Bugzilla #38946:

First step for improved color handling. FOP's own ColorType was replaced with java.awt.Color throughout the codebase.
Submitted by: Max Berger <max.at.berger.name>

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@399185 13f79535-47bb-0310-9956-ffa450edef68

6 files changed, 186 insertions, 832 deletions

diff --git a/src/java/org/apache/fop/fo/properties/ColorProperty.java b/src/java/org/apache/fop/fo/properties/ColorProperty.java
new file mode 100644
index 000000000..4b76d5afe
--- /dev/null
+++ b/src/java/org/apache/fop/fo/properties/ColorProperty.java
@@ -0,0 +1,137 @@
+/*
+ * Copyright 1999-2006 The Apache Software Foundation.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/* $Id: ColorTypeProperty.java 377045 2006-02-11 20:23:47Z jeremias $ */
+
+package org.apache.fop.fo.properties;
+
+import java.awt.Color;
+
+import org.apache.fop.fo.FObj;
+import org.apache.fop.fo.PropertyList;
+import org.apache.fop.fo.expr.PropertyException;
+import org.apache.fop.util.ColorUtil;
+
+/**
+ * Superclass for properties that wrap Color values
+ */
+public class ColorProperty extends Property  {
+    
+    /**
+     * The color represented by this property.
+     */
+    protected final Color color;
+
+    
+    /**
+     * Inner class for creating instances of ColorTypeProperty
+     */
+    public static class Maker extends PropertyMaker {
+
+        /**
+         * @param propId the id of the property for which a Maker should be created
+         */
+        public Maker(int propId) {
+            super(propId);
+        }
+
+        /**
+         * Return a ColorProperty object based on the passed Property object.
+         * This method is called if the Property object built by the parser
+         * isn't the right type for this property.
+         * 
+         * @param p
+         *            The Property object return by the expression parser
+         * @param propertyList
+         *            The PropertyList object being built for this FO.
+         * @param fo
+         *            The parent FO for the FO whose property is being made.
+         * @return A Property of the correct type or null if the parsed value
+         *         can't be converted to the correct type.
+         * @throws PropertyException
+         *             for invalid or inconsistent FO input
+         * @see org.apache.fop.fo.properties.PropertyMaker#convertProperty(
+         *          org.apache.fop.fo.properties.Property,
+         *      org.apache.fop.fo.PropertyList, org.apache.fop.fo.FObj)
+         */
+        public Property convertProperty(Property p,
+                                        PropertyList propertyList, FObj fo) 
+                    throws PropertyException {
+            if (p instanceof ColorProperty) {
+                return p;
+            }
+            Color val = p.getColor();
+            if (val != null) {
+                return new ColorProperty(val);
+            }
+            return convertPropertyDatatype(p, propertyList, fo);
+        }
+
+    }
+
+
+    /**
+     * Set the color given a particular String. For a full List of supported
+     * values please see ColorUtil.
+     * 
+     * @param value RGB value as String to be parsed
+     * @throws PropertyException if the value can't be parsed
+     * @see ColorUtil#parseColorString(String)
+     */
+    public ColorProperty(String value) throws PropertyException {
+        this.color = ColorUtil.parseColorString(value);
+    }
+
+    /**
+     * Create a new ColorProperty with a given color.
+     * 
+     * @param value the color to use.
+     */
+    public ColorProperty(Color value) {
+        this.color = value;
+    }
+    
+    /**
+     * Returns an AWT instance of this color
+     * @return float the AWT color represented by this ColorType instance
+     */
+    public Color getColor() {
+        return color;
+    }
+
+    /**
+     * @see java.lang.Object#toString()
+     */
+    public String toString() {
+        return ColorUtil.colorTOsRGBString(color);
+    }
+
+    /**
+     * Can't convert to any other types
+     * @return this.colorType
+     */
+    public ColorProperty getColorProperty() {
+        return this;
+    }
+
+    /**
+     * @return this.colorType cast as an Object
+     */
+    public Object getObject() {
+        return this;
+    }
+}
+
diff --git a/src/java/org/apache/fop/fo/properties/ColorTypeProperty.java b/src/java/org/apache/fop/fo/properties/ColorTypeProperty.java
deleted file mode 100644
index 836d3d974..000000000
--- a/src/java/org/apache/fop/fo/properties/ColorTypeProperty.java
+++ /dev/null
@@ -1,789 +0,0 @@
-/*
- * Copyright 1999-2006 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/* $Id$ */
-
-package org.apache.fop.fo.properties;
-
-import java.awt.Color;
-import java.util.StringTokenizer;
-
-import org.apache.fop.datatypes.ColorType;
-import org.apache.fop.fo.FObj;
-import org.apache.fop.fo.PropertyList;
-import org.apache.fop.fo.expr.PropertyException;
-
-/**
- * Superclass for properties that wrap ColorType values
- */
-public class ColorTypeProperty extends Property implements ColorType {
-    /**
-     * the red component
-     */
-    protected float red = 0f;
-
-    /**
-     * the green component
-     */
-    protected float green = 0f;
-
-    /**
-     * the blue component
-     */
-    protected float blue = 0f;
-
-    /**
-     * the alpha component (indicator of opaque-ness)
-     * 0.0 - 1.0; 0.0 is completely transparent; 1.0 is completely opaque
-     * see definition at http://java.sun.com/j2se/1.3/docs/api/java/awt/Color.html
-     */
-    protected float alpha = 1f;
-
-    /**
-     * Inner class for creating instances of ColorTypeProperty
-     */
-    public static class Maker extends PropertyMaker {
-
-        /**
-         * @param propId the id of the property for which a Maker should be created
-         */
-        public Maker(int propId) {
-            super(propId);
-        }
-
-        /** @see org.apache.fop.fo.properties.PropertyMaker */
-        public Property convertProperty(Property p,
-                                        PropertyList propertyList, FObj fo) 
-                    throws PropertyException {
-            if (p instanceof ColorTypeProperty) {
-                return p;
-            }
-            ColorTypeProperty val = p.getColorType();
-            if (val != null) {
-                return val;
-            }
-            return convertPropertyDatatype(p, propertyList, fo);
-        }
-
-    }
-
-    /**
-     * Main constructor
-     * @param red red component
-     * @param green green component
-     * @param blue blue component
-     */
-    public ColorTypeProperty(float red, float green, float blue) {
-        this.red = red;
-        this.green = green;
-        this.blue = blue;
-    }
-
-    /**
-     * Set the colour given a particular String specifying either a
-     * colour name or #RGB or #RRGGBB
-     * @param value RGB value as String to be parsed
-     * @throws PropertyException if the value can't be parsed
-     */
-    public ColorTypeProperty(String value) throws PropertyException {
-        if (value.startsWith("#")) {
-            try {
-                if (value.length() == 4) {
-                    // note: divide by 15 so F = FF = 1 and so on
-                    this.red = Integer.parseInt(value.substring(1, 2), 16)
-                    / 15f;
-                    this.green = Integer.parseInt(value.substring(2, 3), 16)
-                    / 15f;
-                    this.blue = Integer.parseInt(value.substring(3), 16)
-                    / 15f;
-                } else if (value.length() == 7) {
-                    // note: divide by 255 so FF = 1
-                    this.red = Integer.parseInt(value.substring(1, 3), 16)
-                    / 255f;
-                    this.green = Integer.parseInt(value.substring(3, 5), 16)
-                    / 255f;
-                    this.blue = Integer.parseInt(value.substring(5), 16)
-                    / 255f;
-                } else {
-                    throw new PropertyException("Unknown color format: "
-                            + value + ". Must be #RGB or #RRGGBB");
-                }
-            } catch (NumberFormatException e) {
-                throw new PropertyException("Unknown color format: " + value
-                        + ". Must be #RGB or #RRGGBB");
-            }
-        } else if (value.startsWith("rgb(")) {
-            int poss = value.indexOf("(");
-            int pose = value.indexOf(")");
-            if (poss != -1 && pose != -1) {
-                value = value.substring(poss + 1, pose);
-                StringTokenizer st = new StringTokenizer(value, ",");
-                try {
-                    if (st.hasMoreTokens()) {
-                        String str = st.nextToken().trim();
-                        if (str.endsWith("%")) {
-                            this.red = Float.parseFloat(str.substring(0, str
-                                    .length() - 1)) / 100.0f;
-                        } else {
-                            this.red = Float.parseFloat(str) / 255f;
-                        }
-                    }
-                    if (st.hasMoreTokens()) {
-                        String str = st.nextToken().trim();
-                        if (str.endsWith("%")) {
-                            this.green = Float.parseFloat(str.substring(0, str
-                                    .length() - 1)) / 100.0f;
-                        } else {
-                            this.green = Float.parseFloat(str) / 255f;
-                        }
-                    }
-                    if (st.hasMoreTokens()) {
-                        String str = st.nextToken().trim();
-                        if (str.endsWith("%")) {
-                            this.blue = Float.parseFloat(str.substring(0, str
-                                    .length() - 1)) / 100.0f;
-                        } else {
-                            this.blue = Float.parseFloat(str) / 255f;
-                        }
-                    }
-                } catch (Exception e) {
-                    throw new PropertyException(
-                            "Arguments to rgb() must be [0..255] or [0%..100%]");
-                }
-            } else {
-                throw new PropertyException("Unknown color format: " + value
-                        + ". Must be rgb(r,g,b)");
-            }
-        } else if (value.startsWith("url(")) {
-            throw new PropertyException(
-                    "Colors starting with url( are not yet supported!");
-        } else {
-            if (value.startsWith("system-color(")) {
-                int poss = value.indexOf("(");
-                int pose = value.indexOf(")");
-                if (poss != -1 && pose != -1) {
-                    value = value.substring(poss + 1, pose);
-                } else {
-                    throw new PropertyException("Unknown color format: "
-                            + value + ". Must be system-color(x)");
-                }
-            }
-            if (value.toLowerCase().equals("transparent")) {
-                this.red = 0;
-                this.green = 0;
-                this.blue = 0;
-                this.alpha = 0;
-            } else {
-                boolean found = false;
-                for (int count = 0; count < NAMES.length; count++) {
-                    if (value.toLowerCase().equals(NAMES[count])) {
-                        this.red = VALUES[count][0] / 255f;
-                        this.green = VALUES[count][1] / 255f;
-                        this.blue = VALUES[count][2] / 255f;
-                        found = true;
-                        break;
-                    }
-                }
-                if (!found) {
-                    throw new PropertyException("Unknown color name: " + value);
-                }
-            }
-        }
-        if ((this.red < 0.0 || this.red > 1.0)
-                || (this.green < 0.0 || this.green > 1.0)
-                || (this.blue < 0.0 || this.blue > 1.0)
-                || (this.alpha < 0.0 || this.alpha > 1.0)) {
-            throw new PropertyException("Color values out of range");
-        }
-    }
-
-    /**
-     * Returns the blue component of the color.
-     * @return float a value between 0.0 and 1.0
-     */
-    public float getBlue() {
-        return this.blue;
-    }
-
-    /**
-     * Returns the green component of the color.
-     * @return float a value between 0.0 and 1.0
-     */
-    public float getGreen() {
-        return this.green;
-    }
-
-    /**
-     * Returns the red component of the color.
-     * @return float a value between 0.0 and 1.0
-     */
-    public float getRed() {
-        return this.red;
-    }
-
-    /**
-     * Returns the alpha (degree of opaque-ness) component of the color.
-     * @return float a value between 0.0 (fully transparent) and 1.0 (fully opaque)
-     */
-    public float getAlpha() {
-        return this.alpha;
-    }
-
-    /**
-     * Returns an AWT instance of this color
-     * @return float the AWT color represented by this ColorType instance
-     */
-    public Color getAWTColor() {
-        return new Color(this.red, this.green, this.blue, this.alpha);
-    }
-
-    /**
-     * @param floatValue value (between 0.0 and 1.0) of color channel
-     * @return integer equivalent (between 0 and 255)
-     */
-    public static int convertChannelToInteger (float floatValue) {
-        if (floatValue > 1.0) {
-            floatValue = 1.0f;
-        }
-        if (floatValue < 0) {
-            floatValue = 0;
-        }
-        return (int) (floatValue * 255);
-    }
-
-    /**
-     * @see java.lang.Object#toString()
-     */
-    public String toString() {
-        StringBuffer sbuf = new StringBuffer(8);
-        sbuf.append('#');
-        String s = Integer.toHexString((int)(red * 255.0));
-        if (s.length() == 1) {
-            sbuf.append('0');
-        }
-        sbuf.append(s);
-        s = Integer.toHexString((int)(green * 255.0));
-        if (s.length() == 1) {
-            sbuf.append('0');
-        }
-        sbuf.append(s);
-        s = Integer.toHexString((int)(blue * 255.0));
-        if (s.length() == 1) {
-            sbuf.append('0');
-        }
-        sbuf.append(s);
-        return sbuf.toString();
-    }
-
-    /** The names of the predefined colors */
-    protected static final String[] NAMES = {
-                "aliceblue", "antiquewhite", "aqua", "aquamarine", "azure", "beige",
-                "bisque", "black", "blanchedalmond", "blue", "blueviolet", "brown",
-                "burlywood", "cadetblue", "chartreuse", "chocolate", "coral",
-                "cornflowerblue", "cornsilk", "crimson", "cyan", "darkblue",
-                "darkcyan", "darkgoldenrod", "darkgray", "darkgreen", "darkgrey",
-                "darkkhaki", "darkmagenta", "darkolivegreen", "darkorange",
-                "darkorchid", "darkred", "darksalmon", "darkseagreen",
-                "darkslateblue", "darkslategray", "darkslategrey", "darkturquoise",
-                "darkviolet", "deeppink", "deepskyblue", "dimgray", "dimgrey",
-                "dodgerblue", "firebrick", "floralwhite", "forestgreen", "fuchsia",
-                "gainsboro", "lightpink", "lightsalmon", "lightseagreen",
-                "lightskyblue", "lightslategray", "lightslategrey", "lightsteelblue",
-                "lightyellow", "lime", "limegreen", "linen", "magenta", "maroon",
-                "mediumaquamarine", "mediumblue", "mediumorchid", "mediumpurple",
-                "mediumseagreen", "mediumslateblue", "mediumspringgreen",
-                "mediumturquoise", "mediumvioletred", "midnightblue", "mintcream",
-                "mistyrose", "moccasin", "navajowhite", "navy", "oldlace", "olive",
-                "olivedrab", "orange", "orangered", "orchid", "palegoldenrod",
-                "palegreen", "paleturquoise", "palevioletred", "papayawhip",
-                "peachpuff", "peru", "pink", "plum", "powderblue", "purple", "red",
-                "rosybrown", "royalblue", "saddlebrown", "salmon", "ghostwhite",
-                "gold", "goldenrod", "gray", "grey", "green", "greenyellow",
-                "honeydew", "hotpink", "indianred", "indigo", "ivory", "khaki",
-                "lavender", "lavenderblush", "lawngreen", "lemonchiffon",
-                "lightblue", "lightcoral", "lightcyan", "lightgoldenrodyellow",
-                "lightgray", "lightgreen", "lightgrey", "sandybrown", "seagreen",
-                "seashell", "sienna", "silver", "skyblue", "slateblue", "slategray",
-                "slategrey", "snow", "springgreen", "steelblue", "tan", "teal",
-                "thistle", "tomato", "turquoise", "violet", "wheat", "white",
-                "whitesmoke", "yellow", "yellowgreen"
-    };
-
-    /** The color values for the predefined colors */
-    protected static final int[][] VALUES = {
-                {
-                            240, 248, 255
-                        }, {
-                            250, 235, 215
-                        }, {
-                            0, 255, 255
-                        }, {
-                            127, 255, 212
-                        }, {
-                            240, 255, 255
-                        }, {
-                            245, 245, 220
-                        }, {
-                            255, 228, 196
-                        }, {
-                            0, 0, 0
-                        }, {
-                            255, 235, 205
-                        }, {
-                            0, 0, 255
-                        }, {
-                            138, 43, 226
-                        }, {
-                            165, 42, 42
-                        }, {
-                            222, 184, 135
-                        }, {
-                            95, 158, 160
-                        }, {
-                            127, 255, 0
-                        }, {
-                            210, 105, 30
-                        }, {
-                            255, 127, 80
-                        }, {
-                            100, 149, 237
-                        }, {
-                            255, 248, 220
-                        }, {
-                            220, 20, 60
-                        }, {
-                            0, 255, 255
-                        }, {
-                            0, 0, 139
-                        }, {
-                            0, 139, 139
-                        }, {
-                            184, 134, 11
-                        }, {
-                            169, 169, 169
-                        }, {
-                            0, 100, 0
-                        }, {
-                            169, 169, 169
-                        }, {
-                            189, 183, 107
-                        }, {
-                            139, 0, 139
-                        }, {
-                            85, 107, 47
-                        }, {
-                            255, 140, 0
-                        }, {
-                            153, 50, 204
-                        }, {
-                            139, 0, 0
-                        }, {
-                            233, 150, 122
-                        }, {
-                            143, 188, 143
-                        }, {
-                            72, 61, 139
-                        }, {
-                            47, 79, 79
-                        }, {
-                            47, 79, 79
-                        }, {
-                            0, 206, 209
-                        }, {
-                            148, 0, 211
-                        }, {
-                            255, 20, 147
-                        }, {
-                            0, 191, 255
-                        }, {
-                            105, 105, 105
-                        }, {
-                            105, 105, 105
-                        }, {
-                            30, 144, 255
-                        }, {
-                            178, 34, 34
-                        }, {
-                            255, 250, 240
-                        }, {
-                            34, 139, 34
-                        }, {
-                            255, 0, 255
-                        }, {
-                            220, 220, 220
-                        }, {
-                            255, 182, 193
-                        }, {
-                            255, 160, 122
-                        }, {
-                            32, 178, 170
-                        }, {
-                            135, 206, 250
-                        }, {
-                            119, 136, 153
-                        }, {
-                            119, 136, 153
-                        }, {
-                            176, 196, 222
-                        }, {
-                            255, 255, 224
-                        }, {
-                            0, 255, 0
-                        }, {
-                            50, 205, 50
-                        }, {
-                            250, 240, 230
-                        }, {
-                            255, 0, 255
-                        }, {
-                            128, 0, 0
-                        }, {
-                            102, 205, 170
-                        }, {
-                            0, 0, 205
-                        }, {
-                            186, 85, 211
-                        }, {
-                            147, 112, 219
-                        }, {
-                            60, 179, 113
-                        }, {
-                            123, 104, 238
-                        }, {
-                            0, 250, 154
-                        }, {
-                            72, 209, 204
-                        }, {
-                            199, 21, 133
-                        }, {
-                            25, 25, 112
-                        }, {
-                            245, 255, 250
-                        }, {
-                            255, 228, 225
-                        }, {
-                            255, 228, 181
-                        }, {
-                            255, 222, 173
-                        }, {
-                            0, 0, 128
-                        }, {
-                            253, 245, 230
-                        }, {
-                            128, 128, 0
-                        }, {
-                            107, 142, 35
-                        }, {
-                            255, 165, 0
-                        }, {
-                            255, 69, 0
-                        }, {
-                            218, 112, 214
-                        }, {
-                            238, 232, 170
-                        }, {
-                            152, 251, 152
-                        }, {
-                            175, 238, 238
-                        }, {
-                            219, 112, 147
-                        }, {
-                            255, 239, 213
-                        }, {
-                            255, 218, 185
-                        }, {
-                            205, 133, 63
-                        }, {
-                            255, 192, 203
-                        }, {
-                            221, 160, 221
-                        }, {
-                            176, 224, 230
-                        }, {
-                            128, 0, 128
-                        }, {
-                            255, 0, 0
-                        }, {
-                            188, 143, 143
-                        }, {
-                            65, 105, 225
-                        }, {
-                            139, 69, 19
-                        }, {
-                            250, 128, 114
-                        }, {
-                            248, 248, 255
-                        }, {
-                            255, 215, 0
-                        }, {
-                            218, 165, 32
-                        }, {
-                            128, 128, 128
-                        }, {
-                            128, 128, 128
-                        }, {
-                            0, 128, 0
-                        }, {
-                            173, 255, 47
-                        }, {
-                            240, 255, 240
-                        }, {
-                            255, 105, 180
-                        }, {
-                            205, 92, 92
-                        }, {
-                            75, 0, 130
-                        }, {
-                            255, 255, 240
-                        }, {
-                            240, 230, 140
-                        }, {
-                            230, 230, 250
-                        }, {
-                            255, 240, 245
-                        }, {
-                            124, 252, 0
-                        }, {
-                            255, 250, 205
-                        }, {
-                            173, 216, 230
-                        }, {
-                            240, 128, 128
-                        }, {
-                            224, 255, 255
-                        }, {
-                            250, 250, 210
-                        }, {
-                            211, 211, 211
-                        }, {
-                            144, 238, 144
-                        }, {
-                            211, 211, 211
-                        }, {
-                            244, 164, 96
-                        }, {
-                            46, 139, 87
-                        }, {
-                            255, 245, 238
-                        }, {
-                            160, 82, 45
-                        }, {
-                            192, 192, 192
-                        }, {
-                            135, 206, 235
-                        }, {
-                            106, 90, 205
-                        }, {
-                            112, 128, 144
-                        }, {
-                            112, 128, 144
-                        }, {
-                            255, 250, 250
-                        }, {
-                            0, 255, 127
-                        }, {
-                            70, 130, 180
-                        }, {
-                            210, 180, 140
-                        }, {
-                            0, 128, 128
-                        }, {
-                            216, 191, 216
-                        }, {
-                            255, 99, 71
-                        }, {
-                            64, 224, 208
-                        }, {
-                            238, 130, 238
-                        }, {
-                            245, 222, 179
-                        }, {
-                            255, 255, 255
-                        }, {
-                            245, 245, 245
-                        }, {
-                            255, 255, 0
-                        }, {
-                            154, 205, 50
-                        }
-    };
-
-    /*
-     * aliceblue rgb(240, 248, 255)
-     * antiquewhite rgb(250, 235, 215)
-     * aqua rgb( 0, 255, 255)
-     * aquamarine rgb(127, 255, 212)
-     * azure rgb(240, 255, 255)
-     * beige rgb(245, 245, 220)
-     * bisque rgb(255, 228, 196)
-     * black rgb( 0, 0, 0)
-     * blanchedalmond rgb(255, 235, 205)
-     * blue rgb( 0, 0, 255)
-     * blueviolet rgb(138, 43, 226)
-     * brown rgb(165, 42, 42)
-     * burlywood rgb(222, 184, 135)
-     * cadetblue rgb( 95, 158, 160)
-     * chartreuse rgb(127, 255, 0)
-     * chocolate rgb(210, 105, 30)
-     * coral rgb(255, 127, 80)
-     * cornflowerblue rgb(100, 149, 237)
-     * cornsilk rgb(255, 248, 220)
-     * crimson rgb(220, 20, 60)
-     * cyan rgb( 0, 255, 255)
-     * darkblue rgb( 0, 0, 139)
-     * darkcyan rgb( 0, 139, 139)
-     * darkgoldenrod rgb(184, 134, 11)
-     * darkgray rgb(169, 169, 169)
-     * darkgreen rgb( 0, 100, 0)
-     * darkgrey rgb(169, 169, 169)
-     * darkkhaki rgb(189, 183, 107)
-     * darkmagenta rgb(139, 0, 139)
-     * darkolivegreen rgb( 85, 107, 47)
-     * darkorange rgb(255, 140, 0)
-     * darkorchid rgb(153, 50, 204)
-     * darkred rgb(139, 0, 0)
-     * darksalmon rgb(233, 150, 122)
-     * darkseagreen rgb(143, 188, 143)
-     * darkslateblue rgb( 72, 61, 139)
-     * darkslategray rgb( 47, 79, 79)
-     * darkslategrey rgb( 47, 79, 79)
-     * darkturquoise rgb( 0, 206, 209)
-     * darkviolet rgb(148, 0, 211)
-     * deeppink rgb(255, 20, 147)
-     * deepskyblue rgb( 0, 191, 255)
-     * dimgray rgb(105, 105, 105)
-     * dimgrey rgb(105, 105, 105)
-     * dodgerblue rgb( 30, 144, 255)
-     * firebrick rgb(178, 34, 34)
-     * floralwhite rgb(255, 250, 240)
-     * forestgreen rgb( 34, 139, 34)
-     * fuchsia rgb(255, 0, 255)
-     * gainsboro rgb(220, 220, 220)
-     * lightpink rgb(255, 182, 193)
-     * lightsalmon rgb(255, 160, 122)
-     * lightseagreen rgb( 32, 178, 170)
-     * lightskyblue rgb(135, 206, 250)
-     * lightslategray rgb(119, 136, 153)
-     * lightslategrey rgb(119, 136, 153)
-     * lightsteelblue rgb(176, 196, 222)
-     * lightyellow rgb(255, 255, 224)
-     * lime rgb( 0, 255, 0)
-     * limegreen rgb( 50, 205, 50)
-     * linen rgb(250, 240, 230)
-     * magenta rgb(255, 0, 255)
-     * maroon rgb(128, 0, 0)
-     * mediumaquamarine rgb(102, 205, 170)
-     * mediumblue rgb( 0, 0, 205)
-     * mediumorchid rgb(186, 85, 211)
-     * mediumpurple rgb(147, 112, 219)
-     * mediumseagreen rgb( 60, 179, 113)
-     * mediumslateblue rgb(123, 104, 238)
-     * mediumspringgreen rgb( 0, 250, 154)
-     * mediumturquoise rgb( 72, 209, 204)
-     * mediumvioletred rgb(199, 21, 133)
-     * midnightblue rgb( 25, 25, 112)
-     * mintcream rgb(245, 255, 250)
-     * mistyrose rgb(255, 228, 225)
-     * moccasin rgb(255, 228, 181)
-     * navajowhite rgb(255, 222, 173)
-     * navy rgb( 0, 0, 128)
-     * oldlace rgb(253, 245, 230)
-     * olive rgb(128, 128, 0)
-     * olivedrab rgb(107, 142, 35)
-     * orange rgb(255, 165, 0)
-     * orangered rgb(255, 69, 0)
-     * orchid rgb(218, 112, 214)
-     * palegoldenrod rgb(238, 232, 170)
-     * palegreen rgb(152, 251, 152)
-     * paleturquoise rgb(175, 238, 238)
-     * palevioletred rgb(219, 112, 147)
-     * papayawhip rgb(255, 239, 213)
-     * peachpuff rgb(255, 218, 185)
-     * peru rgb(205, 133, 63)
-     * pink rgb(255, 192, 203)
-     * plum rgb(221, 160, 221)
-     * powderblue rgb(176, 224, 230)
-     * purple rgb(128, 0, 128)
-     * red rgb(255, 0, 0)
-     * rosybrown rgb(188, 143, 143)
-     * royalblue rgb( 65, 105, 225)
-     * saddlebrown rgb(139, 69, 19)
-     * salmon rgb(250, 128, 114)
-     * ghostwhite rgb(248, 248, 255)
-     * gold rgb(255, 215, 0)
-     * goldenrod rgb(218, 165, 32)
-     * gray rgb(128, 128, 128)
-     * grey rgb(128, 128, 128)
-     * green rgb( 0, 128, 0)
-     * greenyellow rgb(173, 255, 47)
-     * honeydew rgb(240, 255, 240)
-     * hotpink rgb(255, 105, 180)
-     * indianred rgb(205, 92, 92)
-     * indigo rgb( 75, 0, 130)
-     * ivory rgb(255, 255, 240)
-     * khaki rgb(240, 230, 140)
-     * lavender rgb(230, 230, 250)
-     * lavenderblush rgb(255, 240, 245)
-     * lawngreen rgb(124, 252, 0)
-     * lemonchiffon rgb(255, 250, 205)
-     * lightblue rgb(173, 216, 230)
-     * lightcoral rgb(240, 128, 128)
-     * lightcyan rgb(224, 255, 255)
-     * lightgoldenrodyellow rgb(250, 250, 210)
-     * lightgray rgb(211, 211, 211)
-     * lightgreen rgb(144, 238, 144)
-     * lightgrey rgb(211, 211, 211)
-     * sandybrown rgb(244, 164, 96)
-     * seagreen rgb( 46, 139, 87)
-     * seashell rgb(255, 245, 238)
-     * sienna rgb(160, 82, 45)
-     * silver rgb(192, 192, 192)
-     * skyblue rgb(135, 206, 235)
-     * slateblue rgb(106, 90, 205)
-     * slategray rgb(112, 128, 144)
-     * slategrey rgb(112, 128, 144)
-     * snow rgb(255, 250, 250)
-     * springgreen rgb( 0, 255, 127)
-     * steelblue rgb( 70, 130, 180)
-     * tan rgb(210, 180, 140)
-     * teal rgb( 0, 128, 128)
-     * thistle rgb(216, 191, 216)
-     * tomato rgb(255, 99, 71)
-     * turquoise rgb( 64, 224, 208)
-     * violet rgb(238, 130, 238)
-     * wheat rgb(245, 222, 179)
-     * white rgb(255, 255, 255)
-     * whitesmoke rgb(245, 245, 245)
-     * yellow rgb(255, 255, 0)
-     * yellowgreen rgb(154, 205, 50)
-     */
-
-    /**
-     * Can't convert to any other types
-     * @return this.colorType
-     */
-    public ColorTypeProperty getColorType() {
-        return this;
-    }
-
-    /**
-     * @return this.colorType cast as an Object
-     */
-    public Object getObject() {
-        return this;
-    }
-}
-
diff --git a/src/java/org/apache/fop/fo/properties/CommonBorderPaddingBackground.java b/src/java/org/apache/fop/fo/properties/CommonBorderPaddingBackground.java
index 54501d91c..7cf8dc6f1 100755
--- a/src/java/org/apache/fop/fo/properties/CommonBorderPaddingBackground.java
+++ b/src/java/org/apache/fop/fo/properties/CommonBorderPaddingBackground.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2005 The Apache Software Foundation.
+ * Copyright 2004-2006 The Apache Software Foundation.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,8 +18,9 @@
 
 package org.apache.fop.fo.properties;
 
