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

2 files changed, 14 insertions, 14 deletions

diff --git a/src/java/org/apache/fop/fonts/apps/PFMReader.java b/src/java/org/apache/fop/fonts/apps/PFMReader.java
index 822945a03..38d652ab2 100644
--- 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 940eb4c08..3cc7f4871 100644
--- 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());