Added alternative spelling 'grey'.

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/FOP_0-20-0_Alt-Design@195665 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/src/org/apache/fop/fo/properties/ColorNonTransparent.java b/src/org/apache/fop/fo/properties/ColorNonTransparent.java
index f5d0057f875f5c5a3f5b4b2f756270c3db2cd37a..16b9a417f1de46e157894fbd6e25296879d65abb 100644 (file)
--- a/src/org/apache/fop/fo/properties/ColorNonTransparent.java
+++ b/src/org/apache/fop/fo/properties/ColorNonTransparent.java
@@ -23,6 +23,7 @@ public class ColorNonTransparent extends ColorCommon  {
            rwEnumHash.put((Object)rwEnums[i],
                                (Object) Ints.consts.get(i));
        }
+        rwEnumHash.put("grey", Ints.consts.get(ColorCommon.GRAY));
     }
 
     public int getEnumIndex(String enum)
@@ -36,7 +37,7 @@ public class ColorNonTransparent extends ColorCommon  {
     public String getEnumText(int index)
         throws PropertyException
     {
-        if (index < 1 || index >= rwEnums.length)
+        if (index < 1 || index >= (rwEnums.length - 1))
             throw new PropertyException("index out of range: " + index);
         return rwEnums[index];
     }

diff --git a/src/org/apache/fop/fo/properties/ColorTransparent.java b/src/org/apache/fop/fo/properties/ColorTransparent.java
index ac476fb91b0cbc8640cf81ff504599d5eba2305c..1bb863713761249f7577521e7e8db28eba9979c6 100644 (file)
--- a/src/org/apache/fop/fo/properties/ColorTransparent.java
+++ b/src/org/apache/fop/fo/properties/ColorTransparent.java
@@ -18,11 +18,11 @@ public class ColorTransparent extends ColorCommon  {
      */
     private static final HashMap rwEnumHash;
     static {
-       rwEnumHash = new HashMap(rwEnums.length);
+       rwEnumHash = new HashMap(rwEnums.length + 1);
        for (int i = 1; i < rwEnums.length; i++ ) {
-           rwEnumHash.put((Object)rwEnums[i],
-                               (Object) Ints.consts.get(i));
+           rwEnumHash.put(rwEnums[i], Ints.consts.get(i));
        }
+        rwEnumHash.put("grey", Ints.consts.get(ColorCommon.GRAY));
     }
 
     public int getEnumIndex(String enum)