commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ggreg...@apache.org
Subject svn commit: r1220868 [4/4] - in /commons/proper/sanselan/trunk/src: main/java/org/apache/commons/sanselan/ main/java/org/apache/commons/sanselan/color/ main/java/org/apache/commons/sanselan/common/ main/java/org/apache/commons/sanselan/common/mylzw/ ma...
Date Mon, 19 Dec 2011 17:27:32 GMT
Modified: commons/proper/sanselan/trunk/src/test/java/org/apache/commons/sanselan/formats/jpeg/exif/ExifRewriteTest.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/test/java/org/apache/commons/sanselan/formats/jpeg/exif/ExifRewriteTest.java?rev=1220868&r1=1220867&r2=1220868&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/test/java/org/apache/commons/sanselan/formats/jpeg/exif/ExifRewriteTest.java
(original)
+++ commons/proper/sanselan/trunk/src/test/java/org/apache/commons/sanselan/formats/jpeg/exif/ExifRewriteTest.java
Mon Dec 19 17:27:28 2011
@@ -42,7 +42,7 @@ import org.apache.commons.sanselan.forma
 import org.apache.commons.sanselan.formats.tiff.constants.AllTagConstants;
 import org.apache.commons.sanselan.formats.tiff.write.TiffOutputSet;
 import org.apache.commons.sanselan.util.Debug;
