jeremias 2004/08/15 02:57:07
Modified: src/java/org/apache/fop/render/ps PSProcSets.java
src/java/org/apache/fop/fonts/apps TTFReader.java
PFMReader.java
src/java/org/apache/fop/fo FOPropertyMapping.java
src/java-1.4/org/apache/fop/svg GraphicsConfiguration.java
Log:
JDK 1.5 compile-time compatibility (still doesn't compile under 1.5, yet)
Revision Changes Path
1.10 +6 -6 xml-fop/src/java/org/apache/fop/render/ps/PSProcSets.java
Index: PSProcSets.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/render/ps/PSProcSets.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- PSProcSets.java 22 Apr 2004 21:38:40 -0000 1.9
+++ PSProcSets.java 15 Aug 2004 09:57:07 -0000 1.10
@@ -194,9 +194,9 @@
// write("/gfF1{/Helvetica findfont} bd");
// write("/gfF3{/Helvetica-Bold findfont} bd");
Map fonts = fontInfo.getFonts();
- Iterator enum = fonts.keySet().iterator();
- while (enum.hasNext()) {
- String key = (String)enum.next();
+ Iterator iter = fonts.keySet().iterator();
+ while (iter.hasNext()) {
+ String key = (String)iter.next();
Typeface fm = (Typeface)fonts.get(key);
gen.writeln("/" + key + " /" + fm.getFontName() + " def");
}
@@ -205,9 +205,9 @@
defineWinAnsiEncoding(gen);
//Rewrite font encodings
- enum = fonts.keySet().iterator();
- while (enum.hasNext()) {
- String key = (String)enum.next();
+ iter = fonts.keySet().iterator();
+ while (iter.hasNext()) {
+ String key = (String)iter.next();
Typeface fm = (Typeface)fonts.get(key);
if (null == fm.getEncoding()) {
//ignore (ZapfDingbats and Symbol run through here
1.7 +11 -11 xml-fop/src/java/org/apache/fop/fonts/apps/TTFReader.java
Index: TTFReader.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fonts/apps/TTFReader.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- TTFReader.java 23 Jun 2004 00:25:27 -0000 1.6
+++ TTFReader.java 15 Aug 2004 09:57:07 -0000 1.7
@@ -404,9 +404,9 @@
el = doc.createElement("bfranges");
mel.appendChild(el);
- Iterator e = ttf.getCMaps().listIterator();
- while (e.hasNext()) {
- TTFCmapEntry ce = (TTFCmapEntry)e.next();
+ Iterator iter = ttf.getCMaps().listIterator();
+ while (iter.hasNext()) {
+ TTFCmapEntry ce = (TTFCmapEntry)iter.next();
Element el2 = doc.createElement("bf");
el.appendChild(el2);
el2.setAttribute("us", String.valueOf(ce.getUnicodeStart()));
@@ -461,15 +461,15 @@
Document doc = parent.getOwnerDocument();
// Get kerning
- Iterator enum;
+ Iterator iter;
if (isCid) {
- enum = ttf.getKerning().keySet().iterator();
+ iter = ttf.getKerning().keySet().iterator();
} else {
- enum = ttf.getAnsiKerning().keySet().iterator();
+ iter = ttf.getAnsiKerning().keySet().iterator();
}
- while (enum.hasNext()) {
- Integer kpx1 = (Integer)enum.next();
+ while (iter.hasNext()) {
+ Integer kpx1 = (Integer)iter.next();
el = doc.createElement("kerning");
el.setAttribute("kpx1", kpx1.toString());
@@ -483,9 +483,9 @@
h2 = (Map)ttf.getAnsiKerning().get(kpx1);
}
- Iterator enum2 = h2.keySet().iterator();
- while (enum2.hasNext()) {
- Integer kpx2 = (Integer)enum2.next();
+ Iterator iter2 = h2.keySet().iterator();
+ while (iter2.hasNext()) {
+ Integer kpx2 = (Integer)iter2.next();
if (isCid || kpx2.intValue() < 256) {
el2 = doc.createElement("pair");
el2.setAttribute("kpx2", kpx2.toString());
1.6 +3 -3 xml-fop/src/java/org/apache/fop/fonts/apps/PFMReader.java
Index: PFMReader.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fonts/apps/PFMReader.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- PFMReader.java 23 Jun 2004 00:25:27 -0000 1.5
+++ PFMReader.java 15 Aug 2004 09:57:07 -0000 1.6
@@ -371,9 +371,9 @@
// Get kerning
- Iterator enum = pfm.getKerning().keySet().iterator();
- while (enum.hasNext()) {
- Integer kpx1 = (Integer)enum.next();
+ Iterator iter = pfm.getKerning().keySet().iterator();
+ while (iter.hasNext()) {
+ Integer kpx1 = (Integer)iter.next();
el = doc.createElement("kerning");
el.setAttribute("kpx1", kpx1.toString());
root.appendChild(el);
1.14 +5 -5 xml-fop/src/java/org/apache/fop/fo/FOPropertyMapping.java
Index: FOPropertyMapping.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/FOPropertyMapping.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- FOPropertyMapping.java 13 Aug 2004 09:05:15 -0000 1.13
+++ FOPropertyMapping.java 15 Aug 2004 09:57:07 -0000 1.14
@@ -384,14 +384,14 @@
* @param enum A enum value from Constants.java.
* @return An EnumProperty instance.
*/
- private Property makeEnumProperty(int enum) {
+ private Property makeEnumProperty(int enumValue) {
if (enums == null) {
enums = new Property[200];
}
- if (enums[enum] == null) {
- enums[enum] = new EnumProperty(enum);
+ if (enums[enumValue] == null) {
+ enums[enumValue] = new EnumProperty(enumValue);
}
- return enums[enum];
+ return enums[enumValue];
}
/**
1.3 +17 -2
xml-fop/src/java-1.4/org/apache/fop/svg/GraphicsConfiguration.java
Index: GraphicsConfiguration.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java-1.4/org/apache/fop/svg/GraphicsConfiguration.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- GraphicsConfiguration.java 27 Feb 2004 17:58:26 -0000 1.2
+++ GraphicsConfiguration.java 15 Aug 2004 09:57:07 -0000 1.3
@@ -18,6 +18,9 @@
package org.apache.fop.svg;
+
+import java.awt.image.VolatileImage;
+
/**
* Adapter to allow subclassing java.awt.GraphicsConfiguration without
* compilation errors.
@@ -28,7 +31,19 @@
*/
abstract public class GraphicsConfiguration extends java.awt.GraphicsConfiguration {
- public java.awt.image.VolatileImage createCompatibleVolatileImage(int width,
int height) {
+ /**
+ * @see java.awt.GraphicsConfiguration#createCompatibleVolatileImage(int, int)
+ * @since JDK 1.4
+ */
+ public VolatileImage createCompatibleVolatileImage(int width, int height) {
+ return null;
+ }
+
+ /**
+ * @see java.awt.GraphicsConfiguration#createCompatibleVolatileImage(int, int,
int)
+ * @since JDK 1.5
+ */
+ public VolatileImage createCompatibleVolatileImage(int width, int height, int
transparency) {
return null;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
