Modified: 
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/pdf/PDFColorHandler.java
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/pdf/PDFColorHandler.java?rev=1761020&r1=1761019&r2=1761020&view=diff
==============================================================================
--- 
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/pdf/PDFColorHandler.java
 (original)
+++ 
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/pdf/PDFColorHandler.java
 Fri Sep 16 11:17:35 2016
@@ -72,8 +72,7 @@ public class PDFColorHandler {
             ColorWithAlternatives colExt = (ColorWithAlternatives)color;
             //Alternate colors have priority
             Color[] alt = colExt.getAlternativeColors();
-            for (int i = 0, c = alt.length; i < c; i++) {
-                Color col = alt[i];
+            for (Color col : alt) {
                 boolean established = establishColorFromColor(codeBuffer, col, 
fill);
                 if (established) {
                     return;
@@ -223,8 +222,8 @@ public class PDFColorHandler {
         if (comps.length != componentCount) {
             throw new IllegalStateException("Color with unexpected component 
count encountered");
         }
-        for (int i = 0, c = comps.length; i < c; i++) {
-            DoubleFormatUtil.formatDouble(comps[i], 4, 4, codeBuffer);
+        for (float comp : comps) {
+            DoubleFormatUtil.formatDouble(comp, 4, 4, codeBuffer);
             codeBuffer.append(" ");
         }
         codeBuffer.append(command).append("\n");

Modified: 
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/pdf/PDFFilterList.java
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/pdf/PDFFilterList.java?rev=1761020&r1=1761019&r2=1761020&view=diff
==============================================================================
--- 
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/pdf/PDFFilterList.java
 (original)
+++ 
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/pdf/PDFFilterList.java
 Fri Sep 16 11:17:35 2016
@@ -191,8 +191,8 @@ public class PDFFilterList {
                 addFilter(new FlateFilter());
             }
         } else {
-            for (int i = 0; i < filterset.size(); i++) {
-                String v = (String)filterset.get(i);
+            for (Object aFilterset : filterset) {
+                String v = (String) aFilterset;
                 addFilter(v);
             }
         }
@@ -249,8 +249,7 @@ public class PDFFilterList {
     private int populateNamesAndParms(List names, List parms) {
         // run the filters
         int nonNullParams = 0;
-        for (int count = 0; count < filters.size(); count++) {
-            PDFFilter filter = filters.get(count);
+        for (PDFFilter filter : filters) {
             // place the names in our local vector in reverse order
             if (filter.getName().length() > 0) {
                 names.add(0, filter.getName());
@@ -269,8 +268,8 @@ public class PDFFilterList {
     private String buildFilterEntries(List names) {
         int filterCount = 0;
         StringBuffer sb = new StringBuffer(64);
-        for (int i = 0; i < names.size(); i++) {
-            final String name = (String)names.get(i);
+        for (Object name1 : names) {
+            final String name = (String) name1;
             if (name.length() > 0) {
                 filterCount++;
                 sb.append(name);
@@ -290,8 +289,8 @@ public class PDFFilterList {
 
     private void putFilterEntries(PDFDictionary dict, List names) {
         PDFArray array = new PDFArray(dict);
-        for (int i = 0, c = names.size(); i < c; i++) {
-            final String name = (String)names.get(i);
+        for (Object name1 : names) {
+            final String name = (String) name1;
             if (name.length() > 0) {
                 array.add(new PDFName(name));
             }
@@ -313,8 +312,8 @@ public class PDFFilterList {
         if (parms.size() > 1) {
             sb.append("[ ");
         }
-        for (int count = 0; count < parms.size(); count++) {
-            String s = (String)parms.get(count);
+        for (Object parm : parms) {
+            String s = (String) parm;
             if (s != null) {
                 sb.append(s);
                 needParmsEntry = true;
@@ -336,8 +335,7 @@ public class PDFFilterList {
     private void putDecodeParams(PDFDictionary dict, List parms) {
         boolean needParmsEntry = false;
         PDFArray array = new PDFArray(dict);
-        for (int i = 0, c = parms.size(); i < c; i++) {
-            Object obj = parms.get(i);
+        for (Object obj : parms) {
             if (obj != null) {
                 array.add(obj);
                 needParmsEntry = true;

Modified: 
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/pdf/PDFPages.java
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/pdf/PDFPages.java?rev=1761020&r1=1761019&r2=1761020&view=diff
==============================================================================
--- 
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/pdf/PDFPages.java 
(original)
+++ 
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/pdf/PDFPages.java 
Fri Sep 16 11:17:35 2016
@@ -110,8 +110,7 @@ public class PDFPages extends PDFObject
         sb.append("<< /Type /Pages\n/Count ")
                 .append(this.getCount())
                 .append("\n/Kids [");
-        for (int i = 0; i < kids.size(); i++) {
-            Object kid = kids.get(i);
+        for (Object kid : kids) {
             if (kid == null) {
                 throw new IllegalStateException("Gap in the kids list!");
             }

Modified: 
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/pdf/PDFPaintingState.java
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/pdf/PDFPaintingState.java?rev=1761020&r1=1761019&r2=1761020&view=diff
==============================================================================
--- 
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/pdf/PDFPaintingState.java
 (original)
+++ 
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/pdf/PDFPaintingState.java
 Fri Sep 16 11:17:35 2016
@@ -24,7 +24,6 @@ import java.awt.Paint;
 import java.awt.Shape;
 import java.awt.geom.Area;
 import java.awt.geom.GeneralPath;
-import java.util.Iterator;
 
 import org.apache.xmlgraphics.java2d.color.ColorUtil;
 
@@ -172,8 +171,8 @@ public class PDFPaintingState extends or
         PDFGState state;
         PDFGState newState = new PDFGState();
         newState.addValues(defaultState);
-        for (Iterator it = getStateStack().iterator(); it.hasNext();) {
-            PDFData data = (PDFData)it.next();
+        for (AbstractData abstractData : getStateStack()) {
+            PDFData data = (PDFData) abstractData;
             state = data.gstate;
             if (state != null) {
                 newState.addValues(state);

Modified: 
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/pdf/PDFText.java
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/pdf/PDFText.java?rev=1761020&r1=1761019&r2=1761020&view=diff
==============================================================================
--- 
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/pdf/PDFText.java 
(original)
+++ 
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/pdf/PDFText.java 
Fri Sep 16 11:17:35 2016
@@ -151,9 +151,9 @@ public class PDFText extends PDFObject {
         if (brackets) {
             sb.append("<");
         }
-        for (int i = 0; i < data.length; i++) {
-            sb.append(DIGITS[(data[i] >>> 4) & 0x0F]);
-            sb.append(DIGITS[data[i] & 0x0F]);
+        for (byte aData : data) {
+            sb.append(DIGITS[(aData >>> 4) & 0x0F]);
+            sb.append(DIGITS[aData & 0x0F]);
         }
         if (brackets) {
             sb.append(">");
@@ -198,9 +198,9 @@ public class PDFText extends PDFObject {
             throw new CascadingRuntimeException("Incompatible VM", uee);
         }
 
-        for (int i = 0; i < uniBytes.length; i++) {
-            buf.append(DIGITS[(uniBytes[i] >>> 4) & 0x0F]);
-            buf.append(DIGITS[uniBytes[i] & 0x0F]);
+        for (byte uniByte : uniBytes) {
+            buf.append(DIGITS[(uniByte >>> 4) & 0x0F]);
+            buf.append(DIGITS[uniByte & 0x0F]);
         }
         return buf.toString();
     }
@@ -287,8 +287,7 @@ public class PDFText extends PDFObject {
     public static final byte[] escapeByteArray(byte[] data) {
         ByteArrayOutputStream bout = new ByteArrayOutputStream(data.length);
         bout.write((int)'(');
-        for (int i = 0; i < data.length; i++) {
-            final int b = data[i];
+        for (final byte b : data) {
             switch (b) {
                 case '\n':
                     bout.write('\\');

Modified: 
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/pdf/PDFWArray.java
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/pdf/PDFWArray.java?rev=1761020&r1=1761019&r2=1761020&view=diff
==============================================================================
--- 
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/pdf/PDFWArray.java 
(original)
+++ 
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/pdf/PDFWArray.java 
Fri Sep 16 11:17:35 2016
@@ -100,16 +100,15 @@ public class PDFWArray {
         StringBuffer p = new StringBuffer();
         p.append("[ ");
         int len = entries.size();
-        for (int i = 0; i < len; i++) {
-            Object entry = entries.get(i);
+        for (Object entry : entries) {
             if (entry instanceof int[]) {
-                int[] line = (int[])entry;
-                for (int j = 0; j < line.length; j++) {
-                    p.append(line[j]);
+                int[] line = (int[]) entry;
+                for (int aLine : line) {
+                    p.append(aLine);
                     p.append(" ");
                 }
             } else {
-                ((Entry)entry).fillInPDF(p);
+                ((Entry) entry).fillInPDF(p);
             }
         }
         p.append("]");
@@ -131,8 +130,8 @@ public class PDFWArray {
             // p.setLength(0);
             p.append(start);
             p.append(" [");
-            for (int i = 0; i < metrics.length; i++) {
-                p.append(this.metrics[i]);
+            for (int metric : metrics) {
+                p.append(metric);
                 p.append(" ");
             }
             p.append("] ");

Modified: 
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/AbstractFOEventHandlerMaker.java
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/AbstractFOEventHandlerMaker.java?rev=1761020&r1=1761019&r2=1761020&view=diff
==============================================================================
--- 
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/AbstractFOEventHandlerMaker.java
 (original)
+++ 
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/AbstractFOEventHandlerMaker.java
 Fri Sep 16 11:17:35 2016
@@ -58,8 +58,8 @@ public abstract class AbstractFOEventHan
      */
     public boolean isMimeTypeSupported(String mimeType) {
         String[] mimes = getSupportedMimeTypes();
-        for (int i = 0; i < mimes.length; i++) {
-            if (mimes[i].equals(mimeType)) {
+        for (String mime : mimes) {
+            if (mime.equals(mimeType)) {
                 return true;
             }
         }

Modified: 
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/AbstractRenderer.java
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/AbstractRenderer.java?rev=1761020&r1=1761019&r2=1761020&view=diff
==============================================================================
--- 
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/AbstractRenderer.java
 (original)
+++ 
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/AbstractRenderer.java
 Fri Sep 16 11:17:35 2016
@@ -202,11 +202,12 @@ public abstract class AbstractRenderer
 
     private String convertToString(List children) {
         StringBuffer sb = new StringBuffer();
-        for (int count = 0; count < children.size(); count++) {
-            InlineArea inline = (InlineArea) children.get(count);
+        for (Object aChildren : children) {
+            InlineArea inline = (InlineArea) aChildren;
             //if (inline instanceof Character) {
             //    sb.append(((Character) inline).getChar());
-            /*} else*/ if (inline instanceof TextArea) {
+            /*} else*/
+            if (inline instanceof TextArea) {
                 sb.append(((TextArea) inline).getText());
             } else if (inline instanceof InlineParent) {
                 sb.append(convertToString(
@@ -413,8 +414,8 @@ public abstract class AbstractRenderer
         int saveBPPos = currentBPPosition;
         int saveSpanBPPos = saveBPPos;
         int saveIPPos = currentIPPosition;
-        for (int count = 0; count < spans.size(); count++) {
-            span = (Span) spans.get(count);
+        for (Object span1 : spans) {
+            span = (Span) span1;
             int level = span.getBidiLevel();
             if (level < 0) {
                 level = 0;
@@ -548,8 +549,7 @@ public abstract class AbstractRenderer
         containingBPPosition = currentBPPosition;
         containingIPPosition = currentIPPosition;
 
-        for (int count = 0; count < blocks.size(); count++) {
-            Object obj = blocks.get(count);
+        for (Object obj : blocks) {
             if (obj instanceof Block) {
                 currentIPPosition = contIP;
                 containingBPPosition = contBP;
@@ -685,8 +685,8 @@ public abstract class AbstractRenderer
         } else {
             currentIPPosition += line.getStartIndent();
         }
-        for (int i = 0, l = children.size(); i < l; i++) {
-            InlineArea inline = (InlineArea) children.get(i);
+        for (Object aChildren : children) {
+            InlineArea inline = (InlineArea) aChildren;
             renderInlineArea(inline);
         }
         currentBPPosition = saveBP;
@@ -755,8 +755,8 @@ public abstract class AbstractRenderer
         List children = text.getChildAreas();
         int saveIP = currentIPPosition;
         int saveBP = currentBPPosition;
-        for (int i = 0, l = children.size(); i < l; i++) {
-            InlineArea inline = (InlineArea) children.get(i);
+        for (Object aChildren : children) {
+            InlineArea inline = (InlineArea) aChildren;
             renderInlineArea(inline);
         }
         currentIPPosition = saveIP + text.getAllocIPD();
@@ -798,8 +798,8 @@ public abstract class AbstractRenderer
         int ipAdjust;
         if ((ip instanceof FilledArea) && ((level & 1) != 0)) {
             int ipdChildren = 0;
-            for (int i = 0, l = children.size(); i < l; i++) {
-                InlineArea inline = (InlineArea) children.get(i);
+            for (Object aChildren : children) {
+                InlineArea inline = (InlineArea) aChildren;
                 ipdChildren += inline.getAllocIPD();
             }
             ipAdjust = ip.getAllocIPD() - ipdChildren;
@@ -817,8 +817,8 @@ public abstract class AbstractRenderer
         }
         currentBPPosition += ip.getBlockProgressionOffset();
         // render children inlines
-        for (int i = 0, l = children.size(); i < l; i++) {
-            InlineArea inline = (InlineArea) children.get(i);
+        for (Object aChildren : children) {
+            InlineArea inline = (InlineArea) aChildren;
             renderInlineArea(inline);
         }
         currentIPPosition = saveIP + ip.getAllocIPD();

Modified: 
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/AbstractRendererMaker.java
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/AbstractRendererMaker.java?rev=1761020&r1=1761019&r2=1761020&view=diff
==============================================================================
--- 
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/AbstractRendererMaker.java
 (original)
+++ 
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/AbstractRendererMaker.java
 Fri Sep 16 11:17:35 2016
@@ -61,8 +61,8 @@ public abstract class AbstractRendererMa
      */
     public boolean isMimeTypeSupported(String mimeType) {
         String[] mimes = getSupportedMimeTypes();
-        for (int i = 0; i < mimes.length; i++) {
-            if (mimes[i].equals(mimeType)) {
+        for (String mime : mimes) {
+            if (mime.equals(mimeType)) {
                 return true;
             }
         }

Modified: 
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/ImageHandlerRegistry.java
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/ImageHandlerRegistry.java?rev=1761020&r1=1761019&r2=1761020&view=diff
==============================================================================
--- 
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/ImageHandlerRegistry.java
 (original)
+++ 
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/ImageHandlerRegistry.java
 Fri Sep 16 11:17:35 2016
@@ -142,8 +142,8 @@ public class ImageHandlerRegistry {
         for (ImageHandler handler : this.handlerList) {
             if (handler.isCompatible(context, null)) {
                 ImageFlavor[] f = handler.getSupportedImageFlavors();
-                for (int i = 0; i < f.length; i++) {
-                    flavors.add(f[i]);
+                for (ImageFlavor aF : f) {
+                    flavors.add(aF);
                 }
             }
         }

Modified: 
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/RendererFactory.java
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/RendererFactory.java?rev=1761020&r1=1761019&r2=1761020&view=diff
==============================================================================
--- 
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/RendererFactory.java
 (original)
+++ 
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/RendererFactory.java
 Fri Sep 16 11:17:35 2016
@@ -85,13 +85,13 @@ public class RendererFactory {
      */
     public void addRendererMaker(AbstractRendererMaker maker) {
         String[] mimes = maker.getSupportedMimeTypes();
-        for (int i = 0; i < mimes.length; i++) {
+        for (String mime : mimes) {
             //This overrides any renderer previously set for a MIME type
-            if (rendererMakerMapping.get(mimes[i]) != null) {
-                log.trace("Overriding renderer for " + mimes[i]
+            if (rendererMakerMapping.get(mime) != null) {
+                log.trace("Overriding renderer for " + mime
                         + " with " + maker.getClass().getName());
             }
-            rendererMakerMapping.put(mimes[i], maker);
+            rendererMakerMapping.put(mime, maker);
         }
     }
 
@@ -102,13 +102,13 @@ public class RendererFactory {
      */
     public void addFOEventHandlerMaker(AbstractFOEventHandlerMaker maker) {
         String[] mimes = maker.getSupportedMimeTypes();
-        for (int i = 0; i < mimes.length; i++) {
+        for (String mime : mimes) {
             //This overrides any event handler previously set for a MIME type
-            if (eventHandlerMakerMapping.get(mimes[i]) != null) {
-                log.trace("Overriding FOEventHandler for " + mimes[i]
+            if (eventHandlerMakerMapping.get(mime) != null) {
+                log.trace("Overriding FOEventHandler for " + mime
                         + " with " + maker.getClass().getName());
             }
-            eventHandlerMakerMapping.put(mimes[i], maker);
+            eventHandlerMakerMapping.put(mime, maker);
         }
     }
 
@@ -119,13 +119,13 @@ public class RendererFactory {
      */
     public void addDocumentHandlerMaker(AbstractIFDocumentHandlerMaker maker) {
         String[] mimes = maker.getSupportedMimeTypes();
-        for (int i = 0; i < mimes.length; i++) {
+        for (String mime : mimes) {
             //This overrides any renderer previously set for a MIME type
-            if (documentHandlerMakerMapping.get(mimes[i]) != null) {
-                log.trace("Overriding document handler for " + mimes[i]
+            if (documentHandlerMakerMapping.get(mime) != null) {
+                log.trace("Overriding document handler for " + mime
                         + " with " + maker.getClass().getName());
             }
-            documentHandlerMakerMapping.put(mimes[i], maker);
+            documentHandlerMakerMapping.put(mime, maker);
         }
     }
 

Modified: 
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/XMLHandlerConfigurator.java
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/XMLHandlerConfigurator.java?rev=1761020&r1=1761019&r2=1761020&view=diff
==============================================================================
--- 
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/XMLHandlerConfigurator.java
 (original)
+++ 
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/XMLHandlerConfigurator.java
 Fri Sep 16 11:17:35 2016
@@ -57,10 +57,10 @@ public class XMLHandlerConfigurator exte
         Configuration handlerConfig = null;
 
         Configuration[] children = cfg.getChildren("xml-handler");
-        for (int i = 0; i < children.length; ++i) {
+        for (Configuration aChildren : children) {
             try {
-                if (children[i].getAttribute("namespace").equals(namespace)) {
-                    handlerConfig = children[i];
+                if (aChildren.getAttribute("namespace").equals(namespace)) {
+                    handlerConfig = aChildren;
                     break;
                 }
             } catch (ConfigurationException e) {

Modified: 
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/XMLHandlerRegistry.java
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/XMLHandlerRegistry.java?rev=1761020&r1=1761019&r2=1761020&view=diff
==============================================================================
--- 
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/XMLHandlerRegistry.java
 (original)
+++ 
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/XMLHandlerRegistry.java
 Fri Sep 16 11:17:35 2016
@@ -130,9 +130,9 @@ public class XMLHandlerRegistry {
     private XMLHandler getXMLHandler(Renderer renderer, List<XMLHandler> lst) {
         XMLHandler handler;
         if (lst != null) {
-            for (int i = 0, c = lst.size(); i < c; i++) {
+            for (XMLHandler aLst : lst) {
                 //TODO Maybe add priorities later
-                handler = lst.get(i);
+                handler = aLst;
                 if (handler.supportsRenderer(renderer)) {
                     return handler;
                 }

Modified: 
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/afp/AFPRendererConfig.java
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/afp/AFPRendererConfig.java?rev=1761020&r1=1761019&r2=1761020&view=diff
==============================================================================
--- 
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/afp/AFPRendererConfig.java
 (original)
+++ 
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/afp/AFPRendererConfig.java
 Fri Sep 16 11:17:35 2016
@@ -358,8 +358,7 @@ public final class AFPRendererConfig imp
             if (defaultResourceLevelCfg != null) {
                 AFPResourceLevelDefaults defaults = new 
AFPResourceLevelDefaults();
                 String[] types = defaultResourceLevelCfg.getAttributeNames();
-                for (int i = 0, c = types.length; i < c; i++) {
-                    String type = types[i];
+                for (String type : types) {
                     try {
                         String level = 
defaultResourceLevelCfg.getAttribute(type);
                         defaults.setDefaultResourceLevel(type, 
AFPResourceLevel.valueOf(level));

Modified: 
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/intermediate/AbstractIFDocumentHandlerMaker.java
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/intermediate/AbstractIFDocumentHandlerMaker.java?rev=1761020&r1=1761019&r2=1761020&view=diff
==============================================================================
--- 
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/intermediate/AbstractIFDocumentHandlerMaker.java
 (original)
+++ 
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/intermediate/AbstractIFDocumentHandlerMaker.java
 Fri Sep 16 11:17:35 2016
@@ -50,8 +50,8 @@ public abstract class AbstractIFDocument
      */
     public boolean isMimeTypeSupported(String mimeType) {
         String[] mimes = getSupportedMimeTypes();
-        for (int i = 0; i < mimes.length; i++) {
-            if (mimes[i].equals(mimeType)) {
+        for (String mime : mimes) {
+            if (mime.equals(mimeType)) {
                 return true;
             }
         }

Modified: 
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/intermediate/AbstractIFPainter.java
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/intermediate/AbstractIFPainter.java?rev=1761020&r1=1761019&r2=1761020&view=diff
==============================================================================
--- 
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/intermediate/AbstractIFPainter.java
 (original)
+++ 
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/intermediate/AbstractIFPainter.java
 Fri Sep 16 11:17:35 2016
@@ -113,8 +113,8 @@ public abstract class AbstractIFPainter<
 
     private AffineTransform combine(AffineTransform[] transforms) {
         AffineTransform at = new AffineTransform();
-        for (int i = 0, c = transforms.length; i < c; i++) {
-            at.concatenate(transforms[i]);
+        for (AffineTransform transform : transforms) {
+            at.concatenate(transform);
         }
         return at;
     }

Modified: 
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/intermediate/IFRenderer.java
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/intermediate/IFRenderer.java?rev=1761020&r1=1761019&r2=1761020&view=diff
==============================================================================
--- 
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/intermediate/IFRenderer.java
 (original)
+++ 
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/intermediate/IFRenderer.java
 Fri Sep 16 11:17:35 2016
@@ -610,9 +610,7 @@ public class IFRenderer extends Abstract
 
     private void processExtensionAttachments(AreaTreeObject area) throws 
IFException {
         if (area.hasExtensionAttachments()) {
-            for (Iterator iter = area.getExtensionAttachments().iterator();
-                iter.hasNext();) {
-                ExtensionAttachment attachment = (ExtensionAttachment) 
iter.next();
+            for (ExtensionAttachment attachment : 
area.getExtensionAttachments()) {
                 this.documentHandler.handleExtensionObject(attachment);
             }
         }
@@ -688,15 +686,15 @@ public class IFRenderer extends Abstract
     /** {@inheritDoc} */
     protected void restoreStateStackAfterBreakOut(List breakOutList) {
         log.debug("Block.FIXED --> restoring context after break-out");
-        for (int i = 0, c = breakOutList.size(); i < c; i++) {
+        for (Object aBreakOutList : breakOutList) {
             graphicContextStack.push(graphicContext);
-            this.graphicContext = (IFGraphicContext)breakOutList.get(i);
+            this.graphicContext = (IFGraphicContext) aBreakOutList;
 
             //Handle groups
             IFGraphicContext.Group[] groups = graphicContext.getGroups();
-            for (int j = 0, jc = groups.length; j < jc; j++) {
+            for (IFGraphicContext.Group group : groups) {
                 try {
-                    groups[j].start(painter);
+                    group.start(painter);
                 } catch (IFException ife) {
                     handleIFException(ife);
                 }

Modified: 
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/intermediate/IFUtil.java
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/intermediate/IFUtil.java?rev=1761020&r1=1761019&r2=1761020&view=diff
==============================================================================
--- 
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/intermediate/IFUtil.java
 (original)
+++ 
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/intermediate/IFUtil.java
 Fri Sep 16 11:17:35 2016
@@ -307,8 +307,8 @@ public final class IFUtil {
         if (dp == null) {
             return true;
         } else {
-            for (int i = 0, n = dp.length; i < n; i++) {
-                if (!isPAIdentity(dp[i])) {
+            for (int[] aDp : dp) {
+                if (!isPAIdentity(aDp)) {
                     return false;
                 }
             }
@@ -330,8 +330,7 @@ public final class IFUtil {
         if (dp == null) {
             return false;
         } else {
-            for (int i = 0, n = dp.length; i < n; i++) {
-                int[] pa = dp[i];
+            for (int[] pa : dp) {
                 if ((pa != null) && (pa[0] != pa[2])) {
                     return false;
                 }

Modified: 
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/java2d/InstalledFontCollection.java
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/java2d/InstalledFontCollection.java?rev=1761020&r1=1761019&r2=1761020&view=diff
==============================================================================
--- 
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/java2d/InstalledFontCollection.java
 (original)
+++ 
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/java2d/InstalledFontCollection.java
 Fri Sep 16 11:17:35 2016
@@ -77,8 +77,7 @@ public class InstalledFontCollection imp
         GraphicsEnvironment env = 
GraphicsEnvironment.getLocalGraphicsEnvironment();
 
         java.awt.Font[] fonts = env.getAllFonts();
-        for (int i = 0; i < fonts.length; i++) {
-            java.awt.Font f = fonts[i];
+        for (java.awt.Font f : fonts) {
             if (HARDCODED_FONT_NAMES.contains(f.getName())) {
                 continue; //skip
             }

Modified: 
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/pcl/PCLGenerator.java
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/pcl/PCLGenerator.java?rev=1761020&r1=1761019&r2=1761020&view=diff
==============================================================================
--- 
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/pcl/PCLGenerator.java
 (original)
+++ 
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/pcl/PCLGenerator.java
 Fri Sep 16 11:17:35 2016
@@ -108,8 +108,8 @@ public class PCLGenerator {
     public PCLGenerator(OutputStream out, int maxResolution) {
         this(out);
         boolean found = false;
-        for (int i = 0; i < PCL_RESOLUTIONS.length; i++) {
-            if (PCL_RESOLUTIONS[i] == maxResolution) {
+        for (int pclResolutions : PCL_RESOLUTIONS) {
+            if (pclResolutions == maxResolution) {
                 found = true;
                 break;
             }

Modified: 
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/ps/PSImageHandlerSVG.java
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/ps/PSImageHandlerSVG.java?rev=1761020&r1=1761019&r2=1761020&view=diff
==============================================================================
--- 
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/ps/PSImageHandlerSVG.java
 (original)
+++ 
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/ps/PSImageHandlerSVG.java
 Fri Sep 16 11:17:35 2016
@@ -293,8 +293,8 @@ public class PSImageHandlerSVG implement
                 if (curNode.getAttributes().getNamedItem("style") != null) {
                     String[] stylePairs = 
curNode.getAttributes().getNamedItem("style").getNodeValue()
                             .split(";");
-                    for (int styleAtt = 0; styleAtt < stylePairs.length; 
styleAtt++) {
-                        String[] style = stylePairs[styleAtt].split(":");
+                    for (String stylePair : stylePairs) {
+                        String[] style = stylePair.split(":");
                         if (style[0].equalsIgnoreCase("stop-opacity")) {
                             if (Double.parseDouble(style[1]) < 1) {
                                 return true;

Modified: 
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/RTFHandler.java
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/RTFHandler.java?rev=1761020&r1=1761019&r2=1761020&view=diff
==============================================================================
--- 
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/RTFHandler.java
 (original)
+++ 
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/RTFHandler.java
 Fri Sep 16 11:17:35 2016
@@ -1757,9 +1757,9 @@ public class RTFHandler extends FOEventH
               //Calculation for column-widths which are not set
               prepareTable(table);
 
-              for (Iterator it = table.getColumns().iterator(); it.hasNext();) 
{
-                  recurseFONode((FONode) it.next());
-              }
+                for (Object o : table.getColumns()) {
+                    recurseFONode((FONode) o);
+                }
             } else {
                 //TODO Implement implicit column setup handling!
                 RTFEventProducer eventProducer = RTFEventProducer.Provider.get(

Modified: 
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfColorTable.java
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfColorTable.java?rev=1761020&r1=1761019&r2=1761020&view=diff
==============================================================================
--- 
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfColorTable.java
 (original)
+++ 
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfColorTable.java
 Fri Sep 16 11:17:35 2016
@@ -191,8 +191,8 @@ public final class RtfColorTable {
 
         int len = colorTable.size();
 
-        for (int i = 0; i < len; i++) {
-            int identifier = (Integer) colorTable.get(i);
+        for (Object aColorTable : colorTable) {
+            int identifier = (Integer) aColorTable;
 
             header.newLine();
             header.write("\\red" + determineColorLevel(identifier, RED));

Modified: 
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfContainer.java
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfContainer.java?rev=1761020&r1=1761019&r2=1761020&view=diff
==============================================================================
--- 
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfContainer.java
 (original)
+++ 
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfContainer.java
 Fri Sep 16 11:17:35 2016
@@ -28,7 +28,6 @@ package org.apache.fop.render.rtf.rtflib
 
 import java.io.IOException;
 import java.io.Writer;
-import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
 
@@ -113,16 +112,16 @@ public class RtfContainer extends RtfEle
     }
 
     private int findChildren(RtfElement aChild, int iStart) {
-        for (Iterator it = this.getChildren().iterator(); it.hasNext();) {
-          final RtfElement e = (RtfElement)it.next();
-          if (aChild == e) {
-              return iStart;
-          } else if (e instanceof RtfContainer) {
-              int iFound = ((RtfContainer)e).findChildren(aChild, (iStart + 
1));
-              if (iFound != -1) {
-                  return iFound;
-              }
-          }
+        for (Object o : this.getChildren()) {
+            final RtfElement e = (RtfElement) o;
+            if (aChild == e) {
+                return iStart;
+            } else if (e instanceof RtfContainer) {
+                int iFound = ((RtfContainer) e).findChildren(aChild, (iStart + 
1));
+                if (iFound != -1) {
+                    return iFound;
+                }
+            }
         }
         return -1;
     }
@@ -157,8 +156,8 @@ public class RtfContainer extends RtfEle
      */
     protected void writeRtfContent()
     throws IOException {
-        for (Iterator it = children.iterator(); it.hasNext();) {
-            final RtfElement e = (RtfElement)it.next();
+        for (Object aChildren : children) {
+            final RtfElement e = (RtfElement) aChildren;
             e.writeRtf();
         }
     }
@@ -171,12 +170,12 @@ public class RtfContainer extends RtfEle
     /** true if this (recursively) contains at least one RtfText object */
     boolean containsText() {
         boolean result = false;
-        for (Iterator it = children.iterator(); it.hasNext();) {
-            final RtfElement e = (RtfElement)it.next();
+        for (Object aChildren : children) {
+            final RtfElement e = (RtfElement) aChildren;
             if (e instanceof RtfText) {
                 result = !e.isEmpty();
             } else if (e instanceof RtfContainer) {
-                if (((RtfContainer)e).containsText()) {
+                if (((RtfContainer) e).containsText()) {
                     result = true;
                 }
             }
@@ -191,8 +190,8 @@ public class RtfContainer extends RtfEle
     void dump(Writer w, int indent)
     throws IOException {
         super.dump(w, indent);
-        for (Iterator it = children.iterator(); it.hasNext();) {
-            final RtfElement e = (RtfElement)it.next();
+        for (Object aChildren : children) {
+            final RtfElement e = (RtfElement) aChildren;
             e.dump(w, indent + 1);
         }
     }
@@ -222,8 +221,8 @@ public class RtfContainer extends RtfEle
      */
     public boolean isEmpty() {
         boolean result = true;
-        for (Iterator it = children.iterator(); it.hasNext();) {
-            final RtfElement e = (RtfElement)it.next();
+        for (Object aChildren : children) {
+            final RtfElement e = (RtfElement) aChildren;
             if (!e.isEmpty()) {
                 result = false;
                 break;

Modified: 
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfElement.java
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfElement.java?rev=1761020&r1=1761019&r2=1761020&view=diff
==============================================================================
--- 
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfElement.java
 (original)
+++ 
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfElement.java
 Fri Sep 16 11:17:35 2016
@@ -190,8 +190,7 @@ public abstract class RtfElement {
 
         if (nameList != null) {
             // process only given attribute names
-            for (int i = 0; i < nameList.length; i++) {
-                final String name = nameList[i];
+            for (final String name : nameList) {
                 if (attr.isSet(name)) {
                     writeOneAttribute(name, attr.getValue(name));
                 }

Modified: 
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfExternalGraphic.java
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfExternalGraphic.java?rev=1761020&r1=1761019&r2=1761020&view=diff
==============================================================================
--- 
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfExternalGraphic.java
 (original)
+++ 
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfExternalGraphic.java
 Fri Sep 16 11:17:35 2016
@@ -405,8 +405,8 @@ public class RtfExternalGraphic extends
         writeSizeInfo();
         writeAttributes(getRtfAttributes(), null);
 
-        for (int i = 0; i < imagedata.length; i++) {
-            int iData = imagedata [i];
+        for (byte anImagedata : imagedata) {
+            int iData = anImagedata;
 
             // Make positive byte
             if (iData < 0) {

Modified: 
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfExtraRowSet.java
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfExtraRowSet.java?rev=1761020&r1=1761019&r2=1761020&view=diff
==============================================================================
--- 
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfExtraRowSet.java
 (original)
+++ 
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfExtraRowSet.java
 Fri Sep 16 11:17:35 2016
@@ -29,7 +29,6 @@ package org.apache.fop.render.rtf.rtflib
 import java.io.IOException;
 import java.io.Writer;
 import java.util.Collections;
-import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
 
@@ -140,10 +139,10 @@ public class RtfExtraRowSet extends RtfC
      */
     int addTable(RtfTable tbl, int rowIndex, int xOffset) {
         // process all rows of the table
-        for (Iterator it = tbl.getChildren().iterator(); it.hasNext();) {
-            final RtfElement e = (RtfElement)it.next();
+        for (Object o : tbl.getChildren()) {
+            final RtfElement e = (RtfElement) o;
             if (e instanceof RtfTableRow) {
-                addRow((RtfTableRow)e, rowIndex, xOffset);
+                addRow((RtfTableRow) e, rowIndex, xOffset);
                 rowIndex++;
                 maxRowIndex = Math.max(rowIndex, maxRowIndex);
             }
@@ -153,10 +152,10 @@ public class RtfExtraRowSet extends RtfC
 
     /** add all cells of given row to this set */
     private void addRow(RtfTableRow row, int rowIndex, int xOffset) {
-        for (Iterator it = row.getChildren().iterator(); it.hasNext();) {
-            final RtfElement e = (RtfElement)it.next();
+        for (Object o : row.getChildren()) {
+            final RtfElement e = (RtfElement) o;
             if (e instanceof RtfTableCell) {
-                final RtfTableCell c = (RtfTableCell)e;
+                final RtfTableCell c = (RtfTableCell) e;
                 cells.add(new PositionedCell(c, rowIndex, xOffset));
                 xOffset += c.getCellWidth();
             }
@@ -188,8 +187,8 @@ public class RtfExtraRowSet extends RtfC
         // process all extra cells by rendering them into extra rows
         List rowCells = null;
         int rowIndex = -1;
-        for (Iterator it = cells.iterator(); it.hasNext();) {
-            final PositionedCell pc = (PositionedCell)it.next();
+        for (Object cell : cells) {
+            final PositionedCell pc = (PositionedCell) cell;
             if (pc.rowIndex != rowIndex) {
                 // starting a new row, render previous one
                 if (rowCells != null) {
@@ -225,24 +224,24 @@ public class RtfExtraRowSet extends RtfC
         float xOffset = 0;
         float xOffsetOfLastPositionedCell = 0;
 
-        for (Iterator it = cells.iterator(); it.hasNext();) {
-            final PositionedCell pc = (PositionedCell)it.next();
+        for (Object cell : cells) {
+            final PositionedCell pc = (PositionedCell) cell;
 
             // if first cell is not at offset 0, add placeholder cell
             // TODO should be merged with the cell that is above it
             if (cellIndex == 0 && pc.xOffset > 0) {
-               /**
-                * Added by Boris Poudérous
-                */
-               // Add empty cells merged vertically with the cells above and 
with the same widths
-               // (BEFORE the cell that contains the nested table)
+                /**
+                 * Added by Boris Poudérous
+                 */
+                // Add empty cells merged vertically with the cells above and 
with the same widths
+                // (BEFORE the cell that contains the nested table)
                 for (int i = 0; (xOffset < pc.xOffset)
                         && (i < parentITableColumnsInfo.getNumberOfColumns()); 
i++) {
                     // Get the width of the cell above
                     xOffset += parentITableColumnsInfo.getColumnWidth();
                     // Create the empty cell merged vertically
-                    
row.newTableCellMergedVertically((int)parentITableColumnsInfo.getColumnWidth(),
-                           pc.cell.attrib);
+                    row.newTableCellMergedVertically((int) 
parentITableColumnsInfo.getColumnWidth(),
+                            pc.cell.attrib);
                     // Select next column in order to have its width
                     parentITableColumnsInfo.selectNextColumn();
                 }
@@ -286,8 +285,8 @@ public class RtfExtraRowSet extends RtfC
      */
     private static boolean allCellsEmpty(List cells) {
         boolean empty = true;
-        for (Iterator it = cells.iterator(); it.hasNext();) {
-            final PositionedCell pc = (PositionedCell)it.next();
+        for (Object cell : cells) {
+            final PositionedCell pc = (PositionedCell) cell;
             if (pc.cell.containsText()) {
                 empty = false;
                 break;

Modified: 
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfHeader.java
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfHeader.java?rev=1761020&r1=1761019&r2=1761020&view=diff
==============================================================================
--- 
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfHeader.java
 (original)
+++ 
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfHeader.java
 Fri Sep 16 11:17:35 2016
@@ -29,7 +29,6 @@ package org.apache.fop.render.rtf.rtflib
 import java.io.IOException;
 import java.io.Writer;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.Map;
 
 /**
@@ -69,8 +68,8 @@ class RtfHeader extends RtfContainer {
         if (userProperties.size() > 0) {
             writeGroupMark(true);
             writeStarControlWord("userprops");
-            for (Iterator it = userProperties.entrySet().iterator(); 
it.hasNext();) {
-                final Map.Entry entry = (Map.Entry)it.next();
+            for (Object o : userProperties.entrySet()) {
+                final Map.Entry entry = (Map.Entry) o;
                 writeGroupMark(true);
                 writeControlWord("propname");
                 RtfStringConverter.getInstance().writeRtfString(writer,

Modified: 
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfListTable.java
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfListTable.java?rev=1761020&r1=1761019&r2=1761020&view=diff
==============================================================================
--- 
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfListTable.java
 (original)
+++ 
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfListTable.java
 Fri Sep 16 11:17:35 2016
@@ -28,7 +28,6 @@ package org.apache.fop.render.rtf.rtflib
 
 import java.io.IOException;
 import java.io.Writer;
-import java.util.Iterator;
 import java.util.LinkedList;
 
 /**
@@ -134,8 +133,8 @@ public class RtfListTable extends RtfCon
             writeGroupMark(true);
             writeStarControlWordNS(LIST_TABLE);
             newLine();
-            for (Iterator it = lists.iterator(); it.hasNext();) {
-                final RtfList list = (RtfList)it.next();
+            for (Object list1 : lists) {
+                final RtfList list = (RtfList) list1;
                 writeListTableEntry(list);
                 newLine();
             }
@@ -147,8 +146,8 @@ public class RtfListTable extends RtfCon
             writeStarControlWordNS(LIST_OVR_TABLE);
             int z = 1;
             newLine();
-            for (Iterator it = styles.iterator(); it.hasNext();) {
-                final RtfListStyle style = (RtfListStyle)it.next();
+            for (Object style1 : styles) {
+                final RtfListStyle style = (RtfListStyle) style1;
 
                 writeGroupMark(true);
                 writeStarControlWordNS(LIST_OVR);

Modified: 
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfSpaceManager.java
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfSpaceManager.java?rev=1761020&r1=1761019&r2=1761020&view=diff
==============================================================================
--- 
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfSpaceManager.java
 (original)
+++ 
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfSpaceManager.java
 Fri Sep 16 11:17:35 2016
@@ -19,7 +19,6 @@
 
 package org.apache.fop.render.rtf.rtflib.rtfdoc;
 
-import java.util.Iterator;
 import java.util.LinkedList;
 
 /**
@@ -54,8 +53,8 @@ public class RtfSpaceManager {
      * candidate presence.
      */
     public void stopUpdatingSpaceBefore() {
-        for (Iterator it = blockAttributes.iterator(); it.hasNext();) {
-            RtfSpaceSplitter splitter = (RtfSpaceSplitter) it.next();
+        for (Object blockAttribute : blockAttributes) {
+            RtfSpaceSplitter splitter = (RtfSpaceSplitter) blockAttribute;
             if (splitter.isBeforeCadidateSet()) {
                 splitter.stopUpdatingSpaceBefore();
             }
@@ -68,8 +67,8 @@ public class RtfSpaceManager {
      * @param attrs  attributes to set
      */
     public void setCandidate(RtfAttributes attrs) {
-        for (Iterator it = blockAttributes.iterator(); it.hasNext();) {
-            RtfSpaceSplitter splitter = (RtfSpaceSplitter) it.next();
+        for (Object blockAttribute : blockAttributes) {
+            RtfSpaceSplitter splitter = (RtfSpaceSplitter) blockAttribute;
             splitter.setSpaceBeforeCandidate(attrs);
             splitter.setSpaceAfterCandidate(attrs);
         }

Modified: 
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTableCell.java
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTableCell.java?rev=1761020&r1=1761019&r2=1761020&view=diff
==============================================================================
--- 
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTableCell.java
 (original)
+++ 
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTableCell.java
 Fri Sep 16 11:17:35 2016
@@ -28,7 +28,6 @@ package org.apache.fop.render.rtf.rtflib
 
 import java.io.IOException;
 import java.io.Writer;
-import java.util.Iterator;
 
 /**
  * <p>A cell in an RTF table, container for paragraphs, lists, etc.</p>
@@ -491,14 +490,13 @@ public class RtfTableCell
         // true if there is at least one non-empty paragraph after p in our 
children
         boolean pFound = false;
         boolean result = false;
-        for (Iterator it = getChildren().iterator(); it.hasNext();) {
-            final Object o = it.next();
+        for (final Object o : getChildren()) {
             if (!pFound) {
                 // set pFound when p is found in the list
-                pFound =  (o == p);
+                pFound = (o == p);
             } else {
                 if (o instanceof RtfParagraph) {
-                    final RtfParagraph p2 = (RtfParagraph)o;
+                    final RtfParagraph p2 = (RtfParagraph) o;
                     if (!p2.isEmpty()) {
                         // found a non-empty paragraph after p
                         result = true;

Modified: 
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTableRow.java
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTableRow.java?rev=1761020&r1=1761019&r2=1761020&view=diff
==============================================================================
--- 
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTableRow.java
 (original)
+++ 
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTableRow.java
 Fri Sep 16 11:17:35 2016
@@ -28,7 +28,6 @@ package org.apache.fop.render.rtf.rtflib
 
 import java.io.IOException;
 import java.io.Writer;
-import java.util.Iterator;
 
 import org.apache.fop.apps.FOPException;
 
@@ -199,11 +198,11 @@ public class RtfTableRow extends RtfCont
         RtfAttributes tableBorderAttributes = getTable().getBorderAttributes();
 
         int index = 0;
-        for (Iterator it = getChildren().iterator(); it.hasNext();) {
-            final RtfElement e = (RtfElement)it.next();
+        for (Object o : getChildren()) {
+            final RtfElement e = (RtfElement) o;
             if (e instanceof RtfTableCell) {
 
-                RtfTableCell rtfcell = (RtfTableCell)e;
+                RtfTableCell rtfcell = (RtfTableCell) e;
 
                 // Adjust the cell's display attributes so the table's/row's 
borders
                 // are drawn properly.
@@ -214,7 +213,7 @@ public class RtfTableRow extends RtfCont
                         String border = ITableAttributes.CELL_BORDER_LEFT;
                         if (!rtfcell.getRtfAttributes().isSet(border)) {
                             rtfcell.getRtfAttributes().set(border,
-                                (RtfAttributes) 
tableBorderAttributes.getValue(border));
+                                    (RtfAttributes) 
tableBorderAttributes.getValue(border));
                         }
                     }
 
@@ -222,7 +221,7 @@ public class RtfTableRow extends RtfCont
                         String border = ITableAttributes.CELL_BORDER_RIGHT;
                         if (!rtfcell.getRtfAttributes().isSet(border)) {
                             rtfcell.getRtfAttributes().set(border,
-                                (RtfAttributes) 
tableBorderAttributes.getValue(border));
+                                    (RtfAttributes) 
tableBorderAttributes.getValue(border));
                         }
                     }
 
@@ -230,7 +229,7 @@ public class RtfTableRow extends RtfCont
                         String border = ITableAttributes.CELL_BORDER_TOP;
                         if (!rtfcell.getRtfAttributes().isSet(border)) {
                             rtfcell.getRtfAttributes().set(border,
-                                (RtfAttributes) 
tableBorderAttributes.getValue(border));
+                                    (RtfAttributes) 
tableBorderAttributes.getValue(border));
                         }
                     }
 
@@ -238,7 +237,7 @@ public class RtfTableRow extends RtfCont
                         String border = ITableAttributes.CELL_BORDER_BOTTOM;
                         if (!rtfcell.getRtfAttributes().isSet(border)) {
                             rtfcell.getRtfAttributes().set(border,
-                                (RtfAttributes) 
tableBorderAttributes.getValue(border));
+                                    (RtfAttributes) 
tableBorderAttributes.getValue(border));
                         }
                     }
                 }
@@ -247,35 +246,35 @@ public class RtfTableRow extends RtfCont
                 if (index == 0) {
                     if 
(!rtfcell.getRtfAttributes().isSet(ITableAttributes.CELL_BORDER_LEFT)) {
                         
rtfcell.getRtfAttributes().set(ITableAttributes.CELL_BORDER_LEFT,
-                            (String) 
attrib.getValue(ITableAttributes.ROW_BORDER_LEFT));
+                                (String) 
attrib.getValue(ITableAttributes.ROW_BORDER_LEFT));
                     }
                 }
 
                 if (index == this.getChildCount() - 1) {
                     if 
(!rtfcell.getRtfAttributes().isSet(ITableAttributes.CELL_BORDER_RIGHT)) {
                         
rtfcell.getRtfAttributes().set(ITableAttributes.CELL_BORDER_RIGHT,
-                            (String) 
attrib.getValue(ITableAttributes.ROW_BORDER_RIGHT));
+                                (String) 
attrib.getValue(ITableAttributes.ROW_BORDER_RIGHT));
                     }
                 }
 
                 if (isFirstRow()) {
                     if 
(!rtfcell.getRtfAttributes().isSet(ITableAttributes.CELL_BORDER_TOP)) {
                         
rtfcell.getRtfAttributes().set(ITableAttributes.CELL_BORDER_TOP,
-                            (String) 
attrib.getValue(ITableAttributes.ROW_BORDER_TOP));
+                                (String) 
attrib.getValue(ITableAttributes.ROW_BORDER_TOP));
                     }
                 }
 
                 if ((parentTable != null) && (parentTable.isHighestRow(id))) {
                     if 
(!rtfcell.getRtfAttributes().isSet(ITableAttributes.CELL_BORDER_BOTTOM)) {
                         
rtfcell.getRtfAttributes().set(ITableAttributes.CELL_BORDER_BOTTOM,
-                            (String) 
attrib.getValue(ITableAttributes.ROW_BORDER_BOTTOM));
+                                (String) 
attrib.getValue(ITableAttributes.ROW_BORDER_BOTTOM));
                     }
                 }
 
                 // write cell's definition
                 xPos = rtfcell.writeCellDef(xPos);
             }
-          index++; // Added by Boris POUDEROUS on 2002/07/02
+            index++; // Added by Boris POUDEROUS on 2002/07/02
         }
 
         newLine();

Modified: 
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTextrun.java
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTextrun.java?rev=1761020&r1=1761019&r2=1761020&view=diff
==============================================================================
--- 
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTextrun.java
 (original)
+++ 
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTextrun.java
 Fri Sep 16 11:17:35 2016
@@ -418,14 +418,14 @@ public class RtfTextrun extends RtfConta
         RtfParagraphBreak lastParagraphBreak = null;
         if (bLast) {
             RtfElement aBefore = null;
-            for (Iterator it = getChildren().iterator(); it.hasNext();) {
-                final RtfElement e = (RtfElement)it.next();
+            for (Object o : getChildren()) {
+                final RtfElement e = (RtfElement) o;
                 if (e instanceof RtfParagraphBreak) {
                     //If the element before was a paragraph break or a bookmark
                     //they will be hidden and are therefore not considered as 
visible
                     if (!(aBefore instanceof RtfParagraphBreak)
-                     && !(aBefore instanceof RtfBookmark)) {
-                      lastParagraphBreak = (RtfParagraphBreak)e;
+                            && !(aBefore instanceof RtfBookmark)) {
+                        lastParagraphBreak = (RtfParagraphBreak) e;
                     }
                 } else {
                     if (!(e instanceof RtfOpenGroupMark)
@@ -449,8 +449,8 @@ public class RtfTextrun extends RtfConta
         boolean bPrevPar = false;
         boolean bBookmark = false;
         boolean bFirst = true;
-        for (Iterator it = getChildren().iterator(); it.hasNext();) {
-            final RtfElement e = (RtfElement)it.next();
+        for (Object o : getChildren()) {
+            final RtfElement e = (RtfElement) o;
             final boolean bRtfParagraphBreak = (e instanceof 
RtfParagraphBreak);
 
             if (bHasTableCellParent) {
@@ -471,12 +471,12 @@ public class RtfTextrun extends RtfConta
             boolean bHide = false;
             bHide = bRtfParagraphBreak;
             bHide = bHide
-                && (bPrevPar
+                    && (bPrevPar
                     || bFirst
                     || (bSuppressLastPar && bLast && lastParagraphBreak != null
-                        && e == lastParagraphBreak)
+                    && e == lastParagraphBreak)
                     || bBookmark)
-                && ((RtfParagraphBreak)e).canHide();
+                    && ((RtfParagraphBreak) e).canHide();
 
             if (!bHide) {
                 newLine();
@@ -489,7 +489,7 @@ public class RtfTextrun extends RtfConta
 
             if (e instanceof RtfParagraphBreak) {
                 bPrevPar = true;
-            } else if (e instanceof RtfBookmark)  {
+            } else if (e instanceof RtfBookmark) {
                 bBookmark = true;
             } else if (e instanceof RtfCloseGroupMark) {
                 //do nothing

Modified: 
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/WhitespaceCollapser.java
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/WhitespaceCollapser.java?rev=1761020&r1=1761019&r2=1761020&view=diff
==============================================================================
--- 
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/WhitespaceCollapser.java
 (original)
+++ 
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/WhitespaceCollapser.java
 Fri Sep 16 11:17:35 2016
@@ -26,7 +26,6 @@ package org.apache.fop.render.rtf.rtflib
  * the FOP project.
  */
 
-import java.util.Iterator;
 import java.util.StringTokenizer;
 
 /**
@@ -46,13 +45,12 @@ final class WhitespaceCollapser {
      */
     WhitespaceCollapser(RtfContainer c) {
         // process all texts
-        for (Iterator it = c.getChildren().iterator(); it.hasNext();) {
-            final Object kid = it.next();
+        for (final Object kid : c.getChildren()) {
             if (kid instanceof RtfText) {
-                RtfText current = (RtfText)kid;
+                RtfText current = (RtfText) kid;
                 processText(current);
             } else if (kid instanceof RtfString) {
-                RtfString current = (RtfString)kid;
+                RtfString current = (RtfString) kid;
                 processString(current);
             } else {
                 // if there is something between two texts, it counts for a 
space

Modified: 
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/txt/TXTState.java
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/txt/TXTState.java?rev=1761020&r1=1761019&r2=1761020&view=diff
==============================================================================
--- 
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/txt/TXTState.java
 (original)
+++ 
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/txt/TXTState.java
 Fri Sep 16 11:17:35 2016
@@ -21,7 +21,6 @@ package org.apache.fop.render.txt;
 
 import java.awt.Point;
 import java.awt.geom.Rectangle2D;
-import java.util.Iterator;
 import java.util.LinkedList;
 
 import org.apache.fop.area.CTM;
@@ -62,8 +61,8 @@ public class TXTState {
      */
     private void calcResultCTM() {
         resultCTM = new CTM();
-        for (Iterator i = stackCTM.iterator(); i.hasNext();) {
-            updateResultCTM((CTM) i.next());
+        for (Object aStackCTM : stackCTM) {
+            updateResultCTM((CTM) aStackCTM);
         }
     }
 

Modified: 
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/xml/XMLRenderer.java
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/xml/XMLRenderer.java?rev=1761020&r1=1761019&r2=1761020&view=diff
==============================================================================
--- 
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/xml/XMLRenderer.java
 (original)
+++ 
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/xml/XMLRenderer.java
 Fri Sep 16 11:17:35 2016
@@ -466,8 +466,8 @@ public class XMLRenderer extends Abstrac
             startElement("title");
             List children = seqTitle.getInlineAreas();
 
-            for (int count = 0; count < children.size(); count++) {
-                InlineArea inline = (InlineArea) children.get(count);
+            for (Object aChildren : children) {
+                InlineArea inline = (InlineArea) aChildren;
                 renderInlineArea(inline);
             }
 
@@ -603,8 +603,8 @@ public class XMLRenderer extends Abstrac
 
         Span span = null;
         List spans = mr.getSpans();
-        for (int count = 0; count < spans.size(); count++) {
-            span = (Span) spans.get(count);
+        for (Object span1 : spans) {
+            span = (Span) span1;
             atts.clear();
             if (span.getColumnCount() != 1) {
                 addAttribute("columnCount", span.getColumnCount());

Modified: 
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/svg/NativeTextPainter.java
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/svg/NativeTextPainter.java?rev=1761020&r1=1761019&r2=1761020&view=diff
==============================================================================
--- 
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/svg/NativeTextPainter.java
 (original)
+++ 
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/svg/NativeTextPainter.java
 Fri Sep 16 11:17:35 2016
@@ -182,8 +182,8 @@ public abstract class NativeTextPainter
             super.paintTextRuns(textRuns, g2d);
             return;
         }
-        for (int i = 0; i < textRuns.size(); i++) {
-            TextRun textRun = (TextRun) textRuns.get(i);
+        for (Object textRun1 : textRuns) {
+            TextRun textRun = (TextRun) textRun1;
             try {
                 paintTextRun(textRun, g2d);
             } catch (IOException ioe) {

Modified: 
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/svg/PDFGraphics2D.java
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/svg/PDFGraphics2D.java?rev=1761020&r1=1761019&r2=1761020&view=diff
==============================================================================
--- 
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/svg/PDFGraphics2D.java
 (original)
+++ 
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/svg/PDFGraphics2D.java
 Fri Sep 16 11:17:35 2016
@@ -947,8 +947,8 @@ public class PDFGraphics2D extends Abstr
         List<Double> theMatrix = new java.util.ArrayList<Double>();
         double [] mat = new double[6];
         transform.getMatrix(mat);
-        for (int idx = 0; idx < mat.length; idx++) {
-            theMatrix.add(mat[idx]);
+        for (double aMat : mat) {
+            theMatrix.add(aMat);
         }
 
         /** @todo see if pdfDoc and res can be linked here,

Modified: 
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/tools/anttasks/FileCompare.java
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/tools/anttasks/FileCompare.java?rev=1761020&r1=1761019&r2=1761020&view=diff
==============================================================================
--- 
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/tools/anttasks/FileCompare.java
 (original)
+++ 
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/tools/anttasks/FileCompare.java
 Fri Sep 16 11:17:35 2016
@@ -173,9 +173,9 @@ public class FileCompare {
             PrintWriter results
                 = new PrintWriter(new java.io.FileWriter("results.html"), 
true);
             this.writeHeader(results);
-            for (int i = 0; i < filenameList.length; i++) {
-                oldFile = new File(referenceDirectory + filenameList[i]);
-                newFile = new File(testDirectory + filenameList[i]);
+            for (String aFilenameList : filenameList) {
+                oldFile = new File(referenceDirectory + aFilenameList);
+                newFile = new File(testDirectory + aFilenameList);
                 if (filesExist(oldFile, newFile)) {
                     identical = compareFileSize(oldFile, newFile);
                     if (identical) {
@@ -183,28 +183,28 @@ public class FileCompare {
                     }
                     if (!identical) {
                         System.out.println("Task Compare: \nFiles "
-                                           + referenceDirectory
-                                           + oldFile.getName() + " - "
-                                           + testDirectory
-                                           + newFile.getName()
-                                           + " are *not* identical.");
+                                + referenceDirectory
+                                + oldFile.getName() + " - "
+                                + testDirectory
+                                + newFile.getName()
+                                + " are *not* identical.");
                         results.println("<tr><td><a href='"
-                                        + referenceDirectory
-                                        + oldFile.getName() + "'>"
-                                        + oldFile.getName()
-                                        + "</a> </td><td> <a href='"
-                                        + testDirectory + newFile.getName()
-                                        + "'>" + newFile.getName() + "</a>"
-                                        + " </td><td><font 
color='red'>No</font></td></tr>");
+                                + referenceDirectory
+                                + oldFile.getName() + "'>"
+                                + oldFile.getName()
+                                + "</a> </td><td> <a href='"
+                                + testDirectory + newFile.getName()
+                                + "'>" + newFile.getName() + "</a>"
+                                + " </td><td><font 
color='red'>No</font></td></tr>");
                     } else {
                         results.println("<tr><td><a href='"
-                                        + referenceDirectory
-                                        + oldFile.getName() + "'>"
-                                        + oldFile.getName()
-                                        + "</a> </td><td> <a href='"
-                                        + testDirectory + newFile.getName()
-                                        + "'>" + newFile.getName() + "</a>"
-                                        + " </td><td>Yes</td></tr>");
+                                + referenceDirectory
+                                + oldFile.getName() + "'>"
+                                + oldFile.getName()
+                                + "</a> </td><td> <a href='"
+                                + testDirectory + newFile.getName()
+                                + "'>" + newFile.getName() + "</a>"
+                                + " </td><td>Yes</td></tr>");
                     }
                 }
             }

Modified: 
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/tools/anttasks/Fop.java
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/tools/anttasks/Fop.java?rev=1761020&r1=1761019&r2=1761020&view=diff
==============================================================================
--- 
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/tools/anttasks/Fop.java
 (original)
+++ 
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/tools/anttasks/Fop.java
 Fri Sep 16 11:17:35 2016
@@ -446,9 +446,9 @@ class FOPTaskStarter {
         if (format == null) {
             return MimeConstants.MIME_PDF;
         }
-        for (int i = 0; i < SHORT_NAMES.length; i++) {
-            if (SHORT_NAMES[i][0].equals(format)) {
-                return SHORT_NAMES[i][1];
+        for (String[] shortName : SHORT_NAMES) {
+            if (shortName[0].equals(format)) {
+                return shortName[1];
             }
         }
         return format; //no change
@@ -477,9 +477,9 @@ class FOPTaskStarter {
     };
 
     private String determineExtension(String outputFormat) {
-        for (int i = 0; i < EXTENSIONS.length; i++) {
-            if (EXTENSIONS[i][0].equals(outputFormat)) {
-                String ext = EXTENSIONS[i][1];
+        for (String[] extension : EXTENSIONS) {
+            if (extension[0].equals(outputFormat)) {
+                String ext = extension[1];
                 if (ext == null) {
                     throw new RuntimeException("Output format '"
                             + outputFormat + "' does not produce a file.");
@@ -575,18 +575,18 @@ class FOPTaskStarter {
             DirectoryScanner ds = fs.getDirectoryScanner(task.getProject());
             String[] files = ds.getIncludedFiles();
 
-            for (int j = 0; j < files.length; j++) {
-                File f = new File(fs.getDir(task.getProject()), files[j]);
+            for (String file : files) {
+                File f = new File(fs.getDir(task.getProject()), file);
 
                 File outf = null;
-                if (task.getOutdir() != null && 
files[j].endsWith(inputExtension)) {
-                  String[] sa = mapper.mapFileName(files[j]);
-                  outf = new File(task.getOutdir(), sa[0]);
+                if (task.getOutdir() != null && file.endsWith(inputExtension)) 
{
+                    String[] sa = mapper.mapFileName(file);
+                    outf = new File(task.getOutdir(), sa[0]);
                 } else {
-                  outf = replaceExtension(f, inputExtension, newExtension);
-                  if (task.getOutdir() != null) {
-                      outf = new File(task.getOutdir(), outf.getName());
-                  }
+                    outf = replaceExtension(f, inputExtension, newExtension);
+                    if (task.getOutdir() != null) {
+                        outf = new File(task.getOutdir(), outf.getName());
+                    }
                 }
                 File dir = outf.getParentFile();
                 if (!dir.exists()) {
@@ -608,7 +608,7 @@ class FOPTaskStarter {
                 // OR output file doesn't exist OR
                 // output file is older than input file
                 if (task.getForce() || !outf.exists()
-                    || (f.lastModified() > outf.lastModified())) {
+                        || (f.lastModified() > outf.lastModified())) {
                     if (xsltFile != null) {
                         render(f, xsltFile, outf, outputFormat);
                     } else {

Modified: 
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/traits/BorderStyle.java
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/traits/BorderStyle.java?rev=1761020&r1=1761019&r2=1761020&view=diff
==============================================================================
--- 
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/traits/BorderStyle.java
 (original)
+++ 
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/traits/BorderStyle.java
 Fri Sep 16 11:17:35 2016
@@ -72,9 +72,9 @@ public final class BorderStyle extends T
      * @return the enumeration object
      */
     public static BorderStyle valueOf(String name) {
-        for (int i = 0; i < STYLES.length; i++) {
-            if (STYLES[i].getName().equalsIgnoreCase(name)) {
-                return STYLES[i];
+        for (BorderStyle style : STYLES) {
+            if (style.getName().equalsIgnoreCase(name)) {
+                return style;
             }
         }
         throw new IllegalArgumentException("Illegal border style: " + name);
@@ -86,9 +86,9 @@ public final class BorderStyle extends T
      * @return the enumeration object
      */
     public static BorderStyle valueOf(int enumValue) {
-        for (int i = 0; i < STYLES.length; i++) {
-            if (STYLES[i].getEnumValue() == enumValue) {
-                return STYLES[i];
+        for (BorderStyle style : STYLES) {
+            if (style.getEnumValue() == enumValue) {
+                return style;
             }
         }
         throw new IllegalArgumentException("Illegal border style: " + 
enumValue);

Modified: 
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/traits/Direction.java
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/traits/Direction.java?rev=1761020&r1=1761019&r2=1761020&view=diff
==============================================================================
--- 
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/traits/Direction.java
 (original)
+++ 
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/traits/Direction.java
 Fri Sep 16 11:17:35 2016
@@ -74,9 +74,9 @@ public final class Direction extends Tra
      * @return the enumeration object
      */
     public static Direction valueOf(String name) {
-        for (int i = 0; i < DIRECTIONS.length; i++) {
-            if (DIRECTIONS[i].getName().equalsIgnoreCase(name)) {
-                return DIRECTIONS[i];
+        for (Direction direction : DIRECTIONS) {
+            if (direction.getName().equalsIgnoreCase(name)) {
+                return direction;
             }
         }
         throw new IllegalArgumentException("Illegal direction: " + name);
@@ -88,9 +88,9 @@ public final class Direction extends Tra
      * @return the enumeration object
      */
     public static Direction valueOf(int enumValue) {
-        for (int i = 0; i < DIRECTIONS.length; i++) {
-            if (DIRECTIONS[i].getEnumValue() == enumValue) {
-                return DIRECTIONS[i];
+        for (Direction direction : DIRECTIONS) {
+            if (direction.getEnumValue() == enumValue) {
+                return direction;
             }
         }
         throw new IllegalArgumentException("Illegal direction: " + enumValue);

Modified: 
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/traits/RuleStyle.java
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/traits/RuleStyle.java?rev=1761020&r1=1761019&r2=1761020&view=diff
==============================================================================
--- 
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/traits/RuleStyle.java
 (original)
+++ 
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/traits/RuleStyle.java
 Fri Sep 16 11:17:35 2016
@@ -64,9 +64,9 @@ public final class RuleStyle extends Tra
      * @return the enumeration object
      */
     public static RuleStyle valueOf(String name) {
-        for (int i = 0; i < STYLES.length; i++) {
-            if (STYLES[i].getName().equalsIgnoreCase(name)) {
-                return STYLES[i];
+        for (RuleStyle style : STYLES) {
+            if (style.getName().equalsIgnoreCase(name)) {
+                return style;
             }
         }
         throw new IllegalArgumentException("Illegal rule style: " + name);
@@ -78,9 +78,9 @@ public final class RuleStyle extends Tra
      * @return the enumeration object
      */
     public static RuleStyle valueOf(int enumValue) {
-        for (int i = 0; i < STYLES.length; i++) {
-            if (STYLES[i].getEnumValue() == enumValue) {
-                return STYLES[i];
+        for (RuleStyle style : STYLES) {
+            if (style.getEnumValue() == enumValue) {
+                return style;
             }
         }
         throw new IllegalArgumentException("Illegal rule style: " + enumValue);

Modified: 
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/traits/WritingMode.java
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/traits/WritingMode.java?rev=1761020&r1=1761019&r2=1761020&view=diff
==============================================================================
--- 
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/traits/WritingMode.java
 (original)
+++ 
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/traits/WritingMode.java
 Fri Sep 16 11:17:35 2016
@@ -133,9 +133,9 @@ public final class WritingMode extends T
      * @return the enumeration object
      */
     public static WritingMode valueOf(String name) {
-        for (int i = 0; i < WRITING_MODES.length; i++) {
-            if (WRITING_MODES[i].getName().equalsIgnoreCase(name)) {
-                return WRITING_MODES[i];
+        for (WritingMode writingMode : WRITING_MODES) {
+            if (writingMode.getName().equalsIgnoreCase(name)) {
+                return writingMode;
             }
         }
         throw new IllegalArgumentException("Illegal writing mode: " + name);
@@ -147,9 +147,9 @@ public final class WritingMode extends T
      * @return the enumeration object
      */
     public static WritingMode valueOf(int enumValue) {
-        for (int i = 0; i < WRITING_MODES.length; i++) {
-            if (WRITING_MODES[i].getEnumValue() == enumValue) {
-                return WRITING_MODES[i];
+        for (WritingMode writingMode : WRITING_MODES) {
+            if (writingMode.getEnumValue() == enumValue) {
+                return writingMode;
             }
         }
         throw new IllegalArgumentException("Illegal writing mode: " + 
enumValue);

Modified: 
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/util/ColorExt.java
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/util/ColorExt.java?rev=1761020&r1=1761019&r2=1761020&view=diff
==============================================================================
--- 
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/util/ColorExt.java 
(original)
+++ 
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/util/ColorExt.java 
Fri Sep 16 11:17:35 2016
@@ -242,9 +242,9 @@ public final class ColorExt extends Colo
             sb.append("\"" + this.iccProfileSrc + "\"");
         }
         float[] colorComponents = this.getColorComponents(null);
-        for (int ix = 0; ix < colorComponents.length; ix++) {
+        for (float colorComponent : colorComponents) {
             sb.append(",");
-            sb.append(colorComponents[ix]);
+            sb.append(colorComponent);
         }
         sb.append(")");
         return sb.toString();

Modified: 
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/util/ContentHandlerFactoryRegistry.java
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/util/ContentHandlerFactoryRegistry.java?rev=1761020&r1=1761019&r2=1761020&view=diff
==============================================================================
--- 
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/util/ContentHandlerFactoryRegistry.java
 (original)
+++ 
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/util/ContentHandlerFactoryRegistry.java
 Fri Sep 16 11:17:35 2016
@@ -78,8 +78,8 @@ public class ContentHandlerFactoryRegist
      */
     public void addContentHandlerFactory(ContentHandlerFactory factory) {
         String[] ns = factory.getSupportedNamespaces();
-        for (int i = 0; i < ns.length; i++) {
-            factories.put(ns[i], factory);
+        for (String n : ns) {
+            factories.put(n, factory);
         }
     }
 

Modified: 
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/util/DOM2SAX.java
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/util/DOM2SAX.java?rev=1761020&r1=1761019&r2=1761020&view=diff
==============================================================================
--- 
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/util/DOM2SAX.java 
(original)
+++ 
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/util/DOM2SAX.java 
Fri Sep 16 11:17:35 2016
@@ -274,8 +274,8 @@ public class DOM2SAX {
 
             // Generate endPrefixMapping() for all pushed prefixes
             final int nPushedPrefixes = pushedPrefixes.size();
-            for (int i = 0; i < nPushedPrefixes; i++) {
-                endPrefixMapping((String)pushedPrefixes.get(i));
+            for (Object pushedPrefixe : pushedPrefixes) {
+                endPrefixMapping((String) pushedPrefixe);
             }
             break;
 

Modified: 
xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/DigestFilterTestCase.java
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/DigestFilterTestCase.java?rev=1761020&r1=1761019&r2=1761020&view=diff
==============================================================================
--- 
xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/DigestFilterTestCase.java
 (original)
+++ 
xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/DigestFilterTestCase.java
 Fri Sep 16 11:17:35 2016
@@ -64,8 +64,7 @@ public class DigestFilterTestCase {
 
     private String digestToString(byte[] digest) {
         StringBuffer buffer = new StringBuffer(2 * digest.length);
-        for (int i = 0; i < digest.length; i++) {
-            int val = digest[i];
+        for (byte val : digest) {
             int hi = (val >> 4) & 0xF;
             int lo = val & 0xF;
             if (hi < 10) {

Modified: 
xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/afp/modca/AbstractAFPObjectTest.java
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/afp/modca/AbstractAFPObjectTest.java?rev=1761020&r1=1761019&r2=1761020&view=diff
==============================================================================
--- 
xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/afp/modca/AbstractAFPObjectTest.java
 (original)
+++ 
xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/afp/modca/AbstractAFPObjectTest.java
 Fri Sep 16 11:17:35 2016
@@ -138,12 +138,12 @@ public abstract class AbstractAFPObjectT
        byte[] actual = baos.toByteArray();
 
        int index = 0;
-       for (int i = 0; i < expected.length; i++) {
-           for (int j = 0; j < expected[i].length; j++) {
-               assertTrue("" + index, actual[index] == expected[i][j]);
-               index++;
-           }
-       }
+        for (byte[] anExpected : expected) {
+            for (int j = 0; j < anExpected.length; j++) {
+                assertTrue("" + index, actual[index] == anExpected[j]);
+                index++;
+            }
+        }
     }
 
     /**
@@ -222,8 +222,8 @@ public abstract class AbstractAFPObjectT
 
     private void checkHeaderAndData(byte[] header, byte[] data, byte[] 
testData, int expectedIndex,
             int testIndex, int chunkSize) {
-        for (int i = 0; i < header.length; i++) {
-            assertEquals(testData[expectedIndex++], header[i]);
+        for (byte aHeader : header) {
+            assertEquals(testData[expectedIndex++], aHeader);
         }
         for (int i = 0; i < chunkSize; i++) {
             assertEquals(testData[expectedIndex++], data[i + testIndex]);




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

Reply via email to