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

Update of /sources/public/2002/css-validator/org/w3c/css/properties/css2
In directory roscoe:/tmp/cvs-serv24595/css2

Modified Files:
	Css2Style.java 
Added Files:
	CssCaptionSide.java 
Log Message:
caption-side pre css2/css21

--- /sources/public/2002/css-validator/org/w3c/css/properties/css2/Css2Style.java	2012/12/05 15:22:03	1.27
+++ /sources/public/2002/css-validator/org/w3c/css/properties/css2/Css2Style.java	2012/12/05 15:47:17	1.28
@@ -1,5 +1,5 @@
 //
-// $Id: Css2Style.java,v 1.27 2012/12/05 15:22:03 ylafon Exp $
+// $Id: Css2Style.java,v 1.28 2012/12/05 15:47:17 ylafon Exp $
 // From Philippe Le Hegaret (Philippe.Le_Hegaret@sophia.inria.fr)
 //
 // (c) COPYRIGHT MIT and INRIA, 1997.
@@ -10,6 +10,7 @@
 import org.w3c.css.properties.aural.ACssStyle;
 import org.w3c.css.properties.css.CssBorderCollapse;
 import org.w3c.css.properties.css.CssBottom;
+import org.w3c.css.properties.css.CssCaptionSide;
 import org.w3c.css.properties.css.CssClip;
 import org.w3c.css.properties.css.CssCounterIncrement;
 import org.w3c.css.properties.css.CssCounterReset;
@@ -40,7 +41,7 @@
 import org.w3c.css.values.CssIdent;
 
 /**
- * @version $Revision: 1.27 $
+ * @version $Revision: 1.28 $
  */
 public class Css2Style extends ACssStyle {
 
@@ -90,6 +91,7 @@
 	public CssCounterIncrement cssCounterIncrement;
 	public CssCounterReset cssCounterReset;
 	
+	public CssCaptionSide cssCaptionSide;
 	public CssBorderCollapse cssBorderCollapse;
 	public CssEmptyCells cssEmptyCells;
 
@@ -431,6 +433,15 @@
 		return cssCounterReset;
 	}
 
+	public final CssCaptionSide getCaptionSide() {
+		if (cssCaptionSide == null) {
+			cssCaptionSide =
+					(CssCaptionSide) style.CascadingOrder(new CssCaptionSide(),
+							style, selector);
+		}
+		return cssCaptionSide;
+	}
+	
 	public final CssBorderCollapse getBorderCollapse() {
 		if (cssBorderCollapse == null) {
 			cssBorderCollapse =

--- /sources/public/2002/css-validator/org/w3c/css/properties/css2/CssCaptionSide.java	2012/12/05 15:47:17	NONE
+++ /sources/public/2002/css-validator/org/w3c/css/properties/css2/CssCaptionSide.java	2012/12/05 15:47:17	1.1
//
// $Id: CssCaptionSide.java,v 1.1 2012/12/05 15:47:17 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-caption-side
 */
public class CssCaptionSide extends org.w3c.css.properties.css.CssCaptionSide {

	public static final CssIdent[] allowed_values;

	static {
		String[] _allowed_values = {"top", "bottom", "left", "right"};
		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 CssCaptionSide
	 */
	public CssCaptionSide() {
	}

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

Received on Wednesday, 5 December 2012 15:47:27 UTC