JDK 1.5 compile-time compatibility (still doesn't compile under 1.5, yet)

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@197875 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/src/java-1.4/org/apache/fop/svg/GraphicsConfiguration.java b/src/java-1.4/org/apache/fop/svg/GraphicsConfiguration.java
index 06967860fdc05a414322bec124d83ba0f5a77443..ae2b4c8e50d3cc647b7512e804570c192d5df533 100644 (file)
--- a/src/java-1.4/org/apache/fop/svg/GraphicsConfiguration.java
+++ b/src/java-1.4/org/apache/fop/svg/GraphicsConfiguration.java
@@ -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 @@ package org.apache.fop.svg;
  */
 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;
     }
 

diff --git a/src/java/org/apache/fop/fo/FOPropertyMapping.java b/src/java/org/apache/fop/fo/FOPropertyMapping.java
index 418a73720cde6a71211daf8d4ea054aee2124885..54d89b247575230df9dd105e2d23bc4a24f9c511 100644 (file)
--- a/src/java/org/apache/fop/fo/FOPropertyMapping.java
+++ b/src/java/org/apache/fop/fo/FOPropertyMapping.java
@@ -384,14 +384,14 @@ public class FOPropertyMapping implements Constants {
      * @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];
     }
 
     /**

diff --git a/src/java/org/apache/fop/fonts/apps/PFMReader.java b/src/java/org/apache/fop/fonts/apps/PFMReader.java
index 822945a032a413ce04f24b3f7ed57d450579b436..38d652ab27573d11f449ea4e280864b5ad1fa022 100644 (file)
--- a/src/java/org/apache/fop/fonts/apps/PFMReader.java
+++ b/src/java/org/apache/fop/fonts/apps/PFMReader.java
@@ -371,9 +371,9 @@ public class PFMReader {
 
 
         // 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);

diff --git a/src/java/org/apache/fop/fonts/apps/TTFReader.java b/src/java/org/apache/fop/fonts/apps/TTFReader.java
index 940eb4c08f849b97ee6747698b3de4465bc67139..3cc7f48719c011518c443b52dce752e13432729b 100644 (file)
--- a/src/java/org/apache/fop/fonts/apps/TTFReader.java
+++ b/src/java/org/apache/fop/fonts/apps/TTFReader.java
@@ -404,9 +404,9 @@ public class TTFReader {
 
         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 @@ public class TTFReader {
         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 @@ public class TTFReader {
                 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());

diff --git a/src/java/org/apache/fop/render/ps/PSProcSets.java b/src/java/org/apache/fop/render/ps/PSProcSets.java
index 604239da141552a96b349a4e4f29e68f3181810d..abd0192522ceb6c5787d1b51694ccb8888ac44a6 100644 (file)
--- a/src/java/org/apache/fop/render/ps/PSProcSets.java
+++ b/src/java/org/apache/fop/render/ps/PSProcSets.java
@@ -194,9 +194,9 @@ public final class PSProcSets {
         // 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 @@ public final class PSProcSets {
         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