commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ebo...@apache.org
Subject svn commit: r1220990 [1/2] - in /commons/proper/sanselan/trunk/src: main/java/org/apache/commons/sanselan/ main/java/org/apache/commons/sanselan/common/ main/java/org/apache/commons/sanselan/common/itu_t4/ main/java/org/apache/commons/sanselan/formats/...
Date Mon, 19 Dec 2011 23:01:48 GMT
Author: ebourg
Date: Mon Dec 19 23:01:46 2011
New Revision: 1220990

URL: http://svn.apache.org/viewvc?rev=1220990&view=rev
Log:
Changed ArrayList types into List

Modified:
    commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/FormatCompliance.java
    commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/ImageInfo.java
    commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/ImageParser.java
    commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/Sanselan.java
    commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/common/IImageMetadata.java
    commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/common/ImageMetadata.java
    commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/common/itu_t4/HuffmanTree.java
    commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/bmp/BmpImageParser.java
    commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/dcx/DcxImageParser.java
    commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/gif/GenericGifBlock.java
    commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/gif/GifImageParser.java
    commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/gif/ImageContents.java
    commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/icns/IcnsDecoder.java
    commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/icns/IcnsImageParser.java
    commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/ico/IcoImageParser.java
    commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg/JpegImageMetadata.java
    commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg/JpegImageParser.java
    commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg/exif/ExifRewriter.java
    commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg/iptc/IptcParser.java
    commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg/segments/App13Segment.java
    commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg/segments/DhtSegment.java
    commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg/segments/DqtSegment.java
    commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg/xmp/JpegRewriter.java
    commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/png/PngImageInfo.java
    commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/png/PngImageParser.java
    commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/pnm/PnmImageParser.java
    commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/psd/PsdImageParser.java
    commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tga/TgaImageParser.java
    commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/TiffContents.java
    commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/TiffDirectory.java
    commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/TiffImageData.java
    commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/TiffImageMetadata.java
    commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/TiffImageParser.java
    commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/TiffReader.java
    commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/write/TiffImageWriterBase.java
    commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/write/TiffImageWriterLossless.java
    commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/write/TiffOutputDirectory.java
    commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/write/TiffOutputSet.java
    commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/icc/IccProfileParser.java
    commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/palette/MedianCutQuantizer.java
    commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/palette/PaletteFactory.java
    commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/palette/QuantizedPalette.java
    commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/util/Debug.java
    commons/proper/sanselan/trunk/src/test/java/org/apache/commons/sanselan/examples/MetadataExample.java
    commons/proper/sanselan/trunk/src/test/java/org/apache/commons/sanselan/formats/jpeg/exif/ExifRewriteTest.java

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/FormatCompliance.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/FormatCompliance.java?rev=1220990&r1=1220989&r2=1220990&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/FormatCompliance.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/FormatCompliance.java Mon Dec 19 23:01:46 2011
@@ -20,12 +20,13 @@ import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.util.ArrayList;
+import java.util.List;
 
 public class FormatCompliance
 {
     private final boolean failOnError;
     private final String description;
-    private final ArrayList comments = new ArrayList();
+    private final List comments = new ArrayList();
 
     public FormatCompliance(String description)
     {

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/ImageInfo.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/ImageInfo.java?rev=1220990&r1=1220989&r2=1220990&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/ImageInfo.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/ImageInfo.java Mon Dec 19 23:01:46 2011
@@ -20,6 +20,7 @@ import java.io.IOException;
 import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.util.ArrayList;
+import java.util.List;
 
 /**
  * ImageInfo represents a collection of basic properties of an image, such as
@@ -30,7 +31,7 @@ public class ImageInfo
     private final String formatDetails; // ie version
 
     private final int bitsPerPixel;
-    private final ArrayList comments;
+    private final List comments;
 
     private final ImageFormat format;
     private final String formatName;
@@ -72,7 +73,7 @@ public class ImageInfo
     private final String compressionAlgorithm;
 
     public ImageInfo(String formatDetails, int bitsPerPixel,
-            ArrayList comments, ImageFormat format, String formatName,
+            List comments, ImageFormat format, String formatName,
             int height, String mimeType, int numberOfImages,
             int physicalHeightDpi, float physicalHeightInch,
             int physicalWidthDpi, float physicalWidthInch, int width,
@@ -116,7 +117,7 @@ public class ImageInfo
      * Returns a list of comments from the image file. <p/> This is mostly
      * obsolete.
      */
-    public ArrayList getComments()
+    public List getComments()
     {
         return new ArrayList(comments);
     }

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/ImageParser.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/ImageParser.java?rev=1220990&r1=1220989&r2=1220990&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/ImageParser.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/ImageParser.java Mon Dec 19 23:01:46 2011
@@ -24,6 +24,7 @@ import java.io.OutputStream;
 import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.util.ArrayList;
+import java.util.List;
 import java.util.Map;
 
 import org.apache.commons.sanselan.common.BinaryFileParser;
@@ -154,25 +155,25 @@ public abstract class ImageParser extend
         return getFormatCompliance(new ByteSourceFile(file));
     }
 
-    public ArrayList getAllBufferedImages(ByteSource byteSource)
+    public List getAllBufferedImages(ByteSource byteSource)
             throws ImageReadException, IOException
     {
         BufferedImage bi = getBufferedImage(byteSource, null);
 
-        ArrayList result = new ArrayList();
+        List result = new ArrayList();
 
         result.add(bi);
 
         return result;
     }
 
-    public final ArrayList getAllBufferedImages(byte bytes[])
+    public final List getAllBufferedImages(byte bytes[])
             throws ImageReadException, IOException
     {
         return getAllBufferedImages(new ByteSourceArray(bytes));
     }
 
-    public final ArrayList getAllBufferedImages(File file)
+    public final List getAllBufferedImages(File file)
             throws ImageReadException, IOException
     {
         if (!canAcceptExtension(file))
@@ -185,7 +186,7 @@ public abstract class ImageParser extend
     // String dstRoot, ImageParser encoder) throws ImageReadException,
     // IOException, ImageWriteException
     // {
-    // ArrayList v = getAllBufferedImages(byteSource);
+    // List v = getAllBufferedImages(byteSource);
     //
     // if (v == null)
     // return false;

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/Sanselan.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/Sanselan.java?rev=1220990&r1=1220989&r2=1220990&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/Sanselan.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/Sanselan.java Mon Dec 19 23:01:46 2011
@@ -28,6 +28,7 @@ import java.io.InputStream;
 import java.io.OutputStream;
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 import org.apache.commons.sanselan.common.IImageMetadata;
@@ -1073,7 +1074,7 @@ public abstract class Sanselan implement
      *            Filename associated with image data (optional).
      * @return A vector of BufferedImages.
      */
-    public static ArrayList getAllBufferedImages(InputStream is, String filename)
+    public static List getAllBufferedImages(InputStream is, String filename)
             throws ImageReadException, IOException {
         return getAllBufferedImages(new ByteSourceInputStream(is, filename));
     }
@@ -1089,7 +1090,7 @@ public abstract class Sanselan implement
      *            Byte array containing an image file.
      * @return A vector of BufferedImages.
      */
-    public static ArrayList getAllBufferedImages(byte bytes[])
+    public static List getAllBufferedImages(byte bytes[])
             throws ImageReadException, IOException {
         return getAllBufferedImages(new ByteSourceArray(bytes));
     }
@@ -1105,12 +1106,12 @@ public abstract class Sanselan implement
      *            File containing image data.
      * @return A vector of BufferedImages.
      */
-    public static ArrayList getAllBufferedImages(File file)
+    public static List getAllBufferedImages(File file)
             throws ImageReadException, IOException {
         return getAllBufferedImages(new ByteSourceFile(file));
     }
 
-    private static ArrayList getAllBufferedImages(ByteSource byteSource)
+    private static List getAllBufferedImages(ByteSource byteSource)
             throws ImageReadException, IOException {
         ImageParser imageParser = getImageParser(byteSource);
 

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/common/IImageMetadata.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/common/IImageMetadata.java?rev=1220990&r1=1220989&r2=1220990&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/common/IImageMetadata.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/common/IImageMetadata.java Mon Dec 19 23:01:46 2011
@@ -16,13 +16,13 @@
  */
 package org.apache.commons.sanselan.common;
 
-import java.util.ArrayList;
+import java.util.List;
 
 public interface IImageMetadata
 {
     public String toString(String prefix);
 
-    public ArrayList getItems();
+    public List getItems();
 
     public interface IImageMetadataItem
     {

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/common/ImageMetadata.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/common/ImageMetadata.java?rev=1220990&r1=1220989&r2=1220990&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/common/ImageMetadata.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/common/ImageMetadata.java Mon Dec 19 23:01:46 2011
@@ -17,11 +17,12 @@
 package org.apache.commons.sanselan.common;
 
 import java.util.ArrayList;
+import java.util.List;
 
 public class ImageMetadata implements IImageMetadata
 {
 
-    private final ArrayList items = new ArrayList();
+    private final List items = new ArrayList();
 
     public void add(String keyword, String text)
     {
@@ -33,7 +34,7 @@ public class ImageMetadata implements II
         items.add(item);
     }
 
-    public ArrayList getItems()
+    public List getItems()
     {
         return new ArrayList(items);
     }

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/common/itu_t4/HuffmanTree.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/common/itu_t4/HuffmanTree.java?rev=1220990&r1=1220989&r2=1220990&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/common/itu_t4/HuffmanTree.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/common/itu_t4/HuffmanTree.java Mon Dec 19 23:01:46 2011
@@ -18,6 +18,7 @@ package org.apache.commons.sanselan.comm
 
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.List;
 
 import org.apache.commons.sanselan.common.BitInputStreamFlexible;
 
@@ -29,7 +30,7 @@ public class HuffmanTree {
         boolean isEmpty = true;
         Object value = null;
     }
-    private ArrayList nodes = new ArrayList();
+    private List nodes = new ArrayList();
 
     public final void insert(String pattern, Object value) throws HuffmanTreeException {
         int position = 0;

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/bmp/BmpImageParser.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/bmp/BmpImageParser.java?rev=1220990&r1=1220989&r2=1220990&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/bmp/BmpImageParser.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/bmp/BmpImageParser.java Mon Dec 19 23:01:46 2011
@@ -26,6 +26,7 @@ import java.io.OutputStream;
 import java.io.PrintWriter;
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 import org.apache.commons.sanselan.FormatCompliance;
@@ -606,7 +607,7 @@ public class BmpImageParser extends Imag
         int height = bhi.height;
         int width = bhi.width;
 
-        ArrayList comments = new ArrayList();
+        List comments = new ArrayList();
         // TODO: comments...
 
         int bitsPerPixel = bhi.bitsPerPixel;

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/dcx/DcxImageParser.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/dcx/DcxImageParser.java?rev=1220990&r1=1220989&r2=1220990&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/dcx/DcxImageParser.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/dcx/DcxImageParser.java Mon Dec 19 23:01:46 2011
@@ -25,6 +25,7 @@ import java.io.OutputStream;
 import java.io.PrintWriter;
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 import org.apache.commons.sanselan.ImageFormat;
@@ -138,7 +139,7 @@ public class DcxImageParser extends Imag
         {
             is = byteSource.getInputStream();
             int id = read4Bytes("Id", is, "Not a Valid DCX File");
-            ArrayList pageTable = new ArrayList(1024);
+            List pageTable = new ArrayList(1024);
             for (int i = 0; i < 1024; i++)
             {
                 int pageOffset = read4Bytes("PageTable", is, "Not a Valid DCX File");
@@ -184,17 +185,17 @@ public class DcxImageParser extends Imag
     public final BufferedImage getBufferedImage(ByteSource byteSource,
             Map params) throws ImageReadException, IOException
     {
-        ArrayList list = getAllBufferedImages(byteSource);
+        List list = getAllBufferedImages(byteSource);
         if (list.isEmpty())
             return null;
         return (BufferedImage) list.get(0);
     }
 
-    public ArrayList getAllBufferedImages(ByteSource byteSource)
+    public List getAllBufferedImages(ByteSource byteSource)
             throws ImageReadException, IOException
     {
         DcxHeader dcxHeader = readDcxHeader(byteSource);
-        ArrayList images = new ArrayList();
+        List images = new ArrayList();
         PcxImageParser pcxImageParser = new PcxImageParser();
         for (int i = 0; i < dcxHeader.pageTable.length; i++)
         {

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/gif/GenericGifBlock.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/gif/GenericGifBlock.java?rev=1220990&r1=1220989&r2=1220990&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/gif/GenericGifBlock.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/gif/GenericGifBlock.java Mon Dec 19 23:01:46 2011
@@ -18,13 +18,13 @@ package org.apache.commons.sanselan.form
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
-import java.util.ArrayList;
+import java.util.List;
 
 class GenericGifBlock extends GifBlock
 {
-    public final ArrayList subblocks;
+    public final List subblocks;
 
-    public GenericGifBlock(int blockCode, ArrayList subblocks)
+    public GenericGifBlock(int blockCode, List subblocks)
     {
         super(blockCode);
 

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/gif/GifImageParser.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/gif/GifImageParser.java?rev=1220990&r1=1220989&r2=1220990&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/gif/GifImageParser.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/gif/GifImageParser.java Mon Dec 19 23:01:46 2011
@@ -203,7 +203,7 @@ public class GifImageParser extends Imag
     protected GenericGifBlock readGenericGIFBlock(InputStream is, int code,
             byte first[]) throws ImageReadException, IOException
     {
-        ArrayList subblocks = new ArrayList();
+        List subblocks = new ArrayList();
 
         if (first != null)
             subblocks.add(first);
@@ -230,11 +230,11 @@ public class GifImageParser extends Imag
     private final static int XMP_COMPLETE_CODE = (EXTENSION_CODE << 8)
             | XMP_EXTENSION;
 
-    private ArrayList readBlocks(GifHeaderInfo ghi, InputStream is,
+    private List readBlocks(GifHeaderInfo ghi, InputStream is,
             boolean stopBeforeImageData, FormatCompliance formatCompliance)
             throws ImageReadException, IOException
     {
-        ArrayList result = new ArrayList();
+        List result = new ArrayList();
 
         while (true)
         {
@@ -457,7 +457,7 @@ public class GifImageParser extends Imag
         }
     }
 
-    private GifBlock findBlock(ArrayList v, int code)
+    private GifBlock findBlock(List v, int code)
     {
         for (int i = 0; i < v.size(); i++)
         {
@@ -491,11 +491,9 @@ public class GifImageParser extends Imag
                 globalColorTable = readColorTable(is,
                         ghi.sizeOfGlobalColorTable, formatCompliance);
 
-            ArrayList blocks = readBlocks(ghi, is, stopBeforeImageData,
-                    formatCompliance);
+            List blocks = readBlocks(ghi, is, stopBeforeImageData, formatCompliance);
 
-            ImageContents result = new ImageContents(ghi, globalColorTable,
-                    blocks);
+            ImageContents result = new ImageContents(ghi, globalColorTable, blocks);
 
             return result;
         } finally
@@ -531,8 +529,7 @@ public class GifImageParser extends Imag
         if (bhi == null)
             throw new ImageReadException("GIF: Couldn't read Header");
 
-        ImageDescriptor id = (ImageDescriptor) findBlock(blocks.blocks,
-                IMAGE_SEPARATOR);
+        ImageDescriptor id = (ImageDescriptor) findBlock(blocks.blocks, IMAGE_SEPARATOR);
         if (id == null)
             throw new ImageReadException("GIF: Couldn't read ImageDescriptor");
 
@@ -557,9 +554,9 @@ public class GifImageParser extends Imag
         return null;
     }
 
-    private ArrayList getComments(ArrayList v) throws IOException
+    private List getComments(List v) throws IOException
     {
-        ArrayList result = new ArrayList();
+        List result = new ArrayList();
         int code = 0x21fe;
 
         for (int i = 0; i < v.size(); i++)
@@ -600,7 +597,7 @@ public class GifImageParser extends Imag
         int height = id.imageWidth;
         int width = id.imageHeight;
 
-        ArrayList Comments;
+        List Comments;
 
         Comments = getComments(blocks.blocks);
 
@@ -1117,7 +1114,7 @@ public class GifImageParser extends Imag
             if (ghi.globalColorTableFlag)
                 readColorTable(is, ghi.sizeOfGlobalColorTable, formatCompliance);
 
-            ArrayList blocks = readBlocks(ghi, is, true, formatCompliance);
+            List blocks = readBlocks(ghi, is, true, formatCompliance);
 
             List result = new ArrayList();
             for (int i = 0; i < blocks.size(); i++)

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/gif/ImageContents.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/gif/ImageContents.java?rev=1220990&r1=1220989&r2=1220990&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/gif/ImageContents.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/gif/ImageContents.java Mon Dec 19 23:01:46 2011
@@ -16,17 +16,16 @@
  */
 package org.apache.commons.sanselan.formats.gif;
 
-import java.util.ArrayList;
+import java.util.List;
 
 class ImageContents
 {
     public final GifHeaderInfo gifHeaderInfo;
 
-    public final ArrayList blocks;
+    public final List blocks;
     public final byte globalColorTable[];
 
-    public ImageContents(GifHeaderInfo gifHeaderInfo, byte globalColorTable[],
-            ArrayList blocks)
+    public ImageContents(GifHeaderInfo gifHeaderInfo, byte globalColorTable[], List blocks)
     {
         this.gifHeaderInfo = gifHeaderInfo;
         this.globalColorTable = globalColorTable;

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/icns/IcnsDecoder.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/icns/IcnsDecoder.java?rev=1220990&r1=1220989&r2=1220990&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/icns/IcnsDecoder.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/icns/IcnsDecoder.java Mon Dec 19 23:01:46 2011
@@ -19,6 +19,7 @@ package org.apache.commons.sanselan.form
 import java.awt.image.BufferedImage;
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.List;
 
 import org.apache.commons.sanselan.ImageReadException;
 
@@ -428,10 +429,10 @@ public class IcnsDecoder
         }
     }
 
-    public static ArrayList decodeAllImages(IcnsImageParser.IcnsElement[] icnsElements)
+    public static List decodeAllImages(IcnsImageParser.IcnsElement[] icnsElements)
             throws ImageReadException, IOException
     {
-        ArrayList result = new ArrayList();
+        List result = new ArrayList();
         for (int i = 0; i < icnsElements.length; i++)
         {
             IcnsImageParser.IcnsElement imageElement = icnsElements[i];

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/icns/IcnsImageParser.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/icns/IcnsImageParser.java?rev=1220990&r1=1220989&r2=1220990&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/icns/IcnsImageParser.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/icns/IcnsImageParser.java Mon Dec 19 23:01:46 2011
@@ -25,6 +25,7 @@ import java.io.OutputStream;
 import java.io.PrintWriter;
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 import org.apache.commons.sanselan.ImageFormat;
@@ -105,7 +106,7 @@ public class IcnsImageParser extends Ima
         }
 
         IcnsContents contents = readImage(byteSource);
-        ArrayList images = IcnsDecoder.decodeAllImages(contents.icnsElements);
+        List images = IcnsDecoder.decodeAllImages(contents.icnsElements);
         if (images.isEmpty())
             throw new ImageReadException("No icons in ICNS file");
         BufferedImage image0 = (BufferedImage) images.get(0);
@@ -135,7 +136,7 @@ public class IcnsImageParser extends Ima
         }
 
         IcnsContents contents = readImage(byteSource);
-        ArrayList images = IcnsDecoder.decodeAllImages(contents.icnsElements);
+        List images = IcnsDecoder.decodeAllImages(contents.icnsElements);
         if (images.isEmpty())
             throw new ImageReadException("No icons in ICNS file");
         BufferedImage image0 = (BufferedImage) images.get(0);
@@ -246,7 +247,7 @@ public class IcnsImageParser extends Ima
             is = byteSource.getInputStream();
             IcnsHeader icnsHeader = readIcnsHeader(is);
 
-            ArrayList icnsElementList = new ArrayList();
+            List icnsElementList = new ArrayList();
             for (int remainingSize = icnsHeader.fileSize - 8;
                 remainingSize > 0; )
             {
@@ -288,14 +289,14 @@ public class IcnsImageParser extends Ima
             Map params) throws ImageReadException, IOException
     {
         IcnsContents icnsContents = readImage(byteSource);
-        ArrayList result = IcnsDecoder.decodeAllImages(icnsContents.icnsElements);
+        List result = IcnsDecoder.decodeAllImages(icnsContents.icnsElements);
         if (result.size() > 0)
             return (BufferedImage) result.get(0);
         else
             throw new ImageReadException("No icons in ICNS file");
     }
 
-    public ArrayList getAllBufferedImages(ByteSource byteSource)
+    public List getAllBufferedImages(ByteSource byteSource)
             throws ImageReadException, IOException
     {
         IcnsContents icnsContents = readImage(byteSource);

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/ico/IcoImageParser.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/ico/IcoImageParser.java?rev=1220990&r1=1220989&r2=1220990&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/ico/IcoImageParser.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/ico/IcoImageParser.java Mon Dec 19 23:01:46 2011
@@ -27,6 +27,7 @@ import java.io.OutputStream;
 import java.io.PrintWriter;
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 import org.apache.commons.sanselan.ImageFormat;
@@ -570,10 +571,10 @@ public class IcoImageParser extends Imag
             throw new ImageReadException("No icons in ICO file");
     }
 
-    public ArrayList getAllBufferedImages(ByteSource byteSource)
+    public List getAllBufferedImages(ByteSource byteSource)
             throws ImageReadException, IOException
     {
-        ArrayList result = new ArrayList();
+        List result = new ArrayList();
         ImageContents contents = readImage(byteSource);
 
         FileHeader fileHeader = contents.fileHeader;

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg/JpegImageMetadata.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg/JpegImageMetadata.java?rev=1220990&r1=1220989&r2=1220990&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg/JpegImageMetadata.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg/JpegImageMetadata.java Mon Dec 19 23:01:46 2011
@@ -21,6 +21,7 @@ import java.awt.image.BufferedImage;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.List;
 
 import javax.imageio.ImageIO;
 
@@ -92,7 +93,7 @@ public class JpegImageMetadata implement
      * @throws IOException
      */
     public byte[] getEXIFThumbnailData() throws ImageReadException, IOException {
-        ArrayList dirs = exif.getDirectories();
+        List dirs = exif.getDirectories();
         for (int i = 0; i < dirs.size(); i++) {
             TiffImageMetadata.Directory dir = (TiffImageMetadata.Directory) dirs
                     .get(i);
@@ -125,7 +126,7 @@ public class JpegImageMetadata implement
             return null;
         }
 
-        ArrayList dirs = exif.getDirectories();
+        List dirs = exif.getDirectories();
         for (int i = 0; i < dirs.size(); i++) {
             TiffImageMetadata.Directory dir = (TiffImageMetadata.Directory) dirs
                     .get(i);
@@ -150,7 +151,7 @@ public class JpegImageMetadata implement
     }
 
     public TiffImageData getRawImageData() {
-        ArrayList dirs = exif.getDirectories();
+        List dirs = exif.getDirectories();
         for (int i = 0; i < dirs.size(); i++) {
             TiffImageMetadata.Directory dir = (TiffImageMetadata.Directory) dirs
                     .get(i);
@@ -163,8 +164,8 @@ public class JpegImageMetadata implement
         return null;
     }
 
-    public ArrayList getItems() {
-        ArrayList result = new ArrayList();
+    public List getItems() {
+        List result = new ArrayList();
 
         if (null != exif)
             result.addAll(exif.getItems());

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg/JpegImageParser.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg/JpegImageParser.java?rev=1220990&r1=1220989&r2=1220990&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg/JpegImageParser.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg/JpegImageParser.java Mon Dec 19 23:01:46 2011
@@ -110,11 +110,11 @@ public class JpegImageParser extends Ima
         return false;
     }
 
-    public ArrayList readSegments(ByteSource byteSource, final int markers[],
+    public List readSegments(ByteSource byteSource, final int markers[],
             final boolean returnAfterFirst, boolean readEverything)
             throws ImageReadException, IOException
     {
-        final ArrayList result = new ArrayList();
+        final List result = new ArrayList();
         final JpegImageParser parser = this;
         final int[] sofnSegments = {
                 // kJFIFMarker,
@@ -193,7 +193,7 @@ public class JpegImageParser extends Ima
 
     public static final boolean permissive = true;
 
-    private byte[] assembleSegments(ArrayList v) throws ImageReadException
+    private byte[] assembleSegments(List v) throws ImageReadException
     {
         try
         {
@@ -204,7 +204,7 @@ public class JpegImageParser extends Ima
         }
     }
 
-    private byte[] assembleSegments(ArrayList v, boolean start_with_zero)
+    private byte[] assembleSegments(List v, boolean start_with_zero)
             throws ImageReadException
     {
         if (v.size() < 1)
@@ -264,7 +264,7 @@ public class JpegImageParser extends Ima
         return result;
     }
 
-    private void dumpSegments(ArrayList v)
+    private void dumpSegments(List v)
     {
         Debug.debug();
         Debug.debug("dumpSegments", v.size());
@@ -279,7 +279,7 @@ public class JpegImageParser extends Ima
         Debug.debug();
     }
 
-    public ArrayList readSegments(ByteSource byteSource, int markers[],
+    public List readSegments(ByteSource byteSource, int markers[],
             boolean returnAfterFirst) throws ImageReadException, IOException
     {
         return readSegments(byteSource, markers, returnAfterFirst, false);
@@ -288,13 +288,13 @@ public class JpegImageParser extends Ima
     public byte[] getICCProfileBytes(ByteSource byteSource, Map params)
             throws ImageReadException, IOException
     {
-        ArrayList segments = readSegments(byteSource,
+        List segments = readSegments(byteSource,
                 new int[] { JPEG_APP2_Marker, }, false);
 
         if (segments != null)
         {
             // throw away non-icc profile app2 segments.
-            ArrayList filtered = new ArrayList();
+            List filtered = new ArrayList();
             for (int i = 0; i < segments.size(); i++)
             {
                 App2Segment segment = (App2Segment) segments.get(i);
@@ -340,9 +340,9 @@ public class JpegImageParser extends Ima
         return byteArrayHasPrefix(segment.bytes, EXIF_IDENTIFIER_CODE);
     }
 
-    private ArrayList filterAPP1Segments(ArrayList v)
+    private List filterAPP1Segments(List v)
     {
-        ArrayList result = new ArrayList();
+        List result = new ArrayList();
 
         for (int i = 0; i < v.size(); i++)
         {
@@ -355,9 +355,9 @@ public class JpegImageParser extends Ima
     }
 
     // TODO unused
-    private ArrayList filterSegments(ArrayList v, List markers)
+    private List filterSegments(List v, List markers)
     {
-        ArrayList result = new ArrayList();
+        List result = new ArrayList();
 
         for (int i = 0; i < v.size(); i++)
         {
@@ -389,13 +389,13 @@ public class JpegImageParser extends Ima
     public byte[] getExifRawData(ByteSource byteSource)
             throws ImageReadException, IOException
     {
-        ArrayList segments = readSegments(byteSource,
+        List segments = readSegments(byteSource,
                 new int[] { JPEG_APP1_Marker, }, false);
 
         if ((segments == null) || (segments.size() < 1))
             return null;
 
-        ArrayList exifSegments = filterAPP1Segments(segments);
+        List exifSegments = filterAPP1Segments(segments);
         if (debug)
             System.out.println("exif_segments.size" + ": "
                     + exifSegments.size());
@@ -611,7 +611,7 @@ public class JpegImageParser extends Ima
     public JpegPhotoshopMetadata getPhotoshopMetadata(ByteSource byteSource,
             Map params) throws ImageReadException, IOException
     {
-        ArrayList segments = readSegments(byteSource,
+        List segments = readSegments(byteSource,
                 new int[] { JPEG_APP13_Marker, }, false);
 
         if ((segments == null) || (segments.size() < 1))
@@ -639,7 +639,7 @@ public class JpegImageParser extends Ima
     public Dimension getImageSize(ByteSource byteSource, Map params)
             throws ImageReadException, IOException
     {
-        ArrayList segments = readSegments(byteSource, new int[] {
+        List segments = readSegments(byteSource, new int[] {
                 // kJFIFMarker,
                 SOF0Marker,
 
@@ -673,9 +673,9 @@ public class JpegImageParser extends Ima
     public ImageInfo getImageInfo(ByteSource byteSource, Map params)
             throws ImageReadException, IOException
     {
-        // ArrayList allSegments = readSegments(byteSource, null, false);
+        // List allSegments = readSegments(byteSource, null, false);
 
-        ArrayList SOF_segments = readSegments(byteSource, new int[] {
+        List SOF_segments = readSegments(byteSource, new int[] {
                 // kJFIFMarker,
 
                 SOF0Marker, SOF1Marker, SOF2Marker, SOF3Marker, SOF5Marker,
@@ -691,7 +691,7 @@ public class JpegImageParser extends Ima
         // System.out.println("Incoherent SOFN Data Found: "
         // + SOF_segments.size());
 
-        ArrayList jfifSegments = readSegments(byteSource,
+        List jfifSegments = readSegments(byteSource,
                 new int[] { JFIFMarker, }, true);
 
         SofnSegment fSOFNSegment = (SofnSegment) SOF_segments.get(0);
@@ -805,8 +805,8 @@ public class JpegImageParser extends Ima
             PhysicalHeightInch = (float) (Height / (y_density * units_per_inch));
         }
 
-        ArrayList Comments = new ArrayList();
-        ArrayList commentSegments = readSegments(byteSource,
+        List Comments = new ArrayList();
+        List commentSegments = readSegments(byteSource,
                 new int[] { COMMarker }, false);
         for (int i = 0; i < commentSegments.size(); i++)
         {
@@ -858,7 +858,7 @@ public class JpegImageParser extends Ima
     // throws ImageReadException, IOException
     // {
     //
-    // ArrayList allSegments = readSegments(byteSource, null, false);
+    // List allSegments = readSegments(byteSource, null, false);
     //
     // final int SOF_MARKERS[] = new int[]{
     // SOF0Marker, SOF1Marker, SOF2Marker, SOF3Marker, SOF5Marker,
@@ -866,16 +866,16 @@ public class JpegImageParser extends Ima
     // SOF13Marker, SOF14Marker, SOF15Marker,
     // };
     //
-    // ArrayList sofMarkers = new ArrayList();
+    // List sofMarkers = new ArrayList();
     // for(int i=0;i<SOF_MARKERS.length;i++)
     // sofMarkers.add(new Integer(SOF_MARKERS[i]));
-    // ArrayList SOFSegments = filterSegments(allSegments, sofMarkers);
+    // List SOFSegments = filterSegments(allSegments, sofMarkers);
     // if (SOFSegments == null || SOFSegments.size()<1)
     // throw new ImageReadException("No SOFN Data Found.");
     //
     // List jfifMarkers = new ArrayList();
     // jfifMarkers.add(new Integer(JFIFMarker));
-    // ArrayList jfifSegments = filterSegments(allSegments, jfifMarkers);
+    // List jfifSegments = filterSegments(allSegments, jfifMarkers);
     //
     // SofnSegment firstSOFNSegment = (SofnSegment) SOFSegments.get(0);
     //
@@ -985,7 +985,7 @@ public class JpegImageParser extends Ima
     // units_per_inch));
     // }
     //
-    // ArrayList Comments = new ArrayList();
+    // List Comments = new ArrayList();
     // // TODO: comments...
     //
     // int Number_of_components = firstSOFNSegment.numberOfComponents;
@@ -1039,7 +1039,7 @@ public class JpegImageParser extends Ima
         pw.println("");
 
         {
-            ArrayList segments = readSegments(byteSource, null, false);
+            List segments = readSegments(byteSource, null, false);
 
             if (segments == null)
                 throw new ImageReadException("No Segments Found.");

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg/exif/ExifRewriter.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg/exif/ExifRewriter.java?rev=1220990&r1=1220989&r2=1220990&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg/exif/ExifRewriter.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg/exif/ExifRewriter.java Mon Dec 19 23:01:46 2011
@@ -145,7 +145,7 @@ public class ExifRewriter extends Binary
             throws ImageReadException, IOException
     //            , ImageWriteException
     {
-        final ArrayList pieces = new ArrayList();
+        final List pieces = new ArrayList();
         final List exifPieces = new ArrayList();
 
         JpegUtils.Visitor visitor = new JpegUtils.Visitor()

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg/iptc/IptcParser.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg/iptc/IptcParser.java?rev=1220990&r1=1220989&r2=1220990&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg/iptc/IptcParser.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg/iptc/IptcParser.java Mon Dec 19 23:01:46 2011
@@ -111,7 +111,7 @@ public class IptcParser extends BinaryFi
             boolean verbose, boolean strict) throws ImageReadException,
             IOException
     {
-        ArrayList records = new ArrayList();
+        List records = new ArrayList();
 
         List allBlocks = parseAllBlocks(bytes, verbose, strict);
 
@@ -132,7 +132,7 @@ public class IptcParser extends BinaryFi
     protected List parseIPTCBlock(byte bytes[], boolean verbose)
             throws ImageReadException, IOException
     {
-        ArrayList elements = new ArrayList();
+        List elements = new ArrayList();
 
         int index = 0;
         // Integer recordVersion = null;

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg/segments/App13Segment.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg/segments/App13Segment.java?rev=1220990&r1=1220989&r2=1220990&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg/segments/App13Segment.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg/segments/App13Segment.java Mon Dec 19 23:01:46 2011
@@ -30,7 +30,7 @@ public class App13Segment extends AppnSe
 {
     protected final JpegImageParser parser;
 
-    // public final ArrayList elements = new ArrayList();
+    // public final List elements = new ArrayList();
     // public final boolean isIPTCJpegSegment;
 
     public App13Segment(JpegImageParser parser, int marker, byte segmentData[])

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg/segments/DhtSegment.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg/segments/DhtSegment.java?rev=1220990&r1=1220989&r2=1220990&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg/segments/DhtSegment.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg/segments/DhtSegment.java Mon Dec 19 23:01:46 2011
@@ -19,12 +19,13 @@ import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.ArrayList;
+import java.util.List;
 
 import org.apache.commons.sanselan.ImageReadException;
 
 public class DhtSegment extends Segment
 {
-    public final ArrayList huffmanTables = new ArrayList();
+    public final List huffmanTables = new ArrayList();
 
     public static class HuffmanTable
     {

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg/segments/DqtSegment.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg/segments/DqtSegment.java?rev=1220990&r1=1220989&r2=1220990&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg/segments/DqtSegment.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg/segments/DqtSegment.java Mon Dec 19 23:01:46 2011
@@ -19,12 +19,13 @@ import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.ArrayList;
+import java.util.List;
 
 import org.apache.commons.sanselan.ImageReadException;
 
 public class DqtSegment extends Segment
 {
-    public final ArrayList quantizationTables = new ArrayList();
+    public final List quantizationTables = new ArrayList();
 
     public static class QuantizationTable
     {

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg/xmp/JpegRewriter.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg/xmp/JpegRewriter.java?rev=1220990&r1=1220989&r2=1220990&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg/xmp/JpegRewriter.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg/xmp/JpegRewriter.java Mon Dec 19 23:01:46 2011
@@ -171,7 +171,7 @@ public class JpegRewriter extends Binary
             throws ImageReadException, IOException
     // , ImageWriteException
     {
-        final ArrayList pieces = new ArrayList();
+        final List pieces = new ArrayList();
         final List segmentPieces = new ArrayList();
 
         JpegUtils.Visitor visitor = new JpegUtils.Visitor() {

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/png/PngImageInfo.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/png/PngImageInfo.java?rev=1220990&r1=1220989&r2=1220990&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/png/PngImageInfo.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/png/PngImageInfo.java Mon Dec 19 23:01:46 2011
@@ -27,7 +27,7 @@ public class PngImageInfo extends ImageI
     private final List textChunks;
 
     public PngImageInfo(String formatDetails, int bitsPerPixel,
-            ArrayList comments, ImageFormat format, String formatName,
+            List comments, ImageFormat format, String formatName,
             int height, String mimeType, int numberOfImages,
             int physicalHeightDpi, float physicalHeightInch,
             int physicalWidthDpi, float physicalWidthInch, int width,

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/png/PngImageParser.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/png/PngImageParser.java?rev=1220990&r1=1220989&r2=1220990&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/png/PngImageParser.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/png/PngImageParser.java Mon Dec 19 23:01:46 2011
@@ -127,7 +127,7 @@ public class PngImageParser extends Imag
         {
             is = byteSource.getInputStream();
 
-            ArrayList chunks = null;
+            List chunks = null;
 
             readSignature(is);
             chunks = readChunks(is, new int[] { chunkType, }, true);
@@ -161,10 +161,10 @@ public class PngImageParser extends Imag
         return false;
     }
 
-    private ArrayList readChunks(InputStream is, int chunkTypes[],
+    private List readChunks(InputStream is, int chunkTypes[],
             boolean returnAfterFirst) throws ImageReadException, IOException
     {
-        ArrayList result = new ArrayList();
+        List result = new ArrayList();
 
         while (true)
         {
@@ -239,7 +239,7 @@ public class PngImageParser extends Imag
 
     }
 
-    private ArrayList readChunks(ByteSource byteSource, int chunkTypes[],
+    private List readChunks(ByteSource byteSource, int chunkTypes[],
             boolean returnAfterFirst) throws ImageReadException, IOException
     {
         InputStream is = null;
@@ -248,7 +248,7 @@ public class PngImageParser extends Imag
         {
             is = byteSource.getInputStream();
 
-            ArrayList chunks = null;
+            List chunks = null;
 
             readSignature(is);
             chunks = readChunks(is, chunkTypes, returnAfterFirst);
@@ -270,7 +270,7 @@ public class PngImageParser extends Imag
     public byte[] getICCProfileBytes(ByteSource byteSource, Map params)
             throws ImageReadException, IOException
     {
-        ArrayList chunks = readChunks(byteSource, new int[] { iCCP, }, true);
+        List chunks = readChunks(byteSource, new int[] { iCCP, }, true);
 
         if ((chunks == null) || (chunks.size() < 1))
         {
@@ -291,7 +291,7 @@ public class PngImageParser extends Imag
     public Dimension getImageSize(ByteSource byteSource, Map params)
             throws ImageReadException, IOException
     {
-        ArrayList chunks = readChunks(byteSource, new int[] { IHDR, }, true);
+        List chunks = readChunks(byteSource, new int[] { IHDR, }, true);
 
         if ((chunks == null) || (chunks.size() < 1))
             throw new ImageReadException("Png: No chunks");
@@ -317,8 +317,7 @@ public class PngImageParser extends Imag
     public IImageMetadata getMetadata(ByteSource byteSource, Map params)
             throws ImageReadException, IOException
     {
-        ArrayList chunks = readChunks(byteSource, new int[] { tEXt, zTXt, },
-                true);
+        List chunks = readChunks(byteSource, new int[] { tEXt, zTXt, }, true);
 
         if ((chunks == null) || (chunks.size() < 1))
             return null;
@@ -431,9 +430,9 @@ public class PngImageParser extends Imag
         throw new ImageReadException("PNG: unknown color type: " + colorType);
     }
 
-    private ArrayList filterChunks(ArrayList v, int type)
+    private List filterChunks(List v, int type)
     {
-        ArrayList result = new ArrayList();
+        List result = new ArrayList();
 
         for (int i = 0; i < v.size(); i++)
         {
@@ -524,7 +523,7 @@ public class PngImageParser extends Imag
     public ImageInfo getImageInfo(ByteSource byteSource, Map params)
             throws ImageReadException, IOException
     {
-        ArrayList chunks = readChunks(byteSource, new int[] { IHDR, pHYs, tEXt,
+        List chunks = readChunks(byteSource, new int[] { IHDR, pHYs, tEXt,
                 zTXt, tRNS, PLTE, iTXt, }, false);
 
         // if(chunks!=null)
@@ -533,7 +532,7 @@ public class PngImageParser extends Imag
         if ((chunks == null) || (chunks.size() < 1))
             throw new ImageReadException("PNG: no chunks");
 
-        ArrayList IHDRs = filterChunks(chunks, IHDR);
+        List IHDRs = filterChunks(chunks, IHDR);
         if (IHDRs.size() != 1)
             throw new ImageReadException("PNG contains more than one Header");
 
@@ -542,7 +541,7 @@ public class PngImageParser extends Imag
 
         boolean isTransparent = false;
 
-        ArrayList tRNSs = filterChunks(chunks, tRNS);
+        List tRNSs = filterChunks(chunks, tRNS);
         if (tRNSs.size() > 0)
         {
             isTransparent = true;
@@ -555,19 +554,19 @@ public class PngImageParser extends Imag
 
         PngChunkPhys pngChunkpHYs = null;
 
-        ArrayList pHYss = filterChunks(chunks, pHYs);
+        List pHYss = filterChunks(chunks, pHYs);
         if (pHYss.size() > 1)
             throw new ImageReadException("PNG contains more than one pHYs: "
                     + pHYss.size());
         else if (pHYss.size() == 1)
             pngChunkpHYs = (PngChunkPhys) pHYss.get(0);
 
-        ArrayList tEXts = filterChunks(chunks, tEXt);
-        ArrayList zTXts = filterChunks(chunks, zTXt);
-        ArrayList iTXts = filterChunks(chunks, iTXt);
+        List tEXts = filterChunks(chunks, tEXt);
+        List zTXts = filterChunks(chunks, zTXt);
+        List iTXts = filterChunks(chunks, iTXt);
 
         {
-            ArrayList comments = new ArrayList();
+            List comments = new ArrayList();
             List textChunks = new ArrayList();
 
             for (int i = 0; i < tEXts.size(); i++)
@@ -633,7 +632,7 @@ public class PngImageParser extends Imag
 
             boolean usesPalette = false;
 
-            ArrayList PLTEs = filterChunks(chunks, PLTE);
+            List PLTEs = filterChunks(chunks, PLTE);
             if (PLTEs.size() > 1)
                 usesPalette = true;
 
@@ -687,19 +686,19 @@ public class PngImageParser extends Imag
         // throw new ImageWriteException("Unknown parameter: " + firstKey);
         // }
 
-        ArrayList chunks = readChunks(byteSource, new int[] { IHDR, PLTE, IDAT,
+        List chunks = readChunks(byteSource, new int[] { IHDR, PLTE, IDAT,
                 tRNS, iCCP, gAMA, sRGB, }, false);
 
         if ((chunks == null) || (chunks.size() < 1))
             throw new ImageReadException("PNG: no chunks");
 
-        ArrayList IHDRs = filterChunks(chunks, IHDR);
+        List IHDRs = filterChunks(chunks, IHDR);
         if (IHDRs.size() != 1)
             throw new ImageReadException("PNG contains more than one Header");
 
         PngChunkIhdr pngChunkIHDR = (PngChunkIhdr) IHDRs.get(0);
 
-        ArrayList PLTEs = filterChunks(chunks, PLTE);
+        List PLTEs = filterChunks(chunks, PLTE);
         if (PLTEs.size() > 1)
             throw new ImageReadException("PNG contains more than one Palette");
 
@@ -709,7 +708,7 @@ public class PngImageParser extends Imag
 
         // -----
 
-        ArrayList IDATs = filterChunks(chunks, IDAT);
+        List IDATs = filterChunks(chunks, IDAT);
         if (IDATs.size() < 1)
             throw new ImageReadException("PNG missing image data");
 
@@ -728,7 +727,7 @@ public class PngImageParser extends Imag
 
         TransparencyFilter transparencyFilter = null;
 
-        ArrayList tRNSs = filterChunks(chunks, tRNS);
+        List tRNSs = filterChunks(chunks, tRNS);
         if (tRNSs.size() > 0)
         {
             PngChunk pngChunktRNS = (PngChunk) tRNSs.get(0);
@@ -739,9 +738,9 @@ public class PngImageParser extends Imag
         ICC_Profile icc_profile = null;
         GammaCorrection gammaCorrection = null;
         {
-            ArrayList sRGBs = filterChunks(chunks, sRGB);
-            ArrayList gAMAs = filterChunks(chunks, gAMA);
-            ArrayList iCCPs = filterChunks(chunks, iCCP);
+            List sRGBs = filterChunks(chunks, sRGB);
+            List gAMAs = filterChunks(chunks, gAMA);
+            List iCCPs = filterChunks(chunks, iCCP);
             if (sRGBs.size() > 1)
                 throw new ImageReadException("PNG: unexpected sRGB chunk");
             if (gAMAs.size() > 1)
@@ -860,9 +859,9 @@ public class PngImageParser extends Imag
         imageInfo.toString(pw, "");
 
         {
-            ArrayList chunks = readChunks(byteSource, null, false);
+            List chunks = readChunks(byteSource, null, false);
             {
-                ArrayList IHDRs = filterChunks(chunks, IHDR);
+                List IHDRs = filterChunks(chunks, IHDR);
                 if (IHDRs.size() != 1)
                 {
                     if (debug)

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/pnm/PnmImageParser.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/pnm/PnmImageParser.java?rev=1220990&r1=1220989&r2=1220990&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/pnm/PnmImageParser.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/pnm/PnmImageParser.java Mon Dec 19 23:01:46 2011
@@ -25,6 +25,7 @@ import java.io.OutputStream;
 import java.io.PrintWriter;
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 import org.apache.commons.sanselan.ImageFormat;
@@ -184,7 +185,7 @@ public class PnmImageParser extends Imag
         if (info == null)
             throw new ImageReadException("PNM: Couldn't read Header");
 
-        ArrayList Comments = new ArrayList();
+        List Comments = new ArrayList();
 
         int BitsPerPixel = info.getBitDepth() * info.getNumComponents();
         ImageFormat Format = info.getImageType();

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/psd/PsdImageParser.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/psd/PsdImageParser.java?rev=1220990&r1=1220989&r2=1220990&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/psd/PsdImageParser.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/psd/PsdImageParser.java Mon Dec 19 23:01:46 2011
@@ -173,7 +173,7 @@ public class PsdImageParser extends Imag
         return result;
     }
 
-    private ArrayList readImageResourceBlocks(byte bytes[],
+    private List readImageResourceBlocks(byte bytes[],
             int imageResourceIDs[], int maxBlocksToRead)
             throws ImageReadException, IOException
     {
@@ -193,11 +193,11 @@ public class PsdImageParser extends Imag
         return false;
     }
 
-    private ArrayList readImageResourceBlocks(InputStream is,
+    private List readImageResourceBlocks(InputStream is,
             int imageResourceIDs[], int maxBlocksToRead, int available)
             throws ImageReadException, IOException
     {
-        ArrayList result = new ArrayList();
+        List result = new ArrayList();
 
         while (available > 0)
         {
@@ -253,7 +253,7 @@ public class PsdImageParser extends Imag
         return result;
     }
 
-    private ArrayList readImageResourceBlocks(ByteSource byteSource,
+    private List readImageResourceBlocks(ByteSource byteSource,
             int imageResourceIDs[], int maxBlocksToRead)
             throws ImageReadException, IOException
     {
@@ -458,7 +458,7 @@ public class PsdImageParser extends Imag
     public byte[] getICCProfileBytes(ByteSource byteSource, Map params)
             throws ImageReadException, IOException
     {
-        ArrayList blocks = readImageResourceBlocks(byteSource,
+        List blocks = readImageResourceBlocks(byteSource,
                 new int[] { IMAGE_RESOURCE_ID_ICC_PROFILE, }, 1);
 
         if ((blocks == null) || (blocks.size() < 1))
@@ -540,7 +540,7 @@ public class PsdImageParser extends Imag
         int Width = header.Columns;
         int Height = header.Rows;
 
-        ArrayList Comments = new ArrayList();
+        List Comments = new ArrayList();
         // TODO: comments...
 
         int BitsPerPixel = header.Depth * getChannelsPerMode(header.Mode);
@@ -592,7 +592,7 @@ public class PsdImageParser extends Imag
     }
 
     // TODO not used
-    private ImageResourceBlock findImageResourceBlock(ArrayList blocks, int ID)
+    private ImageResourceBlock findImageResourceBlock(List blocks, int ID)
     {
         for (int i = 0; i < blocks.size(); i++)
         {
@@ -622,7 +622,7 @@ public class PsdImageParser extends Imag
             imageContents.dump(pw);
             imageContents.header.dump(pw);
 
-            ArrayList blocks = readImageResourceBlocks(byteSource,
+            List blocks = readImageResourceBlocks(byteSource,
             // fImageContents.ImageResources,
                     null, -1);
 
@@ -676,7 +676,7 @@ public class PsdImageParser extends Imag
         // GraphicControlExtension gce = (GraphicControlExtension) findBlock(
         // fImageContents.blocks, kGraphicControlExtension);
 
-        ArrayList blocks = readImageResourceBlocks(byteSource,
+        List blocks = readImageResourceBlocks(byteSource,
         // fImageContents.ImageResources,
                 null, -1);
 
@@ -808,7 +808,7 @@ public class PsdImageParser extends Imag
         if (header == null)
             throw new ImageReadException("PSD: Couldn't read Header");
 
-        ArrayList blocks = readImageResourceBlocks(byteSource,
+        List blocks = readImageResourceBlocks(byteSource,
                 new int[] { IMAGE_RESOURCE_ID_XMP, }, -1);
 
         if ((blocks == null) || (blocks.size() < 1))

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tga/TgaImageParser.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tga/TgaImageParser.java?rev=1220990&r1=1220989&r2=1220990&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tga/TgaImageParser.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tga/TgaImageParser.java Mon Dec 19 23:01:46 2011
@@ -198,7 +198,7 @@ package org.apache.commons.sanselan.form
 //        }
 //        String FormatDetails;
 //        int BitsPerPixel;
-//        ArrayList Comments;
+//        List Comments;
 //        ImageFormat Format = ImageFormat.IMAGE_FORMAT_TGA;
 //        String FormatName = Format.name;
 //        String MimeType = "image/tga";

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/TiffContents.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/TiffContents.java?rev=1220990&r1=1220989&r2=1220990&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/TiffContents.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/TiffContents.java Mon Dec 19 23:01:46 2011
@@ -18,6 +18,7 @@ package org.apache.commons.sanselan.form
 
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.List;
 
 import org.apache.commons.sanselan.ImageReadException;
 import org.apache.commons.sanselan.formats.tiff.constants.TagInfo;
@@ -26,17 +27,17 @@ import org.apache.commons.sanselan.util.
 public class TiffContents
 {
     public final TiffHeader header;
-    public final ArrayList directories;
+    public final List directories;
 
-    public TiffContents(TiffHeader tiffHeader, ArrayList directories)
+    public TiffContents(TiffHeader tiffHeader, List directories)
     {
         this.header = tiffHeader;
         this.directories = directories;
     }
 
-    public ArrayList getElements() throws ImageReadException
+    public List getElements() throws ImageReadException
     {
-        ArrayList result = new ArrayList();
+        List result = new ArrayList();
 
         result.add(header);
 
@@ -46,7 +47,7 @@ public class TiffContents
 
             result.add(directory);
 
-            ArrayList fields = directory.entries;
+            List fields = directory.entries;
             for (int j = 0; j < fields.size(); j++)
             {
                 TiffField field = (TiffField) fields.get(j);
@@ -80,7 +81,7 @@ public class TiffContents
 
     public void dissect(boolean verbose) throws ImageReadException
     {
-        ArrayList elements = getElements();
+        List elements = getElements();
 
         Collections.sort(elements, TiffElement.COMPARATOR);
 

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/TiffDirectory.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/TiffDirectory.java?rev=1220990&r1=1220989&r2=1220990&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/TiffDirectory.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/TiffDirectory.java Mon Dec 19 23:01:46 2011
@@ -19,6 +19,7 @@ package org.apache.commons.sanselan.form
 import java.awt.image.BufferedImage;
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.List;
 import java.util.Map;
 
 import org.apache.commons.sanselan.ImageReadException;
@@ -87,11 +88,11 @@ public class TiffDirectory extends TiffE
     }
 
     public final int type;
-    public final ArrayList entries;
+    public final List entries;
     //    public final int offset;
     public final int nextDirectoryOffset;
 
-    public TiffDirectory(int type, ArrayList entries, final int offset,
+    public TiffDirectory(int type, List entries, final int offset,
             int nextDirectoryOffset)
     {
         super(offset, TIFF_DIRECTORY_HEADER_LENGTH + entries.size()
@@ -102,7 +103,7 @@ public class TiffDirectory extends TiffE
         this.nextDirectoryOffset = nextDirectoryOffset;
     }
 
-    public ArrayList getDirectoryEntrys()
+    public List getDirectoryEntrys()
     {
         return new ArrayList(entries);
     }
@@ -192,7 +193,7 @@ public class TiffDirectory extends TiffE
         }
     }
 
-    private ArrayList getRawImageDataElements(TiffField offsetsField,
+    private List getRawImageDataElements(TiffField offsetsField,
             TiffField byteCountsField) throws ImageReadException
     {
         int offsets[] = offsetsField.getIntArrayValue();
@@ -202,7 +203,7 @@ public class TiffDirectory extends TiffE
             throw new ImageReadException("offsets.length(" + offsets.length
                     + ") != byteCounts.length(" + byteCounts.length + ")");
 
-        ArrayList result = new ArrayList();
+        List result = new ArrayList();
         for (int i = 0; i < offsets.length; i++)
         {
             result.add(new ImageDataElement(offsets[i], byteCounts[i]));
@@ -210,7 +211,7 @@ public class TiffDirectory extends TiffE
         return result;
     }
 
-    public ArrayList getTiffRawImageDataElements() throws ImageReadException
+    public List getTiffRawImageDataElements() throws ImageReadException
     {
         TiffField tileOffsets = findField(TIFF_TAG_TILE_OFFSETS);
         TiffField tileByteCounts = findField(TIFF_TAG_TILE_BYTE_COUNTS);

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/TiffImageData.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/TiffImageData.java?rev=1220990&r1=1220989&r2=1220990&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/TiffImageData.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/TiffImageData.java Mon Dec 19 23:01:46 2011
@@ -18,7 +18,7 @@
 package org.apache.commons.sanselan.formats.tiff;
 
 import java.io.IOException;
-import java.util.ArrayList;
+import java.util.List;
 
 import org.apache.commons.sanselan.ImageReadException;
 import org.apache.commons.sanselan.formats.tiff.datareaders.DataReader;
@@ -53,7 +53,7 @@ public abstract class TiffImageData
             return false;
         }
 
-        public DataReader getDataReader(ArrayList entries,
+        public DataReader getDataReader(List entries,
                 PhotometricInterpreter photometricInterpreter,
                 int bitsPerPixel, int bitsPerSample[], int predictor,
                 int samplesPerPixel, int width, int height, int compression)
@@ -93,7 +93,7 @@ public abstract class TiffImageData
             return true;
         }
 
-        public DataReader getDataReader(ArrayList entries,
+        public DataReader getDataReader(List entries,
                 PhotometricInterpreter photometricInterpreter,
                 int bitsPerPixel, int bitsPerSample[], int predictor,
                 int samplesPerPixel, int width, int height, int compression)
@@ -117,7 +117,7 @@ public abstract class TiffImageData
 
     public abstract boolean stripsNotTiles();
 
-    public abstract DataReader getDataReader(ArrayList entries,
+    public abstract DataReader getDataReader(List entries,
             PhotometricInterpreter photometricInterpreter, int bitsPerPixel,
             int bitsPerSample[], int predictor, int samplesPerPixel, int width,
             int height, int compression) throws IOException, ImageReadException;

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/TiffImageMetadata.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/TiffImageMetadata.java?rev=1220990&r1=1220989&r2=1220990&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/TiffImageMetadata.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/TiffImageMetadata.java Mon Dec 19 23:01:46 2011
@@ -130,7 +130,7 @@ public class TiffImageMetadata extends I
             {
                 TiffOutputDirectory dstDir = new TiffOutputDirectory(type);
 
-                ArrayList entries = getItems();
+                List entries = getItems();
                 for (int i = 0; i < entries.size(); i++)
                 {
                     TiffImageMetadata.Item item = (TiffImageMetadata.Item) entries
@@ -187,16 +187,16 @@ public class TiffImageMetadata extends I
 
     }
 
-    public ArrayList getDirectories()
+    public List getDirectories()
     {
         return super.getItems();
     }
 
-    public ArrayList getItems()
+    public List getItems()
     {
-        ArrayList result = new ArrayList();
+        List result = new ArrayList();
 
-        ArrayList items = super.getItems();
+        List items = super.getItems();
         for (int i = 0; i < items.size(); i++)
         {
             Directory dir = (Directory) items.get(i);
@@ -229,7 +229,7 @@ public class TiffImageMetadata extends I
         int byteOrder = contents.header.byteOrder;
         TiffOutputSet result = new TiffOutputSet(byteOrder);
 
-        ArrayList srcDirs = getDirectories();
+        List srcDirs = getDirectories();
         for (int i = 0; i < srcDirs.size(); i++)
         {
             TiffImageMetadata.Directory srcDir = (TiffImageMetadata.Directory) srcDirs
@@ -262,7 +262,7 @@ public class TiffImageMetadata extends I
         Integer tagCount = (Integer)tagCounts.get(new Integer(tagInfo.tag));
         int tagsMatching = tagCount == null ? 0 : tagCount.intValue();
 
-        ArrayList directories = getDirectories();
+        List directories = getDirectories();
         if (exactDirectoryMatch || tagInfo.directoryType != EXIF_DIRECTORY_UNKNOWN)
         {
             for (int i = 0; i < directories.size(); i++)
@@ -311,7 +311,7 @@ public class TiffImageMetadata extends I
 
     public TiffDirectory findDirectory(int directoryType)
     {
-        ArrayList directories = getDirectories();
+        List directories = getDirectories();
         for (int i = 0; i < directories.size(); i++)
         {
             Directory directory = (Directory) directories.get(i);
@@ -324,7 +324,7 @@ public class TiffImageMetadata extends I
     public List getAllFields() throws ImageReadException
     {
         List result = new ArrayList();
-        ArrayList directories = getDirectories();
+        List directories = getDirectories();
         for (int i = 0; i < directories.size(); i++)
         {
             Directory directory = (Directory) directories.get(i);

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/TiffImageParser.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/TiffImageParser.java?rev=1220990&r1=1220989&r2=1220990&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/TiffImageParser.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/TiffImageParser.java Mon Dec 19 23:01:46 2011
@@ -124,7 +124,7 @@ public class TiffImageParser extends Ima
         TiffContents contents = new TiffReader(isStrict(params)).readContents(
                 byteSource, params, formatCompliance);
 
-        ArrayList directories = contents.directories;
+        List directories = contents.directories;
 
         TiffImageMetadata result = new TiffImageMetadata(contents);
 
@@ -132,10 +132,9 @@ public class TiffImageParser extends Ima
         {
             TiffDirectory dir = (TiffDirectory) directories.get(i);
 
-            TiffImageMetadata.Directory metadataDirectory = new TiffImageMetadata.Directory(
-                    dir);
+            TiffImageMetadata.Directory metadataDirectory = new TiffImageMetadata.Directory(dir);
 
-            ArrayList entries = dir.getDirectoryEntrys();
+            List entries = dir.getDirectoryEntrys();
 
             for (int j = 0; j < entries.size(); j++)
             {
@@ -234,8 +233,8 @@ public class TiffImageParser extends Ima
 
         // -------------------
 
-        ArrayList comments = new ArrayList();
-        ArrayList entries = directory.entries;
+        List comments = new ArrayList();
+        List entries = directory.entries;
         for (int i = 0; i < entries.size(); i++)
         {
             TiffField field = (TiffField) entries.get(i);
@@ -355,7 +354,7 @@ public class TiffImageParser extends Ima
                 TiffContents contents = new TiffReader(true).readContents(
                         byteSource, params, formatCompliance);
 
-                ArrayList directories = contents.directories;
+                List directories = contents.directories;
 
                 if (directories == null)
                     return false;
@@ -365,7 +364,7 @@ public class TiffImageParser extends Ima
                     TiffDirectory directory = (TiffDirectory) directories
                             .get(d);
 
-                    ArrayList entries = directory.entries;
+                    List entries = directory.entries;
 
                     if (entries == null)
                         return false;
@@ -444,12 +443,12 @@ public class TiffImageParser extends Ima
         return result;
     }
 
-    public ArrayList getAllBufferedImages(ByteSource byteSource)
+    public List getAllBufferedImages(ByteSource byteSource)
             throws ImageReadException, IOException
     {
         FormatCompliance formatCompliance = FormatCompliance.getDefault();
         TiffContents contents = new TiffReader(true).readDirectories(byteSource, true, formatCompliance);
-        ArrayList results = new ArrayList();
+        List results = new ArrayList();
         for (int i = 0; i < contents.directories.size(); i++)
         {
             TiffDirectory directory = (TiffDirectory) contents.directories.get(i);
@@ -465,7 +464,7 @@ public class TiffImageParser extends Ima
     protected BufferedImage getBufferedImage(TiffDirectory directory, Map params)
             throws ImageReadException, IOException
     {
-        ArrayList entries = directory.entries;
+        List entries = directory.entries;
 
         if (entries == null)
             throw new ImageReadException("TIFF missing entries");

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/TiffReader.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/TiffReader.java?rev=1220990&r1=1220989&r2=1220990&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/TiffReader.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/TiffReader.java Mon Dec 19 23:01:46 2011
@@ -138,7 +138,7 @@ public class TiffReader extends BinaryFi
             if (offset > 0)
                 is.skip(offset);
 
-            ArrayList fields = new ArrayList();
+            List fields = new ArrayList();
 
             if (offset >= byteSource.getLength())
             {
@@ -321,8 +321,8 @@ public class TiffReader extends BinaryFi
     private static class Collector implements Listener
     {
         private TiffHeader tiffHeader = null;
-        private ArrayList directories = new ArrayList();
-        private ArrayList fields = new ArrayList();
+        private List directories = new ArrayList();
+        private List fields = new ArrayList();
         private final boolean readThumbnails;
 
         public Collector()
@@ -464,7 +464,7 @@ public class TiffReader extends BinaryFi
             TiffDirectory directory) throws ImageReadException, IOException
     {
 
-        ArrayList elements = directory.getTiffRawImageDataElements();
+        List elements = directory.getTiffRawImageDataElements();
         TiffImageData.Data data[] = new TiffImageData.Data[elements.size()];
         for (int i = 0; i < elements.size(); i++)
         {

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/write/TiffImageWriterBase.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/write/TiffImageWriterBase.java?rev=1220990&r1=1220989&r2=1220990&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/write/TiffImageWriterBase.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/write/TiffImageWriterBase.java Mon Dec 19 23:01:46 2011
@@ -74,7 +74,7 @@ public abstract class TiffImageWriterBas
         TiffOutputField gpsDirectoryOffsetField = null;
         TiffOutputField interoperabilityDirectoryOffsetField = null;
 
-        ArrayList directoryIndices = new ArrayList();
+        List directoryIndices = new ArrayList();
         Map directoryTypeMap = new HashMap();
         for (int i = 0; i < directories.size(); i++)
         {
@@ -125,7 +125,7 @@ public abstract class TiffImageWriterBas
             }
 
             HashSet fieldTags = new HashSet();
-            ArrayList fields = directory.getFields();
+            List fields = directory.getFields();
             for (int j = 0; j < fields.size(); j++)
             {
                 TiffOutputField field = (TiffOutputField) fields.get(j);
@@ -286,7 +286,7 @@ public abstract class TiffImageWriterBas
         //
         // writeImageFileHeader(bos, WRITE_BYTE_ORDER);
 
-        // ArrayList directoryFields = new ArrayList();
+        // List directoryFields = new ArrayList();
 
         final int photometricInterpretation = 2; // TODO:
 

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/write/TiffImageWriterLossless.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/write/TiffImageWriterLossless.java?rev=1220990&r1=1220989&r2=1220990&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/write/TiffImageWriterLossless.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/write/TiffImageWriterLossless.java Mon Dec 19 23:01:46 2011
@@ -129,7 +129,7 @@ public class TiffImageWriterLossless ext
             TiffContents contents = new TiffReader(false).readContents(byteSource,
                     params, formatCompliance);
 
-            ArrayList elements = new ArrayList();
+            List elements = new ArrayList();
             //            result.add(contents.header); // ?
 
             List directories = contents.directories;

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/write/TiffOutputDirectory.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/write/TiffOutputDirectory.java?rev=1220990&r1=1220989&r2=1220990&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/write/TiffOutputDirectory.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/write/TiffOutputDirectory.java Mon Dec 19 23:01:46 2011
@@ -37,7 +37,7 @@ public final class TiffOutputDirectory e
         TiffConstants
 {
     public final int type;
-    private final ArrayList fields = new ArrayList();
+    private final List fields = new ArrayList();
 
     private TiffOutputDirectory nextDirectory = null;
 
@@ -56,7 +56,7 @@ public final class TiffOutputDirectory e
         fields.add(field);
     }
 
-    public ArrayList getFields()
+    public List getFields()
     {
         return new ArrayList(fields);
     }
@@ -68,7 +68,7 @@ public final class TiffOutputDirectory e
 
     public void removeField(int tag)
     {
-        ArrayList matches = new ArrayList();
+        List matches = new ArrayList();
         for (int i = 0; i < fields.size(); i++)
         {
             TiffOutputField field = (TiffOutputField) fields.get(i);

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/write/TiffOutputSet.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/write/TiffOutputSet.java?rev=1220990&r1=1220989&r2=1220990&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/write/TiffOutputSet.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/write/TiffOutputSet.java Mon Dec 19 23:01:46 2011
@@ -27,7 +27,7 @@ import org.apache.commons.sanselan.util.
 public final class TiffOutputSet implements TiffConstants
 {
     public final int byteOrder;
-    private final ArrayList directories = new ArrayList();
+    private final List directories = new ArrayList();
 
     public TiffOutputSet()
     {
@@ -308,7 +308,7 @@ public final class TiffOutputSet impleme
                     + directory.description() + " (" + directory.type + ")");
             result.append(newline);
 
-            ArrayList fields = directory.getFields();
+            List fields = directory.getFields();
             for (int j = 0; j < fields.size(); j++)
             {
                 TiffOutputField field = (TiffOutputField) fields.get(j);

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/icc/IccProfileParser.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/icc/IccProfileParser.java?rev=1220990&r1=1220989&r2=1220990&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/icc/IccProfileParser.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/icc/IccProfileParser.java Mon Dec 19 23:01:46 2011
@@ -227,7 +227,7 @@ public class IccProfileParser extends Bi
 
             int TagCount = read4Bytes("TagCount", is, "Not a Valid ICC Profile");
 
-            //            ArrayList tags = new ArrayList();
+            //            List tags = new ArrayList();
             IccTag tags[] = new IccTag[TagCount];
 
             for (int i = 0; i < TagCount; i++)



Mime
View raw message