vmote 2003/09/16 07:50:16
Modified: src/java/org/apache/fop/rtf/renderer RTFHandler.java
src/java/org/apache/fop/rtf/rtflib/rtfdoc RtfColorTable.java
Log:
make RtfColorTable.getColorNumber return an Integer instead of int, so that it can
return a null value -- submitted by Peter Herweg, see
http://nagoya.apache.org/bugzilla/show_bug.cgi?id=23082
Revision Changes Path
1.18 +2 -2 xml-fop/src/java/org/apache/fop/rtf/renderer/RTFHandler.java
Index: RTFHandler.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/rtf/renderer/RTFHandler.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- RTFHandler.java 9 Sep 2003 14:31:08 -0000 1.17
+++ RTFHandler.java 16 Sep 2003 14:50:16 -0000 1.18
@@ -452,7 +452,7 @@
white. */
if ((fopValue.getRed() == 0) && (fopValue.getGreen() == 0)
&& (fopValue.getBlue() == 0) && (fopValue.getAlpha() == 0)) {
- rtfColor = RtfColorTable.getInstance().getColorNumber("white");
+ rtfColor =
RtfColorTable.getInstance().getColorNumber("white").intValue();
} else {
rtfColor = convertFOPColorToRTF(fopValue);
}
@@ -472,7 +472,7 @@
int greenComponent = ColorType.convertChannelToInteger
(fopColor.getGreen());
int blueComponent = ColorType.convertChannelToInteger (fopColor.getBlue());
return RtfColorTable.getInstance().getColorNumber(redComponent,
- greenComponent, blueComponent);
+ greenComponent, blueComponent).intValue();
}
}
1.7 +14 -14
xml-fop/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfColorTable.java
Index: RtfColorTable.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfColorTable.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- RtfColorTable.java 5 Jul 2003 03:23:23 -0000 1.6
+++ RtfColorTable.java 16 Sep 2003 14:50:16 -0000 1.7
@@ -131,14 +131,14 @@
* Initialize the color table.
*/
private void init () {
- addNamedColor("black", getColorNumber (0, 0, 0));
- addNamedColor("white", getColorNumber (255, 255, 255));
- addNamedColor("red", getColorNumber (255, 0, 0));
- addNamedColor("green", getColorNumber (0, 255, 0));
- addNamedColor("blue", getColorNumber (0, 0, 255));
- addNamedColor("cyan", getColorNumber (0, 255, 255));
- addNamedColor("magenta", getColorNumber (255, 0, 255));
- addNamedColor("yellow", getColorNumber (255, 255, 0));
+ addNamedColor("black", getColorNumber (0, 0, 0).intValue());
+ addNamedColor("white", getColorNumber (255, 255, 255).intValue());
+ addNamedColor("red", getColorNumber (255, 0, 0).intValue());
+ addNamedColor("green", getColorNumber (0, 255, 0).intValue());
+ addNamedColor("blue", getColorNumber (0, 0, 255).intValue());
+ addNamedColor("cyan", getColorNumber (0, 255, 255).intValue());
+ addNamedColor("magenta", getColorNumber (255, 0, 255).intValue());
+ addNamedColor("yellow", getColorNumber (255, 255, 0).intValue());
getColorNumber (0, 0, 128);
getColorNumber (0, 128, 128);
@@ -150,7 +150,7 @@
// Added by Normand Masse
// Gray color added
- addNamedColor("gray", getColorNumber(128, 128, 128));
+ addNamedColor("gray", getColorNumber(128, 128, 128).intValue());
getColorNumber (192, 192, 192);
}
@@ -168,8 +168,8 @@
* @param name a named color
* @return the RTF number of a named color, or null if name not found
*/
- public int getColorNumber (String name) {
- return ((Integer)namedColors.get(name.toLowerCase())).intValue();
+ public Integer getColorNumber (String name) {
+ return ((Integer)namedColors.get(name.toLowerCase()));
}
/**
@@ -181,7 +181,7 @@
*
* @return The number of the color in the table
*/
- public int getColorNumber (int red, int green, int blue) {
+ public Integer getColorNumber (int red, int green, int blue) {
Integer identifier = new Integer (determineIdentifier (red, green, blue));
Object o = colorIndex.get (identifier);
int retVal;
@@ -194,7 +194,7 @@
retVal = ((Integer) o).intValue ();
}
- return retVal + 1;
+ return new Integer(retVal + 1);
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
