commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ebo...@apache.org
Subject svn commit: r1545891 [2/3] - in /commons/proper/imaging/trunk/src: main/java/org/apache/commons/imaging/ main/java/org/apache/commons/imaging/common/ main/java/org/apache/commons/imaging/formats/bmp/ main/java/org/apache/commons/imaging/formats/dcx/ ma...
Date Wed, 27 Nov 2013 00:51:21 GMT
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pnm/PpmWriter.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pnm/PpmWriter.java?rev=1545891&r1=1545890&r2=1545891&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pnm/PpmWriter.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pnm/PpmWriter.java Wed Nov 27 00:51:19 2013
@@ -29,7 +29,7 @@ public class PpmWriter extends PnmWriter
     }
 
     @Override
-    public void writeImage(final BufferedImage src, final OutputStream os, final Map<String,Object> params)
+    public void writeImage(final BufferedImage src, final OutputStream os, final Map<String, Object> params)
             throws ImageWriteException, IOException {
         // System.out.println
         // (b1 == 0x50 && b2 == 0x36)

Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/PsdImageParser.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/PsdImageParser.java?rev=1545891&r1=1545890&r2=1545891&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/PsdImageParser.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/PsdImageParser.java Wed Nov 27 00:51:19 2013
@@ -419,7 +419,7 @@ public class PsdImageParser extends Imag
     }
 
     @Override
-    public byte[] getICCProfileBytes(final ByteSource byteSource, final Map<String,Object> params)
+    public byte[] getICCProfileBytes(final ByteSource byteSource, final Map<String, Object> params)
             throws ImageReadException, IOException {
         final List<ImageResourceBlock> blocks = readImageResourceBlocks(byteSource,
                 new int[] { IMAGE_RESOURCE_ID_ICC_PROFILE, }, 1);
@@ -437,7 +437,7 @@ public class PsdImageParser extends Imag
     }
 
     @Override
-    public Dimension getImageSize(final ByteSource byteSource, final Map<String,Object> params)
+    public Dimension getImageSize(final ByteSource byteSource, final Map<String, Object> params)
             throws ImageReadException, IOException {
         final PsdHeaderInfo bhi = readHeader(byteSource);
         if (bhi == null) {
@@ -458,7 +458,7 @@ public class PsdImageParser extends Imag
     }
 
     @Override
-    public IImageMetadata getMetadata(final ByteSource byteSource, final Map<String,Object> params)
+    public IImageMetadata getMetadata(final ByteSource byteSource, final Map<String, Object> params)
             throws ImageReadException, IOException {
         return null;
     }
@@ -488,7 +488,7 @@ public class PsdImageParser extends Imag
     }
 
     @Override
-    public ImageInfo getImageInfo(final ByteSource byteSource, final Map<String,Object> params)
+    public ImageInfo getImageInfo(final ByteSource byteSource, final Map<String, Object> params)
             throws ImageReadException, IOException {
         final ImageContents imageContents = readImageContents(byteSource);
         // ImageContents imageContents = readImage(byteSource, false);
@@ -613,7 +613,7 @@ public class PsdImageParser extends Imag
     }
 
     @Override
-    public BufferedImage getBufferedImage(final ByteSource byteSource, final Map<String,Object> params)
+    public BufferedImage getBufferedImage(final ByteSource byteSource, final Map<String, Object> params)
             throws ImageReadException, IOException {
         final ImageContents imageContents = readImageContents(byteSource);
         // ImageContents imageContents = readImage(byteSource, false);
@@ -737,7 +737,7 @@ public class PsdImageParser extends Imag
      * @return Xmp Xml as String, if present. Otherwise, returns null.
      */
     @Override
-    public String getXmpXml(final ByteSource byteSource, final Map<String,Object> params)
+    public String getXmpXml(final ByteSource byteSource, final Map<String, Object> params)
             throws ImageReadException, IOException {
 
         final ImageContents imageContents = readImageContents(byteSource);

Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/rgbe/RgbeImageParser.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/rgbe/RgbeImageParser.java?rev=1545891&r1=1545890&r2=1545891&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/rgbe/RgbeImageParser.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/rgbe/RgbeImageParser.java Wed Nov 27 00:51:19 2013
@@ -73,7 +73,7 @@ public class RgbeImageParser extends Ima
     }
 
     @Override
-    public IImageMetadata getMetadata(final ByteSource byteSource, final Map<String,Object> params)
+    public IImageMetadata getMetadata(final ByteSource byteSource, final Map<String, Object> params)
             throws ImageReadException, IOException {
         final RgbeInfo info = new RgbeInfo(byteSource);
         boolean canThrow = false;
@@ -87,7 +87,7 @@ public class RgbeImageParser extends Ima
     }
 
     @Override
-    public ImageInfo getImageInfo(final ByteSource byteSource, final Map<String,Object> params)
+    public ImageInfo getImageInfo(final ByteSource byteSource, final Map<String, Object> params)
             throws ImageReadException, IOException {
         final RgbeInfo info = new RgbeInfo(byteSource);
         boolean canThrow = false;
@@ -107,7 +107,7 @@ public class RgbeImageParser extends Ima
     }
 
     @Override
-    public BufferedImage getBufferedImage(final ByteSource byteSource, final Map<String,Object> params)
+    public BufferedImage getBufferedImage(final ByteSource byteSource, final Map<String, Object> params)
             throws ImageReadException, IOException {
         final RgbeInfo info = new RgbeInfo(byteSource);
         boolean canThrow = false;
@@ -133,7 +133,7 @@ public class RgbeImageParser extends Ima
     }
 
     @Override
-    public Dimension getImageSize(final ByteSource byteSource, final Map<String,Object> params)
+    public Dimension getImageSize(final ByteSource byteSource, final Map<String, Object> params)
             throws ImageReadException, IOException {
         final RgbeInfo info = new RgbeInfo(byteSource);
         boolean canThrow = false;
@@ -147,7 +147,7 @@ public class RgbeImageParser extends Ima
     }
 
     @Override
-    public byte[] getICCProfileBytes(final ByteSource byteSource, final Map<String,Object> params)
+    public byte[] getICCProfileBytes(final ByteSource byteSource, final Map<String, Object> params)
             throws ImageReadException, IOException {
         return null;
     }
@@ -158,7 +158,7 @@ public class RgbeImageParser extends Ima
     }
 
     @Override
-    public String getXmpXml(final ByteSource byteSource, final Map<String,Object> params)
+    public String getXmpXml(final ByteSource byteSource, final Map<String, Object> params)
             throws ImageReadException, IOException {
         return null;
     }

Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/rgbe/RgbeInfo.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/rgbe/RgbeInfo.java?rev=1545891&r1=1545890&r2=1545891&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/rgbe/RgbeInfo.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/rgbe/RgbeInfo.java Wed Nov 27 00:51:19 2013
@@ -141,7 +141,7 @@ class RgbeInfo implements Closeable {
                     "Scan lines must be less than 32768 bytes long");
         }
 
