- From: Yves Lafon via cvs-syncmail <cvsmail@w3.org>
- Date: Thu, 08 Sep 2005 12:23:35 +0000
- To: www-validator-cvs@w3.org
Update of /sources/public/2002/css-validator/org/w3c/css/parser
In directory hutz:/tmp/cvs-serv8236/org/w3c/css/parser
Modified Files:
CssError.java CssErrorToken.java CssFouffa.java
CssParseException.java CssPrinterStyle.java
CssPropertyFactory.java CssSelectors.java
CssSelectorsConstant.java CssStyle.java
CssValidatorListener.java Errors.java Frame.java
Log Message:
Changes from Jean-Guilhem Rouel
Bug fixed: 1174 845 160 766
See
http://www.w3.org/Bugs/Public/show_bug.cgi?id=1174
http://www.w3.org/Bugs/Public/show_bug.cgi?id=845
http://www.w3.org/Bugs/Public/show_bug.cgi?id=160
http://www.w3.org/Bugs/Public/show_bug.cgi?id=766
The handling of selectors has been redone almost entirely.
Also, changelog in files has been removed.
Index: CssSelectors.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/parser/CssSelectors.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- CssSelectors.java 26 Aug 2005 15:51:36 -0000 1.15
+++ CssSelectors.java 8 Sep 2005 12:23:33 -0000 1.16
@@ -7,14 +7,29 @@
package org.w3c.css.parser;
-import java.net.URL;
-import java.util.Enumeration;
-import java.util.Hashtable;
+import java.util.ArrayList;
import org.w3c.css.properties.css1.CssProperty;
+import org.w3c.css.selectors.AdjacentSelector;
+import org.w3c.css.selectors.AttributeSelector;
[...1133 lines suppressed...]
-
- PseudoEnumeration(boolean[] classes, String[] values) {
- this.classes = classes;
- this.values = values;
-
- while ((++current < classes.length) && !classes[current])
- /* nothing */;
- }
-
- public boolean hasMoreElements() {
- return (current != classes.length);
- }
-
- public Object nextElement() {
- String v = values[current];
- while ((++current < classes.length) && !classes[current])
- /* nothing */;
- return v;
- }
-}
Index: Frame.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/parser/Frame.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- Frame.java 23 Aug 2005 16:22:54 -0000 1.6
+++ Frame.java 8 Sep 2005 12:23:33 -0000 1.7
@@ -4,37 +4,6 @@
//
// (c) COPYRIGHT MIT and INRIA, 1997.
// Please first read the full copyright statement in file COPYRIGHT.html
-/*
- * $Log$
- * Revision 1.6 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.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
- *
- * Revision 1.3 2002/08/19 07:23:08 sijtsche
- * compile bug fixed: getLine erroneous?
- *
- * Revision 1.2 2002/04/08 21:24:12 plehegar
- * New
- *
- * Revision 2.1 1997/08/08 15:51:49 plehegar
- * Nothing
- *
- */
package org.w3c.css.parser;
Index: Errors.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/parser/Errors.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Errors.java 8 Aug 2005 13:18:11 -0000 1.3
+++ Errors.java 8 Sep 2005 12:23:33 -0000 1.4
@@ -4,25 +4,7 @@
//
// (c) COPYRIGHT MIT and INRIA, 1997.
// 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
- *
- * Revision 2.1 1997/08/08 15:51:49 plehegar
- * Nothing
- *
- */
+
package org.w3c.css.parser;
import java.util.Vector;
Index: CssParseException.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/parser/CssParseException.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CssParseException.java 8 Aug 2005 13:18:11 -0000 1.3
+++ CssParseException.java 8 Sep 2005 12:23:33 -0000 1.4
@@ -4,22 +4,7 @@
//
// (c) COPYRIGHT MIT and INRIA, 1997.
// 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
- *
- */
+
package org.w3c.css.parser;
import java.util.Vector;
Index: CssPropertyFactory.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/parser/CssPropertyFactory.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- CssPropertyFactory.java 23 Aug 2005 16:22:54 -0000 1.12
+++ CssPropertyFactory.java 8 Sep 2005 12:23:33 -0000 1.13
@@ -9,7 +9,6 @@
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
-import java.net.URL;
import java.util.StringTokenizer;
import java.util.Vector;
Index: CssErrorToken.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/parser/CssErrorToken.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssErrorToken.java 8 Apr 2002 21:24:12 -0000 1.2
+++ CssErrorToken.java 8 Sep 2005 12:23:33 -0000 1.3
@@ -4,27 +4,7 @@
//
// (c) COPYRIGHT MIT and INRIA, 1997.
// Please first read the full copyright statement in file COPYRIGHT.html
-/*
- * $Log$
- * Revision 1.2 2002/04/08 21:24:12 plehegar
- * New
- *
- * Revision 2.2 1997/08/20 14:15:13 plehegar
- * Added context and property in CssErrorToken
- *
- * Revision 2.1 1997/08/08 15:50:52 plehegar
- * Freeze
- *
- * Revision 1.3 1997/07/30 13:20:33 plehegar
- * Updated package
- *
- * Revision 1.2 1997/07/21 14:58:57 plehegar
- * Updated
- *
- * Revision 1.1 1997/07/21 14:36:53 plehegar
- * Initial revision
- *
- */
+
package org.w3c.css.parser;
import java.util.Vector;
Index: CssStyle.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/parser/CssStyle.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- CssStyle.java 23 Aug 2005 16:22:54 -0000 1.5
+++ CssStyle.java 8 Sep 2005 12:23:33 -0000 1.6
@@ -4,31 +4,7 @@
//
// (c) COPYRIGHT MIT and INRIA, 1997.
// 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: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
- *
- * Revision 1.2 2002/04/08 21:24:12 plehegar
- * New
- *
- */
+
package org.w3c.css.parser;
import java.util.Enumeration;
Index: CssError.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/parser/CssError.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssError.java 8 Apr 2002 21:24:12 -0000 1.2
+++ CssError.java 8 Sep 2005 12:23:33 -0000 1.3
@@ -4,24 +4,7 @@
//
// (c) COPYRIGHT MIT and INRIA, 1997.
// Please first read the full copyright statement in file COPYRIGHT.html
-/*
- * $Log$
- * Revision 1.2 2002/04/08 21:24:12 plehegar
- * New
- *
- * Revision 2.2 1997/08/11 13:01:41 plehegar
- * *** empty log message ***
- *
- * Revision 1.3 1997/07/30 13:20:31 plehegar
- * Updated package
- *
- * Revision 1.2 1997/07/21 14:59:06 plehegar
- * Updated
- *
- * Revision 1.1 1997/07/21 14:37:24 plehegar
- * Initial revision
- *
- */
+
package org.w3c.css.parser;
/**
Index: CssFouffa.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/parser/CssFouffa.java,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- CssFouffa.java 26 Aug 2005 14:09:49 -0000 1.33
+++ CssFouffa.java 8 Sep 2005 12:23:33 -0000 1.34
@@ -663,7 +663,7 @@
* a list of one or more selectors to be added to the output
* stylesheet
*/
- public void setSelectorList(Vector selectors) {
+ public void setSelectorList(Vector selectors) {
for (Enumeration e = listeners.elements(); e.hasMoreElements();) {
((CssValidatorListener) e.nextElement()).setSelectorList(selectors);
}
Index: CssSelectorsConstant.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/parser/CssSelectorsConstant.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- CssSelectorsConstant.java 25 Jul 2003 10:59:09 -0000 1.7
+++ CssSelectorsConstant.java 8 Sep 2005 12:23:33 -0000 1.8
@@ -5,85 +5,14 @@
//
// (c) COPYRIGHT MIT and INRIA, 1997.
// Please first read the full copyright statement in file COPYRIGHT.html
-/*
- * $Log$
- * Revision 1.7 2003/07/25 10:59:09 sijtsche
- * new CSS3 UI pseudo classes and elements added
- *
- * Revision 1.6 2002/12/20 16:02:31 sijtsche
- * new Basic User Interface pseudo classes and elements
- *
- * Revision 1.5 2002/08/21 09:00:28 sijtsche
- * pseudo element ::marker added
- *
- * Revision 1.4 2002/08/19 07:24:39 sijtsche
- * tv profile restrictions added
- *
- * Revision 1.3 2002/07/22 14:19:06 sijtsche
- * new elements and classes added and order of constants changed because of representation errors in output
- *
- * Revision 1.2 2002/05/23 09:03:47 dejong
- * new elements and classes added and order of constants changed due to representation errors in output
- *
- */
+
package org.w3c.css.parser;
/**
* @version $Revision$
*/
public interface CssSelectorsConstant {
-
- public static final String[] PSEUDOCLASS_CONSTANTS =
- { "link", "visited", "active", "focus", "target",
- "hover", "first-child",
- "enabled", "disabled",
- "checked", "indeterminate", "root", "last-child",
- "first-of-type", "last-of-type", "only-of-type",
- "only-child", "empty", "valid", "invalid", "required",
- "optional", "read-only", "read-write",
- "default", "in-range", "out-of-range"
- };
-
- public static final String[] PSEUDOCLASS_CONSTANTSCSS2 =
- {
- "link", "visited", "active", "target", "focus",
- "hover", "first-child"
- };
-
- public static final String[] PSEUDOCLASS_CONSTANTSTV =
- {
- "link", "visited", "active", "focus", "first-child"
- };
-
- public static final String[] PSEUDOCLASS_CONSTANTSCSS1 =
- {
- "link", "visited", "active", "target"
- };
-
- public static final String[] PSEUDOCLASS_CONSTANTS_MOBILE =
- {
- "link", "visited", "active", "focus"
- };
-
- // lang is special (and not available for mobile profile)
-
- public static final String[] PSEUDOELEMENT_CONSTANTS =
- { "first-line", "first-letter", "before", "after",
- "selection", "marker", "value", "choices", "repeat-item", "repeat-index"
- };
-
- // lang is special, and contains and nth-element and nth-type-of
-
- public static final String[] PSEUDOELEMENT_CONSTANTSCSS2 =
- { "first-line", "first-letter",
- "before", "after"
- };
-
- public static final String[] PSEUDOELEMENT_CONSTANTSCSS1 =
- {
- "first-line", "first-letter"
- };
-
+
/** [lang="fr"] */
public static final int ATTRIBUTE_EXACT = ' ';
/** [lang~="fr"] */
@@ -100,10 +29,10 @@
public static final int ATTRIBUTE_SUFFIX = '$';
/** [foo*="bar"] */
public static final int ATTRIBUTE_SUBSTR = '*';
-
+
/** Maximun of ATTRIBUTE_ONE_OF */
public static final int ATTRIBUTE_LENGTH = 10;
-
+
/** descendant connector */
public static final char DESCENDANT = ' ';
/** child connector */
Index: CssPrinterStyle.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/parser/CssPrinterStyle.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CssPrinterStyle.java 23 Aug 2005 16:22:54 -0000 1.3
+++ CssPrinterStyle.java 8 Sep 2005 12:23:33 -0000 1.4
@@ -4,21 +4,7 @@
//
// (c) COPYRIGHT MIT and INRIA, 1997.
// Please first read the full copyright statement in file COPYRIGHT.html
-/*
- * $Log$
- * Revision 1.3 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.2 2002/04/08 21:24:12 plehegar
- * New
- *
- * Revision 1.1 1997/08/20 11:41:28 plehegar
- * Initial revision
- *
- */
+
package org.w3c.css.parser;
import org.w3c.css.properties.css1.CssProperty;
Index: CssValidatorListener.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/parser/CssValidatorListener.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- CssValidatorListener.java 8 Aug 2005 13:18:11 -0000 1.4
+++ CssValidatorListener.java 8 Sep 2005 12:23:33 -0000 1.5
@@ -4,34 +4,7 @@
//
// (c) COPYRIGHT MIT and INRIA, 1997.
// 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
- *
- * Revision 1.2 2002/04/08 21:24:12 plehegar
- * New
- *
- * Revision 2.1 1997/08/08 15:50:53 plehegar
- * Freeze
- *
- * Revision 1.2 1997/07/30 13:20:34 plehegar
- * Updated package
- *
- * Revision 1.1 1997/07/28 21:35:52 plehegar
- * Initial revision
- *
- */
+
package org.w3c.css.parser;
import java.util.Vector;
Received on Thursday, 8 September 2005 12:24:40 UTC