commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dam...@apache.org
Subject svn commit: r1326730 [1/2] - in /commons/proper/imaging/trunk: ./ src/main/java/org/apache/commons/imaging/ src/main/java/org/apache/commons/imaging/formats/ico/ src/main/java/org/apache/commons/imaging/formats/jpeg/ src/main/java/org/apache/commons/im...
Date Mon, 16 Apr 2012 18:33:29 GMT
Author: damjan
Date: Mon Apr 16 18:33:26 2012
New Revision: 1326730

URL: http://svn.apache.org/viewvc?rev=1326730&view=rev
Log:
Rename some internal files to Commons Imaging.


Added:
    commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/Imaging.java   (contents, props changed)
      - copied, changed from r1326686, commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/Sanselan.java
    commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/ImagingConstants.java   (contents, props changed)
      - copied, changed from r1326686, commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/SanselanConstants.java
    commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/ImagingException.java   (contents, props changed)
      - copied, changed from r1326686, commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/SanselanException.java
    commons/proper/imaging/trunk/src/main/resources/org/apache/commons/imaging/
      - copied from r1326686, commons/proper/imaging/trunk/src/main/resources/org/apache/commons/sanselan/
    commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/ImagingGuessFormatTest.java   (contents, props changed)
      - copied, changed from r1326686, commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/SanselanGuessFormatTest.java
    commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/ImagingTest.java   (contents, props changed)
      - copied, changed from r1326686, commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/SanselanTest.java
    commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/ImagingTestConstants.java   (contents, props changed)
      - copied, changed from r1326686, commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/SanselanTestConstants.java
Removed:
    commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/Sanselan.java
    commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/SanselanConstants.java
    commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/SanselanException.java
    commons/proper/imaging/trunk/src/main/resources/org/apache/commons/sanselan/
    commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/SanselanGuessFormatTest.java
    commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/SanselanTest.java
    commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/SanselanTestConstants.java
Modified:
    commons/proper/imaging/trunk/LICENSE.txt
    commons/proper/imaging/trunk/NOTICE.txt
    commons/proper/imaging/trunk/RELEASE_NOTES
    commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/ColorTools.java
    commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/ImageParser.java
    commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/ImageReadException.java
    commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/ImageWriteException.java
    commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/ico/IcoImageParser.java
    commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegImageMetadata.java
    commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcParser.java
    commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pcx/PcxConstants.java
    commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/PngConstants.java
    commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/TiffConstants.java
    commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/TiffFieldTypeConstants.java
    commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/util/IoUtils.java
    commons/proper/imaging/trunk/src/site/site.xml
    commons/proper/imaging/trunk/src/site/xdoc/history.xml
    commons/proper/imaging/trunk/src/site/xdoc/sampleimages.xml
    commons/proper/imaging/trunk/src/site/xdoc/todo.xml
    commons/proper/imaging/trunk/src/site/xdoc/whysanselan.xml
    commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/common/BinaryFileFunctionsTest.java
    commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/common/RationalNumberTest.java
    commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/common/bytesource/ByteSourceImageTest.java
    commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/common/bytesource/ByteSourceTest.java
    commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/examples/ImageReadExample.java
    commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/examples/ImageWriteExample.java
    commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/examples/MetadataExample.java
    commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/examples/SampleUsage.java
    commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/examples/WriteExifMetadataExample.java
    commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/bmp/BmpBaseTest.java
    commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/bmp/BmpReadTest.java
    commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/bmp/BmpRoundtripTest.java
    commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/dcx/DcxBaseTest.java
    commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/dcx/DcxReadTest.java
    commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/gif/GifBaseTest.java
    commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/gif/GifReadTest.java
    commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/icns/IcnsBaseTest.java
    commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/icns/IcnsReadTest.java
    commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/icns/IcnsRoundTripTest.java
    commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/ico/IcoBaseTest.java
    commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/ico/IcoReadTest.java
    commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/ico/IcoRoundtripTest.java
    commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/JpegBaseTest.java
    commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/JpegReadTest.java
    commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/JpegWithJpegThumbnailTest.java
    commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/AsciiFieldTest.java
    commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/ExifBaseTest.java
    commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/ExifDumpTest.java
    commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/ExifRewriteTest.java
    commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/GpsTest.java
    commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/SpecificExifTagTest.java
    commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcBaseTest.java
    commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcDumpTest.java
    commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/xmp/JpegXmpBaseTest.java
    commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/pcx/PcxBaseTest.java
    commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/pcx/PcxReadTest.java
    commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/ConvertPngToGifTest.java
    commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/PngBaseTest.java
    commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/PngMultipleRoundtripTest.java
    commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/PngReadTest.java
    commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/PngTextTest.java
    commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/PngWriteForceTrueColorText.java
    commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/PngWriteReadTest.java
    commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/rgbe/RgbeBaseTest.java
    commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/rgbe/RgbeReadTest.java
    commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffBaseTest.java
    commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffCcittTest.java
    commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffReadTest.java
    commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffRoundtripTest.java
    commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffTagIntegrityTest.java
    commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/wbmp/WbmpBaseTest.java
    commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/wbmp/WbmpReadTest.java
    commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/xbm/XbmBaseTest.java
    commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/xbm/XbmReadTest.java
    commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/xmp/XmpDumpTest.java
    commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/xmp/XmpUpdateTest.java
    commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/xpm/XpmBaseTest.java
    commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/xpm/XpmReadTest.java
    commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/roundtrip/RoundtripTest.java

Modified: commons/proper/imaging/trunk/LICENSE.txt
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/LICENSE.txt?rev=1326730&r1=1326729&r2=1326730&view=diff
==============================================================================
--- commons/proper/imaging/trunk/LICENSE.txt (original)
+++ commons/proper/imaging/trunk/LICENSE.txt Mon Apr 16 18:33:26 2012
@@ -204,7 +204,7 @@
 
 EXTERNAL COMPONENTS
 
-Apache Commons Sanselan includes a number of components with separate copyright
+Apache Commons Imaging includes a number of components with separate copyright
 notices and license terms. Your use of these components is subject to the terms
 and conditions of the following licenses.
 

Modified: commons/proper/imaging/trunk/NOTICE.txt
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/NOTICE.txt?rev=1326730&r1=1326729&r2=1326730&view=diff
==============================================================================
--- commons/proper/imaging/trunk/NOTICE.txt (original)
+++ commons/proper/imaging/trunk/NOTICE.txt Mon Apr 16 18:33:26 2012
@@ -1,4 +1,4 @@
-Apache Sanselan
+Apache Imaging
 Copyright 2007-2011 The Apache Software Foundation.
 
 This product includes software developed at

Modified: commons/proper/imaging/trunk/RELEASE_NOTES
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/RELEASE_NOTES?rev=1326730&r1=1326729&r2=1326730&view=diff
==============================================================================
--- commons/proper/imaging/trunk/RELEASE_NOTES (original)
+++ commons/proper/imaging/trunk/RELEASE_NOTES Mon Apr 16 18:33:26 2012
@@ -1,8 +1,8 @@
 
-Apache Commons Sanselan Release Notes 
+Apache Commons Imaging Release Notes 
 -------------------------------------
 
