- From: CVS User ylafon <cvsmail@w3.org>
- Date: Thu, 06 Dec 2012 18:58:13 +0000
- To: www-validator-cvs@w3.org
Update of /sources/public/2002/css-validator/org/w3c/css/properties/css2
In directory roscoe:/tmp/cvs-serv6589/css2
Modified Files:
Css2Style.java
Added Files:
CssBorderSpacing.java
Log Message:
border-spacing per css2/css21
--- /sources/public/2002/css-validator/org/w3c/css/properties/css2/Css2Style.java 2012/12/06 15:54:48 1.29
+++ /sources/public/2002/css-validator/org/w3c/css/properties/css2/Css2Style.java 2012/12/06 18:58:13 1.30
@@ -1,5 +1,5 @@
//
-// $Id: Css2Style.java,v 1.29 2012/12/06 15:54:48 ylafon Exp $
+// $Id: Css2Style.java,v 1.30 2012/12/06 18:58:13 ylafon Exp $
// From Philippe Le Hegaret (Philippe.Le_Hegaret@sophia.inria.fr)
//
// (c) COPYRIGHT MIT and INRIA, 1997.
@@ -9,6 +9,7 @@
import org.w3c.css.parser.CssSelectors;
import org.w3c.css.properties.aural.ACssStyle;
import org.w3c.css.properties.css.CssBorderCollapse;
+import org.w3c.css.properties.css.CssBorderSpacing;
import org.w3c.css.properties.css.CssBottom;
import org.w3c.css.properties.css.CssCaptionSide;
import org.w3c.css.properties.css.CssClip;
@@ -42,7 +43,7 @@
import org.w3c.css.values.CssIdent;
/**
- * @version $Revision: 1.29 $
+ * @version $Revision: 1.30 $
*/
public class Css2Style extends ACssStyle {
@@ -94,6 +95,7 @@
public CssCaptionSide cssCaptionSide;
public CssBorderCollapse cssBorderCollapse;
+ public CssBorderSpacing cssBorderSpacing;
public CssEmptyCells cssEmptyCells;
public CssTableLayout cssTableLayout;
@@ -470,6 +472,15 @@
}
return cssTableLayout;
}
+
+ public final CssBorderSpacing getBorderSpacing() {
+ if (cssBorderSpacing == null) {
+ cssBorderSpacing =
+ (CssBorderSpacing) style.CascadingOrder(new CssBorderSpacing(),
+ style, selector);
+ }
+ return cssBorderSpacing;
+ }
/**
* Find conflicts in this Style
*
--- /sources/public/2002/css-validator/org/w3c/css/properties/css2/CssBorderSpacing.java 2012/12/06 18:58:13 NONE
+++ /sources/public/2002/css-validator/org/w3c/css/properties/css2/CssBorderSpacing.java 2012/12/06 18:58:13 1.1
// $Id: CssBorderSpacing.java,v 1.1 2012/12/06 18:58:13 ylafon Exp $
// Author: Yves Lafon <ylafon@w3.org>
//
// (c) COPYRIGHT MIT, ERCIM and Keio University, 2012.
// Please first read the full copyright statement in file COPYRIGHT.html
package org.w3c.css.properties.css2;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
import org.w3c.css.values.CssLength;
import org.w3c.css.values.CssTypes;
import org.w3c.css.values.CssValue;
import org.w3c.css.values.CssValueList;
import java.util.ArrayList;
import static org.w3c.css.values.CssOperator.SPACE;
/**
* @spec http://www.w3.org/TR/2008/REC-CSS2-20080411/tables.html#propdef-border-spacing
*/
public class CssBorderSpacing extends org.w3c.css.properties.css.CssBorderSpacing {
/**
* Create a new CssBorderSpacing
*/
public CssBorderSpacing() {
}
/**
* Creates a new CssBorderSpacing
*
* @param expression The expression for this property
* @throws org.w3c.css.util.InvalidParamException
* Expressions are incorrect
*/
public CssBorderSpacing(ApplContext ac, CssExpression expression, boolean check)
throws InvalidParamException {
if (check && expression.getCount() > 2) {
throw new InvalidParamException("unrecognize", ac);
}
setByUser();
CssValue val;
char op;
ArrayList<CssValue> v = new ArrayList<CssValue>();
int i = 0;
while (!expression.end() && i < 2) {
val = expression.getValue();
op = expression.getOperator();
switch (val.getType()) {
case CssTypes.CSS_LENGTH:
CssLength l = val.getLength();
l.checkPositiveness(ac, this);
v.add(l);
break;
case CssTypes.CSS_IDENT:
if (inherit.equals(val) && expression.getCount() == 1) {
value = inherit;
break;
}
// unrecognized ident => fail
default:
throw new InvalidParamException("value",
val.toString(),
getPropertyName(), ac);
}
if (op != SPACE) {
throw new InvalidParamException("operator",
((new Character(op)).toString()), ac);
}
expression.next();
i++;
}
if (value != inherit) {
value = (v.size() == 1) ? v.get(0) : new CssValueList(v);
}
}
public CssBorderSpacing(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
}
Received on Thursday, 6 December 2012 18:58:23 UTC