commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mben...@apache.org
Subject svn commit: r1537328 - in /commons/proper/imaging/branches/IMAGING-120/src: main/java/org/apache/commons/imaging/ main/java/org/apache/commons/imaging/formats/bmp/ main/java/org/apache/commons/imaging/formats/dcx/ main/java/org/apache/commons/imaging/f...
Date Wed, 30 Oct 2013 22:12:16 GMT
Author: mbenson
Date: Wed Oct 30 22:12:15 2013
New Revision: 1537328

URL: http://svn.apache.org/r1537328
Log:
extract ImageFormat interface from ImageFormats enum

Added:
    commons/proper/imaging/branches/IMAGING-120/src/main/java/org/apache/commons/imaging/ImageFormat.java
Modified:
    commons/proper/imaging/branches/IMAGING-120/src/main/java/org/apache/commons/imaging/ImageFormats.java
    commons/proper/imaging/branches/IMAGING-120/src/main/java/org/apache/commons/imaging/ImageInfo.java
    commons/proper/imaging/branches/IMAGING-120/src/main/java/org/apache/commons/imaging/ImageParser.java
    commons/proper/imaging/branches/IMAGING-120/src/main/java/org/apache/commons/imaging/Imaging.java
    commons/proper/imaging/branches/IMAGING-120/src/main/java/org/apache/commons/imaging/formats/bmp/BmpImageParser.java
    commons/proper/imaging/branches/IMAGING-120/src/main/java/org/apache/commons/imaging/formats/dcx/DcxImageParser.java
    commons/proper/imaging/branches/IMAGING-120/src/main/java/org/apache/commons/imaging/formats/gif/GifImageParser.java
    commons/proper/imaging/branches/IMAGING-120/src/main/java/org/apache/commons/imaging/formats/icns/IcnsImageParser.java
    commons/proper/imaging/branches/IMAGING-120/src/main/java/org/apache/commons/imaging/formats/ico/IcoImageParser.java
    commons/proper/imaging/branches/IMAGING-120/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegImageParser.java
    commons/proper/imaging/branches/IMAGING-120/src/main/java/org/apache/commons/imaging/formats/pcx/PcxImageParser.java
    commons/proper/imaging/branches/IMAGING-120/src/main/java/org/apache/commons/imaging/formats/png/PngImageInfo.java
    commons/proper/imaging/branches/IMAGING-120/src/main/java/org/apache/commons/imaging/formats/png/PngImageParser.java
    commons/proper/imaging/branches/IMAGING-120/src/main/java/org/apache/commons/imaging/formats/pnm/FileInfo.java
    commons/proper/imaging/branches/IMAGING-120/src/main/java/org/apache/commons/imaging/formats/pnm/PamFileInfo.java
    commons/proper/imaging/branches/IMAGING-120/src/main/java/org/apache/commons/imaging/formats/pnm/PbmFileInfo.java
    commons/proper/imaging/branches/IMAGING-120/src/main/java/org/apache/commons/imaging/formats/pnm/PgmFileInfo.java
    commons/proper/imaging/branches/IMAGING-120/src/main/java/org/apache/commons/imaging/formats/pnm/PnmImageParser.java
    commons/proper/imaging/branches/IMAGING-120/src/main/java/org/apache/commons/imaging/formats/pnm/PpmFileInfo.java
    commons/proper/imaging/branches/IMAGING-120/src/main/java/org/apache/commons/imaging/formats/psd/PsdImageParser.java
    commons/proper/imaging/branches/IMAGING-120/src/main/java/org/apache/commons/imaging/formats/rgbe/RgbeImageParser.java
    commons/proper/imaging/branches/IMAGING-120/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImageParser.java
    commons/proper/imaging/branches/IMAGING-120/src/main/java/org/apache/commons/imaging/formats/wbmp/WbmpImageParser.java
    commons/proper/imaging/branches/IMAGING-120/src/main/java/org/apache/commons/imaging/formats/xbm/XbmImageParser.java
    commons/proper/imaging/branches/IMAGING-120/src/main/java/org/apache/commons/imaging/formats/xpm/XpmImageParser.java
    commons/proper/imaging/branches/IMAGING-120/src/test/java/org/apache/commons/imaging/ImagingGuessFormatTest.java
    commons/proper/imaging/branches/IMAGING-120/src/test/java/org/apache/commons/imaging/common/bytesource/ByteSourceImageTest.java
    commons/proper/imaging/branches/IMAGING-120/src/test/java/org/apache/commons/imaging/examples/ImageWriteExample.java
    commons/proper/imaging/branches/IMAGING-120/src/test/java/org/apache/commons/imaging/examples/SampleUsage.java
    commons/proper/imaging/branches/IMAGING-120/src/test/java/org/apache/commons/imaging/formats/bmp/BmpBaseTest.java
    commons/proper/imaging/branches/IMAGING-120/src/test/java/org/apache/commons/imaging/formats/dcx/DcxBaseTest.java
    commons/proper/imaging/branches/IMAGING-120/src/test/java/org/apache/commons/imaging/formats/gif/GifBaseTest.java
    commons/proper/imaging/branches/IMAGING-120/src/test/java/org/apache/commons/imaging/formats/icns/IcnsBaseTest.java
    commons/proper/imaging/branches/IMAGING-120/src/test/java/org/apache/commons/imaging/formats/jpeg/JpegBaseTest.java
    commons/proper/imaging/branches/IMAGING-120/src/test/java/org/apache/commons/imaging/formats/pam/PamBaseTest.java
    commons/proper/imaging/branches/IMAGING-120/src/test/java/org/apache/commons/imaging/formats/png/PngBaseTest.java
    commons/proper/imaging/branches/IMAGING-120/src/test/java/org/apache/commons/imaging/formats/psd/PsdBaseTest.java
    commons/proper/imaging/branches/IMAGING-120/src/test/java/org/apache/commons/imaging/formats/rgbe/RgbeBaseTest.java
    commons/proper/imaging/branches/IMAGING-120/src/test/java/org/apache/commons/imaging/formats/tiff/TiffBaseTest.java
    commons/proper/imaging/branches/IMAGING-120/src/test/java/org/apache/commons/imaging/formats/xmp/XmpUpdateTest.java
    commons/proper/imaging/branches/IMAGING-120/src/test/java/org/apache/commons/imaging/roundtrip/RoundtripTest.java

Added: commons/proper/imaging/branches/IMAGING-120/src/main/java/org/apache/commons/imaging/ImageFormat.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/branches/IMAGING-120/src/main/java/org/apache/commons/imaging/ImageFormat.java?rev=1537328&view=auto
==============================================================================
--- commons/proper/imaging/branches/IMAGING-120/src/main/java/org/apache/commons/imaging/ImageFormat.java (added)
+++ commons/proper/imaging/branches/IMAGING-120/src/main/java/org/apache/commons/imaging/ImageFormat.java Wed Oct 30 22:12:15 2013
@@ -0,0 +1,38 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.commons.imaging;
+
+/**
+ * Simple image format interface.
+ */
+public interface ImageFormat {
+
+    /**
+     * Get the name of this {@link ImageFormat}.
+     * 
+     * @return String name
+     */
+    String getName();
+
+    /**
+     * Get the file extension associated with this {@link ImageFormat}.
+     * 
+     * @return String extension
+     */
+    String getExtension();
+
+}

Modified: commons/proper/imaging/branches/IMAGING-120/src/main/java/org/apache/commons/imaging/ImageFormats.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/branches/IMAGING-120/src/main/java/org/apache/commons/imaging/ImageFormats.java?rev=1537328&r1=1537327&r2=1537328&view=diff
==============================================================================
--- commons/proper/imaging/branches/IMAGING-120/src/main/java/org/apache/commons/imaging/ImageFormats.java (original)
+++ commons/proper/imaging/branches/IMAGING-120/src/main/java/org/apache/commons/imaging/ImageFormats.java Wed Oct 30 22:12:15 2013
@@ -20,7 +20,7 @@ package org.apache.commons.imaging;
  * Enum of known image formats.
  */
 //@formatter:off
