- From: Yves Lafon via cvs-syncmail <cvsmail@w3.org>
- Date: Thu, 17 Dec 2009 16:39:47 +0000
- To: www-validator-cvs@w3.org
Update of /sources/public/2002/css-validator/org/w3c/css/properties/css3
In directory hutz:/tmp/cvs-serv13362/org/w3c/css/properties/css3
Modified Files:
CssColumnRuleStyle.java
Log Message:
css3-multicol column-rule-style uses CSS21 border-style values
Index: CssColumnRuleStyle.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css3/CssColumnRuleStyle.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CssColumnRuleStyle.java 17 Dec 2009 16:08:12 -0000 1.3
+++ CssColumnRuleStyle.java 17 Dec 2009 16:39:45 -0000 1.4
@@ -11,7 +11,7 @@
package org.w3c.css.properties.css3;
import org.w3c.css.parser.CssStyle;
-import org.w3c.css.properties.css1.CssBorderStyle;
+import org.w3c.css.properties.css1.CssBorderStyleCSS2;
import org.w3c.css.properties.css1.CssProperty;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
@@ -53,10 +53,15 @@
setByUser();
CssValue val = expression.getValue();
+ // too many values
+ if(check && expression.getCount() > 1) {
+ throw new InvalidParamException("unrecognize", ac);
+ }
// we only use Css Ident part of the CssBorderStyle acceptable values
if ((val.getType() != CssTypes.CSS_IDENT) ||
- !CssBorderStyle.acceptable_values.contains((CssIdent)val)) {
+ !(((CssIdent)val).equals(inherit) ||
+ CssBorderStyleCSS2.acceptable_values.contains((CssIdent)val))) {
throw new InvalidParamException("value",
expression.getValue(),
getPropertyName(), ac);
Received on Thursday, 17 December 2009 16:39:49 UTC