- From: Yves Lafon via cvs-syncmail <cvsmail@w3.org>
- Date: Wed, 10 Aug 2005 15:30:28 +0000
- To: www-validator-cvs@w3.org
Update of /sources/public/2002/css-validator/org/w3c/css/properties
In directory hutz:/tmp/cvs-serv6377
Modified Files:
CssBackgroundPosition.java CssBackgroundPositionCSS1.java
CssBackgroundPositionCSS2.java
Log Message:
error on value 0 fixed (Jean-Guilhem Rouel)
Index: CssBackgroundPositionCSS1.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/CssBackgroundPositionCSS1.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CssBackgroundPositionCSS1.java 8 Aug 2005 13:18:12 -0000 1.3
+++ CssBackgroundPositionCSS1.java 10 Aug 2005 15:30:26 -0000 1.4
@@ -6,6 +6,9 @@
// Please first read the full copyright statement in file COPYRIGHT.html
/*
* $Log$
+ * Revision 1.4 2005/08/10 15:30:26 ylafon
+ * error on value 0 fixed (Jean-Guilhem Rouel)
+ *
* Revision 1.3 2005/08/08 13:18:12 ylafon
* All those changed made by Jean-Guilhem Rouel:
*
@@ -55,6 +58,7 @@
import org.w3c.css.values.CssExpression;
import org.w3c.css.values.CssIdent;
import org.w3c.css.values.CssLength;
+import org.w3c.css.values.CssNumber;
//import org.w3c.css.values.CssNumber;
import org.w3c.css.values.CssOperator;
import org.w3c.css.values.CssPercentage;
@@ -218,8 +222,16 @@
first = val;
}
}
- else if(val instanceof CssLength || val instanceof CssPercentage) {
- if(next instanceof CssLength || next instanceof CssPercentage) {
+ else if(val instanceof CssLength || val instanceof CssPercentage
+ || val instanceof CssNumber) {
+ if(val instanceof CssNumber) {
+ val = ((CssNumber) val).getLength();
+ }
+ if(next instanceof CssLength || next instanceof CssPercentage ||
+ next instanceof CssNumber) {
+ if(next instanceof CssNumber) {
+ next = ((CssNumber) next).getLength();
+ }
first = val;
second = next;
}
Index: CssBackgroundPosition.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/CssBackgroundPosition.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CssBackgroundPosition.java 8 Aug 2005 13:18:12 -0000 1.3
+++ CssBackgroundPosition.java 10 Aug 2005 15:30:26 -0000 1.4
@@ -6,6 +6,9 @@
// Please first read the full copyright statement in file COPYRIGHT.html
/*
* $Log$
+ * Revision 1.4 2005/08/10 15:30:26 ylafon
+ * error on value 0 fixed (Jean-Guilhem Rouel)
+ *
* Revision 1.3 2005/08/08 13:18:12 ylafon
* All those changed made by Jean-Guilhem Rouel:
*
@@ -55,6 +58,7 @@
import org.w3c.css.values.CssExpression;
import org.w3c.css.values.CssIdent;
import org.w3c.css.values.CssLength;
+import org.w3c.css.values.CssNumber;
//import org.w3c.css.values.CssNumber;
import org.w3c.css.values.CssOperator;
import org.w3c.css.values.CssPercentage;
@@ -206,7 +210,11 @@
}
}
// a keyword and a percentage/length
- else if(next instanceof CssLength || next instanceof CssPercentage) {
+ else if(next instanceof CssLength || next instanceof CssPercentage
+ || next instanceof CssNumber) {
+ if(next instanceof CssNumber) {
+ next = ((CssNumber) next).getLength();
+ }
if(isHorizontal(index1)) {
first = val;
second = next;
@@ -231,7 +239,11 @@
first = val;
}
}
- else if(val instanceof CssLength || val instanceof CssPercentage) {
+ else if(val instanceof CssLength || val instanceof CssPercentage ||
+ val instanceof CssNumber) {
+ if(val instanceof CssNumber) {
+ val = ((CssNumber) val).getLength();
+ }
// a percentage/length and an keyword
if(next instanceof CssIdent) {
int index = IndexOfIdent((String) next.get());
@@ -248,7 +260,11 @@
first = val;
}
}
- else if(next instanceof CssLength || next instanceof CssPercentage) {
+ else if(next instanceof CssLength || next instanceof CssPercentage
+ || next instanceof CssNumber) {
+ if(next instanceof CssNumber) {
+ next = ((CssNumber) next).getLength();
+ }
first = val;
second = next;
}
Index: CssBackgroundPositionCSS2.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/CssBackgroundPositionCSS2.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CssBackgroundPositionCSS2.java 8 Aug 2005 13:18:12 -0000 1.3
+++ CssBackgroundPositionCSS2.java 10 Aug 2005 15:30:26 -0000 1.4
@@ -6,6 +6,9 @@
// Please first read the full copyright statement in file COPYRIGHT.html
/*
* $Log$
+ * Revision 1.4 2005/08/10 15:30:26 ylafon
+ * error on value 0 fixed (Jean-Guilhem Rouel)
+ *
* Revision 1.3 2005/08/08 13:18:12 ylafon
* All those changed made by Jean-Guilhem Rouel:
*
@@ -55,6 +58,7 @@
import org.w3c.css.values.CssExpression;
import org.w3c.css.values.CssIdent;
import org.w3c.css.values.CssLength;
+import org.w3c.css.values.CssNumber;
//import org.w3c.css.values.CssNumber;
import org.w3c.css.values.CssOperator;
import org.w3c.css.values.CssPercentage;
@@ -206,8 +210,12 @@
}
}
// a keyword and a percentage/length
- else if(next instanceof CssLength || next instanceof CssPercentage) {
+ else if(next instanceof CssLength || next instanceof CssPercentage
+ || next instanceof CssNumber) {
if(isHorizontal(index1)) {
+ if(next instanceof CssNumber) {
+ next = ((CssNumber) next).getLength();
+ }
first = val;
second = next;
}
@@ -231,7 +239,11 @@
first = val;
}
}
- else if(val instanceof CssLength || val instanceof CssPercentage) {
+ else if(val instanceof CssLength || val instanceof CssPercentage ||
+ val instanceof CssNumber) {
+ if(val instanceof CssNumber) {
+ val = ((CssNumber) val).getLength();
+ }
// a percentage/length and an keyword
if(next instanceof CssIdent) {
int index = IndexOfIdent((String) next.get());
@@ -248,7 +260,11 @@
first = val;
}
}
- else if(next instanceof CssLength || next instanceof CssPercentage) {
+ else if(next instanceof CssLength || next instanceof CssPercentage
+ || next instanceof CssNumber) {
+ if(next instanceof CssNumber) {
+ next = ((CssNumber) next).getLength();
+ }
first = val;
second = next;
}
Received on Wednesday, 10 August 2005 15:30:36 UTC