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

2002/css-validator/org/w3c/css/properties/css2 CssBackgroundAttachment.java,1.1,1.2

From: Yves Lafon via cvs-syncmail <cvsmail@w3.org>
Date: Thu, 23 Aug 2012 17:15:38 +0000
To: www-validator-cvs@w3.org
Message-Id: <E1T4b0M-0007Cm-Pj@lionel-hutz.w3.org>
Update of /sources/public/2002/css-validator/org/w3c/css/properties/css2
In directory hutz:/tmp/cvs-serv27635/css2

Modified Files:
	CssBackgroundAttachment.java 
Log Message:
ident case sensitivity

Index: CssBackgroundAttachment.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css2/CssBackgroundAttachment.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- CssBackgroundAttachment.java	9 Feb 2012 17:36:30 -0000	1.1
+++ CssBackgroundAttachment.java	23 Aug 2012 17:15:36 -0000	1.2
@@ -6,9 +6,6 @@
 // Please first read the full copyright statement in file COPYRIGHT.html
 package org.w3c.css.properties.css2;
 
-import org.w3c.css.parser.CssStyle;
-import org.w3c.css.properties.css.CssProperty;
-import org.w3c.css.properties.css1.Css1Style;
 import org.w3c.css.util.ApplContext;
 import org.w3c.css.util.InvalidParamException;
 import org.w3c.css.values.CssExpression;
@@ -16,162 +13,83 @@
 import org.w3c.css.values.CssTypes;
 import org.w3c.css.values.CssValue;
 