-import org.apache.commons.sanselan.util.IOUtils;
+import org.apache.commons.sanselan.util.IoUtils;
 
 public class ExifRewriteTest extends ExifBaseTest implements AllTagConstants
 {
@@ -83,7 +83,7 @@ public class ExifRewriteTest extends Exi
                 byte bytes[] = baos.toByteArray();
                 File tempFile = createTempFile("test", ".jpg");
                 Debug.debug("tempFile", tempFile);
-                IOUtils.writeToFile(bytes, tempFile);
+                IoUtils.writeToFile(bytes, tempFile);
 
                 Debug.debug("Output Segments:");
                 new JpegUtils().dumpJFIF(new ByteSourceArray(bytes));
@@ -127,7 +127,7 @@ public class ExifRewriteTest extends Exi
                 byte bytes[] = baos.toByteArray();
                 File tempFile = createTempFile("removed", ".jpg");
                 Debug.debug("tempFile", tempFile);
-                IOUtils.writeToFile(bytes, tempFile);
+                IoUtils.writeToFile(bytes, tempFile);
 
                 Debug.debug("Output Segments:");
                 stripped = new ByteSourceArray(bytes);
@@ -148,7 +148,7 @@ public class ExifRewriteTest extends Exi
                 byte bytes[] = baos.toByteArray();
                 File tempFile = createTempFile("inserted" + "_", ".jpg");
                 Debug.debug("tempFile", tempFile);
-                IOUtils.writeToFile(bytes, tempFile);
+                IoUtils.writeToFile(bytes, tempFile);
 
                 Debug.debug("Output Segments:");
                 new JpegUtils().dumpJFIF(new ByteSourceArray(bytes));
@@ -222,7 +222,7 @@ public class ExifRewriteTest extends Exi
                 byte bytes[] = baos.toByteArray();
                 File tempFile = createTempFile(name + "_", ".jpg");
                 Debug.debug("tempFile", tempFile);
-                IOUtils.writeToFile(bytes, tempFile);
+                IoUtils.writeToFile(bytes, tempFile);
 
                 Debug.debug("Output Segments:");
                 new JpegUtils().dumpJFIF(new ByteSourceArray(bytes));

Modified: commons/proper/sanselan/trunk/src/test/java/org/apache/commons/sanselan/formats/jpeg/exif/WriteExifMetadataExampleTest.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/test/java/org/apache/commons/sanselan/formats/jpeg/exif/WriteExifMetadataExampleTest.java?rev=1220868&r1=1220867&r2=1220868&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/test/java/org/apache/commons/sanselan/formats/jpeg/exif/WriteExifMetadataExampleTest.java
(original)
+++ commons/proper/sanselan/trunk/src/test/java/org/apache/commons/sanselan/formats/jpeg/exif/WriteExifMetadataExampleTest.java
Mon Dec 19 17:27:28 2011
@@ -23,9 +23,9 @@ import java.util.List;
 
 import org.apache.commons.sanselan.ImageReadException;
 import org.apache.commons.sanselan.ImageWriteException;
+import org.apache.commons.sanselan.examples.WriteExifMetadataExample;
 import org.apache.commons.sanselan.formats.jpeg.exif.ExifRewriter;
 import org.apache.commons.sanselan.formats.tiff.constants.AllTagConstants;
-import org.apache.commons.sanselan.sampleUsage.WriteExifMetadataExample;
 import org.apache.commons.sanselan.util.Debug;
 
 public class WriteExifMetadataExampleTest extends ExifBaseTest

Modified: commons/proper/sanselan/trunk/src/test/java/org/apache/commons/sanselan/formats/jpeg/iptc/IptcDumpTest.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/test/java/org/apache/commons/sanselan/formats/jpeg/iptc/IptcDumpTest.java?rev=1220868&r1=1220867&r2=1220868&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/test/java/org/apache/commons/sanselan/formats/jpeg/iptc/IptcDumpTest.java
(original)
+++ commons/proper/sanselan/trunk/src/test/java/org/apache/commons/sanselan/formats/jpeg/iptc/IptcDumpTest.java
Mon Dec 19 17:27:28 2011
@@ -27,8 +27,8 @@ import org.apache.commons.sanselan.Image
 import org.apache.commons.sanselan.Sanselan;
 import org.apache.commons.sanselan.formats.jpeg.JpegImageMetadata;
 import org.apache.commons.sanselan.formats.jpeg.JpegPhotoshopMetadata;
-import org.apache.commons.sanselan.formats.jpeg.iptc.IPTCConstants;
-import org.apache.commons.sanselan.formats.jpeg.iptc.IPTCRecord;
+import org.apache.commons.sanselan.formats.jpeg.iptc.IptcConstants;
+import org.apache.commons.sanselan.formats.jpeg.iptc.IptcRecord;
 import org.apache.commons.sanselan.util.Debug;
 
 public class IptcDumpTest extends IptcBaseTest
@@ -73,8 +73,8 @@ public class IptcDumpTest extends IptcBa
             Debug.debug();
             for (int j = 0; j < oldRecords.size(); j++)
             {
-                IPTCRecord record = (IPTCRecord) oldRecords.get(j);
-                if (record.iptcType.type != IPTCConstants.IPTC_TYPE_CITY.type)
+                IptcRecord record = (IptcRecord) oldRecords.get(j);
+                if (record.iptcType.type != IptcConstants.IPTC_TYPE_CITY.type)
                     Debug.debug("Key: " + record.iptcType.name + " (0x"
                             + Integer.toHexString(record.iptcType.type)
                             + "), value: " + record.value);

Modified: commons/proper/sanselan/trunk/src/test/java/org/apache/commons/sanselan/formats/jpeg/iptc/IptcUpdateTest.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/test/java/org/apache/commons/sanselan/formats/jpeg/iptc/IptcUpdateTest.java?rev=1220868&r1=1220867&r2=1220868&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/test/java/org/apache/commons/sanselan/formats/jpeg/iptc/IptcUpdateTest.java
(original)
+++ commons/proper/sanselan/trunk/src/test/java/org/apache/commons/sanselan/formats/jpeg/iptc/IptcUpdateTest.java
Mon Dec 19 17:27:28 2011
@@ -33,8 +33,8 @@ import org.apache.commons.sanselan.commo
 import org.apache.commons.sanselan.common.bytesource.ByteSourceFile;
 import org.apache.commons.sanselan.formats.jpeg.JpegImageParser;
 import org.apache.commons.sanselan.formats.jpeg.JpegPhotoshopMetadata;
-import org.apache.commons.sanselan.formats.jpeg.iptc.IPTCConstants;
-import org.apache.commons.sanselan.formats.jpeg.iptc.IPTCRecord;
+import org.apache.commons.sanselan.formats.jpeg.iptc.IptcConstants;
+import org.apache.commons.sanselan.formats.jpeg.iptc.IptcRecord;
 import org.apache.commons.sanselan.formats.jpeg.iptc.JpegIptcRewriter;
 import org.apache.commons.sanselan.formats.jpeg.iptc.PhotoshopApp13Data;
 import org.apache.commons.sanselan.util.Debug;
@@ -181,15 +181,15 @@ public class IptcUpdateTest extends Iptc
                 List newRecords = new ArrayList();
                 for (int j = 0; j < oldRecords.size(); j++)
                 {
-                    IPTCRecord record = (IPTCRecord) oldRecords.get(j);
-                    if (record.iptcType.type != IPTCConstants.IPTC_TYPE_CITY.type
-                            && record.iptcType.type != IPTCConstants.IPTC_TYPE_CREDIT.type)
+                    IptcRecord record = (IptcRecord) oldRecords.get(j);
+                    if (record.iptcType.type != IptcConstants.IPTC_TYPE_CITY.type
+                            && record.iptcType.type != IptcConstants.IPTC_TYPE_CREDIT.type)
                         newRecords.add(record);
                 }
 
-                newRecords.add(new IPTCRecord(IPTCConstants.IPTC_TYPE_CITY,
+                newRecords.add(new IptcRecord(IptcConstants.IPTC_TYPE_CITY,
                         "Albany, NY"));
-                newRecords.add(new IPTCRecord(IPTCConstants.IPTC_TYPE_CREDIT,
+                newRecords.add(new IptcRecord(IptcConstants.IPTC_TYPE_CREDIT,
                         "William Sorensen"));
 
                 PhotoshopApp13Data newData = new PhotoshopApp13Data(newRecords,
@@ -233,9 +233,9 @@ public class IptcUpdateTest extends Iptc
                 List newBlocks = metadata.photoshopApp13Data.getNonIptcBlocks();
                 List newRecords = new ArrayList();
 
-                newRecords.add(new IPTCRecord(IPTCConstants.IPTC_TYPE_CITY,
+                newRecords.add(new IptcRecord(IptcConstants.IPTC_TYPE_CITY,
                         "Albany, NY"));
-                newRecords.add(new IPTCRecord(IPTCConstants.IPTC_TYPE_CREDIT,
+                newRecords.add(new IptcRecord(IptcConstants.IPTC_TYPE_CREDIT,
                         "William Sorensen"));
 
                 PhotoshopApp13Data newData = new PhotoshopApp13Data(newRecords,
@@ -279,9 +279,9 @@ public class IptcUpdateTest extends Iptc
                 List newBlocks = new ArrayList();
                 List newRecords = new ArrayList();
 
-                newRecords.add(new IPTCRecord(IPTCConstants.IPTC_TYPE_CITY,
+                newRecords.add(new IptcRecord(IptcConstants.IPTC_TYPE_CITY,
                         "Albany, NY"));
-                newRecords.add(new IPTCRecord(IPTCConstants.IPTC_TYPE_CREDIT,
+                newRecords.add(new IptcRecord(IptcConstants.IPTC_TYPE_CREDIT,
                         "William Sorensen"));
 
                 PhotoshopApp13Data newData = new PhotoshopApp13Data(newRecords,
@@ -373,17 +373,17 @@ public class IptcUpdateTest extends Iptc
                         newRecords = new ArrayList();
                         for (int j = 0; j < oldRecords.size(); j++)
                         {
-                            IPTCRecord record = (IPTCRecord) oldRecords.get(j);
-                            if (record.iptcType.type != IPTCConstants.IPTC_TYPE_CITY.type
-                                    && record.iptcType.type != IPTCConstants.IPTC_TYPE_CREDIT.type)
+                            IptcRecord record = (IptcRecord) oldRecords.get(j);
+                            if (record.iptcType.type != IptcConstants.IPTC_TYPE_CITY.type
+                                    && record.iptcType.type != IptcConstants.IPTC_TYPE_CREDIT.type)
                                 newRecords.add(record);
                         }
                     }
                 }
 
-                newRecords.add(new IPTCRecord(IPTCConstants.IPTC_TYPE_CITY,
+                newRecords.add(new IptcRecord(IptcConstants.IPTC_TYPE_CITY,
                         "Albany, NY"));
-                newRecords.add(new IPTCRecord(IPTCConstants.IPTC_TYPE_CREDIT,
+                newRecords.add(new IptcRecord(IptcConstants.IPTC_TYPE_CREDIT,
                         "William Sorensen"));
 
                 PhotoshopApp13Data newData = new PhotoshopApp13Data(newRecords,

Modified: commons/proper/sanselan/trunk/src/test/java/org/apache/commons/sanselan/formats/png/PngTextTest.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/test/java/org/apache/commons/sanselan/formats/png/PngTextTest.java?rev=1220868&r1=1220867&r2=1220868&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/test/java/org/apache/commons/sanselan/formats/png/PngTextTest.java
(original)
+++ commons/proper/sanselan/trunk/src/test/java/org/apache/commons/sanselan/formats/png/PngTextTest.java
Mon Dec 19 17:27:28 2011
@@ -33,7 +33,7 @@ import org.apache.commons.sanselan.Sanse
 import org.apache.commons.sanselan.formats.png.PngConstants;
 import org.apache.commons.sanselan.formats.png.PngImageInfo;
 import org.apache.commons.sanselan.formats.png.PngText;
-import org.apache.commons.sanselan.util.IOUtils;
+import org.apache.commons.sanselan.util.IoUtils;
 
 public class PngTextTest extends PngBaseTest
 {
@@ -75,7 +75,7 @@ public class PngTextTest extends PngBase
                 ImageFormat.IMAGE_FORMAT_PNG, writeParams);
 
         File tempFile = createTempFile("temp", ".png");
-        IOUtils.writeToFile(bytes, tempFile);
+        IoUtils.writeToFile(bytes, tempFile);
 
         PngImageInfo imageInfo = (PngImageInfo) Sanselan.getImageInfo(bytes);
         assertNotNull(imageInfo);

Modified: commons/proper/sanselan/trunk/src/test/java/org/apache/commons/sanselan/formats/png/PngWriteReadTest.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/test/java/org/apache/commons/sanselan/formats/png/PngWriteReadTest.java?rev=1220868&r1=1220867&r2=1220868&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/test/java/org/apache/commons/sanselan/formats/png/PngWriteReadTest.java
(original)
+++ commons/proper/sanselan/trunk/src/test/java/org/apache/commons/sanselan/formats/png/PngWriteReadTest.java
Mon Dec 19 17:27:28 2011
@@ -29,7 +29,7 @@ import org.apache.commons.sanselan.Image
 import org.apache.commons.sanselan.ImageWriteException;
 import org.apache.commons.sanselan.Sanselan;
 import org.apache.commons.sanselan.SanselanTest;
-import org.apache.commons.sanselan.util.IOUtils;
+import org.apache.commons.sanselan.util.IoUtils;
 
 public class PngWriteReadTest extends SanselanTest
 {
@@ -152,7 +152,7 @@ public class PngWriteReadTest extends Sa
         //        Debug.debug("bytes", bytes);
 
         File tempFile = createTempFile("temp", ".png");
-        IOUtils.writeToFile(bytes, tempFile);
+        IoUtils.writeToFile(bytes, tempFile);
 
         BufferedImage dstImage = Sanselan.getBufferedImage(bytes);
 

Copied: commons/proper/sanselan/trunk/src/test/java/org/apache/commons/sanselan/formats/tiff/TiffLzwTest.java
(from r1220584, commons/proper/sanselan/trunk/src/test/java/org/apache/commons/sanselan/formats/tiff/TiffLZWTest.java)
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/test/java/org/apache/commons/sanselan/formats/tiff/TiffLzwTest.java?p2=commons/proper/sanselan/trunk/src/test/java/org/apache/commons/sanselan/formats/tiff/TiffLzwTest.java&p1=commons/proper/sanselan/trunk/src/test/java/org/apache/commons/sanselan/formats/tiff/TiffLZWTest.java&r1=1220584&r2=1220868&rev=1220868&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/test/java/org/apache/commons/sanselan/formats/tiff/TiffLZWTest.java
(original)
+++ commons/proper/sanselan/trunk/src/test/java/org/apache/commons/sanselan/formats/tiff/TiffLzwTest.java
Mon Dec 19 17:27:28 2011
@@ -24,11 +24,11 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.commons.sanselan.common.BinaryConstants;
-import org.apache.commons.sanselan.common.mylzw.MyLZWCompressor;
-import org.apache.commons.sanselan.common.mylzw.MyLZWDecompressor;
+import org.apache.commons.sanselan.common.mylzw.MyLzwCompressor;
+import org.apache.commons.sanselan.common.mylzw.MyLzwDecompressor;
 import org.apache.commons.sanselan.util.Debug;
 
-public class TiffLZWTest extends TiffBaseTest implements BinaryConstants
+public class TiffLzwTest extends TiffBaseTest implements BinaryConstants
 {
 
     public void testTrivial() throws IOException
@@ -88,7 +88,7 @@ public class TiffLZWTest extends TiffBas
 
         int LZW_MINIMUM_CODE_SIZE = 8;
         final List codes = new ArrayList();
-        MyLZWCompressor.Listener compressionListener = new MyLZWCompressor.Listener() {
+        MyLzwCompressor.Listener compressionListener = new MyLzwCompressor.Listener() {
             public void dataCode(int code)
             {
                 codes.add(new Integer(code));
@@ -109,11 +109,11 @@ public class TiffLZWTest extends TiffBas
             }
         };
 
-        MyLZWCompressor compressor = new MyLZWCompressor(LZW_MINIMUM_CODE_SIZE,
+        MyLzwCompressor compressor = new MyLzwCompressor(LZW_MINIMUM_CODE_SIZE,
                 BYTE_ORDER_MSB, true, compressionListener);
         byte compressed[] = compressor.compress(src);
 
-        MyLZWDecompressor.Listener decompressionListener = new MyLZWDecompressor.Listener()
{
+        MyLzwDecompressor.Listener decompressionListener = new MyLzwDecompressor.Listener()
{
 
             int index = 0;
             int clearCode, eoiCode;
@@ -162,7 +162,7 @@ public class TiffLZWTest extends TiffBas
 
         };
         InputStream is = new ByteArrayInputStream(compressed);
-        MyLZWDecompressor decompressor = new MyLZWDecompressor(
+        MyLzwDecompressor decompressor = new MyLzwDecompressor(
                 LZW_MINIMUM_CODE_SIZE, BYTE_ORDER_NETWORK,
                 decompressionListener);
         decompressor.setTiffLZWMode();
@@ -182,7 +182,7 @@ public class TiffLZWTest extends TiffBas
         int LZW_MINIMUM_CODE_SIZE = 8;
         final List codes = new ArrayList();
 
-        MyLZWDecompressor.Listener decompressionListener = new MyLZWDecompressor.Listener()
{
+        MyLzwDecompressor.Listener decompressionListener = new MyLzwDecompressor.Listener()
{
 
             public void code(int code)
             {
@@ -199,13 +199,13 @@ public class TiffLZWTest extends TiffBas
 
         };
         InputStream is = new ByteArrayInputStream(src);
-        MyLZWDecompressor decompressor = new MyLZWDecompressor(
+        MyLzwDecompressor decompressor = new MyLzwDecompressor(
                 LZW_MINIMUM_CODE_SIZE, BYTE_ORDER_NETWORK,
                 decompressionListener);
         decompressor.setTiffLZWMode();
         byte decompressed[] = decompressor.decompress(is, src.length);
 
-        MyLZWCompressor.Listener compressionListener = new MyLZWCompressor.Listener() {
+        MyLzwCompressor.Listener compressionListener = new MyLzwCompressor.Listener() {
 
             int clearCode, eoiCode;
 
@@ -268,7 +268,7 @@ public class TiffLZWTest extends TiffBas
 
         };
 
-        MyLZWCompressor compressor = new MyLZWCompressor(LZW_MINIMUM_CODE_SIZE,
+        MyLzwCompressor compressor = new MyLzwCompressor(LZW_MINIMUM_CODE_SIZE,
                 BYTE_ORDER_MSB, true, compressionListener);
         byte compressed[] = compressor.compress(decompressed);
 

Modified: commons/proper/sanselan/trunk/src/test/java/org/apache/commons/sanselan/roundtrip/RoundtripTest.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/test/java/org/apache/commons/sanselan/roundtrip/RoundtripTest.java?rev=1220868&r1=1220867&r2=1220868&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/test/java/org/apache/commons/sanselan/roundtrip/RoundtripTest.java
(original)
+++ commons/proper/sanselan/trunk/src/test/java/org/apache/commons/sanselan/roundtrip/RoundtripTest.java
Mon Dec 19 17:27:28 2011
@@ -31,7 +31,7 @@ import org.apache.commons.sanselan.Sanse
 import org.apache.commons.sanselan.SanselanTest;
 import org.apache.commons.sanselan.common.RgbBufferedImageFactory;
 import org.apache.commons.sanselan.util.Debug;
-import org.apache.commons.sanselan.util.IOUtils;
+import org.apache.commons.sanselan.util.IoUtils;
 
 public class RoundtripTest extends SanselanTest
 {
@@ -257,8 +257,8 @@ public class RoundtripTest extends Sanse
         assertTrue(b.exists() && b.isFile());
         assertEquals(a.length(), b.length());
 
-        byte aData[] = IOUtils.getFileBytes(a);
-        byte bData[] = IOUtils.getFileBytes(b);
+        byte aData[] = IoUtils.getFileBytes(a);
+        byte bData[] = IoUtils.getFileBytes(b);
 
         for (int i = 0; i < a.length(); i++)
         {

Copied: commons/proper/sanselan/trunk/src/test/java/org/apache/commons/sanselan/test/util/FileSystemTraversal.java
(from r1220584, commons/proper/sanselan/trunk/src/test/java/org/apache/commons/sanselan/test/util/FSTraversal.java)
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/test/java/org/apache/commons/sanselan/test/util/FileSystemTraversal.java?p2=commons/proper/sanselan/trunk/src/test/java/org/apache/commons/sanselan/test/util/FileSystemTraversal.java&p1=commons/proper/sanselan/trunk/src/test/java/org/apache/commons/sanselan/test/util/FSTraversal.java&r1=1220584&r2=1220868&rev=1220868&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/test/java/org/apache/commons/sanselan/test/util/FSTraversal.java
(original)
+++ commons/proper/sanselan/trunk/src/test/java/org/apache/commons/sanselan/test/util/FileSystemTraversal.java
Mon Dec 19 17:27:28 2011
@@ -21,7 +21,7 @@ import java.io.File;
 
 import org.apache.commons.sanselan.util.Debug;
 
-public class FSTraversal
+public class FileSystemTraversal
 {
 
     public static final int MODE_FILES = 1;



Mime
View raw message