-        final byte[] scanLineBytes = ByteConversions.toBytes((short)wd,
+        final byte[] scanLineBytes = ByteConversions.toBytes((short) wd,
                 ByteOrder.BIG_ENDIAN);
         final byte[] rgbe = new byte[wd * 4];
         final float[][] out = new float[3][wd * ht];

Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffDirectory.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffDirectory.java?rev=1545891&r1=1545890&r2=1545891&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffDirectory.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffDirectory.java Wed Nov 27 00:51:19 2013
@@ -145,11 +145,11 @@ public class TiffDirectory extends TiffE
 
     public BufferedImage getTiffImage(final ByteOrder byteOrder) throws ImageReadException,
             IOException {
-        final Map<String,Object> params = null;
+        final Map<String, Object> params = null;
         return getTiffImage(byteOrder, params);
     }
 
-    public BufferedImage getTiffImage(final ByteOrder byteOrder, final Map<String,Object> params)
+    public BufferedImage getTiffImage(final ByteOrder byteOrder, final Map<String, Object> params)
             throws ImageReadException, IOException {
         if (null == tiffImageData) {
             return null;

Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffElement.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffElement.java?rev=1545891&r1=1545890&r2=1545891&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffElement.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffElement.java Wed Nov 27 00:51:19 2013
@@ -25,7 +25,7 @@ public abstract class TiffElement {
         public int compare(final TiffElement e1, final TiffElement e2) {
             if (e1.offset < e2.offset) {
                 return -1;
-            } else if (e1.offset > e2.offset){
+            } else if (e1.offset > e2.offset) {
                 return 1;
             } else {
                 return 0;

Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffField.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffField.java?rev=1545891&r1=1545890&r2=1545891&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffField.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffField.java Wed Nov 27 00:51:19 2013
@@ -107,7 +107,7 @@ public class TiffField {
      * or its inlined value <= 4 bytes long encoded in the field's byte order.
      */
     public int getOffset() {
-        return (int)offset;
+        return (int) offset;
     }
 
     /**

Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImageParser.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImageParser.java?rev=1545891&r1=1545890&r2=1545891&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImageParser.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImageParser.java Wed Nov 27 00:51:19 2013
@@ -80,7 +80,7 @@ public class TiffImageParser extends Ima
     }
 
     @Override
-    public byte[] getICCProfileBytes(final ByteSource byteSource, final Map<String,Object> params)
+    public byte[] getICCProfileBytes(final ByteSource byteSource, final Map<String, Object> params)
             throws ImageReadException, IOException {
         final FormatCompliance formatCompliance = FormatCompliance.getDefault();
         final TiffContents contents = new TiffReader(isStrict(params))
@@ -92,7 +92,7 @@ public class TiffImageParser extends Ima
     }
 
     @Override
-    public Dimension getImageSize(final ByteSource byteSource, final Map<String,Object> params)
+    public Dimension getImageSize(final ByteSource byteSource, final Map<String, Object> params)
             throws ImageReadException, IOException {
         final FormatCompliance formatCompliance = FormatCompliance.getDefault();
         final TiffContents contents = new TiffReader(isStrict(params))
@@ -124,7 +124,7 @@ public class TiffImageParser extends Ima
     }
 
     @Override
-    public IImageMetadata getMetadata(final ByteSource byteSource, final Map<String,Object> params)
+    public IImageMetadata getMetadata(final ByteSource byteSource, final Map<String, Object> params)
             throws ImageReadException, IOException {
         final FormatCompliance formatCompliance = FormatCompliance.getDefault();
         final TiffReader tiffReader = new TiffReader(isStrict(params));
@@ -152,7 +152,7 @@ public class TiffImageParser extends Ima
     }
 
     @Override
-    public ImageInfo getImageInfo(final ByteSource byteSource, final Map<String,Object> params)
+    public ImageInfo getImageInfo(final ByteSource byteSource, final Map<String, Object> params)
             throws ImageReadException, IOException {
         final FormatCompliance formatCompliance = FormatCompliance.getDefault();
         final TiffContents contents = new TiffReader(isStrict(params))
@@ -311,7 +311,7 @@ public class TiffImageParser extends Ima
     }
 
     @Override
-    public String getXmpXml(final ByteSource byteSource, final Map<String,Object> params)
+    public String getXmpXml(final ByteSource byteSource, final Map<String, Object> params)
             throws ImageReadException, IOException {
         final FormatCompliance formatCompliance = FormatCompliance.getDefault();
         final TiffContents contents = new TiffReader(isStrict(params))
@@ -354,7 +354,7 @@ public class TiffImageParser extends Ima
             {
                 final FormatCompliance formatCompliance = FormatCompliance
                         .getDefault();
-                final Map<String,Object> params = null;
+                final Map<String, Object> params = null;
                 final TiffContents contents = new TiffReader(true).readContents(
                         byteSource, params, formatCompliance);
 
@@ -399,13 +399,13 @@ public class TiffImageParser extends Ima
     public FormatCompliance getFormatCompliance(final ByteSource byteSource)
             throws ImageReadException, IOException {
         final FormatCompliance formatCompliance = FormatCompliance.getDefault();
-        final Map<String,Object> params = null;
+        final Map<String, Object> params = null;
         new TiffReader(isStrict(params)).readContents(byteSource, params,
                 formatCompliance);
         return formatCompliance;
     }
 
-    public List<byte[]> collectRawImageData(final ByteSource byteSource, final Map<String,Object> params)
+    public List<byte[]> collectRawImageData(final ByteSource byteSource, final Map<String, Object> params)
             throws ImageReadException, IOException {
         final FormatCompliance formatCompliance = FormatCompliance.getDefault();
         final TiffContents contents = new TiffReader(isStrict(params))
@@ -460,7 +460,7 @@ public class TiffImageParser extends Ima
      * access operation.
      */
     @Override
-    public BufferedImage getBufferedImage(final ByteSource byteSource, final Map<String,Object> params)
+    public BufferedImage getBufferedImage(final ByteSource byteSource, final Map<String, Object> params)
             throws ImageReadException, IOException {
         final FormatCompliance formatCompliance = FormatCompliance.getDefault();
         final TiffReader reader = new TiffReader(isStrict(params));
@@ -501,18 +501,17 @@ public class TiffImageParser extends Ima
         if (params == null) {
             return null;
         }
-       
-        if(!params.containsKey(key)) {
+
+        if (!params.containsKey(key)) {
             return null;
         }
-        
+
         final Object obj = params.get(key);
-        
-        if(obj instanceof Integer){
-            return (Integer)obj;
+
+        if (obj instanceof Integer) {
+            return (Integer) obj;
         }
-        throw new ImageReadException(
-                "Non-Integer parameter "+key);
+        throw new ImageReadException("Non-Integer parameter "+key);
     }
     
     private Rectangle checkForSubImage(
@@ -556,7 +555,7 @@ public class TiffImageParser extends Ima
     }
     
     protected BufferedImage getBufferedImage(final TiffDirectory directory,
-            final ByteOrder byteOrder, final Map<String,Object> params) 
+            final ByteOrder byteOrder, final Map<String, Object> params) 
             throws ImageReadException, IOException
     {
         final List<TiffField> entries = directory.entries;
@@ -574,7 +573,7 @@ public class TiffImageParser extends Ima
         final int height = directory.getSingleFieldValue(
                 TiffTagConstants.TIFF_TAG_IMAGE_LENGTH);      
         Rectangle subImage = checkForSubImage(params);
-        if(subImage!=null){
+        if (subImage != null) {
             // Check for valid subimage specification. The following checks
             // are consistent with BufferedImage.getSubimage()
             if (subImage.width <= 0) {
@@ -583,27 +582,25 @@ public class TiffImageParser extends Ima
             if (subImage.height <= 0) {
                 throw new ImageReadException("negative or zero subimage height");
             }
-            if(subImage.x<0 || subImage.x>=width){
+            if (subImage.x < 0 || subImage.x >= width) {
                 throw new ImageReadException("subimage x is outside raster");
             }
-            if(subImage.x+subImage.width>width){
-                throw new ImageReadException(
-                        "subimage (x+width) is outside raster");
+            if (subImage.x + subImage.width > width) {
+                throw new ImageReadException("subimage (x+width) is outside raster");
             }
-            if(subImage.y<0 || subImage.y>=height){
+            if (subImage.y < 0 || subImage.y >= height) {
                 throw new ImageReadException("subimage y is outside raster");
             }
-            if(subImage.y+subImage.height>height){
-                throw new ImageReadException(
-                        "subimage (y+height) is outside raster");
-            }            
-            
+            if (subImage.y + subImage.height > height) {
+                throw new ImageReadException("subimage (y+height) is outside raster");
+            }
+
             // if the subimage is just the same thing as the whole
             // image, suppress the subimage processing
-            if(subImage.x==0 
-                    && subImage.y==0 
-                    && subImage.width==width 
-                    && subImage.height==height){
+            if (subImage.x == 0
+                    && subImage.y == 0
+                    && subImage.width == width
+                    && subImage.height == height) {
                 subImage = null;
             }
         }
@@ -748,7 +745,7 @@ public class TiffImageParser extends Ima
     }
 
     @Override
-    public void writeImage(final BufferedImage src, final OutputStream os, final Map<String,Object> params)
+    public void writeImage(final BufferedImage src, final OutputStream os, final Map<String, Object> params)
             throws ImageWriteException, IOException {
         new TiffImageWriterLossy().writeImage(src, os, params);
     }

Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffReader.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffReader.java?rev=1545891&r1=1545890&r2=1545891&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffReader.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffReader.java Wed Nov 27 00:51:19 2013
@@ -198,7 +198,7 @@ public class TiffReader extends BinaryFi
                             continue;
                         }
                     }
-                    value = byteSource.getBlock(offset, (int)valueLength);
+                    value = byteSource.getBlock(offset, (int) valueLength);
                 } else {
                     value = offsetBytes;
                 }
@@ -310,7 +310,7 @@ public class TiffReader extends BinaryFi
             this(null);
         }
 
-        public Collector(final Map<String,Object> params) {
+        public Collector(final Map<String, Object> params) {
             boolean tmpReadThumbnails = true;
             if (params != null && params.containsKey(PARAM_KEY_READ_THUMBNAILS)) {
                 tmpReadThumbnails = Boolean.TRUE.equals(params
@@ -386,7 +386,7 @@ public class TiffReader extends BinaryFi
 //        }
 //    }
 
-    public TiffContents readFirstDirectory(final ByteSource byteSource, final Map<String,Object> params,
+    public TiffContents readFirstDirectory(final ByteSource byteSource, final Map<String, Object> params,
             final boolean readImageData, final FormatCompliance formatCompliance)
             throws ImageReadException, IOException {
         final Collector collector = new FirstDirectoryCollector(readImageData);
@@ -412,7 +412,7 @@ public class TiffReader extends BinaryFi
         return contents;
     }
 
-    public TiffContents readContents(final ByteSource byteSource, final Map<String,Object> params,
+    public TiffContents readContents(final ByteSource byteSource, final Map<String, Object> params,
             final FormatCompliance formatCompliance) throws ImageReadException,
             IOException {
 
@@ -421,7 +421,7 @@ public class TiffReader extends BinaryFi
         return collector.getContents();
     }
 
-    public void read(final ByteSource byteSource, final Map<String,Object> params,
+    public void read(final ByteSource byteSource, final Map<String, Object> params,
             final FormatCompliance formatCompliance, final Listener listener)
             throws ImageReadException, IOException {
         // TiffContents contents =

Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/MicrosoftHdPhotoTagConstants.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/MicrosoftHdPhotoTagConstants.java?rev=1545891&r1=1545890&r2=1545891&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/MicrosoftHdPhotoTagConstants.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/MicrosoftHdPhotoTagConstants.java Wed Nov 27 00:51:19 2013
@@ -40,115 +40,115 @@ public interface MicrosoftHdPhotoTagCons
             "PixelFormat", 0xbc01, 16,
             TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN);
     BinaryConstant PIXEL_FORMAT_VALUE_BLACK_AND_WHITE =
-            TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte)0x05);
+            TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte) 0x05);
     BinaryConstant PIXEL_FORMAT_VALUE_8_BIT_GRAY =
-            TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte)0x08);
+            TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte) 0x08);
     BinaryConstant PIXEL_FORMAT_VALUE_16_BIT_BGR555 =
-            TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte)0x9);
+            TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte) 0x9);
     BinaryConstant PIXEL_FORMAT_VALUE_16_BIT_BGR565 =
-            TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte)0xa);
+            TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte) 0xa);
     BinaryConstant PIXEL_FORMAT_VALUE_16_BIT_GRAY =
-            TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte)0xb);
+            TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte) 0xb);
     BinaryConstant PIXEL_FORMAT_VALUE_24_BIT_BGR =
