- From: Yves Lafon via cvs-syncmail <cvsmail@w3.org>
- Date: Mon, 08 Aug 2005 13:19:36 +0000
- To: www-validator-cvs@w3.org
Update of /sources/public/2002/css-validator/org/w3c/css/table
In directory hutz:/tmp/cvs-serv27412/org/w3c/css/table
Modified Files:
BorderCollapse.java BorderCollapseATSC.java BorderSpacing.java
BorderSpacingATSC.java CaptionSide.java ColumnSpan.java
ColumnSpanATSC.java Css2Style.java EmptyCells.java
EmptyCellsATSC.java RowSpan.java RowSpanATSC.java
SpeakHeader.java SpeakHeaderATSC.java TableLayout.java
TableLayoutATSC.java TableProperties.java
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: Css2Style.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/table/Css2Style.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Css2Style.java 25 Jul 2002 07:41:57 -0000 1.3
+++ Css2Style.java 8 Aug 2005 13:19:34 -0000 1.4
@@ -8,11 +8,8 @@
*/
package org.w3c.css.table;
-import java.util.Enumeration;
-
-import org.w3c.css.util.Warnings;
-import org.w3c.css.parser.CssPrinterStyle;
import org.w3c.css.aural.ACssStyle;
+import org.w3c.css.parser.CssPrinterStyle;
/**
* @version $Revision$
Index: RowSpanATSC.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/table/RowSpanATSC.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- RowSpanATSC.java 8 Apr 2002 21:18:23 -0000 1.2
+++ RowSpanATSC.java 8 Aug 2005 13:19:34 -0000 1.3
@@ -9,13 +9,13 @@
package org.w3c.css.table;
-import org.w3c.css.properties.CssProperty;
import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.CssProperty;
+import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
-import org.w3c.css.values.CssValue;
import org.w3c.css.values.CssNumber;
-import org.w3c.css.util.InvalidParamException;
-import org.w3c.css.util.ApplContext;
+import org.w3c.css.values.CssValue;
/**
@@ -37,7 +37,13 @@
* @param expression the expression of the size
* @exception InvalidParamException The expression is incorrect
*/
- public RowSpanATSC(ApplContext ac, CssExpression expression) throws InvalidParamException {
+ public RowSpanATSC(ApplContext ac, CssExpression expression,
+ boolean check) throws InvalidParamException {
+
+ if(check && expression.getCount() > 1) {
+ throw new InvalidParamException("unrecognize", ac);
+ }
+
CssValue val = expression.getValue();
setByUser();
@@ -62,6 +68,11 @@
throw new InvalidParamException("value", val.toString(), getPropertyName(), ac);
}
+ public RowSpanATSC(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Returns the current value
*/
Index: TableProperties.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/table/TableProperties.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- TableProperties.java 12 Jul 2005 14:47:55 -0000 1.3
+++ TableProperties.java 8 Aug 2005 13:19:34 -0000 1.4
@@ -15,26 +15,26 @@
* @version $Revision$
*/
public class TableProperties {
- public static Utf8Properties properties;
-
- public static String getString(CssProperty property, String prop) {
- return properties.getProperty(property.getPropertyName() + "." + prop);
- }
+ public static Utf8Properties properties;
- public static boolean getInheritance(CssProperty property) {
- return getString(property, "inherited").equals("true");
- }
+ public static String getString(CssProperty property, String prop) {
+ return properties.getProperty(property.getPropertyName() + "." + prop);
+ }
+
+ public static boolean getInheritance(CssProperty property) {
+ return getString(property, "inherited").equals("true");
+ }
- static {
- properties = new Utf8Properties();
- try {
- URL url = TableProperties.class
- .getResource("TableDefault.properties");
- properties.load(url.openStream());
- } catch (Exception e) {
- System.err
- .println("org.w3c.css.table.TableProperties: couldn't load properties ");
- System.err.println(" " + e.toString());
+ static {
+ properties = new Utf8Properties();
+ try {
+ URL url = TableProperties.class
+ .getResource("TableDefault.properties");
+ properties.load(url.openStream());
+ } catch (Exception e) {
+ System.err
+ .println("org.w3c.css.table.TableProperties: couldn't load properties ");
+ System.err.println(" " + e.toString());
+ }
}
- }
}
Index: BorderSpacingATSC.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/table/BorderSpacingATSC.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- BorderSpacingATSC.java 8 Apr 2002 21:18:23 -0000 1.2
+++ BorderSpacingATSC.java 8 Aug 2005 13:19:34 -0000 1.3
@@ -9,15 +9,15 @@
package org.w3c.css.table;
-import org.w3c.css.properties.CssProperty;
import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.CssProperty;
+import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
-import org.w3c.css.values.CssValue;
import org.w3c.css.values.CssLength;
import org.w3c.css.values.CssNumber;
import org.w3c.css.values.CssOperator;
-import org.w3c.css.util.InvalidParamException;
-import org.w3c.css.util.ApplContext;
+import org.w3c.css.values.CssValue;
/**
@@ -40,7 +40,13 @@
* @param expression the expression of the size
* @exception InvalidParamException The expression is incorrect
*/
- public BorderSpacingATSC(ApplContext ac, CssExpression expression) throws InvalidParamException {
+ public BorderSpacingATSC(ApplContext ac, CssExpression expression,
+ boolean check) throws InvalidParamException {
+
+ if(check && expression.getCount() > 2) {
+ throw new InvalidParamException("unrecognize", ac);
+ }
+
CssValue val = expression.getValue();
CssLength le = getLength(val);
setByUser();
@@ -48,11 +54,17 @@
ac.getFrame().addWarning("atsc", val.toString());
if (val.equals(inherit)) {
+ if(expression.getCount() > 1) {
+ throw new InvalidParamException("unrecognize", ac);
+ }
value = inherit;
} else if (le != null) {
value = le;
if (expression.getOperator() == SPACE) {
expression.next();
+ if(expression.getValue().equals(inherit)) {
+ throw new InvalidParamException("unrecognize", ac);
+ }
le = getLength(expression.getValue());
if (le != null) {
second = le;
@@ -70,6 +82,11 @@
expression.next();
}
+ public BorderSpacingATSC(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Returns the current value
*/
Index: RowSpan.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/table/RowSpan.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- RowSpan.java 8 Apr 2002 21:18:23 -0000 1.2
+++ RowSpan.java 8 Aug 2005 13:19:34 -0000 1.3
@@ -9,13 +9,13 @@
package org.w3c.css.table;
-import org.w3c.css.properties.CssProperty;
import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.CssProperty;
+import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
-import org.w3c.css.values.CssValue;
import org.w3c.css.values.CssNumber;
-import org.w3c.css.util.InvalidParamException;
-import org.w3c.css.util.ApplContext;
+import org.w3c.css.values.CssValue;
/**
@@ -37,7 +37,13 @@
* @param expression the expression of the size
* @exception InvalidParamException The expression is incorrect
*/
- public RowSpan(ApplContext ac, CssExpression expression) throws InvalidParamException {
+ public RowSpan(ApplContext ac, CssExpression expression,
+ boolean check) throws InvalidParamException {
+
+ if(check && expression.getCount() > 1) {
+ throw new InvalidParamException("unrecognize", ac);
+ }
+
CssValue val = expression.getValue();
setByUser();
@@ -60,6 +66,11 @@
throw new InvalidParamException("value", val.toString(), getPropertyName(), ac);
}
+ public RowSpan(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Returns the current value
*/
Index: BorderCollapse.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/table/BorderCollapse.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- BorderCollapse.java 8 Apr 2002 21:18:23 -0000 1.2
+++ BorderCollapse.java 8 Aug 2005 13:19:34 -0000 1.3
@@ -9,13 +9,13 @@
package org.w3c.css.table;
-import org.w3c.css.properties.CssProperty;
import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.CssProperty;
+import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
-import org.w3c.css.values.CssValue;
import org.w3c.css.values.CssIdent;
-import org.w3c.css.util.InvalidParamException;
-import org.w3c.css.util.ApplContext;
+import org.w3c.css.values.CssValue;
/**
@@ -40,7 +40,13 @@
* @param expression the expression of the size
* @exception InvalidParamException The expression is incorrect
*/
- public BorderCollapse(ApplContext ac, CssExpression expression) throws InvalidParamException {
+ public BorderCollapse(ApplContext ac, CssExpression expression,
+ boolean check) throws InvalidParamException {
+
+ if(check && expression.getCount() > 1) {
+ throw new InvalidParamException("unrecognize", ac);
+ }
+
CssValue val = expression.getValue();
setByUser();
@@ -59,6 +65,11 @@
expression.next();
}
+ public BorderCollapse(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Returns the current value
*/
Index: BorderCollapseATSC.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/table/BorderCollapseATSC.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- BorderCollapseATSC.java 8 Apr 2002 21:18:23 -0000 1.2
+++ BorderCollapseATSC.java 8 Aug 2005 13:19:34 -0000 1.3
@@ -9,13 +9,13 @@
package org.w3c.css.table;
-import org.w3c.css.properties.CssProperty;
import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.CssProperty;
+import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
-import org.w3c.css.values.CssValue;
import org.w3c.css.values.CssIdent;
-import org.w3c.css.util.InvalidParamException;
-import org.w3c.css.util.ApplContext;
+import org.w3c.css.values.CssValue;
/**
@@ -40,7 +40,13 @@
* @param expression the expression of the size
* @exception InvalidParamException The expression is incorrect
*/
- public BorderCollapseATSC(ApplContext ac, CssExpression expression) throws InvalidParamException {
+ public BorderCollapseATSC(ApplContext ac, CssExpression expression,
+ boolean check) throws InvalidParamException {
+
+ if(check && expression.getCount() > 1) {
+ throw new InvalidParamException("unrecognize", ac);
+ }
+
CssValue val = expression.getValue();
setByUser();
@@ -61,6 +67,11 @@
expression.next();
}
+ public BorderCollapseATSC(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Returns the current value
*/
Index: TableLayout.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/table/TableLayout.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- TableLayout.java 8 Apr 2002 21:18:23 -0000 1.2
+++ TableLayout.java 8 Aug 2005 13:19:34 -0000 1.3
@@ -9,13 +9,13 @@
package org.w3c.css.table;
-import org.w3c.css.properties.CssProperty;
import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.CssProperty;
+import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
-import org.w3c.css.values.CssValue;
import org.w3c.css.values.CssIdent;
-import org.w3c.css.util.InvalidParamException;
-import org.w3c.css.util.ApplContext;
+import org.w3c.css.values.CssValue;
/**
@@ -40,7 +40,13 @@
* @param expression the expression of the size
* @exception InvalidParamException The expression is incorrect
*/
- public TableLayout(ApplContext ac, CssExpression expression) throws InvalidParamException {
+ public TableLayout(ApplContext ac, CssExpression expression,
+ boolean check) throws InvalidParamException {
+
+ if(check && expression.getCount() > 1) {
+ throw new InvalidParamException("unrecognize", ac);
+ }
+
CssValue val = expression.getValue();
setByUser();
@@ -59,6 +65,11 @@
expression.next();
}
+ public TableLayout(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Returns the current value
*/
Index: BorderSpacing.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/table/BorderSpacing.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- BorderSpacing.java 8 Apr 2002 21:18:23 -0000 1.2
+++ BorderSpacing.java 8 Aug 2005 13:19:34 -0000 1.3
@@ -9,15 +9,15 @@
package org.w3c.css.table;
-import org.w3c.css.properties.CssProperty;
import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.CssProperty;
+import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
-import org.w3c.css.values.CssValue;
import org.w3c.css.values.CssLength;
import org.w3c.css.values.CssNumber;
import org.w3c.css.values.CssOperator;
-import org.w3c.css.util.InvalidParamException;
-import org.w3c.css.util.ApplContext;
+import org.w3c.css.values.CssValue;
/**
@@ -40,17 +40,30 @@
* @param expression the expression of the size
* @exception InvalidParamException The expression is incorrect
*/
- public BorderSpacing(ApplContext ac, CssExpression expression) throws InvalidParamException {
+ public BorderSpacing(ApplContext ac, CssExpression expression,
+ boolean check) throws InvalidParamException {
+
+ if(check && expression.getCount() > 2) {
+ throw new InvalidParamException("unrecognize", ac);
+ }
+
CssValue val = expression.getValue();
CssLength le = getLength(val);
setByUser();
if (val.equals(inherit)) {
+ if(expression.getCount() > 1) {
+ throw new InvalidParamException("unrecognize", ac);
+ }
value = inherit;
} else if (le != null) {
value = le;
- if (expression.getOperator() == SPACE) {
- expression.next();
+ if (expression.getOperator() == SPACE) {
+ expression.next();
+ val = expression.getValue();
+ if(val != null && val.equals(inherit)) {
+ throw new InvalidParamException("unrecognize", ac);
+ }
le = getLength(expression.getValue());
if (le != null) {
second = le;
@@ -68,6 +81,11 @@
expression.next();
}
+ public BorderSpacing(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Returns the current value
*/
Index: ColumnSpanATSC.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/table/ColumnSpanATSC.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ColumnSpanATSC.java 8 Apr 2002 21:18:23 -0000 1.2
+++ ColumnSpanATSC.java 8 Aug 2005 13:19:34 -0000 1.3
@@ -9,13 +9,13 @@
package org.w3c.css.table;
-import org.w3c.css.properties.CssProperty;
import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.CssProperty;
+import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
-import org.w3c.css.values.CssValue;
import org.w3c.css.values.CssNumber;
-import org.w3c.css.util.InvalidParamException;
-import org.w3c.css.util.ApplContext;
+import org.w3c.css.values.CssValue;
/**
@@ -37,7 +37,13 @@
* @param expression the expression of the size
* @exception InvalidParamException The expression is incorrect
*/
- public ColumnSpanATSC(ApplContext ac, CssExpression expression) throws InvalidParamException {
+ public ColumnSpanATSC(ApplContext ac, CssExpression expression,
+ boolean check) throws InvalidParamException {
+
+ if(check && expression.getCount() > 1) {
+ throw new InvalidParamException("unrecognize", ac);
+ }
+
CssValue val = expression.getValue();
setByUser();
@@ -62,6 +68,11 @@
throw new InvalidParamException("value", val.toString(), getPropertyName(), ac);
}
+ public ColumnSpanATSC(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Returns the current value
*/
Index: SpeakHeaderATSC.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/table/SpeakHeaderATSC.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- SpeakHeaderATSC.java 8 Apr 2002 21:18:23 -0000 1.2
+++ SpeakHeaderATSC.java 8 Aug 2005 13:19:34 -0000 1.3
@@ -9,13 +9,13 @@
package org.w3c.css.table;
-import org.w3c.css.properties.CssProperty;
import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.CssProperty;
+import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
-import org.w3c.css.values.CssValue;
import org.w3c.css.values.CssIdent;
-import org.w3c.css.util.InvalidParamException;
-import org.w3c.css.util.ApplContext;
+import org.w3c.css.values.CssValue;
/**
@@ -40,7 +40,13 @@
* @param expression the expression of the size
* @exception InvalidParamException The expression is incorrect
*/
- public SpeakHeaderATSC(ApplContext ac, CssExpression expression) throws InvalidParamException {
+ public SpeakHeaderATSC(ApplContext ac, CssExpression expression,
+ boolean check) throws InvalidParamException {
+
+ if(check && expression.getCount() > 1) {
+ throw new InvalidParamException("unrecognize", ac);
+ }
+
CssValue val = expression.getValue();
setByUser();
@@ -61,6 +67,11 @@
expression.next();
}
+ public SpeakHeaderATSC(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Returns the current value
*/
Index: ColumnSpan.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/table/ColumnSpan.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ColumnSpan.java 8 Apr 2002 21:18:23 -0000 1.2
+++ ColumnSpan.java 8 Aug 2005 13:19:34 -0000 1.3
@@ -9,13 +9,13 @@
package org.w3c.css.table;
-import org.w3c.css.properties.CssProperty;
import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.CssProperty;
+import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
-import org.w3c.css.values.CssValue;
import org.w3c.css.values.CssNumber;
-import org.w3c.css.util.InvalidParamException;
-import org.w3c.css.util.ApplContext;
+import org.w3c.css.values.CssValue;
/**
@@ -37,7 +37,13 @@
* @param expression the expression of the size
* @exception InvalidParamException The expression is incorrect
*/
- public ColumnSpan(ApplContext ac, CssExpression expression) throws InvalidParamException {
+ public ColumnSpan(ApplContext ac, CssExpression expression,
+ boolean check) throws InvalidParamException {
+
+ if(check && expression.getCount() > 1) {
+ throw new InvalidParamException("unrecognize", ac);
+ }
+
CssValue val = expression.getValue();
setByUser();
@@ -60,6 +66,11 @@
throw new InvalidParamException("value", val.toString(), getPropertyName(), ac);
}
+ public ColumnSpan(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Returns the current value
*/
Index: TableLayoutATSC.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/table/TableLayoutATSC.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- TableLayoutATSC.java 8 Apr 2002 21:18:23 -0000 1.2
+++ TableLayoutATSC.java 8 Aug 2005 13:19:34 -0000 1.3
@@ -9,13 +9,13 @@
package org.w3c.css.table;
-import org.w3c.css.properties.CssProperty;
import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.CssProperty;
+import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
-import org.w3c.css.values.CssValue;
import org.w3c.css.values.CssIdent;
-import org.w3c.css.util.InvalidParamException;
-import org.w3c.css.util.ApplContext;
+import org.w3c.css.values.CssValue;
/**
@@ -40,7 +40,13 @@
* @param expression the expression of the size
* @exception InvalidParamException The expression is incorrect
*/
- public TableLayoutATSC(ApplContext ac, CssExpression expression) throws InvalidParamException {
+ public TableLayoutATSC(ApplContext ac, CssExpression expression,
+ boolean check) throws InvalidParamException {
+
+ if(check && expression.getCount() > 1) {
+ throw new InvalidParamException("unrecognize", ac);
+ }
+
CssValue val = expression.getValue();
setByUser();
@@ -61,6 +67,11 @@
expression.next();
}
+ public TableLayoutATSC(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Returns the current value
*/
Index: SpeakHeader.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/table/SpeakHeader.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- SpeakHeader.java 8 Apr 2002 21:18:23 -0000 1.2
+++ SpeakHeader.java 8 Aug 2005 13:19:34 -0000 1.3
@@ -9,13 +9,13 @@
package org.w3c.css.table;
-import org.w3c.css.properties.CssProperty;
import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.CssProperty;
+import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
-import org.w3c.css.values.CssValue;
import org.w3c.css.values.CssIdent;
-import org.w3c.css.util.InvalidParamException;
-import org.w3c.css.util.ApplContext;
+import org.w3c.css.values.CssValue;
/**
@@ -40,7 +40,13 @@
* @param expression the expression of the size
* @exception InvalidParamException The expression is incorrect
*/
- public SpeakHeader(ApplContext ac, CssExpression expression) throws InvalidParamException {
+ public SpeakHeader(ApplContext ac, CssExpression expression,
+ boolean check) throws InvalidParamException {
+
+ if(check && expression.getCount() > 1) {
+ throw new InvalidParamException("unrecognize", ac);
+ }
+
CssValue val = expression.getValue();
setByUser();
@@ -59,6 +65,11 @@
expression.next();
}
+ public SpeakHeader(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Returns the current value
*/
Index: CaptionSide.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/table/CaptionSide.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CaptionSide.java 8 Apr 2002 21:18:23 -0000 1.2
+++ CaptionSide.java 8 Aug 2005 13:19:34 -0000 1.3
@@ -9,13 +9,13 @@
package org.w3c.css.table;
-import org.w3c.css.properties.CssProperty;
import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.CssProperty;
+import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
-import org.w3c.css.values.CssValue;
import org.w3c.css.values.CssIdent;
-import org.w3c.css.util.InvalidParamException;
-import org.w3c.css.util.ApplContext;
+import org.w3c.css.values.CssValue;
/**
@@ -42,7 +42,13 @@
* @param expression the expression of the size
* @exception InvalidParamException The expression is incorrect
*/
- public CaptionSide(ApplContext ac, CssExpression expression) throws InvalidParamException {
+ public CaptionSide(ApplContext ac, CssExpression expression, boolean check)
+ throws InvalidParamException {
+
+ if(check && expression.getCount() > 1) {
+ throw new InvalidParamException("unrecognize", ac);
+ }
+
CssValue val = expression.getValue();
setByUser();
@@ -65,6 +71,11 @@
expression.next();
}
+ public CaptionSide(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Returns the current value
*/
Index: EmptyCellsATSC.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/table/EmptyCellsATSC.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- EmptyCellsATSC.java 8 Apr 2002 21:18:23 -0000 1.2
+++ EmptyCellsATSC.java 8 Aug 2005 13:19:34 -0000 1.3
@@ -9,13 +9,13 @@
package org.w3c.css.table;
-import org.w3c.css.properties.CssProperty;
import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.CssProperty;
+import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
-import org.w3c.css.values.CssValue;
import org.w3c.css.values.CssIdent;
-import org.w3c.css.util.InvalidParamException;
-import org.w3c.css.util.ApplContext;
+import org.w3c.css.values.CssValue;
/**
@@ -40,7 +40,13 @@
* @param expression the expression of the size
* @exception InvalidParamException The expression is incorrect
*/
- public EmptyCellsATSC(ApplContext ac, CssExpression expression) throws InvalidParamException {
+ public EmptyCellsATSC(ApplContext ac, CssExpression expression,
+ boolean check) throws InvalidParamException {
+
+ if(check && expression.getCount() > 1) {
+ throw new InvalidParamException("unrecognize", ac);
+ }
+
CssValue val = expression.getValue();
setByUser();
@@ -61,6 +67,11 @@
expression.next();
}
+ public EmptyCellsATSC(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Returns the current value
*/
Index: EmptyCells.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/table/EmptyCells.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- EmptyCells.java 8 Apr 2002 21:18:23 -0000 1.2
+++ EmptyCells.java 8 Aug 2005 13:19:34 -0000 1.3
@@ -9,13 +9,13 @@
package org.w3c.css.table;
-import org.w3c.css.properties.CssProperty;
import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.CssProperty;
+import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
-import org.w3c.css.values.CssValue;
import org.w3c.css.values.CssIdent;
-import org.w3c.css.util.InvalidParamException;
-import org.w3c.css.util.ApplContext;
+import org.w3c.css.values.CssValue;
/**
@@ -40,7 +40,13 @@
* @param expression the expression of the size
* @exception InvalidParamException The expression is incorrect
*/
- public EmptyCells(ApplContext ac, CssExpression expression) throws InvalidParamException {
+ public EmptyCells(ApplContext ac, CssExpression expression,
+ boolean check) throws InvalidParamException {
+
+ if(check && expression.getCount() > 1) {
+ throw new InvalidParamException("unrecognize", ac);
+ }
+
CssValue val = expression.getValue();
setByUser();
@@ -59,6 +65,11 @@
expression.next();
}
+ public EmptyCells(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Returns the current value
*/
Received on Monday, 8 August 2005 13:20:19 UTC