Use for-each.

apache · Nov 21, 2020 · fdac35a · fdac35a
1 parent 392daf6
commit fdac35a
Show file tree

Hide file tree

Showing 11 changed files with 30 additions and 40 deletions.
diff --git a/src/main/java/org/apache/commons/imaging/formats/jpeg/decoder/JpegDecoder.java b/src/main/java/org/apache/commons/imaging/formats/jpeg/decoder/JpegDecoder.java
@@ -38,7 +38,9 @@
 import org.apache.commons.imaging.formats.jpeg.JpegConstants;
 import org.apache.commons.imaging.formats.jpeg.JpegUtils;
 import org.apache.commons.imaging.formats.jpeg.segments.DhtSegment;
+import org.apache.commons.imaging.formats.jpeg.segments.DhtSegment.HuffmanTable;
 import org.apache.commons.imaging.formats.jpeg.segments.DqtSegment;
+import org.apache.commons.imaging.formats.jpeg.segments.DqtSegment.QuantizationTable;
 import org.apache.commons.imaging.formats.jpeg.segments.SofnSegment;
 import org.apache.commons.imaging.formats.jpeg.segments.SosSegment;
 
@@ -239,8 +241,8 @@ public boolean visitSegment(final int marker, final byte[] markerBytes,
             sofnSegment = new SofnSegment(marker, segmentData);
         } else if (marker == JpegConstants.DQT_MARKER) {
             final DqtSegment dqtSegment = new DqtSegment(marker, segmentData);
-            for (int i = 0; i < dqtSegment.quantizationTables.size(); i++) {
-                final DqtSegment.QuantizationTable table = dqtSegment.quantizationTables.get(i);
+            for (final QuantizationTable element : dqtSegment.quantizationTables) {
+                final DqtSegment.QuantizationTable table = element;
                 if (0 > table.destinationIdentifier
                         || table.destinationIdentifier >= quantizationTables.length) {
                     throw new ImageReadException(
@@ -259,8 +261,8 @@ public boolean visitSegment(final int marker, final byte[] markerBytes,
             }
         } else if (marker == JpegConstants.DHT_MARKER) {
             final DhtSegment dhtSegment = new DhtSegment(marker, segmentData);
-            for (int i = 0; i < dhtSegment.huffmanTables.size(); i++) {
-                final DhtSegment.HuffmanTable table = dhtSegment.huffmanTables.get(i);
+            for (final HuffmanTable element : dhtSegment.huffmanTables) {
+                final DhtSegment.HuffmanTable table = element;
                 DhtSegment.HuffmanTable[] tables;
                 if (table.tableClass == 0) {
                     tables = huffmanDCTables;

diff --git a/src/main/java/org/apache/commons/imaging/formats/tiff/TiffRasterStatistics.java b/src/main/java/org/apache/commons/imaging/formats/tiff/TiffRasterStatistics.java
@@ -44,8 +44,7 @@ public class TiffRasterStatistics {
         int nS = 0;
         int nN = 0;
         final float[] data = raster.getData();
-        for (int i = 0; i < data.length; i++) {
-            final float test = data[i];
+        for (final float test : data) {
             if (Float.isNaN(test)) {
                 nN++;
                 continue;

diff --git a/src/main/java/org/apache/commons/imaging/formats/tiff/datareaders/DataReaderStrips.java b/src/main/java/org/apache/commons/imaging/formats/tiff/datareaders/DataReaderStrips.java
@@ -326,8 +326,8 @@ public ImageBuilder readImageData(final Rectangle subImageSpecification,
                     final byte[] decompressed = decompress(compressed, compression,
                       (int) bytesPerStrip, width, (int) rowsInThisStrip);
                     int index = iPlane;
-                    for (int i = 0; i < decompressed.length; i++) {
-                        b[index] = decompressed[i];
+                    for (final byte element : decompressed) {
+                        b[index] = element;
                         index += 3;
                     }
                 }

diff --git a/src/test/java/org/apache/commons/imaging/examples/MetadataExample.java b/src/test/java/org/apache/commons/imaging/examples/MetadataExample.java
@@ -140,8 +140,7 @@ public static void metadataExample(final File file) throws ImageReadException,
             System.out.println();
 
             final List<ImageMetadataItem> items = jpegMetadata.getItems();
-            for (int i = 0; i < items.size(); i++) {
-                final ImageMetadataItem item = items.get(i);
+            for (final ImageMetadataItem item : items) {
                 System.out.println("    " + "item: " + item);
             }
 

diff --git a/src/test/java/org/apache/commons/imaging/examples/tiff/SurveyTiffFolder.java b/src/test/java/org/apache/commons/imaging/examples/tiff/SurveyTiffFolder.java
@@ -181,8 +181,8 @@ private static int[] findMaxLengths(final List<String[]> pathList) {
     private static void surveyFiles(final File topDir, final List<String[]> pathList, final int[] maxLen, final boolean csv, final PrintStream ps) {
         final SurveyTiffFile surveyor = new SurveyTiffFile();
         int n = maxLen.length - 1;
-        for (int i = 0; i < maxLen.length; i++) {
-            n += maxLen[i];
+        for (final int element : maxLen) {
+            n += element;
         }
         if (n < 10) {
             n = 10;

diff --git a/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/ExifRewriteTest.java b/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/ExifRewriteTest.java
@@ -61,9 +61,8 @@ public class ExifRewriteTest extends ExifBaseTest {
     @Test
     public void testRemove() throws Exception {
         final List<File> images = getImagesWithExifData();
-        for (int i = 0; i < images.size(); i++) {
+        for (final File imageFile : images) {
 
-            final File imageFile = images.get(i);
             Debug.debug("imageFile", imageFile);
 
             final boolean ignoreImageData = isPhilHarveyTestImage(imageFile);
@@ -99,9 +98,8 @@ public void testRemove() throws Exception {
     @Test
     public void testInsert() throws Exception {
         final List<File> images = getImagesWithExifData();
-        for (int i = 0; i < images.size(); i++) {
+        for (final File imageFile : images) {
 
-            final File imageFile = images.get(i);
             Debug.debug("imageFile", imageFile);
 
             final boolean ignoreImageData = isPhilHarveyTestImage(imageFile);
@@ -175,9 +173,7 @@ void rewrite(ByteSource byteSource, OutputStream os,
     private void rewrite(final Rewriter rewriter, final String name) throws IOException,
             ImageReadException {
         final List<File> images = getImagesWithExifData();
-        for (int i = 0; i < images.size(); i++) {
-
-            final File imageFile = images.get(i);
+        for (final File imageFile : images) {
 
             try {
 
@@ -264,17 +260,17 @@ public void testRewriteLossless() throws Exception {
 
     private Map<Integer,TiffImageMetadata.Directory> makeDirectoryMap(final List<? extends ImageMetadataItem> directories) {
         final Map<Integer,TiffImageMetadata.Directory> directoryMap = new HashMap<>();
-        for (int i = 0; i < directories.size(); i++) {
-            final TiffImageMetadata.Directory directory = (TiffImageMetadata.Directory) directories.get(i);
+        for (final ImageMetadataItem element : directories) {
+            final TiffImageMetadata.Directory directory = (TiffImageMetadata.Directory) element;
             directoryMap.put(directory.type, directory);
         }
         return directoryMap;
     }
 
     private Map<Integer,TiffField> makeFieldMap(final List<? extends ImageMetadataItem> items) {
         final Map<Integer,TiffField> fieldMap = new HashMap<>();
-        for (int i = 0; i < items.size(); i++) {
-            final TiffImageMetadata.TiffMetadataItem item = (TiffImageMetadata.TiffMetadataItem) items.get(i);
+        for (final ImageMetadataItem item2 : items) {
+            final TiffImageMetadata.TiffMetadataItem item = (TiffImageMetadata.TiffMetadataItem) item2;
             final TiffField field = item.getTiffField();
             if (!fieldMap.containsKey(field.getTag())) {
                 fieldMap.put(field.getTag(), field);
@@ -303,8 +299,8 @@ private void compare(final File imageFile, final TiffImageMetadata oldExifMetada
         Collections.sort(newDirectoryTypes);
         assertEquals(oldDirectoryTypes, newDirectoryTypes);
 
-        for (int i = 0; i < oldDirectoryTypes.size(); i++) {
-            final Integer dirType = oldDirectoryTypes.get(i);
+        for (final Integer dirType : oldDirectoryTypes) {
+
 
             // Debug.debug("dirType", dirType);
 
@@ -338,9 +334,7 @@ private void compare(final File imageFile, final TiffImageMetadata oldExifMetada
             Collections.sort(newFieldTags);
             assertEquals(oldFieldTags, newFieldTags);
 
-            for (int j = 0; j < oldFieldTags.size(); j++) {
-                final Integer fieldTag = oldFieldTags.get(j);
-
+            for (final Integer fieldTag : oldFieldTags) {
                 final TiffField oldField = oldFieldMap.get(fieldTag);
                 final TiffField newField = newFieldMap.get(fieldTag);
 

diff --git a/src/test/java/org/apache/commons/imaging/formats/pam/PamReadTest.java b/src/test/java/org/apache/commons/imaging/formats/pam/PamReadTest.java
@@ -39,9 +39,8 @@ public void test() throws Exception {
         Debug.debug("start");
 
         final List<File> images = getPamImages();
-        for (int i = 0; i < images.size(); i++) {
+        for (final File imageFile : images) {
 
-            final File imageFile = images.get(i);
             Debug.debug("imageFile", imageFile);
 
             final ImageMetadata metadata = Imaging.getMetadata(imageFile);

diff --git a/src/test/java/org/apache/commons/imaging/formats/pcx/PcxReadTest.java b/src/test/java/org/apache/commons/imaging/formats/pcx/PcxReadTest.java
@@ -39,9 +39,8 @@ public void test() throws Exception {
         Debug.debug("start");
 
         final List<File> images = getPcxImages();
-        for (int i = 0; i < images.size(); i++) {
+        for (final File imageFile : images) {
 
-            final File imageFile = images.get(i);
             Debug.debug("imageFile", imageFile);
 
             final ImageMetadata metadata = Imaging.getMetadata(imageFile);

diff --git a/src/test/java/org/apache/commons/imaging/formats/png/ConvertPngToGifTest.java b/src/test/java/org/apache/commons/imaging/formats/png/ConvertPngToGifTest.java
@@ -36,9 +36,8 @@ public class ConvertPngToGifTest extends PngBaseTest {
     public void test() throws Exception {
 
         final List<File> images = getPngImages();
-        for (int i = 0; i < images.size(); i++) {
+        for (final File imageFile : images) {
 
-            final File imageFile = images.get(i);
             if (isInvalidPNGTestFile(imageFile))
              {
                 continue;

diff --git a/src/test/java/org/apache/commons/imaging/formats/png/PngReadTest.java b/src/test/java/org/apache/commons/imaging/formats/png/PngReadTest.java
@@ -38,9 +38,8 @@ public void test() throws Exception {
         Debug.debug("start");
 
         final List<File> images = getPngImages();
-        for (int i = 0; i < images.size(); i++) {
+        for (final File imageFile : images) {
 
-            final File imageFile = images.get(i);
             Debug.debug("imageFile", imageFile);
             if (isInvalidPNGTestFile(imageFile)) {
                 assertThrows(

diff --git a/src/test/java/org/apache/commons/imaging/formats/tiff/TiffReadAlphaTest.java b/src/test/java/org/apache/commons/imaging/formats/tiff/TiffReadAlphaTest.java
@@ -76,10 +76,10 @@ public void test() {
                 g2d.fillRect(0, 50, 101, 51);
                 g2d.drawImage(overlay, 0, 0, null);
 
-                for (int i = 0; i < testSite.length; i++) {
-                    final int x = testSite[i][0];
-                    final int y = testSite[i][1];
-                    final int p = testSite[i][2];
+                for (final int[] element : testSite) {
+                    final int x = element[0];
+                    final int y = element[1];
+                    final int p = element[2];
                     final int t = composite.getRGB(x, y);
                     assertEquals(t, p, "Error for " + name + " at position " + x + ", " + y);
                 }