W3C home > Mailing lists > Public > www-validator-cvs@w3.org > October 2011

2002/css-validator/org/w3c/css/properties/css3 CssColumnCount.java,1.7,1.8 CssColumnFill.java,1.4,1.5 CssColumnGap.java,1.6,1.7 CssColumnRule.java,1.7,1.8 CssColumnRuleColor.java,1.6,1.7 CssColumnRuleStyle.java,1.8,1.9 CssColumnRuleWidth.java,1.6,1.7 CssColumnSpan.java,1.8,1.9 CssColumnWidth.java,1.8,1.9 CssColumns.java,1.4,1.5

From: Yves Lafon via cvs-syncmail <cvsmail@w3.org>
Date: Fri, 21 Oct 2011 18:08:45 +0000
To: www-validator-cvs@w3.org
Message-Id: <E1RHJWP-0000wH-Gb@lionel-hutz.w3.org>
Update of /sources/public/2002/css-validator/org/w3c/css/properties/css3
In directory hutz:/tmp/cvs-serv3590/css/properties/css3

Modified Files:
	CssColumnCount.java CssColumnFill.java CssColumnGap.java 
	CssColumnRule.java CssColumnRuleColor.java 
	CssColumnRuleStyle.java CssColumnRuleWidth.java 
	CssColumnSpan.java CssColumnWidth.java CssColumns.java 
Log Message:
check the number of parameters when missing

