- From: Yves Lafon via cvs-syncmail <cvsmail@w3.org>
- Date: Tue, 23 Aug 2005 16:22:56 +0000
- To: www-validator-cvs@w3.org
Update of /sources/public/2002/css-validator/org/w3c/css/css
In directory hutz:/tmp/cvs-serv7360/css
Modified Files:
CssCascadingOrder.java CssStyleRule.java
StyleReportSOAP12.java StyleSheet.java StyleSheetCom.java
StyleSheetGenerator.java StyleSheetGenerator2.java
StyleSheetGeneratorHTML.java StyleSheetGeneratorHTML2.java
StyleSheetParser.java XMLStyleSheetHandler.java
Log Message:
Patch by Jean-Guilhem Rouel
Better handling of media and properties files
Major reorganization of those properties files
Index: StyleSheetCom.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/css/StyleSheetCom.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- StyleSheetCom.java 8 Aug 2005 13:18:04 -0000 1.8
+++ StyleSheetCom.java 23 Aug 2005 16:22:54 -0000 1.9
@@ -6,6 +6,12 @@
// Please first read the full copyright statement in file COPYRIGHT.html
/*
* $Log$
+ * Revision 1.9 2005/08/23 16:22:54 ylafon
+ * Patch by Jean-Guilhem Rouel
+ *
+ * Better handling of media and properties files
+ * Major reorganization of those properties files
+ *
* Revision 1.8 2005/08/08 13:18:04 ylafon
* All those changed made by Jean-Guilhem Rouel:
*
@@ -56,7 +62,7 @@
import org.w3c.css.parser.CssFouffa;
import org.w3c.css.parser.CssSelectors;
import org.w3c.css.parser.CssStyle;
-import org.w3c.css.properties.CssProperty;
+import org.w3c.css.properties.css1.CssProperty;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.HTTPURL;
import org.w3c.css.util.Util;
@@ -147,12 +153,12 @@
parser.getStyleSheet().findConflicts(ac);
if (selector != null) {
System.err.println("<color value=\""
- + parser.getStyleSheet().CascadingOrder(new org.w3c.css.properties.CssColor(),
+ + parser.getStyleSheet().CascadingOrder(new org.w3c.css.properties.css1.CssColor(),
parser.getStyleSheet(),
selector));
CssStyle s = parser.getStyleSheet().getStyle(selector);
CssProperty _sl =
- ((org.w3c.css.properties.Css1Style) s).getColor();
+ ((org.w3c.css.properties.css1.Css1Style) s).getColor();
s.print(new org.w3c.css.parser.CssPrinterStyle () {
public void print(CssProperty property) {
Index: XMLStyleSheetHandler.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/css/XMLStyleSheetHandler.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- XMLStyleSheetHandler.java 10 Aug 2005 13:44:27 -0000 1.15
+++ XMLStyleSheetHandler.java 23 Aug 2005 16:22:54 -0000 1.16
@@ -210,7 +210,7 @@
}
if (href != null) {
- URL url;
+ //URL url;
try {
baseURI = new URL(documentURI, href);
Index: StyleSheetGeneratorHTML2.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/css/StyleSheetGeneratorHTML2.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- StyleSheetGeneratorHTML2.java 8 Aug 2005 13:18:04 -0000 1.14
+++ StyleSheetGeneratorHTML2.java 23 Aug 2005 16:22:54 -0000 1.15
@@ -25,7 +25,7 @@
import org.w3c.css.parser.CssPrinterStyle;
import org.w3c.css.parser.CssSelectors;
import org.w3c.css.parser.Errors;
-import org.w3c.css.properties.CssProperty;
+import org.w3c.css.properties.css1.CssProperty;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.util.Utf8Properties;
@@ -51,7 +51,7 @@
private CssSelectors selector;
- private CssProperty property;
+ //private CssProperty property;
private PrintWriter out;
@@ -245,7 +245,7 @@
ret.append(queryReplace(error.getExp().toString()));
ret.append("</span>\n");
}
- } else {
+ } else {
ret.append(ac.getMsg().getGeneratorString("unrecognize"));
ret.append(" - <span class='error'>");
ret.append(queryReplace(error.getSkippedString()));
Index: StyleReportSOAP12.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/css/StyleReportSOAP12.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- StyleReportSOAP12.java 8 Aug 2005 13:18:04 -0000 1.8
+++ StyleReportSOAP12.java 23 Aug 2005 16:22:54 -0000 1.9
@@ -25,7 +25,7 @@
import org.w3c.css.parser.CssPrinterStyle;
import org.w3c.css.parser.CssSelectors;
import org.w3c.css.parser.Errors;
-import org.w3c.css.properties.CssProperty;
+import org.w3c.css.properties.css1.CssProperty;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.util.Utf8Properties;
Index: StyleSheet.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/css/StyleSheet.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- StyleSheet.java 8 Aug 2005 13:18:04 -0000 1.7
+++ StyleSheet.java 23 Aug 2005 16:22:54 -0000 1.8
@@ -16,7 +16,7 @@
import org.w3c.css.parser.CssSelectors;
import org.w3c.css.parser.CssStyle;
import org.w3c.css.parser.Errors;
-import org.w3c.css.properties.CssProperty;
+import org.w3c.css.properties.css1.CssProperty;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.SortedHashtable;
import org.w3c.css.util.Util;
Index: StyleSheetGeneratorHTML.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/css/StyleSheetGeneratorHTML.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- StyleSheetGeneratorHTML.java 12 Jul 2005 14:47:55 -0000 1.3
+++ StyleSheetGeneratorHTML.java 23 Aug 2005 16:22:54 -0000 1.4
@@ -6,6 +6,12 @@
// Please first read the full copyright statement in file COPYRIGHT.html
/*
* $Log$
+ * Revision 1.4 2005/08/23 16:22:54 ylafon
+ * Patch by Jean-Guilhem Rouel
+ *
+ * Better handling of media and properties files
+ * Major reorganization of those properties files
+ *
* Revision 1.3 2005/07/12 14:47:55 ylafon
* Utf8 properties (Jean-Guilhem Rouel)
*
@@ -37,7 +43,7 @@
import org.w3c.css.parser.CssPrinterStyle;
import org.w3c.css.parser.CssSelectors;
import org.w3c.css.parser.Errors;
-import org.w3c.css.properties.CssProperty;
+import org.w3c.css.properties.css1.CssProperty;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.util.SortedHashtable;
Index: CssCascadingOrder.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/css/CssCascadingOrder.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CssCascadingOrder.java 8 Aug 2005 13:18:04 -0000 1.3
+++ CssCascadingOrder.java 23 Aug 2005 16:22:54 -0000 1.4
@@ -6,6 +6,12 @@
// Please first read the full copyright statement in file COPYRIGHT.html
/**
* $Log$
+ * Revision 1.4 2005/08/23 16:22:54 ylafon
+ * Patch by Jean-Guilhem Rouel
+ *
+ * Better handling of media and properties files
+ * Major reorganization of those properties files
+ *
* Revision 1.3 2005/08/08 13:18:04 ylafon
* All those changed made by Jean-Guilhem Rouel:
*
@@ -41,7 +47,7 @@
import org.w3c.css.parser.CssSelectors;
import org.w3c.css.parser.CssStyle;
-import org.w3c.css.properties.CssProperty;
+import org.w3c.css.properties.css1.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.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- CssStyleRule.java 8 Aug 2005 13:18:04 -0000 1.7
+++ CssStyleRule.java 23 Aug 2005 16:22:54 -0000 1.8
@@ -8,7 +8,7 @@
import java.io.PrintWriter;
import java.util.Vector;
-import org.w3c.css.properties.CssProperty;
+import org.w3c.css.properties.css1.CssProperty;
import org.w3c.css.util.Util;
Index: StyleSheetGenerator2.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/css/StyleSheetGenerator2.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- StyleSheetGenerator2.java 12 Jul 2005 14:47:55 -0000 1.3
+++ StyleSheetGenerator2.java 23 Aug 2005 16:22:54 -0000 1.4
@@ -15,7 +15,7 @@
import org.w3c.css.parser.CssParseException;
import org.w3c.css.parser.CssSelectors;
import org.w3c.css.parser.Errors;
-import org.w3c.css.properties.CssProperty;
+import org.w3c.css.properties.css1.CssProperty;
import org.w3c.css.util.Date;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.util.Utf8Properties;
Index: StyleSheetGenerator.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/css/StyleSheetGenerator.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- StyleSheetGenerator.java 12 Jul 2005 14:47:55 -0000 1.3
+++ StyleSheetGenerator.java 23 Aug 2005 16:22:54 -0000 1.4
@@ -6,6 +6,12 @@
// Please first read the full copyright statement in file COPYRIGHT.html
/*
* $Log$
+ * Revision 1.4 2005/08/23 16:22:54 ylafon
+ * Patch by Jean-Guilhem Rouel
+ *
+ * Better handling of media and properties files
+ * Major reorganization of those properties files
+ *
* Revision 1.3 2005/07/12 14:47:55 ylafon
* Utf8 properties (Jean-Guilhem Rouel)
*
@@ -58,7 +64,7 @@
import org.w3c.css.parser.CssPrinterStyle;
import org.w3c.css.parser.CssSelectors;
import org.w3c.css.parser.Errors;
-import org.w3c.css.properties.CssProperty;
+import org.w3c.css.properties.css1.CssProperty;
import org.w3c.css.util.Date;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.util.Utf8Properties;
Index: StyleSheetParser.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/css/StyleSheetParser.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- StyleSheetParser.java 8 Aug 2005 13:18:04 -0000 1.4
+++ StyleSheetParser.java 23 Aug 2005 16:22:54 -0000 1.5
@@ -6,6 +6,12 @@
// Please first read the full copyright statement in file COPYRIGHT.html
/*
* $Log$
+ * Revision 1.5 2005/08/23 16:22:54 ylafon
+ * Patch by Jean-Guilhem Rouel
+ *
+ * Better handling of media and properties files
+ * Major reorganization of those properties files
+ *
* Revision 1.4 2005/08/08 13:18:04 ylafon
* All those changed made by Jean-Guilhem Rouel:
*
@@ -50,7 +56,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.CssProperty;
+import org.w3c.css.properties.css1.CssProperty;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.util.Util;
@@ -285,11 +291,11 @@
-1, e));
notifyErrors(er);
} catch(TokenMgrError e) {
- Errors er = new Errors();
+ Errors er = new Errors();
er.addError(new org.w3c.css.parser.CssError(url.toString(), e.getErrorLine(), new CssParseException(new Exception(e))));
notifyErrors(er);
} catch(RuntimeException e) {
- Errors er = new Errors();
+ Errors er = new Errors();
er.addError(new org.w3c.css.parser.CssError(url.toString(), cssFouffa.getLine(), new CssParseException(e)));
notifyErrors(er);
}
Received on Tuesday, 23 August 2005 16:26:20 UTC