- 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/paged
In directory hutz:/tmp/cvs-serv27412/org/w3c/css/paged
Modified Files:
Css2Style.java Marks.java Orphans.java OrphansATSC.java
Page.java PageATSC.java PageBreakAfter.java
PageBreakAfterATSC.java PageBreakBefore.java
PageBreakBeforeATSC.java PageBreakInside.java
PageBreakInsideATSC.java Size.java Widows.java WidowsATSC.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/paged/Css2Style.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Css2Style.java 8 Apr 2002 21:17:20 -0000 1.2
+++ Css2Style.java 8 Aug 2005 13:18:11 -0000 1.3
@@ -8,9 +8,6 @@
*/
package org.w3c.css.paged;
-import java.util.Enumeration;
-
-import org.w3c.css.util.Warnings;
import org.w3c.css.parser.CssPrinterStyle;
Index: WidowsATSC.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/paged/WidowsATSC.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- WidowsATSC.java 8 Apr 2002 21:17:21 -0000 1.2
+++ WidowsATSC.java 8 Aug 2005 13:18:11 -0000 1.3
@@ -9,13 +9,13 @@
package org.w3c.css.paged;
-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 WidowsATSC(ApplContext ac, CssExpression expression) throws InvalidParamException {
+ public WidowsATSC(ApplContext ac, CssExpression expression,
+ boolean check) throws InvalidParamException {
+
+ if(check && expression.getCount() > 1) {
+ throw new InvalidParamException("unrecognize", ac);
+ }
+
CssValue val = expression.getValue();
setByUser();
@@ -64,6 +70,11 @@
getPropertyName(), ac);
}
+ public WidowsATSC(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Returns the current value
*/
Index: Marks.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/paged/Marks.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Marks.java 8 Apr 2002 21:17:20 -0000 1.2
+++ Marks.java 8 Aug 2005 13:18:11 -0000 1.3
@@ -7,18 +7,16 @@
/*
*/
package org.w3c.css.paged;
-import java.util.Vector;
-
-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.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;
/**
* @version $Revision$
@@ -45,18 +43,29 @@
* @param expression The expression for this property
* @exception InvalidParamException Values are incorrect
*/
- public Marks(ApplContext ac, CssExpression expression)
+ public Marks(ApplContext ac, CssExpression expression, boolean check)
throws InvalidParamException {
+
+ if(check && expression.getCount() > 2) {
+ throw new InvalidParamException("unrecognize", ac);
+ }
+
CssValue val = expression.getValue();
char op = expression.getOperator();
setByUser();
if (val.equals(inherit)) {
+ if(expression.getCount() > 1) {
+ throw new InvalidParamException("unrecognize", ac);
+ }
l1 = inherit;
expression.next();
return;
} else if (val.equals(none)) {
+ if(expression.getCount() > 1) {
+ throw new InvalidParamException("unrecognize", ac);
+ }
l1 = none;
expression.next();
return;
@@ -98,6 +107,11 @@
val.toString(), getPropertyName(), ac);
}
+ public Marks(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Returns the value of this property
*/
Index: PageBreakBefore.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/paged/PageBreakBefore.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- PageBreakBefore.java 8 Apr 2002 21:17:21 -0000 1.2
+++ PageBreakBefore.java 8 Aug 2005 13:18:11 -0000 1.3
@@ -7,17 +7,14 @@
/*
*/
package org.w3c.css.paged;
-import java.util.Vector;
-
-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.values.CssURL;
import org.w3c.css.values.CssOperator;
-import org.w3c.css.util.InvalidParamException;
-import org.w3c.css.util.ApplContext;
+import org.w3c.css.values.CssValue;
/**
* @version $Revision$
@@ -46,10 +43,15 @@
* @param expression The expression for this property
* @exception InvalidParamException Values are incorrect
*/
- public PageBreakBefore(ApplContext ac, CssExpression expression)
- throws InvalidParamException {
+ public PageBreakBefore(ApplContext ac, CssExpression expression,
+ boolean check) throws InvalidParamException {
+
+ if(check && expression.getCount() > 1) {
+ throw new InvalidParamException("unrecognize", ac);
+ }
+
CssValue val = expression.getValue();
- char op = expression.getOperator();
+// char op = expression.getOperator();
setByUser();
@@ -69,6 +71,11 @@
val.toString(), getPropertyName(), ac);
}
+ public PageBreakBefore(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Returns the value of this property
*/
Index: Size.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/paged/Size.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Size.java 8 Apr 2002 21:17:21 -0000 1.2
+++ Size.java 8 Aug 2005 13:18:11 -0000 1.3
@@ -7,18 +7,16 @@
/*
*/
package org.w3c.css.paged;
-import java.util.Vector;
-
-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.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;
/**
* @version $Revision$
@@ -45,26 +43,43 @@
* @param expression The expression for this property
* @exception InvalidParamException Values are incorrect
*/
- public Size(ApplContext ac, CssExpression expression)
+ public Size(ApplContext ac, CssExpression expression, boolean check)
throws InvalidParamException {
+
+ if(check && expression.getCount() > 2) {
+ throw new InvalidParamException("unrecognize", ac);
+ }
+
CssValue val = expression.getValue();
char op = expression.getOperator();
setByUser();
if (val.equals(inherit)) {
+ if(expression.getCount() > 1) {
+ throw new InvalidParamException("unrecognize", ac);
+ }
l1 = inherit;
expression.next();
return;
} else if (val.equals(auto)) {
+ if(expression.getCount() > 1) {
+ throw new InvalidParamException("unrecognize", ac);
+ }
l1 = auto;
expression.next();
return;
} else if (val.equals(portrait)) {
+ if(expression.getCount() > 1) {
+ throw new InvalidParamException("unrecognize", ac);
+ }
l1 = portrait;
expression.next();
return;
} else if (val.equals(landscape)) {
+ if(expression.getCount() > 1) {
+ throw new InvalidParamException("unrecognize", ac);
+ }
l1 = landscape;
expression.next();
return;
@@ -75,6 +90,9 @@
l1 = val;
expression.next();
if (!expression.end()) {
+ if(expression.getValue().equals(inherit)) {
+ throw new InvalidParamException("unrecognize", ac);
+ }
val = getLength(expression.getValue());
if ((val == null)
|| (op != SPACE)) {
@@ -96,6 +114,11 @@
}
}
+ public Size(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Returns the value of this property
*/
Index: PageBreakAfter.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/paged/PageBreakAfter.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- PageBreakAfter.java 8 Apr 2002 21:17:21 -0000 1.2
+++ PageBreakAfter.java 8 Aug 2005 13:18:11 -0000 1.3
@@ -7,17 +7,14 @@
/*
*/
package org.w3c.css.paged;
-import java.util.Vector;
-
-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.values.CssURL;
import org.w3c.css.values.CssOperator;
-import org.w3c.css.util.InvalidParamException;
-import org.w3c.css.util.ApplContext;
+import org.w3c.css.values.CssValue;
/**
* @version $Revision$
@@ -46,10 +43,15 @@
* @param expression The expression for this property
* @exception InvalidParamException Values are incorrect
*/
- public PageBreakAfter(ApplContext ac, CssExpression expression)
- throws InvalidParamException {
+ public PageBreakAfter(ApplContext ac, CssExpression expression,
+ boolean check) throws InvalidParamException {
+
+ if(check && expression.getCount() > 1) {
+ throw new InvalidParamException("unrecognize", ac);
+ }
+
CssValue val = expression.getValue();
- char op = expression.getOperator();
+// char op = expression.getOperator();
setByUser();
@@ -69,6 +71,11 @@
val.toString(), getPropertyName(), ac);
}
+ public PageBreakAfter(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Returns the value of this property
*/
Index: PageBreakInside.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/paged/PageBreakInside.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- PageBreakInside.java 8 Apr 2002 21:17:21 -0000 1.2
+++ PageBreakInside.java 8 Aug 2005 13:18:11 -0000 1.3
@@ -7,17 +7,14 @@
/*
*/
package org.w3c.css.paged;
-import java.util.Vector;
-
-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.values.CssURL;
import org.w3c.css.values.CssOperator;
-import org.w3c.css.util.InvalidParamException;
-import org.w3c.css.util.ApplContext;
+import org.w3c.css.values.CssValue;
/**
* @version $Revision$
@@ -46,10 +43,15 @@
* @param expression The expression for this property
* @exception InvalidParamException Values are incorrect
*/
- public PageBreakInside(ApplContext ac, CssExpression expression)
- throws InvalidParamException {
+ public PageBreakInside(ApplContext ac, CssExpression expression,
+ boolean check) throws InvalidParamException {
+
+ if(check && expression.getCount() > 1) {
+ throw new InvalidParamException("unrecognize", ac);
+ }
+
CssValue val = expression.getValue();
- char op = expression.getOperator();
+// char op = expression.getOperator();
setByUser();
@@ -69,6 +71,11 @@
val.toString(), getPropertyName(), ac);
}
+ public PageBreakInside(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Returns the value of this property
*/
Index: Page.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/paged/Page.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Page.java 8 Apr 2002 21:17:21 -0000 1.2
+++ Page.java 8 Aug 2005 13:18:11 -0000 1.3
@@ -7,17 +7,14 @@
/*
*/
package org.w3c.css.paged;
-import java.util.Vector;
-
-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.values.CssURL;
import org.w3c.css.values.CssOperator;
-import org.w3c.css.util.InvalidParamException;
-import org.w3c.css.util.ApplContext;
+import org.w3c.css.values.CssValue;
/**
* @version $Revision$
@@ -44,14 +41,22 @@
* @param expression The expression for this property
* @exception InvalidParamException Values are incorrect
*/
- public Page(ApplContext ac, CssExpression expression)
+ public Page(ApplContext ac, CssExpression expression, boolean check)
throws InvalidParamException {
+
+ if(check && expression.getCount() > 2) {
+ throw new InvalidParamException("unrecognize", ac);
+ }
+
CssValue val = expression.getValue();
char op = expression.getOperator();
setByUser();
if (val.equals(auto)) {
+ if(expression.getCount() > 1) {
+ throw new InvalidParamException("unrecognize", ac);
+ }
value = val;
expression.next();
} else if (val instanceof CssIdent) {
@@ -65,16 +70,21 @@
return;
} else {
throw new InvalidParamException("value",
- val.toString(),
- getPropertyName(), ac);
+ val.toString(),
+ getPropertyName(), ac);
}
}
} else {
throw new InvalidParamException("value",
- val.toString(), getPropertyName(), ac);
+ val.toString(), getPropertyName(), ac);
}
}
+ public Page(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Returns the value of this property
*/
Index: PageATSC.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/paged/PageATSC.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- PageATSC.java 8 Apr 2002 21:17:21 -0000 1.2
+++ PageATSC.java 8 Aug 2005 13:18:11 -0000 1.3
@@ -7,17 +7,14 @@
/*
*/
package org.w3c.css.paged;
-import java.util.Vector;
-
-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.values.CssURL;
import org.w3c.css.values.CssOperator;
-import org.w3c.css.util.InvalidParamException;
-import org.w3c.css.util.ApplContext;
+import org.w3c.css.values.CssValue;
/**
* @version $Revision$
@@ -44,8 +41,13 @@
* @param expression The expression for this property
* @exception InvalidParamException Values are incorrect
*/
- public PageATSC(ApplContext ac, CssExpression expression)
- throws InvalidParamException {
+ public PageATSC(ApplContext ac, CssExpression expression,
+ boolean check) throws InvalidParamException {
+
+ if(check && expression.getCount() > 2) {
+ throw new InvalidParamException("unrecognize", ac);
+ }
+
CssValue val = expression.getValue();
char op = expression.getOperator();
@@ -54,6 +56,9 @@
ac.getFrame().addWarning("atsc", val.toString());
if (val.equals(auto)) {
+ if(expression.getCount() > 1) {
+ throw new InvalidParamException("unrecognize", ac);
+ }
value = val;
expression.next();
} else if (val instanceof CssIdent) {
@@ -77,6 +82,11 @@
}
}
+ public PageATSC(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Returns the value of this property
*/
Index: Orphans.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/paged/Orphans.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Orphans.java 8 Apr 2002 21:17:21 -0000 1.2
+++ Orphans.java 8 Aug 2005 13:18:11 -0000 1.3
@@ -9,13 +9,13 @@
package org.w3c.css.paged;
-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 Orphans(ApplContext ac, CssExpression expression) throws InvalidParamException {
+ public Orphans(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 @@
getPropertyName(), ac);
}
+ public Orphans(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Returns the current value
*/
Index: PageBreakAfterATSC.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/paged/PageBreakAfterATSC.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- PageBreakAfterATSC.java 8 Apr 2002 21:17:21 -0000 1.2
+++ PageBreakAfterATSC.java 8 Aug 2005 13:18:11 -0000 1.3
@@ -7,17 +7,14 @@
/*
*/
package org.w3c.css.paged;
-import java.util.Vector;
-
-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.values.CssURL;
import org.w3c.css.values.CssOperator;
-import org.w3c.css.util.InvalidParamException;
-import org.w3c.css.util.ApplContext;
+import org.w3c.css.values.CssValue;
/**
* @version $Revision$
@@ -46,10 +43,15 @@
* @param expression The expression for this property
* @exception InvalidParamException Values are incorrect
*/
- public PageBreakAfterATSC(ApplContext ac, CssExpression expression)
- throws InvalidParamException {
+ public PageBreakAfterATSC(ApplContext ac, CssExpression expression,
+ boolean check) throws InvalidParamException {
+
+ if(check && expression.getCount() > 1) {
+ throw new InvalidParamException("unrecognize", ac);
+ }
+
CssValue val = expression.getValue();
- char op = expression.getOperator();
+// char op = expression.getOperator();
setByUser();
@@ -71,6 +73,11 @@
val.toString(), getPropertyName(), ac);
}
+ public PageBreakAfterATSC(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Returns the value of this property
*/
Index: OrphansATSC.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/paged/OrphansATSC.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- OrphansATSC.java 8 Apr 2002 21:17:21 -0000 1.2
+++ OrphansATSC.java 8 Aug 2005 13:18:11 -0000 1.3
@@ -9,13 +9,13 @@
package org.w3c.css.paged;
-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 OrphansATSC(ApplContext ac, CssExpression expression) throws InvalidParamException {
+ public OrphansATSC(ApplContext ac, CssExpression expression,boolean check)
+ throws InvalidParamException {
+
+ if(check && expression.getCount() > 1) {
+ throw new InvalidParamException("unrecognize", ac);
+ }
+
CssValue val = expression.getValue();
setByUser();
@@ -64,6 +70,11 @@
getPropertyName(), ac);
}
+ public OrphansATSC(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Returns the current value
*/
Index: Widows.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/paged/Widows.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Widows.java 8 Apr 2002 21:17:21 -0000 1.2
+++ Widows.java 8 Aug 2005 13:18:11 -0000 1.3
@@ -9,13 +9,13 @@
package org.w3c.css.paged;
-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 Widows(ApplContext ac, CssExpression expression) throws InvalidParamException {
+ public Widows(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 @@
getPropertyName(), ac);
}
+ public Widows(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Returns the current value
*/
Index: PageBreakInsideATSC.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/paged/PageBreakInsideATSC.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- PageBreakInsideATSC.java 8 Apr 2002 21:17:21 -0000 1.2
+++ PageBreakInsideATSC.java 8 Aug 2005 13:18:11 -0000 1.3
@@ -7,17 +7,14 @@
/*
*/
package org.w3c.css.paged;
-import java.util.Vector;
-
-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.values.CssURL;
import org.w3c.css.values.CssOperator;
-import org.w3c.css.util.InvalidParamException;
-import org.w3c.css.util.ApplContext;
+import org.w3c.css.values.CssValue;
/**
* @version $Revision$
@@ -46,10 +43,15 @@
* @param expression The expression for this property
* @exception InvalidParamException Values are incorrect
*/
- public PageBreakInsideATSC(ApplContext ac, CssExpression expression)
- throws InvalidParamException {
+ public PageBreakInsideATSC(ApplContext ac, CssExpression expression,
+ boolean check) throws InvalidParamException {
+
+ if(check && expression.getCount() > 1) {
+ throw new InvalidParamException("unrecognize", ac);
+ }
+
CssValue val = expression.getValue();
- char op = expression.getOperator();
+ //char op = expression.getOperator();
setByUser();
@@ -71,6 +73,11 @@
val.toString(), getPropertyName(), ac);
}
+ public PageBreakInsideATSC(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Returns the value of this property
*/
Index: PageBreakBeforeATSC.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/paged/PageBreakBeforeATSC.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- PageBreakBeforeATSC.java 8 Apr 2002 21:17:21 -0000 1.2
+++ PageBreakBeforeATSC.java 8 Aug 2005 13:18:11 -0000 1.3
@@ -7,17 +7,14 @@
/*
*/
package org.w3c.css.paged;
-import java.util.Vector;
-
-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.values.CssURL;
import org.w3c.css.values.CssOperator;
-import org.w3c.css.util.InvalidParamException;
-import org.w3c.css.util.ApplContext;
+import org.w3c.css.values.CssValue;
/**
* @version $Revision$
@@ -46,10 +43,15 @@
* @param expression The expression for this property
* @exception InvalidParamException Values are incorrect
*/
- public PageBreakBeforeATSC(ApplContext ac, CssExpression expression)
- throws InvalidParamException {
+ public PageBreakBeforeATSC(ApplContext ac, CssExpression expression,
+ boolean check) throws InvalidParamException {
+
+ if(check && expression.getCount() > 1) {
+ throw new InvalidParamException("unrecognize", ac);
+ }
+
CssValue val = expression.getValue();
- char op = expression.getOperator();
+// char op = expression.getOperator();
setByUser();
@@ -71,6 +73,11 @@
val.toString(), getPropertyName(), ac);
}
+ public PageBreakBeforeATSC(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Returns the value of this property
*/
Received on Monday, 8 August 2005 13:20:26 UTC