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: Fri, 07 Dec 2012 12:18:56 +0000
Message-Id: <E1TgwtM-0008DC-Ic@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-serv31496/css2

Modified Files:
	Css2Style.java 
Added Files:
	CssSpeakHeader.java 
Log Message:
speak header per css2 (table) css21 (audio), and not in css3 (audio)

--- /sources/public/2002/css-validator/org/w3c/css/properties/css2/Css2Style.java	2012/12/06 18:58:13	1.30
+++ /sources/public/2002/css-validator/org/w3c/css/properties/css2/Css2Style.java	2012/12/07 12:18:56	1.31
@@ -1,5 +1,5 @@
 //
-// $Id: Css2Style.java,v 1.30 2012/12/06 18:58:13 ylafon Exp $
+// $Id: Css2Style.java,v 1.31 2012/12/07 12:18:56 ylafon Exp $
 // From Philippe Le Hegaret (Philippe.Le_Hegaret@sophia.inria.fr)
 //
 // (c) COPYRIGHT MIT and INRIA, 1997.
@@ -32,6 +32,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.CssSpeakHeader;
 import org.w3c.css.properties.css.CssTableLayout;
 import org.w3c.css.properties.css.CssTextShadow;
 import org.w3c.css.properties.css.CssTop;
@@ -43,7 +44,7 @@
 import org.w3c.css.values.CssIdent;
 
 /**
- * @version $Revision: 1.30 $
+ * @version $Revision: 1.31 $
  */
 public class Css2Style extends ACssStyle {
 
@@ -98,6 +99,7 @@
 	public CssBorderSpacing cssBorderSpacing;
 	public CssEmptyCells cssEmptyCells;
 	public CssTableLayout cssTableLayout;
+	public CssSpeakHeader cssSpeakHeader;
 
 	/**
 	 * Get the azimuth
@@ -481,6 +483,15 @@
 		}
 		return cssBorderSpacing;
 	}
+
+	public final CssSpeakHeader getSpeakHeader() {
+		if (cssSpeakHeader == null) {
+			cssSpeakHeader =
+					(CssSpeakHeader) style.CascadingOrder(new CssSpeakHeader(),
+							style, selector);
+		}
+		return cssSpeakHeader;
+	}
 	/**
 	 * Find conflicts in this Style
 	 *

--- /sources/public/2002/css-validator/org/w3c/css/properties/css2/CssSpeakHeader.java	2012/12/07 12:18:56	NONE
+++ /sources/public/2002/css-validator/org/w3c/css/properties/css2/CssSpeakHeader.java	2012/12/07 12:18:56	1.1
// $Id: CssSpeakHeader.java,v 1.1 2012/12/07 12:18:56 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#speak-headers
 */
public class CssSpeakHeader extends org.w3c.css.properties.css.CssSpeakHeader {

	public static final CssIdent[] allowed_values;

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

	/**
	 * Creates a new CssSpeakHeader
	 *
	 * @param expression The expression for this property
	 * @throws org.w3c.css.util.InvalidParamException
	 *          Expressions are incorrect
	 */
	public CssSpeakHeader(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 CssSpeakHeader(ApplContext ac, CssExpression expression)
			throws InvalidParamException {
		this(ac, expression, false);
	}
}
Received on Friday, 7 December 2012 12:19:00 UTC

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