-public enum ImageFormats {
+public enum ImageFormats implements ImageFormat {
     UNKNOWN,
     BMP,
     DCX,
@@ -45,57 +45,63 @@ public enum ImageFormats {
     XPM;
 //@formatter:on
 
+    /**
+     * {@inheritDoc}
+     */
     public String getName() {
         return name();
     }
 
+    /**
+     * {@inheritDoc}
+     */
     public String getExtension() {
         return name();
     }
 
     @Deprecated
-    public static final ImageFormats IMAGE_FORMAT_UNKNOWN = UNKNOWN;
+    public static final ImageFormat IMAGE_FORMAT_UNKNOWN = UNKNOWN;
     @Deprecated
-    public static final ImageFormats IMAGE_FORMAT_BMP = BMP;
+    public static final ImageFormat IMAGE_FORMAT_BMP = BMP;
     @Deprecated
-    public static final ImageFormats IMAGE_FORMAT_DCX = DCX;
+    public static final ImageFormat IMAGE_FORMAT_DCX = DCX;
     @Deprecated
-    public static final ImageFormats IMAGE_FORMAT_GIF = GIF;
+    public static final ImageFormat IMAGE_FORMAT_GIF = GIF;
     @Deprecated
-    public static final ImageFormats IMAGE_FORMAT_ICNS = ICNS;
+    public static final ImageFormat IMAGE_FORMAT_ICNS = ICNS;
     @Deprecated
-    public static final ImageFormats IMAGE_FORMAT_ICO = ICO;
+    public static final ImageFormat IMAGE_FORMAT_ICO = ICO;
     @Deprecated
-    public static final ImageFormats IMAGE_FORMAT_JBIG2 = JBIG2;
+    public static final ImageFormat IMAGE_FORMAT_JBIG2 = JBIG2;
     @Deprecated
-    public static final ImageFormats IMAGE_FORMAT_JPEG = JPEG;
+    public static final ImageFormat IMAGE_FORMAT_JPEG = JPEG;
     @Deprecated
-    public static final ImageFormats IMAGE_FORMAT_PAM = PAM;
+    public static final ImageFormat IMAGE_FORMAT_PAM = PAM;
     @Deprecated
-    public static final ImageFormats IMAGE_FORMAT_PSD = PSD;
+    public static final ImageFormat IMAGE_FORMAT_PSD = PSD;
     @Deprecated
-    public static final ImageFormats IMAGE_FORMAT_PBM = PBM;
+    public static final ImageFormat IMAGE_FORMAT_PBM = PBM;
     @Deprecated
-    public static final ImageFormats IMAGE_FORMAT_PGM = PGM;
+    public static final ImageFormat IMAGE_FORMAT_PGM = PGM;
     @Deprecated
-    public static final ImageFormats IMAGE_FORMAT_PNM = PNM;
+    public static final ImageFormat IMAGE_FORMAT_PNM = PNM;
     @Deprecated
-    public static final ImageFormats IMAGE_FORMAT_PPM = PPM;
+    public static final ImageFormat IMAGE_FORMAT_PPM = PPM;
     @Deprecated
-    public static final ImageFormats IMAGE_FORMAT_PCX = PCX;
+    public static final ImageFormat IMAGE_FORMAT_PCX = PCX;
     @Deprecated
-    public static final ImageFormats IMAGE_FORMAT_PNG = PNG;
+    public static final ImageFormat IMAGE_FORMAT_PNG = PNG;
     @Deprecated
-    public static final ImageFormats IMAGE_FORMAT_RGBE = RGBE;
+    public static final ImageFormat IMAGE_FORMAT_RGBE = RGBE;
     @Deprecated
-    public static final ImageFormats IMAGE_FORMAT_TGA = TGA;
+    public static final ImageFormat IMAGE_FORMAT_TGA = TGA;
     @Deprecated
-    public static final ImageFormats IMAGE_FORMAT_TIFF = TIFF;
+    public static final ImageFormat IMAGE_FORMAT_TIFF = TIFF;
     @Deprecated
-    public static final ImageFormats IMAGE_FORMAT_WBMP = WBMP;
+    public static final ImageFormat IMAGE_FORMAT_WBMP = WBMP;
     @Deprecated
-    public static final ImageFormats IMAGE_FORMAT_XBM = XBM;
+    public static final ImageFormat IMAGE_FORMAT_XBM = XBM;
     @Deprecated
-    public static final ImageFormats IMAGE_FORMAT_XPM = XPM;
+    public static final ImageFormat IMAGE_FORMAT_XPM = XPM;
 
 }

Modified: commons/proper/imaging/branches/IMAGING-120/src/main/java/org/apache/commons/imaging/ImageInfo.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/branches/IMAGING-120/src/main/java/org/apache/commons/imaging/ImageInfo.java?rev=1537328&r1=1537327&r2=1537328&view=diff
==============================================================================
--- commons/proper/imaging/branches/IMAGING-120/src/main/java/org/apache/commons/imaging/ImageInfo.java (original)
+++ commons/proper/imaging/branches/IMAGING-120/src/main/java/org/apache/commons/imaging/ImageInfo.java Wed Oct 30 22:12:15 2013
@@ -31,7 +31,7 @@ public class ImageInfo {
     private final int bitsPerPixel;
     private final List<String> comments;
 
-    private final ImageFormats format;
+    private final ImageFormat format;
     private final String formatName;
     private final int height;
     private final String mimeType;
@@ -74,7 +74,7 @@ public class ImageInfo {
     private final String compressionAlgorithm;
 
     public ImageInfo(final String formatDetails, final int bitsPerPixel,
-            final List<String> comments, final ImageFormats format, final String formatName,
+            final List<String> comments, final ImageFormat format, final String formatName,
             final int height, final String mimeType, final int numberOfImages,
             final int physicalHeightDpi, final float physicalHeightInch,
             final int physicalWidthDpi, final float physicalWidthInch, final int width,
@@ -129,7 +129,7 @@ public class ImageInfo {
      * @return A constant defined in ImageFormat.
      * @see ImageFormats
      */
-    public ImageFormats getFormat() {
+    public ImageFormat getFormat() {
         return format;
     }
 

Modified: commons/proper/imaging/branches/IMAGING-120/src/main/java/org/apache/commons/imaging/ImageParser.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/branches/IMAGING-120/src/main/java/org/apache/commons/imaging/ImageParser.java?rev=1537328&r1=1537327&r2=1537328&view=diff
==============================================================================
--- commons/proper/imaging/branches/IMAGING-120/src/main/java/org/apache/commons/imaging/ImageParser.java (original)
+++ commons/proper/imaging/branches/IMAGING-120/src/main/java/org/apache/commons/imaging/ImageParser.java Wed Oct 30 22:12:15 2013
@@ -906,7 +906,7 @@ public abstract class ImageParser extend
      * accepted types
      * @return A valid array of one or more elements.
      */
-    protected abstract ImageFormats[] getAcceptedTypes();
+    protected abstract ImageFormat[] getAcceptedTypes();
 
     /**
      * Indicates whether the ImageParser implementation can accept
@@ -914,10 +914,10 @@ public abstract class ImageParser extend
      * @param type An instance of ImageFormat. 
      * @return If the parser can accept the format, true; otherwise, false.
      */
-    public boolean canAcceptType(final ImageFormats type) {
-        final ImageFormats types[] = getAcceptedTypes();
+    public boolean canAcceptType(final ImageFormat type) {
+        final ImageFormat types[] = getAcceptedTypes();
 
-        for (final ImageFormats type2 : types) {
+        for (final ImageFormat type2 : types) {
             if (type2.equals(type)) {
                 return true;
             }

Modified: commons/proper/imaging/branches/IMAGING-120/src/main/java/org/apache/commons/imaging/Imaging.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/branches/IMAGING-120/src/main/java/org/apache/commons/imaging/Imaging.java?rev=1537328&r1=1537327&r2=1537328&view=diff
==============================================================================
--- commons/proper/imaging/branches/IMAGING-120/src/main/java/org/apache/commons/imaging/Imaging.java (original)
+++ commons/proper/imaging/branches/IMAGING-120/src/main/java/org/apache/commons/imaging/Imaging.java Wed Oct 30 22:12:15 2013
@@ -147,7 +147,7 @@ public abstract class Imaging implements
      *         ImageFormat.IMAGE_FORMAT_UNKNOWN if the image type cannot be
      *         determined.
      */
-    public static ImageFormats guessFormat(final byte bytes[])
+    public static ImageFormat guessFormat(final byte bytes[])
             throws ImageReadException, IOException {
         return guessFormat(new ByteSourceArray(bytes));
     }
@@ -167,7 +167,7 @@ public abstract class Imaging implements
      *         ImageFormat.IMAGE_FORMAT_UNKNOWN if the image type cannot be
      *         determined.
      */
-    public static ImageFormats guessFormat(final File file) throws ImageReadException,
+    public static ImageFormat guessFormat(final File file) throws ImageReadException,
             IOException {
         return guessFormat(new ByteSourceFile(file));
     }
@@ -219,7 +219,7 @@ public abstract class Imaging implements
      * attempt to read the image data
      * @throws IOException in the event of an unrecoverable I/O condition.
      */
-    public static ImageFormats guessFormat(final ByteSource byteSource)
+    public static ImageFormat guessFormat(final ByteSource byteSource)
             throws ImageReadException, IOException {
         
         if (byteSource==null) {
@@ -707,7 +707,7 @@ public abstract class Imaging implements
 
     private static ImageParser getImageParser(final ByteSource byteSource)
             throws ImageReadException, IOException {
-        final ImageFormats format = guessFormat(byteSource);
+        final ImageFormat format = guessFormat(byteSource);
         if (!format.equals(ImageFormats.UNKNOWN)) {
 
             final ImageParser imageParsers[] = ImageParser.getAllImageParsers();
@@ -1403,7 +1403,7 @@ public abstract class Imaging implements
      * @see ImagingConstants
      */    
     public static void writeImage(final BufferedImage src, final File file,
-            final ImageFormats format, final Map<String,Object> params) throws ImageWriteException,
+            final ImageFormat format, final Map<String,Object> params) throws ImageWriteException,
             IOException {
         OutputStream os = null;
         boolean canThrow = false;
@@ -1443,7 +1443,7 @@ public abstract class Imaging implements
      * @see ImagingConstants
      */   
     public static byte[] writeImageToBytes(final BufferedImage src,
-            final ImageFormats format, final Map<String,Object> params) throws ImageWriteException,
+            final ImageFormat format, final Map<String,Object> params) throws ImageWriteException,
             IOException {
         final ByteArrayOutputStream os = new ByteArrayOutputStream();
 
@@ -1477,7 +1477,7 @@ public abstract class Imaging implements
      * @see ImagingConstants
      */    
     public static void writeImage(final BufferedImage src, final OutputStream os,
-            final ImageFormats format, Map<String,Object> params) throws ImageWriteException,
+            final ImageFormat format, Map<String,Object> params) throws ImageWriteException,
             IOException {
         final ImageParser imageParsers[] = ImageParser.getAllImageParsers();
 

Modified: commons/proper/imaging/branches/IMAGING-120/src/main/java/org/apache/commons/imaging/formats/bmp/BmpImageParser.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/branches/IMAGING-120/src/main/java/org/apache/commons/imaging/formats/bmp/BmpImageParser.java?rev=1537328&r1=1537327&r2=1537328&view=diff
==============================================================================
--- commons/proper/imaging/branches/IMAGING-120/src/main/java/org/apache/commons/imaging/formats/bmp/BmpImageParser.java (original)
+++ commons/proper/imaging/branches/IMAGING-120/src/main/java/org/apache/commons/imaging/formats/bmp/BmpImageParser.java Wed Oct 30 22:12:15 2013
@@ -30,6 +30,7 @@ import java.util.List;
 import java.util.Map;
 
 import org.apache.commons.imaging.FormatCompliance;
+import org.apache.commons.imaging.ImageFormat;
 import org.apache.commons.imaging.ImageFormats;
 import org.apache.commons.imaging.ImageInfo;
 import org.apache.commons.imaging.ImageParser;
@@ -79,8 +80,8 @@ public class BmpImageParser extends Imag
     }
 
     @Override
-    protected ImageFormats[] getAcceptedTypes() {
-        return new ImageFormats[] { ImageFormats.BMP, //
+    protected ImageFormat[] getAcceptedTypes() {
+        return new ImageFormat[] { ImageFormats.BMP, //
         };
     }
 
@@ -632,7 +633,7 @@ public class BmpImageParser extends Imag
         // TODO: comments...
 
         final int bitsPerPixel = bhi.bitsPerPixel;
-        final ImageFormats format = ImageFormats.BMP;
+        final ImageFormat format = ImageFormats.BMP;
         final String name = "BMP Windows Bitmap";
         final String mimeType = "image/x-ms-bmp";
         // we ought to count images, but don't yet.

Modified: commons/proper/imaging/branches/IMAGING-120/src/main/java/org/apache/commons/imaging/formats/dcx/DcxImageParser.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/branches/IMAGING-120/src/main/java/org/apache/commons/imaging/formats/dcx/DcxImageParser.java?rev=1537328&r1=1537327&r2=1537328&view=diff
==============================================================================
--- commons/proper/imaging/branches/IMAGING-120/src/main/java/org/apache/commons/imaging/formats/dcx/DcxImageParser.java (original)
+++ commons/proper/imaging/branches/IMAGING-120/src/main/java/org/apache/commons/imaging/formats/dcx/DcxImageParser.java Wed Oct 30 22:12:15 2013
@@ -28,6 +28,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import org.apache.commons.imaging.ImageFormat;
 import org.apache.commons.imaging.ImageFormats;
 import org.apache.commons.imaging.ImageInfo;
 import org.apache.commons.imaging.ImageParser;
@@ -69,8 +70,8 @@ public class DcxImageParser extends Imag
     }
 
     @Override
-    protected ImageFormats[] getAcceptedTypes() {
-        return new ImageFormats[] {
+    protected ImageFormat[] getAcceptedTypes() {
+        return new ImageFormat[] {
                 ImageFormats.DCX, //
         };
     }

Modified: commons/proper/imaging/branches/IMAGING-120/src/main/java/org/apache/commons/imaging/formats/gif/GifImageParser.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/branches/IMAGING-120/src/main/java/org/apache/commons/imaging/formats/gif/GifImageParser.java?rev=1537328&r1=1537327&r2=1537328&view=diff
==============================================================================
--- commons/proper/imaging/branches/IMAGING-120/src/main/java/org/apache/commons/imaging/formats/gif/GifImageParser.java (original)
+++ commons/proper/imaging/branches/IMAGING-120/src/main/java/org/apache/commons/imaging/formats/gif/GifImageParser.java Wed Oct 30 22:12:15 2013
@@ -31,6 +31,7 @@ import java.util.List;
 import java.util.Map;
 
 import org.apache.commons.imaging.FormatCompliance;
+import org.apache.commons.imaging.ImageFormat;
 import org.apache.commons.imaging.ImageFormats;
 import org.apache.commons.imaging.ImageInfo;
 import org.apache.commons.imaging.ImageParser;
@@ -74,8 +75,8 @@ public class GifImageParser extends Imag
     }
 
     @Override
-    protected ImageFormats[] getAcceptedTypes() {
-        return new ImageFormats[] { ImageFormats.GIF, //
+    protected ImageFormat[] getAcceptedTypes() {
+        return new ImageFormat[] { ImageFormats.GIF, //
         };
     }
 
@@ -564,7 +565,7 @@ public class GifImageParser extends Imag
 
         final List<String> comments = getComments(blocks.blocks);
         final int bitsPerPixel = (bhi.colorResolution + 1);
-        final ImageFormats format = ImageFormats.GIF;
+        final ImageFormat format = ImageFormats.GIF;
         final String formatName = "GIF Graphics Interchange Format";
         final String mimeType = "image/gif";
         // we ought to count images, but don't yet.

Modified: commons/proper/imaging/branches/IMAGING-120/src/main/java/org/apache/commons/imaging/formats/icns/IcnsImageParser.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/branches/IMAGING-120/src/main/java/org/apache/commons/imaging/formats/icns/IcnsImageParser.java?rev=1537328&r1=1537327&r2=1537328&view=diff
==============================================================================
--- commons/proper/imaging/branches/IMAGING-120/src/main/java/org/apache/commons/imaging/formats/icns/IcnsImageParser.java (original)
+++ commons/proper/imaging/branches/IMAGING-120/src/main/java/org/apache/commons/imaging/formats/icns/IcnsImageParser.java Wed Oct 30 22:12:15 2013
@@ -28,6 +28,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import org.apache.commons.imaging.ImageFormat;
 import org.apache.commons.imaging.ImageFormats;
 import org.apache.commons.imaging.ImageInfo;
 import org.apache.commons.imaging.ImageParser;
@@ -67,8 +68,8 @@ public class IcnsImageParser extends Ima
     }
 
     @Override
-    protected ImageFormats[] getAcceptedTypes() {
-        return new ImageFormats[] { ImageFormats.ICNS };
+    protected ImageFormat[] getAcceptedTypes() {
+        return new ImageFormat[] { ImageFormats.ICNS };
     }
 
     @Override

Modified: commons/proper/imaging/branches/IMAGING-120/src/main/java/org/apache/commons/imaging/formats/ico/IcoImageParser.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/branches/IMAGING-120/src/main/java/org/apache/commons/imaging/formats/ico/IcoImageParser.java?rev=1537328&r1=1537327&r2=1537328&view=diff
==============================================================================
--- commons/proper/imaging/branches/IMAGING-120/src/main/java/org/apache/commons/imaging/formats/ico/IcoImageParser.java (original)
+++ commons/proper/imaging/branches/IMAGING-120/src/main/java/org/apache/commons/imaging/formats/ico/IcoImageParser.java Wed Oct 30 22:12:15 2013
@@ -30,6 +30,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import org.apache.commons.imaging.ImageFormat;
 import org.apache.commons.imaging.ImageFormats;
 import org.apache.commons.imaging.ImageInfo;
 import org.apache.commons.imaging.ImageParser;
@@ -72,8 +73,8 @@ public class IcoImageParser extends Imag
     }
 
     @Override
-    protected ImageFormats[] getAcceptedTypes() {
-        return new ImageFormats[] { ImageFormats.ICO, //
+    protected ImageFormat[] getAcceptedTypes() {
+        return new ImageFormat[] { ImageFormats.ICO, //
         };
     }
 
@@ -534,7 +535,7 @@ public class IcoImageParser extends Imag
 
     private IconData readIconData(final byte[] iconData, final IconInfo fIconInfo)
             throws ImageReadException, IOException {
-        final ImageFormats imageFormat = Imaging.guessFormat(iconData);
+        final ImageFormat imageFormat = Imaging.guessFormat(iconData);
         if (imageFormat.equals(ImageFormats.PNG)) {
             final BufferedImage bufferedImage = Imaging.getBufferedImage(iconData);
             final PNGIconData pngIconData = new PNGIconData(fIconInfo, bufferedImage);

Modified: commons/proper/imaging/branches/IMAGING-120/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegImageParser.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/branches/IMAGING-120/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegImageParser.java?rev=1537328&r1=1537327&r2=1537328&view=diff
==============================================================================
--- commons/proper/imaging/branches/IMAGING-120/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegImageParser.java (original)
+++ commons/proper/imaging/branches/IMAGING-120/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegImageParser.java Wed Oct 30 22:12:15 2013
@@ -30,6 +30,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import org.apache.commons.imaging.ImageFormat;
 import org.apache.commons.imaging.ImageFormats;
 import org.apache.commons.imaging.ImageInfo;
 import org.apache.commons.imaging.ImageParser;
@@ -64,8 +65,8 @@ public class JpegImageParser extends Ima
     }
 
     @Override
-    protected ImageFormats[] getAcceptedTypes() {
-        return new ImageFormats[] { ImageFormats.JPEG, //
+    protected ImageFormat[] getAcceptedTypes() {
+        return new ImageFormat[] { ImageFormats.JPEG, //
         };
     }
 
@@ -783,7 +784,7 @@ public class JpegImageParser extends Ima
         final int Precision = fSOFNSegment.precision;
 
         final int BitsPerPixel = Number_of_components * Precision;
-        final ImageFormats Format = ImageFormats.JPEG;
+        final ImageFormat Format = ImageFormats.JPEG;
         final String FormatName = "JPEG (Joint Photographic Experts Group) Format";
         final String MimeType = "image/jpeg";
         // we ought to count images, but don't yet.

Modified: commons/proper/imaging/branches/IMAGING-120/src/main/java/org/apache/commons/imaging/formats/pcx/PcxImageParser.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/branches/IMAGING-120/src/main/java/org/apache/commons/imaging/formats/pcx/PcxImageParser.java?rev=1537328&r1=1537327&r2=1537328&view=diff
==============================================================================
--- commons/proper/imaging/branches/IMAGING-120/src/main/java/org/apache/commons/imaging/formats/pcx/PcxImageParser.java (original)
+++ commons/proper/imaging/branches/IMAGING-120/src/main/java/org/apache/commons/imaging/formats/pcx/PcxImageParser.java Wed Oct 30 22:12:15 2013
@@ -38,6 +38,7 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.Properties;
 
+import org.apache.commons.imaging.ImageFormat;
 import org.apache.commons.imaging.ImageFormats;
 import org.apache.commons.imaging.ImageInfo;
 import org.apache.commons.imaging.ImageParser;
@@ -84,8 +85,8 @@ public class PcxImageParser extends Imag
     }
 
     @Override
-    protected ImageFormats[] getAcceptedTypes() {
-        return new ImageFormats[] { ImageFormats.PCX, //
+    protected ImageFormat[] getAcceptedTypes() {
+        return new ImageFormat[] { ImageFormats.PCX, //
         };
     }
 

Modified: commons/proper/imaging/branches/IMAGING-120/src/main/java/org/apache/commons/imaging/formats/png/PngImageInfo.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/branches/IMAGING-120/src/main/java/org/apache/commons/imaging/formats/png/PngImageInfo.java?rev=1537328&r1=1537327&r2=1537328&view=diff
==============================================================================
--- commons/proper/imaging/branches/IMAGING-120/src/main/java/org/apache/commons/imaging/formats/png/PngImageInfo.java (original)
+++ commons/proper/imaging/branches/IMAGING-120/src/main/java/org/apache/commons/imaging/formats/png/PngImageInfo.java Wed Oct 30 22:12:15 2013
@@ -19,14 +19,14 @@ package org.apache.commons.imaging.forma
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.commons.imaging.ImageFormats;
+import org.apache.commons.imaging.ImageFormat;
 import org.apache.commons.imaging.ImageInfo;
 
 public class PngImageInfo extends ImageInfo {
     private final List<PngText> textChunks;
 
     public PngImageInfo(final String formatDetails, final int bitsPerPixel,
-            final List<String> comments, final ImageFormats format, final String formatName,
+            final List<String> comments, final ImageFormat format, final String formatName,
             final int height, final String mimeType, final int numberOfImages,
             final int physicalHeightDpi, final float physicalHeightInch,
             final int physicalWidthDpi, final float physicalWidthInch, final int width,

Modified: commons/proper/imaging/branches/IMAGING-120/src/main/java/org/apache/commons/imaging/formats/png/PngImageParser.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/branches/IMAGING-120/src/main/java/org/apache/commons/imaging/formats/png/PngImageParser.java?rev=1537328&r1=1537327&r2=1537328&view=diff
==============================================================================
--- commons/proper/imaging/branches/IMAGING-120/src/main/java/org/apache/commons/imaging/formats/png/PngImageParser.java (original)
+++ commons/proper/imaging/branches/IMAGING-120/src/main/java/org/apache/commons/imaging/formats/png/PngImageParser.java Wed Oct 30 22:12:15 2013
@@ -35,6 +35,7 @@ import java.util.Map;
 import java.util.zip.InflaterInputStream;
 
 import org.apache.commons.imaging.ColorTools;
+import org.apache.commons.imaging.ImageFormat;
 import org.apache.commons.imaging.ImageFormats;
 import org.apache.commons.imaging.ImageInfo;
 import org.apache.commons.imaging.ImageParser;
@@ -88,8 +89,8 @@ public class PngImageParser extends Imag
     }
 
     @Override
-    protected ImageFormats[] getAcceptedTypes() {
-        return new ImageFormats[] { ImageFormats.PNG, //
+    protected ImageFormat[] getAcceptedTypes() {
+        return new ImageFormat[] { ImageFormats.PNG, //
         };
     }
 
@@ -556,7 +557,7 @@ public class PngImageParser extends Imag
 
         final int BitsPerPixel = pngChunkIHDR.bitDepth
                 * samplesPerPixel(pngChunkIHDR.colorType);
-        final ImageFormats Format = ImageFormats.PNG;
+        final ImageFormat Format = ImageFormats.PNG;
         final String FormatName = "PNG Portable Network Graphics";
         final int Height = pngChunkIHDR.height;
         final String MimeType = "image/png";

Modified: commons/proper/imaging/branches/IMAGING-120/src/main/java/org/apache/commons/imaging/formats/pnm/FileInfo.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/branches/IMAGING-120/src/main/java/org/apache/commons/imaging/formats/pnm/FileInfo.java?rev=1537328&r1=1537327&r2=1537328&view=diff
==============================================================================
--- commons/proper/imaging/branches/IMAGING-120/src/main/java/org/apache/commons/imaging/formats/pnm/FileInfo.java (original)
+++ commons/proper/imaging/branches/IMAGING-120/src/main/java/org/apache/commons/imaging/formats/pnm/FileInfo.java Wed Oct 30 22:12:15 2013
@@ -19,7 +19,7 @@ package org.apache.commons.imaging.forma
 import java.io.IOException;
 import java.io.InputStream;
 
-import org.apache.commons.imaging.ImageFormats;
+import org.apache.commons.imaging.ImageFormat;
 import org.apache.commons.imaging.common.ImageBuilder;
 
 public abstract class FileInfo {
@@ -38,7 +38,7 @@ public abstract class FileInfo {
 
     public abstract int getBitDepth();
 
-    public abstract ImageFormats getImageType();
+    public abstract ImageFormat getImageType();
 
     public abstract String getImageTypeDescription();
 

Modified: commons/proper/imaging/branches/IMAGING-120/src/main/java/org/apache/commons/imaging/formats/pnm/PamFileInfo.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/branches/IMAGING-120/src/main/java/org/apache/commons/imaging/formats/pnm/PamFileInfo.java?rev=1537328&r1=1537327&r2=1537328&view=diff
==============================================================================
--- commons/proper/imaging/branches/IMAGING-120/src/main/java/org/apache/commons/imaging/formats/pnm/PamFileInfo.java (original)
+++ commons/proper/imaging/branches/IMAGING-120/src/main/java/org/apache/commons/imaging/formats/pnm/PamFileInfo.java Wed Oct 30 22:12:15 2013
@@ -20,6 +20,7 @@ package org.apache.commons.imaging.forma
 import java.io.IOException;
 import java.io.InputStream;
 
+import org.apache.commons.imaging.ImageFormat;
 import org.apache.commons.imaging.ImageFormats;
 import org.apache.commons.imaging.ImageInfo;
 import org.apache.commons.imaging.ImageReadException;
@@ -78,7 +79,7 @@ public class PamFileInfo extends FileInf
     }
 
     @Override
-    public ImageFormats getImageType() {
+    public ImageFormat getImageType() {
         return ImageFormats.PAM;
     }
 

Modified: commons/proper/imaging/branches/IMAGING-120/src/main/java/org/apache/commons/imaging/formats/pnm/PbmFileInfo.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/branches/IMAGING-120/src/main/java/org/apache/commons/imaging/formats/pnm/PbmFileInfo.java?rev=1537328&r1=1537327&r2=1537328&view=diff
==============================================================================
--- commons/proper/imaging/branches/IMAGING-120/src/main/java/org/apache/commons/imaging/formats/pnm/PbmFileInfo.java (original)
+++ commons/proper/imaging/branches/IMAGING-120/src/main/java/org/apache/commons/imaging/formats/pnm/PbmFileInfo.java Wed Oct 30 22:12:15 2013
@@ -19,6 +19,7 @@ package org.apache.commons.imaging.forma
 import java.io.IOException;
 import java.io.InputStream;
 
+import org.apache.commons.imaging.ImageFormat;
 import org.apache.commons.imaging.ImageFormats;
 import org.apache.commons.imaging.ImageInfo;
 
@@ -43,7 +44,7 @@ public class PbmFileInfo extends FileInf
     }
 
     @Override
-    public ImageFormats getImageType() {
+    public ImageFormat getImageType() {
         return ImageFormats.PBM;
     }
 

Modified: commons/proper/imaging/branches/IMAGING-120/src/main/java/org/apache/commons/imaging/formats/pnm/PgmFileInfo.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/branches/IMAGING-120/src/main/java/org/apache/commons/imaging/formats/pnm/PgmFileInfo.java?rev=1537328&r1=1537327&r2=1537328&view=diff
==============================================================================
--- commons/proper/imaging/branches/IMAGING-120/src/main/java/org/apache/commons/imaging/formats/pnm/PgmFileInfo.java (original)
+++ commons/proper/imaging/branches/IMAGING-120/src/main/java/org/apache/commons/imaging/formats/pnm/PgmFileInfo.java Wed Oct 30 22:12:15 2013
@@ -19,6 +19,7 @@ package org.apache.commons.imaging.forma
 import java.io.IOException;
 import java.io.InputStream;
 
+import org.apache.commons.imaging.ImageFormat;
 import org.apache.commons.imaging.ImageFormats;
 import org.apache.commons.imaging.ImageInfo;
 import org.apache.commons.imaging.ImageReadException;
@@ -62,7 +63,7 @@ public class PgmFileInfo extends FileInf
     }
 
     @Override
-    public ImageFormats getImageType() {
+    public ImageFormat getImageType() {
         return ImageFormats.PGM;
     }
 

Modified: commons/proper/imaging/branches/IMAGING-120/src/main/java/org/apache/commons/imaging/formats/pnm/PnmImageParser.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/branches/IMAGING-120/src/main/java/org/apache/commons/imaging/formats/pnm/PnmImageParser.java?rev=1537328&r1=1537327&r2=1537328&view=diff
==============================================================================
--- commons/proper/imaging/branches/IMAGING-120/src/main/java/org/apache/commons/imaging/formats/pnm/PnmImageParser.java (original)
+++ commons/proper/imaging/branches/IMAGING-120/src/main/java/org/apache/commons/imaging/formats/pnm/PnmImageParser.java Wed Oct 30 22:12:15 2013
@@ -29,6 +29,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.StringTokenizer;
 
+import org.apache.commons.imaging.ImageFormat;
 import org.apache.commons.imaging.ImageFormats;
 import org.apache.commons.imaging.ImageInfo;
 import org.apache.commons.imaging.ImageParser;
@@ -69,8 +70,8 @@ public class PnmImageParser extends Imag
     }
 
     @Override
-    protected ImageFormats[] getAcceptedTypes() {
-        return new ImageFormats[] {
+    protected ImageFormat[] getAcceptedTypes() {
+        return new ImageFormat[] {
                 ImageFormats.PBM, //
                 ImageFormats.PGM, //
                 ImageFormats.PPM, //
@@ -241,7 +242,7 @@ public class PnmImageParser extends Imag
         final List<String> Comments = new ArrayList<String>();
 
         final int BitsPerPixel = info.getBitDepth() * info.getNumComponents();
-        final ImageFormats Format = info.getImageType();
+        final ImageFormat Format = info.getImageType();
         final String FormatName = info.getImageTypeDescription();
         final String MimeType = info.getMIMEType();
         final int NumberOfImages = 1;

Modified: commons/proper/imaging/branches/IMAGING-120/src/main/java/org/apache/commons/imaging/formats/pnm/PpmFileInfo.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/branches/IMAGING-120/src/main/java/org/apache/commons/imaging/formats/pnm/PpmFileInfo.java?rev=1537328&r1=1537327&r2=1537328&view=diff
==============================================================================
--- commons/proper/imaging/branches/IMAGING-120/src/main/java/org/apache/commons/imaging/formats/pnm/PpmFileInfo.java (original)
+++ commons/proper/imaging/branches/IMAGING-120/src/main/java/org/apache/commons/imaging/formats/pnm/PpmFileInfo.java Wed Oct 30 22:12:15 2013
@@ -19,6 +19,7 @@ package org.apache.commons.imaging.forma
 import java.io.IOException;
 import java.io.InputStream;
 
+import org.apache.commons.imaging.ImageFormat;
 import org.apache.commons.imaging.ImageFormats;
 import org.apache.commons.imaging.ImageInfo;
 import org.apache.commons.imaging.ImageReadException;
@@ -62,7 +63,7 @@ public class PpmFileInfo extends FileInf
     }
 
     @Override
-    public ImageFormats getImageType() {
+    public ImageFormat getImageType() {
         return ImageFormats.PPM;
     }
 

Modified: commons/proper/imaging/branches/IMAGING-120/src/main/java/org/apache/commons/imaging/formats/psd/PsdImageParser.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/branches/IMAGING-120/src/main/java/org/apache/commons/imaging/formats/psd/PsdImageParser.java?rev=1537328&r1=1537327&r2=1537328&view=diff
==============================================================================
--- commons/proper/imaging/branches/IMAGING-120/src/main/java/org/apache/commons/imaging/formats/psd/PsdImageParser.java (original)
+++ commons/proper/imaging/branches/IMAGING-120/src/main/java/org/apache/commons/imaging/formats/psd/PsdImageParser.java Wed Oct 30 22:12:15 2013
@@ -28,6 +28,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
+import org.apache.commons.imaging.ImageFormat;
 import org.apache.commons.imaging.ImageFormats;
 import org.apache.commons.imaging.ImageInfo;
 import org.apache.commons.imaging.ImageParser;
@@ -74,8 +75,8 @@ public class PsdImageParser extends Imag
     }
 
     @Override
-    protected ImageFormats[] getAcceptedTypes() {
-        return new ImageFormats[] { ImageFormats.PSD, //
+    protected ImageFormat[] getAcceptedTypes() {
+        return new ImageFormat[] { ImageFormats.PSD, //
         };
     }
 
@@ -524,7 +525,7 @@ public class PsdImageParser extends Imag
         if (BitsPerPixel < 0) {
             BitsPerPixel = 0;
         }
-        final ImageFormats Format = ImageFormats.PSD;
+        final ImageFormat Format = ImageFormats.PSD;
         final String FormatName = "Photoshop";
         final String MimeType = "image/x-photoshop";
         // we ought to count images, but don't yet.

Modified: commons/proper/imaging/branches/IMAGING-120/src/main/java/org/apache/commons/imaging/formats/rgbe/RgbeImageParser.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/branches/IMAGING-120/src/main/java/org/apache/commons/imaging/formats/rgbe/RgbeImageParser.java?rev=1537328&r1=1537327&r2=1537328&view=diff
==============================================================================
--- commons/proper/imaging/branches/IMAGING-120/src/main/java/org/apache/commons/imaging/formats/rgbe/RgbeImageParser.java (original)
+++ commons/proper/imaging/branches/IMAGING-120/src/main/java/org/apache/commons/imaging/formats/rgbe/RgbeImageParser.java Wed Oct 30 22:12:15 2013
@@ -31,6 +31,7 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Map;
 
+import org.apache.commons.imaging.ImageFormat;
 import org.apache.commons.imaging.ImageFormats;
 import org.apache.commons.imaging.ImageInfo;
 import org.apache.commons.imaging.ImageParser;
@@ -67,8 +68,8 @@ public class RgbeImageParser extends Ima
     }
 
     @Override
-    protected ImageFormats[] getAcceptedTypes() {
-        return new ImageFormats[] { ImageFormats.RGBE };
+    protected ImageFormat[] getAcceptedTypes() {
+        return new ImageFormat[] { ImageFormats.RGBE };
     }
 
     @Override

Modified: commons/proper/imaging/branches/IMAGING-120/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImageParser.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/branches/IMAGING-120/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImageParser.java?rev=1537328&r1=1537327&r2=1537328&view=diff
==============================================================================
--- commons/proper/imaging/branches/IMAGING-120/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImageParser.java (original)
+++ commons/proper/imaging/branches/IMAGING-120/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImageParser.java Wed Oct 30 22:12:15 2013
@@ -29,6 +29,7 @@ import java.util.List;
 import java.util.Map;
 
 import org.apache.commons.imaging.FormatCompliance;
+import org.apache.commons.imaging.ImageFormat;
 import org.apache.commons.imaging.ImageFormats;
 import org.apache.commons.imaging.ImageInfo;
 import org.apache.commons.imaging.ImageParser;
@@ -78,8 +79,8 @@ public class TiffImageParser extends Ima
     }
 
     @Override
-    protected ImageFormats[] getAcceptedTypes() {
-        return new ImageFormats[] { ImageFormats.TIFF, //
+    protected ImageFormat[] getAcceptedTypes() {
+        return new ImageFormat[] { ImageFormats.TIFF, //
         };
     }
 
@@ -255,7 +256,7 @@ public class TiffImageParser extends Ima
             comments.add(comment);
         }
 
-        final ImageFormats format = ImageFormats.TIFF;
+        final ImageFormat format = ImageFormats.TIFF;
         final String formatName = "TIFF Tag-based Image File Format";
         final String mimeType = "image/tiff";
         final int numberOfImages = contents.directories.size();

Modified: commons/proper/imaging/branches/IMAGING-120/src/main/java/org/apache/commons/imaging/formats/wbmp/WbmpImageParser.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/branches/IMAGING-120/src/main/java/org/apache/commons/imaging/formats/wbmp/WbmpImageParser.java?rev=1537328&r1=1537327&r2=1537328&view=diff
==============================================================================
--- commons/proper/imaging/branches/IMAGING-120/src/main/java/org/apache/commons/imaging/formats/wbmp/WbmpImageParser.java (original)
+++ commons/proper/imaging/branches/IMAGING-120/src/main/java/org/apache/commons/imaging/formats/wbmp/WbmpImageParser.java Wed Oct 30 22:12:15 2013
@@ -32,6 +32,7 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.Properties;
 
+import org.apache.commons.imaging.ImageFormat;
 import org.apache.commons.imaging.ImageFormats;
 import org.apache.commons.imaging.ImageInfo;
 import org.apache.commons.imaging.ImageParser;
@@ -64,8 +65,8 @@ public class WbmpImageParser extends Ima
     }
 
     @Override
-    protected ImageFormats[] getAcceptedTypes() {
-        return new ImageFormats[] { ImageFormats.WBMP, //
+    protected ImageFormat[] getAcceptedTypes() {
+        return new ImageFormat[] { ImageFormats.WBMP, //
         };
     }
 

Modified: commons/proper/imaging/branches/IMAGING-120/src/main/java/org/apache/commons/imaging/formats/xbm/XbmImageParser.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/branches/IMAGING-120/src/main/java/org/apache/commons/imaging/formats/xbm/XbmImageParser.java?rev=1537328&r1=1537327&r2=1537328&view=diff
==============================================================================
--- commons/proper/imaging/branches/IMAGING-120/src/main/java/org/apache/commons/imaging/formats/xbm/XbmImageParser.java (original)
+++ commons/proper/imaging/branches/IMAGING-120/src/main/java/org/apache/commons/imaging/formats/xbm/XbmImageParser.java Wed Oct 30 22:12:15 2013
@@ -37,6 +37,7 @@ import java.util.Map.Entry;
 import java.util.Properties;
 import java.util.UUID;
 
+import org.apache.commons.imaging.ImageFormat;
 import org.apache.commons.imaging.ImageFormats;
 import org.apache.commons.imaging.ImageInfo;
 import org.apache.commons.imaging.ImageParser;
@@ -70,8 +71,8 @@ public class XbmImageParser extends Imag
     }
 
     @Override
-    protected ImageFormats[] getAcceptedTypes() {
-        return new ImageFormats[] { ImageFormats.XBM, //
+    protected ImageFormat[] getAcceptedTypes() {
+        return new ImageFormat[] { ImageFormats.XBM, //
         };
     }
 

Modified: commons/proper/imaging/branches/IMAGING-120/src/main/java/org/apache/commons/imaging/formats/xpm/XpmImageParser.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/branches/IMAGING-120/src/main/java/org/apache/commons/imaging/formats/xpm/XpmImageParser.java?rev=1537328&r1=1537327&r2=1537328&view=diff
==============================================================================
--- commons/proper/imaging/branches/IMAGING-120/src/main/java/org/apache/commons/imaging/formats/xpm/XpmImageParser.java (original)
+++ commons/proper/imaging/branches/IMAGING-120/src/main/java/org/apache/commons/imaging/formats/xpm/XpmImageParser.java Wed Oct 30 22:12:15 2013
@@ -40,6 +40,7 @@ import java.util.Map.Entry;
 import java.util.Properties;
 import java.util.UUID;
 
+import org.apache.commons.imaging.ImageFormat;
 import org.apache.commons.imaging.ImageFormats;
 import org.apache.commons.imaging.ImageInfo;
 import org.apache.commons.imaging.ImageParser;
@@ -120,8 +121,8 @@ public class XpmImageParser extends Imag
     }
 
     @Override
-    protected ImageFormats[] getAcceptedTypes() {
-        return new ImageFormats[] { ImageFormats.XPM, //
+    protected ImageFormat[] getAcceptedTypes() {
+        return new ImageFormat[] { ImageFormats.XPM, //
         };
     }
 

Modified: commons/proper/imaging/branches/IMAGING-120/src/test/java/org/apache/commons/imaging/ImagingGuessFormatTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/branches/IMAGING-120/src/test/java/org/apache/commons/imaging/ImagingGuessFormatTest.java?rev=1537328&r1=1537327&r2=1537328&view=diff
==============================================================================
--- commons/proper/imaging/branches/IMAGING-120/src/test/java/org/apache/commons/imaging/ImagingGuessFormatTest.java (original)
+++ commons/proper/imaging/branches/IMAGING-120/src/test/java/org/apache/commons/imaging/ImagingGuessFormatTest.java Wed Oct 30 22:12:15 2013
@@ -63,14 +63,14 @@ public class ImagingGuessFormatTest exte
         testGuess(ImageFormats.UNKNOWN, UNKNOWN_IMAGE_FILE);
     }
 
-    public void testGuess(final ImageFormats expectedFormat, String imagePath)
+    public void testGuess(final ImageFormat expectedFormat, String imagePath)
             throws Exception {
         imagePath = FilenameUtils.separatorsToSystem(imagePath);
         final File imageFile = new File(TEST_IMAGE_FOLDER, imagePath);
 
         assertTrue(imageFile.exists());
         assertTrue(imageFile.isFile());
-        final ImageFormats guessedFormat = Imaging.guessFormat(imageFile);
+        final ImageFormat guessedFormat = Imaging.guessFormat(imageFile);
         assertNotNull(guessedFormat);
         assertEquals(guessedFormat, expectedFormat);
     }

Modified: commons/proper/imaging/branches/IMAGING-120/src/test/java/org/apache/commons/imaging/common/bytesource/ByteSourceImageTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/branches/IMAGING-120/src/test/java/org/apache/commons/imaging/common/bytesource/ByteSourceImageTest.java?rev=1537328&r1=1537327&r2=1537328&view=diff
==============================================================================
--- commons/proper/imaging/branches/IMAGING-120/src/test/java/org/apache/commons/imaging/common/bytesource/ByteSourceImageTest.java (original)
+++ commons/proper/imaging/branches/IMAGING-120/src/test/java/org/apache/commons/imaging/common/bytesource/ByteSourceImageTest.java Wed Oct 30 22:12:15 2013
@@ -28,6 +28,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import org.apache.commons.imaging.ImageFormat;
 import org.apache.commons.imaging.ImageFormats;
 import org.apache.commons.imaging.ImageInfo;
 import org.apache.commons.imaging.ImageReadException;
@@ -84,7 +85,7 @@ public class ByteSourceImageTest extends
 
             checkGetImageSize(imageFile, imageFileBytes);
 
-            final ImageFormats imageFormat = Imaging.guessFormat(imageFile);
+            final ImageFormat imageFormat = Imaging.guessFormat(imageFile);
             if (ImageFormats.JPEG != imageFormat
                     && ImageFormats.UNKNOWN != imageFormat) {
                 checkGetBufferedImage(imageFile, imageFileBytes);
@@ -123,12 +124,12 @@ public class ByteSourceImageTest extends
     public void checkGuessFormat(final File imageFile, final byte[] imageFileBytes)
             throws Exception {
         // check guessFormat()
-        final ImageFormats imageFormatFile = Imaging.guessFormat(imageFile);
+        final ImageFormat imageFormatFile = Imaging.guessFormat(imageFile);
         assertNotNull(imageFormatFile);
         assertTrue(imageFormatFile != ImageFormats.UNKNOWN);
         // Debug.debug("imageFormatFile", imageFormatFile);
 
-        final ImageFormats imageFormatBytes = Imaging.guessFormat(imageFileBytes);
+        final ImageFormat imageFormatBytes = Imaging.guessFormat(imageFileBytes);
         assertNotNull(imageFormatBytes);
         assertTrue(imageFormatBytes != ImageFormats.UNKNOWN);
         // Debug.debug("imageFormatBytes", imageFormatBytes);
@@ -157,7 +158,7 @@ public class ByteSourceImageTest extends
             IllegalArgumentException, InvocationTargetException {
         final Map<String,Object> params = new HashMap<String,Object>();
         final boolean ignoreImageData = isPhilHarveyTestImage(imageFile);
-        final ImageFormats imageFormat = Imaging.guessFormat(imageFile);
+        final ImageFormat imageFormat = Imaging.guessFormat(imageFile);
         if (imageFormat.equals(ImageFormats.TIFF)
                 || imageFormat.equals(ImageFormats.JPEG)) {
             params.put(PARAM_KEY_READ_THUMBNAILS, new Boolean(!ignoreImageData));

Modified: commons/proper/imaging/branches/IMAGING-120/src/test/java/org/apache/commons/imaging/examples/ImageWriteExample.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/branches/IMAGING-120/src/test/java/org/apache/commons/imaging/examples/ImageWriteExample.java?rev=1537328&r1=1537327&r2=1537328&view=diff
==============================================================================
--- commons/proper/imaging/branches/IMAGING-120/src/test/java/org/apache/commons/imaging/examples/ImageWriteExample.java (original)
+++ commons/proper/imaging/branches/IMAGING-120/src/test/java/org/apache/commons/imaging/examples/ImageWriteExample.java Wed Oct 30 22:12:15 2013
@@ -22,6 +22,7 @@ import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
 
+import org.apache.commons.imaging.ImageFormat;
 import org.apache.commons.imaging.ImageFormats;
 import org.apache.commons.imaging.ImageReadException;
 import org.apache.commons.imaging.ImageWriteException;
@@ -35,7 +36,7 @@ public class ImageWriteExample {
         // read image
         final BufferedImage image = Imaging.getBufferedImage(file);
 
-        final ImageFormats format = ImageFormats.TIFF;
+        final ImageFormat format = ImageFormats.TIFF;
         final Map<String,Object> params = new HashMap<String,Object>();
 
         // set optional parameters if you like

Modified: commons/proper/imaging/branches/IMAGING-120/src/test/java/org/apache/commons/imaging/examples/SampleUsage.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/branches/IMAGING-120/src/test/java/org/apache/commons/imaging/examples/SampleUsage.java?rev=1537328&r1=1537327&r2=1537328&view=diff
==============================================================================
--- commons/proper/imaging/branches/IMAGING-120/src/test/java/org/apache/commons/imaging/examples/SampleUsage.java (original)
+++ commons/proper/imaging/branches/IMAGING-120/src/test/java/org/apache/commons/imaging/examples/SampleUsage.java Wed Oct 30 22:12:15 2013
@@ -26,6 +26,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.commons.imaging.FormatCompliance;
+import org.apache.commons.imaging.ImageFormat;
 import org.apache.commons.imaging.ImageFormats;
 import org.apache.commons.imaging.ImageInfo;
 import org.apache.commons.imaging.Imaging;
@@ -64,7 +65,7 @@ public class SampleUsage {
             // <b>Write an image. </b>
             final BufferedImage image = someImage;
             final File dst = someFile;
-            final ImageFormats format = ImageFormats.PNG;
+            final ImageFormat format = ImageFormats.PNG;
             final Map<String,Object> optional_params = new HashMap<String,Object>();
             Imaging.writeImage(image, dst, format, optional_params);
 
@@ -91,7 +92,7 @@ public class SampleUsage {
             }
 
             // <b>try to guess the image's format. </b>
-            final ImageFormats image_format = Imaging.guessFormat(imageBytes);
+            final ImageFormat image_format = Imaging.guessFormat(imageBytes);
             image_format.equals(ImageFormats.PNG);
 
             // <b>get all metadata stored in EXIF format (ie. from JPEG or

Modified: commons/proper/imaging/branches/IMAGING-120/src/test/java/org/apache/commons/imaging/formats/bmp/BmpBaseTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/branches/IMAGING-120/src/test/java/org/apache/commons/imaging/formats/bmp/BmpBaseTest.java?rev=1537328&r1=1537327&r2=1537328&view=diff
==============================================================================
--- commons/proper/imaging/branches/IMAGING-120/src/test/java/org/apache/commons/imaging/formats/bmp/BmpBaseTest.java (original)
+++ commons/proper/imaging/branches/IMAGING-120/src/test/java/org/apache/commons/imaging/formats/bmp/BmpBaseTest.java Wed Oct 30 22:12:15 2013
@@ -21,6 +21,7 @@ import java.io.File;
 import java.io.IOException;
 import java.util.List;
 
+import org.apache.commons.imaging.ImageFormat;
 import org.apache.commons.imaging.ImageFormats;
 import org.apache.commons.imaging.ImageReadException;
 import org.apache.commons.imaging.Imaging;
@@ -30,7 +31,7 @@ public abstract class BmpBaseTest extend
 
     private static boolean isBmp(final File file) throws IOException,
             ImageReadException {
-        final ImageFormats format = Imaging.guessFormat(file);
+        final ImageFormat format = Imaging.guessFormat(file);
         return format == ImageFormats.BMP;
     }
 

Modified: commons/proper/imaging/branches/IMAGING-120/src/test/java/org/apache/commons/imaging/formats/dcx/DcxBaseTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/branches/IMAGING-120/src/test/java/org/apache/commons/imaging/formats/dcx/DcxBaseTest.java?rev=1537328&r1=1537327&r2=1537328&view=diff
==============================================================================
--- commons/proper/imaging/branches/IMAGING-120/src/test/java/org/apache/commons/imaging/formats/dcx/DcxBaseTest.java (original)
+++ commons/proper/imaging/branches/IMAGING-120/src/test/java/org/apache/commons/imaging/formats/dcx/DcxBaseTest.java Wed Oct 30 22:12:15 2013
@@ -21,6 +21,7 @@ import java.io.File;
 import java.io.IOException;
 import java.util.List;
 
+import org.apache.commons.imaging.ImageFormat;
 import org.apache.commons.imaging.ImageFormats;
 import org.apache.commons.imaging.ImageReadException;
 import org.apache.commons.imaging.Imaging;
@@ -30,7 +31,7 @@ public abstract class DcxBaseTest extend
 
     private static boolean isDcx(final File file) throws IOException,
             ImageReadException {
-        final ImageFormats format = Imaging.guessFormat(file);
+        final ImageFormat format = Imaging.guessFormat(file);
         return format == ImageFormats.DCX;
     }
 

Modified: commons/proper/imaging/branches/IMAGING-120/src/test/java/org/apache/commons/imaging/formats/gif/GifBaseTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/branches/IMAGING-120/src/test/java/org/apache/commons/imaging/formats/gif/GifBaseTest.java?rev=1537328&r1=1537327&r2=1537328&view=diff
==============================================================================
--- commons/proper/imaging/branches/IMAGING-120/src/test/java/org/apache/commons/imaging/formats/gif/GifBaseTest.java (original)
+++ commons/proper/imaging/branches/IMAGING-120/src/test/java/org/apache/commons/imaging/formats/gif/GifBaseTest.java Wed Oct 30 22:12:15 2013
@@ -21,6 +21,7 @@ import java.io.File;
 import java.io.IOException;
 import java.util.List;
 
+import org.apache.commons.imaging.ImageFormat;
 import org.apache.commons.imaging.ImageFormats;
 import org.apache.commons.imaging.ImageReadException;
 import org.apache.commons.imaging.Imaging;
@@ -30,7 +31,7 @@ public abstract class GifBaseTest extend
 
     private static boolean isGif(final File file) throws IOException,
             ImageReadException {
-        final ImageFormats format = Imaging.guessFormat(file);
+        final ImageFormat format = Imaging.guessFormat(file);
         return format == ImageFormats.GIF;
     }
 

Modified: commons/proper/imaging/branches/IMAGING-120/src/test/java/org/apache/commons/imaging/formats/icns/IcnsBaseTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/branches/IMAGING-120/src/test/java/org/apache/commons/imaging/formats/icns/IcnsBaseTest.java?rev=1537328&r1=1537327&r2=1537328&view=diff
==============================================================================
--- commons/proper/imaging/branches/IMAGING-120/src/test/java/org/apache/commons/imaging/formats/icns/IcnsBaseTest.java (original)
+++ commons/proper/imaging/branches/IMAGING-120/src/test/java/org/apache/commons/imaging/formats/icns/IcnsBaseTest.java Wed Oct 30 22:12:15 2013
@@ -21,6 +21,7 @@ import java.io.File;
 import java.io.IOException;
 import java.util.List;
 
+import org.apache.commons.imaging.ImageFormat;
 import org.apache.commons.imaging.ImageFormats;
 import org.apache.commons.imaging.ImageReadException;
 import org.apache.commons.imaging.Imaging;
@@ -30,7 +31,7 @@ public abstract class IcnsBaseTest exten
 
     private static boolean isIcns(final File file) throws IOException,
             ImageReadException {
-        final ImageFormats format = Imaging.guessFormat(file);
+        final ImageFormat format = Imaging.guessFormat(file);
         return format == ImageFormats.ICNS;
     }
 

Modified: commons/proper/imaging/branches/IMAGING-120/src/test/java/org/apache/commons/imaging/formats/jpeg/JpegBaseTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/branches/IMAGING-120/src/test/java/org/apache/commons/imaging/formats/jpeg/JpegBaseTest.java?rev=1537328&r1=1537327&r2=1537328&view=diff
==============================================================================
--- commons/proper/imaging/branches/IMAGING-120/src/test/java/org/apache/commons/imaging/formats/jpeg/JpegBaseTest.java (original)
+++ commons/proper/imaging/branches/IMAGING-120/src/test/java/org/apache/commons/imaging/formats/jpeg/JpegBaseTest.java Wed Oct 30 22:12:15 2013
@@ -21,6 +21,7 @@ import java.io.File;
 import java.io.IOException;
 import java.util.List;
 
+import org.apache.commons.imaging.ImageFormat;
 import org.apache.commons.imaging.ImageFormats;
 import org.apache.commons.imaging.ImageReadException;
 import org.apache.commons.imaging.Imaging;
@@ -30,7 +31,7 @@ public abstract class JpegBaseTest exten
 
     protected static boolean isJpeg(final File file) throws IOException,
             ImageReadException {
-        final ImageFormats format = Imaging.guessFormat(file);
+        final ImageFormat format = Imaging.guessFormat(file);
         return format == ImageFormats.JPEG;
     }
 

Modified: commons/proper/imaging/branches/IMAGING-120/src/test/java/org/apache/commons/imaging/formats/pam/PamBaseTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/branches/IMAGING-120/src/test/java/org/apache/commons/imaging/formats/pam/PamBaseTest.java?rev=1537328&r1=1537327&r2=1537328&view=diff
==============================================================================
--- commons/proper/imaging/branches/IMAGING-120/src/test/java/org/apache/commons/imaging/formats/pam/PamBaseTest.java (original)
+++ commons/proper/imaging/branches/IMAGING-120/src/test/java/org/apache/commons/imaging/formats/pam/PamBaseTest.java Wed Oct 30 22:12:15 2013
@@ -21,6 +21,7 @@ import java.io.File;
 import java.io.IOException;
 import java.util.List;
 
+import org.apache.commons.imaging.ImageFormat;
 import org.apache.commons.imaging.ImageFormats;
 import org.apache.commons.imaging.ImageReadException;
 import org.apache.commons.imaging.Imaging;
@@ -30,7 +31,7 @@ public abstract class PamBaseTest extend
 
     private static boolean isPam(final File file) throws IOException,
             ImageReadException {
-        final ImageFormats format = Imaging.guessFormat(file);
+        final ImageFormat format = Imaging.guessFormat(file);
         return format == ImageFormats.PAM;
     }
 

Modified: commons/proper/imaging/branches/IMAGING-120/src/test/java/org/apache/commons/imaging/formats/png/PngBaseTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/branches/IMAGING-120/src/test/java/org/apache/commons/imaging/formats/png/PngBaseTest.java?rev=1537328&r1=1537327&r2=1537328&view=diff
==============================================================================
--- commons/proper/imaging/branches/IMAGING-120/src/test/java/org/apache/commons/imaging/formats/png/PngBaseTest.java (original)
+++ commons/proper/imaging/branches/IMAGING-120/src/test/java/org/apache/commons/imaging/formats/png/PngBaseTest.java Wed Oct 30 22:12:15 2013
@@ -21,6 +21,7 @@ import java.io.File;
 import java.io.IOException;
 import java.util.List;
 
+import org.apache.commons.imaging.ImageFormat;
 import org.apache.commons.imaging.ImageFormats;
 import org.apache.commons.imaging.ImageReadException;
 import org.apache.commons.imaging.Imaging;
@@ -30,7 +31,7 @@ public abstract class PngBaseTest extend
 
     private static boolean isPng(final File file) throws IOException,
             ImageReadException {
-        final ImageFormats format = Imaging.guessFormat(file);
+        final ImageFormat format = Imaging.guessFormat(file);
         return format == ImageFormats.PNG;
     }
 

Modified: commons/proper/imaging/branches/IMAGING-120/src/test/java/org/apache/commons/imaging/formats/psd/PsdBaseTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/branches/IMAGING-120/src/test/java/org/apache/commons/imaging/formats/psd/PsdBaseTest.java?rev=1537328&r1=1537327&r2=1537328&view=diff
==============================================================================
--- commons/proper/imaging/branches/IMAGING-120/src/test/java/org/apache/commons/imaging/formats/psd/PsdBaseTest.java (original)
+++ commons/proper/imaging/branches/IMAGING-120/src/test/java/org/apache/commons/imaging/formats/psd/PsdBaseTest.java Wed Oct 30 22:12:15 2013
@@ -20,6 +20,7 @@ import java.io.File;
 import java.io.IOException;
 import java.util.List;
 
+import org.apache.commons.imaging.ImageFormat;
 import org.apache.commons.imaging.ImageFormats;
 import org.apache.commons.imaging.ImageReadException;
 import org.apache.commons.imaging.Imaging;
@@ -28,7 +29,7 @@ import org.apache.commons.imaging.Imagin
 public abstract class PsdBaseTest extends ImagingTest {
     private static boolean isPsd(final File file) throws IOException,
             ImageReadException {
-        final ImageFormats format = Imaging.guessFormat(file);
+        final ImageFormat format = Imaging.guessFormat(file);
         return format == ImageFormats.PSD;
     }
 

Modified: commons/proper/imaging/branches/IMAGING-120/src/test/java/org/apache/commons/imaging/formats/rgbe/RgbeBaseTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/branches/IMAGING-120/src/test/java/org/apache/commons/imaging/formats/rgbe/RgbeBaseTest.java?rev=1537328&r1=1537327&r2=1537328&view=diff
==============================================================================
--- commons/proper/imaging/branches/IMAGING-120/src/test/java/org/apache/commons/imaging/formats/rgbe/RgbeBaseTest.java (original)
+++ commons/proper/imaging/branches/IMAGING-120/src/test/java/org/apache/commons/imaging/formats/rgbe/RgbeBaseTest.java Wed Oct 30 22:12:15 2013
@@ -20,6 +20,7 @@ import java.io.File;
 import java.io.IOException;
 import java.util.List;
 
+import org.apache.commons.imaging.ImageFormat;
 import org.apache.commons.imaging.ImageFormats;
 import org.apache.commons.imaging.ImageReadException;
 import org.apache.commons.imaging.Imaging;
@@ -28,7 +29,7 @@ import org.apache.commons.imaging.Imagin
 public abstract class RgbeBaseTest extends ImagingTest {
     private static boolean isRgbe(final File file) throws IOException,
             ImageReadException {
-        final ImageFormats format = Imaging.guessFormat(file);
+        final ImageFormat format = Imaging.guessFormat(file);
         return format == ImageFormats.RGBE;
     }
 

Modified: commons/proper/imaging/branches/IMAGING-120/src/test/java/org/apache/commons/imaging/formats/tiff/TiffBaseTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/branches/IMAGING-120/src/test/java/org/apache/commons/imaging/formats/tiff/TiffBaseTest.java?rev=1537328&r1=1537327&r2=1537328&view=diff
==============================================================================
--- commons/proper/imaging/branches/IMAGING-120/src/test/java/org/apache/commons/imaging/formats/tiff/TiffBaseTest.java (original)
+++ commons/proper/imaging/branches/IMAGING-120/src/test/java/org/apache/commons/imaging/formats/tiff/TiffBaseTest.java Wed Oct 30 22:12:15 2013
@@ -21,6 +21,7 @@ import java.io.File;
 import java.io.IOException;
 import java.util.List;
 
+import org.apache.commons.imaging.ImageFormat;
 import org.apache.commons.imaging.ImageFormats;
 import org.apache.commons.imaging.ImageReadException;
 import org.apache.commons.imaging.Imaging;
@@ -30,7 +31,7 @@ public abstract class TiffBaseTest exten
 
     private static boolean isTiff(final File file) throws IOException,
             ImageReadException {
-        final ImageFormats format = Imaging.guessFormat(file);
+        final ImageFormat format = Imaging.guessFormat(file);
         return format == ImageFormats.TIFF;
     }
 

Modified: commons/proper/imaging/branches/IMAGING-120/src/test/java/org/apache/commons/imaging/formats/xmp/XmpUpdateTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/branches/IMAGING-120/src/test/java/org/apache/commons/imaging/formats/xmp/XmpUpdateTest.java?rev=1537328&r1=1537327&r2=1537328&view=diff
==============================================================================
--- commons/proper/imaging/branches/IMAGING-120/src/test/java/org/apache/commons/imaging/formats/xmp/XmpUpdateTest.java (original)
+++ commons/proper/imaging/branches/IMAGING-120/src/test/java/org/apache/commons/imaging/formats/xmp/XmpUpdateTest.java Wed Oct 30 22:12:15 2013
@@ -23,6 +23,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import org.apache.commons.imaging.ImageFormat;
 import org.apache.commons.imaging.ImageFormats;
 import org.apache.commons.imaging.Imaging;
 import org.apache.commons.imaging.ImagingTest;
@@ -47,7 +48,7 @@ public class XmpUpdateTest extends Imagi
             Debug.debug("imageFile", imageFile);
             Debug.debug();
 
-            final ImageFormats imageFormat = Imaging.guessFormat(imageFile);
+            final ImageFormat imageFormat = Imaging.guessFormat(imageFile);
 
             String xmpXml = Imaging.getXmpXml(imageFile);
             if (null == xmpXml

Modified: commons/proper/imaging/branches/IMAGING-120/src/test/java/org/apache/commons/imaging/roundtrip/RoundtripTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/branches/IMAGING-120/src/test/java/org/apache/commons/imaging/roundtrip/RoundtripTest.java?rev=1537328&r1=1537327&r2=1537328&view=diff
==============================================================================
--- commons/proper/imaging/branches/IMAGING-120/src/test/java/org/apache/commons/imaging/roundtrip/RoundtripTest.java (original)
+++ commons/proper/imaging/branches/IMAGING-120/src/test/java/org/apache/commons/imaging/roundtrip/RoundtripTest.java Wed Oct 30 22:12:15 2013
@@ -23,6 +23,7 @@ import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
 
+import org.apache.commons.imaging.ImageFormat;
 import org.apache.commons.imaging.ImageFormats;
 import org.apache.commons.imaging.ImageInfo;
 import org.apache.commons.imaging.ImageReadException;
@@ -43,14 +44,14 @@ public class RoundtripTest extends Imagi
 
     private static class FormatInfo {
 
-        public final ImageFormats format;
+        public final ImageFormat format;
         public final boolean canRead;
         public final boolean canWrite;
         public final int colorSupport;
         public final boolean identicalSecondWrite;
         public final boolean preservesResolution;
 
-        public FormatInfo(final ImageFormats format, final boolean canRead,
+        public FormatInfo(final ImageFormat format, final boolean canRead,
                 final boolean canWrite, final int colorSupport,
                 final boolean identicalSecondWrite,
                 final boolean preservesResolution) {



Mime
View raw message