-Apache Commons Sanselan is a pure-Java image library for reading and writing a variety of image formats.
+Apache Commons Imaging is a pure-Java image library for reading and writing a variety of image formats.
 
 See the project site for details and sample code.
 

Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/ColorTools.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/ColorTools.java?rev=1326730&r1=1326729&r2=1326730&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/ColorTools.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/ColorTools.java Mon Apr 16 18:33:26 2012
@@ -37,7 +37,7 @@ public class ColorTools {
 
     public BufferedImage correctImage(BufferedImage src, File file)
             throws ImageReadException, IOException {
-        ICC_Profile icc = Sanselan.getICCProfile(file);
+        ICC_Profile icc = Imaging.getICCProfile(file);
         if (icc == null)
             return src;
 

Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/ImageParser.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/ImageParser.java?rev=1326730&r1=1326729&r2=1326730&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/ImageParser.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/ImageParser.java Mon Apr 16 18:33:26 2012
@@ -52,7 +52,7 @@ import org.apache.commons.imaging.format
 import org.apache.commons.imaging.util.Debug;
 
 public abstract class ImageParser extends BinaryFileParser implements
-        SanselanConstants
+        ImagingConstants
 {
 
     public static final ImageParser[] getAllImageParsers()
@@ -424,7 +424,7 @@ public abstract class ImageParser extend
             return new SimpleBufferedImageFactory();
 
         IBufferedImageFactory result = (IBufferedImageFactory) params
-                .get(SanselanConstants.BUFFERED_IMAGE_FACTORY);
+                .get(ImagingConstants.BUFFERED_IMAGE_FACTORY);
 
         if (null != result)
             return result;

Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/ImageReadException.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/ImageReadException.java?rev=1326730&r1=1326729&r2=1326730&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/ImageReadException.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/ImageReadException.java Mon Apr 16 18:33:26 2012
@@ -16,7 +16,7 @@
  */
 package org.apache.commons.imaging;
 
-public class ImageReadException extends SanselanException
+public class ImageReadException extends ImagingException
 {
     private static final long serialVersionUID = -1L;
 

Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/ImageWriteException.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/ImageWriteException.java?rev=1326730&r1=1326729&r2=1326730&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/ImageWriteException.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/ImageWriteException.java Mon Apr 16 18:33:26 2012
@@ -16,7 +16,7 @@
  */
 package org.apache.commons.imaging;
 
-public class ImageWriteException extends SanselanException
+public class ImageWriteException extends ImagingException
 {
     static final long serialVersionUID = -1L;
 

Copied: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/Imaging.java (from r1326686, commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/Sanselan.java)
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/Imaging.java?p2=commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/Imaging.java&p1=commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/Sanselan.java&r1=1326686&r2=1326730&rev=1326730&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/Sanselan.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/Imaging.java Mon Apr 16 18:33:26 2012
@@ -40,19 +40,19 @@ import org.apache.commons.imaging.icc.Ic
 import org.apache.commons.imaging.util.Debug;
 
 /**
- * The primary interface to the sanselan library.
+ * The primary interface to the Imaging library.
  * <p>
- * Almost all of the Sanselan library's core functionality can be accessed
+ * Almost all of the Imaging library's core functionality can be accessed
  * through it's methods.
  * <p>
- * All of Sanselan's methods are static.
+ * All of Imaging's methods are static.
  * <p>
  * See the source of the SampleUsage class and other classes in the
  * org.apache.commons.sanselan.examples package for examples.
  *
  * @see org.apache.commons.sanselan.examples.SampleUsage
  */
-public abstract class Sanselan implements SanselanConstants {
+public abstract class Imaging implements ImagingConstants {
 
     /**
      * Tries to guess whether a file contains an image based on its file
@@ -1160,7 +1160,7 @@ public abstract class Sanselan implement
      * @param is
      *            InputStream to read image data from.
      * @return A BufferedImage.
-     * @see SanselanConstants
+     * @see ImagingConstants
      */
     public static BufferedImage getBufferedImage(InputStream is)
             throws ImageReadException, IOException {
@@ -1184,7 +1184,7 @@ public abstract class Sanselan implement
      * @param params
      *            Map of optional parameters, defined in SanselanConstants.
      * @return A BufferedImage.
-     * @see SanselanConstants
+     * @see ImagingConstants
      */
     public static BufferedImage getBufferedImage(InputStream is, Map params)
             throws ImageReadException, IOException {
@@ -1209,7 +1209,7 @@ public abstract class Sanselan implement
      * @param bytes
      *            Byte array containing an image file.
      * @return A BufferedImage.
-     * @see SanselanConstants
+     * @see ImagingConstants
      */
     public static BufferedImage getBufferedImage(byte bytes[])
             throws ImageReadException, IOException {
@@ -1233,7 +1233,7 @@ public abstract class Sanselan implement
      * @param params
      *            Map of optional parameters, defined in SanselanConstants.
      * @return A BufferedImage.
-     * @see SanselanConstants
+     * @see ImagingConstants
      */
     public static BufferedImage getBufferedImage(byte bytes[], Map params)
             throws ImageReadException, IOException {
@@ -1255,7 +1255,7 @@ public abstract class Sanselan implement
      * @param file
      *            File containing image data.
      * @return A BufferedImage.
-     * @see SanselanConstants
+     * @see ImagingConstants
      */
     public static BufferedImage getBufferedImage(File file)
             throws ImageReadException, IOException {
@@ -1279,7 +1279,7 @@ public abstract class Sanselan implement
      * @param params
      *            Map of optional parameters, defined in SanselanConstants.
      * @return A BufferedImage.
-     * @see SanselanConstants
+     * @see ImagingConstants
      */
     public static BufferedImage getBufferedImage(File file, Map params)
             throws ImageReadException, IOException {
@@ -1315,7 +1315,7 @@ public abstract class Sanselan implement
      *            The ImageFormat to use.
      * @param params
      *            Map of optional parameters, defined in SanselanConstants.
-     * @see SanselanConstants
+     * @see ImagingConstants
      */
     public static void writeImage(BufferedImage src, File file,
             ImageFormat format, Map params) throws ImageWriteException,
@@ -1356,7 +1356,7 @@ public abstract class Sanselan implement
      * @param params
      *            Map of optional parameters, defined in SanselanConstants.
      * @return A byte array containing the image file.
-     * @see SanselanConstants
+     * @see ImagingConstants
      */
     public static byte[] writeImageToBytes(BufferedImage src,
             ImageFormat format, Map params) throws ImageWriteException,
@@ -1388,7 +1388,7 @@ public abstract class Sanselan implement
      *            The ImageFormat to use.
      * @param params
      *            Map of optional parameters, defined in SanselanConstants.
-     * @see SanselanConstants
+     * @see ImagingConstants
      */
     public static void writeImage(BufferedImage src, OutputStream os,
             ImageFormat format, Map params) throws ImageWriteException,

Propchange: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/Imaging.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/ImagingConstants.java (from r1326686, commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/SanselanConstants.java)
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/ImagingConstants.java?p2=commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/ImagingConstants.java&p1=commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/SanselanConstants.java&r1=1326686&r2=1326730&rev=1326730&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/SanselanConstants.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/ImagingConstants.java Mon Apr 16 18:33:26 2012
@@ -20,7 +20,7 @@ import java.io.InputStream;
 
 import org.apache.commons.imaging.formats.tiff.constants.TiffConstants;
 
-public interface SanselanConstants
+public interface ImagingConstants
 {
     /**
      * Parameter key. Applies to read and write operations.

Propchange: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/ImagingConstants.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/ImagingException.java (from r1326686, commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/SanselanException.java)
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/ImagingException.java?p2=commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/ImagingException.java&p1=commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/SanselanException.java&r1=1326686&r2=1326730&rev=1326730&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/SanselanException.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/ImagingException.java Mon Apr 16 18:33:26 2012
@@ -16,16 +16,16 @@
  */
 package org.apache.commons.imaging;
 
-public class SanselanException extends Exception
+public class ImagingException extends Exception
 {
     private static final long serialVersionUID = -1L;
 
-    public SanselanException(String s)
+    public ImagingException(String s)
     {
         super(s);
     }
 
-    public SanselanException(String s, Exception e)
+    public ImagingException(String s, Exception e)
     {
         super(s, e);
     }

Propchange: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/ImagingException.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/ico/IcoImageParser.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/ico/IcoImageParser.java?rev=1326730&r1=1326729&r2=1326730&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/ico/IcoImageParser.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/ico/IcoImageParser.java Mon Apr 16 18:33:26 2012
@@ -35,7 +35,7 @@ import org.apache.commons.imaging.ImageI
 import org.apache.commons.imaging.ImageParser;
 import org.apache.commons.imaging.ImageReadException;
 import org.apache.commons.imaging.ImageWriteException;
-import org.apache.commons.imaging.Sanselan;
+import org.apache.commons.imaging.Imaging;
 import org.apache.commons.imaging.common.BinaryOutputStream;
 import org.apache.commons.imaging.common.IImageMetadata;
 import org.apache.commons.imaging.common.bytesource.ByteSource;
@@ -486,10 +486,10 @@ public class IcoImageParser extends Imag
     private IconData readIconData(byte[] iconData, IconInfo fIconInfo)
             throws ImageReadException, IOException
     {
-        ImageFormat imageFormat = Sanselan.guessFormat(iconData);
+        ImageFormat imageFormat = Imaging.guessFormat(iconData);
         if (imageFormat.equals(ImageFormat.IMAGE_FORMAT_PNG))
         {
-            BufferedImage bufferedImage = Sanselan.getBufferedImage(iconData);
+            BufferedImage bufferedImage = Imaging.getBufferedImage(iconData);
             PNGIconData pngIconData = new PNGIconData(fIconInfo, bufferedImage);
             return pngIconData;
         }

Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegImageMetadata.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegImageMetadata.java?rev=1326730&r1=1326729&r2=1326730&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegImageMetadata.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegImageMetadata.java Mon Apr 16 18:33:26 2012
@@ -26,7 +26,7 @@ import java.util.List;
 import javax.imageio.ImageIO;
 
 import org.apache.commons.imaging.ImageReadException;
-import org.apache.commons.imaging.Sanselan;
+import org.apache.commons.imaging.Imaging;
 import org.apache.commons.imaging.common.IImageMetadata;
 import org.apache.commons.imaging.formats.tiff.JpegImageData;
 import org.apache.commons.imaging.formats.tiff.TiffField;
@@ -80,7 +80,7 @@ public class JpegImageMetadata implement
         byte[] data = getEXIFThumbnailData();
 
         if( data != null ){
-            return Sanselan.getImageSize(data);
+            return Imaging.getImageSize(data);
         }
         return null;
     }

Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcParser.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcParser.java?rev=1326730&r1=1326729&r2=1326730&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcParser.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcParser.java Mon Apr 16 18:33:26 2012
@@ -27,7 +27,7 @@ import java.util.Map;
 
 import org.apache.commons.imaging.ImageReadException;
 import org.apache.commons.imaging.ImageWriteException;
-import org.apache.commons.imaging.SanselanConstants;
+import org.apache.commons.imaging.ImagingConstants;
 import org.apache.commons.imaging.common.BinaryFileParser;
 import org.apache.commons.imaging.common.BinaryInputStream;
 import org.apache.commons.imaging.common.BinaryOutputStream;
@@ -99,9 +99,9 @@ public class IptcParser extends BinaryFi
             throws ImageReadException, IOException
     {
         boolean strict = ParamMap.getParamBoolean(params,
-                SanselanConstants.PARAM_KEY_STRICT, false);
+                ImagingConstants.PARAM_KEY_STRICT, false);
         boolean verbose = ParamMap.getParamBoolean(params,
-                SanselanConstants.PARAM_KEY_VERBOSE, false);
+                ImagingConstants.PARAM_KEY_VERBOSE, false);
 
         return parsePhotoshopSegment(bytes, verbose, strict);
     }

Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pcx/PcxConstants.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pcx/PcxConstants.java?rev=1326730&r1=1326729&r2=1326730&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pcx/PcxConstants.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pcx/PcxConstants.java Mon Apr 16 18:33:26 2012
@@ -14,9 +14,9 @@
  */
 package org.apache.commons.imaging.formats.pcx;
 
-import org.apache.commons.imaging.SanselanConstants;
+import org.apache.commons.imaging.ImagingConstants;
 
-public interface PcxConstants extends SanselanConstants
+public interface PcxConstants extends ImagingConstants
 {
     public static final String PARAM_KEY_PCX_COMPRESSION = "PCX_COMPRESSION";
     public static final int PCX_COMPRESSION_UNCOMPRESSED = 0;

Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/PngConstants.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/PngConstants.java?rev=1326730&r1=1326729&r2=1326730&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/PngConstants.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/PngConstants.java Mon Apr 16 18:33:26 2012
@@ -16,11 +16,11 @@
  */
 package org.apache.commons.imaging.formats.png;
 
-import org.apache.commons.imaging.SanselanConstants;
+import org.apache.commons.imaging.ImagingConstants;
 import org.apache.commons.imaging.common.BinaryConstant;
 import org.apache.commons.imaging.common.BinaryFileFunctions;
 
-public interface PngConstants extends SanselanConstants
+public interface PngConstants extends ImagingConstants
 {
 
     public static final int COMPRESSION_DEFLATE_INFLATE = 0;

Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/TiffConstants.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/TiffConstants.java?rev=1326730&r1=1326729&r2=1326730&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/TiffConstants.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/TiffConstants.java Mon Apr 16 18:33:26 2012
@@ -16,12 +16,12 @@
  */
 package org.apache.commons.imaging.formats.tiff.constants;
 
-import org.apache.commons.imaging.SanselanConstants;
+import org.apache.commons.imaging.ImagingConstants;
 import org.apache.commons.imaging.common.BinaryConstants;
 
 public interface TiffConstants
         extends
-            SanselanConstants,
+            ImagingConstants,
             TiffFieldTypeConstants,
             TiffDirectoryConstants,
             AllTagConstants,

Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/TiffFieldTypeConstants.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/TiffFieldTypeConstants.java?rev=1326730&r1=1326729&r2=1326730&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/TiffFieldTypeConstants.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/TiffFieldTypeConstants.java Mon Apr 16 18:33:26 2012
@@ -20,7 +20,7 @@ import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
-import org.apache.commons.imaging.SanselanConstants;
+import org.apache.commons.imaging.ImagingConstants;
 import org.apache.commons.imaging.formats.tiff.fieldtypes.FieldType;
 import org.apache.commons.imaging.formats.tiff.fieldtypes.FieldTypeAscii;
 import org.apache.commons.imaging.formats.tiff.fieldtypes.FieldTypeByte;
@@ -31,7 +31,7 @@ import org.apache.commons.imaging.format
 import org.apache.commons.imaging.formats.tiff.fieldtypes.FieldTypeShort;
 import org.apache.commons.imaging.formats.tiff.fieldtypes.FieldTypeUnknown;
 
-public interface TiffFieldTypeConstants extends SanselanConstants
+public interface TiffFieldTypeConstants extends ImagingConstants
 {
 
     public static final FieldTypeByte FIELD_TYPE_BYTE = new FieldTypeByte(1,

Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/util/IoUtils.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/util/IoUtils.java?rev=1326730&r1=1326729&r2=1326730&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/util/IoUtils.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/util/IoUtils.java Mon Apr 16 18:33:26 2012
@@ -28,9 +28,9 @@ import java.io.InputStream;
 import java.io.OutputStream;
 import java.nio.channels.FileChannel;
 
-import org.apache.commons.imaging.SanselanConstants;
+import org.apache.commons.imaging.ImagingConstants;
 
-public class IoUtils implements SanselanConstants
+public class IoUtils implements ImagingConstants
 {
     /**
      * This class should never be instantiated.

Modified: commons/proper/imaging/trunk/src/site/site.xml
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/site/site.xml?rev=1326730&r1=1326729&r2=1326730&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/site/site.xml (original)
+++ commons/proper/imaging/trunk/src/site/site.xml Mon Apr 16 18:33:26 2012
@@ -15,15 +15,15 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -->
-<project name="Commons Sanselan">
+<project name="Commons Imaging">
   <bannerRight>
-    <name>Commons Sanselan</name>
+    <name>Commons Imaging</name>
     <href>/index.html</href>
   </bannerRight>
 
   <body>
 
-    <menu name="Sanselan">
+    <menu name="Imaging">
       <item name="Overview"                href="/index.html"/>
       <item name="Mailing Lists"           href="/mail-lists.html"/>
       <item name="Issue Tracking"          href="/issue-tracking.html"/>
@@ -34,7 +34,7 @@
     </menu>
 
     <menu name="Documentation">
-      <item name="Why Use Sanselan"        href="/whysanselan.html"/>
+      <item name="Why Use Imaging"         href="/whysanselan.html"/>
       <item name="Getting Started"         href="/gettingstarted.html"/>
       <item name="Sample Usage"            href="/sampleusage.html"/>
       <item name="Format Support"          href="/formatsupport.html"/>

Modified: commons/proper/imaging/trunk/src/site/xdoc/history.xml
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/site/xdoc/history.xml?rev=1326730&r1=1326729&r2=1326730&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/site/xdoc/history.xml (original)
+++ commons/proper/imaging/trunk/src/site/xdoc/history.xml Mon Apr 16 18:33:26 2012
@@ -25,6 +25,10 @@ limitations under the License.
 <section name="Project Status and History">
 
 <p>
+  Apache Commons Sanselan was renamed to Apache Commons Imaging on 16 April 2012.
+</p>
+
+<p>
   Version 0.90 released January 31st, 2008.
   <ul>
     <li>Added some convenience functions for reading and writing GPS data.</li>

Modified: commons/proper/imaging/trunk/src/site/xdoc/sampleimages.xml
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/site/xdoc/sampleimages.xml?rev=1326730&r1=1326729&r2=1326730&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/site/xdoc/sampleimages.xml (original)
+++ commons/proper/imaging/trunk/src/site/xdoc/sampleimages.xml Mon Apr 16 18:33:26 2012
@@ -26,7 +26,7 @@ limitations under the License.
 
 <p>
   <ul>
-      <li>The original test image suite that Sanselan was developed against cannot be released, since we don't own the rights to many of the more interesting examples.</li>
+      <li>The original test image suite that Imaging was developed against cannot be released, since we don't own the rights to many of the more interesting examples.</li>
       <li>We are in the process of collecting</li>
   </ul>
 </p>

Modified: commons/proper/imaging/trunk/src/site/xdoc/todo.xml
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/site/xdoc/todo.xml?rev=1326730&r1=1326729&r2=1326730&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/site/xdoc/todo.xml (original)
+++ commons/proper/imaging/trunk/src/site/xdoc/todo.xml Mon Apr 16 18:33:26 2012
@@ -27,7 +27,7 @@ limitations under the License.
 <p>
   <ul>
       <li>Add a structured way to write IPTC image metadata to JPEG files.</li>
-      <li>Refactor interface. Rename Sanselan methods and public class names. Formats should subclass imagemetadata class to include format-specific info ie. GIF's transparency index.</li>
+      <li>Refactor interface. Rename Imaging methods and public class names. Formats should subclass imagemetadata class to include format-specific info ie. GIF's transparency index.</li>
       <li>More control over writing.</li>
       <li>Share test image suite with comments.</li>
       <li>Improve Javadoc and write more FAQs / examples.</li>

Modified: commons/proper/imaging/trunk/src/site/xdoc/whysanselan.xml
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/site/xdoc/whysanselan.xml?rev=1326730&r1=1326729&r2=1326730&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/site/xdoc/whysanselan.xml (original)
+++ commons/proper/imaging/trunk/src/site/xdoc/whysanselan.xml Mon Apr 16 18:33:26 2012
@@ -22,26 +22,26 @@ limitations under the License.
  </properties>
 <body>
 <!-- ================================================== -->
-<section name="Why use Sanselan?">
+<section name="Why use Imaging?">
 
 <p>
   <ul>
       <li>This library is Free Software/Open Source. It is available under the <a href="license.html">Apache Software License</a>.</li>
-      <li>Sanselan is pure-Java. It will run on any jvm, on any platform without modification. It has no dependencies. Sanselan only requires Java 1.4 or later.</li>
-      <li>Sanselan is easy to use. It has a simple, clean interface. Most operations are a single Sanselan method call. See our Sample Code for examples.</li>
+      <li>Imaging is pure-Java. It will run on any jvm, on any platform without modification. It has no dependencies. Imaging only requires Java 1.4 or later.</li>
+      <li>Imaging is easy to use. It has a simple, clean interface. Most operations are a single Imaging method call. See our Sample Code for examples.</li>
       <li>The core functionality is reading and writing a variety of image formats. See the list of Supported Formats.</li>
-      <li>Sanselan supports a number of format variations and uncommon features not supported by other image libraries.</li>
-      <li>Sanselan does more than read and write images. Reading image info (image size, colorspace, bit depth, etc.) and metadata is easy and does not require reading the entire image.</li>
-      <li>Sanselan supports reading and writing a variety of metadata in a structured way, including EXIF metadata.</li>
-      <li>Sanselan provides a consistent api across a variety of image formats.</li>
-      <li>Sanselan is network-aware. Sanselan will only read the data it needs. Reading most image info and metadata only requires reading a header.</li>
-      <li>Sanselan was written with an eye to correctness and code clarity rather than efficiency.</li>
-      <li>Sanselan can extract and (simply) parse embedded ICC Profiles. Moreover, Sanselan applies the icc profile by default, coverting read images to sRGB.
+      <li>Imaging supports a number of format variations and uncommon features not supported by other image libraries.</li>
+      <li>Imaging does more than read and write images. Reading image info (image size, colorspace, bit depth, etc.) and metadata is easy and does not require reading the entire image.</li>
+      <li>Imaging supports reading and writing a variety of metadata in a structured way, including EXIF metadata.</li>
+      <li>Imaging provides a consistent api across a variety of image formats.</li>
+      <li>Imaging is network-aware. Imaging will only read the data it needs. Reading most image info and metadata only requires reading a header.</li>
+      <li>Imaging was written with an eye to correctness and code clarity rather than efficiency.</li>
+      <li>Imaging can extract and (simply) parse embedded ICC Profiles. Moreover, Imaging applies the icc profile by default, coverting read images to sRGB.
           This means images are color-corrected by default. see: 
           <a href="http://en.wikipedia.org/wiki/International_Color_Consortium">http://en.wikipedia.org/wiki/International_Color_Consortium</a>, 
           <a href="http://en.wikipedia.org/wiki/SRGB">http://en.wikipedia.org/wiki/SRGB</a>
       </li>
-      <li>Sanselan is actively maintained.</li>
+      <li>Imaging is actively maintained.</li>
   </ul>
 </p>
 

Copied: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/ImagingGuessFormatTest.java (from r1326686, commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/SanselanGuessFormatTest.java)
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/ImagingGuessFormatTest.java?p2=commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/ImagingGuessFormatTest.java&p1=commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/SanselanGuessFormatTest.java&r1=1326686&r2=1326730&rev=1326730&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/SanselanGuessFormatTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/ImagingGuessFormatTest.java Mon Apr 16 18:33:26 2012
@@ -20,9 +20,9 @@ package org.apache.commons.imaging;
 import java.io.File;
 import org.apache.commons.io.FilenameUtils;
 import org.apache.commons.imaging.ImageFormat;
-import org.apache.commons.imaging.Sanselan;
+import org.apache.commons.imaging.Imaging;
 
-public class SanselanGuessFormatTest extends SanselanTest {
+public class ImagingGuessFormatTest extends ImagingTest {
 
     public static final String BMP_IMAGE_FILE = "bmp\\1\\Oregon Scientific DS6639 - DSC_0307 - small.bmp";
     public static final String PNG_IMAGE_FILE = "png\\1\\Oregon Scientific DS6639 - DSC_0307 - small.png";
@@ -71,7 +71,7 @@ public class SanselanGuessFormatTest ext
 
         assertTrue(imageFile.exists());
         assertTrue(imageFile.isFile());
-        ImageFormat guessedFormat = Sanselan.guessFormat(imageFile);
+        ImageFormat guessedFormat = Imaging.guessFormat(imageFile);
         assertNotNull(guessedFormat);
         assertEquals(guessedFormat, expectedFormat);
     }

Propchange: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/ImagingGuessFormatTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/ImagingTest.java (from r1326686, commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/SanselanTest.java)
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/ImagingTest.java?p2=commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/ImagingTest.java&p1=commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/SanselanTest.java&r1=1326686&r2=1326730&rev=1326730&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/SanselanTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/ImagingTest.java Mon Apr 16 18:33:26 2012
@@ -25,13 +25,13 @@ import java.util.List;
 import junit.framework.TestCase;
 
 import org.apache.commons.imaging.ImageReadException;
-import org.apache.commons.imaging.Sanselan;
-import org.apache.commons.imaging.SanselanConstants;
+import org.apache.commons.imaging.Imaging;
+import org.apache.commons.imaging.ImagingConstants;
 import org.apache.commons.imaging.test.util.FileSystemTraversal;
 import org.apache.commons.imaging.util.Debug;
 
-public abstract class SanselanTest extends TestCase implements
-        SanselanTestConstants, SanselanConstants {
+public abstract class ImagingTest extends TestCase implements
+        ImagingTestConstants, ImagingConstants {
 
     protected File createTempFile(String prefix, String suffix)
             throws IOException {
@@ -121,7 +121,7 @@ public abstract class SanselanTest exten
         FileSystemTraversal.Visitor visitor = new FileSystemTraversal.Visitor() {
 
             public boolean visit(File file, double progressEstimate) {
-                if (!Sanselan.hasImageFileExtension(file))
+                if (!Imaging.hasImageFileExtension(file))
                     return true;
                 ALL_IMAGES.add(file);
                 return true;
@@ -138,7 +138,7 @@ public abstract class SanselanTest exten
         for (int i = 0; i < ALL_IMAGES.size(); i++) {
             File file = (File) ALL_IMAGES.get(i);
 
-            if (!Sanselan.hasImageFileExtension(file))
+            if (!Imaging.hasImageFileExtension(file))
                 continue;
 
             if (counter++ % 10 == 0)

Propchange: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/ImagingTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/ImagingTestConstants.java (from r1326686, commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/SanselanTestConstants.java)
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/ImagingTestConstants.java?p2=commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/ImagingTestConstants.java&p1=commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/SanselanTestConstants.java&r1=1326686&r2=1326730&rev=1326730&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/SanselanTestConstants.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/ImagingTestConstants.java Mon Apr 16 18:33:26 2012
@@ -20,7 +20,7 @@ package org.apache.commons.imaging;
 import java.io.File;
 import org.apache.commons.io.FilenameUtils;
 
-public interface SanselanTestConstants {
+public interface ImagingTestConstants {
 
     static final File PHIL_HARVEY_TEST_IMAGE_FOLDER = new File(
             FilenameUtils.separatorsToSystem("src\\test\\data\\images\\exif\\philHarvey\\"));

Propchange: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/ImagingTestConstants.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/common/BinaryFileFunctionsTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/common/BinaryFileFunctionsTest.java?rev=1326730&r1=1326729&r2=1326730&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/common/BinaryFileFunctionsTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/common/BinaryFileFunctionsTest.java Mon Apr 16 18:33:26 2012
@@ -15,10 +15,10 @@
 
 package org.apache.commons.imaging.common;
 
-import org.apache.commons.imaging.SanselanTest;
+import org.apache.commons.imaging.ImagingTest;
 import org.apache.commons.imaging.common.BinaryFileFunctions;
 
-public class BinaryFileFunctionsTest extends SanselanTest {
+public class BinaryFileFunctionsTest extends ImagingTest {
     // Work around that pesky "protected"...
     private static class Extender extends BinaryFileFunctions {
         public void testFloatToByteConversion() {

Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/common/RationalNumberTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/common/RationalNumberTest.java?rev=1326730&r1=1326729&r2=1326730&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/common/RationalNumberTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/common/RationalNumberTest.java Mon Apr 16 18:33:26 2012
@@ -20,12 +20,12 @@ package org.apache.commons.imaging.commo
 import java.text.DecimalFormat;
 import java.text.NumberFormat;
 
-import org.apache.commons.imaging.SanselanTest;
+import org.apache.commons.imaging.ImagingTest;
 import org.apache.commons.imaging.common.RationalNumber;
 import org.apache.commons.imaging.common.RationalNumberUtilities;
 import org.apache.commons.imaging.util.Debug;
 
-public class RationalNumberTest extends SanselanTest
+public class RationalNumberTest extends ImagingTest
 {
     //    public RationalNumberTest()
     //    {

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=1326730&r1=1326729&r2=1326730&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 Mon Apr 16 18:33:26 2012
@@ -31,7 +31,7 @@ import java.util.Map;
 import org.apache.commons.imaging.ImageFormat;
 import org.apache.commons.imaging.ImageInfo;
 import org.apache.commons.imaging.ImageReadException;
-import org.apache.commons.imaging.Sanselan;
+import org.apache.commons.imaging.Imaging;
 import org.apache.commons.imaging.util.Debug;
 import org.apache.commons.imaging.util.IoUtils;
 
@@ -85,7 +85,7 @@ public class ByteSourceImageTest extends
 
             checkGetImageSize(imageFile, imageFileBytes);
 
-            ImageFormat imageFormat = Sanselan.guessFormat(imageFile);
+            ImageFormat imageFormat = Imaging.guessFormat(imageFile);
             if (ImageFormat.IMAGE_FORMAT_JPEG != imageFormat
              && ImageFormat.IMAGE_FORMAT_UNKNOWN != imageFormat)
             {
@@ -96,7 +96,7 @@ public class ByteSourceImageTest extends
 
     public void checkGetBufferedImage(File file, byte[] bytes) throws Exception
     {
-        BufferedImage imageFile = Sanselan.getBufferedImage(file);
+        BufferedImage imageFile = Imaging.getBufferedImage(file);
         assertNotNull(imageFile);
         assertTrue(imageFile.getWidth() > 0);
         assertTrue(imageFile.getHeight() > 0);
@@ -104,7 +104,7 @@ public class ByteSourceImageTest extends
         int imageFileHeight = imageFile.getHeight();
         imageFile = null;
 
-        BufferedImage imageBytes = Sanselan.getBufferedImage(bytes);
+        BufferedImage imageBytes = Imaging.getBufferedImage(bytes);
         assertNotNull(imageBytes);
         assertTrue(imageFileWidth == imageBytes.getWidth());
         assertTrue(imageFileHeight == imageBytes.getHeight());
@@ -112,12 +112,12 @@ public class ByteSourceImageTest extends
 
     public void checkGetImageSize(File imageFile, byte[] imageFileBytes) throws Exception
     {
-        Dimension imageSizeFile = Sanselan.getImageSize(imageFile);
+        Dimension imageSizeFile = Imaging.getImageSize(imageFile);
         assertNotNull(imageSizeFile);
         assertTrue(imageSizeFile.width > 0);
         assertTrue(imageSizeFile.height > 0);
 
-        Dimension imageSizeBytes = Sanselan.getImageSize(imageFileBytes);
+        Dimension imageSizeBytes = Imaging.getImageSize(imageFileBytes);
         assertNotNull(imageSizeBytes);
         assertTrue(imageSizeFile.width == imageSizeBytes.width);
         assertTrue(imageSizeFile.height == imageSizeBytes.height);
@@ -126,12 +126,12 @@ public class ByteSourceImageTest extends
     public void checkGuessFormat(File imageFile, byte[] imageFileBytes) throws Exception
     {
         // check guessFormat()
-        ImageFormat imageFormatFile = Sanselan.guessFormat(imageFile);
+        ImageFormat imageFormatFile = Imaging.guessFormat(imageFile);
         assertNotNull(imageFormatFile);
         assertTrue(imageFormatFile != ImageFormat.IMAGE_FORMAT_UNKNOWN);
         // Debug.debug("imageFormatFile", imageFormatFile);
 
-        ImageFormat imageFormatBytes = Sanselan.guessFormat(imageFileBytes);
+        ImageFormat imageFormatBytes = Imaging.guessFormat(imageFileBytes);
         assertNotNull(imageFormatBytes);
         assertTrue(imageFormatBytes != ImageFormat.IMAGE_FORMAT_UNKNOWN);
         // Debug.debug("imageFormatBytes", imageFormatBytes);
@@ -142,9 +142,9 @@ public class ByteSourceImageTest extends
     public void checkGetICCProfileBytes(File imageFile, byte[] imageFileBytes)  throws Exception
     {
         // check guessFormat()
-        byte iccBytesFile[] = Sanselan.getICCProfileBytes(imageFile);
+        byte iccBytesFile[] = Imaging.getICCProfileBytes(imageFile);
 
-        byte iccBytesBytes[] = Sanselan.getICCProfileBytes(imageFileBytes);
+        byte iccBytesBytes[] = Imaging.getICCProfileBytes(imageFileBytes);
 
         assertTrue((iccBytesFile != null) == (iccBytesBytes != null));
 
@@ -160,16 +160,16 @@ public class ByteSourceImageTest extends
     {
         Map params = new HashMap();
         boolean ignoreImageData = isPhilHarveyTestImage(imageFile);
-        ImageFormat imageFormat = Sanselan.guessFormat(imageFile);
+        ImageFormat imageFormat = Imaging.guessFormat(imageFile);
         if (imageFormat.equals(ImageFormat.IMAGE_FORMAT_TIFF)
                 || imageFormat.equals(ImageFormat.IMAGE_FORMAT_JPEG))
             params
                     .put(PARAM_KEY_READ_THUMBNAILS, new Boolean(
                             !ignoreImageData));
 
-        ImageInfo imageInfoFile = Sanselan.getImageInfo(imageFile, params);
+        ImageInfo imageInfoFile = Imaging.getImageInfo(imageFile, params);
 
-        ImageInfo imageInfoBytes = Sanselan
+        ImageInfo imageInfoBytes = Imaging
                 .getImageInfo(imageFileBytes, params);
 
         assertNotNull(imageInfoFile);

Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/common/bytesource/ByteSourceTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/common/bytesource/ByteSourceTest.java?rev=1326730&r1=1326729&r2=1326730&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/common/bytesource/ByteSourceTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/common/bytesource/ByteSourceTest.java Mon Apr 16 18:33:26 2012
@@ -24,9 +24,9 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
 
-import org.apache.commons.imaging.SanselanTest;
+import org.apache.commons.imaging.ImagingTest;
 
-public abstract class ByteSourceTest extends SanselanTest
+public abstract class ByteSourceTest extends ImagingTest
 {
     protected File createTempFile(byte src[]) throws IOException
     {

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=1326730&r1=1326729&r2=1326730&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 Mon Apr 16 18:33:26 2012
@@ -27,8 +27,8 @@ import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.commons.imaging.ImageReadException;
-import org.apache.commons.imaging.Sanselan;
-import org.apache.commons.imaging.SanselanConstants;
+import org.apache.commons.imaging.Imaging;
+import org.apache.commons.imaging.ImagingConstants;
 import org.apache.commons.imaging.common.IBufferedImageFactory;
 
 public class ImageReadExample
@@ -39,13 +39,13 @@ public class ImageReadExample
         Map params = new HashMap();
 
         // set optional parameters if you like
-        params.put(SanselanConstants.BUFFERED_IMAGE_FACTORY,
+        params.put(ImagingConstants.BUFFERED_IMAGE_FACTORY,
                 new ManagedImageBufferedImageFactory());
 
         //        params.put(SanselanConstants.PARAM_KEY_VERBOSE, Boolean.TRUE);
 
         // read image
-        BufferedImage image = Sanselan.getBufferedImage(file, params);
+        BufferedImage image = Imaging.getBufferedImage(file, params);
 
         return image;
     }

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=1326730&r1=1326729&r2=1326730&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 Mon Apr 16 18:33:26 2012
@@ -25,8 +25,8 @@ import java.util.Map;
 import org.apache.commons.imaging.ImageFormat;
 import org.apache.commons.imaging.ImageReadException;
 import org.apache.commons.imaging.ImageWriteException;
-import org.apache.commons.imaging.Sanselan;
-import org.apache.commons.imaging.SanselanConstants;
+import org.apache.commons.imaging.Imaging;
+import org.apache.commons.imaging.ImagingConstants;
 import org.apache.commons.imaging.formats.tiff.constants.TiffConstants;
 
 public class ImageWriteExample
@@ -35,16 +35,16 @@ public class ImageWriteExample
             throws ImageReadException, ImageWriteException, IOException
     {
         // read image
-        BufferedImage image = Sanselan.getBufferedImage(file);
+        BufferedImage image = Imaging.getBufferedImage(file);
 
         ImageFormat format = ImageFormat.IMAGE_FORMAT_TIFF;
         Map params = new HashMap();
 
         // set optional parameters if you like
-        params.put(SanselanConstants.PARAM_KEY_COMPRESSION, new Integer(
+        params.put(ImagingConstants.PARAM_KEY_COMPRESSION, new Integer(
                 TiffConstants.TIFF_COMPRESSION_UNCOMPRESSED));
 
-        byte bytes[] = Sanselan.writeImageToBytes(image, format, params);
+        byte bytes[] = Imaging.writeImageToBytes(image, format, params);
 
         return bytes;
     }

Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/examples/MetadataExample.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/examples/MetadataExample.java?rev=1326730&r1=1326729&r2=1326730&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/examples/MetadataExample.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/examples/MetadataExample.java Mon Apr 16 18:33:26 2012
@@ -21,7 +21,7 @@ import java.io.IOException;
 import java.util.List;
 
 import org.apache.commons.imaging.ImageReadException;
-import org.apache.commons.imaging.Sanselan;
+import org.apache.commons.imaging.Imaging;
 import org.apache.commons.imaging.common.IImageMetadata;
 import org.apache.commons.imaging.common.RationalNumber;
 import org.apache.commons.imaging.formats.jpeg.JpegImageMetadata;
@@ -39,7 +39,7 @@ public class MetadataExample
     {
         //        get all metadata stored in EXIF format (ie. from JPEG or TIFF).
         //            org.w3c.dom.Node node = Sanselan.getMetadataObsolete(imageBytes);
-        IImageMetadata metadata = Sanselan.getMetadata(file);
+        IImageMetadata metadata = Imaging.getMetadata(file);
 
         //System.out.println(metadata);
 

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=1326730&r1=1326729&r2=1326730&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 Mon Apr 16 18:33:26 2012
@@ -28,7 +28,7 @@ import java.util.Map;
 import org.apache.commons.imaging.FormatCompliance;
 import org.apache.commons.imaging.ImageFormat;
 import org.apache.commons.imaging.ImageInfo;
-import org.apache.commons.imaging.Sanselan;
+import org.apache.commons.imaging.Imaging;
 import org.apache.commons.imaging.common.IImageMetadata;
 
 public class SampleUsage
@@ -51,35 +51,35 @@ public class SampleUsage
 
             // <b>how to read an image: </b>
             byte imageBytes[] = someBytes;
-            BufferedImage image_1 = Sanselan.getBufferedImage(imageBytes);
+            BufferedImage image_1 = Imaging.getBufferedImage(imageBytes);
 
             // <b>methods of Sanselan usually accept files, byte arrays, or inputstreams as arguments. </b>
-            BufferedImage image_2 = Sanselan.getBufferedImage(imageBytes);
+            BufferedImage image_2 = Imaging.getBufferedImage(imageBytes);
             File file = someFile;
-            BufferedImage image_3 = Sanselan.getBufferedImage(file);
+            BufferedImage image_3 = Imaging.getBufferedImage(file);
             InputStream is = someInputStream;
-            BufferedImage image_4 = Sanselan.getBufferedImage(is);
+            BufferedImage image_4 = Imaging.getBufferedImage(is);
 
             // <b>Write an image. </b>
             BufferedImage image = someImage;
             File dst = someFile;
             ImageFormat format = ImageFormat.IMAGE_FORMAT_PNG;
             Map optional_params = new HashMap();
-            Sanselan.writeImage(image, dst, format, optional_params);
+            Imaging.writeImage(image, dst, format, optional_params);
 
             OutputStream os = someOutputStream;
-            Sanselan.writeImage(image, os, format, optional_params);
+            Imaging.writeImage(image, os, format, optional_params);
 
             // <b>get the image's embedded ICC Profile, if it has one. </b>
-            byte iccProfileBytes[] = Sanselan.getICCProfileBytes(imageBytes);
+            byte iccProfileBytes[] = Imaging.getICCProfileBytes(imageBytes);
 
-            ICC_Profile iccProfile = Sanselan.getICCProfile(imageBytes);
+            ICC_Profile iccProfile = Imaging.getICCProfile(imageBytes);
 
             // <b>get the image's width and height. </b>
-            Dimension d = Sanselan.getImageSize(imageBytes);
+            Dimension d = Imaging.getImageSize(imageBytes);
 
             // <b>get all of the image's info (ie. bits per pixel, size, transparency, etc.) </b>
-            ImageInfo imageInfo = Sanselan.getImageInfo(imageBytes);
+            ImageInfo imageInfo = Imaging.getImageInfo(imageBytes);
 
             if (imageInfo.getColorType() == ImageInfo.COLOR_TYPE_GRAYSCALE)
                 System.out.println("Grayscale image.");
@@ -87,18 +87,18 @@ public class SampleUsage
                 System.out.println("Large image.");
 
             // <b>try to guess the image's format. </b>
-            ImageFormat image_format = Sanselan.guessFormat(imageBytes);
+            ImageFormat image_format = Imaging.guessFormat(imageBytes);
             image_format.equals(ImageFormat.IMAGE_FORMAT_PNG);
 
             // <b>get all metadata stored in EXIF format (ie. from JPEG or TIFF). </b>
             // <b>org.w3c.dom.Node node = Sanselan.getMetadataObsolete(imageBytes); </b>
-            IImageMetadata metdata = Sanselan.getMetadata(imageBytes);
+            IImageMetadata metdata = Imaging.getMetadata(imageBytes);
 
             // <b>print a dump of information about an image to stdout. </b>
-            Sanselan.dumpImageFile(imageBytes);
+            Imaging.dumpImageFile(imageBytes);
 
             // <b>get a summary of format errors. </b>
-            FormatCompliance formatCompliance = Sanselan
+            FormatCompliance formatCompliance = Imaging
                     .getFormatCompliance(imageBytes);
 
         }

Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/examples/WriteExifMetadataExample.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/examples/WriteExifMetadataExample.java?rev=1326730&r1=1326729&r2=1326730&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/examples/WriteExifMetadataExample.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/examples/WriteExifMetadataExample.java Mon Apr 16 18:33:26 2012
@@ -24,7 +24,7 @@ import java.io.OutputStream;
 
 import org.apache.commons.imaging.ImageReadException;
 import org.apache.commons.imaging.ImageWriteException;
-import org.apache.commons.imaging.Sanselan;
+import org.apache.commons.imaging.Imaging;
 import org.apache.commons.imaging.common.IImageMetadata;
 import org.apache.commons.imaging.common.RationalNumber;
 import org.apache.commons.imaging.formats.jpeg.JpegImageMetadata;
@@ -80,7 +80,7 @@ public class WriteExifMetadataExample
             TiffOutputSet outputSet = null;
 
             // note that metadata might be null if no metadata is found.
-            IImageMetadata metadata = Sanselan.getMetadata(jpegImageFile);
+            IImageMetadata metadata = Imaging.getMetadata(jpegImageFile);
             JpegImageMetadata jpegMetadata = (JpegImageMetadata) metadata;
             if (null != jpegMetadata)
             {
@@ -191,7 +191,7 @@ public class WriteExifMetadataExample
             TiffOutputSet outputSet = null;
 
             // note that metadata might be null if no metadata is found.
-            IImageMetadata metadata = Sanselan.getMetadata(jpegImageFile);
+            IImageMetadata metadata = Imaging.getMetadata(jpegImageFile);
             JpegImageMetadata jpegMetadata = (JpegImageMetadata) metadata;
             if (null != jpegMetadata)
             {
@@ -286,7 +286,7 @@ public class WriteExifMetadataExample
             TiffOutputSet outputSet = null;
 
             // note that metadata might be null if no metadata is found.
-            IImageMetadata metadata = Sanselan.getMetadata(jpegImageFile);
+            IImageMetadata metadata = Imaging.getMetadata(jpegImageFile);
             JpegImageMetadata jpegMetadata = (JpegImageMetadata) metadata;
             if (null != jpegMetadata)
             {

Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/bmp/BmpBaseTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/bmp/BmpBaseTest.java?rev=1326730&r1=1326729&r2=1326730&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/bmp/BmpBaseTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/bmp/BmpBaseTest.java Mon Apr 16 18:33:26 2012
@@ -23,16 +23,16 @@ import java.util.List;
 
 import org.apache.commons.imaging.ImageFormat;
 import org.apache.commons.imaging.ImageReadException;
-import org.apache.commons.imaging.Sanselan;
-import org.apache.commons.imaging.SanselanTest;
+import org.apache.commons.imaging.Imaging;
+import org.apache.commons.imaging.ImagingTest;
 
-public abstract class BmpBaseTest extends SanselanTest
+public abstract class BmpBaseTest extends ImagingTest
 {
 
     private static boolean isBmp(File file) throws IOException,
             ImageReadException
     {
-        ImageFormat format = Sanselan.guessFormat(file);
+        ImageFormat format = Imaging.guessFormat(file);
         return format == ImageFormat.IMAGE_FORMAT_BMP;
     }
 

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=1326730&r1=1326729&r2=1326730&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 Mon Apr 16 18:33:26 2012
@@ -24,7 +24,7 @@ import java.util.List;
 import java.util.Map;
 
 import org.apache.commons.imaging.ImageInfo;
-import org.apache.commons.imaging.Sanselan;
+import org.apache.commons.imaging.Imaging;
 import org.apache.commons.imaging.common.IImageMetadata;
 import org.apache.commons.imaging.util.Debug;
 
@@ -44,15 +44,15 @@ public class BmpReadTest extends BmpBase
             File imageFile = (File) images.get(i);
             Debug.debug("imageFile", imageFile);
 
-            IImageMetadata metadata = Sanselan.getMetadata(imageFile);
+            IImageMetadata metadata = Imaging.getMetadata(imageFile);
             // assertNotNull(metadata);
 
             Map params = new HashMap();
 //            params.put(PARAM_KEY_VERBOSE, Boolean.TRUE);
-            ImageInfo imageInfo = Sanselan.getImageInfo(imageFile, params);
+            ImageInfo imageInfo = Imaging.getImageInfo(imageFile, params);
             assertNotNull(imageInfo);
 
-            BufferedImage image = Sanselan.getBufferedImage(imageFile);
+            BufferedImage image = Imaging.getBufferedImage(imageFile);
             assertNotNull(image);
         }
     }

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=1326730&r1=1326729&r2=1326730&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 Mon Apr 16 18:33:26 2012
@@ -27,7 +27,7 @@ import java.util.Random;
 import org.apache.commons.imaging.ImageFormat;
 import org.apache.commons.imaging.ImageReadException;
 import org.apache.commons.imaging.ImageWriteException;
-import org.apache.commons.imaging.Sanselan;
+import org.apache.commons.imaging.Imaging;
 import org.apache.commons.imaging.util.Debug;
 import org.apache.commons.imaging.util.IoUtils;
 
@@ -148,7 +148,7 @@ public class BmpRoundtripTest extends Bm
         // writeParams.put(PngConstants.PARAM_KEY_BMP_FORCE_TRUE_COLOR,
         // Boolean.TRUE);
 
-        byte bytes[] = Sanselan.writeImageToBytes(srcImage,
+        byte bytes[] = Imaging.writeImageToBytes(srcImage,
                 ImageFormat.IMAGE_FORMAT_BMP, writeParams);
 
         // Debug.debug("bytes", bytes);
@@ -156,7 +156,7 @@ public class BmpRoundtripTest extends Bm
         File tempFile = createTempFile("temp", ".bmp");
         IoUtils.writeToFile(bytes, tempFile);
 
-        BufferedImage dstImage = Sanselan.getBufferedImage(bytes);
+        BufferedImage dstImage = Imaging.getBufferedImage(bytes);
 
         assertNotNull(dstImage);
         assertTrue(srcImage.getWidth() == dstImage.getWidth());

Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/dcx/DcxBaseTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/dcx/DcxBaseTest.java?rev=1326730&r1=1326729&r2=1326730&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/dcx/DcxBaseTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/dcx/DcxBaseTest.java Mon Apr 16 18:33:26 2012
@@ -23,15 +23,15 @@ import java.util.List;
 
 import org.apache.commons.imaging.ImageFormat;
 import org.apache.commons.imaging.ImageReadException;
-import org.apache.commons.imaging.Sanselan;
-import org.apache.commons.imaging.SanselanTest;
+import org.apache.commons.imaging.Imaging;
+import org.apache.commons.imaging.ImagingTest;
 
-public abstract class DcxBaseTest extends SanselanTest
+public abstract class DcxBaseTest extends ImagingTest
 {
 
     private static boolean isDcx(File file) throws IOException, ImageReadException
     {
-        ImageFormat format = Sanselan.guessFormat(file);
+        ImageFormat format = Imaging.guessFormat(file);
         return format == ImageFormat.IMAGE_FORMAT_DCX;
     }
 

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=1326730&r1=1326729&r2=1326730&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 Mon Apr 16 18:33:26 2012
@@ -24,7 +24,7 @@ import java.util.List;
 import java.util.Map;
 
 import org.apache.commons.imaging.ImageInfo;
-import org.apache.commons.imaging.Sanselan;
+import org.apache.commons.imaging.Imaging;
 import org.apache.commons.imaging.common.IImageMetadata;
 import org.apache.commons.imaging.util.Debug;
 
@@ -44,14 +44,14 @@ public class DcxReadTest extends DcxBase
             File imageFile = (File) images.get(i);
             Debug.debug("imageFile", imageFile);
 
-            IImageMetadata metadata = Sanselan.getMetadata(imageFile);
+            IImageMetadata metadata = Imaging.getMetadata(imageFile);
             // assertNotNull(metadata);
 
             Map params = new HashMap();
-            ImageInfo imageInfo = Sanselan.getImageInfo(imageFile, params);
+            ImageInfo imageInfo = Imaging.getImageInfo(imageFile, params);
             //assertNotNull(imageInfo);
 
-            BufferedImage image = Sanselan.getBufferedImage(imageFile);
+            BufferedImage image = Imaging.getBufferedImage(imageFile);
             assertNotNull(image);
         }
     }

Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/gif/GifBaseTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/gif/GifBaseTest.java?rev=1326730&r1=1326729&r2=1326730&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/gif/GifBaseTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/gif/GifBaseTest.java Mon Apr 16 18:33:26 2012
@@ -23,16 +23,16 @@ import java.util.List;
 
 import org.apache.commons.imaging.ImageFormat;
 import org.apache.commons.imaging.ImageReadException;
-import org.apache.commons.imaging.Sanselan;
-import org.apache.commons.imaging.SanselanTest;
+import org.apache.commons.imaging.Imaging;
+import org.apache.commons.imaging.ImagingTest;
 
-public abstract class GifBaseTest extends SanselanTest
+public abstract class GifBaseTest extends ImagingTest
 {
 
     private static boolean isGif(File file) throws IOException,
             ImageReadException
     {
-        ImageFormat format = Sanselan.guessFormat(file);
+        ImageFormat format = Imaging.guessFormat(file);
         return format == ImageFormat.IMAGE_FORMAT_GIF;
     }
 

Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/gif/GifReadTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/gif/GifReadTest.java?rev=1326730&r1=1326729&r2=1326730&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/gif/GifReadTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/gif/GifReadTest.java Mon Apr 16 18:33:26 2012
@@ -22,7 +22,7 @@ import java.io.File;
 import java.util.List;
 
 import org.apache.commons.imaging.ImageInfo;
-import org.apache.commons.imaging.Sanselan;
+import org.apache.commons.imaging.Imaging;
 import org.apache.commons.imaging.common.IImageMetadata;
 import org.apache.commons.imaging.util.Debug;
 
@@ -42,13 +42,13 @@ public class GifReadTest extends GifBase
             File imageFile = (File) images.get(i);
             Debug.debug("imageFile", imageFile);
 
-            IImageMetadata metadata = Sanselan.getMetadata(imageFile);
+            IImageMetadata metadata = Imaging.getMetadata(imageFile);
 //            assertNotNull(metadata);
 
-            ImageInfo imageInfo = Sanselan.getImageInfo(imageFile);
+            ImageInfo imageInfo = Imaging.getImageInfo(imageFile);
             assertNotNull(imageInfo);
 
-            BufferedImage image = Sanselan.getBufferedImage(imageFile);
+            BufferedImage image = Imaging.getBufferedImage(imageFile);
             assertNotNull(image);
         }
     }

Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/icns/IcnsBaseTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/icns/IcnsBaseTest.java?rev=1326730&r1=1326729&r2=1326730&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/icns/IcnsBaseTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/icns/IcnsBaseTest.java Mon Apr 16 18:33:26 2012
@@ -23,15 +23,15 @@ import java.util.List;
 
 import org.apache.commons.imaging.ImageFormat;
 import org.apache.commons.imaging.ImageReadException;
-import org.apache.commons.imaging.Sanselan;
-import org.apache.commons.imaging.SanselanTest;
+import org.apache.commons.imaging.Imaging;
+import org.apache.commons.imaging.ImagingTest;
 
-public abstract class IcnsBaseTest extends SanselanTest
+public abstract class IcnsBaseTest extends ImagingTest
 {
 
     private static boolean isIcns(File file) throws IOException, ImageReadException
     {
-        ImageFormat format = Sanselan.guessFormat(file);
+        ImageFormat format = Imaging.guessFormat(file);
         return format == ImageFormat.IMAGE_FORMAT_ICNS;
     }
 

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=1326730&r1=1326729&r2=1326730&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 Mon Apr 16 18:33:26 2012
@@ -24,7 +24,7 @@ import java.util.List;
 import java.util.Map;
 
 import org.apache.commons.imaging.ImageInfo;
-import org.apache.commons.imaging.Sanselan;
+import org.apache.commons.imaging.Imaging;
 import org.apache.commons.imaging.common.IImageMetadata;
 import org.apache.commons.imaging.util.Debug;
 
@@ -44,14 +44,14 @@ public class IcnsReadTest extends IcnsBa
             File imageFile = (File) images.get(i);
             Debug.debug("imageFile", imageFile);
 
-            IImageMetadata metadata = Sanselan.getMetadata(imageFile);
+            IImageMetadata metadata = Imaging.getMetadata(imageFile);
             // assertNotNull(metadata);
 
             Map params = new HashMap();
-            ImageInfo imageInfo = Sanselan.getImageInfo(imageFile, params);
+            ImageInfo imageInfo = Imaging.getImageInfo(imageFile, params);
             assertNotNull(imageInfo);
 
-            BufferedImage image = Sanselan.getBufferedImage(imageFile);
+            BufferedImage image = Imaging.getBufferedImage(imageFile);
             assertNotNull(image);
         }
     }

Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/icns/IcnsRoundTripTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/icns/IcnsRoundTripTest.java?rev=1326730&r1=1326729&r2=1326730&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/icns/IcnsRoundTripTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/icns/IcnsRoundTripTest.java Mon Apr 16 18:33:26 2012
@@ -23,7 +23,7 @@ import java.io.File;
 import java.io.IOException;
 
 import org.apache.commons.imaging.ImageReadException;
-import org.apache.commons.imaging.Sanselan;
+import org.apache.commons.imaging.Imaging;
 import org.apache.commons.imaging.common.BinaryOutputStream;
 import org.apache.commons.imaging.formats.icns.IcnsImageParser;
 import org.apache.commons.imaging.formats.icns.IcnsType;
@@ -445,7 +445,7 @@ public class IcnsRoundTripTest extends I
         File tempFile = createTempFile("temp", ".icns");
         IoUtils.writeToFile(rawData, tempFile);
 
-        BufferedImage dstImage = Sanselan.getBufferedImage(tempFile);
+        BufferedImage dstImage = Imaging.getBufferedImage(tempFile);
 
         assertNotNull(dstImage);
         assertTrue(dstImage.getWidth() == image[0].length);

Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/ico/IcoBaseTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/ico/IcoBaseTest.java?rev=1326730&r1=1326729&r2=1326730&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/ico/IcoBaseTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/ico/IcoBaseTest.java Mon Apr 16 18:33:26 2012
@@ -22,9 +22,9 @@ import java.io.IOException;
 import java.util.List;
 
 import org.apache.commons.imaging.ImageReadException;
-import org.apache.commons.imaging.SanselanTest;
+import org.apache.commons.imaging.ImagingTest;
 
-public abstract class IcoBaseTest extends SanselanTest
+public abstract class IcoBaseTest extends ImagingTest
 {
 
     private static boolean isIco(File file)

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=1326730&r1=1326729&r2=1326730&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 Mon Apr 16 18:33:26 2012
@@ -24,7 +24,7 @@ import java.util.List;
 import java.util.Map;
 
 import org.apache.commons.imaging.ImageInfo;
-import org.apache.commons.imaging.Sanselan;
+import org.apache.commons.imaging.Imaging;
 import org.apache.commons.imaging.common.IImageMetadata;
 import org.apache.commons.imaging.util.Debug;
 
@@ -44,14 +44,14 @@ public class IcoReadTest extends IcoBase
             File imageFile = (File) images.get(i);
             Debug.debug("imageFile", imageFile);
 
-            IImageMetadata metadata = Sanselan.getMetadata(imageFile);
+            IImageMetadata metadata = Imaging.getMetadata(imageFile);
             // assertNotNull(metadata);
 
             Map params = new HashMap();
-            ImageInfo imageInfo = Sanselan.getImageInfo(imageFile, params);
+            ImageInfo imageInfo = Imaging.getImageInfo(imageFile, params);
             // assertNotNull(imageInfo);
 
-            BufferedImage image = Sanselan.getBufferedImage(imageFile);
+            BufferedImage image = Imaging.getBufferedImage(imageFile);
             assertNotNull(image);
         }
     }

Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/ico/IcoRoundtripTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/ico/IcoRoundtripTest.java?rev=1326730&r1=1326729&r2=1326730&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/ico/IcoRoundtripTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/ico/IcoRoundtripTest.java Mon Apr 16 18:33:26 2012
@@ -27,7 +27,7 @@ import java.util.Map;
 
 import org.apache.commons.imaging.ImageReadException;
 import org.apache.commons.imaging.ImageWriteException;
-import org.apache.commons.imaging.Sanselan;
+import org.apache.commons.imaging.Imaging;
 import org.apache.commons.imaging.common.BinaryOutputStream;
 import org.apache.commons.imaging.util.Debug;
 import org.apache.commons.imaging.util.IoUtils;
@@ -553,7 +553,7 @@ public class IcoRoundtripTest extends Ic
         File tempFile = createTempFile("temp", ".ico");
         IoUtils.writeToFile(rawData, tempFile);
 
-        BufferedImage dstImage = Sanselan.getBufferedImage(tempFile);
+        BufferedImage dstImage = Imaging.getBufferedImage(tempFile);
 
         assertNotNull(dstImage);
         assertTrue(dstImage.getWidth() == image[0].length);



Mime
View raw message