avoid casting, use accessors instead (for properties that have multiple types)

Author: ylafon

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

@@ -81,8 +81,7 @@ public CssTextEmphasisStyle() {
      * Creates a new CssTextEmphasisStyle
      *
      * @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 CssTextEmphasisStyle(ApplContext ac, CssExpression expression, boolean check)
             throws InvalidParamException {
@@ -102,31 +101,33 @@ public CssTextEmphasisStyle(ApplContext ac, CssExpression expression, boolean ch
 
         switch (val.getType()) {
             case CssTypes.CSS_STRING:
-                CssString s = (CssString) val;
-                // limit of 1 character + two surrounding quotes
-                // TODO might be a warning only
-                if (s.toString().length() != 3) {
-                    throw new InvalidParamException("value",
-                            s, getPropertyName(), ac);
+                if (val.getRawType() == CssTypes.CSS_STRING) {
+                    CssString s = (CssString) val;
+                    // limit of 1 character + two surrounding quotes
+                    // TODO might be a warning only
+                    if (s.toString().length() != 3) {
+                        throw new InvalidParamException("value",
+                                s, getPropertyName(), ac);
+                    }
                 }
                 if (check && expression.getCount() != 1) {
                     throw new InvalidParamException("value",
                             val.toString(),
                             getPropertyName(), ac);
                 }
-                value = s;
+                value = val;
                 break;
             case CssTypes.CSS_IDENT:
-                CssIdent ident = (CssIdent) val;
+                CssIdent ident = val.getIdent();
                 if (inherit.equals(ident)) {
-                    value = inherit;
+                    value = val;
                     if (check && expression.getCount() != 1) {
                         throw new InvalidParamException("value",
                                 val.toString(),
                                 getPropertyName(), ac);
                     }
                 } else if (none.equals(ident)) {
-                    value = none;
+                    value = val;
                     if (check && expression.getCount() != 1) {
                         throw new InvalidParamException("value",
                                 val.toString(),
@@ -168,7 +169,7 @@ public CssTextEmphasisStyle(ApplContext ac, CssExpression expression, boolean ch
                                     val.toString(),
                                     getPropertyName(), ac);
                         }
-                        ident = (CssIdent) val;
+                        ident = val.getIdent();
                     } while (!expression.end());
                     // now construct the value
                     if (formValue != null && styleValue != null) {

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

@@ -35,8 +35,7 @@ public CssTextShadow() {
      * Creates a new CssTextShadow
      *
      * @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 CssTextShadow(ApplContext ac, CssExpression expression, boolean check)
             throws InvalidParamException {
@@ -55,21 +54,21 @@ public CssTextShadow(ApplContext ac, CssExpression expression, boolean check)
             val = expression.getValue();
             op = expression.getOperator();
 
-            if (inherit.equals(val)) {
+            if (inherit.equals(val.getIdent())) {
                 if (expression.getCount() > 1) {
                     throw new InvalidParamException("value", val,
                             getPropertyName(), ac);
                 }
-                value = inherit;
+                value = val;
                 expression.next();
                 return;
             }
-            if (none.equals(val)) {
+            if (none.equals(val.getIdent())) {
                 if (expression.getCount() > 1) {
                     throw new InvalidParamException("value", val,
                             getPropertyName(), ac);
                 }
-                value = none;
+                value = val;
                 expression.next();
                 return;
             }
@@ -132,14 +131,13 @@ public CssValue check(ApplContext ac, CssExpression exp)
                     throw new InvalidParamException("value",
                             val, getPropertyName(), ac);
                 }
+                // FIXME rewrite potential exceptions
                 CssColor c = new CssColor(ac, exp, false);
-                color = c.getColor();
+                color = val;
                 // color can be first or last
                 if (values.size() > 0 && exp.getRemainingCount() != 0) {
-                    if (color != null) {
-                        throw new InvalidParamException("value",
-                                val, getPropertyName(), ac);
-                    }
+                    throw new InvalidParamException("value",
+                            val, getPropertyName(), ac);
                 }
                 // no need for exp.next() as CssColor parsing is
                 // already doing that.