+import java.awt.Color;
+
 import org.apache.fop.apps.FOUserAgent;
-import org.apache.fop.datatypes.ColorType;
 import org.apache.fop.datatypes.Length;
 import org.apache.fop.datatypes.PercentBaseContext;
 import org.apache.fop.fo.Constants;
@@ -42,7 +43,7 @@ public class CommonBorderPaddingBackground implements Cloneable {
     /**
      * The "background-color" property.
      */
-    public ColorType backgroundColor;
+    public Color backgroundColor;
 
     /**
      * The "background-image" property.
@@ -79,10 +80,10 @@ public class CommonBorderPaddingBackground implements Cloneable {
     
     public static class BorderInfo implements Cloneable {
         private int mStyle; // Enum for border style
-        private ColorType mColor; // Border color
+        private Color mColor; // Border color
         private CondLengthProperty mWidth;
 
-        BorderInfo(int style, CondLengthProperty width, ColorType color) {
+        BorderInfo(int style, CondLengthProperty width, Color color) {
             mStyle = style;
             mWidth = width;
             mColor = color;
@@ -92,7 +93,7 @@ public class CommonBorderPaddingBackground implements Cloneable {
             return this.mStyle;
         }
         
-        public ColorType getColor() {
+        public Color getColor() {
             return this.mColor;
         }
         
@@ -142,7 +143,7 @@ public class CommonBorderPaddingBackground implements Cloneable {
     public CommonBorderPaddingBackground(PropertyList pList, FObj fobj) throws PropertyException {
         
         backgroundAttachment = pList.get(Constants.PR_BACKGROUND_ATTACHMENT).getEnum();
-        backgroundColor = pList.get(Constants.PR_BACKGROUND_COLOR).getColorType();
+        backgroundColor = pList.get(Constants.PR_BACKGROUND_COLOR).getColor();
         if (backgroundColor.getAlpha() == 0) {
             backgroundColor = null;
         }
@@ -206,7 +207,7 @@ public class CommonBorderPaddingBackground implements Cloneable {
         if (style != Constants.EN_NONE) {
             setBorderInfo(new BorderInfo(style,
                 pList.get(widthProp).getCondLength(),
-                pList.get(colorProp).getColorType()), side);
+                pList.get(colorProp).getColor()), side);
         }
     }
     
@@ -286,7 +287,7 @@ public class CommonBorderPaddingBackground implements Cloneable {
         }
     }
 
-    public ColorType getBorderColor(int side) {
+    public Color getBorderColor(int side) {
         if (borderInfo[side] != null) {
             return borderInfo[side].mColor;
         } else {
@@ -341,18 +342,19 @@ public class CommonBorderPaddingBackground implements Cloneable {
      * @return all the padding and border height.
      */
     public int getBPPaddingAndBorder(boolean bDiscard, PercentBaseContext context) {
-        return getPaddingBefore(bDiscard, context) + getPaddingAfter(bDiscard, context) +
-               getBorderBeforeWidth(bDiscard) + getBorderAfterWidth(bDiscard);        
+        return getPaddingBefore(bDiscard, context) + getPaddingAfter(bDiscard, context)
+               + getBorderBeforeWidth(bDiscard) + getBorderAfterWidth(bDiscard);        
     }
 
+    /** @see java.lang.Object#toString() */
     public String toString() {
-        return "CommonBordersAndPadding (Before, After, Start, End):\n" +
-        "Borders: (" + getBorderBeforeWidth(false) + ", " + getBorderAfterWidth(false) + ", " +
-        getBorderStartWidth(false) + ", " + getBorderEndWidth(false) + ")\n" +
-        "Border Colors: (" + getBorderColor(BEFORE) + ", " + getBorderColor(AFTER) + ", " +
-        getBorderColor(START) + ", " + getBorderColor(END) + ")\n" +
-        "Padding: (" + getPaddingBefore(false, null) + ", " + getPaddingAfter(false, null) + ", " +
-        getPaddingStart(false, null) + ", " + getPaddingEnd(false, null) + ")\n";
+        return "CommonBordersAndPadding (Before, After, Start, End):\n"
+            + "Borders: (" + getBorderBeforeWidth(false) + ", " + getBorderAfterWidth(false) + ", "
+            + getBorderStartWidth(false) + ", " + getBorderEndWidth(false) + ")\n"
+            + "Border Colors: (" + getBorderColor(BEFORE) + ", " + getBorderColor(AFTER) + ", "
+            + getBorderColor(START) + ", " + getBorderColor(END) + ")\n"
+            + "Padding: (" + getPaddingBefore(false, null) + ", " + getPaddingAfter(false, null) 
+            + ", " + getPaddingStart(false, null) + ", " + getPaddingEnd(false, null) + ")\n";
     }
 
     /**
diff --git a/src/java/org/apache/fop/fo/properties/CommonTextDecoration.java b/src/java/org/apache/fop/fo/properties/CommonTextDecoration.java
index 072cb5417..984b854a0 100644
--- a/src/java/org/apache/fop/fo/properties/CommonTextDecoration.java
+++ b/src/java/org/apache/fop/fo/properties/CommonTextDecoration.java
@@ -21,7 +21,7 @@ package org.apache.fop.fo.properties;
 import java.util.Iterator;
 import java.util.List;
 
-import org.apache.fop.datatypes.ColorType;
+import java.awt.Color;
 import org.apache.fop.fo.Constants;
 import org.apache.fop.fo.PropertyList;
 import org.apache.fop.fo.expr.PropertyException;
@@ -38,9 +38,9 @@ public class CommonTextDecoration {
     private static final int BLINK        = 8;
     
     private int decoration;
-    private ColorType underColor;
-    private ColorType overColor;
-    private ColorType throughColor;
+    private Color underColor;
+    private Color overColor;
+    private Color throughColor;
     
     /**
      * Creates a new CommonTextDecoration object with default values.
@@ -85,33 +85,33 @@ public class CommonTextDecoration {
                         deco = new CommonTextDecoration();
                     }
                     deco.decoration |= UNDERLINE;
-                    deco.underColor = pList.get(Constants.PR_COLOR).getColorType();
+                    deco.underColor = pList.get(Constants.PR_COLOR).getColor();
                 } else if (propEnum == Constants.EN_NO_UNDERLINE) {
                     if (deco != null) {
                         deco.decoration &= OVERLINE | LINE_THROUGH | BLINK;
-                        deco.underColor = pList.get(Constants.PR_COLOR).getColorType();
+                        deco.underColor = pList.get(Constants.PR_COLOR).getColor();
                     }
                 } else if (propEnum == Constants.EN_OVERLINE) {
                     if (deco == null) {
                         deco = new CommonTextDecoration();
                     }
                     deco.decoration |= OVERLINE;
-                    deco.overColor = pList.get(Constants.PR_COLOR).getColorType();
+                    deco.overColor = pList.get(Constants.PR_COLOR).getColor();
                 } else if (propEnum == Constants.EN_NO_OVERLINE) {
                     if (deco != null) {
                         deco.decoration &= UNDERLINE | LINE_THROUGH | BLINK;
-                        deco.overColor = pList.get(Constants.PR_COLOR).getColorType();
+                        deco.overColor = pList.get(Constants.PR_COLOR).getColor();
                     }
                 } else if (propEnum == Constants.EN_LINE_THROUGH) {
                     if (deco == null) {
                         deco = new CommonTextDecoration();
                     }
                     deco.decoration |= LINE_THROUGH;
-                    deco.throughColor = pList.get(Constants.PR_COLOR).getColorType();
+                    deco.throughColor = pList.get(Constants.PR_COLOR).getColor();
                 } else if (propEnum == Constants.EN_NO_LINE_THROUGH) {
                     if (deco != null) {
                         deco.decoration &= UNDERLINE | OVERLINE | BLINK;
-                        deco.throughColor = pList.get(Constants.PR_COLOR).getColorType();
+                        deco.throughColor = pList.get(Constants.PR_COLOR).getColor();
                     }
                 } else if (propEnum == Constants.EN_BLINK) {
                     if (deco == null) {
@@ -151,17 +151,17 @@ public class CommonTextDecoration {
     }
     
     /** @return the color of the underline mark */
-    public ColorType getUnderlineColor() {
+    public Color getUnderlineColor() {
         return this.underColor;
     }
     
     /** @return the color of the overline mark */
-    public ColorType getOverlineColor() {
+    public Color getOverlineColor() {
         return this.overColor;
     }
 
     /** @return the color of the line-through mark */
-    public ColorType getLineThroughColor() {
+    public Color getLineThroughColor() {
         return this.throughColor;
     }
 
diff --git a/src/java/org/apache/fop/fo/properties/NumberProperty.java b/src/java/org/apache/fop/fo/properties/NumberProperty.java
index c69c7affd..fa04a1d4b 100644
--- a/src/java/org/apache/fop/fo/properties/NumberProperty.java
+++ b/src/java/org/apache/fop/fo/properties/NumberProperty.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
+ * Copyright 1999-2004,2006 The Apache Software Foundation.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,8 +18,10 @@
 
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.datatypes.PercentBaseContext;
+import java.awt.Color;
+
 import org.apache.fop.datatypes.Numeric;
+import org.apache.fop.datatypes.PercentBaseContext;
 import org.apache.fop.fo.FObj;
 import org.apache.fop.fo.PropertyList;
 import org.apache.fop.fo.expr.PropertyException;
@@ -118,6 +120,7 @@ public class NumberProperty extends Property implements Numeric {
         return getNumericValue();
     }
 
+    /** @see org.apache.fop.datatypes.Numeric#getValue() */
     public int getValue() {
         return number.intValue();
     }
@@ -164,13 +167,14 @@ public class NumberProperty extends Property implements Numeric {
     }
 
     /**
-     * Convert NumberProperty to a ColorType. Not sure why this is needed.
-     * @return ColorType that corresponds to black
+     * Convert NumberProperty to a Color. Not sure why this is needed.
+     * @return Color that corresponds to black
      */
-    public ColorTypeProperty getColorType() {
+    public Color getColor() {
+        // TODO: Implement somehow
         // Convert numeric value to color ???
         // Convert to hexadecimal and then try to make it into a color?
-        return new ColorTypeProperty((float)0.0, (float)0.0, (float)0.0);
+        return Color.black;
     }
 
 }
diff --git a/src/java/org/apache/fop/fo/properties/Property.java b/src/java/org/apache/fop/fo/properties/Property.java
index 3d4dbe65d..41003439d 100644
--- a/src/java/org/apache/fop/fo/properties/Property.java
+++ b/src/java/org/apache/fop/fo/properties/Property.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2005 The Apache Software Foundation.
+ * Copyright 1999-2006 The Apache Software Foundation.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,6 +19,7 @@
 package org.apache.fop.fo.properties;
 
 import java.util.List;
+import java.awt.Color;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -29,7 +30,6 @@ import org.apache.fop.fo.Constants;
 
 /**
  * Base class for all property objects
- * @author unascribed
  */
 public class Property {
     
@@ -44,10 +44,10 @@ public class Property {
 
     /**
      * Set the original value specified for the property attribute.
-     * @param specVal The specified value.
+     * @param value The specified value.
      */
-    public void setSpecifiedValue(String specVal) {
-        this.specVal = specVal;
+    public void setSpecifiedValue(String value) {
+        this.specVal = value;
     }
 
     /**
@@ -75,7 +75,7 @@ public class Property {
      * This method expects to be overridden by subclasses
      * @return ColorType property value
      */
-    public ColorTypeProperty getColorType() {
+    public Color getColor() {
         return null;
     }