commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dam...@apache.org
Subject svn commit: r1391207 - in /commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging: formats/jpeg/exif/ formats/jpeg/iptc/ formats/jpeg/xmp/ formats/pcx/ formats/png/ formats/rgbe/ formats/tiff/ formats/wbmp/ formats/xbm/ formats/xmp/ form...
Date Thu, 27 Sep 2012 20:45:51 GMT
Author: damjan
Date: Thu Sep 27 20:45:49 2012
New Revision: 1391207

URL: http://svn.apache.org/viewvc?rev=1391207&view=rev
Log:
Fix the remaining issues with generics in the tests.


Modified:
    commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/ExifRewriteTest.java
    commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/GpsTest.java
    commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/SpecificExifTagTest.java
    commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/WriteExifMetadataExampleTest.java
    commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcBaseTest.java
    commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcDumpTest.java
    commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcUpdateTest.java
    commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/xmp/JpegXmpBaseTest.java
    commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/xmp/JpegXmpDumpTest.java
    commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/xmp/JpegXmpRewriteTest.java
    commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/pcx/PcxBaseTest.java
    commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/pcx/PcxReadTest.java
    commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/ConvertPngToGifTest.java
    commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/PngBaseTest.java
    commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/PngMultipleRoundtripTest.java
    commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/PngReadTest.java
    commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/PngTextTest.java
    commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/PngWriteForceTrueColorText.java
    commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/PngWriteReadTest.java
    commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/rgbe/RgbeBaseTest.java
    commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/rgbe/RgbeReadTest.java
    commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffBaseTest.java
    commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffCcittTest.java
    commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffLzwTest.java
    commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffReadTest.java
    commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffRoundtripTest.java
    commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/wbmp/WbmpBaseTest.java
    commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/wbmp/WbmpReadTest.java
    commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/xbm/XbmBaseTest.java
    commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/xbm/XbmReadTest.java
    commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/xmp/XmpDumpTest.java
    commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/xmp/XmpUpdateTest.java
    commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/xpm/XpmBaseTest.java
    commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/xpm/XpmReadTest.java
    commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/roundtrip/RoundtripTest.java

Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/ExifRewriteTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/ExifRewriteTest.java?rev=1391207&r1=1391206&r2=1391207&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/ExifRewriteTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/ExifRewriteTest.java Thu Sep 27 20:45:49 2012
@@ -31,6 +31,7 @@ import java.util.Set;
 import org.apache.commons.imaging.ImageReadException;
 import org.apache.commons.imaging.ImageWriteException;
 import org.apache.commons.imaging.Imaging;
+import org.apache.commons.imaging.common.IImageMetadata.IImageMetadataItem;
 import org.apache.commons.imaging.common.bytesource.ByteSource;
 import org.apache.commons.imaging.common.bytesource.ByteSourceArray;
 import org.apache.commons.imaging.common.bytesource.ByteSourceFile;
@@ -276,24 +277,23 @@ public class ExifRewriteTest extends Exi
         rewrite(rewriter, "lossless");
     }
 
