Following w3c#257 output of color parsing no longer depends on the css level, but on the original syntax, at least for rgb/rgba

Author: ylafon

org/w3c/css/values/CssColor.java

@@ -211,6 +211,7 @@ public void setModernRGBColor(ApplContext ac, CssExpression exp)
         color = null;
         rgba = new RGBA("rgb");
         boolean separator_space = (op == SPACE);
+        rgba.setModernStyle(separator_space);
 
         if (val == null || (!separator_space && (op != COMMA))) {
             throw new InvalidParamException("invalid-color", ac);

org/w3c/css/values/RGB.java

@@ -16,7 +16,7 @@ public class RGB {
 
     private String output = null;
     private boolean percent = false;
-    boolean isCss3 = false;
+    boolean isModernCss = false;
 
     CssValue vr, vg, vb;
 
@@ -27,10 +27,10 @@ public static final CssValue filterValue(ApplContext ac, CssValue val)
             // might need to extend...
         } else {
             if (val.getType() == CssTypes.CSS_NUMBER) {
-                boolean isCss3 = (ac.getCssVersion().compareTo(CssVersion.CSS3) >= 0);
+                boolean IsModernCss = (ac.getCssVersion().compareTo(CssVersion.CSS3) >= 0);
                 CssCheckableValue v = val.getCheckableValue();
                 // in CSS2, numbers can only be integers
-                if (!isCss3) {
+                if (!IsModernCss) {
                     if (!v.isInteger()) {
                         throw new InvalidParamException("rgb", val, ac);
                     }
@@ -71,7 +71,6 @@ public static final CssValue filterValue(ApplContext ac, CssValue val)
     public final void setRed(ApplContext ac, CssValue val)
             throws InvalidParamException {
         output = null;
-        isCss3 = (ac.getCssVersion().compareTo(CssVersion.CSS3) >= 0);
         vr = filterValue(ac, val);
     }
 
@@ -130,14 +129,14 @@ public RGB(int r, int g, int b) {
     /**
      * Create a new RGB with default values
      *
-     * @param isCss3 a boolean toggling the output of RGB
-     * @param r the red channel, an <EM>int</EM>
-     * @param g the green channel, an <EM>int</EM>
-     * @param b the blue channel, an <EM>int</EM>
+     * @param isModernCss a boolean toggling the output of RGB
+     * @param r           the red channel, an <EM>int</EM>
+     * @param g           the green channel, an <EM>int</EM>
+     * @param b           the blue channel, an <EM>int</EM>
      */
-    public RGB(boolean isCss3, int r, int g, int b) {
+    public RGB(boolean isModernCss, int r, int g, int b) {
         this(r, g, b);
-        this.isCss3 = isCss3;
+        this.isModernCss = isModernCss;
     }
 
     public boolean equals(RGB other) {
@@ -151,13 +150,18 @@ protected void setRepresentationString(String s) {
         output = s;
     }
 
+    protected void setModernStyle(boolean isModernCss) {
+        this.isModernCss = isModernCss;
+        output = null;
+    }
+
     /**
      * Returns a string representation of the object.
      */
     public String toString() {
         if (output == null) {
             StringBuilder sb = new StringBuilder(functionname).append('(');
-            if (isCss3) {
+            if (isModernCss) {
                 sb.append(vr).append(' ').append(vg).append(' ').append(vb).append(')');
             } else {
                 sb.append(vr).append(", ");

org/w3c/css/values/RGBA.java

@@ -117,15 +117,15 @@ public RGBA(int r, int g, int b, float a) {
     /**
      * Create a new RGBA with default values
      *
-     * @param isCss3 a boolean toggling the output of RGB
-     * @param r      the red channel, an <EM>int</EM>
-     * @param g      the green channel, an <EM>int</EM>
-     * @param b      the blue channel, an <EM>int</EM>
-     * @param a      the alpha channel, an <EM>float</EM>
+     * @param isModernCss a boolean toggling the output of RGB
+     * @param r           the red channel, an <EM>int</EM>
+     * @param g           the green channel, an <EM>int</EM>
+     * @param b           the blue channel, an <EM>int</EM>
+     * @param a           the alpha channel, an <EM>float</EM>
      */
-    public RGBA(boolean isCss3, int r, int g, int b, float a) {
+    public RGBA(boolean isModernCss, int r, int g, int b, float a) {
         this(r, g, b, a);
-        this.isCss3 = isCss3;
+        this.isModernCss = isModernCss;
     }
 
     protected void setRepresentationString(String s) {
@@ -138,7 +138,7 @@ protected void setRepresentationString(String s) {
     public String toString() {
         if (output == null) {
             StringBuilder sb = new StringBuilder();
-            if (isCss3) {
+            if (isModernCss) {
                 sb.append(RGB.functionname).append('(');
                 sb.append(vr).append(' ');
                 sb.append(vg).append(' ').append(vb);
@@ -149,9 +149,11 @@ public String toString() {
             } else {
                 sb.append(fname).append('(');
                 sb.append(vr).append(", ");
-                sb.append(vg).append(", ");
-                sb.append(vb).append(", ");
-                sb.append(va).append(')');
+                sb.append(vg).append(", ").append(vb);
+                if (va != null) {
+                    sb.append(", ").append(va);
+                }
+                sb.append(')');
             }
             output = sb.toString();
         }