-            TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte)0xc);
+            TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte) 0xc);
     BinaryConstant PIXEL_FORMAT_VALUE_24_BIT_RGB =
-            TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte)0xd);
+            TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte) 0xd);
     BinaryConstant PIXEL_FORMAT_VALUE_32_BIT_BGR =
-            TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte)0xe);
+            TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte) 0xe);
     BinaryConstant PIXEL_FORMAT_VALUE_32_BIT_BGRA =
-            TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte)0xf);
+            TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte) 0xf);
     BinaryConstant PIXEL_FORMAT_VALUE_32_BIT_PBGRA =
-            TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte)0x10);
+            TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte) 0x10);
     BinaryConstant PIXEL_FORMAT_VALUE_32_BIT_GRAY_FLOAT =
-            TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte)0x11);
+            TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte) 0x11);
     BinaryConstant PIXEL_FORMAT_VALUE_48_BIT_RGB_FIXED_POINT =
-            TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte)0x12);
+            TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte) 0x12);
     BinaryConstant PIXEL_FORMAT_VALUE_32_BIT_BGR101010 =
-            TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte)0x13);
+            TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte) 0x13);
     BinaryConstant PIXEL_FORMAT_VALUE_48_BIT_RGB =
-            TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte)0x15);
+            TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte) 0x15);
     BinaryConstant PIXEL_FORMAT_VALUE_64_BIT_RGBA =
-            TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte)0x16);
+            TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte) 0x16);
     BinaryConstant PIXEL_FORMAT_VALUE_64_BIT_PRGBA =
-            TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte)0x17);
+            TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte) 0x17);
     BinaryConstant PIXEL_FORMAT_VALUE_96_BIT_RGB_FIXED_POINT =
-            TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte)0x18);
+            TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte) 0x18);
     BinaryConstant PIXEL_FORMAT_VALUE_128_BIT_RGBA_FLOAT =
-            TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte)0x19);
+            TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte) 0x19);
     BinaryConstant PIXEL_FORMAT_VALUE_128_BIT_PRGBA_FLOAT =
-            TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte)0x1a);
+            TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte) 0x1a);
     BinaryConstant PIXEL_FORMAT_VALUE_128_BIT_RGB_FLOAT =
-            TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte)0x1b);
+            TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte) 0x1b);
     BinaryConstant PIXEL_FORMAT_VALUE_32_BIT_CMYK =
-            TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte)0x1c);
+            TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte) 0x1c);
     BinaryConstant PIXEL_FORMAT_VALUE_64_BIT_RGBA_FIXED_POINT =
-            TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte)0x1d);
+            TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte) 0x1d);
     BinaryConstant PIXEL_FORMAT_VALUE_128_BIT_RGBA_FIXED_POINT =
-            TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte)0x1e);
+            TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte) 0x1e);
     BinaryConstant PIXEL_FORMAT_VALUE_64_BIT_CMYK =
-            TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte)0x1f);
+            TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte) 0x1f);
     BinaryConstant PIXEL_FORMAT_VALUE_24_BIT_3_CHANNELS =
-            TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte)0x20);
+            TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte) 0x20);
     BinaryConstant PIXEL_FORMAT_VALUE_32_BIT_4_CHANNELS =
-            TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte)0x21);
+            TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte) 0x21);
     BinaryConstant PIXEL_FORMAT_VALUE_40_BIT_5_CHANNELS =
-            TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte)0x22);
+            TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte) 0x22);
     BinaryConstant PIXEL_FORMAT_VALUE_48_BIT_6_CHANNELS =
-            TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte)0x23);
+            TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte) 0x23);
     BinaryConstant PIXEL_FORMAT_VALUE_56_BIT_7_CHANNELS =
-            TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte)0x24);
+            TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte) 0x24);
     BinaryConstant PIXEL_FORMAT_VALUE_64_BIT_8_CHANNELS =
