- 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/css
In directory hutz:/tmp/cvs-serv8236/org/w3c/css/css
Modified Files:
CssCascadingOrder.java CssParser.java StyleSheetGenerator.java
StyleSheetGeneratorHTML.java StyleSheetOrigin.java
StyleSheetParser.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: CssParser.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/css/CssParser.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- CssParser.java 8 Aug 2005 13:18:04 -0000 1.4
+++ CssParser.java 8 Sep 2005 12:23:33 -0000 1.5
@@ -4,25 +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:04 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:02 plehegar
- * Removed HttpServletResponse import
- *
- * Revision 1.2 2002/04/08 21:16:38 plehegar
- * New
- *
- */
+
package org.w3c.css.css;
import java.io.IOException;
Index: StyleSheetOrigin.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/css/StyleSheetOrigin.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- StyleSheetOrigin.java 8 Apr 2002 21:16:38 -0000 1.2
+++ StyleSheetOrigin.java 8 Sep 2005 12:23:33 -0000 1.3
@@ -4,12 +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:16:38 plehegar
- * New
- *
- */
+
package org.w3c.css.css;
/**
Index: StyleSheetGeneratorHTML.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/css/StyleSheetGeneratorHTML.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- StyleSheetGeneratorHTML.java 23 Aug 2005 16:22:54 -0000 1.4
+++ StyleSheetGeneratorHTML.java 8 Sep 2005 12:23:33 -0000 1.5
@@ -4,26 +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/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)
- *
- * Revision 1.2 2002/05/19 04:16:31 plehegar
- * Replaced the email address
- *
- * Revision 1.1 2002/03/13 19:55:01 plehegar
- * New
- *
- *
- * @@HACK
- */
+
package org.w3c.css.css;
import java.io.FileNotFoundException;
Index: CssCascadingOrder.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/css/CssCascadingOrder.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- CssCascadingOrder.java 23 Aug 2005 16:22:54 -0000 1.4
+++ CssCascadingOrder.java 8 Sep 2005 12:23:33 -0000 1.5
@@ -4,43 +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/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:
- *
- * 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:16:38 plehegar
- * New
- *
- * Revision 1.5 1997/08/26 14:25:19 plehegar
- * Optimized
- *
- * Revision 1.4 1997/08/25 14:06:21 plehegar
- * Minor bug line 35
- *
- * Revision 1.3 1997/08/25 12:50:23 plehegar
- * Bug
- *
- * Revision 1.2 1997/08/22 16:37:56 plehegar
- * Updated
- *
- * Revision 1.1 1997/08/22 14:53:56 plehegar
- * Initial revision
- *
- */
+
package org.w3c.css.css;
import java.util.Enumeration;
@@ -150,10 +114,9 @@
*/
public CssProperty order(CssProperty property,
StyleSheet style, CssSelectors selector) {
- int i = 0;
+ //int i = 0;
propertyData = new CssProperty[10];
propertyCount = 0;
-
Util.verbose("CASCADING ORDER " + property.getPropertyName()
+ " in " + selector);
@@ -164,7 +127,7 @@
Util.verbose("######## test with " + context
+ " and " + selector);
- // if (!selector.equals(context) && context.canApply(selector)) {
+ // if (!selector.equals(context) && context.canApply(selector)) {
if (context.canApply(selector)) {
// here, don't try to resolve
CssProperty prop =
Index: StyleSheetGenerator.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/css/StyleSheetGenerator.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- StyleSheetGenerator.java 23 Aug 2005 16:22:54 -0000 1.4
+++ StyleSheetGenerator.java 8 Sep 2005 12:23:33 -0000 1.5
@@ -4,51 +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/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)
- *
- * Revision 1.2 2002/04/08 21:16:38 plehegar
- * New
- *
- * Revision 1.2 1998/02/25 09:25:40 plehegar
- * Freeze
- *
- * Revision 1.1 1998/01/08 18:46:51 plehegar
- * Initial revision
- *
- * Revision 3.2 1997/09/09 12:42:01 plehegar
- * Updates
- *
- * Revision 3.1 1997/08/29 13:23:27 plehegar
- * Freeze
- *
- * Revision 1.6 1997/08/22 14:55:24 plehegar
- * Updated
- *
- * Revision 1.5 1997/08/21 07:28:55 plehegar
- * Added StyleSheet
- *
- * Revision 1.4 1997/08/20 14:14:10 plehegar
- * Added context and property in CssErrorToken
- *
- * Revision 1.3 1997/08/20 13:15:31 plehegar
- * Added HTMl design by Thierry Kormann
- *
- * Revision 1.2 1997/08/20 11:42:10 plehegar
- * Freeze
- *
- * Revision 1.1 1997/08/11 08:05:33 plehegar
- * Initial revision
- *
- */
+
package org.w3c.css.css;
import java.io.FileNotFoundException;
Index: StyleSheetParser.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/css/StyleSheetParser.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- StyleSheetParser.java 26 Aug 2005 14:09:49 -0000 1.6
+++ StyleSheetParser.java 8 Sep 2005 12:23:33 -0000 1.7
@@ -4,55 +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/26 14:09:49 ylafon
- * All changes made by Jean-Guilhem Rouel:
- *
- * Fix for bugs: 1269, 979, 791, 777, 776, 767, 765, 763, 576, 363
- *
- * Errors in font, the handling of 'transparent', CSS Parser reinits...
- *
- * http://www.w3.org/Bugs/Public/show_bug.cgi?id=1269
- * http://www.w3.org/Bugs/Public/show_bug.cgi?id=979
- * http://www.w3.org/Bugs/Public/show_bug.cgi?id=791
- * http://www.w3.org/Bugs/Public/show_bug.cgi?id=777
- * http://www.w3.org/Bugs/Public/show_bug.cgi?id=776
- * http://www.w3.org/Bugs/Public/show_bug.cgi?id=767
- * http://www.w3.org/Bugs/Public/show_bug.cgi?id=765
- * http://www.w3.org/Bugs/Public/show_bug.cgi?id=763
- * http://www.w3.org/Bugs/Public/show_bug.cgi?id=576
- * http://www.w3.org/Bugs/Public/show_bug.cgi?id=363
- *
- * 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:
- *
- * 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 2005/07/22 09:45:18 ylafon
- * Added code for error Handling (Jean-Guilhem Rouel)
- *
- * Revision 1.2 2002/04/08 21:16:38 plehegar
- * New
- *
- * Revision 3.1 1997/08/29 13:23:27 plehegar
- * Freeze
- *
- * Revision 1.1 1997/08/21 07:26:37 plehegar
- * Initial revision
- *
- */
package org.w3c.css.css;
@@ -75,6 +26,7 @@
import org.w3c.css.parser.Errors;
import org.w3c.css.parser.analyzer.TokenMgrError;
import org.w3c.css.properties.css1.CssProperty;
+import org.w3c.css.selectors.IdSelector;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.util.Util;
@@ -362,7 +314,7 @@
} catch (InvalidParamException e) {} //ignore
try {
- selector.addAttribute("id", id.substring(1));
+ selector.addId(new IdSelector(id.substring(1)));;
} catch (InvalidParamException e) {
style.removeThisRule();
ac.getFrame().addError(new CssError(e));
Received on Thursday, 8 September 2005 12:24:53 UTC