From a606ae44d4de36aaed21417fca49b9abcd274c21 Mon Sep 17 00:00:00 2001 From: Peter Bernard West Date: Fri, 29 Nov 2002 16:48:47 +0000 Subject: [PATCH] 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 --- src/org/apache/fop/fo/properties/ColorNonTransparent.java | 3 ++- src/org/apache/fop/fo/properties/ColorTransparent.java | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/org/apache/fop/fo/properties/ColorNonTransparent.java b/src/org/apache/fop/fo/properties/ColorNonTransparent.java index f5d0057f8..16b9a417f 100644 --- 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 ac476fb91..1bb863713 100644 --- 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) -- 2.39.5