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

2002/css-validator/org/w3c/css/properties/css2 CssOverflow.java,NONE,1.1 Css2Style.java,1.21,1.22

From: Yves Lafon via cvs-syncmail <cvsmail@w3.org>
Date: Mon, 05 Nov 2012 17:36:14 +0000
To: www-validator-cvs@w3.org
Message-Id: <E1TVQas-0004Ze-QE@lionel-hutz.w3.org>
Update of /sources/public/2002/css-validator/org/w3c/css/properties/css2
In directory hutz:/tmp/cvs-serv17386/css2

Modified Files:
	Css2Style.java 
Added Files:
	CssOverflow.java 
Log Message:
overflow per css2/21/3 overflow-x and overflow-y per css3 http://www.w3.org/TR/2007/WD-css3-box-20070809/#overflow

Index: Css2Style.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css2/Css2Style.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- Css2Style.java	5 Nov 2012 15:35:25 -0000	1.21
+++ Css2Style.java	5 Nov 2012 17:36:12 -0000	1.22
@@ -22,6 +22,7 @@
 import org.w3c.css.properties.css.CssOutlineColor;
 import org.w3c.css.properties.css.CssOutlineStyle;
 import org.w3c.css.properties.css.CssOutlineWidth;
+import org.w3c.css.properties.css.CssOverflow;
 import org.w3c.css.properties.css.CssPosition;
 import org.w3c.css.properties.css.CssRight;
 import org.w3c.css.properties.css.CssTextShadow;
@@ -79,6 +80,7 @@
 	public CssDirection cssDirection;
 	public CssUnicodeBidi cssUnicodeBidi;
 	public CssVisibility cssVisibility;
+	public CssOverflow cssOverflow;
 
 	/**
 	 * Get the azimuth
@@ -374,6 +376,17 @@
 		return cssVisibility;
 	}
 	/**
+	 * Get the overflow property
+	 */
+	public final CssOverflow getOverflow() {
+		if (cssOverflow == null) {
+			cssOverflow =
+					(CssOverflow) style.CascadingOrder(new CssOverflow(),
+							style, selector);
+		}
+		return cssOverflow;
+	}
+	/**
 	 * Find conflicts in this Style
 	 *
 	 * @param warnings     For warnings reports.

--- NEW FILE: CssOverflow.java ---
// $Id: CssOverflow.java,v 1.1 2012/11/05 17:36:12 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/visufx.html#propdef-overflow
 */
public class CssOverflow extends org.w3c.css.properties.css.CssOverflow {

	public static final CssIdent[] allowed_values;

	static {
		String[] _allowed_values = {"visible", "hidden", "scroll", "auto"};
		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 CssOverflow
	 */
	public CssOverflow() {
	}

	/**
	 * Creates a new CssOverflow
	 *
	 * @param expression The expression for this property
	 * @throws org.w3c.css.util.InvalidParamException
	 *          Expressions are incorrect
	 */
	public CssOverflow(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) {
			throw new InvalidParamException("value", val,
					getPropertyName(), ac);
		}
		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);
			}
		}
		expression.next();
	}

	public CssOverflow(ApplContext ac, CssExpression expression)
			throws InvalidParamException {
		this(ac, expression, false);
	}
}
Received on Monday, 5 November 2012 17:36:16 UTC

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