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

2002/css-validator/org/w3c/css/properties/css3 CssClear.java,NONE,1.1 Css3Style.java,1.95,1.96 CssClearCSS3.java,1.4,NONE

From: Yves Lafon via cvs-syncmail <cvsmail@w3.org>
Date: Thu, 27 Sep 2012 20:56:44 +0000
To: www-validator-cvs@w3.org
Message-Id: <E1THL8W-0001rp-6h@lionel-hutz.w3.org>
Update of /sources/public/2002/css-validator/org/w3c/css/properties/css3
In directory hutz:/tmp/cvs-serv7048/css3

Modified Files:
	Css3Style.java 
Added Files:
	CssClear.java 
Removed Files:
	CssClearCSS3.java 
Log Message:
clear per relevant specs

Index: Css3Style.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css3/Css3Style.java,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -d -r1.95 -r1.96
--- Css3Style.java	25 Sep 2012 19:51:27 -0000	1.95
+++ Css3Style.java	27 Sep 2012 20:56:41 -0000	1.96
@@ -83,7 +83,6 @@
 	CssBaselineShift cssBaselineShift;
 	CssFit cssFit;
 	CssFloatCSS3 cssFloatCSS3;
-	CssClearCSS3 cssClearCSS3;
 
 	public CssOpacity cssOpacity;
 	public CssBackgroundClip cssBackgroundClip;
@@ -350,15 +349,6 @@
 		return cssFloatCSS3;
 	}
 
-	public CssClearCSS3 getClearCSS3() {
-		if (cssClearCSS3 == null) {
-			cssClearCSS3 =
-					(CssClearCSS3) style.CascadingOrder(
-							new CssClearCSS3(), style, selector);
-		}
-		return cssClearCSS3;
-	}
-
 	public CssColumns getColumns() {
 		if (cssColumns == null) {
 			cssColumns =

--- CssClearCSS3.java DELETED ---

--- NEW FILE: CssClear.java ---
// $Id: CssClear.java,v 1.1 2012/09/27 20:56:42 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.css3;

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/2007/WD-css3-box-20070809/#clear
 */
public class CssClear extends org.w3c.css.properties.css.CssClear {

	public static final CssIdent[] allowed_values;

	static {
		String[] _allowed_values = {"none", "left", "right", "both"};
		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 CssClear
	 */
	public CssClear() {
		value = initial;
	}


	/**
	 * Set the value of the property<br/>
	 * Does not check the number of values
	 *
	 * @param expression The expression for this property
	 * @throws org.w3c.css.util.InvalidParamException
	 *          The expression is incorrect
	 */
	public CssClear(ApplContext ac, CssExpression expression)
			throws InvalidParamException {
		this(ac, expression, false);
	}

	/**
	 * Set the value of the property
	 *
	 * @param expression The expression for this property
	 * @param check      set it to true to check the number of values
	 * @throws org.w3c.css.util.InvalidParamException
	 *          The expression is incorrect
	 */
	public CssClear(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();
	}
}
Received on Thursday, 27 September 2012 20:56:48 UTC

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