cast+ref (cont.)

org/w3c/css/properties/css3/CssBackgroundAttachment.java

@@ -19,17 +19,19 @@
 import static org.w3c.css.values.CssOperator.COMMA;
 
 /**
- * @spec http://www.w3.org/TR/2009/CR-css3-background-20091217/#the-background-attachment
+ * @spec https://www.w3.org/TR/2021/CRD-css-backgrounds-3-20210726/#propdef-background-attachment
  */
 public class CssBackgroundAttachment extends org.w3c.css.properties.css.CssBackgroundAttachment {
 
-    private static CssIdent[] allowed_values;
+    private static final CssIdent[] allowed_values;
 
     static {
-        allowed_values = new CssIdent[3];
-        allowed_values[0] = CssIdent.getIdent("scroll");
-        allowed_values[1] = CssIdent.getIdent("fixed");
-        allowed_values[2] = CssIdent.getIdent("local");
+        String[] id_values = {"scroll", "fixed", "local"};
+        allowed_values = new CssIdent[id_values.length];
+        int i = 0;
+        for (String s : id_values) {
+            allowed_values[i++] = CssIdent.getIdent(s);
+        }
     }
 
     public static boolean isMatchingIdent(CssIdent ident) {
@@ -63,8 +65,7 @@ public CssBackgroundAttachment() {
      * @param ac         the context
      * @param expression The expression for this property
      * @param check      if some length checking is required
-     * @throws org.w3c.css.util.InvalidParamException
-     *          Values are incorrect
+     * @throws org.w3c.css.util.InvalidParamException Values are incorrect
      */
     public CssBackgroundAttachment(ApplContext ac, CssExpression expression,
                                    boolean check) throws InvalidParamException {
@@ -82,22 +83,22 @@ public CssBackgroundAttachment(ApplContext ac, CssExpression expression,
                 throw new InvalidParamException("value", val,
                         getPropertyName(), ac);
             }
-            if (inherit.equals(val)) {
+            CssIdent id = val.getIdent();
+            if (CssIdent.isCssWide(id)) {
                 // if we got inherit after other values, fail
                 // if we got more than one value... fail
                 if ((values.size() > 0) || (expression.getCount() > 1)) {
                     throw new InvalidParamException("value", val,
                             getPropertyName(), ac);
                 }
-                values.add(inherit);
+                values.add(val);
             } else {
                 // check that it's in the allowed values
-                CssValue new_val = getMatchingIdent((CssIdent) val);
-                if (new_val == null) {
+                if (getMatchingIdent(id) == null) {
                     throw new InvalidParamException("value", val,
                             getPropertyName(), ac);
                 }
-                values.add(new_val);
+                values.add(val);
             }
             expression.next();
             // and check that values are separated by commas
@@ -106,12 +107,7 @@ public CssBackgroundAttachment(ApplContext ac, CssExpression expression,
                         Character.toString(op), ac);
             }
         }
-
-        if (values.size() == 1) {
-            value = values.get(0);
-        } else {
-            value = new CssLayerList(values);
-        }
+        value = (values.size() == 1) ? values.get(0) : new CssLayerList(values);
     }
 
     public CssBackgroundAttachment(ApplContext ac, CssExpression expression)

org/w3c/css/properties/css3/CssBackgroundBlendMode.java

@@ -34,15 +34,14 @@ public CssBackgroundBlendMode() {
      * Creates a new CssBackgroundBlendMode
      *
      * @param expression The expression for this property
-     * @throws org.w3c.css.util.InvalidParamException
-     *          Expressions are incorrect
+     * @throws org.w3c.css.util.InvalidParamException Expressions are incorrect
      */
     public CssBackgroundBlendMode(ApplContext ac, CssExpression expression, boolean check)
             throws InvalidParamException {
         setByUser();
 
         CssValue val;
-        CssIdent ident, id;
+        CssIdent ident;
         char op;
 
         ArrayList<CssValue> values = new ArrayList<>();
@@ -52,22 +51,21 @@ public CssBackgroundBlendMode(ApplContext ac, CssExpression expression, boolean
             op = expression.getOperator();
 
             if (val.getType() == CssTypes.CSS_IDENT) {
-                ident = (CssIdent) val;
-                if (inherit.equals(ident)) {
+                ident = val.getIdent();
+                if (CssIdent.isCssWide(ident)) {
                     if (expression.getCount() > 1) {
                         throw new InvalidParamException("value",
                                 val.toString(),
                                 getPropertyName(), ac);
                     }
-                    values.add(inherit);
+                    values.add(val);
                 } else {
-                    id = CssMixBlendMode.getAllowedIdent(ident);
-                    if (id == null) {
+                    if (CssMixBlendMode.getAllowedIdent(ident) == null) {
                         throw new InvalidParamException("value",
                                 val.toString(),
                                 getPropertyName(), ac);
                     }
-                    values.add(id);
+                    values.add(val);
                 }
             } else {
                 throw new InvalidParamException("value",

org/w3c/css/properties/css3/CssBackgroundColor.java

@@ -10,10 +10,12 @@
 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/2009/CR-css3-background-20091217/#the-background-color
+ * @spec https://www.w3.org/TR/2021/CRD-css-backgrounds-3-20210726/#propdef-background-color
  */
 public class CssBackgroundColor extends org.w3c.css.properties.css.CssBackgroundColor {
 
@@ -28,8 +30,7 @@ public CssBackgroundColor() {
      * Create a new CssBackgroundColor
      *
      * @param expression The expression for this property
-     * @throws org.w3c.css.util.InvalidParamException
-     *          Values are incorrect
+     * @throws org.w3c.css.util.InvalidParamException Values are incorrect
      */
     public CssBackgroundColor(ApplContext ac, CssExpression expression,
                               boolean check) throws InvalidParamException {
@@ -41,8 +42,8 @@ public CssBackgroundColor(ApplContext ac, CssExpression expression,
             throw new InvalidParamException("unrecognize", ac);
         }
 
-        if (inherit.equals(val)) {
-            value = inherit;
+        if ((val.getType() == CssTypes.CSS_IDENT) && CssIdent.isCssWide(val.getIdent())) {
+            value = val;
             expression.next();
         } else {
             try {
@@ -51,7 +52,7 @@ public CssBackgroundColor(ApplContext ac, CssExpression expression,
                 CssColor tcolor = new CssColor(ac, expression, check);
                 // instead of using getColor, we get the value directly
                 // as we can have idents
-                value = (tcolor.value == null) ? tcolor.color : tcolor.value;
+                value = (tcolor.color != null) ? tcolor.color : tcolor.value;
             } catch (InvalidParamException e) {
                 throw new InvalidParamException("value",
                         expression.getValue(),
@@ -69,6 +70,7 @@ public CssBackgroundColor(ApplContext ac, CssExpression expression)
      * Is the value of this property is a default value.
      * It is used by all macro for the function <code>print</code>
      */
+    @Override
     public boolean isDefault() {
         return (value == transparent);
     }

org/w3c/css/properties/css3/CssBackgroundImage.java

@@ -19,7 +19,7 @@
 import static org.w3c.css.values.CssOperator.COMMA;
 
 /**
- * @spec http://www.w3.org/TR/2009/CR-css3-background-20091217/#the-background-image
+ * @spec https://www.w3.org/TR/2021/CRD-css-backgrounds-3-20210726/#propdef-background-image
  */
 public class CssBackgroundImage extends org.w3c.css.properties.css.CssBackgroundImage {
 
@@ -41,8 +41,7 @@ public CssBackgroundImage() {
      * @param ac         the context
      * @param expression The expression for this property
      * @param check      boolean
-     * @throws org.w3c.css.util.InvalidParamException
-     *          Values are incorrect
+     * @throws org.w3c.css.util.InvalidParamException Values are incorrect
      */
     public CssBackgroundImage(ApplContext ac, CssExpression expression,
                               boolean check) throws InvalidParamException {
@@ -62,17 +61,18 @@ public CssBackgroundImage(ApplContext ac, CssExpression expression,
                     values.add(val);
                     break;
                 case CssTypes.CSS_IDENT:
-                    if (inherit.equals(val)) {
+                    CssIdent id = val.getIdent();
+                    if (CssIdent.isCssWide(id)) {
                         // if we got inherit after other values, fail
                         // if we got more than one value... fail
                         if ((values.size() > 0) || (expression.getCount() > 1)) {
                             throw new InvalidParamException("value", val,
                                     getPropertyName(), ac);
                         }
-                        values.add(inherit);
+                        values.add(val);
                         break;
-                    } else if (none.equals(val)) {
-                        values.add(none);
+                    } else if (isMatchingIdent(id)) {
+                        values.add(val);
                         break;
                     }
                 default:
@@ -85,11 +85,7 @@ public CssBackgroundImage(ApplContext ac, CssExpression expression,
                         Character.toString(op), ac);
             }
         }
-        if (values.size() == 1) {
-            value = values.get(0);
-        } else {
-            value = new CssLayerList(values);
-        }
+        value = (values.size() == 1) ? values.get(0) : new CssLayerList(values);
     }
 
     public CssBackgroundImage(ApplContext ac, CssExpression expression)

org/w3c/css/properties/css3/CssBackgroundOrigin.java

@@ -21,7 +21,7 @@
 import static org.w3c.css.values.CssOperator.COMMA;
 
 /**
- * @spec http://www.w3.org/TR/2009/CR-css3-background-20091217/#the-background-origin
+ * @spec https://www.w3.org/TR/2021/CRD-css-backgrounds-3-20210726/#propdef-background-origin
  */
 
 public class CssBackgroundOrigin extends org.w3c.css.properties.css.CssBackgroundOrigin {
@@ -53,8 +53,7 @@ public CssBackgroundOrigin() {
      * Create a new CssBackgroundClip
      *
      * @param expression The expression for this property
-     * @throws org.w3c.css.util.InvalidParamException
-     *          Incorrect value
+     * @throws org.w3c.css.util.InvalidParamException Incorrect value
      */
     public CssBackgroundOrigin(ApplContext ac, CssExpression expression,
                                boolean check) throws InvalidParamException {
@@ -69,23 +68,19 @@ public CssBackgroundOrigin(ApplContext ac, CssExpression expression,
             op = expression.getOperator();
             switch (val.getType()) {
                 case CssTypes.CSS_IDENT:
-                    if (inherit.equals(val)) {
+                    CssIdent id = val.getIdent();
+                    if (CssIdent.isCssWide(id)) {
                         // if we got inherit after other values, fail
                         // if we got more than one value... fail
                         if ((values.size() > 0) || (expression.getCount() > 1)) {
                             throw new InvalidParamException("value", val,
                                     getPropertyName(), ac);
                         }
-                        values.add(inherit);
+                        values.add(val);
                         break;
-                    } else if (border_box.equals(val)) {
-                        values.add(border_box);
-                        break;
-                    } else if (content_box.equals(val)) {
-                        values.add(content_box);
-                        break;
-                    } else if (padding_box.equals(val)) {
-                        values.add(padding_box);
+                    }
+                    if (isMatchingIdent(id)) {
+                        values.add(val);
                         break;
                     }
                 default:
@@ -98,11 +93,7 @@ public CssBackgroundOrigin(ApplContext ac, CssExpression expression,
                         Character.toString(op), ac);
             }
         }
-        if (values.size() == 1) {
-            value = values.get(0);
-        } else {
-            value = new CssLayerList(values);
-        }
+        value = (values.size() == 1) ? values.get(0) : new CssLayerList(values);
     }
 
     public CssBackgroundOrigin(ApplContext ac, CssExpression expression)