2002/css-validator/org/w3c/css/parser CssFouffa.java,1.36,1.37 Frame.java,1.8,1.9

Update of /sources/public/2002/css-validator/org/w3c/css/parser
In directory hutz:/tmp/cvs-serv2279/org/w3c/css/parser

Modified Files:
	CssFouffa.java Frame.java 
Log Message:
Improved warning count

Index: Frame.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/parser/Frame.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- Frame.java	14 Sep 2005 15:14:18 -0000	1.8
+++ Frame.java	16 Dec 2006 20:22:27 -0000	1.9
@@ -30,11 +30,11 @@
      * @param cssFouffa  The current parser.
      * @param sourceFile The name of the source file.
      */
-    public Frame(CssFouffa cssFouffa, String sourceFile) {
-    this.sourceFile = sourceFile;
-    this.cssFouffa = cssFouffa;
-    errors = new Errors();
-    warnings = new Warnings();
+    public Frame(CssFouffa cssFouffa, String sourceFile, int warningLevel) {
+    	this.sourceFile = sourceFile;
+    	this.cssFouffa = cssFouffa;
+    	errors = new Errors();
+    	warnings = new Warnings(warningLevel);
     }
 
     /**
@@ -44,12 +44,9 @@
      * @param sourceFile The name of the source file.
      * @param beginLine  The begin line
      */
-    public Frame(CssFouffa cssFouffa, String sourceFile, int beginLine) {
-    this.sourceFile = sourceFile;
-    this.cssFouffa = cssFouffa;
-    line = beginLine;
-    errors = new Errors();
-    warnings = new Warnings();
+    public Frame(CssFouffa cssFouffa, String sourceFile, int beginLine, int warningLevel) {
+    	this(cssFouffa, sourceFile, warningLevel);
+    	line = beginLine;
     }
 
     /**

Index: CssFouffa.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/parser/CssFouffa.java,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- CssFouffa.java	19 Apr 2006 11:28:05 -0000	1.36
+++ CssFouffa.java	16 Dec 2006 20:22:27 -0000	1.37
@@ -107,7 +107,7 @@
 	} else {
 	    setOrigin(ac.getOrigin()); // default is user
 	}
-	ac.setFrame(new Frame(this, file.toString(), beginLine));
+	ac.setFrame(new Frame(this, file.toString(), beginLine, ac.getWarningLevel()));
 	setApplContext(ac);
 	// @@this is a default media ...
 	/*
@@ -212,7 +212,7 @@
 	this(ac, in, url, 0);
 	this.visited = urlvisited;
 	setURL(url);
-	ac.setFrame(new Frame(this, url.toString()));
+	ac.setFrame(new Frame(this, url.toString(), ac.getWarningLevel()));
 	setApplContext(ac);
 	this.listeners = listeners;
 	this.properties = cssfactory;
@@ -286,7 +286,7 @@
      */
     public void ReInit(ApplContext ac, InputStream input, URL file,
 	    int beginLine) throws IOException {
-	Frame f = new Frame(this, file.toString(), beginLine);
+	Frame f = new Frame(this, file.toString(), beginLine, ac.getWarningLevel());
 	ac.setFrame(f);
 	ReInit(ac, input, file, f);
     }
@@ -303,7 +303,7 @@
      */
     public void ReInit(ApplContext ac, InputStream input, URL file)
     throws IOException {
-	Frame f = new Frame(this, file.toString());
+	Frame f = new Frame(this, file.toString(), ac.getWarningLevel());
 	ac.setFrame(f);
 	ReInit(ac, input, file, f);
     }
@@ -318,7 +318,7 @@
      *                if an I/O error occurs.
      */
     public void ReInit(ApplContext ac, URL file) throws IOException {
-	Frame f = new Frame(this, file.toString());
+	Frame f = new Frame(this, file.toString(), ac.getWarningLevel());
 	ac.setFrame(f);
 	URLConnection urlC = HTTPURL.getConnection(file, ac);
 	ReInit(ac, urlC.getInputStream(), urlC.getURL(), f);

Received on Saturday, 16 December 2006 20:22:36 UTC