commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ggreg...@apache.org
Subject svn commit: r1220868 [3/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/main/java/org/apache/commons/sanselan/formats/png/ScanExpediterSimple.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/png/ScanExpediterSimple.java?rev=1220868&r1=1220867&r2=1220868&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/png/ScanExpediterSimple.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/png/ScanExpediterSimple.java Mon Dec 19 17:27:28 2011
@@ -21,14 +21,14 @@ import java.io.IOException;
 import java.io.InputStream;
 
 import org.apache.commons.sanselan.ImageReadException;
-import org.apache.commons.sanselan.formats.png.chunks.PNGChunkPLTE;
+import org.apache.commons.sanselan.formats.png.chunks.PngChunkPlte;
 import org.apache.commons.sanselan.formats.transparencyfilters.TransparencyFilter;
 
 public class ScanExpediterSimple extends ScanExpediter
 {
     public ScanExpediterSimple(int width, int height, InputStream is,
             BufferedImage bi, int color_type, int BitDepth, int bitsPerPixel,
-            PNGChunkPLTE pngChunkPLTE, GammaCorrection gammaCorrection,
+            PngChunkPlte pngChunkPLTE, GammaCorrection gammaCorrection,
             TransparencyFilter transparencyFilter)
 
     {

Copied: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/png/chunks/PngChunk.java (from r1220584, commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/png/chunks/PNGChunk.java)
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/png/chunks/PngChunk.java?p2=commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/png/chunks/PngChunk.java&p1=commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/png/chunks/PNGChunk.java&r1=1220584&r2=1220868&rev=1220868&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/png/chunks/PNGChunk.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/png/chunks/PngChunk.java Mon Dec 19 17:27:28 2011
@@ -20,7 +20,7 @@ import java.io.ByteArrayInputStream;
 
 import org.apache.commons.sanselan.common.BinaryFileParser;
 
-public class PNGChunk extends BinaryFileParser
+public class PngChunk extends BinaryFileParser
 {
     public final int length;
     public final int chunkType;
@@ -30,7 +30,7 @@ public class PNGChunk extends BinaryFile
     public final boolean propertyBits[];
     public final boolean ancillary, isPrivate, reserved, safeToCopy;
 
-    public PNGChunk(int Length, int ChunkType, int CRC, byte bytes[])
+    public PngChunk(int Length, int ChunkType, int CRC, byte bytes[])
     {
         this.length = Length;
         this.chunkType = ChunkType;

Copied: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/png/chunks/PngChunkGama.java (from r1220584, commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/png/chunks/PNGChunkgAMA.java)
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/png/chunks/PngChunkGama.java?p2=commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/png/chunks/PngChunkGama.java&p1=commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/png/chunks/PNGChunkgAMA.java&r1=1220584&r2=1220868&rev=1220868&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/png/chunks/PNGChunkgAMA.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/png/chunks/PngChunkGama.java Mon Dec 19 17:27:28 2011
@@ -21,11 +21,11 @@ import java.io.IOException;
 
 import org.apache.commons.sanselan.ImageReadException;
 
-public class PNGChunkgAMA extends PNGChunk
+public class PngChunkGama extends PngChunk
 {
     public final int Gamma;
 
-    public PNGChunkgAMA(int Length, int ChunkType, int CRC, byte bytes[])
+    public PngChunkGama(int Length, int ChunkType, int CRC, byte bytes[])
             throws ImageReadException, IOException
     {
         super(Length, ChunkType, CRC, bytes);

Copied: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/png/chunks/PngChunkIccp.java (from r1220584, commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/png/chunks/PNGChunkiCCP.java)
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/png/chunks/PngChunkIccp.java?p2=commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/png/chunks/PngChunkIccp.java&p1=commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/png/chunks/PNGChunkiCCP.java&r1=1220584&r2=1220868&rev=1220868&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/png/chunks/PNGChunkiCCP.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/png/chunks/PngChunkIccp.java Mon Dec 19 17:27:28 2011
@@ -21,7 +21,7 @@ import java.io.IOException;
 import org.apache.commons.sanselan.ImageReadException;
 import org.apache.commons.sanselan.common.ZLibUtils;
 
-public class PNGChunkiCCP extends PNGChunk
+public class PngChunkIccp extends PngChunk
 {
     //    private final PngImageParser parser;
     public final String ProfileName;
@@ -29,7 +29,7 @@ public class PNGChunkiCCP extends PNGChu
     public final byte CompressedProfile[];
     public final byte UncompressedProfile[];
 
-    public PNGChunkiCCP(
+    public PngChunkIccp(
     //            PngImageParser parser,
             int Length, int ChunkType, int CRC, byte bytes[])
             throws ImageReadException, IOException
@@ -40,7 +40,7 @@ public class PNGChunkiCCP extends PNGChu
         {
             int index = findNull(bytes);
             if (index < 0)
-                throw new ImageReadException("PNGChunkiCCP: No Profile Name");
+                throw new ImageReadException("PngChunkIccp: No Profile Name");
             byte name_bytes[] = new byte[index];
             System.arraycopy(bytes, 0, name_bytes, 0, index);
             ProfileName = new String(name_bytes);

Copied: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/png/chunks/PngChunkIdat.java (from r1220584, commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/png/chunks/PNGChunkIDAT.java)
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/png/chunks/PngChunkIdat.java?p2=commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/png/chunks/PngChunkIdat.java&p1=commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/png/chunks/PNGChunkIDAT.java&r1=1220584&r2=1220868&rev=1220868&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/png/chunks/PNGChunkIDAT.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/png/chunks/PngChunkIdat.java Mon Dec 19 17:27:28 2011
@@ -18,9 +18,9 @@ package org.apache.commons.sanselan.form
 
 import java.io.IOException;
 
-public class PNGChunkIDAT extends PNGChunk
+public class PngChunkIdat extends PngChunk
 {
-    public PNGChunkIDAT(int Length, int ChunkType, int CRC, byte bytes[])
+    public PngChunkIdat(int Length, int ChunkType, int CRC, byte bytes[])
             throws IOException
     {
         super(Length, ChunkType, CRC, bytes);

Copied: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/png/chunks/PngChunkIhdr.java (from r1220584, commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/png/chunks/PNGChunkIHDR.java)
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/png/chunks/PngChunkIhdr.java?p2=commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/png/chunks/PngChunkIhdr.java&p1=commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/png/chunks/PNGChunkIHDR.java&r1=1220584&r2=1220868&rev=1220868&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/png/chunks/PNGChunkIHDR.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/png/chunks/PngChunkIhdr.java Mon Dec 19 17:27:28 2011
@@ -21,7 +21,7 @@ import java.io.IOException;
 
 import org.apache.commons.sanselan.ImageReadException;
 
-public class PNGChunkIHDR extends PNGChunk
+public class PngChunkIhdr extends PngChunk
 {
     public final int width;
     public final int height;
@@ -31,7 +31,7 @@ public class PNGChunkIHDR extends PNGChu
     public final int filterMethod;
     public final int interlaceMethod;
 
-    public PNGChunkIHDR(int Length, int ChunkType, int CRC, byte bytes[])
+    public PngChunkIhdr(int Length, int ChunkType, int CRC, byte bytes[])
             throws ImageReadException, IOException
     {
         super(Length, ChunkType, CRC, bytes);

Copied: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/png/chunks/PngChunkItxt.java (from r1220584, commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/png/chunks/PNGChunkiTXt.java)
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/png/chunks/PngChunkItxt.java?p2=commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/png/chunks/PngChunkItxt.java&p1=commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/png/chunks/PNGChunkiTXt.java&r1=1220584&r2=1220868&rev=1220868&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/png/chunks/PNGChunkiTXt.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/png/chunks/PngChunkItxt.java Mon Dec 19 17:27:28 2011
@@ -23,7 +23,7 @@ import org.apache.commons.sanselan.commo
 import org.apache.commons.sanselan.formats.png.PngConstants;
 import org.apache.commons.sanselan.formats.png.PngText;
 
-public class PNGChunkiTXt extends PNGTextChunk
+public class PngChunkItxt extends PngTextChunk
 {
     public final String keyword, text;
 
@@ -40,7 +40,7 @@ public class PNGChunkiTXt extends PNGTex
 
     public final String translatedKeyword;
 
-    public PNGChunkiTXt(int length, int chunkType, int crc, byte bytes[])
+    public PngChunkItxt(int length, int chunkType, int crc, byte bytes[])
             throws ImageReadException, IOException
     {
         super(length, chunkType, crc, bytes);

Copied: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/png/chunks/PngChunkPhys.java (from r1220584, commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/png/chunks/PNGChunkpHYs.java)
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/png/chunks/PngChunkPhys.java?p2=commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/png/chunks/PngChunkPhys.java&p1=commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/png/chunks/PNGChunkpHYs.java&r1=1220584&r2=1220868&rev=1220868&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/png/chunks/PNGChunkpHYs.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/png/chunks/PngChunkPhys.java Mon Dec 19 17:27:28 2011
@@ -21,13 +21,13 @@ import java.io.IOException;
 
 import org.apache.commons.sanselan.ImageReadException;
 
-public class PNGChunkpHYs extends PNGChunk
+public class PngChunkPhys extends PngChunk
 {
     public final int PixelsPerUnitXAxis;
     public final int PixelsPerUnitYAxis;
     public final int UnitSpecifier;
 
-    public PNGChunkpHYs(int Length, int ChunkType, int CRC, byte bytes[])
+    public PngChunkPhys(int Length, int ChunkType, int CRC, byte bytes[])
             throws ImageReadException, IOException
     {
         super(Length, ChunkType, CRC, bytes);

Copied: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/png/chunks/PngChunkPlte.java (from r1220584, commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/png/chunks/PNGChunkPLTE.java)
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/png/chunks/PngChunkPlte.java?p2=commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/png/chunks/PngChunkPlte.java&p1=commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/png/chunks/PNGChunkPLTE.java&r1=1220584&r2=1220868&rev=1220868&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/png/chunks/PNGChunkPLTE.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/png/chunks/PngChunkPlte.java Mon Dec 19 17:27:28 2011
@@ -22,11 +22,11 @@ import java.io.IOException;
 import org.apache.commons.sanselan.ImageReadException;
 import org.apache.commons.sanselan.formats.png.GammaCorrection;
 
-public class PNGChunkPLTE extends PNGChunk
+public class PngChunkPlte extends PngChunk
 {
     public final int rgb[];
 
-    public PNGChunkPLTE(int length, int ChunkType, int CRC, byte bytes[])
+    public PngChunkPlte(int length, int ChunkType, int CRC, byte bytes[])
             throws ImageReadException, IOException
     {
         super(length, ChunkType, CRC, bytes);

Copied: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/png/chunks/PngChunkText.java (from r1220584, commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/png/chunks/PNGChunktEXt.java)
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/png/chunks/PngChunkText.java?p2=commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/png/chunks/PngChunkText.java&p1=commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/png/chunks/PNGChunktEXt.java&r1=1220584&r2=1220868&rev=1220868&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/png/chunks/PNGChunktEXt.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/png/chunks/PngChunkText.java Mon Dec 19 17:27:28 2011
@@ -21,11 +21,11 @@ import java.io.IOException;
 import org.apache.commons.sanselan.ImageReadException;
 import org.apache.commons.sanselan.formats.png.PngText;
 
-public class PNGChunktEXt extends PNGTextChunk
+public class PngChunkText extends PngTextChunk
 {
     public final String keyword, text;
 
-    public PNGChunktEXt(int length, int chunkType, int crc, byte bytes[])
+    public PngChunkText(int length, int chunkType, int crc, byte bytes[])
             throws ImageReadException, IOException
     {
         super(length, chunkType, crc, bytes);

Copied: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/png/chunks/PngChunkZtxt.java (from r1220584, commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/png/chunks/PNGChunkzTXt.java)
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/png/chunks/PngChunkZtxt.java?p2=commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/png/chunks/PngChunkZtxt.java&p1=commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/png/chunks/PNGChunkzTXt.java&r1=1220584&r2=1220868&rev=1220868&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/png/chunks/PNGChunkzTXt.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/png/chunks/PngChunkZtxt.java Mon Dec 19 17:27:28 2011
@@ -23,12 +23,12 @@ import org.apache.commons.sanselan.commo
 import org.apache.commons.sanselan.formats.png.PngConstants;
 import org.apache.commons.sanselan.formats.png.PngText;
 
-public class PNGChunkzTXt extends PNGTextChunk
+public class PngChunkZtxt extends PngTextChunk
 {
 
     public final String keyword, text;
 
-    public PNGChunkzTXt(int length, int chunkType, int crc, byte bytes[])
+    public PngChunkZtxt(int length, int chunkType, int crc, byte bytes[])
             throws ImageReadException, IOException
     {
         super(length, chunkType, crc, bytes);

Copied: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/png/chunks/PngTextChunk.java (from r1220584, commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/png/chunks/PNGTextChunk.java)
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/png/chunks/PngTextChunk.java?p2=commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/png/chunks/PngTextChunk.java&p1=commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/png/chunks/PNGTextChunk.java&r1=1220584&r2=1220868&rev=1220868&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/png/chunks/PNGTextChunk.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/png/chunks/PngTextChunk.java Mon Dec 19 17:27:28 2011
@@ -20,10 +20,10 @@ import java.io.IOException;
 
 import org.apache.commons.sanselan.formats.png.PngText;
 
-public abstract class PNGTextChunk extends PNGChunk
+public abstract class PngTextChunk extends PngChunk
 {
 
-    public PNGTextChunk(int Length, int ChunkType, int CRC, byte bytes[])
+    public PngTextChunk(int Length, int ChunkType, int CRC, byte bytes[])
             throws IOException
     {
         super(Length, ChunkType, CRC, bytes);

Copied: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/pnm/PbmFileInfo.java (from r1220584, commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/pnm/PBMFileInfo.java)
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/pnm/PbmFileInfo.java?p2=commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/pnm/PbmFileInfo.java&p1=commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/pnm/PBMFileInfo.java&r1=1220584&r2=1220868&rev=1220868&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/pnm/PBMFileInfo.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/pnm/PbmFileInfo.java Mon Dec 19 17:27:28 2011
@@ -22,9 +22,9 @@ import java.io.InputStream;
 import org.apache.commons.sanselan.ImageFormat;
 import org.apache.commons.sanselan.ImageInfo;
 
-public class PBMFileInfo extends FileInfo
+public class PbmFileInfo extends FileInfo
 {
-    public PBMFileInfo(int width, int height, boolean RAWBITS)
+    public PbmFileInfo(int width, int height, boolean RAWBITS)
     {
         super(width, height, RAWBITS);
     }

Copied: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/pnm/PbmWriter.java (from r1220584, commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/pnm/PBMWriter.java)
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/pnm/PbmWriter.java?p2=commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/pnm/PbmWriter.java&p1=commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/pnm/PBMWriter.java&r1=1220584&r2=1220868&rev=1220868&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/pnm/PBMWriter.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/pnm/PbmWriter.java Mon Dec 19 17:27:28 2011
@@ -23,9 +23,9 @@ import java.util.Map;
 
 import org.apache.commons.sanselan.ImageWriteException;
 
-public class PBMWriter extends PNMWriter implements PNMConstants
+public class PbmWriter extends PnmWriter implements PnmConstants
 {
-    public PBMWriter(boolean RAWBITS)
+    public PbmWriter(boolean RAWBITS)
     {
         super(RAWBITS);
     }

Copied: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/pnm/PgmFileInfo.java (from r1220584, commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/pnm/PGMFileInfo.java)
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/pnm/PgmFileInfo.java?p2=commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/pnm/PgmFileInfo.java&p1=commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/pnm/PGMFileInfo.java&r1=1220584&r2=1220868&rev=1220868&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/pnm/PGMFileInfo.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/pnm/PgmFileInfo.java Mon Dec 19 17:27:28 2011
@@ -22,11 +22,11 @@ import java.io.InputStream;
 import org.apache.commons.sanselan.ImageFormat;
 import org.apache.commons.sanselan.ImageInfo;
 
-public class PGMFileInfo extends FileInfo
+public class PgmFileInfo extends FileInfo
 {
     private final int max; // TODO: handle max
 
-    public PGMFileInfo(int width, int height, boolean RAWBITS, int max)
+    public PgmFileInfo(int width, int height, boolean RAWBITS, int max)
     {
         super(width, height, RAWBITS);
 

Copied: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/pnm/PgmWriter.java (from r1220584, commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/pnm/PGMWriter.java)
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/pnm/PgmWriter.java?p2=commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/pnm/PgmWriter.java&p1=commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/pnm/PGMWriter.java&r1=1220584&r2=1220868&rev=1220868&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/pnm/PGMWriter.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/pnm/PgmWriter.java Mon Dec 19 17:27:28 2011
@@ -23,9 +23,9 @@ import java.util.Map;
 
 import org.apache.commons.sanselan.ImageWriteException;
 
-public class PGMWriter extends PNMWriter implements PNMConstants
+public class PgmWriter extends PnmWriter implements PnmConstants
 {
-    public PGMWriter(boolean RAWBITS)
+    public PgmWriter(boolean RAWBITS)
     {
         super(RAWBITS);
     }

Copied: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/pnm/PnmConstants.java (from r1220584, commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/pnm/PNMConstants.java)
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/pnm/PnmConstants.java?p2=commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/pnm/PnmConstants.java&p1=commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/pnm/PNMConstants.java&r1=1220584&r2=1220868&rev=1220868&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/pnm/PNMConstants.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/pnm/PnmConstants.java Mon Dec 19 17:27:28 2011
@@ -16,7 +16,7 @@
  */
 package org.apache.commons.sanselan.formats.pnm;
 
-public interface PNMConstants
+public interface PnmConstants
 {
     public static final byte PNM_PREFIX_BYTE = 0x50; // P
 

Copied: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/pnm/PnmImageParser.java (from r1220584, commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/pnm/PNMImageParser.java)
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/pnm/PnmImageParser.java?p2=commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/pnm/PnmImageParser.java&p1=commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/pnm/PNMImageParser.java&r1=1220584&r2=1220868&rev=1220868&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/pnm/PNMImageParser.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/pnm/PnmImageParser.java Mon Dec 19 17:27:28 2011
@@ -36,10 +36,10 @@ import org.apache.commons.sanselan.commo
 import org.apache.commons.sanselan.common.bytesource.ByteSource;
 import org.apache.commons.sanselan.util.Debug;
 
-public class PNMImageParser extends ImageParser implements PNMConstants
+public class PnmImageParser extends ImageParser implements PnmConstants
 {
 
-    public PNMImageParser()
+    public PnmImageParser()
     {
         super.setByteOrder(BYTE_ORDER_LSB);
         // setDebug(true);
@@ -95,26 +95,26 @@ public class PNMImageParser extends Imag
             throw new ImageReadException("PNM file has invalid header.");
 
         if (identifier2 == PBM_TEXT_CODE)
-            return new PBMFileInfo(width, height, false);
+            return new PbmFileInfo(width, height, false);
         else if (identifier2 == PBM_RAW_CODE)
-            return new PBMFileInfo(width, height, true);
+            return new PbmFileInfo(width, height, true);
         else if (identifier2 == PGM_TEXT_CODE)
         {
             int maxgray = Integer.parseInt(wsr.readtoWhiteSpace());
-            return new PGMFileInfo(width, height, false, maxgray);
+            return new PgmFileInfo(width, height, false, maxgray);
         } else if (identifier2 == PGM_RAW_CODE)
         {
             int maxgray = Integer.parseInt(wsr.readtoWhiteSpace());
-            return new PGMFileInfo(width, height, true, maxgray);
+            return new PgmFileInfo(width, height, true, maxgray);
         } else if (identifier2 == PPM_TEXT_CODE)
         {
             int max = Integer.parseInt(wsr.readtoWhiteSpace());
-            return new PPMFileInfo(width, height, false, max);
+            return new PpmFileInfo(width, height, false, max);
         } else if (identifier2 == PPM_RAW_CODE)
         {
             int max = Integer.parseInt(wsr.readtoWhiteSpace());
             // System.out.println("max: " + max);
-            return new PPMFileInfo(width, height, true, max);
+            return new PpmFileInfo(width, height, true, max);
         } else
             throw new ImageReadException("PNM file has invalid header.");
     }
@@ -302,7 +302,7 @@ public class PNMImageParser extends Imag
     public void writeImage(BufferedImage src, OutputStream os, Map params)
             throws ImageWriteException, IOException
     {
-        PNMWriter writer = null;
+        PnmWriter writer = null;
         boolean useRawbits = true;
 
         if (params != null)
@@ -318,16 +318,16 @@ public class PNMImageParser extends Imag
             if (subtype != null)
             {
                 if (subtype.equals(ImageFormat.IMAGE_FORMAT_PBM))
-                    writer = new PBMWriter(useRawbits);
+                    writer = new PbmWriter(useRawbits);
                 else if (subtype.equals(ImageFormat.IMAGE_FORMAT_PGM))
-                    writer = new PGMWriter(useRawbits);
+                    writer = new PgmWriter(useRawbits);
                 else if (subtype.equals(ImageFormat.IMAGE_FORMAT_PPM))
-                    writer = new PPMWriter(useRawbits);
+                    writer = new PpmWriter(useRawbits);
             }
         }
 
         if (writer == null)
-            writer = new PPMWriter(useRawbits);
+            writer = new PpmWriter(useRawbits);
 
         // make copy of params; we'll clear keys as we consume them.
         params = new HashMap(params);

Copied: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/pnm/PnmWriter.java (from r1220584, commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/pnm/PNMWriter.java)
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/pnm/PnmWriter.java?p2=commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/pnm/PnmWriter.java&p1=commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/pnm/PNMWriter.java&r1=1220584&r2=1220868&rev=1220868&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/pnm/PNMWriter.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/pnm/PnmWriter.java Mon Dec 19 17:27:28 2011
@@ -23,11 +23,11 @@ import java.util.Map;
 
 import org.apache.commons.sanselan.ImageWriteException;
 
-public abstract class PNMWriter
+public abstract class PnmWriter
 {
     protected final boolean RAWBITS;
 
-    public PNMWriter(boolean RAWBITS)
+    public PnmWriter(boolean RAWBITS)
     {
         this.RAWBITS = RAWBITS;
     }

Copied: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/pnm/PpmFileInfo.java (from r1220584, commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/pnm/PPMFileInfo.java)
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/pnm/PpmFileInfo.java?p2=commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/pnm/PpmFileInfo.java&p1=commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/pnm/PPMFileInfo.java&r1=1220584&r2=1220868&rev=1220868&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/pnm/PPMFileInfo.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/pnm/PpmFileInfo.java Mon Dec 19 17:27:28 2011
@@ -22,11 +22,11 @@ import java.io.InputStream;
 import org.apache.commons.sanselan.ImageFormat;
 import org.apache.commons.sanselan.ImageInfo;
 
-public class PPMFileInfo extends FileInfo
+public class PpmFileInfo extends FileInfo
 {
     private final int max; // TODO: handle max
 
-    public PPMFileInfo(int width, int height, boolean RAWBITS, int max)
+    public PpmFileInfo(int width, int height, boolean RAWBITS, int max)
     {
         super(width, height, RAWBITS);
 

Copied: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/pnm/PpmWriter.java (from r1220584, commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/pnm/PPMWriter.java)
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/pnm/PpmWriter.java?p2=commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/pnm/PpmWriter.java&p1=commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/pnm/PPMWriter.java&r1=1220584&r2=1220868&rev=1220868&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/pnm/PPMWriter.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/pnm/PpmWriter.java Mon Dec 19 17:27:28 2011
@@ -23,9 +23,9 @@ import java.util.Map;
 
 import org.apache.commons.sanselan.ImageWriteException;
 
-public class PPMWriter extends PNMWriter implements PNMConstants
+public class PpmWriter extends PnmWriter implements PnmConstants
 {
-    public PPMWriter(boolean RAWBITS)
+    public PpmWriter(boolean RAWBITS)
     {
         super(RAWBITS);
     }

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/psd/ImageContents.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/psd/ImageContents.java?rev=1220868&r1=1220867&r2=1220868&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/psd/ImageContents.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/psd/ImageContents.java Mon Dec 19 17:27:28 2011
@@ -20,14 +20,14 @@ import java.io.PrintWriter;
 
 public class ImageContents
 {
-    public final PSDHeaderInfo header;
+    public final PsdHeaderInfo header;
 
     public final int ColorModeDataLength;
     public final int ImageResourcesLength;
     public final int LayerAndMaskDataLength;
     public final int Compression;
 
-    public ImageContents(PSDHeaderInfo header,
+    public ImageContents(PsdHeaderInfo header,
 
     int ColorModeDataLength, int ImageResourcesLength,
             int LayerAndMaskDataLength, int Compression)

Copied: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/psd/PsdConstants.java (from r1220584, commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/psd/PSDConstants.java)
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/psd/PsdConstants.java?p2=commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/psd/PsdConstants.java&p1=commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/psd/PSDConstants.java&r1=1220584&r2=1220868&rev=1220868&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/psd/PSDConstants.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/psd/PsdConstants.java Mon Dec 19 17:27:28 2011
@@ -18,7 +18,7 @@ package org.apache.commons.sanselan.form
 
 import org.apache.commons.sanselan.util.Debug;
 
-public class PSDConstants
+public class PsdConstants
 {
     public static final ImageResourceType fImageResourceTypes[];
 
@@ -197,7 +197,7 @@ public class PSDConstants
         }
         catch (Exception e)
         {
-            Debug.debug(PSDConstants.class, e);
+            Debug.debug(PsdConstants.class, e);
         }
         fImageResourceTypes = temp;
     }

Copied: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/psd/PsdHeaderInfo.java (from r1220584, commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/psd/PSDHeaderInfo.java)
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/psd/PsdHeaderInfo.java?p2=commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/psd/PsdHeaderInfo.java&p1=commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/psd/PSDHeaderInfo.java&r1=1220584&r2=1220868&rev=1220868&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/psd/PSDHeaderInfo.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/psd/PsdHeaderInfo.java Mon Dec 19 17:27:28 2011
@@ -18,7 +18,7 @@ package org.apache.commons.sanselan.form
 
 import java.io.PrintWriter;
 
-public class PSDHeaderInfo
+public class PsdHeaderInfo
 {
     public final int Version;
     public final byte Reserved[];
@@ -28,7 +28,7 @@ public class PSDHeaderInfo
     public final int Depth;
     public final int Mode;
 
-    public PSDHeaderInfo(int Version, byte Reserved[], int Channels, int Rows,
+    public PsdHeaderInfo(int Version, byte Reserved[], int Channels, int Rows,
             int Columns, int Depth, int Mode)
     {
         this.Version = Version;

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/psd/PsdImageParser.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/psd/PsdImageParser.java?rev=1220868&r1=1220867&r2=1220868&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/psd/PsdImageParser.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/psd/PsdImageParser.java Mon Dec 19 17:27:28 2011
@@ -36,11 +36,11 @@ import org.apache.commons.sanselan.commo
 import org.apache.commons.sanselan.common.bytesource.ByteSource;
 import org.apache.commons.sanselan.formats.psd.dataparsers.DataParser;
 import org.apache.commons.sanselan.formats.psd.dataparsers.DataParserBitmap;
-import org.apache.commons.sanselan.formats.psd.dataparsers.DataParserCMYK;
+import org.apache.commons.sanselan.formats.psd.dataparsers.DataParserCmyk;
 import org.apache.commons.sanselan.formats.psd.dataparsers.DataParserGrayscale;
 import org.apache.commons.sanselan.formats.psd.dataparsers.DataParserIndexed;
 import org.apache.commons.sanselan.formats.psd.dataparsers.DataParserLab;
-import org.apache.commons.sanselan.formats.psd.dataparsers.DataParserRGB;
+import org.apache.commons.sanselan.formats.psd.dataparsers.DataParserRgb;
 import org.apache.commons.sanselan.formats.psd.datareaders.CompressedDataReader;
 import org.apache.commons.sanselan.formats.psd.datareaders.DataReader;
 import org.apache.commons.sanselan.formats.psd.datareaders.UncompressedDataReader;
@@ -80,7 +80,7 @@ public class PsdImageParser extends Imag
         };
     }
 
-    private PSDHeaderInfo readHeader(ByteSource byteSource)
+    private PsdHeaderInfo readHeader(ByteSource byteSource)
             throws ImageReadException, IOException
     {
         InputStream is = null;
@@ -105,7 +105,7 @@ public class PsdImageParser extends Imag
         }
     }
 
-    private PSDHeaderInfo readHeader(InputStream is) throws ImageReadException,
+    private PsdHeaderInfo readHeader(InputStream is) throws ImageReadException,
             IOException
     {
         readAndVerifyBytes(is, new byte[] { 56, 66, 80, 83 },
@@ -122,7 +122,7 @@ public class PsdImageParser extends Imag
         int Depth = read2Bytes("Depth", is, "Not a Valid PSD File");
         int Mode = read2Bytes("Mode", is, "Not a Valid PSD File");
 
-        PSDHeaderInfo result = new PSDHeaderInfo(Version, Reserved, Channels,
+        PsdHeaderInfo result = new PsdHeaderInfo(Version, Reserved, Channels,
                 Rows, Columns, Depth, Mode);
 
         return result;
@@ -131,7 +131,7 @@ public class PsdImageParser extends Imag
     private ImageContents readImageContents(InputStream is)
             throws ImageReadException, IOException
     {
-        PSDHeaderInfo header = readHeader(is);
+        PsdHeaderInfo header = readHeader(is);
 
         int ColorModeDataLength = read4Bytes("ColorModeDataLength", is,
                 "Not a Valid PSD File");
@@ -359,7 +359,7 @@ public class PsdImageParser extends Imag
         {
             is = byteSource.getInputStream();
 
-            // PSDHeaderInfo header = readHeader(is);
+            // PsdHeaderInfo header = readHeader(is);
             if (section == PSD_SECTION_HEADER)
                 return readByteArray("Header", PSD_HEADER_LENGTH, is,
                         "Not a Valid PSD File");
@@ -474,7 +474,7 @@ public class PsdImageParser extends Imag
     public Dimension getImageSize(ByteSource byteSource, Map params)
             throws ImageReadException, IOException
     {
-        PSDHeaderInfo bhi = readHeader(byteSource);
+        PsdHeaderInfo bhi = readHeader(byteSource);
         if (bhi == null)
             throw new ImageReadException("PSD: couldn't read header");
 
@@ -533,7 +533,7 @@ public class PsdImageParser extends Imag
         if (imageContents == null)
             throw new ImageReadException("PSD: Couldn't read blocks");
 
-        PSDHeaderInfo header = imageContents.header;
+        PsdHeaderInfo header = imageContents.header;
         if (header == null)
             throw new ImageReadException("PSD: Couldn't read Header");
 
@@ -641,7 +641,7 @@ public class PsdImageParser extends Imag
                         // + block.getClass().getName()
                         // + ", "
                         + " data: " + block.data.length + " type: '"
-                        + new PSDConstants().getDescription(block.id) + "' "
+                        + new PsdConstants().getDescription(block.id) + "' "
                         + ")");
 
             }
@@ -664,7 +664,7 @@ public class PsdImageParser extends Imag
         if (imageContents == null)
             throw new ImageReadException("PSD: Couldn't read blocks");
 
-        PSDHeaderInfo header = imageContents.header;
+        PsdHeaderInfo header = imageContents.header;
         if (header == null)
             throw new ImageReadException("PSD: Couldn't read Header");
 
@@ -703,10 +703,10 @@ public class PsdImageParser extends Imag
             dataParser = new DataParserGrayscale();
             break;
         case 3:
-            dataParser = new DataParserRGB();
+            dataParser = new DataParserRgb();
             break;
         case 4:
-            dataParser = new DataParserCMYK();
+            dataParser = new DataParserCmyk();
             break;
         case 9:
             dataParser = new DataParserLab();
@@ -804,7 +804,7 @@ public class PsdImageParser extends Imag
         if (imageContents == null)
             throw new ImageReadException("PSD: Couldn't read blocks");
 
-        PSDHeaderInfo header = imageContents.header;
+        PsdHeaderInfo header = imageContents.header;
         if (header == null)
             throw new ImageReadException("PSD: Couldn't read Header");
 

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/psd/dataparsers/DataParser.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/psd/dataparsers/DataParser.java?rev=1220868&r1=1220867&r2=1220868&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/psd/dataparsers/DataParser.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/psd/dataparsers/DataParser.java Mon Dec 19 17:27:28 2011
@@ -20,7 +20,7 @@ import java.awt.image.BufferedImage;
 import java.awt.image.DataBuffer;
 
 import org.apache.commons.sanselan.formats.psd.ImageContents;
-import org.apache.commons.sanselan.formats.psd.PSDHeaderInfo;
+import org.apache.commons.sanselan.formats.psd.PsdHeaderInfo;
 
 public abstract class DataParser
 {
@@ -29,7 +29,7 @@ public abstract class DataParser
     {
         DataBuffer buffer = bi.getRaster().getDataBuffer();
 
-        PSDHeaderInfo header = imageContents.header;
+        PsdHeaderInfo header = imageContents.header;
         int width = header.Columns;
         int height = header.Rows;
 

Copied: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/psd/dataparsers/DataParserCmyk.java (from r1220584, commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/psd/dataparsers/DataParserCMYK.java)
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/psd/dataparsers/DataParserCmyk.java?p2=commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/psd/dataparsers/DataParserCmyk.java&p1=commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/psd/dataparsers/DataParserCMYK.java&r1=1220584&r2=1220868&rev=1220868&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/psd/dataparsers/DataParserCMYK.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/psd/dataparsers/DataParserCmyk.java Mon Dec 19 17:27:28 2011
@@ -19,7 +19,7 @@ package org.apache.commons.sanselan.form
 import org.apache.commons.sanselan.color.ColorConversions;
 import org.apache.commons.sanselan.formats.psd.ImageContents;
 
-public class DataParserCMYK extends DataParser
+public class DataParserCmyk extends DataParser
 {
     protected int getRGB(int data[][][], int x, int y,
             ImageContents imageContents)

Copied: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/psd/dataparsers/DataParserRgb.java (from r1220584, commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/psd/dataparsers/DataParserRGB.java)
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/psd/dataparsers/DataParserRgb.java?p2=commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/psd/dataparsers/DataParserRgb.java&p1=commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/psd/dataparsers/DataParserRGB.java&r1=1220584&r2=1220868&rev=1220868&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/psd/dataparsers/DataParserRGB.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/psd/dataparsers/DataParserRgb.java Mon Dec 19 17:27:28 2011
@@ -18,7 +18,7 @@ package org.apache.commons.sanselan.form
 
 import org.apache.commons.sanselan.formats.psd.ImageContents;
 
-public class DataParserRGB extends DataParser
+public class DataParserRgb extends DataParser
 {
     protected int getRGB(int data[][][], int x, int y,
             ImageContents imageContents)

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/psd/datareaders/CompressedDataReader.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/psd/datareaders/CompressedDataReader.java?rev=1220868&r1=1220867&r2=1220868&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/psd/datareaders/CompressedDataReader.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/psd/datareaders/CompressedDataReader.java Mon Dec 19 17:27:28 2011
@@ -27,7 +27,7 @@ import org.apache.commons.sanselan.commo
 import org.apache.commons.sanselan.common.mylzw.BitsToByteInputStream;
 import org.apache.commons.sanselan.common.mylzw.MyBitInputStream;
 import org.apache.commons.sanselan.formats.psd.ImageContents;
-import org.apache.commons.sanselan.formats.psd.PSDHeaderInfo;
+import org.apache.commons.sanselan.formats.psd.PsdHeaderInfo;
 import org.apache.commons.sanselan.formats.psd.dataparsers.DataParser;
 
 public class CompressedDataReader extends DataReader
@@ -42,7 +42,7 @@ public class CompressedDataReader extend
             ImageContents imageContents, BinaryFileParser bfp)
             throws ImageReadException, IOException
     {
-        PSDHeaderInfo header = imageContents.header;
+        PsdHeaderInfo header = imageContents.header;
         int width = header.Columns;
         int height = header.Rows;
 

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/psd/datareaders/UncompressedDataReader.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/psd/datareaders/UncompressedDataReader.java?rev=1220868&r1=1220867&r2=1220868&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/psd/datareaders/UncompressedDataReader.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/psd/datareaders/UncompressedDataReader.java Mon Dec 19 17:27:28 2011
@@ -25,7 +25,7 @@ import org.apache.commons.sanselan.commo
 import org.apache.commons.sanselan.common.mylzw.BitsToByteInputStream;
 import org.apache.commons.sanselan.common.mylzw.MyBitInputStream;
 import org.apache.commons.sanselan.formats.psd.ImageContents;
-import org.apache.commons.sanselan.formats.psd.PSDHeaderInfo;
+import org.apache.commons.sanselan.formats.psd.PsdHeaderInfo;
 import org.apache.commons.sanselan.formats.psd.dataparsers.DataParser;
 
 public class UncompressedDataReader extends DataReader
@@ -39,7 +39,7 @@ public class UncompressedDataReader exte
             ImageContents imageContents, BinaryFileParser bfp)
             throws ImageReadException, IOException
     {
-        PSDHeaderInfo header = imageContents.header;
+        PsdHeaderInfo header = imageContents.header;
         int width = header.Columns;
         int height = header.Rows;
 

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/TiffImageParser.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/TiffImageParser.java?rev=1220868&r1=1220867&r2=1220868&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/TiffImageParser.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/TiffImageParser.java Mon Dec 19 17:27:28 2011
@@ -39,11 +39,11 @@ import org.apache.commons.sanselan.forma
 import org.apache.commons.sanselan.formats.tiff.datareaders.DataReader;
 import org.apache.commons.sanselan.formats.tiff.photometricinterpreters.PhotometricInterpreter;
 import org.apache.commons.sanselan.formats.tiff.photometricinterpreters.PhotometricInterpreterBiLevel;
-import org.apache.commons.sanselan.formats.tiff.photometricinterpreters.PhotometricInterpreterCIELAB;
-import org.apache.commons.sanselan.formats.tiff.photometricinterpreters.PhotometricInterpreterCMYK;
-import org.apache.commons.sanselan.formats.tiff.photometricinterpreters.PhotometricInterpreterLogLUV;
+import org.apache.commons.sanselan.formats.tiff.photometricinterpreters.PhotometricInterpreterCieLab;
+import org.apache.commons.sanselan.formats.tiff.photometricinterpreters.PhotometricInterpreterCmyk;
+import org.apache.commons.sanselan.formats.tiff.photometricinterpreters.PhotometricInterpreterLogLuv;
 import org.apache.commons.sanselan.formats.tiff.photometricinterpreters.PhotometricInterpreterPalette;
-import org.apache.commons.sanselan.formats.tiff.photometricinterpreters.PhotometricInterpreterRGB;
+import org.apache.commons.sanselan.formats.tiff.photometricinterpreters.PhotometricInterpreterRgb;
 import org.apache.commons.sanselan.formats.tiff.photometricinterpreters.PhotometricInterpreterYCbCr;
 import org.apache.commons.sanselan.formats.tiff.write.TiffImageWriterLossy;
 
@@ -563,10 +563,10 @@ public class TiffImageParser extends Ima
                     bitsPerSample, predictor, width, height, colorMap);
         }
         case 2: // RGB
-            return new PhotometricInterpreterRGB(samplesPerPixel,
+            return new PhotometricInterpreterRgb(samplesPerPixel,
                     bitsPerSample, predictor, width, height);
         case 5: // CMYK
-            return new PhotometricInterpreterCMYK(samplesPerPixel,
+            return new PhotometricInterpreterCmyk(samplesPerPixel,
                     bitsPerSample, predictor, width, height);
         case 6: //
         {
@@ -587,13 +587,13 @@ public class TiffImageParser extends Ima
         }
 
         case 8:
-            return new PhotometricInterpreterCIELAB(samplesPerPixel,
+            return new PhotometricInterpreterCieLab(samplesPerPixel,
                     bitsPerSample, predictor, width, height);
 
         case 32844:
         case 32845: {
             boolean yonly = (photometricInterpretation == 32844);
-            return new PhotometricInterpreterLogLUV(samplesPerPixel,
+            return new PhotometricInterpreterLogLuv(samplesPerPixel,
                     bitsPerSample, predictor, width, height, yonly);
         }
 

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/constants/AllTagConstants.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/constants/AllTagConstants.java?rev=1220868&r1=1220867&r2=1220868&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/constants/AllTagConstants.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/constants/AllTagConstants.java Mon Dec 19 17:27:28 2011
@@ -23,7 +23,7 @@ public interface AllTagConstants
             SanselanConstants,
             TiffTagConstants,
             ExifTagConstants,
-            GPSTagConstants
+            GpsTagConstants
 {
     public static final TagInfo ALL_TAGS[] = TagConstantsUtils
             .mergeTagLists(new TagInfo[][]{

Copied: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/constants/GpsTagConstants.java (from r1220584, commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/constants/GPSTagConstants.java)
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/constants/GpsTagConstants.java?p2=commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/constants/GpsTagConstants.java&p1=commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/constants/GPSTagConstants.java&r1=1220584&r2=1220868&rev=1220868&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/constants/GPSTagConstants.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/constants/GpsTagConstants.java Mon Dec 19 17:27:28 2011
@@ -16,7 +16,7 @@
  */
 package org.apache.commons.sanselan.formats.tiff.constants;
 
-public interface GPSTagConstants
+public interface GpsTagConstants
         extends
             TiffDirectoryConstants,
             TiffFieldTypeConstants

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/constants/TiffFieldTypeConstants.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/constants/TiffFieldTypeConstants.java?rev=1220868&r1=1220867&r2=1220868&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/constants/TiffFieldTypeConstants.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/constants/TiffFieldTypeConstants.java Mon Dec 19 17:27:28 2011
@@ -18,7 +18,7 @@ package org.apache.commons.sanselan.form
 
 import org.apache.commons.sanselan.SanselanConstants;
 import org.apache.commons.sanselan.formats.tiff.fieldtypes.FieldType;
-import org.apache.commons.sanselan.formats.tiff.fieldtypes.FieldTypeASCII;
+import org.apache.commons.sanselan.formats.tiff.fieldtypes.FieldTypeAscii;
 import org.apache.commons.sanselan.formats.tiff.fieldtypes.FieldTypeByte;
 import org.apache.commons.sanselan.formats.tiff.fieldtypes.FieldTypeDouble;
 import org.apache.commons.sanselan.formats.tiff.fieldtypes.FieldTypeFloat;
@@ -33,7 +33,7 @@ public interface TiffFieldTypeConstants 
     public static final FieldTypeByte FIELD_TYPE_BYTE = new FieldTypeByte(1,
             "Byte");
 
-    public static final FieldTypeASCII FIELD_TYPE_ASCII = new FieldTypeASCII(2,
+    public static final FieldTypeAscii FIELD_TYPE_ASCII = new FieldTypeAscii(2,
             "ASCII");
 
     public static final FieldTypeShort FIELD_TYPE_SHORT = new FieldTypeShort(3,

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/datareaders/DataReader.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/datareaders/DataReader.java?rev=1220868&r1=1220867&r2=1220868&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/datareaders/DataReader.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/datareaders/DataReader.java Mon Dec 19 17:27:28 2011
@@ -26,7 +26,7 @@ import org.apache.commons.sanselan.commo
 import org.apache.commons.sanselan.common.BitInputStream;
 import org.apache.commons.sanselan.common.PackBits;
 import org.apache.commons.sanselan.common.itu_t4.T4Compression;
-import org.apache.commons.sanselan.common.mylzw.MyLZWDecompressor;
+import org.apache.commons.sanselan.common.mylzw.MyLzwDecompressor;
 import org.apache.commons.sanselan.formats.tiff.constants.TiffConstants;
 import org.apache.commons.sanselan.formats.tiff.photometricinterpreters.PhotometricInterpreter;
 
@@ -116,7 +116,7 @@ public abstract class DataReader impleme
 
                 int LZWMinimumCodeSize = 8;
 
-                MyLZWDecompressor myLzwDecompressor = new MyLZWDecompressor(
+                MyLzwDecompressor myLzwDecompressor = new MyLzwDecompressor(
                         LZWMinimumCodeSize, BYTE_ORDER_NETWORK);
 
                 myLzwDecompressor.setTiffLZWMode();

Copied: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/fieldtypes/FieldTypeAscii.java (from r1220584, commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/fieldtypes/FieldTypeASCII.java)
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/fieldtypes/FieldTypeAscii.java?p2=commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/fieldtypes/FieldTypeAscii.java&p1=commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/fieldtypes/FieldTypeASCII.java&r1=1220584&r2=1220868&rev=1220868&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/fieldtypes/FieldTypeASCII.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/fieldtypes/FieldTypeAscii.java Mon Dec 19 17:27:28 2011
@@ -19,9 +19,9 @@ package org.apache.commons.sanselan.form
 import org.apache.commons.sanselan.ImageWriteException;
 import org.apache.commons.sanselan.formats.tiff.TiffField;
 
-public class FieldTypeASCII extends FieldType
+public class FieldTypeAscii extends FieldType
 {
-    public FieldTypeASCII(int type, String name)
+    public FieldTypeAscii(int type, String name)
     {
         super(type, 1, name);
     }

Copied: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/photometricinterpreters/PhotometricInterpreterCieLab.java (from r1220584, commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/photometricinterpreters/PhotometricInterpreterCIELAB.java)
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/photometricinterpreters/PhotometricInterpreterCieLab.java?p2=commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/photometricinterpreters/PhotometricInterpreterCieLab.java&p1=commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/photometricinterpreters/PhotometricInterpreterCIELAB.java&r1=1220584&r2=1220868&rev=1220868&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/photometricinterpreters/PhotometricInterpreterCIELAB.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/photometricinterpreters/PhotometricInterpreterCieLab.java Mon Dec 19 17:27:28 2011
@@ -22,9 +22,9 @@ import java.io.IOException;
 import org.apache.commons.sanselan.ImageReadException;
 import org.apache.commons.sanselan.color.ColorConversions;
 
-public class PhotometricInterpreterCIELAB extends PhotometricInterpreter
+public class PhotometricInterpreterCieLab extends PhotometricInterpreter
 {
-    public PhotometricInterpreterCIELAB(int fSamplesPerPixel,
+    public PhotometricInterpreterCieLab(int fSamplesPerPixel,
             int fBitsPerSample[], int Predictor, int width, int height)
     {
         super(fSamplesPerPixel, fBitsPerSample, Predictor, width, height);

Copied: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/photometricinterpreters/PhotometricInterpreterCmyk.java (from r1220584, commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/photometricinterpreters/PhotometricInterpreterCMYK.java)
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/photometricinterpreters/PhotometricInterpreterCmyk.java?p2=commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/photometricinterpreters/PhotometricInterpreterCmyk.java&p1=commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/photometricinterpreters/PhotometricInterpreterCMYK.java&r1=1220584&r2=1220868&rev=1220868&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/photometricinterpreters/PhotometricInterpreterCMYK.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/photometricinterpreters/PhotometricInterpreterCmyk.java Mon Dec 19 17:27:28 2011
@@ -22,9 +22,9 @@ import java.io.IOException;
 import org.apache.commons.sanselan.ImageReadException;
 import org.apache.commons.sanselan.color.ColorConversions;
 
-public class PhotometricInterpreterCMYK extends PhotometricInterpreter
+public class PhotometricInterpreterCmyk extends PhotometricInterpreter
 {
-    public PhotometricInterpreterCMYK(int fSamplesPerPixel,
+    public PhotometricInterpreterCmyk(int fSamplesPerPixel,
             int fBitsPerSample[], int Predictor, int width, int height)
     {
         super(fSamplesPerPixel, fBitsPerSample, Predictor, width, height);

Copied: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/photometricinterpreters/PhotometricInterpreterLogLuv.java (from r1220584, commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/photometricinterpreters/PhotometricInterpreterLogLUV.java)
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/photometricinterpreters/PhotometricInterpreterLogLuv.java?p2=commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/photometricinterpreters/PhotometricInterpreterLogLuv.java&p1=commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/photometricinterpreters/PhotometricInterpreterLogLUV.java&r1=1220584&r2=1220868&rev=1220868&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/photometricinterpreters/PhotometricInterpreterLogLUV.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/photometricinterpreters/PhotometricInterpreterLogLuv.java Mon Dec 19 17:27:28 2011
@@ -21,11 +21,11 @@ import java.io.IOException;
 
 import org.apache.commons.sanselan.ImageReadException;
 
-public class PhotometricInterpreterLogLUV extends PhotometricInterpreter
+public class PhotometricInterpreterLogLuv extends PhotometricInterpreter
 {
     //    private final boolean yOnly;
 
-    public PhotometricInterpreterLogLUV(int fSamplesPerPixel,
+    public PhotometricInterpreterLogLuv(int fSamplesPerPixel,
             int fBitsPerSample[], int Predictor, int width, int height,
             boolean yonly)
     {

Copied: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/photometricinterpreters/PhotometricInterpreterRgb.java (from r1220584, commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/photometricinterpreters/PhotometricInterpreterRGB.java)
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/photometricinterpreters/PhotometricInterpreterRgb.java?p2=commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/photometricinterpreters/PhotometricInterpreterRgb.java&p1=commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/photometricinterpreters/PhotometricInterpreterRGB.java&r1=1220584&r2=1220868&rev=1220868&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/photometricinterpreters/PhotometricInterpreterRGB.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/photometricinterpreters/PhotometricInterpreterRgb.java Mon Dec 19 17:27:28 2011
@@ -21,9 +21,9 @@ import java.io.IOException;
 
 import org.apache.commons.sanselan.ImageReadException;
 
-public class PhotometricInterpreterRGB extends PhotometricInterpreter
+public class PhotometricInterpreterRgb extends PhotometricInterpreter
 {
-    public PhotometricInterpreterRGB(int fSamplesPerPixel,
+    public PhotometricInterpreterRgb(int fSamplesPerPixel,
             int fBitsPerSample[], int Predictor, int width, int height)
     {
         super(fSamplesPerPixel, fBitsPerSample, Predictor, width, height);

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/write/TiffImageWriterBase.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/write/TiffImageWriterBase.java?rev=1220868&r1=1220867&r2=1220868&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/write/TiffImageWriterBase.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/write/TiffImageWriterBase.java Mon Dec 19 17:27:28 2011
@@ -30,7 +30,7 @@ import org.apache.commons.sanselan.Image
 import org.apache.commons.sanselan.common.BinaryConstants;
 import org.apache.commons.sanselan.common.BinaryOutputStream;
 import org.apache.commons.sanselan.common.PackBits;
-import org.apache.commons.sanselan.common.mylzw.MyLZWCompressor;
+import org.apache.commons.sanselan.common.mylzw.MyLzwCompressor;
 import org.apache.commons.sanselan.formats.tiff.TiffElement;
 import org.apache.commons.sanselan.formats.tiff.TiffImageData;
 import org.apache.commons.sanselan.formats.tiff.constants.TiffConstants;
@@ -341,7 +341,7 @@ public abstract class TiffImageWriterBas
 
                 int LZW_MINIMUM_CODE_SIZE = 8;
 
-                MyLZWCompressor compressor = new MyLZWCompressor(
+                MyLzwCompressor compressor = new MyLzwCompressor(
                         LZW_MINIMUM_CODE_SIZE, BYTE_ORDER_MSB, true);
                 byte compressed[] = compressor.compress(uncompressed);
 

Copied: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/util/IoUtils.java (from r1220584, commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/util/IOUtils.java)
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/util/IoUtils.java?p2=commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/util/IoUtils.java&p1=commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/util/IOUtils.java&r1=1220584&r2=1220868&rev=1220868&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/util/IOUtils.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/util/IoUtils.java Mon Dec 19 17:27:28 2011
@@ -30,12 +30,12 @@ import java.nio.channels.FileChannel;
 
 import org.apache.commons.sanselan.SanselanConstants;
 
-public class IOUtils implements SanselanConstants
+public class IoUtils implements SanselanConstants
 {
     /**
      * This class should never be instantiated.
      */
-    private IOUtils()
+    private IoUtils()
     {
     }
 

Modified: commons/proper/sanselan/trunk/src/site/xdoc/sampleusage.xml
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/site/xdoc/sampleusage.xml?rev=1220868&r1=1220867&r2=1220868&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/site/xdoc/sampleusage.xml (original)
+++ commons/proper/sanselan/trunk/src/site/xdoc/sampleusage.xml Mon Dec 19 17:27:28 2011
@@ -26,7 +26,7 @@ limitations under the License.
 
 <subsection name="Example Code">
 <p>
-  Can be found in the source distribution in org.apache.commons.sanselan.sampleUsage package
+  Can be found in the source distribution in org.apache.commons.sanselan.examples package
   <ul>
       <li><a href="https://svn.apache.org/repos/asf/commons/proper/sanselan/trunk/src/test/java/org/apache/commons/sanselan/sampleUsage/SampleUsage.java">SampleUsage.java</a>(includes the above code)</li>
       <li><a href="https://svn.apache.org/repos/asf/commons/proper/sanselan/trunk/src/test/java/org/apache/commons/sanselan/sampleUsage/MetadataExample.java">MetadataExample.java</a>(illustrates how to find JPEG EXIF metadata such as GPS, date and time photo taken, etc.)</li>

Modified: commons/proper/sanselan/trunk/src/test/java/org/apache/commons/sanselan/SanselanTest.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/test/java/org/apache/commons/sanselan/SanselanTest.java?rev=1220868&r1=1220867&r2=1220868&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/test/java/org/apache/commons/sanselan/SanselanTest.java (original)
+++ commons/proper/sanselan/trunk/src/test/java/org/apache/commons/sanselan/SanselanTest.java Mon Dec 19 17:27:28 2011
@@ -27,7 +27,7 @@ import junit.framework.TestCase;
 import org.apache.commons.sanselan.ImageReadException;
 import org.apache.commons.sanselan.Sanselan;
 import org.apache.commons.sanselan.SanselanConstants;
-import org.apache.commons.sanselan.test.util.FSTraversal;
+import org.apache.commons.sanselan.test.util.FileSystemTraversal;
 import org.apache.commons.sanselan.util.Debug;
 
 public abstract class SanselanTest extends TestCase implements
@@ -118,7 +118,7 @@ public abstract class SanselanTest exten
         Debug.debug("imagesFolder", imagesFolder);
         assertTrue(imagesFolder.exists());
 
-        FSTraversal.Visitor visitor = new FSTraversal.Visitor() {
+        FileSystemTraversal.Visitor visitor = new FileSystemTraversal.Visitor() {
 
             public boolean visit(File file, double progressEstimate) {
                 if (!Sanselan.hasImageFileExtension(file))
@@ -127,7 +127,7 @@ public abstract class SanselanTest exten
                 return true;
             }
         };
-        new FSTraversal().traverseFiles(imagesFolder, visitor);
+        new FileSystemTraversal().traverseFiles(imagesFolder, visitor);
     }
 
     protected List getTestImages(final ImageFilter filter, final int max)

Modified: commons/proper/sanselan/trunk/src/test/java/org/apache/commons/sanselan/common/bytesource/ByteSourceDataTest.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/test/java/org/apache/commons/sanselan/common/bytesource/ByteSourceDataTest.java?rev=1220868&r1=1220867&r2=1220868&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/test/java/org/apache/commons/sanselan/common/bytesource/ByteSourceDataTest.java (original)
+++ commons/proper/sanselan/trunk/src/test/java/org/apache/commons/sanselan/common/bytesource/ByteSourceDataTest.java Mon Dec 19 17:27:28 2011
@@ -26,7 +26,7 @@ import java.io.InputStream;
 import org.apache.commons.sanselan.common.bytesource.ByteSource;
 import org.apache.commons.sanselan.common.bytesource.ByteSourceFile;
 import org.apache.commons.sanselan.common.bytesource.ByteSourceInputStream;
-import org.apache.commons.sanselan.util.IOUtils;
+import org.apache.commons.sanselan.util.IoUtils;
 
 public class ByteSourceDataTest extends ByteSourceTest
 {
@@ -95,7 +95,7 @@ public class ByteSourceDataTest extends 
         for (int j = 0; j < 5; j++)
         {
             InputStream is = byteSource.getInputStream();
-            byte dst[] = IOUtils.getInputStreamBytes(is);
+            byte dst[] = IoUtils.getInputStreamBytes(is);
 
             compareByteArrays(src, dst);
         }
@@ -113,7 +113,7 @@ public class ByteSourceDataTest extends 
             int start = src.length / 2;
 
             InputStream is = byteSource.getInputStream(start);
-            byte dst[] = IOUtils.getInputStreamBytes(is);
+            byte dst[] = IoUtils.getInputStreamBytes(is);
 
             assertTrue(src.length == dst.length + start);
             for (int i = 0; i < dst.length; i++)

Modified: commons/proper/sanselan/trunk/src/test/java/org/apache/commons/sanselan/common/bytesource/ByteSourceImageTest.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/test/java/org/apache/commons/sanselan/common/bytesource/ByteSourceImageTest.java?rev=1220868&r1=1220867&r2=1220868&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/test/java/org/apache/commons/sanselan/common/bytesource/ByteSourceImageTest.java (original)
+++ commons/proper/sanselan/trunk/src/test/java/org/apache/commons/sanselan/common/bytesource/ByteSourceImageTest.java Mon Dec 19 17:27:28 2011
@@ -33,7 +33,7 @@ import org.apache.commons.sanselan.Image
 import org.apache.commons.sanselan.ImageReadException;
 import org.apache.commons.sanselan.Sanselan;
 import org.apache.commons.sanselan.util.Debug;
-import org.apache.commons.sanselan.util.IOUtils;
+import org.apache.commons.sanselan.util.IoUtils;
 
 public class ByteSourceImageTest extends ByteSourceTest
 {
@@ -52,7 +52,7 @@ public class ByteSourceImageTest extends
             Debug.debug("imageFile", imageFile);
             assertNotNull(imageFile);
 
-            byte imageFileBytes[] = IOUtils.getFileBytes(imageFile);
+            byte imageFileBytes[] = IoUtils.getFileBytes(imageFile);
             assertNotNull(imageFileBytes);
             assertTrue(imageFileBytes.length == imageFile.length());
 

Modified: commons/proper/sanselan/trunk/src/test/java/org/apache/commons/sanselan/examples/ImageReadExample.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/test/java/org/apache/commons/sanselan/examples/ImageReadExample.java?rev=1220868&r1=1220584&r2=1220868&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/test/java/org/apache/commons/sanselan/examples/ImageReadExample.java (original)
+++ commons/proper/sanselan/trunk/src/test/java/org/apache/commons/sanselan/examples/ImageReadExample.java Mon Dec 19 17:27:28 2011
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.sanselan.sampleUsage;
+package org.apache.commons.sanselan.examples;
 
 import java.awt.GraphicsConfiguration;
 import java.awt.GraphicsDevice;

Modified: commons/proper/sanselan/trunk/src/test/java/org/apache/commons/sanselan/examples/ImageWriteExample.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/test/java/org/apache/commons/sanselan/examples/ImageWriteExample.java?rev=1220868&r1=1220584&r2=1220868&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/test/java/org/apache/commons/sanselan/examples/ImageWriteExample.java (original)
+++ commons/proper/sanselan/trunk/src/test/java/org/apache/commons/sanselan/examples/ImageWriteExample.java Mon Dec 19 17:27:28 2011
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.sanselan.sampleUsage;
+package org.apache.commons.sanselan.examples;
 
 import java.awt.image.BufferedImage;
 import java.io.File;

Modified: commons/proper/sanselan/trunk/src/test/java/org/apache/commons/sanselan/examples/MetadataExample.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/test/java/org/apache/commons/sanselan/examples/MetadataExample.java?rev=1220868&r1=1220584&r2=1220868&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/test/java/org/apache/commons/sanselan/examples/MetadataExample.java (original)
+++ commons/proper/sanselan/trunk/src/test/java/org/apache/commons/sanselan/examples/MetadataExample.java Mon Dec 19 17:27:28 2011
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.sanselan.sampleUsage;
+package org.apache.commons.sanselan.examples;
 
 import java.io.File;
 import java.io.IOException;

Modified: commons/proper/sanselan/trunk/src/test/java/org/apache/commons/sanselan/examples/SampleUsage.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/test/java/org/apache/commons/sanselan/examples/SampleUsage.java?rev=1220868&r1=1220584&r2=1220868&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/test/java/org/apache/commons/sanselan/examples/SampleUsage.java (original)
+++ commons/proper/sanselan/trunk/src/test/java/org/apache/commons/sanselan/examples/SampleUsage.java Mon Dec 19 17:27:28 2011
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.sanselan.sampleUsage;
+package org.apache.commons.sanselan.examples;
 
 import java.awt.Dimension;
 import java.awt.color.ICC_Profile;

Copied: commons/proper/sanselan/trunk/src/test/java/org/apache/commons/sanselan/examples/WriteExifMetadataExample.java (from r1220585, commons/proper/sanselan/trunk/src/test/java/org/apache/commons/sanselan/sampleUsage/WriteExifMetadataExample.java)
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/test/java/org/apache/commons/sanselan/examples/WriteExifMetadataExample.java?p2=commons/proper/sanselan/trunk/src/test/java/org/apache/commons/sanselan/examples/WriteExifMetadataExample.java&p1=commons/proper/sanselan/trunk/src/test/java/org/apache/commons/sanselan/sampleUsage/WriteExifMetadataExample.java&r1=1220585&r2=1220868&rev=1220868&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/test/java/org/apache/commons/sanselan/sampleUsage/WriteExifMetadataExample.java (original)
+++ commons/proper/sanselan/trunk/src/test/java/org/apache/commons/sanselan/examples/WriteExifMetadataExample.java Mon Dec 19 17:27:28 2011
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.sanselan.sampleUsage;
+package org.apache.commons.sanselan.examples;
 
 import java.io.BufferedOutputStream;
 import java.io.File;
@@ -33,7 +33,7 @@ import org.apache.commons.sanselan.forma
 import org.apache.commons.sanselan.formats.tiff.write.TiffOutputDirectory;
 import org.apache.commons.sanselan.formats.tiff.write.TiffOutputField;
 import org.apache.commons.sanselan.formats.tiff.write.TiffOutputSet;
-import org.apache.commons.sanselan.util.IOUtils;
+import org.apache.commons.sanselan.util.IoUtils;
 
 public class WriteExifMetadataExample
 {
@@ -219,7 +219,7 @@ public class WriteExifMetadataExample
             {
                 // file does not contain any exif metadata. We don't need to
                 // update the file; just copy it.
-                IOUtils.copyFileNio(jpegImageFile, dst);
+                IoUtils.copyFileNio(jpegImageFile, dst);
                 return;
             }
 

Modified: commons/proper/sanselan/trunk/src/test/java/org/apache/commons/sanselan/formats/bmp/BmpRoundtripTest.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/test/java/org/apache/commons/sanselan/formats/bmp/BmpRoundtripTest.java?rev=1220868&r1=1220867&r2=1220868&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/test/java/org/apache/commons/sanselan/formats/bmp/BmpRoundtripTest.java (original)
+++ commons/proper/sanselan/trunk/src/test/java/org/apache/commons/sanselan/formats/bmp/BmpRoundtripTest.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.util.Debug;
-import org.apache.commons.sanselan.util.IOUtils;
+import org.apache.commons.sanselan.util.IoUtils;
 
 public class BmpRoundtripTest extends BmpBaseTest
 {
@@ -162,7 +162,7 @@ public class BmpRoundtripTest extends Bm
         // Debug.debug("bytes", bytes);
 
         File tempFile = createTempFile("temp", ".bmp");
-        IOUtils.writeToFile(bytes, tempFile);
+        IoUtils.writeToFile(bytes, tempFile);
 
         BufferedImage dstImage = Sanselan.getBufferedImage(bytes);
 

Modified: commons/proper/sanselan/trunk/src/test/java/org/apache/commons/sanselan/formats/icns/IcnsRoundTripTest.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/test/java/org/apache/commons/sanselan/formats/icns/IcnsRoundTripTest.java?rev=1220868&r1=1220867&r2=1220868&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/test/java/org/apache/commons/sanselan/formats/icns/IcnsRoundTripTest.java (original)
+++ commons/proper/sanselan/trunk/src/test/java/org/apache/commons/sanselan/formats/icns/IcnsRoundTripTest.java Mon Dec 19 17:27:28 2011
@@ -29,7 +29,7 @@ import org.apache.commons.sanselan.commo
 import org.apache.commons.sanselan.formats.icns.IcnsImageParser;
 import org.apache.commons.sanselan.formats.icns.IcnsType;
 import org.apache.commons.sanselan.util.Debug;
-import org.apache.commons.sanselan.util.IOUtils;
+import org.apache.commons.sanselan.util.IoUtils;
 
 public class IcnsRoundTripTest extends IcnsBaseTest
 {
@@ -443,10 +443,10 @@ public class IcnsRoundTripTest extends I
     {
         // Uncomment to generate ICNS files that can be tested with MacOS:
         File exportFile = new File("/tmp/" + description + ".icns");
-        IOUtils.writeToFile(rawData, exportFile);
+        IoUtils.writeToFile(rawData, exportFile);
 
         File tempFile = createTempFile("temp", ".icns");
-        IOUtils.writeToFile(rawData, tempFile);
+        IoUtils.writeToFile(rawData, tempFile);
 
         BufferedImage dstImage = Sanselan.getBufferedImage(tempFile);
 

Modified: commons/proper/sanselan/trunk/src/test/java/org/apache/commons/sanselan/formats/ico/IcoRoundtripTest.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/test/java/org/apache/commons/sanselan/formats/ico/IcoRoundtripTest.java?rev=1220868&r1=1220867&r2=1220868&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/test/java/org/apache/commons/sanselan/formats/ico/IcoRoundtripTest.java (original)
+++ commons/proper/sanselan/trunk/src/test/java/org/apache/commons/sanselan/formats/ico/IcoRoundtripTest.java Mon Dec 19 17:27:28 2011
@@ -30,7 +30,7 @@ import org.apache.commons.sanselan.Image
 import org.apache.commons.sanselan.Sanselan;
 import org.apache.commons.sanselan.common.BinaryOutputStream;
 import org.apache.commons.sanselan.util.Debug;
-import org.apache.commons.sanselan.util.IOUtils;
+import org.apache.commons.sanselan.util.IoUtils;
 
 public class IcoRoundtripTest extends IcoBaseTest
 {
@@ -549,10 +549,10 @@ public class IcoRoundtripTest extends Ic
     {
         // Uncomment to generate ICO files that can be tested with Windows:
         //File exportFile = new File("/tmp/" + description + ".ico");
-        //IOUtils.writeToFile(rawData, exportFile);
+        //IoUtils.writeToFile(rawData, exportFile);
 
         File tempFile = createTempFile("temp", ".ico");
-        IOUtils.writeToFile(rawData, tempFile);
+        IoUtils.writeToFile(rawData, tempFile);
 
         BufferedImage dstImage = Sanselan.getBufferedImage(tempFile);
 



Mime
View raw message