Redone HSLA support to use CssValues

Author: ylafon

org/w3c/css/values/CssColor.java

@@ -499,7 +499,7 @@ public void setHSLColor(CssExpression exp, ApplContext ac)
         switch (val.getType()) {
             case CssTypes.CSS_ANGLE:
             case CssTypes.CSS_NUMBER:
-               hsl.setHue(ac, val);
+                hsl.setHue(ac, val);
                 break;
             default:
                 throw new InvalidParamException("rgb", val, ac); // FIXME hsl
@@ -564,11 +564,13 @@ public void setHSLAColor(CssExpression exp, ApplContext ac)
         if (val == null || op != COMMA) {
             throw new InvalidParamException("invalid-color", ac);
         }
-        if (val.getType() == CssTypes.CSS_NUMBER) {
-            CssNumber number = (CssNumber) val;
-            hsla.setHue(angleValue(number.getValue(), ac));
-        } else {
-            throw new InvalidParamException("rgb", val, ac); // FIXME hsl
+        switch (val.getType()) {
+            case CssTypes.CSS_ANGLE:
+            case CssTypes.CSS_NUMBER:
+                hsla.setHue(ac, val);
+                break;
+            default:
+                throw new InvalidParamException("rgb", val, ac); // FIXME hsl
         }
 
         // S
@@ -580,8 +582,7 @@ public void setHSLAColor(CssExpression exp, ApplContext ac)
             throw new InvalidParamException("invalid-color", ac);
         }
         if (val.getType() == CssTypes.CSS_PERCENTAGE) {
-            CssPercentage percent = (CssPercentage) val;
-            hsla.setSaturation(clippedPercentValue(percent.floatValue(), ac));
+            hsla.setSaturation(ac, val);
         } else {
             exp.starts();
             throw new InvalidParamException("rgb", val, ac); // FIXME hsl
@@ -596,8 +597,7 @@ public void setHSLAColor(CssExpression exp, ApplContext ac)
             throw new InvalidParamException("invalid-color", ac);
         }
         if (val.getType() == CssTypes.CSS_PERCENTAGE) {
-            CssPercentage percent = (CssPercentage) val;
-            hsla.setLightness(clippedPercentValue(percent.floatValue(), ac));
+            hsla.setLightness(ac, val);
         } else {
             exp.starts();
             throw new InvalidParamException("rgb", val, ac); // FIXME hsl
@@ -610,12 +610,15 @@ public void setHSLAColor(CssExpression exp, ApplContext ac)
             exp.starts();
             throw new InvalidParamException("invalid-color", ac);
         }
-        if (val.getType() == CssTypes.CSS_NUMBER) {
-            CssNumber number = (CssNumber) val;
-            hsla.setAlpha(clippedAlphaValue(number.getValue(), ac));
-        } else {
-            exp.starts();
-            throw new InvalidParamException("rgb", val, ac); // FIXME hsl
+        switch (val.getType()) {
+            case CssTypes.CSS_NUMBER:
+                // starting with CSS Color 4
+            case CssTypes.CSS_PERCENTAGE:
+                hsla.setAlpha(ac, val);
+                break;
+            default:
+                exp.starts();
+                throw new InvalidParamException("rgb", val, ac); // FIXME rgba
         }
         // extra values?
         exp.next();

org/w3c/css/values/HSLA.java

@@ -13,65 +13,37 @@
  */
 package org.w3c.css.values;
 
-import org.w3c.css.util.Util;
+import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
 
-public class HSLA {
-    String output = null;
-    float fh;
-    float fs;
-    float fl;
-    float fa;
+public class HSLA extends HSL {
+    CssValue va;
 
     /**
-     * Create a new HSL
+     * Create a new HSLA
      */
     public HSLA() {
     }
 
-    public void setHue(float hue) {
-        this.fh = (float) ((((double) hue % 360.0) + 360.0) % 360.0);
-    }
-
-    public void setHue(CssNumber hue) {
-        setHue(hue.getValue());
-    }
-
-    public void setSaturation(float sat) {
-        this.fs = sat;
-    }
-
-    public void setSaturation(CssNumber sat) {
-        setSaturation(sat.getValue());
-    }
-
-    public void setLightness(float light) {
-        this.fl = light;
-    }
-
-    public void setLightness(CssNumber light) {
-        setLightness(light.getValue());
-    }
-
-    public void setAlpha(float alpha) {
-        this.fa = alpha;
-    }
-
-    public void setAlpha(CssNumber alpha) {
-        setAlpha(alpha.getValue());
+    public void setAlpha(ApplContext ac, CssValue alpha)
+            throws InvalidParamException {
+        output = null;
+        va = RGBA.filterAlpha(ac, alpha);
     }
 
     /**
      * Returns a string representation of the object.
      */
     public String toString() {
         if (output == null) {
-            StringBuilder sb = new StringBuilder("hsla(");
-            sb.append(Util.displayFloat(fh)).append(", ");
-            sb.append(Util.displayFloat(fs)).append("%, ");
-            sb.append(Util.displayFloat(fl)).append("%, ");
-            sb.append(Util.displayFloat(fa)).append(')');
+            StringBuilder sb = new StringBuilder("hsl(");
+            sb.append(vh).append(", ");
+            sb.append(vs).append(", ");
+            sb.append(vl).append(", ");
+            sb.append(va).append(")");
             output = sb.toString();
         }
         return output;
+
     }
 }