- From: Yves Lafon via cvs-syncmail <cvsmail@w3.org>
- Date: Mon, 08 Aug 2005 13:18:13 +0000
- To: www-validator-cvs@w3.org
Update of /sources/public/2002/css-validator/org/w3c/css/parser
In directory hutz:/tmp/cvs-serv27412/org/w3c/css/parser
Modified Files:
AtRuleMedia.java AtRuleMediaCSS1.java AtRuleMediaCSS2.java
AtRulePage.java AtRulePreference.java CssFouffa.java
CssParseException.java CssPropertyFactory.java CssStyle.java
CssValidatorListener.java Errors.java Frame.java
allcss.properties
Log Message:
All those changed made by Jean-Guilhem Rouel:
Huge patch, imports fixed (automatic)
Bug fixed: 372, 920, 778, 287, 696, 764, 233
Partial bug fix for 289
Issue with "inherit" in CSS2.
The validator now checks the number of values (extraneous values were previously ignored)
Index: Frame.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/parser/Frame.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Frame.java 19 Nov 2004 20:26:06 -0000 1.4
+++ Frame.java 8 Aug 2005 13:18:11 -0000 1.5
@@ -6,6 +6,16 @@
// Please first read the full copyright statement in file COPYRIGHT.html
/*
* $Log$
+ * Revision 1.5 2005/08/08 13:18:11 ylafon
+ * All those changed made by Jean-Guilhem Rouel:
+ *
+ * Huge patch, imports fixed (automatic)
+ * Bug fixed: 372, 920, 778, 287, 696, 764, 233
+ * Partial bug fix for 289
+ *
+ * Issue with "inherit" in CSS2.
+ * The validator now checks the number of values (extraneous values were previously ignored)
+ *
* Revision 1.4 2004/11/19 20:26:06 sijtsche
* error message linenr bug fixed
*
@@ -22,9 +32,9 @@
package org.w3c.css.parser;
+import org.w3c.css.util.ApplContext;
import org.w3c.css.util.Warning;
import org.w3c.css.util.Warnings;
-import org.w3c.css.util.ApplContext;
/**
* @version $Revision$
Index: Errors.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/parser/Errors.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Errors.java 8 Apr 2002 21:24:12 -0000 1.2
+++ Errors.java 8 Aug 2005 13:18:11 -0000 1.3
@@ -6,6 +6,16 @@
// Please first read the full copyright statement in file COPYRIGHT.html
/**
* $Log$
+ * Revision 1.3 2005/08/08 13:18:11 ylafon
+ * All those changed made by Jean-Guilhem Rouel:
+ *
+ * Huge patch, imports fixed (automatic)
+ * Bug fixed: 372, 920, 778, 287, 696, 764, 233
+ * Partial bug fix for 289
+ *
+ * Issue with "inherit" in CSS2.
+ * The validator now checks the number of values (extraneous values were previously ignored)
+ *
* Revision 1.2 2002/04/08 21:24:12 plehegar
* New
*
@@ -15,6 +25,8 @@
*/
package org.w3c.css.parser;
+import java.util.Vector;
+
/**
* Controls all errors in the validator
* @version $Revision$
Index: CssParseException.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/parser/CssParseException.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssParseException.java 8 Apr 2002 21:24:12 -0000 1.2
+++ CssParseException.java 8 Aug 2005 13:18:11 -0000 1.3
@@ -6,6 +6,16 @@
// Please first read the full copyright statement in file COPYRIGHT.html
/*
* $Log$
+ * Revision 1.3 2005/08/08 13:18:11 ylafon
+ * All those changed made by Jean-Guilhem Rouel:
+ *
+ * Huge patch, imports fixed (automatic)
+ * Bug fixed: 372, 920, 778, 287, 696, 764, 233
+ * Partial bug fix for 289
+ *
+ * Issue with "inherit" in CSS2.
+ * The validator now checks the number of values (extraneous values were previously ignored)
+ *
* Revision 1.2 2002/04/08 21:24:12 plehegar
* New
*
@@ -13,6 +23,7 @@
package org.w3c.css.parser;
import java.util.Vector;
+
import org.w3c.css.parser.analyzer.ParseException;
import org.w3c.css.values.CssExpression;
Index: CssPropertyFactory.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/parser/CssPropertyFactory.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- CssPropertyFactory.java 12 Jul 2005 14:47:55 -0000 1.10
+++ CssPropertyFactory.java 8 Aug 2005 13:18:11 -0000 1.11
@@ -29,279 +29,281 @@
public class CssPropertyFactory implements Cloneable {
// all recognized properties are here.
- private Utf8Properties properties;
-
- private Utf8Properties allprops;
-
+ private Utf8Properties properties;
+
+ private Utf8Properties allprops;
+
private String usermedium;
public CssPropertyFactory getClone() {
- try {
- return (CssPropertyFactory) clone();
- } catch (CloneNotSupportedException ex) {
- ex.printStackTrace();
- return null;
- }
+ try {
+ return (CssPropertyFactory) clone();
+ } catch (CloneNotSupportedException ex) {
+ ex.printStackTrace();
+ return null;
+ }
}
-
+
/**
* Create a new CssPropertyFactory
*/
- public CssPropertyFactory(URL url, URL allprop_url) {
- properties = new Utf8Properties();
- InputStream f = null;
- try {
- f = url.openStream();
- properties.load(f);
- } catch (IOException e) {
- e.printStackTrace();
- } finally {
- try {
- if (f != null)
- f.close();
- } catch (Exception e) {
- e.printStackTrace();
- } // ignore
- }
-
- // list of all properties
- allprops = new Utf8Properties();
- InputStream f_all = null;
- try {
- f_all = allprop_url.openStream();
- allprops.load(f_all);
- } catch (IOException e) {
- e.printStackTrace();
- } finally {
- try {
- if (f_all != null)
- f_all.close();
- } catch (Exception e) {
- e.printStackTrace();
- } // ignore
- }
+ public CssPropertyFactory(URL url, URL allprop_url) {
+ properties = new Utf8Properties();
+ InputStream f = null;
+ try {
+ f = url.openStream();
+ properties.load(f);
+ } catch (IOException e) {
+ e.printStackTrace();
+ } finally {
+ try {
+ if (f != null)
+ f.close();
+ } catch (Exception e) {
+ e.printStackTrace();
+ } // ignore
+ }
+
+ // list of all properties
+ allprops = new Utf8Properties();
+ InputStream f_all = null;
+ try {
+ f_all = allprop_url.openStream();
+ allprops.load(f_all);
+ } catch (IOException e) {
+ e.printStackTrace();
+ } finally {
+ try {
+ if (f_all != null)
+ f_all.close();
+ } catch (Exception e) {
+ e.printStackTrace();
+ } // ignore
+ }
}
-
+
public String getProperty(String name) {
- return properties.getProperty(name);
+ return properties.getProperty(name);
}
-
+
private Vector getVector(String media) {
- Vector list = new Vector(4);
- String medium = new String();
- StringTokenizer tok = new StringTokenizer(media, ",");
-
- while (tok.hasMoreTokens()) {
- medium = tok.nextToken();
- medium = medium.trim();
- list.addElement(medium);
- }
-
- return list;
+ Vector list = new Vector(4);
+ String medium = new String();
+ StringTokenizer tok = new StringTokenizer(media, ",");
+
+ while (tok.hasMoreTokens()) {
+ medium = tok.nextToken();
+ medium = medium.trim();
+ list.addElement(medium);
+ }
+
+ return list;
}
-
+
public void setUserMedium(String usermedium) {
- this.usermedium = usermedium;
+ this.usermedium = usermedium;
}
-
- public synchronized CssProperty createMediaFeature(ApplContext ac,
- AtRule atRule, String property, CssExpression expression)
+
+ public synchronized CssProperty createMediaFeature(ApplContext ac,
+ AtRule atRule, String property, CssExpression expression)
throws Exception {
-
- String result = "ok";
- String media = atRule.toString();
- int pos = -1;
- int pos2 = media.toUpperCase().indexOf("AND");
-
- if (pos2 == -1) {
- pos2 = media.length();
- }
-
- if (media.toUpperCase().indexOf("NOT") != -1) {
- pos = media.toUpperCase().indexOf("NOT");
- media = media.substring(pos + 4, pos2);
- } else if (media.toUpperCase().indexOf("ONLY") != -1) {
- pos = media.toUpperCase().indexOf("ONLY");
- media = media.substring(pos + 4, pos2);
- } else {
- pos = media.indexOf(" ");
- media = media.substring(pos + 1, pos2);
- }
-
- media = media.trim();
-
- String classname = properties.getProperty("mediafeature" + "."
- + property);
-
- if (classname == null) {
- if (atRule instanceof AtRuleMedia && (!media.equals("all"))) {
- // I don't know this property
- // throw new InvalidParamException("noexistence-media",
- // property,
- // media, ac);
- ac.getFrame().addWarning("noexistence-media", property);
- classname = allprops.getProperty(property);
- } else {
- // I don't know this property
- throw new InvalidParamException("noexistence", property, media,
- ac);
- }
- }
-
- try {
- // create an instance of your property class
- Class expressionclass = new CssExpression().getClass();
- if (expression != null) {
- expressionclass = expression.getClass();
- }
- Class[] parametersType = { ac.getClass(), expressionclass };
- Constructor constructor = Class.forName(classname).getConstructor(
- parametersType);
- Object[] parameters = { ac, expression };
- // invoke the constructor
- return (CssProperty) constructor.newInstance(parameters);
- } catch (InvocationTargetException e) {
- // catch InvalidParamException
- InvocationTargetException iv = e;
- Exception ex = (Exception) iv.getTargetException();
- throw ex;
- }
-
+
+ String result = "ok";
+ String media = atRule.toString();
+ int pos = -1;
+ int pos2 = media.toUpperCase().indexOf("AND");
+
+ if (pos2 == -1) {
+ pos2 = media.length();
+ }
+
+ if (media.toUpperCase().indexOf("NOT") != -1) {
+ pos = media.toUpperCase().indexOf("NOT");
+ media = media.substring(pos + 4, pos2);
+ } else if (media.toUpperCase().indexOf("ONLY") != -1) {
+ pos = media.toUpperCase().indexOf("ONLY");
+ media = media.substring(pos + 4, pos2);
+ } else {
+ pos = media.indexOf(" ");
+ media = media.substring(pos + 1, pos2);
+ }
+
+ media = media.trim();
+
+ String classname = properties.getProperty("mediafeature" + "."
+ + property);
+
+ if (classname == null) {
+ if (atRule instanceof AtRuleMedia && (!media.equals("all"))) {
+ // I don't know this property
+ // throw new InvalidParamException("noexistence-media",
+ // property,
+ // media, ac);
+ ac.getFrame().addWarning("noexistence-media", property);
+ classname = allprops.getProperty(property);
+ } else {
+ // I don't know this property
+ throw new InvalidParamException("noexistence", property, media,
+ ac);
+ }
+ }
+
+ try {
+ // create an instance of your property class
+ Class expressionclass = new CssExpression().getClass();
+ if (expression != null) {
+ expressionclass = expression.getClass();
+ }
+ // Maybe it will be necessary to add the check parameter as for
+ // create property, so... FIXME
+ Class[] parametersType = { ac.getClass(), expressionclass };
+ Constructor constructor = Class.forName(classname).getConstructor(
+ parametersType);
+ Object[] parameters = { ac, expression };
+ // invoke the constructor
+ return (CssProperty) constructor.newInstance(parameters);
+ } catch (InvocationTargetException e) {
+ // catch InvalidParamException
+ InvocationTargetException iv = e;
+ Exception ex = (Exception) iv.getTargetException();
+ throw ex;
+ }
+
}
-
+
public synchronized CssProperty createProperty(ApplContext ac,
- AtRule atRule, String property, CssExpression expression)
+ AtRule atRule, String property, CssExpression expression)
throws Exception {
-
- String result = "ok";
- String classname;
- String media = atRule.toString();
- int pos = -1;
- String upperMedia = media.toUpperCase();
- int pos2 = upperMedia.indexOf("AND ");
-
- if (pos2 == -1) {
- pos2 = media.length();
- }
-
- if ((pos = upperMedia.indexOf("NOT")) != -1) {
- media = media.substring(pos + 4, pos2);
- } else if ((pos = upperMedia.indexOf("ONLY")) != -1) {
- media = media.substring(pos + 4, pos2);
- } else {
- pos = media.indexOf(' ');
- media = media.substring(pos + 1, pos2);
- }
-
- media = media.trim();
-
- Vector list = new Vector(getVector(media));
-
- if (atRule instanceof AtRuleMedia) {
- if (media.equals("all")) {
- classname = properties.getProperty(property);
- } else {
- for (int i = 0; i < list.size() - 1; i++) {
- String medium = (String) list.elementAt(i);
- String name = properties.getProperty(medium + "."
- + property);
- if (name == null) {
- result = medium;
- }
- }
-
- if (result.equals("ok")) {
- classname = properties.getProperty((String) list
- .firstElement()
- + "." + property);
- } else {
- classname = null;
- }
- }
- } else {
- classname = properties.getProperty("@" + atRule.keyword() + "."
- + property);
- }
-
- CssProperty prop = null;
-
- // System.out.println(allprops.getProperty(property));
-
- if (classname == null && usermedium != null) {
- if (atRule instanceof AtRuleMedia) {
- // I don't know this property
- if (!media.equals("all"))
- ac.getFrame().addWarning("notforusermedium", property);
- classname = properties.getProperty(property);
- } else {
- // NEW
- if (allprops.getProperty(property) == null) {
- // I don't know this property
- throw new InvalidParamException("noexistence", property,
- media, ac);
- } else {
- ac.getFrame().addWarning("otherprofile", property);
- classname = allprops.getProperty(property);
- }
- }
- } else if (classname == null) { // && CssFouffa.usermedium == null)
- if (atRule instanceof AtRuleMedia && (!media.equals("all"))) {
- // I don't know this property
- /*
- * throw new InvalidParamException("noexistence-media",
- * property, media, ac);
- */
- ac.getFrame().addWarning("noexistence-media", property);
- classname = allprops.getProperty(property);
-
- } else {
- // I don't know this property
- // NEW
- if (allprops.getProperty(property) == null) {
- // I don't know this property
- throw new InvalidParamException("noexistence", property,
- media, ac);
- } else {
- ac.getFrame().addWarning("otherprofile", property);
- classname = allprops.getProperty(property);
- }
- }
- }
-
- CssIdent initial = new CssIdent("initial");
-
- if (expression.getValue().equals(initial)
- && ac.getCssVersion().equals("css3")) {
- try {
- // create an instance of your property class
- Class[] parametersType = {};
- Constructor constructor = Class.forName(classname)
- .getConstructor(parametersType);
- Object[] parameters = {};
- // invoke the constructor
- return (CssProperty) constructor.newInstance(parameters);
- } catch (InvocationTargetException e) {
- // catch InvalidParamException
- InvocationTargetException iv = e;
- Exception ex = (Exception) iv.getTargetException();
- throw ex;
- }
- } else {
-
- try {
- // create an instance of your property class
- Class[] parametersType = { ac.getClass(), expression.getClass() };
- Constructor constructor = Class.forName(classname)
- .getConstructor(parametersType);
- Object[] parameters = { ac, expression };
- // invoke the constructor
- return (CssProperty) constructor.newInstance(parameters);
- } catch (InvocationTargetException e) {
- // catch InvalidParamException
- InvocationTargetException iv = e;
- Exception ex = (Exception) iv.getTargetException();
- throw ex;
- }
- }
+
+ String result = "ok";
+ String classname;
+ String media = atRule.toString();
+ int pos = -1;
+ String upperMedia = media.toUpperCase();
+ int pos2 = upperMedia.indexOf("AND ");
+
+ if (pos2 == -1) {
+ pos2 = media.length();
+ }
+
+ if ((pos = upperMedia.indexOf("NOT")) != -1) {
+ media = media.substring(pos + 4, pos2);
+ } else if ((pos = upperMedia.indexOf("ONLY")) != -1) {
+ media = media.substring(pos + 4, pos2);
+ } else {
+ pos = media.indexOf(' ');
+ media = media.substring(pos + 1, pos2);
+ }
+
+ media = media.trim();
+
+ Vector list = new Vector(getVector(media));
+
+ if (atRule instanceof AtRuleMedia) {
+ if (media.equals("all")) {
+ classname = properties.getProperty(property);
+ } else {
+ for (int i = 0; i < list.size() - 1; i++) {
+ String medium = (String) list.elementAt(i);
+ String name = properties.getProperty(medium + "."
+ + property);
+ if (name == null) {
+ result = medium;
+ }
+ }
+
+ if (result.equals("ok")) {
+ classname = properties.getProperty((String) list
+ .firstElement()
+ + "." + property);
+ } else {
+ classname = null;
+ }
+ }
+ } else {
+ classname = properties.getProperty("@" + atRule.keyword() + "."
+ + property);
+ }
+
+ CssProperty prop = null;
+
+ // System.out.println(allprops.getProperty(property));
+
+ if (classname == null && usermedium != null) {
+ if (atRule instanceof AtRuleMedia) {
+ // I don't know this property
+ if (!media.equals("all"))
+ ac.getFrame().addWarning("notforusermedium", property);
+ classname = properties.getProperty(property);
+ } else {
+ // NEW
+ if (allprops.getProperty(property) == null) {
+ // I don't know this property
+ throw new InvalidParamException("noexistence", property,
+ media, ac);
+ } else {
+ ac.getFrame().addWarning("otherprofile", property);
+ classname = allprops.getProperty(property);
+ }
+ }
+ } else if (classname == null) { // && CssFouffa.usermedium == null)
+ if (atRule instanceof AtRuleMedia && (!media.equals("all"))) {
+ // I don't know this property
+ /*
+ * throw new InvalidParamException("noexistence-media",
+ * property, media, ac);
+ */
+ ac.getFrame().addWarning("noexistence-media", property);
+ classname = allprops.getProperty(property);
+
+ } else {
+ // I don't know this property
+ // NEW
+ if (allprops.getProperty(property) == null) {
+ // I don't know this property
+ throw new InvalidParamException("noexistence", property,
+ media, ac);
+ } else {
+ ac.getFrame().addWarning("otherprofile", property);
+ classname = allprops.getProperty(property);
+ }
+ }
+ }
+
+ CssIdent initial = new CssIdent("initial");
+
+ if (expression.getValue().equals(initial)
+ && ac.getCssVersion().equals("css3")) {
+ try {
+ // create an instance of your property class
+ Class[] parametersType = {};
+ Constructor constructor = Class.forName(classname)
+ .getConstructor(parametersType);
+ Object[] parameters = {};
+ // invoke the constructor
+ return (CssProperty) constructor.newInstance(parameters);
+ } catch (InvocationTargetException e) {
+ // catch InvalidParamException
+ InvocationTargetException iv = e;
+ Exception ex = (Exception) iv.getTargetException();
+ throw ex;
+ }
+ } else {
+
+ try {
+ // create an instance of your property class
+ Class[] parametersType = { ac.getClass(), expression.getClass(), boolean.class };
+ Constructor constructor = Class.forName(classname)
+ .getConstructor(parametersType);
+ Object[] parameters = { ac, expression, new Boolean(true)};
+ // invoke the constructor
+ return (CssProperty) constructor.newInstance(parameters);
+ } catch (InvocationTargetException e) {
+ // catch InvalidParamException
+ InvocationTargetException iv = e;
+ Exception ex = (Exception) iv.getTargetException();
+ throw ex;
+ }
+ }
}
}
Index: AtRulePage.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/parser/AtRulePage.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- AtRulePage.java 8 Apr 2002 21:24:12 -0000 1.2
+++ AtRulePage.java 8 Aug 2005 13:18:11 -0000 1.3
@@ -10,15 +10,15 @@
*/
package org.w3c.css.parser;
-import org.w3c.css.util.InvalidParamException;
import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
/**
* This class manages all media defines by CSS2
*
* @version $Revision$
- * @author Philippe Le Hégaret
+ * @author Philippe Le H�garet
*/
public class AtRulePage extends AtRule {
Index: CssStyle.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/parser/CssStyle.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CssStyle.java 13 Apr 2003 15:30:16 -0000 1.3
+++ CssStyle.java 8 Aug 2005 13:18:11 -0000 1.4
@@ -6,6 +6,16 @@
// Please first read the full copyright statement in file COPYRIGHT.html
/*
* $Log$
+ * Revision 1.4 2005/08/08 13:18:11 ylafon
+ * All those changed made by Jean-Guilhem Rouel:
+ *
+ * Huge patch, imports fixed (automatic)
+ * Bug fixed: 372, 920, 778, 287, 696, 764, 233
+ * Partial bug fix for 289
+ *
+ * Issue with "inherit" in CSS2.
+ * The validator now checks the number of values (extraneous values were previously ignored)
+ *
* Revision 1.3 2003/04/13 15:30:16 sijtsche
* addToStyle invocation commented out, obsolete
*
@@ -16,11 +26,12 @@
package org.w3c.css.parser;
import java.util.Enumeration;
-import org.w3c.css.util.Warnings;
-import org.w3c.css.util.Warning;
-import org.w3c.css.util.ApplContext;
-import org.w3c.css.properties.CssProperty;
+
import org.w3c.css.css.StyleSheet;
+import org.w3c.css.properties.CssProperty;
+import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.Warning;
+import org.w3c.css.util.Warnings;
/**
* This class represents a class for one context
Index: AtRulePreference.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/parser/AtRulePreference.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- AtRulePreference.java 8 Apr 2002 21:24:12 -0000 1.2
+++ AtRulePreference.java 8 Aug 2005 13:18:11 -0000 1.3
@@ -8,7 +8,6 @@
package org.w3c.css.parser;
-import org.w3c.css.util.InvalidParamException;
public class AtRulePreference extends AtRule {
Index: CssFouffa.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/parser/CssFouffa.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- CssFouffa.java 22 Jul 2005 09:45:18 -0000 1.29
+++ CssFouffa.java 8 Aug 2005 13:18:11 -0000 1.30
@@ -20,8 +20,6 @@
import java.util.Vector;
import org.w3c.css.css.StyleSheetOrigin;
-import org.w3c.css.parser.CssParseException;
-import org.w3c.css.parser.Errors;
import org.w3c.css.parser.analyzer.CssParser;
import org.w3c.css.parser.analyzer.CssParserTokenManager;
import org.w3c.css.parser.analyzer.ParseException;
@@ -75,7 +73,7 @@
static CssPropertyFactory __s_svgbasicprop = null;
[...1010 lines suppressed...]
e.printStackTrace();
}
}
-
+
public CssFouffa(java.io.InputStream stream) {
super(stream);
loadConfig("css2", null);
}
-
+
public CssFouffa(java.io.Reader stream) {
super(stream);
loadConfig("css2", null);
}
-
+
public CssFouffa(CssParserTokenManager tm) {
super(tm);
loadConfig("css2", null);
Index: AtRuleMedia.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/parser/AtRuleMedia.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- AtRuleMedia.java 30 May 2004 05:06:52 -0000 1.6
+++ AtRuleMedia.java 8 Aug 2005 13:18:11 -0000 1.7
@@ -11,18 +11,17 @@
package org.w3c.css.parser;
import java.util.Enumeration;
+import java.util.Vector;
-import org.w3c.css.util.InvalidParamException;
-import org.w3c.css.util.ApplContext;
-import org.w3c.css.css.StyleSheetCom;
import org.w3c.css.properties.CssProperty;
-import java.util.Vector;
+import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
/**
* This class manages all media defines by CSS2
*
* @version $Revision$
- * @author Philippe Le Hégaret
+ * @author Philippe Le H�garet
*/
public class AtRuleMedia extends AtRule {
Index: CssValidatorListener.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/parser/CssValidatorListener.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CssValidatorListener.java 2 Jul 2003 14:39:50 -0000 1.3
+++ CssValidatorListener.java 8 Aug 2005 13:18:11 -0000 1.4
@@ -6,6 +6,16 @@
// Please first read the full copyright statement in file COPYRIGHT.html
/*
* $Log$
+ * Revision 1.4 2005/08/08 13:18:11 ylafon
+ * All those changed made by Jean-Guilhem Rouel:
+ *
+ * Huge patch, imports fixed (automatic)
+ * Bug fixed: 372, 920, 778, 287, 696, 764, 233
+ * Partial bug fix for 289
+ *
+ * Issue with "inherit" in CSS2.
+ * The validator now checks the number of values (extraneous values were previously ignored)
+ *
* Revision 1.3 2003/07/02 14:39:50 plehegar
* Removed HttpServletResponse import
*
@@ -26,9 +36,8 @@
import java.util.Vector;
-
-import org.w3c.css.util.Warnings;
import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.Warnings;
/**
* Implements this interface if you want to use the CSS1 parser.
Index: allcss.properties
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/parser/allcss.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- allcss.properties 14 Jul 2003 13:57:26 -0000 1.2
+++ allcss.properties 8 Aug 2005 13:18:11 -0000 1.3
@@ -898,12 +898,12 @@
#@font-face.mathline: org.w3c.css.font.Mathline
#@font-face.topline: org.w3c.css.font.Topline
-atsc-dynamic-refresh org.w3c.css.atsc.ATSCDynamicRefresh
-atsc-nav-down org.w3c.css.atsc.ATSCNavDown
-atsc-nav-index org.w3c.css.atsc.ATSCNavIndex
-atsc-nav-left org.w3c.css.atsc.ATSCNavLeft
-atsc-nav-right org.w3c.css.atsc.ATSCNavRight
-atsc-nav-up org.w3c.css.atsc.ATSCNavUp
+atsc-dynamic-refresh org.w3c.css.atsc.ATSCDynamicRefresh
+atsc-nav-down org.w3c.css.atsc.ATSCNavDown
+atsc-nav-index org.w3c.css.atsc.ATSCNavIndex
+atsc-nav-left org.w3c.css.atsc.ATSCNavLeft
+atsc-nav-right org.w3c.css.atsc.ATSCNavRight
+atsc-nav-up org.w3c.css.atsc.ATSCNavUp
font-style: org.w3c.css.properties.CssFontStyleCSS2
font-variant: org.w3c.css.properties.CssFontVariantCSS2
font-weight: org.w3c.css.properties.CssFontWeightCSS2
@@ -935,26 +935,26 @@
padding-left: org.w3c.css.properties.CssPaddingLeft
padding-right: org.w3c.css.properties.CssPaddingRight
padding: org.w3c.css.properties.CssPadding
-border-top-width: org.w3c.css.properties.CssBorderTopWidthATSC
-border-right-width: org.w3c.css.properties.CssBorderRightWidthATSC
-border-left-width: org.w3c.css.properties.CssBorderLeftWidthATSC
-border-bottom-width: org.w3c.css.properties.CssBorderBottomWidthATSC
-border-top-color: org.w3c.css.properties.CssBorderTopColorATSC
-border-right-color: org.w3c.css.properties.CssBorderRightColorATSC
-border-left-color: org.w3c.css.properties.CssBorderLeftColorATSC
-border-bottom-color: org.w3c.css.properties.CssBorderBottomColorATSC
-border-top-style: org.w3c.css.properties.CssBorderTopStyleATSC
-border-right-style: org.w3c.css.properties.CssBorderRightStyleATSC
-border-left-style: org.w3c.css.properties.CssBorderLeftStyleATSC
-border-bottom-style: org.w3c.css.properties.CssBorderBottomStyleATSC
-border-width: org.w3c.css.properties.CssBorderWidthATSC
-border-color: org.w3c.css.properties.CssBorderColorATSC
-border-style: org.w3c.css.properties.CssBorderStyleATSC
-border-top: org.w3c.css.properties.CssBorderTopATSC
-border-right: org.w3c.css.properties.CssBorderRightATSC
-border-left: org.w3c.css.properties.CssBorderLeftATSC
-border-bottom: org.w3c.css.properties.CssBorderBottomATSC
-border: org.w3c.css.properties.CssBorderATSC
+border-top-width: org.w3c.css.atsc.CssBorderTopWidthATSC
+border-right-width: org.w3c.css.atsc.CssBorderRightWidthATSC
+border-left-width: org.w3c.css.atsc.CssBorderLeftWidthATSC
+border-bottom-width: org.w3c.css.atsc.CssBorderBottomWidthATSC
+border-top-color: org.w3c.css.atsc.CssBorderTopColorATSC
+border-right-color: org.w3c.css.atsc.CssBorderRightColorATSC
+border-left-color: org.w3c.css.atsc.CssBorderLeftColorATSC
+border-bottom-color: org.w3c.css.atsc.CssBorderBottomColorATSC
+border-top-style: org.w3c.css.atsc.CssBorderTopStyleATSC
+border-right-style: org.w3c.css.atsc.CssBorderRightStyleATSC
+border-left-style: org.w3c.css.atsc.CssBorderLeftStyleATSC
+border-bottom-style: org.w3c.css.atsc.CssBorderBottomStyleATSC
+border-width: org.w3c.css.atsc.CssBorderWidthATSC
+border-color: org.w3c.css.atsc.CssBorderColorATSC
+border-style: org.w3c.css.atsc.CssBorderStyleATSC
+border-top: org.w3c.css.atsc.CssBorderTopATSC
+border-right: org.w3c.css.atsc.CssBorderRightATSC
+border-left: org.w3c.css.atsc.CssBorderLeftATSC
+border-bottom: org.w3c.css.atsc.CssBorderBottomATSC
+border: org.w3c.css.atsc.CssBorderATSC
width: org.w3c.css.properties.CssWidth
height: org.w3c.css.properties.CssHeight
float: org.w3c.css.properties.CssFloat
Index: AtRuleMediaCSS1.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/parser/AtRuleMediaCSS1.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- AtRuleMediaCSS1.java 8 Apr 2002 21:24:12 -0000 1.2
+++ AtRuleMediaCSS1.java 8 Aug 2005 13:18:11 -0000 1.3
@@ -12,15 +12,14 @@
import java.util.Enumeration;
-import org.w3c.css.util.InvalidParamException;
import org.w3c.css.util.ApplContext;
-import org.w3c.css.css.StyleSheetCom;
+import org.w3c.css.util.InvalidParamException;
/**
* This class manages all media defines by CSS2
*
* @version $Revision$
- * @author Philippe Le Hégaret
+ * @author Philippe Le H�garet
*/
public class AtRuleMediaCSS1 extends AtRuleMedia {
Index: AtRuleMediaCSS2.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/parser/AtRuleMediaCSS2.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- AtRuleMediaCSS2.java 8 Apr 2002 21:24:12 -0000 1.2
+++ AtRuleMediaCSS2.java 8 Aug 2005 13:18:11 -0000 1.3
@@ -12,15 +12,14 @@
import java.util.Enumeration;
-import org.w3c.css.util.InvalidParamException;
import org.w3c.css.util.ApplContext;
-import org.w3c.css.css.StyleSheetCom;
+import org.w3c.css.util.InvalidParamException;
/**
* This class manages all media defines by CSS2
*
* @version $Revision$
- * @author Philippe Le Hégaret
+ * @author Philippe Le H�garet
*/
public class AtRuleMediaCSS2 extends AtRuleMedia {
Received on Monday, 8 August 2005 13:20:27 UTC