xmlgraphics-fop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jerem...@apache.org
Subject svn commit: r379439 - in /xmlgraphics/fop/branches/fop-0_20_2-maintain: ./ src/org/apache/fop/fonts/apps/ src/org/apache/fop/messaging/ src/org/apache/fop/render/ps/
Date Tue, 21 Feb 2006 12:46:08 GMT
Author: jeremias
Date: Tue Feb 21 04:46:05 2006
New Revision: 379439

URL: http://svn.apache.org/viewcvs?rev=379439&view=rev
Log:
Oh well, let's remove the "enum" tokens entirely. Maybe Gump is happier this way.

Modified:
    xmlgraphics/fop/branches/fop-0_20_2-maintain/   (props changed)
    xmlgraphics/fop/branches/fop-0_20_2-maintain/build.xml
    xmlgraphics/fop/branches/fop-0_20_2-maintain/src/org/apache/fop/fonts/apps/PFMReader.java
    xmlgraphics/fop/branches/fop-0_20_2-maintain/src/org/apache/fop/fonts/apps/TTFReader.java
    xmlgraphics/fop/branches/fop-0_20_2-maintain/src/org/apache/fop/messaging/MessageHandler.java
    xmlgraphics/fop/branches/fop-0_20_2-maintain/src/org/apache/fop/render/ps/PSRenderer.java

Propchange: xmlgraphics/fop/branches/fop-0_20_2-maintain/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Feb 21 04:46:05 2006
@@ -1,2 +1,5 @@
 build
 jpfop-0.17.0
+.classpath
+.project
+.settings

Modified: xmlgraphics/fop/branches/fop-0_20_2-maintain/build.xml
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/branches/fop-0_20_2-maintain/build.xml?rev=379439&r1=379438&r2=379439&view=diff
==============================================================================
--- xmlgraphics/fop/branches/fop-0_20_2-maintain/build.xml (original)
+++ xmlgraphics/fop/branches/fop-0_20_2-maintain/build.xml Tue Feb 21 04:46:05 2006
@@ -671,6 +671,7 @@
              bottom="Copyright © ${year} Apache Software Foundation. All Rights
Reserved."
              overview="${build.src}/overview.html"
              use="true"
+             source="${javac.source}"
              failonerror="true">
       <group title="Control and Startup">
         <package name="org.apache.fop.apps"/>

Modified: xmlgraphics/fop/branches/fop-0_20_2-maintain/src/org/apache/fop/fonts/apps/PFMReader.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/branches/fop-0_20_2-maintain/src/org/apache/fop/fonts/apps/PFMReader.java?rev=379439&r1=379438&r2=379439&view=diff
==============================================================================
--- xmlgraphics/fop/branches/fop-0_20_2-maintain/src/org/apache/fop/fonts/apps/PFMReader.java
(original)
+++ xmlgraphics/fop/branches/fop-0_20_2-maintain/src/org/apache/fop/fonts/apps/PFMReader.java
Tue Feb 21 04:46:05 2006
@@ -371,8 +371,8 @@
 
 
         // Get kerning
-        for (Iterator enum = pfm.getKerning().keySet().iterator(); enum.hasNext(); ) {
-            Integer kpx1 = (Integer)enum.next();
+        for (Iterator iter = pfm.getKerning().keySet().iterator(); iter.hasNext(); ) {
+            Integer kpx1 = (Integer)iter.next();
             el = doc.createElement("kerning");
             el.setAttribute("kpx1", kpx1.toString());
             root.appendChild(el);

Modified: xmlgraphics/fop/branches/fop-0_20_2-maintain/src/org/apache/fop/fonts/apps/TTFReader.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/branches/fop-0_20_2-maintain/src/org/apache/fop/fonts/apps/TTFReader.java?rev=379439&r1=379438&r2=379439&view=diff
==============================================================================
--- xmlgraphics/fop/branches/fop-0_20_2-maintain/src/org/apache/fop/fonts/apps/TTFReader.java
(original)
+++ xmlgraphics/fop/branches/fop-0_20_2-maintain/src/org/apache/fop/fonts/apps/TTFReader.java
Tue Feb 21 04:46:05 2006
@@ -426,14 +426,14 @@
         }
 
         // 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());

Modified: xmlgraphics/fop/branches/fop-0_20_2-maintain/src/org/apache/fop/messaging/MessageHandler.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/branches/fop-0_20_2-maintain/src/org/apache/fop/messaging/MessageHandler.java?rev=379439&r1=379438&r2=379439&view=diff
==============================================================================
--- xmlgraphics/fop/branches/fop-0_20_2-maintain/src/org/apache/fop/messaging/MessageHandler.java
(original)
+++ xmlgraphics/fop/branches/fop-0_20_2-maintain/src/org/apache/fop/messaging/MessageHandler.java
Tue Feb 21 04:46:05 2006
@@ -159,9 +159,9 @@
             break;
         case EVENT:
             setMessage(message);
-            Enumeration enum = listeners.elements();
-            while (enum.hasMoreElements()) {
-                ((MessageListener)enum.nextElement()).processMessage(new MessageEvent(getMessage()));
+            Enumeration en = listeners.elements();
+            while (en.hasMoreElements()) {
+                ((MessageListener)en.nextElement()).processMessage(new MessageEvent(getMessage()));
             }
             break;
         case NONE:
@@ -208,11 +208,11 @@
             break;
         case EVENT:
             setMessage(message);
-            Enumeration enum = listeners.elements();
-            while (enum.hasMoreElements()) {
+            Enumeration en = listeners.elements();
+            while (en.hasMoreElements()) {
                 MessageEvent messEv = new MessageEvent(getMessage());
                 messEv.setMessageType(MessageEvent.ERROR);
-                ((MessageListener)enum.nextElement()).processMessage(messEv);
+                ((MessageListener)en.nextElement()).processMessage(messEv);
             }
             break;
         case NONE:

Modified: xmlgraphics/fop/branches/fop-0_20_2-maintain/src/org/apache/fop/render/ps/PSRenderer.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/branches/fop-0_20_2-maintain/src/org/apache/fop/render/ps/PSRenderer.java?rev=379439&r1=379438&r2=379439&view=diff
==============================================================================
--- xmlgraphics/fop/branches/fop-0_20_2-maintain/src/org/apache/fop/render/ps/PSRenderer.java
(original)
+++ xmlgraphics/fop/branches/fop-0_20_2-maintain/src/org/apache/fop/render/ps/PSRenderer.java
Tue Feb 21 04:46:05 2006
@@ -319,9 +319,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();
             Font fm = (Font)fonts.get(key);
             write("/" + key + " /" + fm.fontName() + " def");
         }
@@ -330,9 +330,9 @@
         defineWinAnsiEncoding();
 
         //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();
             Font fm = (Font)fonts.get(key);
             if (null == fm.encoding()) {
                 //ignore (ZapfDingbats and Symbol run through here



---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org


Mime
View raw message