pbwest 2002/11/29 08:48:47
Modified: src/org/apache/fop/fo/properties Tag: FOP_0-20-0_Alt-Design
ColorNonTransparent.java ColorTransparent.java
Log:
Added alternative spelling 'grey'.
Revision Changes Path
No revision
No revision
1.1.2.5 +2 -1
xml-fop/src/org/apache/fop/fo/properties/Attic/ColorNonTransparent.java
Index: ColorNonTransparent.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/ColorNonTransparent.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- ColorNonTransparent.java 27 Nov 2002 02:43:58 -0000 1.1.2.4
+++ ColorNonTransparent.java 29 Nov 2002 16:48:44 -0000 1.1.2.5
@@ -23,6 +23,7 @@
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 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];
}
1.1.2.5 +3 -3
xml-fop/src/org/apache/fop/fo/properties/Attic/ColorTransparent.java
Index: ColorTransparent.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/ColorTransparent.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- ColorTransparent.java 27 Nov 2002 02:43:58 -0000 1.1.2.4
+++ ColorTransparent.java 29 Nov 2002 16:48:47 -0000 1.1.2.5
@@ -18,11 +18,11 @@
*/
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)
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
