- From: CVS User ylafon <cvsmail@w3.org>
- Date: Thu, 06 Dec 2012 15:54:48 +0000
- To: www-validator-cvs@w3.org
Update of /sources/public/2002/css-validator/org/w3c/css/properties/css2
In directory roscoe:/tmp/cvs-serv8396/css2
Modified Files:
Css2Style.java
Added Files:
CssTableLayout.java
Log Message:
table-layout per css2/css21
--- /sources/public/2002/css-validator/org/w3c/css/properties/css2/Css2Style.java 2012/12/05 15:47:17 1.28
+++ /sources/public/2002/css-validator/org/w3c/css/properties/css2/Css2Style.java 2012/12/06 15:54:48 1.29
@@ -1,5 +1,5 @@
//
-// $Id: Css2Style.java,v 1.28 2012/12/05 15:47:17 ylafon Exp $
+// $Id: Css2Style.java,v 1.29 2012/12/06 15:54:48 ylafon Exp $
// From Philippe Le Hegaret (Philippe.Le_Hegaret@sophia.inria.fr)
//
// (c) COPYRIGHT MIT and INRIA, 1997.
@@ -31,6 +31,7 @@
import org.w3c.css.properties.css.CssPosition;
import org.w3c.css.properties.css.CssQuotes;
import org.w3c.css.properties.css.CssRight;
+import org.w3c.css.properties.css.CssTableLayout;
import org.w3c.css.properties.css.CssTextShadow;
import org.w3c.css.properties.css.CssTop;
import org.w3c.css.properties.css.CssUnicodeBidi;
@@ -41,7 +42,7 @@
import org.w3c.css.values.CssIdent;
/**
- * @version $Revision: 1.28 $
+ * @version $Revision: 1.29 $
*/
public class Css2Style extends ACssStyle {
@@ -94,6 +95,7 @@
public CssCaptionSide cssCaptionSide;
public CssBorderCollapse cssBorderCollapse;
public CssEmptyCells cssEmptyCells;
+ public CssTableLayout cssTableLayout;
/**
* Get the azimuth
@@ -459,6 +461,15 @@
}
return cssEmptyCells;
}
+
+ public final CssTableLayout getTableLayout() {
+ if (cssTableLayout == null) {
+ cssTableLayout =
+ (CssTableLayout) style.CascadingOrder(new CssTableLayout(),
+ style, selector);
+ }
+ return cssTableLayout;
+ }
/**
* Find conflicts in this Style
*
--- /sources/public/2002/css-validator/org/w3c/css/properties/css2/CssTableLayout.java 2012/12/06 15:54:48 NONE
+++ /sources/public/2002/css-validator/org/w3c/css/properties/css2/CssTableLayout.java 2012/12/06 15:54:48 1.1
// $Id: CssTableLayout.java,v 1.1 2012/12/06 15:54:48 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.CssIdent;
import org.w3c.css.values.CssTypes;
import org.w3c.css.values.CssValue;
/**
* @spec http://www.w3.org/TR/2008/REC-CSS2-20080411/tables.html#propdef-table-layout
*/
public class CssTableLayout extends org.w3c.css.properties.css.CssTableLayout {
public static final CssIdent[] allowed_values;
static {
String[] _allowed_values = {"auto", "fixed"};
int i = 0;
allowed_values = new CssIdent[_allowed_values.length];
for (String s : _allowed_values) {
allowed_values[i++] = CssIdent.getIdent(s);
}
}
public static final CssIdent getAllowedIdent(CssIdent ident) {
for (CssIdent id : allowed_values) {
if (id.equals(ident)) {
return id;
}
}
return null;
}
/**
* Create a new CssTableLayout
*/
public CssTableLayout() {
}
/**
* Creates a new CssTableLayout
*
* @param expression The expression for this property
* @throws org.w3c.css.util.InvalidParamException
* Expressions are incorrect
*/
public CssTableLayout(ApplContext ac, CssExpression expression, boolean check)
throws InvalidParamException {
if (check && expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
}
setByUser();
CssValue val;
char op;
val = expression.getValue();
op = expression.getOperator();
if (val.getType() == CssTypes.CSS_IDENT) {
CssIdent id = (CssIdent) val;
if (inherit.equals(id)) {
value = inherit;
} else {
value = getAllowedIdent(id);
if (value == null) {
throw new InvalidParamException("value",
val.toString(),
getPropertyName(), ac);
}
}
} else {
throw new InvalidParamException("value",
val.toString(),
getPropertyName(), ac);
}
expression.next();
}
public CssTableLayout(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
}
Received on Thursday, 6 December 2012 15:54:54 UTC