-    private Hashtable makeDirectoryMap(List directories) {
-        Hashtable directoryMap = new Hashtable();
+    private Hashtable<Integer,TiffImageMetadata.Directory> makeDirectoryMap(List<? extends IImageMetadataItem> directories) {
+        Hashtable<Integer,TiffImageMetadata.Directory> directoryMap = new Hashtable<Integer,TiffImageMetadata.Directory>();
         for (int i = 0; i < directories.size(); i++) {
             TiffImageMetadata.Directory directory = (TiffImageMetadata.Directory) directories
                     .get(i);
-            directoryMap.put(new Integer(directory.type), directory);
+            directoryMap.put(directory.type, directory);
         }
         return directoryMap;
     }
 
-    private Hashtable makeFieldMap(List items) {
-        Hashtable fieldMap = new Hashtable();
+    private Hashtable<Integer,TiffField> makeFieldMap(List<? extends IImageMetadataItem> items) {
+        Hashtable<Integer,TiffField> fieldMap = new Hashtable<Integer,TiffField>();
         for (int i = 0; i < items.size(); i++) {
             TiffImageMetadata.Item item = (TiffImageMetadata.Item) items.get(i);
             TiffField field = item.getTiffField();
-            Object key = new Integer(field.tag);
-            if (!fieldMap.containsKey(key))
-                fieldMap.put(key, field);
+            if (!fieldMap.containsKey(field.tag))
+                fieldMap.put(field.tag, field);
         }
         return fieldMap;
     }
@@ -303,18 +303,18 @@ public class ExifRewriteTest extends Exi
         assertNotNull(oldExifMetadata);
         assertNotNull(newExifMetadata);
 
-        List oldDirectories = oldExifMetadata.getDirectories();
-        List newDirectories = newExifMetadata.getDirectories();
+        List<? extends IImageMetadataItem> oldDirectories = oldExifMetadata.getDirectories();
+        List<? extends IImageMetadataItem> newDirectories = newExifMetadata.getDirectories();
 
         assertTrue(oldDirectories.size() == newDirectories.size());
 
-        Hashtable oldDirectoryMap = makeDirectoryMap(oldDirectories);
-        Hashtable newDirectoryMap = makeDirectoryMap(newDirectories);
+        Hashtable<Integer,TiffImageMetadata.Directory> oldDirectoryMap = makeDirectoryMap(oldDirectories);
+        Hashtable<Integer,TiffImageMetadata.Directory> newDirectoryMap = makeDirectoryMap(newDirectories);
 
         assertEquals(oldDirectories.size(), oldDirectoryMap.keySet().size());
-        List oldDirectoryTypes = new ArrayList(oldDirectoryMap.keySet());
+        List<Integer> oldDirectoryTypes = new ArrayList<Integer>(oldDirectoryMap.keySet());
         Collections.sort(oldDirectoryTypes);
-        List newDirectoryTypes = new ArrayList(newDirectoryMap.keySet());
+        List<Integer> newDirectoryTypes = new ArrayList<Integer>(newDirectoryMap.keySet());
         Collections.sort(newDirectoryTypes);
         assertEquals(oldDirectoryTypes, newDirectoryTypes);
 
@@ -330,8 +330,8 @@ public class ExifRewriteTest extends Exi
             assertNotNull(oldDirectory);
             assertNotNull(newDirectory);
 
-            List oldItems = oldDirectory.getItems();
-            List newItems = newDirectory.getItems();
+            List<? extends IImageMetadataItem> oldItems = oldDirectory.getItems();
+            List<? extends IImageMetadataItem> newItems = newDirectory.getItems();
 
             // Debug.debug("oldItems.size()", oldItems.size());
             // Debug.debug("newItems.size()", newItems.size());
@@ -346,13 +346,13 @@ public class ExifRewriteTest extends Exi
             // }
             // assertTrue(oldItems.size() == newItems.size());
 
-            Hashtable oldFieldMap = makeFieldMap(oldItems);
-            Hashtable newFieldMap = makeFieldMap(newItems);
+            Hashtable<Integer,TiffField> oldFieldMap = makeFieldMap(oldItems);
+            Hashtable<Integer,TiffField> newFieldMap = makeFieldMap(newItems);
 
-            Set missingInNew = new HashSet(oldFieldMap.keySet());
+            Set<Integer> missingInNew = new HashSet<Integer>(oldFieldMap.keySet());
             missingInNew.removeAll(newFieldMap.keySet());
 
-            Set missingInOld = new HashSet(newFieldMap.keySet());
+            Set<Integer> missingInOld = new HashSet<Integer>(newFieldMap.keySet());
             missingInOld.removeAll(oldFieldMap.keySet());
 
             // dump("missingInNew", missingInNew);
@@ -371,9 +371,9 @@ public class ExifRewriteTest extends Exi
             // assertEquals(oldFieldMap.keySet(), newFieldMap.keySet());
             // assertEquals(oldFieldMap.keySet(), newFieldMap.keySet());
 
-            List oldFieldTags = new ArrayList(oldFieldMap.keySet());
+            List<Integer> oldFieldTags = new ArrayList<Integer>(oldFieldMap.keySet());
             Collections.sort(oldFieldTags);
-            List newFieldTags = new ArrayList(newFieldMap.keySet());
+            List<Integer> newFieldTags = new ArrayList<Integer>(newFieldMap.keySet());
             Collections.sort(newFieldTags);
             assertEquals(oldFieldTags, newFieldTags);
 
@@ -396,7 +396,7 @@ public class ExifRewriteTest extends Exi
                 assertEquals(oldField.directoryType, newField.directoryType);
 
                 if (oldField.fieldType == TiffFieldTypeConstants.FIELD_TYPE_ASCII) {
-                    // Sanselan currently doesn't correctly rewrite
+                    // Imaging currently doesn't correctly rewrite
                     // strings if any byte had the highest bit set,
                     // so if the source had that, all bets are off.
                     byte[] rawBytes = oldField.fieldType.getRawBytes(oldField);

Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/GpsTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/GpsTest.java?rev=1391207&r1=1391206&r2=1391207&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/GpsTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/GpsTest.java Thu Sep 27 20:45:49 2012
@@ -32,7 +32,7 @@ public class GpsTest extends ExifBaseTes
 
     public void test() throws Exception {
 
-        List images = getImagesWithExifData(300);
+        List<File> images = getImagesWithExifData(300);
         for (int i = 0; i < images.size(); i++) {
             if (i % 10 == 0)
                 Debug.purgeMemory();
@@ -47,7 +47,7 @@ public class GpsTest extends ExifBaseTes
                 continue;
 
             try {
-                Map params = new HashMap();
+                Map<String,Object> params = new HashMap<String,Object>();
                 boolean ignoreImageData = isPhilHarveyTestImage(imageFile);
                 params.put(PARAM_KEY_READ_THUMBNAILS, new Boolean(
                         !ignoreImageData));

Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/SpecificExifTagTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/SpecificExifTagTest.java?rev=1391207&r1=1391206&r2=1391207&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/SpecificExifTagTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/SpecificExifTagTest.java Thu Sep 27 20:45:49 2012
@@ -46,7 +46,7 @@ public abstract class SpecificExifTagTes
     }
 
     public void testAllImages() throws Exception {
-        List images = getImagesWithExifData();
+        List<File> images = getImagesWithExifData();
         for (int i = 0; i < images.size(); i++) {
             if (i % 10 == 0)
                 Debug.purgeMemory();
@@ -66,7 +66,7 @@ public abstract class SpecificExifTagTes
             ImageReadException, ImageWriteException {
         // Debug.debug("imageFile", imageFile.getAbsoluteFile());
 
-        Map params = new HashMap();
+        Map<String,Object> params = new HashMap<String,Object>();
         boolean ignoreImageData = isPhilHarveyTestImage(imageFile);
         params.put(PARAM_KEY_READ_THUMBNAILS, new Boolean(!ignoreImageData));
 
@@ -81,9 +81,9 @@ public abstract class SpecificExifTagTes
         if (null == exif)
             return;
 
-        List fields = exif.getAllFields();
+        List<TiffField> fields = exif.getAllFields();
         for (int i = 0; i < fields.size(); i++) {
-            TiffField field = (TiffField) fields.get(i);
+            TiffField field = fields.get(i);
             checkField(imageFile, field);
         }
 

Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/WriteExifMetadataExampleTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/WriteExifMetadataExampleTest.java?rev=1391207&r1=1391206&r2=1391207&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/WriteExifMetadataExampleTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/WriteExifMetadataExampleTest.java Thu Sep 27 20:45:49 2012
@@ -33,7 +33,7 @@ public class WriteExifMetadataExampleTes
     // }
 
     public void test() throws Exception {
-        List images = getJpegImages();
+        List<File> images = getJpegImages();
         for (int i = 0; i < images.size(); i++) {
             if (i % 10 == 0)
                 Debug.purgeMemory();
@@ -58,7 +58,7 @@ public class WriteExifMetadataExampleTes
     }
 
     public void testInsert() throws Exception {
-        List images = getJpegImages();
+        List<File> images = getJpegImages();
         for (int i = 0; i < images.size(); i++) {
             if (i % 10 == 0)
                 Debug.purgeMemory();

Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcBaseTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcBaseTest.java?rev=1391207&r1=1391206&r2=1391207&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcBaseTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcBaseTest.java Thu Sep 27 20:45:49 2012
@@ -64,12 +64,12 @@ public abstract class IptcBaseTest exten
         return getTestImage(HAS_IPTC_IMAGE_FILTER);
     }
 
-    protected List getImagesWithIptcData() throws IOException,
+    protected List<File> getImagesWithIptcData() throws IOException,
             ImageReadException {
         return getTestImages(HAS_IPTC_IMAGE_FILTER);
     }
 
-    protected List getImagesWithIptcData(int max) throws IOException,
+    protected List<File> getImagesWithIptcData(int max) throws IOException,
             ImageReadException {
         return getTestImages(HAS_IPTC_IMAGE_FILTER, max);
     }
@@ -78,11 +78,11 @@ public abstract class IptcBaseTest exten
         return getTestImage(JPEG_IMAGE_FILTER);
     }
 
-    protected List getJpegImages() throws IOException, ImageReadException {
+    protected List<File> getJpegImages() throws IOException, ImageReadException {
         return getTestImages(JPEG_IMAGE_FILTER);
     }
 
-    protected List getJpegImages(int max) throws IOException,
+    protected List<File> getJpegImages(int max) throws IOException,
             ImageReadException {
         return getTestImages(JPEG_IMAGE_FILTER, max);
     }

Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcDumpTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcDumpTest.java?rev=1391207&r1=1391206&r2=1391207&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcDumpTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcDumpTest.java Thu Sep 27 20:45:49 2012
@@ -31,7 +31,7 @@ import org.apache.commons.imaging.util.D
 public class IptcDumpTest extends IptcBaseTest {
 
     public void test() throws Exception {
-        List images = getImagesWithIptcData();
+        List<File> images = getImagesWithIptcData();
         for (int i = 0; i < images.size(); i++) {
             if (i % 10 == 0)
                 Debug.purgeMemory();
@@ -44,7 +44,7 @@ public class IptcDumpTest extends IptcBa
             // Debug.debug("Segments:");
             // new JpegUtils().dumpJFIF(byteSource);
 
-            Map params = new HashMap();
+            Map<String,Object> params = new HashMap<String,Object>();
             boolean ignoreImageData = isPhilHarveyTestImage(imageFile);
             params.put(PARAM_KEY_READ_THUMBNAILS, new Boolean(!ignoreImageData));
             // params.put(PARAM_KEY_VERBOSE, Boolean.TRUE);
@@ -60,11 +60,11 @@ public class IptcDumpTest extends IptcBa
             // metadata.getPhotoshop().getItems().size());
 
             JpegPhotoshopMetadata psMetadata = metadata.getPhotoshop();
-            List oldRecords = psMetadata.photoshopApp13Data.getRecords();
+            List<IptcRecord> oldRecords = psMetadata.photoshopApp13Data.getRecords();
 
             Debug.debug();
             for (int j = 0; j < oldRecords.size(); j++) {
-                IptcRecord record = (IptcRecord) oldRecords.get(j);
+                IptcRecord record = oldRecords.get(j);
                 if (record.iptcType != IptcTypes.CITY)
                     Debug.debug("Key: " + record.iptcType.getName() + " (0x"
                             + Integer.toHexString(record.iptcType.getType())

Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcUpdateTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcUpdateTest.java?rev=1391207&r1=1391206&r2=1391207&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcUpdateTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcUpdateTest.java Thu Sep 27 20:45:49 2012
@@ -36,7 +36,7 @@ import org.apache.commons.imaging.format
 import org.apache.commons.imaging.util.Debug;
 
 public class IptcUpdateTest extends IptcBaseTest {
-    private List imagesWithIptcData;
+    private List<File> imagesWithIptcData;
 
     @Override
     public void setUp() throws Exception {
@@ -56,7 +56,7 @@ public class IptcUpdateTest extends Iptc
      * Remove all Photoshop IPTC data from a JPEG file.
      */
     public void testRemove() throws Exception {
-        List images = imagesWithIptcData;
+        List<File> images = imagesWithIptcData;
         for (int i = 0; i < images.size(); i++) {
             if (i % 10 == 0)
                 Debug.purgeMemory();
@@ -67,7 +67,7 @@ public class IptcUpdateTest extends Iptc
 
             ByteSource byteSource = new ByteSourceFile(imageFile);
 
-            Map params = new HashMap();
+            Map<String,Object> params = new HashMap<String,Object>();
             boolean ignoreImageData = isPhilHarveyTestImage(imageFile);
             params.put(PARAM_KEY_READ_THUMBNAILS, new Boolean(!ignoreImageData));
 
@@ -104,7 +104,7 @@ public class IptcUpdateTest extends Iptc
     }
 
     public void testRemoveInsertUpdate() throws Exception {
-        List images = imagesWithIptcData;
+        List<File> images = imagesWithIptcData;
         for (int i = 0; i < images.size(); i++) {
             if (i % 10 == 0)
                 Debug.purgeMemory();
@@ -117,7 +117,7 @@ public class IptcUpdateTest extends Iptc
             // Debug.debug("Segments:");
             // new JpegUtils().dumpJFIF(byteSource);
 
-            Map params = new HashMap();
+            Map<String,Object> params = new HashMap<String,Object>();
             boolean ignoreImageData = isPhilHarveyTestImage(imageFile);
             params.put(PARAM_KEY_READ_THUMBNAILS, new Boolean(!ignoreImageData));
             // params.put(PARAM_KEY_VERBOSE, Boolean.TRUE);
@@ -157,9 +157,9 @@ public class IptcUpdateTest extends Iptc
             {
                 // test no-change update
 
-                List newBlocks = metadata.photoshopApp13Data.getNonIptcBlocks();
-                List oldRecords = metadata.photoshopApp13Data.getRecords();
-                List newRecords = new ArrayList();
+                List<IptcBlock> newBlocks = metadata.photoshopApp13Data.getNonIptcBlocks();
+                List<IptcRecord> oldRecords = metadata.photoshopApp13Data.getRecords();
+                List<IptcRecord> newRecords = new ArrayList<IptcRecord>();
                 for (int j = 0; j < oldRecords.size(); j++) {
                     IptcRecord record = (IptcRecord) oldRecords.get(j);
                     if (record.iptcType != IptcTypes.CITY
@@ -207,8 +207,8 @@ public class IptcUpdateTest extends Iptc
             {
                 // test update
 
-                List newBlocks = metadata.photoshopApp13Data.getNonIptcBlocks();
-                List newRecords = new ArrayList();
+                List<IptcBlock> newBlocks = metadata.photoshopApp13Data.getNonIptcBlocks();
+                List<IptcRecord> newRecords = new ArrayList<IptcRecord>();
 
                 newRecords.add(new IptcRecord(IptcTypes.CITY, "Albany, NY"));
                 newRecords.add(new IptcRecord(IptcTypes.CREDIT,
@@ -250,8 +250,8 @@ public class IptcUpdateTest extends Iptc
             {
                 // test insert
 
-                List newBlocks = new ArrayList();
-                List newRecords = new ArrayList();
+                List<IptcBlock> newBlocks = new ArrayList<IptcBlock>();
+                List<IptcRecord> newRecords = new ArrayList<IptcRecord>();
 
                 newRecords.add(new IptcRecord(IptcTypes.CITY, "Albany, NY"));
                 newRecords.add(new IptcRecord(IptcTypes.CREDIT,
@@ -299,7 +299,7 @@ public class IptcUpdateTest extends Iptc
      * IPTC data.
      */
     public void testAddIptcData() throws Exception {
-        List images = getJpegImages();
+        List<File> images = getJpegImages();
         for (int i = 0; i < images.size(); i++) {
             if (i % 10 == 0)
                 Debug.purgeMemory();
@@ -312,7 +312,7 @@ public class IptcUpdateTest extends Iptc
             // Debug.debug("Segments:");
             // new JpegUtils().dumpJFIF(byteSource);
 
-            Map params = new HashMap();
+            Map<String,Object> params = new HashMap<String,Object>();
             boolean ignoreImageData = isPhilHarveyTestImage(imageFile);
             params.put(PARAM_KEY_READ_THUMBNAILS, new Boolean(!ignoreImageData));
 
@@ -321,8 +321,8 @@ public class IptcUpdateTest extends Iptc
             // metadata.dump();
 
             {
-                List newBlocks = new ArrayList();
-                List newRecords = new ArrayList();
+                List<IptcBlock> newBlocks = new ArrayList<IptcBlock>();
+                List<IptcRecord> newRecords = new ArrayList<IptcRecord>();
 
                 if (null != metadata) {
                     boolean keepOldIptcNonTextValues = true;
@@ -331,10 +331,10 @@ public class IptcUpdateTest extends Iptc
                                 .getNonIptcBlocks());
                     boolean keepOldIptcTextValues = true;
                     if (keepOldIptcTextValues) {
-                        List oldRecords = metadata.photoshopApp13Data
+                        List<IptcRecord> oldRecords = metadata.photoshopApp13Data
                                 .getRecords();
 
-                        newRecords = new ArrayList();
+                        newRecords = new ArrayList<IptcRecord>();
                         for (int j = 0; j < oldRecords.size(); j++) {
                             IptcRecord record = (IptcRecord) oldRecords.get(j);
                             if (record.iptcType != IptcTypes.CITY

Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/xmp/JpegXmpBaseTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/xmp/JpegXmpBaseTest.java?rev=1391207&r1=1391206&r2=1391207&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/xmp/JpegXmpBaseTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/xmp/JpegXmpBaseTest.java Thu Sep 27 20:45:49 2012
@@ -66,12 +66,12 @@ public abstract class JpegXmpBaseTest ex
         return getTestImage(HAS_JPEG_XMP_IMAGE_FILTER);
     }
 
-    protected List getImagesWithXmpData() throws IOException,
+    protected List<File> getImagesWithXmpData() throws IOException,
             ImageReadException {
         return getTestImages(HAS_JPEG_XMP_IMAGE_FILTER);
     }
 
-    protected List getImagesWithXmpData(int max) throws IOException,
+    protected List<File> getImagesWithXmpData(int max) throws IOException,
             ImageReadException {
         return getTestImages(HAS_JPEG_XMP_IMAGE_FILTER, max);
     }

Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/xmp/JpegXmpDumpTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/xmp/JpegXmpDumpTest.java?rev=1391207&r1=1391206&r2=1391207&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/xmp/JpegXmpDumpTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/xmp/JpegXmpDumpTest.java Thu Sep 27 20:45:49 2012
@@ -30,7 +30,7 @@ import org.apache.commons.imaging.util.D
 public class JpegXmpDumpTest extends JpegXmpBaseTest {
 
     public void test() throws Exception {
-        List images = getImagesWithXmpData();
+        List<File> images = getImagesWithXmpData();
         for (int i = 0; i < images.size(); i++) {
             if (i % 10 == 0)
                 Debug.purgeMemory();
@@ -40,7 +40,7 @@ public class JpegXmpDumpTest extends Jpe
             Debug.debug();
 
             ByteSource byteSource = new ByteSourceFile(imageFile);
-            Map params = new HashMap();
+            Map<String,Object> params = new HashMap<String,Object>();
             String xmpXml = new JpegImageParser().getXmpXml(byteSource, params);
             assertNotNull(xmpXml);
 

Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/xmp/JpegXmpRewriteTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/xmp/JpegXmpRewriteTest.java?rev=1391207&r1=1391206&r2=1391207&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/xmp/JpegXmpRewriteTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/xmp/JpegXmpRewriteTest.java Thu Sep 27 20:45:49 2012
@@ -34,7 +34,7 @@ import org.apache.commons.imaging.util.D
 public class JpegXmpRewriteTest extends JpegXmpBaseTest {
 
     public void testRemoveInsertUpdate() throws Exception {
-        List images = getImagesWithXmpData();
+        List<File> images = getImagesWithXmpData();
         for (int i = 0; i < images.size(); i++) {
             if (i % 10 == 0)
                 Debug.purgeMemory();
@@ -50,7 +50,7 @@ public class JpegXmpRewriteTest extends 
             // Debug.debug("Source Segments:");
             // new JpegUtils().dumpJFIF(byteSource);
 
-            Map params = new HashMap();
+            Map<String,Object> params = new HashMap<String,Object>();
             String xmpXml = new JpegImageParser().getXmpXml(byteSource, params);
             assertNotNull(xmpXml);
 

Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/pcx/PcxBaseTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/pcx/PcxBaseTest.java?rev=1391207&r1=1391206&r2=1391207&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/pcx/PcxBaseTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/pcx/PcxBaseTest.java Thu Sep 27 20:45:49 2012
@@ -36,7 +36,7 @@ public abstract class PcxBaseTest extend
         }
     };
 
-    protected List getPcxImages() throws IOException, ImageReadException {
+    protected List<File> getPcxImages() throws IOException, ImageReadException {
         return getTestImages(IMAGE_FILTER);
     }
 }

Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/pcx/PcxReadTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/pcx/PcxReadTest.java?rev=1391207&r1=1391206&r2=1391207&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/pcx/PcxReadTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/pcx/PcxReadTest.java Thu Sep 27 20:45:49 2012
@@ -33,7 +33,7 @@ public class PcxReadTest extends PcxBase
     public void test() throws Exception {
         Debug.debug("start");
 
-        List images = getPcxImages();
+        List<File> images = getPcxImages();
         for (int i = 0; i < images.size(); i++) {
             if (i % 10 == 0)
                 Debug.purgeMemory();
@@ -44,7 +44,7 @@ public class PcxReadTest extends PcxBase
             IImageMetadata metadata = Imaging.getMetadata(imageFile);
             // assertNotNull(metadata);
 
-            Map params = new HashMap();
+            Map<String,Object> params = new HashMap<String,Object>();
             ImageInfo imageInfo = Imaging.getImageInfo(imageFile, params);
             assertNotNull(imageInfo);
 

Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/ConvertPngToGifTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/ConvertPngToGifTest.java?rev=1391207&r1=1391206&r2=1391207&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/ConvertPngToGifTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/ConvertPngToGifTest.java Thu Sep 27 20:45:49 2012
@@ -30,7 +30,7 @@ public class ConvertPngToGifTest extends
 
     public void test() throws Exception {
 
-        List images = getPngImages();
+        List<File> images = getPngImages();
         for (int i = 0; i < images.size(); i++) {
             if (i % 10 == 0)
                 Debug.purgeMemory();
@@ -41,7 +41,7 @@ public class ConvertPngToGifTest extends
             // Debug.debug("imageFile", imageFile);
             // Debug.debug();
 
-            Hashtable params = new Hashtable();
+            Hashtable<String,Object> params = new Hashtable<String,Object>();
             // params.put(SanselanConstants.PARAM_KEY_VERBOSE, Boolean.TRUE);
 
             BufferedImage image = Imaging.getBufferedImage(imageFile, params);

Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/PngBaseTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/PngBaseTest.java?rev=1391207&r1=1391206&r2=1391207&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/PngBaseTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/PngBaseTest.java Thu Sep 27 20:45:49 2012
@@ -40,7 +40,7 @@ public abstract class PngBaseTest extend
         }
     };
 
-    protected List getPngImages() throws IOException, ImageReadException {
+    protected List<File> getPngImages() throws IOException, ImageReadException {
         return getTestImages(imageFilter);
     }
 

Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/PngMultipleRoundtripTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/PngMultipleRoundtripTest.java?rev=1391207&r1=1391206&r2=1391207&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/PngMultipleRoundtripTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/PngMultipleRoundtripTest.java Thu Sep 27 20:45:49 2012
@@ -48,7 +48,7 @@ public class PngMultipleRoundtripTest ex
 
             File lastFile = imageFile;
             for (int j = 0; j < 10; j++) {
-                Map readParams = new HashMap();
+                Map<String,Object> readParams = new HashMap<String,Object>();
                 // readParams.put(SanselanConstants.BUFFERED_IMAGE_FACTORY,
                 // new RgbBufferedImageFactory());
                 BufferedImage image = Imaging.getBufferedImage(lastFile,
@@ -59,7 +59,7 @@ public class PngMultipleRoundtripTest ex
                         + ".", ".png");
                 Debug.debug("tempFile", tempFile);
 
-                Map writeParams = new HashMap();
+                Map<String,Object> writeParams = new HashMap<String,Object>();
                 Imaging.writeImage(image, tempFile,
                         ImageFormat.IMAGE_FORMAT_PNG, writeParams);
 

Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/PngReadTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/PngReadTest.java?rev=1391207&r1=1391206&r2=1391207&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/PngReadTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/PngReadTest.java Thu Sep 27 20:45:49 2012
@@ -31,7 +31,7 @@ public class PngReadTest extends PngBase
     public void test() throws Exception {
         Debug.debug("start");
 
-        List images = getPngImages();
+        List<File> images = getPngImages();
         for (int i = 0; i < images.size(); i++) {
             if (i % 10 == 0)
                 Debug.purgeMemory();

Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/PngTextTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/PngTextTest.java?rev=1391207&r1=1391206&r2=1391207&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/PngTextTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/PngTextTest.java Thu Sep 27 20:45:49 2012
@@ -41,9 +41,9 @@ public class PngTextTest extends PngBase
                 BufferedImage.TYPE_INT_ARGB);
         srcImage.setRGB(0, 0, Color.red.getRGB());
 
-        Map writeParams = new HashMap();
+        Map<String,Object> writeParams = new HashMap<String,Object>();
 
-        List writeTexts = new ArrayList();
+        List<PngText> writeTexts = new ArrayList<PngText>();
         {
             String keyword = "a";
             String text = "b";
@@ -74,7 +74,7 @@ public class PngTextTest extends PngBase
         PngImageInfo imageInfo = (PngImageInfo) Imaging.getImageInfo(bytes);
         assertNotNull(imageInfo);
 
-        List readTexts = imageInfo.getTextChunks();
+        List<PngText> readTexts = imageInfo.getTextChunks();
         assertEquals(readTexts.size(), 3);
         for (int i = 0; i < readTexts.size(); i++) {
             PngText text = (PngText) readTexts.get(i);

Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/PngWriteForceTrueColorText.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/PngWriteForceTrueColorText.java?rev=1391207&r1=1391206&r2=1391207&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/PngWriteForceTrueColorText.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/PngWriteForceTrueColorText.java Thu Sep 27 20:45:49 2012
@@ -32,7 +32,7 @@ public class PngWriteForceTrueColorText 
 
     public void test() throws Exception {
 
-        List images = getPngImages();
+        List<File> images = getPngImages();
         for (int i = 0; i < images.size(); i++) {
             if (i % 10 == 0)
                 Debug.purgeMemory();
@@ -49,20 +49,20 @@ public class PngWriteForceTrueColorText 
                 // Boolean.TRUE);
 
                 BufferedImage image = Imaging.getBufferedImage(imageFile,
-                        new HashMap());
+                        new HashMap<String,Object>());
                 assertNotNull(image);
 
                 File outFile = createTempFile(imageFile.getName() + ".", ".gif");
                 // Debug.debug("outFile", outFile);
 
-                Map params = new HashMap();
+                Map<String,Object> params = new HashMap<String,Object>();
                 params.put(PngConstants.PARAM_KEY_PNG_FORCE_TRUE_COLOR,
                         Boolean.TRUE);
                 Imaging.writeImage(image, outFile,
                         ImageFormat.IMAGE_FORMAT_PNG, params);
 
                 BufferedImage image2 = Imaging.getBufferedImage(outFile,
-                        new HashMap());
+                        new HashMap<String,Object>());
             } catch (Exception e) {
                 Debug.debug("imageFile", imageFile);
                 throw e;

Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/PngWriteReadTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/PngWriteReadTest.java?rev=1391207&r1=1391206&r2=1391207&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/PngWriteReadTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/PngWriteReadTest.java Thu Sep 27 20:45:49 2012
@@ -125,7 +125,7 @@ public class PngWriteReadTest extends Im
             ImageReadException, ImageWriteException {
         BufferedImage srcImage = imageDataToBufferedImage(rawData);
 
-        Map writeParams = new HashMap();
+        Map<String,Object> writeParams = new HashMap<String,Object>();
         // writeParams.put(SanselanConstants.PARAM_KEY_FORMAT,
         // ImageFormat.IMAGE_FORMAT_PNG);
         // writeParams.put(PngConstants.PARAM_KEY_PNG_FORCE_TRUE_COLOR,

Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/rgbe/RgbeBaseTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/rgbe/RgbeBaseTest.java?rev=1391207&r1=1391206&r2=1391207&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/rgbe/RgbeBaseTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/rgbe/RgbeBaseTest.java Thu Sep 27 20:45:49 2012
@@ -38,7 +38,7 @@ public abstract class RgbeBaseTest exten
         }
     };
 
-    protected List getRgbeImages() throws IOException, ImageReadException {
+    protected List<File> getRgbeImages() throws IOException, ImageReadException {
         return getTestImages(IMAGE_FILTER);
     }
 }

Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/rgbe/RgbeReadTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/rgbe/RgbeReadTest.java?rev=1391207&r1=1391206&r2=1391207&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/rgbe/RgbeReadTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/rgbe/RgbeReadTest.java Thu Sep 27 20:45:49 2012
@@ -33,7 +33,7 @@ public class RgbeReadTest extends RgbeBa
             ImageWriteException {
         Debug.debug("start");
 
-        List images = getRgbeImages();
+        List<File> images = getRgbeImages();
 
         for (int i = 0; i < images.size(); i++) {
             if (i % 10 == 0) {

Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffBaseTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffBaseTest.java?rev=1391207&r1=1391206&r2=1391207&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffBaseTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffBaseTest.java Thu Sep 27 20:45:49 2012
@@ -40,7 +40,7 @@ public abstract class TiffBaseTest exten
         }
     };
 
-    protected List getTiffImages() throws IOException, ImageReadException {
+    protected List<File> getTiffImages() throws IOException, ImageReadException {
         return getTestImages(imageFilter);
     }
 

Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffCcittTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffCcittTest.java?rev=1391207&r1=1391206&r2=1391207&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffCcittTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffCcittTest.java Thu Sep 27 20:45:49 2012
@@ -171,7 +171,7 @@ public class TiffCcittTest extends TiffB
             }
 
             try {
-                HashMap params = new HashMap();
+                HashMap<String,Object> params = new HashMap<String,Object>();
                 params.put(ImagingConstants.PARAM_KEY_COMPRESSION,
                         TiffConstants.TIFF_COMPRESSION_CCITT_1D);
                 byte[] compressed = Imaging.writeImageToBytes(image,
@@ -190,7 +190,7 @@ public class TiffCcittTest extends TiffB
             }
 
             try {
-                HashMap params = new HashMap();
+                HashMap<String,Object> params = new HashMap<String,Object>();
                 params.put(ImagingConstants.PARAM_KEY_COMPRESSION,
                         TiffConstants.TIFF_COMPRESSION_CCITT_GROUP_3);
                 params.put(TiffConstants.PARAM_KEY_T4_OPTIONS, 0);
@@ -210,7 +210,7 @@ public class TiffCcittTest extends TiffB
             }
 
             try {
-                HashMap params = new HashMap();
+                HashMap<String,Object> params = new HashMap<String,Object>();
                 params.put(ImagingConstants.PARAM_KEY_COMPRESSION,
                         TiffConstants.TIFF_COMPRESSION_CCITT_GROUP_3);
                 params.put(TiffConstants.PARAM_KEY_T4_OPTIONS, 4);
@@ -230,7 +230,7 @@ public class TiffCcittTest extends TiffB
             }
 
             try {
-                HashMap params = new HashMap();
+                HashMap<String,Object> params = new HashMap<String,Object>();
                 params.put(ImagingConstants.PARAM_KEY_COMPRESSION,
                         TiffConstants.TIFF_COMPRESSION_CCITT_GROUP_3);
                 params.put(TiffConstants.PARAM_KEY_T4_OPTIONS, 1);
@@ -250,7 +250,7 @@ public class TiffCcittTest extends TiffB
             }
 
             try {
-                HashMap params = new HashMap();
+                HashMap<String,Object> params = new HashMap<String,Object>();
                 params.put(ImagingConstants.PARAM_KEY_COMPRESSION,
                         TiffConstants.TIFF_COMPRESSION_CCITT_GROUP_3);
                 params.put(TiffConstants.PARAM_KEY_T4_OPTIONS, 5);
@@ -270,7 +270,7 @@ public class TiffCcittTest extends TiffB
             }
 
             try {
-                HashMap params = new HashMap();
+                HashMap<String,Object> params = new HashMap<String,Object>();
                 params.put(ImagingConstants.PARAM_KEY_COMPRESSION,
                         TiffConstants.TIFF_COMPRESSION_CCITT_GROUP_4);
                 byte[] compressed = Imaging.writeImageToBytes(image,

Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffLzwTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffLzwTest.java?rev=1391207&r1=1391206&r2=1391207&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffLzwTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffLzwTest.java Thu Sep 27 20:45:49 2012
@@ -81,18 +81,18 @@ public class TiffLzwTest extends TiffBas
         }
 
         int LZW_MINIMUM_CODE_SIZE = 8;
-        final List codes = new ArrayList();
+        final List<Integer> codes = new ArrayList<Integer>();
         MyLzwCompressor.Listener compressionListener = new MyLzwCompressor.Listener() {
             public void dataCode(int code) {
-                codes.add(new Integer(code));
+                codes.add(code);
             }
 
             public void eoiCode(int code) {
-                codes.add(new Integer(code));
+                codes.add(code);
             }
 
             public void clearCode(int code) {
-                codes.add(new Integer(code));
+                codes.add(code);
             }
 
             public void init(int clearCode, int eoiCode) {
@@ -163,7 +163,7 @@ public class TiffLzwTest extends TiffBas
         Debug.debug();
 
         int LZW_MINIMUM_CODE_SIZE = 8;
-        final List codes = new ArrayList();
+        final List<Integer> codes = new ArrayList<Integer>();
 
         MyLzwDecompressor.Listener decompressionListener = new MyLzwDecompressor.Listener() {
 
@@ -172,7 +172,7 @@ public class TiffLzwTest extends TiffBas
                         + Integer.toHexString(code) + ") "
                         + Integer.toBinaryString(code) + ", index: "
                         + codes.size());
-                codes.add(new Integer(code));
+                codes.add(code);
             }
 
             public void init(int clearCode, int eoiCode) {

Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffReadTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffReadTest.java?rev=1391207&r1=1391206&r2=1391207&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffReadTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffReadTest.java Thu Sep 27 20:45:49 2012
@@ -29,7 +29,7 @@ import org.apache.commons.imaging.util.D
 public class TiffReadTest extends TiffBaseTest {
 
     public void test() throws Exception {
-        List images = getTiffImages();
+        List<File> images = getTiffImages();
         for (int i = 0; i < images.size(); i++) {
             if (i % 10 == 0)
                 Debug.purgeMemory();

Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffRoundtripTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffRoundtripTest.java?rev=1391207&r1=1391206&r2=1391207&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffRoundtripTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffRoundtripTest.java Thu Sep 27 20:45:49 2012
@@ -32,7 +32,7 @@ import org.apache.commons.imaging.util.D
 public class TiffRoundtripTest extends TiffBaseTest {
 
     public void test() throws Exception {
-        List images = getTiffImages();
+        List<File> images = getTiffImages();
         for (int i = 0; i < images.size(); i++) {
             if (i % 10 == 0)
                 Debug.purgeMemory();
@@ -50,7 +50,7 @@ public class TiffRoundtripTest extends T
             assertNotNull(image);
 
             File tempFile = createTempFile(imageFile.getName() + ".", ".tif");
-            Map params = new HashMap();
+            Map<String,Object> params = new HashMap<String,Object>();
             Imaging.writeImage(image, tempFile, ImageFormat.IMAGE_FORMAT_TIFF,
                     params);
             image = null;

Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/wbmp/WbmpBaseTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/wbmp/WbmpBaseTest.java?rev=1391207&r1=1391206&r2=1391207&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/wbmp/WbmpBaseTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/wbmp/WbmpBaseTest.java Thu Sep 27 20:45:49 2012
@@ -33,7 +33,7 @@ public abstract class WbmpBaseTest exten
         }
     };
 
-    protected List getWbmpImages() throws IOException, ImageReadException {
+    protected List<File> getWbmpImages() throws IOException, ImageReadException {
         return getTestImages(IMAGE_FILTER);
     }
 }

Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/wbmp/WbmpReadTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/wbmp/WbmpReadTest.java?rev=1391207&r1=1391206&r2=1391207&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/wbmp/WbmpReadTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/wbmp/WbmpReadTest.java Thu Sep 27 20:45:49 2012
@@ -31,7 +31,7 @@ public class WbmpReadTest extends WbmpBa
     public void test() throws Exception {
         Debug.debug("start");
 
-        List images = getWbmpImages();
+        List<File> images = getWbmpImages();
         for (int i = 0; i < images.size(); i++) {
             if (i % 10 == 0)
                 Debug.purgeMemory();
@@ -42,7 +42,7 @@ public class WbmpReadTest extends WbmpBa
             IImageMetadata metadata = Imaging.getMetadata(imageFile);
             // assertNotNull(metadata);
 
-            Map params = new HashMap();
+            Map<String,Object> params = new HashMap<String,Object>();
             ImageInfo imageInfo = Imaging.getImageInfo(imageFile, params);
             assertNotNull(imageInfo);
 

Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/xbm/XbmBaseTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/xbm/XbmBaseTest.java?rev=1391207&r1=1391206&r2=1391207&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/xbm/XbmBaseTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/xbm/XbmBaseTest.java Thu Sep 27 20:45:49 2012
@@ -34,7 +34,7 @@ public abstract class XbmBaseTest extend
         }
     };
 
-    protected List getXbmImages() throws IOException, ImageReadException {
+    protected List<File> getXbmImages() throws IOException, ImageReadException {
         return getTestImages(IMAGE_FILTER);
     }
 }

Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/xbm/XbmReadTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/xbm/XbmReadTest.java?rev=1391207&r1=1391206&r2=1391207&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/xbm/XbmReadTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/xbm/XbmReadTest.java Thu Sep 27 20:45:49 2012
@@ -31,7 +31,7 @@ public class XbmReadTest extends XbmBase
     public void test() throws Exception {
         Debug.debug("start");
 
-        List images = getXbmImages();
+        List<File> images = getXbmImages();
         for (int i = 0; i < images.size(); i++) {
             if (i % 10 == 0)
                 Debug.purgeMemory();
@@ -42,7 +42,7 @@ public class XbmReadTest extends XbmBase
             IImageMetadata metadata = Imaging.getMetadata(imageFile);
             // assertNotNull(metadata);
 
-            Map params = new HashMap();
+            Map<String,Object> params = new HashMap<String,Object>();
             ImageInfo imageInfo = Imaging.getImageInfo(imageFile, params);
             assertNotNull(imageInfo);
 

Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/xmp/XmpDumpTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/xmp/XmpDumpTest.java?rev=1391207&r1=1391206&r2=1391207&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/xmp/XmpDumpTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/xmp/XmpDumpTest.java Thu Sep 27 20:45:49 2012
@@ -27,7 +27,7 @@ import org.apache.commons.imaging.util.D
 public class XmpDumpTest extends ImagingTest {
 
     public void test() throws Exception {
-        List images = getTestImages();
+        List<File> images = getTestImages();
         for (int i = 0; i < images.size(); i++) {
             if (i % 10 == 0)
                 Debug.purgeMemory();

Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/xmp/XmpUpdateTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/xmp/XmpUpdateTest.java?rev=1391207&r1=1391206&r2=1391207&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/xmp/XmpUpdateTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/xmp/XmpUpdateTest.java Thu Sep 27 20:45:49 2012
@@ -31,7 +31,7 @@ import org.apache.commons.imaging.util.D
 public class XmpUpdateTest extends ImagingTest {
 
     public void test() throws Exception {
-        List images = getTestImages();
+        List<File> images = getTestImages();
         for (int i = 0; i < images.size(); i++) {
             if (i % 10 == 0)
                 Debug.purgeMemory();
@@ -77,7 +77,7 @@ public class XmpUpdateTest extends Imagi
 
             // ----
 
-            Map params = new HashMap();
+            Map<String,Object> params = new HashMap<String,Object>();
             params.put(PARAM_KEY_XMP_XML, xmpXml);
             Imaging.writeImage(image, tempFile, imageFormat, params);
 

Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/xpm/XpmBaseTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/xpm/XpmBaseTest.java?rev=1391207&r1=1391206&r2=1391207&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/xpm/XpmBaseTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/xpm/XpmBaseTest.java Thu Sep 27 20:45:49 2012
@@ -34,7 +34,7 @@ public abstract class XpmBaseTest extend
         }
     };
 
-    protected List getXpmImages() throws IOException, ImageReadException {
+    protected List<File> getXpmImages() throws IOException, ImageReadException {
         return getTestImages(IMAGE_FILTER);
     }
 }

Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/xpm/XpmReadTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/xpm/XpmReadTest.java?rev=1391207&r1=1391206&r2=1391207&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/xpm/XpmReadTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/xpm/XpmReadTest.java Thu Sep 27 20:45:49 2012
@@ -31,7 +31,7 @@ public class XpmReadTest extends XpmBase
     public void test() throws Exception {
         Debug.debug("start");
 
-        List images = getXpmImages();
+        List<File> images = getXpmImages();
         for (int i = 0; i < images.size(); i++) {
             if (i % 10 == 0)
                 Debug.purgeMemory();
@@ -42,7 +42,7 @@ public class XpmReadTest extends XpmBase
             IImageMetadata metadata = Imaging.getMetadata(imageFile);
             // assertNotNull(metadata);
 
-            Map params = new HashMap();
+            Map<String,Object> params = new HashMap<String,Object>();
             ImageInfo imageInfo = Imaging.getImageInfo(imageFile, params);
             assertNotNull(imageInfo);
 

Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/roundtrip/RoundtripTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/roundtrip/RoundtripTest.java?rev=1391207&r1=1391206&r2=1391207&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/roundtrip/RoundtripTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/roundtrip/RoundtripTest.java Thu Sep 27 20:45:49 2012
@@ -396,7 +396,7 @@ public class RoundtripTest extends Imagi
             File temp1 = createTempFile("pixeldensity.", "."
                     + formatInfo.format.getExtension());
             
-            Map params = new HashMap();
+            Map<String,Object> params = new HashMap<String,Object>();
             PixelDensity pixelDensity = PixelDensity.createFromPixelsPerInch(75, 150);
             params.put(ImagingConstants.PARAM_KEY_PIXEL_DENSITY, pixelDensity);
             Imaging.writeImage(testImage, temp1, formatInfo.format, params);
@@ -425,10 +425,10 @@ public class RoundtripTest extends Imagi
                 + formatInfo.format.getExtension());
         // Debug.debug("tempFile: " + tempFile.getName());
 
-        Map params = new HashMap();
+        Map<String,Object> params = new HashMap<String,Object>();
         Imaging.writeImage(testImage, temp1, formatInfo.format, params);
 
-        Map readParams = new HashMap();
+        Map<String,Object> readParams = new HashMap<String,Object>();
         readParams.put(ImagingConstants.BUFFERED_IMAGE_FACTORY,
                 new RgbBufferedImageFactory());
         BufferedImage image2 = Imaging.getBufferedImage(temp1, readParams);



Mime
View raw message