-            TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte)0x25);
+            TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte) 0x25);
     BinaryConstant PIXEL_FORMAT_VALUE_48_BIT_3_CHANNELS =
-            TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte)0x26);
+            TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte) 0x26);
     BinaryConstant PIXEL_FORMAT_VALUE_64_BIT_4_CHANNELS =
-            TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte)0x27);
+            TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte) 0x27);
     BinaryConstant PIXEL_FORMAT_VALUE_80_BIT_5_CHANNELS =
-            TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte)0x28);
+            TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte) 0x28);
     BinaryConstant PIXEL_FORMAT_VALUE_96_BIT_6_CHANNELS =
-            TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte)0x29);
+            TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte) 0x29);
     BinaryConstant PIXEL_FORMAT_VALUE_112_BIT_7_CHANNELS =
-            TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte)0x2a);
+            TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte) 0x2a);
     BinaryConstant PIXEL_FORMAT_VALUE_128_BIT_8_CHANNELS =
-            TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte)0x2b);
+            TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte) 0x2b);
     BinaryConstant PIXEL_FORMAT_VALUE_40_BIT_CMYK_ALPHA =
-            TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte)0x2c);
+            TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte) 0x2c);
     BinaryConstant PIXEL_FORMAT_VALUE_80_BIT_CMYK_ALPHA =
-            TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte)0x2d);
+            TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte) 0x2d);
     BinaryConstant PIXEL_FORMAT_VALUE_32_BIT_3_CHANNELS_ALPHA =
-            TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte)0x2e);
+            TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte) 0x2e);
     BinaryConstant PIXEL_FORMAT_VALUE_40_BIT_4_CHANNELS_ALPHA =
-            TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte)0x2f);
+            TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte) 0x2f);
     BinaryConstant PIXEL_FORMAT_VALUE_48_BIT_5_CHANNELS_ALPHA =
-            TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte)0x30);
+            TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte) 0x30);
     BinaryConstant PIXEL_FORMAT_VALUE_56_BIT_6_CHANNELS_ALPHA =
-            TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte)0x31);
+            TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte) 0x31);
     BinaryConstant PIXEL_FORMAT_VALUE_64_BIT_7_CHANNELS_ALPHA =
-            TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte)0x32);
+            TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte) 0x32);
     BinaryConstant PIXEL_FORMAT_VALUE_72_BIT_8_CHANNELS_ALPHA =
-            TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte)0x33);
+            TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte) 0x33);
     BinaryConstant PIXEL_FORMAT_VALUE_64_BIT_3_CHANNELS_ALPHA =
-            TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte)0x34);
+            TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte) 0x34);
     BinaryConstant PIXEL_FORMAT_VALUE_80_BIT_4_CHANNELS_ALPHA =
-            TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte)0x35);
+            TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte) 0x35);
     BinaryConstant PIXEL_FORMAT_VALUE_96_BIT_5_CHANNELS_ALPHA =
-            TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte)0x36);
+            TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte) 0x36);
     BinaryConstant PIXEL_FORMAT_VALUE_112_BIT_6_CHANNELS_ALPHA =
-            TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte)0x37);
+            TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte) 0x37);
     BinaryConstant PIXEL_FORMAT_VALUE_128_BIT_7_CHANNELS_ALPHA =
-            TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte)0x38);
+            TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte) 0x38);
     BinaryConstant PIXEL_FORMAT_VALUE_144_BIT_8_CHANNELS_ALPHA =
-            TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte)0x39);
+            TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte) 0x39);
     BinaryConstant PIXEL_FORMAT_VALUE_64_BIT_RGBA_HALF =
-            TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte)0x3a);
+            TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte) 0x3a);
     BinaryConstant PIXEL_FORMAT_VALUE_48_BIT_RGB_HALF =
-            TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte)0x3b);
+            TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte) 0x3b);
     BinaryConstant PIXEL_FORMAT_VALUE_32_BIT_RGBE =
-            TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte)0x3d);
+            TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte) 0x3d);
     BinaryConstant PIXEL_FORMAT_VALUE_16_BIT_GRAY_HALF =
-            TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte)0x3e);
+            TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte) 0x3e);
     BinaryConstant PIXEL_FORMAT_VALUE_32_BIT_GRAY_FIXED_POINT =
-            TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte)0x3f);
+            TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte) 0x3f);
 
     TagInfoLong EXIF_TAG_TRANSFOMATION = new TagInfoLong(
             "Transfomation", 0xbc02, 1,

Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/fieldtypes/FieldTypeShort.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/fieldtypes/FieldTypeShort.java?rev=1545891&r1=1545890&r2=1545891&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/fieldtypes/FieldTypeShort.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/fieldtypes/FieldTypeShort.java Wed Nov 27 00:51:19 2013
@@ -39,7 +39,7 @@ public class FieldTypeShort extends Fiel
     @Override
     public byte[] writeData(final Object o, final ByteOrder byteOrder) throws ImageWriteException {
         if (o instanceof Short) {
-            return ByteConversions.toBytes(((Short)o).shortValue(), byteOrder);
+            return ByteConversions.toBytes(((Short) o).shortValue(), byteOrder);
         } else if (o instanceof short[]) {
             final short[] numbers = (short[]) o;
             return ByteConversions.toBytes(numbers, byteOrder);

Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffImageWriterBase.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffImageWriterBase.java?rev=1545891&r1=1545890&r2=1545891&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffImageWriterBase.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffImageWriterBase.java Wed Nov 27 00:51:19 2013
@@ -240,10 +240,10 @@ public abstract class TiffImageWriterBas
         // Debug.debug();
     }
 
-    public void writeImage(final BufferedImage src, final OutputStream os, Map<String,Object> params)
+    public void writeImage(final BufferedImage src, final OutputStream os, Map<String, Object> params)
             throws ImageWriteException, IOException {
         // make copy of params; we'll clear keys as we consume them.
-        params = new HashMap<String,Object>(params);
+        params = new HashMap<String, Object>(params);
 
         // clear format key.
         if (params.containsKey(PARAM_KEY_FORMAT)) {
@@ -282,7 +282,7 @@ public abstract class TiffImageWriterBas
             }
             params.remove(PARAM_KEY_COMPRESSION);
         }
-        final HashMap<String,Object> rawParams = new HashMap<String,Object>(params);
+        final HashMap<String, Object> rawParams = new HashMap<String, Object>(params);
         params.remove(PARAM_KEY_T4_OPTIONS);
         params.remove(PARAM_KEY_T6_OPTIONS);
         if (!params.isEmpty()) {
@@ -588,7 +588,7 @@ public abstract class TiffImageWriterBas
 
         bos.write2Bytes(42); // tiffVersion
 
-        bos.write4Bytes((int)offsetToFirstIFD);
+        bos.write4Bytes((int) offsetToFirstIFD);
     }
 
 }

Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffImageWriterLossless.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffImageWriterLossless.java?rev=1545891&r1=1545890&r2=1545891&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffImageWriterLossless.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffImageWriterLossless.java Wed Nov 27 00:51:19 2013
@@ -67,7 +67,7 @@ public class TiffImageWriterLossless ext
             IOException {
         try {
             final ByteSource byteSource = new ByteSourceArray(exifBytes);
-            final Map<String,Object> params = null;
+            final Map<String, Object> params = null;
             final FormatCompliance formatCompliance = FormatCompliance.getDefault();
             final TiffContents contents = new TiffReader(false).readContents(
                     byteSource, params, formatCompliance);
@@ -300,7 +300,7 @@ public class TiffImageWriterLossless ext
             final long outputLength) throws IOException, ImageWriteException {
         final TiffOutputDirectory rootDirectory = outputSet.getRootDirectory();
 
-        final byte[] output = new byte[(int)outputLength];
+        final byte[] output = new byte[(int) outputLength];
 
         // copy old data (including maker notes, etc.)
         System.arraycopy(exifBytes, 0, output, 0,

Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputDirectory.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputDirectory.java?rev=1545891&r1=1545890&r2=1545891&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputDirectory.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputDirectory.java Wed Nov 27 00:51:19 2013
@@ -482,7 +482,7 @@ public final class TiffOutputDirectory e
         if (nextDirectoryOffset == UNDEFINED_VALUE) {
             bos.write4Bytes(0);
         } else {
-            bos.write4Bytes((int)nextDirectoryOffset);
+            bos.write4Bytes((int) nextDirectoryOffset);
         }
     }
 

Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputField.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputField.java?rev=1545891&r1=1545890&r2=1545891&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputField.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputField.java Wed Nov 27 00:51:19 2013
@@ -89,7 +89,7 @@ public class TiffOutputField implements 
                 throw new ImageWriteException("Missing separate value item.");
             }
 
-            bos.write4Bytes((int)separateValueItem.getOffset());
+            bos.write4Bytes((int) separateValueItem.getOffset());
         }
     }
 

Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/wbmp/WbmpImageParser.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/wbmp/WbmpImageParser.java?rev=1545891&r1=1545890&r2=1545891&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/wbmp/WbmpImageParser.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/wbmp/WbmpImageParser.java Wed Nov 27 00:51:19 2013
@@ -73,13 +73,13 @@ public class WbmpImageParser extends Ima
     }
 
     @Override
