W3C home > Mailing lists > Public > www-validator-cvs@w3.org > December 2012

CVS 2002/css-validator/org/w3c/css/properties/css2

From: CVS User ylafon <cvsmail@w3.org>
Date: Wed, 05 Dec 2012 10:19:37 +0000
Message-Id: <E1TgC4n-0004u5-DW@roscoe.w3.org>
To: www-validator-cvs@w3.org
Update of /sources/public/2002/css-validator/org/w3c/css/properties/css2
In directory roscoe:/tmp/cvs-serv18631/css2

Modified Files:
	Css2Style.java 
Added Files:
	CssEmptyCells.java 
Log Message:
empty-cells per CSS2/CSS21

--- /sources/public/2002/css-validator/org/w3c/css/properties/css2/Css2Style.java	2012/11/06 11:22:01	1.25
+++ /sources/public/2002/css-validator/org/w3c/css/properties/css2/Css2Style.java	2012/12/05 10:19:37	1.26
@@ -1,5 +1,5 @@
 //
-// $Id: Css2Style.java,v 1.25 2012/11/06 11:22:01 ylafon Exp $
+// $Id: Css2Style.java,v 1.26 2012/12/05 10:19:37 ylafon Exp $
 // From Philippe Le Hegaret (Philippe.Le_Hegaret@sophia.inria.fr)
 //
 // (c) COPYRIGHT MIT and INRIA, 1997.
@@ -14,6 +14,7 @@
 import org.w3c.css.properties.css.CssCounterReset;
 import org.w3c.css.properties.css.CssCursor;
 import org.w3c.css.properties.css.CssDirection;
+import org.w3c.css.properties.css.CssEmptyCells;
 import org.w3c.css.properties.css.CssLeft;
 import org.w3c.css.properties.css.CssMarkerOffset;
 import org.w3c.css.properties.css.CssMaxHeight;
@@ -38,7 +39,7 @@
 import org.w3c.css.values.CssIdent;
 
 /**
- * @version $Revision: 1.25 $
+ * @version $Revision: 1.26 $
  */
 public class Css2Style extends ACssStyle {
 
@@ -87,6 +88,8 @@
 	public CssQuotes cssQuotes;
 	public CssCounterIncrement cssCounterIncrement;
 	public CssCounterReset cssCounterReset;
+	
+	public CssEmptyCells cssEmptyCells;
 
 	/**
 	 * Get the azimuth
@@ -426,6 +429,14 @@
 		return cssCounterReset;
 	}
 
+	public final CssEmptyCells getEmptyCells() {
+		if (cssEmptyCells == null) {
+			cssEmptyCells =
+					(CssEmptyCells) style.CascadingOrder(new CssEmptyCells(),
+							style, selector);
+		}
+		return cssEmptyCells;
+	}
 	/**
 	 * Find conflicts in this Style
 	 *

--- /sources/public/2002/css-validator/org/w3c/css/properties/css2/CssEmptyCells.java	2012/12/05 10:19:37	NONE
+++ /sources/public/2002/css-validator/org/w3c/css/properties/css2/CssEmptyCells.java	2012/12/05 10:19:37	1.1
//
// $Id: CssEmptyCells.java,v 1.1 2012/12/05 10:19:37 ylafon Exp $
// From Philippe Le Hegaret (Philippe.Le_Hegaret@sophia.inria.fr)
//
// (c) COPYRIGHT MIT and INRIA, 1997.
// 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-empty-cells
 */
public class CssEmptyCells extends org.w3c.css.properties.css.CssEmptyCells {

	public static final CssIdent[] allowed_values;

	static {
		String[] _allowed_values = {"show", "hide"};
		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 CssEmptyCells
     */
    public CssEmptyCells() {
    }

    /**
     * Creates a new CssEmptyCells
     *
     * @param expression The expression for this property
     * @throws org.w3c.css.util.InvalidParamException
     *          Expressions are incorrect
     */
    public CssEmptyCells(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 CssEmptyCells(ApplContext ac, CssExpression expression)
            throws InvalidParamException {
        this(ac, expression, false);
    }

}
Received on Wednesday, 5 December 2012 10:21:29 UTC

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