2002/css-validator/org/w3c/css/properties/css3 CssColumnSpan.java,1.2,1.3

• From: Yves Lafon via cvs-syncmail <cvsmail@w3.org>
• Date: Tue, 15 Dec 2009 18:45:40 +0000
• To: www-validator-cvs@w3.org
• Message-Id: <E1NKcOy-0006K5-6z@lionel-hutz.w3.org>

Update of /sources/public/2002/css-validator/org/w3c/css/properties/css3
In directory hutz:/tmp/cvs-serv24291

Modified Files:
	CssColumnSpan.java 
Log Message:
Fixed column-span, acceptable values are now 1, all, inherit


Index: CssColumnSpan.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css3/CssColumnSpan.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssColumnSpan.java	14 Sep 2005 15:15:04 -0000	1.2
+++ CssColumnSpan.java	15 Dec 2009 18:45:38 -0000	1.3
@@ -19,11 +19,11 @@
 
 /**
  *  <P>
- *  <EM>Value:</EM> &lt;integer&gt; || none || all || inherit<BR>
- *  <EM>Initial:</EM>none<BR>
- *  <EM>Applies to:</EM>block-level elements<BR>
+ *  <EM>Value:</EM> 1 ||  all <BR>
+ *  <EM>Initial:</EM>1<BR>
+ *  <EM>Applies to:</EM>static, non-floating elements<BR>
  *  <EM>Inherited:</EM>no<BR>
- *  <EM>Percentages:</EM>no<BR>
+ *  <EM>Percentages:</EM>N/A<BR>
  *  <EM>Media:</EM>:visual
  */
 
@@ -32,8 +32,10 @@
     CssValue value;
     ApplContext ac;
 
-    CssIdent none = new CssIdent("none");
-    CssIdent all = new CssIdent("all");
+    static CssIdent all;
+    static {
+	all = new CssIdent("all");
+    }
 
     /**
      * Create a new CssColumnSpan
@@ -54,32 +56,27 @@
 	setByUser(); // tell this property is set by the user
 	CssValue val = expression.getValue();
 
-	if (val instanceof CssNumber) {
-	    if (((CssNumber) val).isInteger()) {
-		value = val;
-		expression.next();
-		return;
-	    } else {
-		throw new InvalidParamException("integer",
-			val.toString(),
-			getPropertyName(), ac);
+	switch (val.getType()) {
+	case CssTypes.CSS_NUMBER:
+	    int ival = ((CssNumber) val).getInt();
+	    if (ival != 1) {
+		throw new InvalidParamException("value", val.toString(),
+						getPropertyName(), ac);
 	    }
-	}
-	else if (val instanceof CssIdent) {
-	    if (val.equals(inherit)) {
-		value = inherit;
-		expression.next();
-	    } else if (val.equals(none)) {
-		value = none;
-		expression.next();
-	    } else if (val.equals(all)) {
+	    value = val;
+	    break;
+	case CssTypes.CSS_IDENT:
+	    if (all.equals(val)) {
 		value = all;
-		expression.next();
+		break;
 	    }
-	}
-	else {
+	    if (inherit.equals(val)) {
+		value = inherit;
+		break;
+	    }
+	default:
 	    throw new InvalidParamException("value", val.toString(),
-		    getPropertyName(), ac);
+					    getPropertyName(), ac);
 	}
     }
 
@@ -141,7 +138,7 @@
      * Returns true if this property is "softly" inherited
      */
     public boolean isSoftlyInherited() {
-	return value.equals(inherit);
+	return (value == inherit);
     }
 
     /**
@@ -156,7 +153,8 @@
      * It is used by all macro for the function <code>print</code>
      */
     public boolean isDefault() {
-	return value == none;
+	// we only have 3 values
+	return ((value != all) && (value != inherit))
     }
 
 }

Received on Tuesday, 15 December 2009 18:45:41 UTC