-    public IImageMetadata getMetadata(final ByteSource byteSource, final Map<String,Object> params)
+    public IImageMetadata getMetadata(final ByteSource byteSource, final Map<String, Object> params)
             throws ImageReadException, IOException {
         return null;
     }
 
     @Override
-    public ImageInfo getImageInfo(final ByteSource byteSource, final Map<String,Object> params)
+    public ImageInfo getImageInfo(final ByteSource byteSource, final Map<String, Object> params)
             throws ImageReadException, IOException {
         final WbmpHeader wbmpHeader = readWbmpHeader(byteSource);
         return new ImageInfo("WBMP", 1, new ArrayList<String>(),
@@ -91,14 +91,14 @@ public class WbmpImageParser extends Ima
     }
 
     @Override
-    public Dimension getImageSize(final ByteSource byteSource, final Map<String,Object> params)
+    public Dimension getImageSize(final ByteSource byteSource, final Map<String, Object> params)
             throws ImageReadException, IOException {
         final WbmpHeader wbmpHeader = readWbmpHeader(byteSource);
         return new Dimension(wbmpHeader.width, wbmpHeader.height);
     }
 
     @Override
-    public byte[] getICCProfileBytes(final ByteSource byteSource, final Map<String,Object> params)
+    public byte[] getICCProfileBytes(final ByteSource byteSource, final Map<String, Object> params)
             throws ImageReadException, IOException {
         return null;
     }
@@ -219,7 +219,7 @@ public class WbmpImageParser extends Ima
 
     @Override
     public final BufferedImage getBufferedImage(final ByteSource byteSource,
-            final Map<String,Object> params) throws ImageReadException, IOException {
+            final Map<String, Object> params) throws ImageReadException, IOException {
         InputStream is = null;
         boolean canThrow = false;
         try {
@@ -234,10 +234,10 @@ public class WbmpImageParser extends Ima
     }
 
     @Override
-    public void writeImage(final BufferedImage src, final OutputStream os, Map<String,Object> params)
+    public void writeImage(final BufferedImage src, final OutputStream os, Map<String, Object> params)
             throws ImageWriteException, IOException {
         // make copy of params; we'll clear keys as we consume them.
-        params = (params == null) ? new HashMap<String,Object>() : new HashMap<String,Object>(params);
+        params = (params == null) ? new HashMap<String, Object>() : new HashMap<String, Object>(params);
 
         // clear format key.
         if (params.containsKey(PARAM_KEY_FORMAT)) {
@@ -290,7 +290,7 @@ public class WbmpImageParser extends Ima
      * @return Xmp Xml as String, if present. Otherwise, returns null.
      */
     @Override
-    public String getXmpXml(final ByteSource byteSource, final Map<String,Object> params)
+    public String getXmpXml(final ByteSource byteSource, final Map<String, Object> params)
             throws ImageReadException, IOException {
         return null;
     }

Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/xbm/XbmImageParser.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/xbm/XbmImageParser.java?rev=1545891&r1=1545890&r2=1545891&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/xbm/XbmImageParser.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/xbm/XbmImageParser.java Wed Nov 27 00:51:19 2013
@@ -79,13 +79,13 @@ public class XbmImageParser extends Imag
     }
 
     @Override
-    public IImageMetadata getMetadata(final ByteSource byteSource, final Map<String,Object> params)
+    public IImageMetadata getMetadata(final ByteSource byteSource, final Map<String, Object> params)
             throws ImageReadException, IOException {
         return null;
     }
 
     @Override
-    public ImageInfo getImageInfo(final ByteSource byteSource, final Map<String,Object> params)
+    public ImageInfo getImageInfo(final ByteSource byteSource, final Map<String, Object> params)
             throws ImageReadException, IOException {
         final XbmHeader xbmHeader = readXbmHeader(byteSource);
         return new ImageInfo("XBM", 1, new ArrayList<String>(),
@@ -96,14 +96,14 @@ public class XbmImageParser extends Imag
     }
 
     @Override
-    public Dimension getImageSize(final ByteSource byteSource, final Map<String,Object> params)
+    public Dimension getImageSize(final ByteSource byteSource, final Map<String, Object> params)
             throws ImageReadException, IOException {
         final XbmHeader xbmHeader = readXbmHeader(byteSource);
         return new Dimension(xbmHeader.width, xbmHeader.height);
     }
 
     @Override
-    public byte[] getICCProfileBytes(final ByteSource byteSource, final Map<String,Object> params)
+    public byte[] getICCProfileBytes(final ByteSource byteSource, final Map<String, Object> params)
             throws ImageReadException, IOException {
         return null;
     }
@@ -296,7 +296,7 @@ public class XbmImageParser extends Imag
 
     @Override
     public final BufferedImage getBufferedImage(final ByteSource byteSource,
-            final Map<String,Object> params) throws ImageReadException, IOException {
+            final Map<String, Object> params) throws ImageReadException, IOException {
         final XbmParseResult result = parseXbmHeader(byteSource);
         return readXbmImage(result.xbmHeader, result.cParser);
     }
@@ -327,10 +327,10 @@ public class XbmImageParser extends Imag
     }
 
     @Override
-    public void writeImage(final BufferedImage src, final OutputStream os, Map<String,Object> params)
+    public void writeImage(final BufferedImage src, final OutputStream os, Map<String, Object> params)
             throws ImageWriteException, IOException {
         // make copy of params; we'll clear keys as we consume them.
-        params = (params == null) ? new HashMap<String,Object>() : new HashMap<String,Object>(params);
+        params = (params == null) ? new HashMap<String, Object>() : new HashMap<String, Object>(params);
 
         // clear format key.
         if (params.containsKey(PARAM_KEY_FORMAT)) {
@@ -410,7 +410,7 @@ public class XbmImageParser extends Imag
      * @return Xmp Xml as String, if present. Otherwise, returns null.
      */
     @Override
-    public String getXmpXml(final ByteSource byteSource, final Map<String,Object> params)
+    public String getXmpXml(final ByteSource byteSource, final Map<String, Object> params)
             throws ImageReadException, IOException {
         return null;
     }

Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/xpm/XpmImageParser.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/xpm/XpmImageParser.java?rev=1545891&r1=1545890&r2=1545891&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/xpm/XpmImageParser.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/xpm/XpmImageParser.java Wed Nov 27 00:51:19 2013
@@ -138,13 +138,13 @@ public class XpmImageParser extends Imag
     }
 
     @Override
-    public IImageMetadata getMetadata(final ByteSource byteSource, final Map<String,Object> params)
+    public IImageMetadata getMetadata(final ByteSource byteSource, final Map<String, Object> params)
             throws ImageReadException, IOException {
         return null;
     }
 
     @Override
-    public ImageInfo getImageInfo(final ByteSource byteSource, final Map<String,Object> params)
+    public ImageInfo getImageInfo(final ByteSource byteSource, final Map<String, Object> params)
             throws ImageReadException, IOException {
         final XpmHeader xpmHeader = readXpmHeader(byteSource);
         boolean isTransparent = false;
@@ -170,14 +170,14 @@ public class XpmImageParser extends Imag
     }
 
     @Override
-    public Dimension getImageSize(final ByteSource byteSource, final Map<String,Object> params)
+    public Dimension getImageSize(final ByteSource byteSource, final Map<String, Object> params)
             throws ImageReadException, IOException {
         final XpmHeader xpmHeader = readXpmHeader(byteSource);
         return new Dimension(xpmHeader.width, xpmHeader.height);
     }
 
     @Override
-    public byte[] getICCProfileBytes(final ByteSource byteSource, final Map<String,Object> params)
+    public byte[] getICCProfileBytes(final ByteSource byteSource, final Map<String, Object> params)
             throws ImageReadException, IOException {
         return null;
     }
@@ -609,7 +609,7 @@ public class XpmImageParser extends Imag
 
     @Override
     public final BufferedImage getBufferedImage(final ByteSource byteSource,
-            final Map<String,Object> params) throws ImageReadException, IOException {
+            final Map<String, Object> params) throws ImageReadException, IOException {
         final XpmParseResult result = parseXpmHeader(byteSource);
         return readXpmImage(result.xpmHeader, result.cParser);
     }
@@ -655,10 +655,10 @@ public class XpmImageParser extends Imag
     }
 
     @Override
-    public void writeImage(final BufferedImage src, final OutputStream os, Map<String,Object> params)
+    public void writeImage(final BufferedImage src, final OutputStream os, Map<String, Object> params)
             throws ImageWriteException, IOException {
         // make copy of params; we'll clear keys as we consume them.
-        params = (params == null) ? new HashMap<String,Object>() : new HashMap<String,Object>(params);
+        params = (params == null) ? new HashMap<String, Object>() : new HashMap<String, Object>(params);
 
         // clear format key.
         if (params.containsKey(PARAM_KEY_FORMAT)) {
@@ -747,7 +747,7 @@ public class XpmImageParser extends Imag
      * @return Xmp Xml as String, if present. Otherwise, returns null.
      */
     @Override
-    public String getXmpXml(final ByteSource byteSource, final Map<String,Object> params)
+    public String getXmpXml(final ByteSource byteSource, final Map<String, Object> params)
             throws ImageReadException, IOException {
         return null;
     }

Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/palette/MedianCutMostPopulatedBoxesImplementation.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/palette/MedianCutMostPopulatedBoxesImplementation.java?rev=1545891&r1=1545890&r2=1545891&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/palette/MedianCutMostPopulatedBoxesImplementation.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/palette/MedianCutMostPopulatedBoxesImplementation.java Wed Nov 27 00:51:19 2013
@@ -87,7 +87,7 @@ public class MedianCutMostPopulatedBoxes
             final ColorGroup lowerGroup = new ColorGroup(lowerColors, ignoreAlpha);
             final ColorGroup upperGroup = new ColorGroup(upperColors, ignoreAlpha);
             final int diff = Math.abs(lowerGroup.totalPoints - upperGroup.totalPoints);
-            final double score = diff / (double)Math.max(lowerGroup.totalPoints, upperGroup.totalPoints);
+            final double score = diff / (double) Math.max(lowerGroup.totalPoints, upperGroup.totalPoints);
             if (score < bestScore) {
                 bestScore = score;
                 bestColorComponent = colorComponent;

Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/common/bytesource/ByteSourceImageTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/common/bytesource/ByteSourceImageTest.java?rev=1545891&r1=1545890&r2=1545891&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/common/bytesource/ByteSourceImageTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/common/bytesource/ByteSourceImageTest.java Wed Nov 27 00:51:19 2013
@@ -157,7 +157,7 @@ public class ByteSourceImageTest extends
     public void checkGetImageInfo(final File imageFile, final byte[] imageFileBytes)
             throws IOException, ImageReadException, IllegalAccessException,
             IllegalArgumentException, InvocationTargetException {
-        final Map<String,Object> params = new HashMap<String,Object>();
+        final Map<String, Object> params = new HashMap<String, Object>();
         final boolean ignoreImageData = isPhilHarveyTestImage(imageFile);
         final ImageFormat imageFormat = Imaging.guessFormat(imageFile);
         if (imageFormat.equals(ImageFormats.TIFF)

Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/examples/ApacheImagingSpeedAndMemoryTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/examples/ApacheImagingSpeedAndMemoryTest.java?rev=1545891&r1=1545890&r2=1545891&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/examples/ApacheImagingSpeedAndMemoryTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/examples/ApacheImagingSpeedAndMemoryTest.java Wed Nov 27 00:51:19 2013
@@ -212,7 +212,7 @@ public class ApacheImagingSpeedAndMemory
 
                 // ready the parser (you may modify this code block
                 // to use your parser of choice)
-                HashMap<String,Object> params = new HashMap<String,Object>();
+                HashMap<String, Object> params = new HashMap<String, Object>();
                 TiffImageParser tiffImageParser = new TiffImageParser();
 
                 // load the file and record time needed to do so

Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/examples/ImageReadExample.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/examples/ImageReadExample.java?rev=1545891&r1=1545890&r2=1545891&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/examples/ImageReadExample.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/examples/ImageReadExample.java Wed Nov 27 00:51:19 2013
@@ -34,7 +34,7 @@ import org.apache.commons.imaging.common
 public class ImageReadExample {
     public static BufferedImage imageReadExample(final File file)
             throws ImageReadException, IOException {
-        final Map<String,Object> params = new HashMap<String,Object>();
+        final Map<String, Object> params = new HashMap<String, Object>();
 
         // set optional parameters if you like
         params.put(ImagingConstants.BUFFERED_IMAGE_FACTORY,

Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/examples/ImageWriteExample.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/examples/ImageWriteExample.java?rev=1545891&r1=1545890&r2=1545891&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/examples/ImageWriteExample.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/examples/ImageWriteExample.java Wed Nov 27 00:51:19 2013
@@ -37,7 +37,7 @@ public class ImageWriteExample {
         final BufferedImage image = Imaging.getBufferedImage(file);
 
         final ImageFormat format = ImageFormats.TIFF;
-        final Map<String,Object> params = new HashMap<String,Object>();
+        final Map<String, Object> params = new HashMap<String, Object>();
 
         // set optional parameters if you like
         params.put(ImagingConstants.PARAM_KEY_COMPRESSION, new Integer(

Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/examples/SampleUsage.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/examples/SampleUsage.java?rev=1545891&r1=1545890&r2=1545891&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/examples/SampleUsage.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/examples/SampleUsage.java Wed Nov 27 00:51:19 2013
@@ -66,7 +66,7 @@ public class SampleUsage {
             final BufferedImage image = someImage;
             final File dst = someFile;
             final ImageFormat format = ImageFormats.PNG;
-            final Map<String,Object> optional_params = new HashMap<String,Object>();
+            final Map<String, Object> optional_params = new HashMap<String, Object>();
             Imaging.writeImage(image, dst, format, optional_params);
 
             final OutputStream os = someOutputStream;

Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/bmp/BmpReadTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/bmp/BmpReadTest.java?rev=1545891&r1=1545890&r2=1545891&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/bmp/BmpReadTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/bmp/BmpReadTest.java Wed Nov 27 00:51:19 2013
@@ -46,7 +46,7 @@ public class BmpReadTest extends BmpBase
             final IImageMetadata metadata = Imaging.getMetadata(imageFile);
             // assertNotNull(metadata);
 
-            final Map<String,Object> params = new HashMap<String,Object>();
+            final Map<String, Object> params = new HashMap<String, Object>();
             // params.put(PARAM_KEY_VERBOSE, Boolean.TRUE);
             final ImageInfo imageInfo = Imaging.getImageInfo(imageFile, params);
             assertNotNull(imageInfo);

Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/bmp/BmpRoundtripTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/bmp/BmpRoundtripTest.java?rev=1545891&r1=1545890&r2=1545891&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/bmp/BmpRoundtripTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/bmp/BmpRoundtripTest.java Wed Nov 27 00:51:19 2013
@@ -130,7 +130,7 @@ public class BmpRoundtripTest extends Bm
             ImageReadException, ImageWriteException {
         final BufferedImage srcImage = imageDataToBufferedImage(rawData);
 
-        final Map<String,Object> writeParams = new HashMap<String,Object>();
+        final Map<String, Object> writeParams = new HashMap<String, Object>();
         // writeParams.put(ImagingConstants.PARAM_KEY_FORMAT,
         // ImageFormat.IMAGE_FORMAT_BMP);
         // writeParams.put(PngConstants.PARAM_KEY_BMP_FORCE_TRUE_COLOR,

Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/dcx/DcxReadTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/dcx/DcxReadTest.java?rev=1545891&r1=1545890&r2=1545891&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/dcx/DcxReadTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/dcx/DcxReadTest.java Wed Nov 27 00:51:19 2013
@@ -46,7 +46,7 @@ public class DcxReadTest extends DcxBase
             final IImageMetadata metadata = Imaging.getMetadata(imageFile);
             // assertNotNull(metadata);
 
-            final Map<String,Object> params = new HashMap<String,Object>();
+            final Map<String, Object> params = new HashMap<String, Object>();
             final ImageInfo imageInfo = Imaging.getImageInfo(imageFile, params);
             // assertNotNull(imageInfo);
 

Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/icns/IcnsReadTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/icns/IcnsReadTest.java?rev=1545891&r1=1545890&r2=1545891&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/icns/IcnsReadTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/icns/IcnsReadTest.java Wed Nov 27 00:51:19 2013
@@ -46,7 +46,7 @@ public class IcnsReadTest extends IcnsBa
             final IImageMetadata metadata = Imaging.getMetadata(imageFile);
             // assertNotNull(metadata);
 
-            final Map<String,Object> params = new HashMap<String,Object>();
+            final Map<String, Object> params = new HashMap<String, Object>();
             final ImageInfo imageInfo = Imaging.getImageInfo(imageFile, params);
             assertNotNull(imageInfo);
 

Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/ico/IcoReadTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/ico/IcoReadTest.java?rev=1545891&r1=1545890&r2=1545891&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/ico/IcoReadTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/ico/IcoReadTest.java Wed Nov 27 00:51:19 2013
@@ -46,7 +46,7 @@ public class IcoReadTest extends IcoBase
             final IImageMetadata metadata = Imaging.getMetadata(imageFile);
             // assertNotNull(metadata);
 
-            final Map<String,Object> params = new HashMap<String,Object>();
+            final Map<String, Object> params = new HashMap<String, Object>();
             final ImageInfo imageInfo = Imaging.getImageInfo(imageFile, params);
             // assertNotNull(imageInfo);
 

Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/JpegReadTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/JpegReadTest.java?rev=1545891&r1=1545890&r2=1545891&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/JpegReadTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/JpegReadTest.java Wed Nov 27 00:51:19 2013
@@ -45,7 +45,7 @@ public class JpegReadTest extends JpegBa
             // ByteSource byteSource = new ByteSourceFile(imageFile);
             // new JpegUtils().dumpJFIF(byteSource);
 
-            final Map<String,Object> params = new HashMap<String,Object>();
+            final Map<String, Object> params = new HashMap<String, Object>();
             final 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/JpegWithJpegThumbnailTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/JpegWithJpegThumbnailTest.java?rev=1545891&r1=1545890&r2=1545891&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/JpegWithJpegThumbnailTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/JpegWithJpegThumbnailTest.java Wed Nov 27 00:51:19 2013
@@ -32,7 +32,7 @@ public class JpegWithJpegThumbnailTest e
     public void testSingleImage() throws Exception {
         final File imageFile = getTestImageByName("img_F028c_small.jpg");
 
-        final Map<String,Object> params = new HashMap<String,Object>();
+        final Map<String, Object> params = new HashMap<String, Object>();
         final IImageMetadata metadata = Imaging.getMetadata(imageFile, params);
         assertNotNull(metadata);
         final JpegImageMetadata jpegMetadata = (JpegImageMetadata) metadata;

Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/AsciiFieldTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/AsciiFieldTest.java?rev=1545891&r1=1545890&r2=1545891&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/AsciiFieldTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/AsciiFieldTest.java Wed Nov 27 00:51:19 2013
@@ -37,7 +37,7 @@ public class AsciiFieldTest extends Exif
     public void testSingleImage() throws Exception {
         final File imageFile = getTestImageByName("Canon Powershot SD750 - 2007.12.26.n.IMG_3704.JPG");
 
-        final Map<String,Object> params = new HashMap<String,Object>();
+        final Map<String, Object> params = new HashMap<String, Object>();
 
         final IImageMetadata metadata = Imaging.getMetadata(imageFile, params);
         assertNotNull(metadata);

Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/ExifDumpTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/ExifDumpTest.java?rev=1545891&r1=1545890&r2=1545891&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/ExifDumpTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/ExifDumpTest.java Wed Nov 27 00:51:19 2013
@@ -51,7 +51,7 @@ public class ExifDumpTest extends ExifBa
             Debug.debug("Segments:");
             new JpegUtils().dumpJFIF(byteSource);
 
-            final Map<String,Object> params = new HashMap<String,Object>();
+            final Map<String, Object> params = new HashMap<String, Object>();
             final 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/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=1545891&r1=1545890&r2=1545891&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 Wed Nov 27 00:51:19 2013
@@ -50,7 +50,7 @@ public class GpsTest extends ExifBaseTes
             }
 
             try {
-                final Map<String,Object> params = new HashMap<String,Object>();
+                final Map<String, Object> params = new HashMap<String, Object>();
                 final 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/MicrosoftTagTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/MicrosoftTagTest.java?rev=1545891&r1=1545890&r2=1545891&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/MicrosoftTagTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/MicrosoftTagTest.java Wed Nov 27 00:51:19 2013
@@ -46,7 +46,7 @@ public class MicrosoftTagTest extends Ex
         exif.add(MicrosoftTagConstants.EXIF_TAG_XPCOMMENT, COMMENT);
         exif.add(MicrosoftTagConstants.EXIF_TAG_XPSUBJECT, SUBJECT);
         exif.add(MicrosoftTagConstants.EXIF_TAG_XPTITLE, TITLE);
-        final Map<String,Object> params = new TreeMap<String,Object>();
+        final Map<String, Object> params = new TreeMap<String, Object>();
         params.put(TiffConstants.PARAM_KEY_EXIF, exifSet);
         final byte[] bytes = Imaging.writeImageToBytes(image, ImageFormats.TIFF, params);
         checkFields(bytes);

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=1545891&r1=1545890&r2=1545891&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 Wed Nov 27 00:51:19 2013
@@ -68,7 +68,7 @@ public abstract class SpecificExifTagTes
             ImageReadException, ImageWriteException {
         // Debug.debug("imageFile", imageFile.getAbsoluteFile());
 
-        final Map<String,Object> params = new HashMap<String,Object>();
+        final Map<String, Object> params = new HashMap<String, Object>();
         final 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/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=1545891&r1=1545890&r2=1545891&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 Wed Nov 27 00:51:19 2013
@@ -45,7 +45,7 @@ public class IptcDumpTest extends IptcBa
             // Debug.debug("Segments:");
             // new JpegUtils().dumpJFIF(byteSource);
 
-            final Map<String,Object> params = new HashMap<String,Object>();
+            final Map<String, Object> params = new HashMap<String, Object>();
             final boolean ignoreImageData = isPhilHarveyTestImage(imageFile);
             params.put(PARAM_KEY_READ_THUMBNAILS, new Boolean(!ignoreImageData));
             // params.put(PARAM_KEY_VERBOSE, Boolean.TRUE);

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=1545891&r1=1545890&r2=1545891&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 Wed Nov 27 00:51:19 2013
@@ -67,7 +67,7 @@ public class IptcUpdateTest extends Iptc
 
             final ByteSource byteSource = new ByteSourceFile(imageFile);
 
-            final Map<String,Object> params = new HashMap<String,Object>();
+            final Map<String, Object> params = new HashMap<String, Object>();
             final boolean ignoreImageData = isPhilHarveyTestImage(imageFile);
             params.put(PARAM_KEY_READ_THUMBNAILS, new Boolean(!ignoreImageData));
 
@@ -117,7 +117,7 @@ public class IptcUpdateTest extends Iptc
             // Debug.debug("Segments:");
             // new JpegUtils().dumpJFIF(byteSource);
 
-            final Map<String,Object> params = new HashMap<String,Object>();
+            final Map<String, Object> params = new HashMap<String, Object>();
             final boolean ignoreImageData = isPhilHarveyTestImage(imageFile);
             params.put(PARAM_KEY_READ_THUMBNAILS, new Boolean(!ignoreImageData));
             // params.put(PARAM_KEY_VERBOSE, Boolean.TRUE);
@@ -310,7 +310,7 @@ public class IptcUpdateTest extends Iptc
             // Debug.debug("Segments:");
             // new JpegUtils().dumpJFIF(byteSource);
 
-            final Map<String,Object> params = new HashMap<String,Object>();
+            final Map<String, Object> params = new HashMap<String, Object>();
             final 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/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=1545891&r1=1545890&r2=1545891&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 Wed Nov 27 00:51:19 2013
@@ -42,7 +42,7 @@ public class JpegXmpDumpTest extends Jpe
             Debug.debug();
 
             final ByteSource byteSource = new ByteSourceFile(imageFile);
-            final Map<String,Object> params = new HashMap<String,Object>();
+            final Map<String, Object> params = new HashMap<String, Object>();
             final 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=1545891&r1=1545890&r2=1545891&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 Wed Nov 27 00:51:19 2013
@@ -52,7 +52,7 @@ public class JpegXmpRewriteTest extends 
             // Debug.debug("Source Segments:");
             // new JpegUtils().dumpJFIF(byteSource);
 
-            final Map<String,Object> params = new HashMap<String,Object>();
+            final Map<String, Object> params = new HashMap<String, Object>();
             final String xmpXml = new JpegImageParser().getXmpXml(byteSource, params);
             assertNotNull(xmpXml);
 

Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/pam/PamReadTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/pam/PamReadTest.java?rev=1545891&r1=1545890&r2=1545891&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/pam/PamReadTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/pam/PamReadTest.java Wed Nov 27 00:51:19 2013
@@ -46,7 +46,7 @@ public class PamReadTest extends PamBase
             final IImageMetadata metadata = Imaging.getMetadata(imageFile);
             // assertNotNull(metadata);
 
-            final Map<String,Object> params = new HashMap<String,Object>();
+            final Map<String, Object> params = new HashMap<String, Object>();
             final ImageInfo imageInfo = Imaging.getImageInfo(imageFile, params);
             assertNotNull(imageInfo);
 

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=1545891&r1=1545890&r2=1545891&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 Wed Nov 27 00:51:19 2013
@@ -46,7 +46,7 @@ public class PcxReadTest extends PcxBase
             final IImageMetadata metadata = Imaging.getMetadata(imageFile);
             // assertNotNull(metadata);
 
-            final Map<String,Object> params = new HashMap<String,Object>();
+            final Map<String, Object> params = new HashMap<String, Object>();
             final 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=1545891&r1=1545890&r2=1545891&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 Wed Nov 27 00:51:19 2013
@@ -45,7 +45,7 @@ public class ConvertPngToGifTest extends
             // Debug.debug();
             }
 
-            final Hashtable<String,Object> params = new Hashtable<String,Object>();
+            final Hashtable<String, Object> params = new Hashtable<String, Object>();
             // params.put(ImagingConstants.PARAM_KEY_VERBOSE, Boolean.TRUE);
 
             final BufferedImage image = Imaging.getBufferedImage(imageFile, params);

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=1545891&r1=1545890&r2=1545891&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 Wed Nov 27 00:51:19 2013
@@ -50,7 +50,7 @@ public class PngMultipleRoundtripTest ex
 
             File lastFile = imageFile;
             for (int j = 0; j < 10; j++) {
-                final Map<String,Object> readParams = new HashMap<String,Object>();
+                final Map<String, Object> readParams = new HashMap<String, Object>();
                 // readParams.put(ImagingConstants.BUFFERED_IMAGE_FACTORY,
                 // new RgbBufferedImageFactory());
                 final BufferedImage image = Imaging.getBufferedImage(lastFile,
@@ -61,7 +61,7 @@ public class PngMultipleRoundtripTest ex
                         + ".", ".png");
                 Debug.debug("tempFile", tempFile);
 
-                final Map<String,Object> writeParams = new HashMap<String,Object>();
+                final Map<String, Object> writeParams = new HashMap<String, Object>();
                 Imaging.writeImage(image, tempFile,
                         ImageFormats.PNG, writeParams);
 

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=1545891&r1=1545890&r2=1545891&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 Wed Nov 27 00:51:19 2013
@@ -38,7 +38,7 @@ public class PngTextTest extends PngBase
                 BufferedImage.TYPE_INT_ARGB);
         srcImage.setRGB(0, 0, Color.red.getRGB());
 
-        final Map<String,Object> writeParams = new HashMap<String,Object>();
+        final Map<String, Object> writeParams = new HashMap<String, Object>();
 
         final List<PngText> writeTexts = new ArrayList<PngText>();
         {

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=1545891&r1=1545890&r2=1545891&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 Wed Nov 27 00:51:19 2013
@@ -51,20 +51,20 @@ public class PngWriteForceTrueColorText 
                 // Boolean.TRUE);
 
                 final BufferedImage image = Imaging.getBufferedImage(imageFile,
-                        new HashMap<String,Object>());
+                        new HashMap<String, Object>());
                 assertNotNull(image);
 
                 final File outFile = createTempFile(imageFile.getName() + ".", ".gif");
                 // Debug.debug("outFile", outFile);
 
-                final Map<String,Object> params = new HashMap<String,Object>();
+                final Map<String, Object> params = new HashMap<String, Object>();
                 params.put(PngConstants.PARAM_KEY_PNG_FORCE_TRUE_COLOR,
                         Boolean.TRUE);
                 Imaging.writeImage(image, outFile,
                         ImageFormats.PNG, params);
 
                 final BufferedImage image2 = Imaging.getBufferedImage(outFile,
-                        new HashMap<String,Object>());
+                        new HashMap<String, Object>());
             } catch (final 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=1545891&r1=1545890&r2=1545891&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 Wed Nov 27 00:51:19 2013
@@ -130,7 +130,7 @@ public class PngWriteReadTest extends Im
             ImageReadException, ImageWriteException {
         final BufferedImage srcImage = imageDataToBufferedImage(rawData);
 
-        final Map<String,Object> writeParams = new HashMap<String,Object>();
+        final Map<String, Object> writeParams = new HashMap<String, Object>();
         // writeParams.put(ImagingConstants.PARAM_KEY_FORMAT,
         // ImageFormat.IMAGE_FORMAT_PNG);
         // writeParams.put(PngConstants.PARAM_KEY_PNG_FORCE_TRUE_COLOR,



Mime
View raw message