- From: Yves Lafon via cvs-syncmail <cvsmail@w3.org>
- Date: Tue, 05 Jan 2010 13:49:35 +0000
- To: www-validator-cvs@w3.org
Update of /sources/public/2002/css-validator/org/w3c/css/css
In directory hutz:/tmp/cvs-serv25562/org/w3c/css/css
Modified Files:
CssCascadingOrder.java CssStyleRule.java StyleSheet.java
StyleSheetCom.java StyleSheetGenerator.java
StyleSheetParser.java
Log Message:
Implementation of css3-background (partial, missing background-color and background, also borders not done)
cf. http://www.w3.org/TR/2009/CR-css3-background-20091217/
moved and corrected implementation of css3-multicol
cf. http://www.w3.org/TR/2009/CR-css3-multicol-20091217/
Some reorganization of code.
Index: StyleSheetCom.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/css/StyleSheetCom.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- StyleSheetCom.java 13 Sep 2007 09:35:46 -0000 1.22
+++ StyleSheetCom.java 5 Jan 2010 13:49:33 -0000 1.23
@@ -19,10 +19,9 @@
import org.w3c.css.parser.CssSelectors;
import org.w3c.css.parser.CssStyle;
import org.w3c.css.properties.PropertiesLoader;
-import org.w3c.css.properties.css1.CssProperty;
+import org.w3c.css.properties.css.CssProperty;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.HTTPURL;
-import org.w3c.css.util.Util;
import org.w3c.www.mime.MimeType;
Index: StyleSheet.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/css/StyleSheet.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- StyleSheet.java 28 Mar 2008 16:36:46 -0000 1.15
+++ StyleSheet.java 5 Jan 2010 13:49:33 -0000 1.16
@@ -8,7 +8,6 @@
package org.w3c.css.css;
import java.io.PrintWriter;
-import java.util.Enumeration;
import java.util.Hashtable;
import java.util.Vector;
@@ -16,7 +15,7 @@
import org.w3c.css.parser.CssSelectors;
import org.w3c.css.parser.CssStyle;
import org.w3c.css.parser.Errors;
-import org.w3c.css.properties.css1.CssProperty;
+import org.w3c.css.properties.css.CssProperty;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.SortedHashtable;
import org.w3c.css.util.Util;
Index: CssCascadingOrder.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/css/CssCascadingOrder.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- CssCascadingOrder.java 6 Mar 2009 11:15:38 -0000 1.7
+++ CssCascadingOrder.java 5 Jan 2010 13:49:33 -0000 1.8
@@ -11,7 +11,7 @@
import org.w3c.css.parser.CssSelectors;
import org.w3c.css.parser.CssStyle;
-import org.w3c.css.properties.css1.CssProperty;
+import org.w3c.css.properties.css.CssProperty;
import org.w3c.css.util.CompareFunction;
import org.w3c.css.util.QuickSortAlgorithm;
import org.w3c.css.util.SortAlgorithm;
Index: CssStyleRule.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/css/CssStyleRule.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- CssStyleRule.java 25 Feb 2009 20:44:49 -0000 1.18
+++ CssStyleRule.java 5 Jan 2010 13:49:33 -0000 1.19
@@ -7,7 +7,7 @@
import java.util.Vector;
-import org.w3c.css.properties.css1.CssProperty;
+import org.w3c.css.properties.css.CssProperty;
import org.w3c.css.util.Messages;
public class CssStyleRule {
Index: StyleSheetGenerator.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/css/StyleSheetGenerator.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- StyleSheetGenerator.java 7 Dec 2009 14:23:09 -0000 1.28
+++ StyleSheetGenerator.java 5 Jan 2010 13:49:33 -0000 1.29
@@ -1,24 +1,10 @@
package org.w3c.css.css;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.net.URL;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.TimeZone;
-import java.util.Vector;
-
-import org.apache.velocity.VelocityContext;
import org.apache.velocity.Template;
+import org.apache.velocity.VelocityContext;
import org.apache.velocity.app.Velocity;
-import org.apache.velocity.exception.ResourceNotFoundException;
import org.apache.velocity.exception.ParseErrorException;
+import org.apache.velocity.exception.ResourceNotFoundException;
import org.w3c.css.error.ErrorReportHTML;
import org.w3c.css.parser.CssError;
import org.w3c.css.parser.CssErrorToken;
@@ -30,7 +16,20 @@
import org.w3c.css.util.Messages;
import org.w3c.css.util.Utf8Properties;
import org.w3c.css.util.Warnings;
-import org.w3c.css.util.Warning;
+
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.net.URL;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Hashtable;
+import java.util.Iterator;
+import java.util.TimeZone;
+import java.util.Vector;
/**
* @author Julien Grand-Mourcel
@@ -176,14 +175,14 @@
new Integer(warnings.getIgnoredWarningCount()));
context.put("warning_level", new Integer(warningLevel));
context.put("rules_count", new Integer(items.size()));
- context.put("no_errors_report", new Boolean(false));
+ context.put("no_errors_report", Boolean.FALSE);
context.put("charset", ac.getContentEncoding());
context.put("cssversion", ac.getCssVersion());
context.put("css_profile", ac.getProfile());
context.put("css", ac.getMsg().getString(ac.getCssVersion()));
context.put("css_link",getURLProperty("@url-base_"+ac.getCssVersion()));
context.put("is_valid", (errors.getErrorCount() == 0)?"true":"false");
- context.put("fake_input", new Boolean(ac.isInputFake()));
+ context.put("fake_input", Boolean.valueOf(ac.isInputFake()));
context.put("author", "www-validator-css");
context.put("author-email", "Email.html");
if (style.charset != null)
@@ -481,7 +480,7 @@
* is called
*/
public void desactivateError() {
- context.put("no_errors_report", new Boolean(true));
+ context.put("no_errors_report", Boolean.TRUE);
// activate the no errors report
}
Index: StyleSheetParser.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/css/StyleSheetParser.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- StyleSheetParser.java 17 Dec 2009 16:14:02 -0000 1.16
+++ StyleSheetParser.java 5 Jan 2010 13:49:33 -0000 1.17
@@ -27,7 +27,7 @@
import org.w3c.css.parser.CssValidatorListener;
import org.w3c.css.parser.Errors;
import org.w3c.css.parser.analyzer.TokenMgrError;
-import org.w3c.css.properties.css1.CssProperty;
+import org.w3c.css.properties.css.CssProperty;
import org.w3c.css.selectors.IdSelector;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
@@ -304,7 +304,8 @@
cpe = new CssParseException(new Exception(e.getMessage()));
}
er.addError(new org.w3c.css.parser.CssError(url.toString(),
- e.getErrorLine(),
+ -1,
+ //e.getErrorLine(),
cpe));
notifyErrors(er);
} catch(RuntimeException e) {
Received on Tuesday, 5 January 2010 13:50:07 UTC