Index: CssColumnRuleColor.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css3/CssColumnRuleColor.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- CssColumnRuleColor.java	5 Oct 2011 08:18:33 -0000	1.6
+++ CssColumnRuleColor.java	21 Oct 2011 18:08:43 -0000	1.7
@@ -16,19 +16,6 @@
 
 /**
  * @spec http://www.w3.org/TR/2011/CR-css3-multicol-20110412/#column-rule-color
- * <p/>
- * Name:  	column-rule-color
- * Value: 	&lt;color&gt;
- * Initial: 	same as for 'color' property [CSS21]
- * Applies to: 	multicol elements
- * Inherited: 	no
- * Percentages: 	N/A
- * Media: 	visual
- * Computed value: 	the same as the computed value for the 'color'
- * property [CSS21]
- * <p/>
- * This property sets the color of the column rule. The &lt;color&gt; values are
- * defined in [CSS21].
  */
 
 public class CssColumnRuleColor extends org.w3c.css.properties.css.CssColumnRuleColor {
@@ -54,7 +41,7 @@
         setByUser();
         CssValue val = expression.getValue();
 
-        if (check && expression.getCount() > 1) {
+        if (expression.getCount() > 1) {
             throw new InvalidParamException("unrecognize", ac);
         }
         if (inherit.equals(val)) {

Index: CssColumnFill.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css3/CssColumnFill.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- CssColumnFill.java	5 Oct 2011 08:18:33 -0000	1.4
+++ CssColumnFill.java	21 Oct 2011 18:08:43 -0000	1.5
@@ -20,21 +20,6 @@
 
 /**
  * @spec http://www.w3.org/TR/2011/CR-css3-multicol-20110412/#filling-columns
- * <p/>
- * There are two strategies for filling columns: columns can either be
- * balanced, or not. If columns are balanced, UAs should minimize the variation
- * in column length. Otherwise, columns are filled sequentially and will
- * therefore end up having different lengths. In any case, the user agent
- * should try to honor the �widows� and �orphans� properties.
- * <p/>
- * Name: 	column-fill
- * Value: 	auto | balance
- * Initial: 	balance
- * Applies to: 	multi-column elements
- * Inherited: 	no
- * Percentages: 	N/A
- * Media: 	see below
- * Computed value: 	as specified
  */
 
 public class CssColumnFill extends org.w3c.css.properties.css.CssColumnFill {
@@ -72,7 +57,7 @@
         setByUser();
         CssValue val = expression.getValue();
 
-        if (check && expression.getCount() > 1) {
+        if (expression.getCount() > 1) {
             throw new InvalidParamException("unrecognize", ac);
         }
 

Index: CssColumnWidth.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css3/CssColumnWidth.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- CssColumnWidth.java	5 Oct 2011 08:18:33 -0000	1.8
+++ CssColumnWidth.java	21 Oct 2011 18:08:43 -0000	1.9
@@ -21,24 +21,10 @@
 /**
  * @spec http://www.w3.org/TR/2011/CR-css3-multicol-20110412/#column-width
  *
- * <p/>
- * Name:  	column-width
- * Value: 	&lt;length&gt; | auto
- * Initial: 	auto
- * Applies to: 	non-replaced block-level elements (except table elements),
- * table cells, and inline-block elements
- * Inherited: 	no
- * Percentages: 	N/A
- * Media: 	visual
- * Computed value: 	the absolute length
- * <p/>
- * This property describes the width of columns in multicol elements.
  */
 
 public class CssColumnWidth extends org.w3c.css.properties.css.CssColumnWidth {
 
-    private static final String propertyName = "column-width";
-
     CssValue width;
 
     static CssIdent auto;
@@ -67,6 +53,10 @@
         CssValue val = expression.getValue();
         Float value;
 
+        if (expression.getCount() > 1) {
+            throw new InvalidParamException("unrecognize", ac);
+        }
+
         switch (val.getType()) {
             case CssTypes.CSS_NUMBER:
                 val = ((CssNumber) val).getLength();

Index: CssColumns.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css3/CssColumns.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- CssColumns.java	5 Oct 2011 08:18:33 -0000	1.4
+++ CssColumns.java	21 Oct 2011 18:08:43 -0000	1.5
@@ -22,20 +22,6 @@
 /**
  * @spec http://www.w3.org/TR/2011/CR-css3-multicol-20110412/#columns
  *
- * <p/>
- * Name:  	columns
- * Value: 	&lt;‘column-width’&gt; || &lt;‘column-count’&gt;
- * Initial: 	see individual properties
- * Applies to: 	non-replaced block-level elements (except table elements),
- * table cells, and inline-block elements
- * Inherited: 	no
- * Percentages: 	N/A
- * Media: 	visual
- * Computed value: 	see individual properties
- * <p/>
- * This is a shorthand property for setting ‘column-width’ and ‘column-count’.
- * Omitted values are set to their initial values.
- *
  * @see CssColumnWidth
  * @see org.w3c.css.properties.css3.CssColumnCount
  */
@@ -70,7 +56,7 @@
         int nb_val = expression.getCount();
         int nb_auto = 0;
 
-        if (check && nb_val > 2) {
+        if (nb_val > 2) {
             throw new InvalidParamException("unrecognize", ac);
         }
         setByUser();

Index: CssColumnSpan.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css3/CssColumnSpan.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- CssColumnSpan.java	5 Oct 2011 08:18:33 -0000	1.8
+++ CssColumnSpan.java	21 Oct 2011 18:08:43 -0000	1.9
@@ -20,17 +20,6 @@
 
 /**
  * @spec http://www.w3.org/TR/2011/CR-css3-multicol-20110412/#column-span
- *
- * Name:  	column-span
- * Value: 	1 | all
- * Initial: 	1
- * Applies to: 	static, non-floating elements
- * Inherited: 	no
- * Percentages: 	N/A
- * Media: 	visual
- * Computed value: 	as specified
- *
- * This property describes how many columns an element spans across.
  */
 
 public class CssColumnSpan extends org.w3c.css.properties.css.CssColumnSpan {
@@ -64,6 +53,10 @@
         setByUser(); // tell this property is set by the user
         CssValue val = expression.getValue();
 
+        if (expression.getCount() > 1) {
+            throw new InvalidParamException("unrecognize", ac);
+        }
+
         switch (val.getType()) {
             case CssTypes.CSS_IDENT:
                 if (all.equals(val)) {

Index: CssColumnRule.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css3/CssColumnRule.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- CssColumnRule.java	5 Oct 2011 08:18:33 -0000	1.7
+++ CssColumnRule.java	21 Oct 2011 18:08:43 -0000	1.8
@@ -21,20 +21,6 @@
 
 /**
  * @spec http://www.w3.org/TR/2011/CR-css3-multicol-20110412/#column-rule
- * <p/>
- * Name:  	column-rule
- * Value: &lt;column-rule-width&gt; || &lt;border-style&gt; ||
- * [ &lt;color&gt; | transparent ]
- * Initial: 	see individual properties
- * Applies to: 	multicol elements
- * Inherited: 	no
- * Percentages: 	N/A
- * Media: 	visual
- * Computed value: 	see individual properties
- * <p/>
- * This property is a shorthand for setting 'column-rule-width',
- * 'column-rule-style', and 'column-rule-color' at the same place in the
- * style sheet. Omitted values are set to their initial values.
  */
 
 public class CssColumnRule extends org.w3c.css.properties.css.CssColumnRule {
@@ -63,7 +49,7 @@
         char op;
         int nb_val = expression.getCount();
 
-        if (check && nb_val > 3) {
+        if (nb_val > 3) {
             throw new InvalidParamException("unrecognize", ac);
         }
         setByUser();

Index: CssColumnCount.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css3/CssColumnCount.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- CssColumnCount.java	5 Oct 2011 08:18:33 -0000	1.7
+++ CssColumnCount.java	21 Oct 2011 18:08:42 -0000	1.8
@@ -19,18 +19,6 @@
 
 /**
  * @spec http://www.w3.org/TR/2011/CR-css3-multicol-20110412/#cc
- * <p/>
- * Name:  	column-count
- * Value: 	&lt;integer&gt; | auto
- * Initial: 	auto
- * Applies to: 	non-replaced block-level elements (except table elements),
- * table cells, and inline-block elements
- * Inherited: 	no
- * Percentages: 	N/A
- * Media: 	visual
- * Computed value: 	specified value
- * <p/>
- * This property describes the number of columns of a multicol element.
  */
 
 public class CssColumnCount extends org.w3c.css.properties.css.CssColumnCount {
@@ -59,6 +47,10 @@
         CssValue val = expression.getValue();
         CssNumber num;
 
+        if (expression.getCount() > 1) {
+            throw new InvalidParamException("unrecognize", ac);
+        }
+
         switch (val.getType()) {
             case CssTypes.CSS_NUMBER:
                 num = (CssNumber) val;

Index: CssColumnRuleWidth.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css3/CssColumnRuleWidth.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- CssColumnRuleWidth.java	5 Oct 2011 08:18:33 -0000	1.6
+++ CssColumnRuleWidth.java	21 Oct 2011 18:08:43 -0000	1.7
@@ -17,14 +17,6 @@
 
 /**
  * @spec http://www.w3.org/TR/2011/CR-css3-multicol-20110412/#crw
- *
- * <p/>
- * <EM>Value:</EM> &lt;border-width&gt;<BR>
- * <EM>Initial:</EM>medium<BR>
- * <EM>Applies to:</EM>multicol elements<BR>
- * <EM>Inherited:</EM>no<BR>
- * <EM>Percentages:</EM>N/A<BR>
- * <EM>Media:</EM>:visual
  */
 
 public class CssColumnRuleWidth extends org.w3c.css.properties.css.CssColumnRuleWidth {
@@ -52,7 +44,7 @@
         setByUser();
         CssValue val = expression.getValue();
 
-        if (check && expression.getCount() > 1) {
+        if (expression.getCount() > 1) {
             throw new InvalidParamException("unrecognize", ac);
         }
 

Index: CssColumnRuleStyle.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css3/CssColumnRuleStyle.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- CssColumnRuleStyle.java	5 Oct 2011 08:18:33 -0000	1.8
+++ CssColumnRuleStyle.java	21 Oct 2011 18:08:43 -0000	1.9
@@ -21,18 +21,7 @@
 
 /**
  * @spec http://www.w3.org/TR/2011/CR-css3-multicol-20110412/#column-rule-style
- * 
- * Name:  	column-rule-style
- * Value: 	&lt;‘border-style’&gt;
- * Initial: 	none
- * Applies to: 	multicol elements
- * Inherited: 	no
- * Percentages: 	N/A
- * Media: 	visual
- * Computed value: 	specified value
  *
- * The ‘column-rule-style’ property sets the style of the rule between columns
- * of an element. The &lt;border-style&gt; values are defined in [CSS21].
  */
 
 public class CssColumnRuleStyle extends org.w3c.css.properties.css.CssColumnRuleStyle {
@@ -60,7 +49,7 @@
         setByUser();
         CssValue val = expression.getValue();
         // too many values
-        if (check && expression.getCount() > 1) {
+        if (expression.getCount() > 1) {
             throw new InvalidParamException("unrecognize", ac);
         }
         // we only use Css Ident part of the CssBorderStyle acceptable values

Index: CssColumnGap.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css3/CssColumnGap.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- CssColumnGap.java	5 Oct 2011 08:18:33 -0000	1.6
+++ CssColumnGap.java	21 Oct 2011 18:08:43 -0000	1.7
@@ -20,22 +20,6 @@
 
 /**
  * @spec http://www.w3.org/TR/2011/CR-css3-multicol-20110412/#column-gap
- * <p/>
- * Name:  	column-gap
- * Value: 	&lt;length&gt; | normal
- * Initial: 	normal
- * Applies to: 	multicol elements
- * Inherited: 	no
- * Percentages: 	N/A
- * Media: 	visual
- * Computed value: 	absolute length or ‘normal’
- * <p/>
- * The ‘column-gap’ property sets the gap between columns. If there is a
- * column rule between columns, it will appear in the middle of the gap.
- * <p/>
- * The ‘normal’ value is UA-specific. A value of ‘1em’ is suggested.
- * <p/>
- * Column gaps cannot be negative.
  */
 
 public class CssColumnGap extends org.w3c.css.properties.css.CssColumnGap {
@@ -64,6 +48,10 @@
         CssValue val = expression.getValue();
         Float value;
 
+        if (expression.getCount() > 1) {
+            throw new InvalidParamException("unrecognize", ac);
+        }
+
         switch (val.getType()) {
             case CssTypes.CSS_NUMBER:
                 val = ((CssNumber) val).getLength();
Received on Friday, 21 October 2011 18:08:48 UTC

This archive was generated by hypermail 2.3.1 : Wednesday, 7 January 2015 15:17:47 UTC