2002/css-validator/org/w3c/css/properties/css3 CssFloat.java,NONE,1.1 Css3Style.java,1.96,1.97 CssFloatCSS3.java,1.4,NONE

Update of /sources/public/2002/css-validator/org/w3c/css/properties/css3
In directory hutz:/tmp/cvs-serv18302/css3

Modified Files:
	Css3Style.java 
Added Files:
	CssFloat.java 
Removed Files:
	CssFloatCSS3.java 
Log Message:
float per css1->css3

--- CssFloatCSS3.java DELETED ---

--- NEW FILE: CssFloat.java ---
// $Id: CssFloat.java,v 1.1 2012/09/28 11:30:59 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/#float
 */
public class CssFloat extends org.w3c.css.properties.css.CssFloat {

	public static final CssIdent[] allowed_values;

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

Index: Css3Style.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css3/Css3Style.java,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -d -r1.96 -r1.97
--- Css3Style.java	27 Sep 2012 20:56:41 -0000	1.96
+++ Css3Style.java	28 Sep 2012 11:30:59 -0000	1.97
@@ -82,7 +82,6 @@
 	CssAlignmentAdjust cssAlignmentAdjust;
 	CssBaselineShift cssBaselineShift;
 	CssFit cssFit;
-	CssFloatCSS3 cssFloatCSS3;
 
 	public CssOpacity cssOpacity;
 	public CssBackgroundClip cssBackgroundClip;
@@ -340,15 +339,6 @@
 		return cssFit;
 	}
 
-	public CssFloatCSS3 getFloatCSS3() {
-		if (cssFloatCSS3 == null) {
-			cssFloatCSS3 =
-					(CssFloatCSS3) style.CascadingOrder(
-							new CssFloatCSS3(), style, selector);
-		}
-		return cssFloatCSS3;
-	}
-
 	public CssColumns getColumns() {
 		if (cssColumns == null) {
 			cssColumns =

Received on Friday, 28 September 2012 11:31:06 UTC