-import java.util.HashMap;
-
 /**
- * <H4>
- * &nbsp;&nbsp; 'background-attachment'
- * </H4>
- * <p/>
- * <EM>Value:</EM> scroll | fixed<BR>
- * <EM>Initial:</EM> scroll<BR>
- * <EM>Applies to:</EM> all elements<BR>
- * <EM>Inherited:</EM> no<BR>
- * <EM>Percentage values:</EM> N/A<BR>
- * <p/>
- * If a background image is specified, the value of 'background-attachment'
- * determines if it is fixed with regard to the canvas or if it scrolls along
- * with the content.
- * <PRE>
- * BODY {
- * background: red url(pendant.gif);
- * background-repeat: repeat-y;
- * background-attachment: fixed;
- * }
- * </PRE>
- *
- * @version $Revision$
+ * @spec http://www.w3.org/TR/2008/REC-CSS2-20080411/colors.html#propdef-background-attachment
  */
 public class CssBackgroundAttachment extends org.w3c.css.properties.css.CssBackgroundAttachment {
 
-    public static boolean checkMatchingIdent(CssIdent ident) {
-        return allowed_values.containsValue(ident);
-    }
-
-    private static HashMap<String,CssIdent> allowed_values;
-    private static CssIdent scroll;
-
-    static {
-        allowed_values = new HashMap<String, CssIdent>();
-        scroll = CssIdent.getIdent("scroll");
-        allowed_values.put("scroll", scroll);
-        allowed_values.put("fixed", CssIdent.getIdent("fixed"));
-    }
-
-    CssIdent value;
-
-    /**
-     * Create a new CssBackgroundAttachment
-     */
-    public CssBackgroundAttachment() {
-        value = scroll;
-    }
-
-    /**
-     * Creates a new CssBackgroundAttachment
-     *
-     * @param expression The expression for this property
-     * @throws InvalidParamException Values are incorrect
-     */
-    public CssBackgroundAttachment(ApplContext ac, CssExpression expression,
-                                   boolean check) throws InvalidParamException {
-
-        if (check && expression.getCount() > 1) {
-            throw new InvalidParamException("unrecognize", ac);
-        }
+	public static boolean checkMatchingIdent(CssIdent ident) {
+		for (CssIdent id : allowed_values) {
+			if (id.equals(ident)) {
+				return true;
+			}
+		}
+		return false;
+	}
 
-        setByUser();
+	private static CssIdent[] allowed_values;
 
-        CssValue val = expression.getValue();
+	static {
+		allowed_values = new CssIdent[2];
+		allowed_values[0] = CssIdent.getIdent("scroll");
+		allowed_values[1] = CssIdent.getIdent("fixed");
+	}
 
-        if (val.getType() == CssTypes.CSS_IDENT) {
-            if (inherit.equals(val)) {
-                value = inherit;
-                expression.next();
-                return;
-            }
-            CssIdent new_val = allowed_values.get(val.toString());
-            if (new_val != null) {
-                value = new_val;
-                expression.next();
-                return;
-            }
-        }
+	public static CssIdent getMatchingIdent(CssIdent ident) {
+		for (CssIdent id : allowed_values) {
+			if (id.equals(ident)) {
+				return id;
+			}
+		}
+		return null;
+	}
 
+	/**
+	 * Create a new CssBackgroundAttachment
+	 */
+	public CssBackgroundAttachment() {
+	}
 
-        throw new InvalidParamException("value", expression.getValue(),
-                getPropertyName(), ac);
-    }
+	/**
+	 * Creates a new CssBackgroundAttachment
+	 *
+	 * @param expression The expression for this property
+	 * @throws InvalidParamException Values are incorrect
+	 */
+	public CssBackgroundAttachment(ApplContext ac, CssExpression expression,
+								   boolean check) throws InvalidParamException {
 
-    public CssBackgroundAttachment(ApplContext ac, CssExpression expression)
-            throws InvalidParamException {
-        this(ac, expression, false);
-    }
+		if (check && expression.getCount() > 1) {
+			throw new InvalidParamException("unrecognize", ac);
+		}
 
-    /**
-     * Returns the value of this property
-     */
-    public Object get() {
-        return value;
-    }
+		setByUser();
 
-    /**
-     * Returns true if this property is "softly" inherited
-     * e.g. his value equals inherit
-     */
-    public boolean isSoftlyInherited() {
-        return (inherit == value);
-    }
+		CssValue val = expression.getValue();
 
-    /**
-     * Returns a string representation of the object.
-     */
-    public String toString() {
-        return value.toString();
-    }
+		if (val.getType() == CssTypes.CSS_IDENT) {
+			if (inherit.equals(val)) {
+				value = inherit;
+				expression.next();
+				return;
+			}
+			CssIdent new_val = getMatchingIdent((CssIdent) val);
+			if (new_val != null) {
+				value = new_val;
+				expression.next();
+				return;
+			}
+		}
 
-    /**
-     * Add this property to the CssStyle.
-     *
-     * @param style The CssStyle
-     */
-    public void addToStyle(ApplContext ac, CssStyle style) {
-        org.w3c.css.properties.css.CssBackground cssBackground = ((Css1Style) style).cssBackground;
-        if (cssBackground.attachment != null)
-            style.addRedefinitionWarning(ac, this);
-        cssBackground.attachment = this;
-    }
 
-    /**
-     * Get this property in the style.
-     *
-     * @param style   The style where the property is
-     * @param resolve if true, resolve the style to find this property
-     */
-    public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
-        if (resolve) {
-            return ((Css1Style) style).getBackgroundAttachment();
-        } else {
-            return ((Css1Style) style).cssBackground.attachment;
-        }
-    }
+		throw new InvalidParamException("value", expression.getValue(),
+				getPropertyName(), ac);
+	}
 
-    /**
-     * Compares two properties for equality.
-     *
-     * @param property The other property.
-     */
-    public boolean equals(CssProperty property) {
-        return (property instanceof CssBackgroundAttachment &&
-                value == ((CssBackgroundAttachment) property).value);
-    }
+	public CssBackgroundAttachment(ApplContext ac, CssExpression expression)
+			throws InvalidParamException {
+		this(ac, expression, false);
+	}
 
-    /**
-     * Is the value of this property is a default value.
-     * It is used by all macro for the function <code>print</code>
-     */
-    public boolean isDefault() {
-        return (scroll == value);
-    }
 
 }
Received on Thursday, 23 August 2012 17:15:39 UTC

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