Camel-case all class names that are not already camel-cased.
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/sanselan/trunk@1220868 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/main/java/org/apache/commons/sanselan/ImageParser.java b/src/main/java/org/apache/commons/sanselan/ImageParser.java
index 8ee1fd9..fea8117 100644
--- a/src/main/java/org/apache/commons/sanselan/ImageParser.java
+++ b/src/main/java/org/apache/commons/sanselan/ImageParser.java
@@ -41,7 +41,7 @@
import org.apache.commons.sanselan.formats.jpeg.JpegImageParser;
import org.apache.commons.sanselan.formats.pcx.PcxImageParser;
import org.apache.commons.sanselan.formats.png.PngImageParser;
-import org.apache.commons.sanselan.formats.pnm.PNMImageParser;
+import org.apache.commons.sanselan.formats.pnm.PnmImageParser;
import org.apache.commons.sanselan.formats.psd.PsdImageParser;
import org.apache.commons.sanselan.formats.tiff.TiffImageParser;
import org.apache.commons.sanselan.formats.wbmp.WbmpImageParser;
@@ -58,7 +58,7 @@
ImageParser result[] = { new JpegImageParser(), new TiffImageParser(),
new PngImageParser(), new BmpImageParser(),
new GifImageParser(), new PsdImageParser(),
- new PNMImageParser(), new IcoImageParser(),
+ new PnmImageParser(), new IcoImageParser(),
new IcnsImageParser(), new WbmpImageParser(),
new PcxImageParser(), new DcxImageParser(),
new XbmImageParser(), new XpmImageParser(),
diff --git a/src/main/java/org/apache/commons/sanselan/Sanselan.java b/src/main/java/org/apache/commons/sanselan/Sanselan.java
index 2788db0..e38d9d2 100644
--- a/src/main/java/org/apache/commons/sanselan/Sanselan.java
+++ b/src/main/java/org/apache/commons/sanselan/Sanselan.java
@@ -48,9 +48,9 @@
* All of Sanselan's methods are static.
* <p>
* See the source of the SampleUsage class and other classes in the
- * org.apache.commons.sanselan.sampleUsage package for examples.
+ * org.apache.commons.sanselan.examples package for examples.
*
- * @see org.apache.commons.sanselan.sampleUsage.SampleUsage
+ * @see org.apache.commons.sanselan.examples.SampleUsage
*/
public abstract class Sanselan implements SanselanConstants {
diff --git a/src/main/java/org/apache/commons/sanselan/color/ColorCIELab.java b/src/main/java/org/apache/commons/sanselan/color/ColorCieLab.java
similarity index 92%
rename from src/main/java/org/apache/commons/sanselan/color/ColorCIELab.java
rename to src/main/java/org/apache/commons/sanselan/color/ColorCieLab.java
index 659f0fb..26cb8e3 100644
--- a/src/main/java/org/apache/commons/sanselan/color/ColorCIELab.java
+++ b/src/main/java/org/apache/commons/sanselan/color/ColorCieLab.java
@@ -16,11 +16,11 @@
*/
package org.apache.commons.sanselan.color;
-public final class ColorCIELab
+public final class ColorCieLab
{
public final double L, a, b;
- public ColorCIELab(double l, double a, double b)
+ public ColorCieLab(double l, double a, double b)
{
L = l;
this.a = a;
diff --git a/src/main/java/org/apache/commons/sanselan/color/ColorCIELCH.java b/src/main/java/org/apache/commons/sanselan/color/ColorCieLch.java
similarity index 92%
rename from src/main/java/org/apache/commons/sanselan/color/ColorCIELCH.java
rename to src/main/java/org/apache/commons/sanselan/color/ColorCieLch.java
index 1c629f1..4ec5d07 100644
--- a/src/main/java/org/apache/commons/sanselan/color/ColorCIELCH.java
+++ b/src/main/java/org/apache/commons/sanselan/color/ColorCieLch.java
@@ -16,11 +16,11 @@
*/
package org.apache.commons.sanselan.color;
-public final class ColorCIELCH
+public final class ColorCieLch
{
public final double L, C, H;
- public ColorCIELCH(double l, double C, double H)
+ public ColorCieLch(double l, double C, double H)
{
L = l;
this.C = C;
diff --git a/src/main/java/org/apache/commons/sanselan/color/ColorCIELuv.java b/src/main/java/org/apache/commons/sanselan/color/ColorCieLuv.java
similarity index 92%
rename from src/main/java/org/apache/commons/sanselan/color/ColorCIELuv.java
rename to src/main/java/org/apache/commons/sanselan/color/ColorCieLuv.java
index cf87022..be289fa 100644
--- a/src/main/java/org/apache/commons/sanselan/color/ColorCIELuv.java
+++ b/src/main/java/org/apache/commons/sanselan/color/ColorCieLuv.java
@@ -16,11 +16,11 @@
*/
package org.apache.commons.sanselan.color;
-public final class ColorCIELuv
+public final class ColorCieLuv
{
public final double L, u, v;
- public ColorCIELuv(double l, double u, double v)
+ public ColorCieLuv(double l, double u, double v)
{
L = l;
this.u = u;
diff --git a/src/main/java/org/apache/commons/sanselan/color/ColorCMY.java b/src/main/java/org/apache/commons/sanselan/color/ColorCmy.java
similarity index 92%
rename from src/main/java/org/apache/commons/sanselan/color/ColorCMY.java
rename to src/main/java/org/apache/commons/sanselan/color/ColorCmy.java
index ca0e35b..b3c8339 100644
--- a/src/main/java/org/apache/commons/sanselan/color/ColorCMY.java
+++ b/src/main/java/org/apache/commons/sanselan/color/ColorCmy.java
@@ -16,11 +16,11 @@
*/
package org.apache.commons.sanselan.color;
-public final class ColorCMY
+public final class ColorCmy
{
public final double C, M, Y;
- public ColorCMY(double C, double M, double Y)
+ public ColorCmy(double C, double M, double Y)
{
this.C = C;
this.M = M;
diff --git a/src/main/java/org/apache/commons/sanselan/color/ColorCMYK.java b/src/main/java/org/apache/commons/sanselan/color/ColorCmyk.java
similarity index 92%
rename from src/main/java/org/apache/commons/sanselan/color/ColorCMYK.java
rename to src/main/java/org/apache/commons/sanselan/color/ColorCmyk.java
index 49b17ba..2cb93c1 100644
--- a/src/main/java/org/apache/commons/sanselan/color/ColorCMYK.java
+++ b/src/main/java/org/apache/commons/sanselan/color/ColorCmyk.java
@@ -16,11 +16,11 @@
*/
package org.apache.commons.sanselan.color;
-public final class ColorCMYK
+public final class ColorCmyk
{
public final double C, M, Y, K;
- public ColorCMYK(double C, double M, double Y, double K)
+ public ColorCmyk(double C, double M, double Y, double K)
{
this.C = C;
this.M = M;
diff --git a/src/main/java/org/apache/commons/sanselan/color/ColorConversions.java b/src/main/java/org/apache/commons/sanselan/color/ColorConversions.java
index 86f8187..b6cbb55 100644
--- a/src/main/java/org/apache/commons/sanselan/color/ColorConversions.java
+++ b/src/main/java/org/apache/commons/sanselan/color/ColorConversions.java
@@ -69,7 +69,7 @@
{
int rgb = sample_rgbs[i];
- ColorXYZ xyz;
+ ColorXyz xyz;
{
xyz = ColorConversions.convertRGBtoXYZ(rgb);
int xyz_rgb = ColorConversions.convertXYZtoRGB(xyz);
@@ -83,10 +83,10 @@
if ((0xffffff & xyz_rgb) != (0xffffff & rgb))
Debug.debug("!!!!!!!!!!!!!!!!!!!!!!!");
}
- ColorCIELab cielab;
+ ColorCieLab cielab;
{
cielab = ColorConversions.convertXYZtoCIELab(xyz);
- ColorXYZ cielab_xyz = ColorConversions
+ ColorXyz cielab_xyz = ColorConversions
.convertCIELabtoXYZ(cielab);
int cielab_xyz_rgb = ColorConversions
.convertXYZtoRGB(cielab_xyz);
@@ -102,7 +102,7 @@
{
ColorHunterLab hunterlab = ColorConversions
.convertXYZtoHunterLab(xyz);
- ColorXYZ hunterlab_xyz = ColorConversions
+ ColorXyz hunterlab_xyz = ColorConversions
.convertHunterLabtoXYZ(hunterlab);
int hunterlab_xyz_rgb = ColorConversions
.convertXYZtoRGB(hunterlab_xyz);
@@ -116,9 +116,9 @@
}
{
- ColorCMY cmy = ColorConversions.convertRGBtoCMY(rgb);
- ColorCMYK cmyk = ColorConversions.convertCMYtoCMYK(cmy);
- ColorCMY cmyk_cmy = ColorConversions.convertCMYKtoCMY(cmyk);
+ ColorCmy cmy = ColorConversions.convertRGBtoCMY(rgb);
+ ColorCmyk cmyk = ColorConversions.convertCMYtoCMYK(cmy);
+ ColorCmy cmyk_cmy = ColorConversions.convertCMYKtoCMY(cmyk);
int cmyk_cmy_rgb = ColorConversions
.convertCMYtoRGB(cmyk_cmy);
@@ -132,7 +132,7 @@
}
{
- ColorHSL hsl = ColorConversions.convertRGBtoHSL(rgb);
+ ColorHsl hsl = ColorConversions.convertRGBtoHSL(rgb);
int hsl_rgb = ColorConversions.convertHSLtoRGB(hsl);
Debug.debug("hsl", hsl);
@@ -142,7 +142,7 @@
Debug.debug("!!!!!!!!!!!!!!!!!!!!!!!");
}
{
- ColorHSV hsv = ColorConversions.convertRGBtoHSV(rgb);
+ ColorHsv hsv = ColorConversions.convertRGBtoHSV(rgb);
int hsv_rgb = ColorConversions.convertHSVtoRGB(hsv);
Debug.debug("hsv", hsv);
@@ -153,9 +153,9 @@
}
{
- ColorCIELCH cielch = ColorConversions
+ ColorCieLch cielch = ColorConversions
.convertCIELabtoCIELCH(cielab);
- ColorCIELab cielch_cielab = ColorConversions
+ ColorCieLab cielch_cielab = ColorConversions
.convertCIELCHtoCIELab(cielch);
Debug.debug("cielch", cielch);
@@ -163,9 +163,9 @@
}
{
- ColorCIELuv cieluv = ColorConversions
+ ColorCieLuv cieluv = ColorConversions
.convertXYZtoCIELuv(xyz);
- ColorXYZ cieluv_xyz = ColorConversions
+ ColorXyz cieluv_xyz = ColorConversions
.convertCIELuvtoXYZ(cieluv);
Debug.debug("cieluv", cieluv);
@@ -180,7 +180,7 @@
}
}
- public static final ColorCIELab convertXYZtoCIELab(ColorXYZ xyz)
+ public static final ColorCieLab convertXYZtoCIELab(ColorXyz xyz)
{
return convertXYZtoCIELab(xyz.X, xyz.Y, xyz.Z);
}
@@ -189,7 +189,7 @@
private static final double ref_Y = 100.000;
private static final double ref_Z = 108.883;
- public static final ColorCIELab convertXYZtoCIELab(double X, double Y,
+ public static final ColorCieLab convertXYZtoCIELab(double X, double Y,
double Z)
{
@@ -213,15 +213,15 @@
double L = (116 * var_Y) - 16;
double a = 500 * (var_X - var_Y);
double b = 200 * (var_Y - var_Z);
- return new ColorCIELab(L, a, b);
+ return new ColorCieLab(L, a, b);
}
- public static final ColorXYZ convertCIELabtoXYZ(ColorCIELab cielab)
+ public static final ColorXyz convertCIELabtoXYZ(ColorCieLab cielab)
{
return convertCIELabtoXYZ(cielab.L, cielab.a, cielab.b);
}
- public static final ColorXYZ convertCIELabtoXYZ(double L, double a, double b)
+ public static final ColorXyz convertCIELabtoXYZ(double L, double a, double b)
{
double var_Y = (L + 16) / 116.0;
double var_X = a / 500 + var_Y;
@@ -244,10 +244,10 @@
double Y = ref_Y * var_Y; //ref_Y = 100.000
double Z = ref_Z * var_Z; //ref_Z = 108.883
- return new ColorXYZ(X, Y, Z);
+ return new ColorXyz(X, Y, Z);
}
- public static final ColorHunterLab convertXYZtoHunterLab(ColorXYZ xyz)
+ public static final ColorHunterLab convertXYZtoHunterLab(ColorXyz xyz)
{
return convertXYZtoHunterLab(xyz.X, xyz.Y, xyz.Z);
}
@@ -262,12 +262,12 @@
return new ColorHunterLab(L, a, b);
}
- public static final ColorXYZ convertHunterLabtoXYZ(ColorHunterLab cielab)
+ public static final ColorXyz convertHunterLabtoXYZ(ColorHunterLab cielab)
{
return convertHunterLabtoXYZ(cielab.L, cielab.a, cielab.b);
}
- public static final ColorXYZ convertHunterLabtoXYZ(double L, double a,
+ public static final ColorXyz convertHunterLabtoXYZ(double L, double a,
double b)
{
double var_Y = L / 10;
@@ -278,10 +278,10 @@
double X = (var_X + Y) / 1.02;
double Z = -(var_Z - Y) / 0.847;
- return new ColorXYZ(X, Y, Z);
+ return new ColorXyz(X, Y, Z);
}
- public static final int convertXYZtoRGB(ColorXYZ xyz)
+ public static final int convertXYZtoRGB(ColorXyz xyz)
{
return convertXYZtoRGB(xyz.X, xyz.Y, xyz.Z);
}
@@ -317,7 +317,7 @@
return convertRGBtoRGB(R, G, B);
}
- public static final ColorXYZ convertRGBtoXYZ(int rgb)
+ public static final ColorXyz convertRGBtoXYZ(int rgb)
{
int r = 0xff & (rgb >> 16);
int g = 0xff & (rgb >> 8);
@@ -349,10 +349,10 @@
double Y = var_R * 0.2126 + var_G * 0.7152 + var_B * 0.0722;
double Z = var_R * 0.0193 + var_G * 0.1192 + var_B * 0.9505;
- return new ColorXYZ(X, Y, Z);
+ return new ColorXyz(X, Y, Z);
}
- public static final ColorCMY convertRGBtoCMY(int rgb)
+ public static final ColorCmy convertRGBtoCMY(int rgb)
{
int R = 0xff & (rgb >> 16);
int G = 0xff & (rgb >> 8);
@@ -365,10 +365,10 @@
double M = 1 - (G / 255.0);
double Y = 1 - (B / 255.0);
- return new ColorCMY(C, M, Y);
+ return new ColorCmy(C, M, Y);
}
- public static final int convertCMYtoRGB(ColorCMY cmy)
+ public static final int convertCMYtoRGB(ColorCmy cmy)
{
// CMY values = 0 ÷ 1
// RGB values = 0 ÷ 255
@@ -380,7 +380,7 @@
return convertRGBtoRGB(R, G, B);
}
- public static final ColorCMYK convertCMYtoCMYK(ColorCMY cmy)
+ public static final ColorCmyk convertCMYtoCMYK(ColorCmy cmy)
{
// Where CMYK and CMY values = 0 ÷ 1
@@ -408,15 +408,15 @@
M = (M - var_K) / (1 - var_K);
Y = (Y - var_K) / (1 - var_K);
}
- return new ColorCMYK(C, M, Y, var_K);
+ return new ColorCmyk(C, M, Y, var_K);
}
- public static final ColorCMY convertCMYKtoCMY(ColorCMYK cmyk)
+ public static final ColorCmy convertCMYKtoCMY(ColorCmyk cmyk)
{
return convertCMYKtoCMY(cmyk.C, cmyk.M, cmyk.Y, cmyk.K);
}
- public static final ColorCMY convertCMYKtoCMY(double C, double M, double Y,
+ public static final ColorCmy convertCMYKtoCMY(double C, double M, double Y,
double K)
{
// Where CMYK and CMY values = 0 ÷ 1
@@ -425,7 +425,7 @@
M = (M * (1 - K) + K);
Y = (Y * (1 - K) + K);
- return new ColorCMY(C, M, Y);
+ return new ColorCmy(C, M, Y);
}
public static final int convertCMYKtoRGB(int c, int m, int y, int k)
@@ -439,7 +439,7 @@
return convertCMYtoRGB(convertCMYKtoCMY(C, M, Y, K));
}
- public static final ColorHSL convertRGBtoHSL(int rgb)
+ public static final ColorHsl convertRGBtoHSL(int rgb)
{
int R = 0xff & (rgb >> 16);
@@ -501,10 +501,10 @@
// Debug.debug("H2", H);
}
- return new ColorHSL(H, S, L);
+ return new ColorHsl(H, S, L);
}
- public static int convertHSLtoRGB(ColorHSL hsl)
+ public static int convertHSLtoRGB(ColorHsl hsl)
{
return convertHSLtoRGB(hsl.H, hsl.S, hsl.L);
}
@@ -553,7 +553,7 @@
return (v1);
}
- public static final ColorHSV convertRGBtoHSV(int rgb)
+ public static final ColorHsv convertRGBtoHSV(int rgb)
{
int R = 0xff & (rgb >> 16);
int G = 0xff & (rgb >> 8);
@@ -602,10 +602,10 @@
H -= 1;
}
- return new ColorHSV(H, S, V);
+ return new ColorHsv(H, S, V);
}
- public static int convertHSVtoRGB(ColorHSV HSV)
+ public static int convertHSVtoRGB(ColorHsv HSV)
{
return convertHSVtoRGB(HSV.H, HSV.S, HSV.V);
}
@@ -796,12 +796,12 @@
return rgb;
}
- public static ColorCIELCH convertCIELabtoCIELCH(ColorCIELab cielab)
+ public static ColorCieLch convertCIELabtoCIELCH(ColorCieLab cielab)
{
return convertCIELabtoCIELCH(cielab.L, cielab.a, cielab.b);
}
- public static ColorCIELCH convertCIELabtoCIELCH(double L, double a, double b)
+ public static ColorCieLch convertCIELabtoCIELCH(double L, double a, double b)
{
double var_H = Math.atan2(b, a); //Quadrant by signs
@@ -814,15 +814,15 @@
double C = Math.sqrt(square(a) + square(b));
double H = var_H;
- return new ColorCIELCH(L, C, H);
+ return new ColorCieLch(L, C, H);
}
- public static ColorCIELab convertCIELCHtoCIELab(ColorCIELCH cielch)
+ public static ColorCieLab convertCIELCHtoCIELab(ColorCieLch cielch)
{
return convertCIELCHtoCIELab(cielch.L, cielch.C, cielch.H);
}
- public static ColorCIELab convertCIELCHtoCIELab(double L, double C, double H)
+ public static ColorCieLab convertCIELCHtoCIELab(double L, double C, double H)
{
// Where CIE-H° = 0 ÷ 360°
@@ -830,7 +830,7 @@
double a = Math.cos(degree_2_radian(H)) * C;
double b = Math.sin(degree_2_radian(H)) * C;
- return new ColorCIELab(L, a, b);
+ return new ColorCieLab(L, a, b);
}
public static double degree_2_radian(double degree)
@@ -843,12 +843,12 @@
return radian * 180.0 / Math.PI;
}
- public static ColorCIELuv convertXYZtoCIELuv(ColorXYZ xyz)
+ public static ColorCieLuv convertXYZtoCIELuv(ColorXyz xyz)
{
return convertXYZtoCIELuv(xyz.X, xyz.Y, xyz.Z);
}
- public static ColorCIELuv convertXYZtoCIELuv(double X, double Y, double Z)
+ public static ColorCieLuv convertXYZtoCIELuv(double X, double Y, double Z)
{
// problems here with div by zero
@@ -882,15 +882,15 @@
double u = 13 * L * (var_U - ref_U);
double v = 13 * L * (var_V - ref_V);
- return new ColorCIELuv(L, u, v);
+ return new ColorCieLuv(L, u, v);
}
- public static ColorXYZ convertCIELuvtoXYZ(ColorCIELuv cielch)
+ public static ColorXyz convertCIELuvtoXYZ(ColorCieLuv cielch)
{
return convertCIELuvtoXYZ(cielch.L, cielch.u, cielch.v);
}
- public static ColorXYZ convertCIELuvtoXYZ(double L, double u, double v)
+ public static ColorXyz convertCIELuvtoXYZ(double L, double u, double v)
{
// problems here with div by zero
@@ -913,6 +913,6 @@
double X = -(9 * Y * var_U) / ((var_U - 4) * var_V - var_U * var_V);
double Z = (9 * Y - (15 * var_V * Y) - (var_V * X)) / (3 * var_V);
- return new ColorXYZ(X, Y, Z);
+ return new ColorXyz(X, Y, Z);
}
}
\ No newline at end of file
diff --git a/src/main/java/org/apache/commons/sanselan/color/ColorHSL.java b/src/main/java/org/apache/commons/sanselan/color/ColorHsl.java
similarity index 92%
rename from src/main/java/org/apache/commons/sanselan/color/ColorHSL.java
rename to src/main/java/org/apache/commons/sanselan/color/ColorHsl.java
index 331da2d..5c6517f 100644
--- a/src/main/java/org/apache/commons/sanselan/color/ColorHSL.java
+++ b/src/main/java/org/apache/commons/sanselan/color/ColorHsl.java
@@ -16,11 +16,11 @@
*/
package org.apache.commons.sanselan.color;
-public final class ColorHSL
+public final class ColorHsl
{
public final double H, S, L;
- public ColorHSL(double h, double s, double v)
+ public ColorHsl(double h, double s, double v)
{
H = h;
S = s;
diff --git a/src/main/java/org/apache/commons/sanselan/color/ColorHSV.java b/src/main/java/org/apache/commons/sanselan/color/ColorHsv.java
similarity index 92%
rename from src/main/java/org/apache/commons/sanselan/color/ColorHSV.java
rename to src/main/java/org/apache/commons/sanselan/color/ColorHsv.java
index 011242b..f8db2ea 100644
--- a/src/main/java/org/apache/commons/sanselan/color/ColorHSV.java
+++ b/src/main/java/org/apache/commons/sanselan/color/ColorHsv.java
@@ -16,11 +16,11 @@
*/
package org.apache.commons.sanselan.color;
-public final class ColorHSV
+public final class ColorHsv
{
public final double H, S, V;
- public ColorHSV(double h, double s, double v)
+ public ColorHsv(double h, double s, double v)
{
H = h;
S = s;
diff --git a/src/main/java/org/apache/commons/sanselan/color/ColorXYZ.java b/src/main/java/org/apache/commons/sanselan/color/ColorXyz.java
similarity index 92%
rename from src/main/java/org/apache/commons/sanselan/color/ColorXYZ.java
rename to src/main/java/org/apache/commons/sanselan/color/ColorXyz.java
index 2048216..2cf7077 100644
--- a/src/main/java/org/apache/commons/sanselan/color/ColorXYZ.java
+++ b/src/main/java/org/apache/commons/sanselan/color/ColorXyz.java
@@ -16,11 +16,11 @@
*/
package org.apache.commons.sanselan.color;
-public final class ColorXYZ
+public final class ColorXyz
{
public final double X, Y, Z;
- public ColorXYZ(double x, double y, double z)
+ public ColorXyz(double x, double y, double z)
{
X = x;
Y = y;
diff --git a/src/main/java/org/apache/commons/sanselan/common/Compression.java b/src/main/java/org/apache/commons/sanselan/common/Compression.java
index 4a7ef05..30d9d39 100644
--- a/src/main/java/org/apache/commons/sanselan/common/Compression.java
+++ b/src/main/java/org/apache/commons/sanselan/common/Compression.java
@@ -21,8 +21,8 @@
import java.io.InputStream;
import org.apache.commons.sanselan.ImageReadException;
-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;
public class Compression
{
@@ -32,7 +32,7 @@
{
InputStream is = new ByteArrayInputStream(compressed);
- MyLZWDecompressor decompressor = new MyLZWDecompressor(
+ MyLzwDecompressor decompressor = new MyLzwDecompressor(
LZWMinimumCodeSize, byteOrder);
byte[] result = decompressor.decompress(is, expectedSize);
@@ -50,7 +50,7 @@
int byteOrder, boolean earlyLimit) throws IOException
{
- MyLZWCompressor compressor = new MyLZWCompressor(LZWMinimumCodeSize,
+ MyLzwCompressor compressor = new MyLzwCompressor(LZWMinimumCodeSize,
byteOrder, earlyLimit);
byte compressed[] = compressor.compress(src);
diff --git a/src/main/java/org/apache/commons/sanselan/common/mylzw/MyLZWCompressor.java b/src/main/java/org/apache/commons/sanselan/common/mylzw/MyLzwCompressor.java
similarity index 97%
rename from src/main/java/org/apache/commons/sanselan/common/mylzw/MyLZWCompressor.java
rename to src/main/java/org/apache/commons/sanselan/common/mylzw/MyLzwCompressor.java
index e659fa0..4481bec 100644
--- a/src/main/java/org/apache/commons/sanselan/common/mylzw/MyLZWCompressor.java
+++ b/src/main/java/org/apache/commons/sanselan/common/mylzw/MyLzwCompressor.java
@@ -21,7 +21,7 @@
import java.util.HashMap;
import java.util.Map;
-public class MyLZWCompressor
+public class MyLzwCompressor
{
// private static final int MAX_TABLE_SIZE = 1 << 12;
@@ -36,13 +36,13 @@
private final int eoiCode;
private final Listener listener;
- public MyLZWCompressor(int initialCodeSize, int byteOrder,
+ public MyLzwCompressor(int initialCodeSize, int byteOrder,
boolean earlyLimit)
{
this(initialCodeSize, byteOrder, earlyLimit, null);
}
- public MyLZWCompressor(int initialCodeSize, int byteOrder,
+ public MyLzwCompressor(int initialCodeSize, int byteOrder,
boolean earlyLimit, Listener listener)
{
this.listener = listener;
diff --git a/src/main/java/org/apache/commons/sanselan/common/mylzw/MyLZWDecompressor.java b/src/main/java/org/apache/commons/sanselan/common/mylzw/MyLzwDecompressor.java
similarity index 97%
rename from src/main/java/org/apache/commons/sanselan/common/mylzw/MyLZWDecompressor.java
rename to src/main/java/org/apache/commons/sanselan/common/mylzw/MyLzwDecompressor.java
index 302abfe..0303de7 100644
--- a/src/main/java/org/apache/commons/sanselan/common/mylzw/MyLZWDecompressor.java
+++ b/src/main/java/org/apache/commons/sanselan/common/mylzw/MyLzwDecompressor.java
@@ -21,7 +21,7 @@
import java.io.InputStream;
import java.io.OutputStream;
-public final class MyLZWDecompressor
+public final class MyLzwDecompressor
{
private static final int MAX_TABLE_SIZE = 1 << 12;
@@ -41,12 +41,12 @@
public void init(int clearCode, int eoiCode);
}
- public MyLZWDecompressor(int initialCodeSize, int byteOrder)
+ public MyLzwDecompressor(int initialCodeSize, int byteOrder)
{
this(initialCodeSize, byteOrder, null);
}
- public MyLZWDecompressor(int initialCodeSize, int byteOrder,
+ public MyLzwDecompressor(int initialCodeSize, int byteOrder,
Listener listener)
{
this.listener = listener;
diff --git a/src/main/java/org/apache/commons/sanselan/formats/bmp/BmpImageParser.java b/src/main/java/org/apache/commons/sanselan/formats/bmp/BmpImageParser.java
index f12a79e..f89bbd1 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/bmp/BmpImageParser.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/bmp/BmpImageParser.java
@@ -41,9 +41,9 @@
import org.apache.commons.sanselan.formats.bmp.pixelparsers.PixelParserBitFields;
import org.apache.commons.sanselan.formats.bmp.pixelparsers.PixelParserRgb;
import org.apache.commons.sanselan.formats.bmp.pixelparsers.PixelParserRle;
-import org.apache.commons.sanselan.formats.bmp.writers.BMPWriter;
-import org.apache.commons.sanselan.formats.bmp.writers.BMPWriterPalette;
-import org.apache.commons.sanselan.formats.bmp.writers.BMPWriterRGB;
+import org.apache.commons.sanselan.formats.bmp.writers.BmpWriter;
+import org.apache.commons.sanselan.formats.bmp.writers.BmpWriterPalette;
+import org.apache.commons.sanselan.formats.bmp.writers.BmpWriterRgb;
import org.apache.commons.sanselan.palette.PaletteFactory;
import org.apache.commons.sanselan.palette.SimplePalette;
import org.apache.commons.sanselan.util.Debug;
@@ -753,11 +753,11 @@
final SimplePalette palette = new PaletteFactory().makePaletteSimple(
src, 256);
- BMPWriter writer = null;
+ BmpWriter writer = null;
if (palette == null)
- writer = new BMPWriterRGB();
+ writer = new BmpWriterRgb();
else
- writer = new BMPWriterPalette(palette);
+ writer = new BmpWriterPalette(palette);
byte imagedata[] = writer.getImageData(src);
BinaryOutputStream bos = new BinaryOutputStream(os, BYTE_ORDER_INTEL);
diff --git a/src/main/java/org/apache/commons/sanselan/formats/bmp/writers/BMPWriter.java b/src/main/java/org/apache/commons/sanselan/formats/bmp/writers/BmpWriter.java
similarity index 97%
rename from src/main/java/org/apache/commons/sanselan/formats/bmp/writers/BMPWriter.java
rename to src/main/java/org/apache/commons/sanselan/formats/bmp/writers/BmpWriter.java
index 69ec932..42d38e9 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/bmp/writers/BMPWriter.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/bmp/writers/BmpWriter.java
@@ -21,7 +21,7 @@
import org.apache.commons.sanselan.common.BinaryOutputStream;
-public abstract class BMPWriter
+public abstract class BmpWriter
{
public abstract int getPaletteSize();
diff --git a/src/main/java/org/apache/commons/sanselan/formats/bmp/writers/BMPWriterPalette.java b/src/main/java/org/apache/commons/sanselan/formats/bmp/writers/BmpWriterPalette.java
similarity index 97%
rename from src/main/java/org/apache/commons/sanselan/formats/bmp/writers/BMPWriterPalette.java
rename to src/main/java/org/apache/commons/sanselan/formats/bmp/writers/BmpWriterPalette.java
index 1e4cf8d..32259f3 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/bmp/writers/BMPWriterPalette.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/bmp/writers/BmpWriterPalette.java
@@ -23,12 +23,12 @@
import org.apache.commons.sanselan.common.BinaryOutputStream;
import org.apache.commons.sanselan.palette.SimplePalette;
-public class BMPWriterPalette extends BMPWriter
+public class BmpWriterPalette extends BmpWriter
{
private final SimplePalette palette;
private final int bitsPerSample;
- public BMPWriterPalette(SimplePalette palette)
+ public BmpWriterPalette(SimplePalette palette)
{
this.palette = palette;
diff --git a/src/main/java/org/apache/commons/sanselan/formats/bmp/writers/BMPWriterRGB.java b/src/main/java/org/apache/commons/sanselan/formats/bmp/writers/BmpWriterRgb.java
similarity index 96%
rename from src/main/java/org/apache/commons/sanselan/formats/bmp/writers/BMPWriterRGB.java
rename to src/main/java/org/apache/commons/sanselan/formats/bmp/writers/BmpWriterRgb.java
index b569b2a..3072841 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/bmp/writers/BMPWriterRGB.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/bmp/writers/BmpWriterRgb.java
@@ -22,11 +22,11 @@
import org.apache.commons.sanselan.common.BinaryOutputStream;
-public class BMPWriterRGB extends BMPWriter
+public class BmpWriterRgb extends BmpWriter
{
// private final boolean alpha;
//
- // public BMPWriterRGB(boolean alpha)
+ // public BmpWriterRgb(boolean alpha)
// {
// this.alpha = alpha;
// }
diff --git a/src/main/java/org/apache/commons/sanselan/formats/gif/GenericGIFBlock.java b/src/main/java/org/apache/commons/sanselan/formats/gif/GenericGifBlock.java
similarity index 93%
rename from src/main/java/org/apache/commons/sanselan/formats/gif/GenericGIFBlock.java
rename to src/main/java/org/apache/commons/sanselan/formats/gif/GenericGifBlock.java
index 9a0b785..5b4ed19 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/gif/GenericGIFBlock.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/gif/GenericGifBlock.java
@@ -20,11 +20,11 @@
import java.io.IOException;
import java.util.ArrayList;
-class GenericGIFBlock extends GIFBlock
+class GenericGifBlock extends GifBlock
{
public final ArrayList subblocks;
- public GenericGIFBlock(int blockCode, ArrayList subblocks)
+ public GenericGifBlock(int blockCode, ArrayList subblocks)
{
super(blockCode);
diff --git a/src/main/java/org/apache/commons/sanselan/formats/gif/GIFBlock.java b/src/main/java/org/apache/commons/sanselan/formats/gif/GifBlock.java
similarity index 94%
rename from src/main/java/org/apache/commons/sanselan/formats/gif/GIFBlock.java
rename to src/main/java/org/apache/commons/sanselan/formats/gif/GifBlock.java
index 108cf29..448b3c8 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/gif/GIFBlock.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/gif/GifBlock.java
@@ -16,11 +16,11 @@
*/
package org.apache.commons.sanselan.formats.gif;
-class GIFBlock
+class GifBlock
{
public final int blockCode;
- public GIFBlock(int blockCode)
+ public GifBlock(int blockCode)
{
this.blockCode = blockCode;
}
diff --git a/src/main/java/org/apache/commons/sanselan/formats/gif/GIFHeaderInfo.java b/src/main/java/org/apache/commons/sanselan/formats/gif/GifHeaderInfo.java
similarity index 96%
rename from src/main/java/org/apache/commons/sanselan/formats/gif/GIFHeaderInfo.java
rename to src/main/java/org/apache/commons/sanselan/formats/gif/GifHeaderInfo.java
index 65f3913..924a3a8 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/gif/GIFHeaderInfo.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/gif/GifHeaderInfo.java
@@ -16,7 +16,7 @@
*/
package org.apache.commons.sanselan.formats.gif;
-class GIFHeaderInfo
+class GifHeaderInfo
{
public final byte identifier1;
public final byte identifier2;
@@ -35,7 +35,7 @@
public final boolean sortFlag;
public final byte sizeOfGlobalColorTable;
- public GIFHeaderInfo(byte Identifier1, byte Identifier2, byte Identifier3,
+ public GifHeaderInfo(byte Identifier1, byte Identifier2, byte Identifier3,
byte Version1, byte Version2, byte Version3,
int LogicalScreenWidth, int LogicalScreenHeight, byte PackedFields,
byte BackgroundColorIndex, byte PixelAspectRatio,
diff --git a/src/main/java/org/apache/commons/sanselan/formats/gif/GifImageParser.java b/src/main/java/org/apache/commons/sanselan/formats/gif/GifImageParser.java
index 24d3c1c..0591093 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/gif/GifImageParser.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/gif/GifImageParser.java
@@ -40,8 +40,8 @@
import org.apache.commons.sanselan.common.BinaryOutputStream;
import org.apache.commons.sanselan.common.IImageMetadata;
import org.apache.commons.sanselan.common.bytesource.ByteSource;
-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.palette.Palette;
import org.apache.commons.sanselan.palette.PaletteFactory;
import org.apache.commons.sanselan.util.Debug;
@@ -82,7 +82,7 @@
private static final byte GIF_HEADER_SIGNATURE[] = { 71, 73, 70 };
- private GIFHeaderInfo readHeader(InputStream is,
+ private GifHeaderInfo readHeader(InputStream is,
FormatCompliance formatCompliance) throws ImageReadException,
IOException
{
@@ -156,7 +156,7 @@
backgroundColorIndex);
}
- return new GIFHeaderInfo(identifier1, identifier2, identifier3,
+ return new GifHeaderInfo(identifier1, identifier2, identifier3,
version1, version2, version3, logicalScreenWidth,
logicalScreenHeight, packedFields, backgroundColorIndex,
pixelAspectRatio, globalColorTableFlag, colorResolution,
@@ -194,13 +194,13 @@
return bytes;
}
- protected GenericGIFBlock readGenericGIFBlock(InputStream is, int code)
+ protected GenericGifBlock readGenericGIFBlock(InputStream is, int code)
throws ImageReadException, IOException
{
return readGenericGIFBlock(is, code, null);
}
- protected GenericGIFBlock readGenericGIFBlock(InputStream is, int code,
+ protected GenericGifBlock readGenericGIFBlock(InputStream is, int code,
byte first[]) throws ImageReadException, IOException
{
ArrayList subblocks = new ArrayList();
@@ -216,7 +216,7 @@
subblocks.add(bytes);
}
- return new GenericGIFBlock(code, subblocks);
+ return new GenericGifBlock(code, subblocks);
}
private final static int EXTENSION_CODE = 0x21;
@@ -230,7 +230,7 @@
private final static int XMP_COMPLETE_CODE = (EXTENSION_CODE << 8)
| XMP_EXTENSION;
- private ArrayList readBlocks(GIFHeaderInfo ghi, InputStream is,
+ private ArrayList readBlocks(GifHeaderInfo ghi, InputStream is,
boolean stopBeforeImageData, FormatCompliance formatCompliance)
throws ImageReadException, IOException
{
@@ -270,7 +270,7 @@
case COMMENT_EXTENSION:
case PLAIN_TEXT_EXTENSION: {
- GenericGIFBlock block = readGenericGIFBlock(is,
+ GenericGifBlock block = readGenericGIFBlock(is,
completeCode);
result.add(block);
break;
@@ -293,7 +293,7 @@
if ((label != null) && (label.length > 0))
{
- GenericGIFBlock block = readGenericGIFBlock(is,
+ GenericGifBlock block = readGenericGIFBlock(is,
completeCode, label);
result.add(block);
}
@@ -306,7 +306,7 @@
formatCompliance.addComment("Unknown block",
completeCode);
- GenericGIFBlock block = readGenericGIFBlock(is,
+ GenericGifBlock block = readGenericGIFBlock(is,
completeCode);
result.add(block);
break;
@@ -327,7 +327,7 @@
}
}
- private ImageDescriptor readImageDescriptor(GIFHeaderInfo ghi,
+ private ImageDescriptor readImageDescriptor(GifHeaderInfo ghi,
int blockCode, InputStream is, boolean stopBeforeImageData,
FormatCompliance formatCompliance) throws ImageReadException,
IOException
@@ -381,12 +381,12 @@
{
int LZWMinimumCodeSize = is.read();
- GenericGIFBlock block = readGenericGIFBlock(is, -1);
+ GenericGifBlock block = readGenericGIFBlock(is, -1);
byte bytes[] = block.appendSubBlocks();
InputStream bais = new ByteArrayInputStream(bytes);
int size = imageWidth * imageHeight;
- MyLZWDecompressor myLzwDecompressor = new MyLZWDecompressor(
+ MyLzwDecompressor myLzwDecompressor = new MyLzwDecompressor(
LZWMinimumCodeSize, BYTE_ORDER_LSB);
imageData = myLzwDecompressor.decompress(bais, size);
} else
@@ -433,7 +433,7 @@
}
// TODO - unused
- private GIFHeaderInfo readHeader(ByteSource byteSource)
+ private GifHeaderInfo readHeader(ByteSource byteSource)
throws ImageReadException, IOException
{
InputStream is = null;
@@ -457,11 +457,11 @@
}
}
- private GIFBlock findBlock(ArrayList v, int code)
+ private GifBlock findBlock(ArrayList v, int code)
{
for (int i = 0; i < v.size(); i++)
{
- GIFBlock gifBlock = (GIFBlock) v.get(i);
+ GifBlock gifBlock = (GifBlock) v.get(i);
if (gifBlock.blockCode == code)
return gifBlock;
}
@@ -484,7 +484,7 @@
{
is = byteSource.getInputStream();
- GIFHeaderInfo ghi = readHeader(is, formatCompliance);
+ GifHeaderInfo ghi = readHeader(is, formatCompliance);
byte globalColorTable[] = null;
if (ghi.globalColorTableFlag)
@@ -527,7 +527,7 @@
if (blocks == null)
throw new ImageReadException("GIF: Couldn't read blocks");
- GIFHeaderInfo bhi = blocks.gifHeaderInfo;
+ GifHeaderInfo bhi = blocks.gifHeaderInfo;
if (bhi == null)
throw new ImageReadException("GIF: Couldn't read Header");
@@ -564,10 +564,10 @@
for (int i = 0; i < v.size(); i++)
{
- GIFBlock block = (GIFBlock) v.get(i);
+ GifBlock block = (GifBlock) v.get(i);
if (block.blockCode == code)
{
- byte bytes[] = ((GenericGIFBlock) block).appendSubBlocks();
+ byte bytes[] = ((GenericGifBlock) block).appendSubBlocks();
result.add(new String(bytes));
}
}
@@ -583,7 +583,7 @@
if (blocks == null)
throw new ImageReadException("GIF: Couldn't read blocks");
- GIFHeaderInfo bhi = blocks.gifHeaderInfo;
+ GifHeaderInfo bhi = blocks.gifHeaderInfo;
if (bhi == null)
throw new ImageReadException("GIF: Couldn't read Header");
@@ -660,7 +660,7 @@
pw.println("gif.blocks: " + blocks.blocks.size());
for (int i = 0; i < blocks.blocks.size(); i++)
{
- GIFBlock gifBlock = (GIFBlock) blocks.blocks.get(i);
+ GifBlock gifBlock = (GifBlock) blocks.blocks.get(i);
this.debugNumber(pw, "\t" + i + " ("
+ gifBlock.getClass().getName() + ")",
gifBlock.blockCode, 4);
@@ -716,7 +716,7 @@
if (imageContents == null)
throw new ImageReadException("GIF: Couldn't read blocks");
- GIFHeaderInfo ghi = imageContents.gifHeaderInfo;
+ GifHeaderInfo ghi = imageContents.gifHeaderInfo;
if (ghi == null)
throw new ImageReadException("GIF: Couldn't read Header");
@@ -1035,7 +1035,7 @@
// here.
bos.write(LZWMinimumCodeSize);
- MyLZWCompressor compressor = new MyLZWCompressor(
+ MyLzwCompressor compressor = new MyLzwCompressor(
LZWMinimumCodeSize, BYTE_ORDER_LSB, false); // GIF
// Mode);
@@ -1112,7 +1112,7 @@
is = byteSource.getInputStream();
FormatCompliance formatCompliance = null;
- GIFHeaderInfo ghi = readHeader(is, formatCompliance);
+ GifHeaderInfo ghi = readHeader(is, formatCompliance);
if (ghi.globalColorTableFlag)
readColorTable(is, ghi.sizeOfGlobalColorTable, formatCompliance);
@@ -1122,11 +1122,11 @@
List result = new ArrayList();
for (int i = 0; i < blocks.size(); i++)
{
- GIFBlock block = (GIFBlock) blocks.get(i);
+ GifBlock block = (GifBlock) blocks.get(i);
if (block.blockCode != XMP_COMPLETE_CODE)
continue;
- GenericGIFBlock genericBlock = (GenericGIFBlock) block;
+ GenericGifBlock genericBlock = (GenericGifBlock) block;
byte blockBytes[] = genericBlock.appendSubBlocks(true);
if (blockBytes.length < XMP_APPLICATION_ID_AND_AUTH_CODE.length)
diff --git a/src/main/java/org/apache/commons/sanselan/formats/gif/GraphicControlExtension.java b/src/main/java/org/apache/commons/sanselan/formats/gif/GraphicControlExtension.java
index c9d92d0..8bd9620 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/gif/GraphicControlExtension.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/gif/GraphicControlExtension.java
@@ -16,7 +16,7 @@
*/
package org.apache.commons.sanselan.formats.gif;
-class GraphicControlExtension extends GIFBlock
+class GraphicControlExtension extends GifBlock
{
public final int packed;
diff --git a/src/main/java/org/apache/commons/sanselan/formats/gif/ImageContents.java b/src/main/java/org/apache/commons/sanselan/formats/gif/ImageContents.java
index 1c49044..6490ed7 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/gif/ImageContents.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/gif/ImageContents.java
@@ -20,12 +20,12 @@
class ImageContents
{
- public final GIFHeaderInfo gifHeaderInfo;
+ public final GifHeaderInfo gifHeaderInfo;
public final ArrayList blocks;
public final byte globalColorTable[];
- public ImageContents(GIFHeaderInfo gifHeaderInfo, byte globalColorTable[],
+ public ImageContents(GifHeaderInfo gifHeaderInfo, byte globalColorTable[],
ArrayList blocks)
{
this.gifHeaderInfo = gifHeaderInfo;
diff --git a/src/main/java/org/apache/commons/sanselan/formats/gif/ImageDescriptor.java b/src/main/java/org/apache/commons/sanselan/formats/gif/ImageDescriptor.java
index 4a3eaec..7023494 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/gif/ImageDescriptor.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/gif/ImageDescriptor.java
@@ -16,7 +16,7 @@
*/
package org.apache.commons.sanselan.formats.gif;
-public class ImageDescriptor extends GIFBlock
+public class ImageDescriptor extends GifBlock
{
public final int imageLeftPosition;
diff --git a/src/main/java/org/apache/commons/sanselan/formats/jpeg/JpegImageParser.java b/src/main/java/org/apache/commons/sanselan/formats/jpeg/JpegImageParser.java
index bc7eb26..3141b18 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/jpeg/JpegImageParser.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/jpeg/JpegImageParser.java
@@ -37,15 +37,15 @@
import org.apache.commons.sanselan.common.IImageMetadata;
import org.apache.commons.sanselan.common.bytesource.ByteSource;
import org.apache.commons.sanselan.formats.jpeg.decoder.JpegDecoder;
-import org.apache.commons.sanselan.formats.jpeg.iptc.IPTCParser;
+import org.apache.commons.sanselan.formats.jpeg.iptc.IptcParser;
import org.apache.commons.sanselan.formats.jpeg.iptc.PhotoshopApp13Data;
import org.apache.commons.sanselan.formats.jpeg.segments.App13Segment;
import org.apache.commons.sanselan.formats.jpeg.segments.App2Segment;
-import org.apache.commons.sanselan.formats.jpeg.segments.COMSegment;
-import org.apache.commons.sanselan.formats.jpeg.segments.DQTSegment;
+import org.apache.commons.sanselan.formats.jpeg.segments.ComSegment;
+import org.apache.commons.sanselan.formats.jpeg.segments.DqtSegment;
import org.apache.commons.sanselan.formats.jpeg.segments.GenericSegment;
-import org.apache.commons.sanselan.formats.jpeg.segments.JFIFSegment;
-import org.apache.commons.sanselan.formats.jpeg.segments.SOFNSegment;
+import org.apache.commons.sanselan.formats.jpeg.segments.JfifSegment;
+import org.apache.commons.sanselan.formats.jpeg.segments.SofnSegment;
import org.apache.commons.sanselan.formats.jpeg.segments.Segment;
import org.apache.commons.sanselan.formats.jpeg.segments.UnknownSegment;
import org.apache.commons.sanselan.formats.jpeg.xmp.JpegXmpParser;
@@ -163,20 +163,20 @@
result.add(new App2Segment(marker, segmentData));
} else if (marker == JFIFMarker)
{
- result.add(new JFIFSegment(marker, segmentData));
+ result.add(new JfifSegment(marker, segmentData));
} else if (Arrays.binarySearch(sofnSegments, marker) >= 0)
{
- result.add(new SOFNSegment(marker, segmentData));
+ result.add(new SofnSegment(marker, segmentData));
} else if (marker == DQTMarker)
{
- result.add(new DQTSegment(marker, segmentData));
+ result.add(new DqtSegment(marker, segmentData));
} else if ((marker >= JPEG_APP1_Marker)
&& (marker <= JPEG_APP15_Marker))
{
result.add(new UnknownSegment(marker, segmentData));
} else if (marker == COMMarker)
{
- result.add(new COMSegment(marker, segmentData));
+ result.add(new ComSegment(marker, segmentData));
}
if (returnAfterFirst)
@@ -491,7 +491,7 @@
if (marker == JPEG_APP13_Marker)
{
- if (new IPTCParser().isPhotoshopJpegSegment(segmentData))
+ if (new IptcParser().isPhotoshopJpegSegment(segmentData))
{
result[0] = true;
return false;
@@ -655,7 +655,7 @@
if (segments.size() > 1)
throw new ImageReadException("Redundant JFIF Data Found.");
- SOFNSegment fSOFNSegment = (SOFNSegment) segments.get(0);
+ SofnSegment fSOFNSegment = (SofnSegment) segments.get(0);
return new Dimension(fSOFNSegment.width, fSOFNSegment.height);
}
@@ -694,8 +694,8 @@
ArrayList jfifSegments = readSegments(byteSource,
new int[] { JFIFMarker, }, true);
- SOFNSegment fSOFNSegment = (SOFNSegment) SOF_segments.get(0);
- // SOFNSegment fSOFNSegment = (SOFNSegment) findSegment(segments,
+ SofnSegment fSOFNSegment = (SofnSegment) SOF_segments.get(0);
+ // SofnSegment fSOFNSegment = (SofnSegment) findSegment(segments,
// SOFNmarkers);
if (fSOFNSegment == null)
@@ -704,12 +704,12 @@
int Width = fSOFNSegment.width;
int Height = fSOFNSegment.height;
- JFIFSegment jfifSegment = null;
+ JfifSegment jfifSegment = null;
if ((jfifSegments != null) && (jfifSegments.size() > 0))
- jfifSegment = (JFIFSegment) jfifSegments.get(0);
+ jfifSegment = (JfifSegment) jfifSegments.get(0);
- // JFIFSegment fTheJFIFSegment = (JFIFSegment) findSegment(segments,
+ // JfifSegment fTheJFIFSegment = (JfifSegment) findSegment(segments,
// kJFIFMarker);
double x_density = -1.0;
@@ -810,7 +810,7 @@
new int[] { COMMarker }, false);
for (int i = 0; i < commentSegments.size(); i++)
{
- COMSegment comSegment = (COMSegment) commentSegments.get(i);
+ ComSegment comSegment = (ComSegment) commentSegments.get(i);
String comment = "";
try {
comment = new String(comSegment.comment, "ISO-8859-1");
@@ -877,15 +877,15 @@
// jfifMarkers.add(new Integer(JFIFMarker));
// ArrayList jfifSegments = filterSegments(allSegments, jfifMarkers);
//
- // SOFNSegment firstSOFNSegment = (SOFNSegment) SOFSegments.get(0);
+ // SofnSegment firstSOFNSegment = (SofnSegment) SOFSegments.get(0);
//
// int Width = firstSOFNSegment.width;
// int Height = firstSOFNSegment.height;
//
- // JFIFSegment jfifSegment = null;
+ // JfifSegment jfifSegment = null;
//
// if (jfifSegments != null && jfifSegments.size() > 0)
- // jfifSegment = (JFIFSegment) jfifSegments.get(0);
+ // jfifSegment = (JfifSegment) jfifSegments.get(0);
//
// double x_density = -1.0;
// double y_density = -1.0;
diff --git a/src/main/java/org/apache/commons/sanselan/formats/jpeg/JpegPhotoshopMetadata.java b/src/main/java/org/apache/commons/sanselan/formats/jpeg/JpegPhotoshopMetadata.java
index 4a9f548..ac582d1 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/jpeg/JpegPhotoshopMetadata.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/jpeg/JpegPhotoshopMetadata.java
@@ -20,13 +20,13 @@
import java.util.List;
import org.apache.commons.sanselan.common.ImageMetadata;
-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.PhotoshopApp13Data;
import org.apache.commons.sanselan.util.Debug;
public class JpegPhotoshopMetadata extends ImageMetadata implements
- IPTCConstants
+ IptcConstants
{
public final PhotoshopApp13Data photoshopApp13Data;
@@ -36,10 +36,10 @@
this.photoshopApp13Data = photoshopApp13Data;
List records = photoshopApp13Data.getRecords();
- Collections.sort(records, IPTCRecord.COMPARATOR);
+ Collections.sort(records, IptcRecord.COMPARATOR);
for (int j = 0; j < records.size(); j++)
{
- IPTCRecord element = (IPTCRecord) records.get(j);
+ IptcRecord element = (IptcRecord) records.get(j);
if (element.iptcType.type != IPTC_TYPE_RECORD_VERSION.type)
add(element.getIptcTypeName(), element.getValue());
}
diff --git a/src/main/java/org/apache/commons/sanselan/formats/jpeg/decoder/DCT.java b/src/main/java/org/apache/commons/sanselan/formats/jpeg/decoder/Dct.java
similarity index 99%
rename from src/main/java/org/apache/commons/sanselan/formats/jpeg/decoder/DCT.java
rename to src/main/java/org/apache/commons/sanselan/formats/jpeg/decoder/Dct.java
index c53a9aa..48d3bb8 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/jpeg/decoder/DCT.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/jpeg/decoder/Dct.java
@@ -15,7 +15,7 @@
package org.apache.commons.sanselan.formats.jpeg.decoder;
-public class DCT
+public class Dct
{
/*
* The book "JPEG still image data compression standard",
@@ -135,7 +135,7 @@
}
/**
- * Fast forward DCT using AA&N.
+ * Fast forward Dct using AA&N.
* Taken from the book "JPEG still image data compression standard",
* by Pennebaker and Mitchell, chapter 4, figure "4-8".
*/
@@ -260,7 +260,7 @@
}
/**
- * Fast inverse DCT using AA&N. This is taken from the beautiful
+ * Fast inverse Dct using AA&N. This is taken from the beautiful
* http://vsr.informatik.tu-chemnitz.de/~jan/MPEG/HTML/IDCT.html
* which gives easy equations and properly explains constants and
* scaling factors. Terms have been inlined and the negation
diff --git a/src/main/java/org/apache/commons/sanselan/formats/jpeg/decoder/JpegDecoder.java b/src/main/java/org/apache/commons/sanselan/formats/jpeg/decoder/JpegDecoder.java
index 0b57d28..d320c89 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/jpeg/decoder/JpegDecoder.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/jpeg/decoder/JpegDecoder.java
@@ -32,10 +32,10 @@
import org.apache.commons.sanselan.formats.jpeg.JpegConstants;
import org.apache.commons.sanselan.formats.jpeg.JpegUtils;
import org.apache.commons.sanselan.formats.jpeg.ZigZag;
-import org.apache.commons.sanselan.formats.jpeg.segments.DHTSegment;
-import org.apache.commons.sanselan.formats.jpeg.segments.DQTSegment;
-import org.apache.commons.sanselan.formats.jpeg.segments.SOFNSegment;
-import org.apache.commons.sanselan.formats.jpeg.segments.SOSSegment;
+import org.apache.commons.sanselan.formats.jpeg.segments.DhtSegment;
+import org.apache.commons.sanselan.formats.jpeg.segments.DqtSegment;
+import org.apache.commons.sanselan.formats.jpeg.segments.SofnSegment;
+import org.apache.commons.sanselan.formats.jpeg.segments.SosSegment;
public class JpegDecoder extends BinaryFileParser implements JpegUtils.Visitor,
JpegConstants
@@ -53,11 +53,11 @@
* for positive numbers.
*/
- private DQTSegment.QuantizationTable[] quantizationTables = new DQTSegment.QuantizationTable[4];
- private DHTSegment.HuffmanTable[] huffmanDCTables = new DHTSegment.HuffmanTable[4];
- private DHTSegment.HuffmanTable[] huffmanACTables = new DHTSegment.HuffmanTable[4];
- private SOFNSegment sofnSegment;
- private SOSSegment sosSegment;
+ private DqtSegment.QuantizationTable[] quantizationTables = new DqtSegment.QuantizationTable[4];
+ private DhtSegment.HuffmanTable[] huffmanDCTables = new DhtSegment.HuffmanTable[4];
+ private DhtSegment.HuffmanTable[] huffmanACTables = new DhtSegment.HuffmanTable[4];
+ private SofnSegment sofnSegment;
+ private SosSegment sosSegment;
private float[][] scaledQuantizationTables = new float[4][];
private BufferedImage image = null;
private ImageReadException imageReadException = null;
@@ -76,9 +76,9 @@
{
int segmentLength = read2Bytes("segmentLength", is,
"Not a Valid JPEG File");
- byte[] sosSegmentBytes = readByteArray("SOSSegment",
+ byte[] sosSegmentBytes = readByteArray("SosSegment",
segmentLength - 2, is, "Not a Valid JPEG File");
- sosSegment = new SOSSegment(marker, sosSegmentBytes);
+ sosSegment = new SosSegment(marker, sosSegmentBytes);
int hMax = 0;
int vMax = 0;
@@ -202,14 +202,14 @@
if (marker != SOF0Marker)
throw new ImageReadException("Only sequential, baseline JPEGs " +
"are supported at the moment");
- sofnSegment = new SOFNSegment(marker, segmentData);
+ sofnSegment = new SofnSegment(marker, segmentData);
}
else if (marker == DQTMarker)
{
- DQTSegment dqtSegment = new DQTSegment(marker, segmentData);
+ DqtSegment dqtSegment = new DqtSegment(marker, segmentData);
for (int i = 0; i < dqtSegment.quantizationTables.size(); i++)
{
- DQTSegment.QuantizationTable table = (DQTSegment.QuantizationTable)
+ DqtSegment.QuantizationTable table = (DqtSegment.QuantizationTable)
dqtSegment.quantizationTables.get(i);
if (0 > table.destinationIdentifier ||
table.destinationIdentifier >= quantizationTables.length)
@@ -221,19 +221,19 @@
float[] quantizationMatrixFloat = new float[64];
for (int j = 0; j < 64; j++)
quantizationMatrixFloat[j] = quantizationMatrixInt[j];
- DCT.scaleDequantizationMatrix(quantizationMatrixFloat);
+ Dct.scaleDequantizationMatrix(quantizationMatrixFloat);
scaledQuantizationTables[table.destinationIdentifier] =
quantizationMatrixFloat;
}
}
else if (marker == DHTMarker)
{
- DHTSegment dhtSegment = new DHTSegment(marker, segmentData);
+ DhtSegment dhtSegment = new DhtSegment(marker, segmentData);
for (int i = 0; i < dhtSegment.huffmanTables.size(); i++)
{
- DHTSegment.HuffmanTable table = (DHTSegment.HuffmanTable)
+ DhtSegment.HuffmanTable table = (DhtSegment.HuffmanTable)
dhtSegment.huffmanTables.get(i);
- DHTSegment.HuffmanTable[] tables;
+ DhtSegment.HuffmanTable[] tables;
if (table.tableClass == 0)
tables = huffmanDCTables;
else if (table.tableClass == 1)
@@ -301,8 +301,8 @@
Block[] mcu = new Block[sosSegment.numberOfComponents];
for (int i = 0; i < sosSegment.numberOfComponents; i++)
{
- SOSSegment.Component scanComponent = sosSegment.components[i];
- SOFNSegment.Component frameComponent = null;
+ SosSegment.Component scanComponent = sosSegment.components[i];
+ SofnSegment.Component frameComponent = null;
for (int j = 0; j < sofnSegment.numberOfComponents; j++)
{
if (sofnSegment.components[j].componentIdentifier ==
@@ -330,8 +330,8 @@
{
for (int i = 0; i < sosSegment.numberOfComponents; i++)
{
- SOSSegment.Component scanComponent = sosSegment.components[i];
- SOFNSegment.Component frameComponent = null;
+ SosSegment.Component scanComponent = sosSegment.components[i];
+ SofnSegment.Component frameComponent = null;
for (int j = 0; j < sofnSegment.numberOfComponents; j++)
{
if (sofnSegment.components[j].componentIdentifier ==
@@ -397,7 +397,7 @@
ZigZag.zigZagToBlock(zz, blockInt);
for (int j = 0; j < 64; j++)
block[j] = blockInt[j] * scaledQuantizationTable[j];
- DCT.inverseDCT8x8(block);
+ Dct.inverseDCT8x8(block);
int dstRowOffset = 8*y*8*frameComponent.horizontalSamplingFactor +
8*x;
@@ -455,7 +455,7 @@
return v;
}
- private int decode(JpegInputStream is, DHTSegment.HuffmanTable huffmanTable)
+ private int decode(JpegInputStream is, DhtSegment.HuffmanTable huffmanTable)
throws IOException, ImageReadException
{
// "DECODE", section F.2.2.3, figure F.16, page 109 of T.81
diff --git a/src/main/java/org/apache/commons/sanselan/formats/jpeg/exif/ExifRewriter.java b/src/main/java/org/apache/commons/sanselan/formats/jpeg/exif/ExifRewriter.java
index 09188b4..d349262 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/jpeg/exif/ExifRewriter.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/jpeg/exif/ExifRewriter.java
@@ -45,7 +45,7 @@
* <p>
* See the source of the ExifMetadataUpdateExample class for example usage.
*
- * @see org.apache.commons.sanselan.sampleUsage.WriteExifMetadataExample
+ * @see org.apache.commons.sanselan.examples.WriteExifMetadataExample
*/
public class ExifRewriter extends BinaryFileParser implements JpegConstants
{
diff --git a/src/main/java/org/apache/commons/sanselan/formats/jpeg/iptc/IPTCBlock.java b/src/main/java/org/apache/commons/sanselan/formats/jpeg/iptc/IptcBlock.java
similarity index 89%
rename from src/main/java/org/apache/commons/sanselan/formats/jpeg/iptc/IPTCBlock.java
rename to src/main/java/org/apache/commons/sanselan/formats/jpeg/iptc/IptcBlock.java
index ede570f..980c998 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/jpeg/iptc/IPTCBlock.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/jpeg/iptc/IptcBlock.java
@@ -19,13 +19,13 @@
/*
* Represents an IPTC block, a set of key-value pairs of Photoshop IPTC data.
*/
-public class IPTCBlock
+public class IptcBlock
{
public final int blockType;
public final byte[] blockNameBytes;
public final byte[] blockData;
- public IPTCBlock(int blockType, byte[] blockNameBytes, byte[] blockData)
+ public IptcBlock(int blockType, byte[] blockNameBytes, byte[] blockData)
{
this.blockData = blockData;
this.blockNameBytes = blockNameBytes;
@@ -34,6 +34,6 @@
public boolean isIPTCBlock()
{
- return blockType == IPTCParser.IMAGE_RESOURCE_BLOCK_IPTC_DATA;
+ return blockType == IptcParser.IMAGE_RESOURCE_BLOCK_IPTC_DATA;
}
}
\ No newline at end of file
diff --git a/src/main/java/org/apache/commons/sanselan/formats/jpeg/iptc/IPTCConstants.java b/src/main/java/org/apache/commons/sanselan/formats/jpeg/iptc/IptcConstants.java
similarity index 69%
rename from src/main/java/org/apache/commons/sanselan/formats/jpeg/iptc/IPTCConstants.java
rename to src/main/java/org/apache/commons/sanselan/formats/jpeg/iptc/IptcConstants.java
index 3281c0d..adcca22 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/jpeg/iptc/IPTCConstants.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/jpeg/iptc/IptcConstants.java
@@ -18,7 +18,7 @@
import org.apache.commons.sanselan.formats.jpeg.JpegConstants;
-public interface IPTCConstants extends JpegConstants
+public interface IptcConstants extends JpegConstants
{
public static final byte IPTC_PREFIX[] = { 0x1C, 0x02, };
@@ -95,120 +95,120 @@
public static final int IPTC_ENVELOPE_RECORD_NUMBER = 0x01;
public static final int IPTC_APPLICATION_2_RECORD_NUMBER = 0x02;
- public static final IPTCType IPTC_TYPE_RECORD_VERSION = new IPTCType(0,
+ public static final IptcType IPTC_TYPE_RECORD_VERSION = new IptcType(0,
"Record Version");
- public static final IPTCType IPTC_TYPE_OBJECT_TYPE_REFERENCE = new IPTCType(
+ public static final IptcType IPTC_TYPE_OBJECT_TYPE_REFERENCE = new IptcType(
3, "Object Type Reference");
- public static final IPTCType IPTC_TYPE_OBJECT_ATTRIBUTE_REFERENCE = new IPTCType(
+ public static final IptcType IPTC_TYPE_OBJECT_ATTRIBUTE_REFERENCE = new IptcType(
4, "Object Attribute Reference");
- public static final IPTCType IPTC_TYPE_OBJECT_NAME = new IPTCType(5,
+ public static final IptcType IPTC_TYPE_OBJECT_NAME = new IptcType(5,
"Object Name");
- public static final IPTCType IPTC_TYPE_EDIT_STATUS = new IPTCType(7,
+ public static final IptcType IPTC_TYPE_EDIT_STATUS = new IptcType(7,
"Edit Status");
- public static final IPTCType IPTC_TYPE_EDITORIAL_UPDATE = new IPTCType(8,
+ public static final IptcType IPTC_TYPE_EDITORIAL_UPDATE = new IptcType(8,
"Editorial Update");
- public static final IPTCType IPTC_TYPE_URGENCY = new IPTCType(10, "Urgency");
- public static final IPTCType IPTC_TYPE_SUBJECT_REFERENCE = new IPTCType(12,
+ public static final IptcType IPTC_TYPE_URGENCY = new IptcType(10, "Urgency");
+ public static final IptcType IPTC_TYPE_SUBJECT_REFERENCE = new IptcType(12,
"Subject Reference");
- public static final IPTCType IPTC_TYPE_CATEGORY = new IPTCType(15,
+ public static final IptcType IPTC_TYPE_CATEGORY = new IptcType(15,
"Category");
- public static final IPTCType IPTC_TYPE_SUPPLEMENTAL_CATEGORY = new IPTCType(
+ public static final IptcType IPTC_TYPE_SUPPLEMENTAL_CATEGORY = new IptcType(
20, "Supplemental Category");
- public static final IPTCType IPTC_TYPE_FIXTURE_IDENTIFIER = new IPTCType(
+ public static final IptcType IPTC_TYPE_FIXTURE_IDENTIFIER = new IptcType(
22, "Fixture Identifier");
- public static final IPTCType IPTC_TYPE_KEYWORDS = new IPTCType(25,
+ public static final IptcType IPTC_TYPE_KEYWORDS = new IptcType(25,
"Keywords");
- public static final IPTCType IPTC_TYPE_CONTENT_LOCATION_CODE = new IPTCType(
+ public static final IptcType IPTC_TYPE_CONTENT_LOCATION_CODE = new IptcType(
26, "Content Location Code");
- public static final IPTCType IPTC_TYPE_CONTENT_LOCATION_NAME = new IPTCType(
+ public static final IptcType IPTC_TYPE_CONTENT_LOCATION_NAME = new IptcType(
27, "Content Location Name");
- public static final IPTCType IPTC_TYPE_RELEASE_DATE = new IPTCType(30,
+ public static final IptcType IPTC_TYPE_RELEASE_DATE = new IptcType(30,
"Release Date");
- public static final IPTCType IPTC_TYPE_RELEASE_TIME = new IPTCType(35,
+ public static final IptcType IPTC_TYPE_RELEASE_TIME = new IptcType(35,
"Release Time");
- public static final IPTCType IPTC_TYPE_EXPIRATION_DATE = new IPTCType(37,
+ public static final IptcType IPTC_TYPE_EXPIRATION_DATE = new IptcType(37,
"Expiration Date");
- public static final IPTCType IPTC_TYPE_EXPIRATION_TIME = new IPTCType(38,
+ public static final IptcType IPTC_TYPE_EXPIRATION_TIME = new IptcType(38,
"Expiration Time");
- public static final IPTCType IPTC_TYPE_SPECIAL_INSTRUCTIONS = new IPTCType(
+ public static final IptcType IPTC_TYPE_SPECIAL_INSTRUCTIONS = new IptcType(
40, "Special Instructions");
- public static final IPTCType IPTC_TYPE_ACTION_ADVISED = new IPTCType(42,
+ public static final IptcType IPTC_TYPE_ACTION_ADVISED = new IptcType(42,
"Action Advised");
- public static final IPTCType IPTC_TYPE_REFERENCE_SERVICE = new IPTCType(45,
+ public static final IptcType IPTC_TYPE_REFERENCE_SERVICE = new IptcType(45,
"Reference Service");
- public static final IPTCType IPTC_TYPE_REFERENCE_DATE = new IPTCType(47,
+ public static final IptcType IPTC_TYPE_REFERENCE_DATE = new IptcType(47,
"Reference Date");
- public static final IPTCType IPTC_TYPE_REFERENCE_NUMBER = new IPTCType(50,
+ public static final IptcType IPTC_TYPE_REFERENCE_NUMBER = new IptcType(50,
"Reference Number");
- public static final IPTCType IPTC_TYPE_DATE_CREATED = new IPTCType(55,
+ public static final IptcType IPTC_TYPE_DATE_CREATED = new IptcType(55,
"Date Created");
- public static final IPTCType IPTC_TYPE_TIME_CREATED = new IPTCType(60,
+ public static final IptcType IPTC_TYPE_TIME_CREATED = new IptcType(60,
"Time Created");
- public static final IPTCType IPTC_TYPE_DIGITAL_CREATION_DATE = new IPTCType(
+ public static final IptcType IPTC_TYPE_DIGITAL_CREATION_DATE = new IptcType(
62, "Digital Creation Date");
- public static final IPTCType IPTC_TYPE_DIGITAL_CREATION_TIME = new IPTCType(
+ public static final IptcType IPTC_TYPE_DIGITAL_CREATION_TIME = new IptcType(
63, "Digital Creation Time");
- public static final IPTCType IPTC_TYPE_ORIGINATING_PROGRAM = new IPTCType(
+ public static final IptcType IPTC_TYPE_ORIGINATING_PROGRAM = new IptcType(
65, "Originating Program");
- public static final IPTCType IPTC_TYPE_PROGRAM_VERSION = new IPTCType(70,
+ public static final IptcType IPTC_TYPE_PROGRAM_VERSION = new IptcType(70,
"Program Version");
- public static final IPTCType IPTC_TYPE_OBJECT_CYCLE = new IPTCType(75,
+ public static final IptcType IPTC_TYPE_OBJECT_CYCLE = new IptcType(75,
"Object Cycle");
- public static final IPTCType IPTC_TYPE_BYLINE = new IPTCType(80, "By-line");
- public static final IPTCType IPTC_TYPE_BYLINE_TITLE = new IPTCType(85,
+ public static final IptcType IPTC_TYPE_BYLINE = new IptcType(80, "By-line");
+ public static final IptcType IPTC_TYPE_BYLINE_TITLE = new IptcType(85,
"By-line Title");
- public static final IPTCType IPTC_TYPE_CITY = new IPTCType(90, "City");
- public static final IPTCType IPTC_TYPE_SUBLOCATION = new IPTCType(92,
+ public static final IptcType IPTC_TYPE_CITY = new IptcType(90, "City");
+ public static final IptcType IPTC_TYPE_SUBLOCATION = new IptcType(92,
"Sublocation");
- public static final IPTCType IPTC_TYPE_PROVINCE_STATE = new IPTCType(95,
+ public static final IptcType IPTC_TYPE_PROVINCE_STATE = new IptcType(95,
"Province/State");
- public static final IPTCType IPTC_TYPE_COUNTRY_PRIMARY_LOCATION_CODE = new IPTCType(
+ public static final IptcType IPTC_TYPE_COUNTRY_PRIMARY_LOCATION_CODE = new IptcType(
100, "Country/Primary Location Code");
- public static final IPTCType IPTC_TYPE_COUNTRY_PRIMARY_LOCATION_NAME = new IPTCType(
+ public static final IptcType IPTC_TYPE_COUNTRY_PRIMARY_LOCATION_NAME = new IptcType(
101, "Country/Primary Location Name");
- public static final IPTCType IPTC_TYPE_ORIGINAL_TRANSMISSION_REFERENCE = new IPTCType(
+ public static final IptcType IPTC_TYPE_ORIGINAL_TRANSMISSION_REFERENCE = new IptcType(
103, "Original Transmission, Reference");
- public static final IPTCType IPTC_TYPE_HEADLINE = new IPTCType(105,
+ public static final IptcType IPTC_TYPE_HEADLINE = new IptcType(105,
"Headline");
- public static final IPTCType IPTC_TYPE_CREDIT = new IPTCType(110, "Credit");
- public static final IPTCType IPTC_TYPE_SOURCE = new IPTCType(115, "Source");
- public static final IPTCType IPTC_TYPE_COPYRIGHT_NOTICE = new IPTCType(116,
+ public static final IptcType IPTC_TYPE_CREDIT = new IptcType(110, "Credit");
+ public static final IptcType IPTC_TYPE_SOURCE = new IptcType(115, "Source");
+ public static final IptcType IPTC_TYPE_COPYRIGHT_NOTICE = new IptcType(116,
"Copyright Notice");
- public static final IPTCType IPTC_TYPE_CONTACT = new IPTCType(118,
+ public static final IptcType IPTC_TYPE_CONTACT = new IptcType(118,
"Contact");
- public static final IPTCType IPTC_TYPE_CAPTION_ABSTRACT = new IPTCType(120,
+ public static final IptcType IPTC_TYPE_CAPTION_ABSTRACT = new IptcType(120,
"Caption/Abstract");
- public static final IPTCType IPTC_TYPE_WRITER_EDITOR = new IPTCType(122,
+ public static final IptcType IPTC_TYPE_WRITER_EDITOR = new IptcType(122,
"Writer/Editor");
- public static final IPTCType IPTC_TYPE_RASTERIZED_CAPTION = new IPTCType(
+ public static final IptcType IPTC_TYPE_RASTERIZED_CAPTION = new IptcType(
125, "Rasterized Caption");
- public static final IPTCType IPTC_TYPE_IMAGE_TYPE = new IPTCType(130,
+ public static final IptcType IPTC_TYPE_IMAGE_TYPE = new IptcType(130,
"ImageType");
- public static final IPTCType IPTC_TYPE_IMAGE_ORIENTATION = new IPTCType(
+ public static final IptcType IPTC_TYPE_IMAGE_ORIENTATION = new IptcType(
131, "Image Orientation");
- public static final IPTCType IPTC_TYPE_LANGUAGE_IDENTIFIER = new IPTCType(
+ public static final IptcType IPTC_TYPE_LANGUAGE_IDENTIFIER = new IptcType(
135, "Language Identifier");
- public static final IPTCType IPTC_TYPE_AUDIO_TYPE = new IPTCType(150,
+ public static final IptcType IPTC_TYPE_AUDIO_TYPE = new IptcType(150,
"Audio Type");
- public static final IPTCType IPTC_TYPE_AUDIO_SAMPLING_RATE = new IPTCType(
+ public static final IptcType IPTC_TYPE_AUDIO_SAMPLING_RATE = new IptcType(
151, "Audio Sampling Rate");
- public static final IPTCType IPTC_TYPE_AUDIO_SAMPLING_RESOLUTION = new IPTCType(
+ public static final IptcType IPTC_TYPE_AUDIO_SAMPLING_RESOLUTION = new IptcType(
152, "Audio Sampling Resolution");
- public static final IPTCType IPTC_TYPE_AUDIO_DURATION = new IPTCType(153,
+ public static final IptcType IPTC_TYPE_AUDIO_DURATION = new IptcType(153,
"Audio Duration");
- public static final IPTCType IPTC_TYPE_AUDIO_OUTCUE = new IPTCType(154,
+ public static final IptcType IPTC_TYPE_AUDIO_OUTCUE = new IptcType(154,
"Audio Outcue");
- public static final IPTCType IPTC_TYPE_OBJECT_DATA_PREVIEW_FILE_FORMAT = new IPTCType(
+ public static final IptcType IPTC_TYPE_OBJECT_DATA_PREVIEW_FILE_FORMAT = new IptcType(
200, "Object Data Preview, File Format");
- public static final IPTCType IPTC_TYPE_OBJECT_DATA_PREVIEW_FILE_FORMAT_VERSION = new IPTCType(
+ public static final IptcType IPTC_TYPE_OBJECT_DATA_PREVIEW_FILE_FORMAT_VERSION = new IptcType(
201, "Object Data Preview, File Format Version");
- public static final IPTCType IPTC_TYPE_OBJECT_DATA_PREVIEW_DATA = new IPTCType(
+ public static final IptcType IPTC_TYPE_OBJECT_DATA_PREVIEW_DATA = new IptcType(
202, "Object Data Preview Data");
// --
- // public static final IPTCType IPTC_TYPE_UNKNOWN = new IPTCType(-1,
+ // public static final IptcType IPTC_TYPE_UNKNOWN = new IptcType(-1,
// "Unknown");
- public static final IPTCType IPTC_TYPES[] = { IPTC_TYPE_RECORD_VERSION,
+ public static final IptcType IPTC_TYPES[] = { IPTC_TYPE_RECORD_VERSION,
IPTC_TYPE_OBJECT_TYPE_REFERENCE,
IPTC_TYPE_OBJECT_ATTRIBUTE_REFERENCE, IPTC_TYPE_OBJECT_NAME,
IPTC_TYPE_EDIT_STATUS, IPTC_TYPE_EDITORIAL_UPDATE,
diff --git a/src/main/java/org/apache/commons/sanselan/formats/jpeg/iptc/IPTCParser.java b/src/main/java/org/apache/commons/sanselan/formats/jpeg/iptc/IptcParser.java
similarity index 96%
rename from src/main/java/org/apache/commons/sanselan/formats/jpeg/iptc/IPTCParser.java
rename to src/main/java/org/apache/commons/sanselan/formats/jpeg/iptc/IptcParser.java
index 073976c..71e58b4 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/jpeg/iptc/IPTCParser.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/jpeg/iptc/IptcParser.java
@@ -34,11 +34,11 @@
import org.apache.commons.sanselan.util.Debug;
import org.apache.commons.sanselan.util.ParamMap;
-public class IPTCParser extends BinaryFileParser implements IPTCConstants
+public class IptcParser extends BinaryFileParser implements IptcConstants
{
private static final int APP13_BYTE_ORDER = BYTE_ORDER_NETWORK;
- public IPTCParser()
+ public IptcParser()
{
setByteOrder(BYTE_ORDER_NETWORK);
}
@@ -82,7 +82,7 @@
* structure:
*
* 1. 2-byte prefix. The value is always 0x1C02 2. 1-byte record type. The
- * record types are documented by the IPTC. See IPTCConstants. 3. 2-byte
+ * record types are documented by the IPTC. See IptcConstants. 3. 2-byte
* record size (in bytes). 4. Record data, "record size" bytes long.
*
* Record data (unlike block data) is NOT padded to have an even length.
@@ -117,7 +117,7 @@
for (int i = 0; i < allBlocks.size(); i++)
{
- IPTCBlock block = (IPTCBlock) allBlocks.get(i);
+ IptcBlock block = (IptcBlock) allBlocks.get(i);
// Ignore everything but IPTC data.
if (!block.isIPTCBlock())
@@ -236,7 +236,7 @@
String value = new String(recordData, "ISO-8859-1");
- IPTCType iptcType = IPTCTypeLookup.getIptcType(recordType);
+ IptcType iptcType = IptcTypeLookup.getIptcType(recordType);
// Debug.debug("iptcType", iptcType);
// debugByteArray("iptcData", iptcData);
@@ -249,7 +249,7 @@
// Debug.debug("index", IPTC_TYPE_CREDIT.name);
// }
- IPTCRecord element = new IPTCRecord(iptcType, value);
+ IptcRecord element = new IptcRecord(iptcType, value);
elements.add(element);
}
@@ -333,7 +333,7 @@
if (null == blockData)
break;
- blocks.add(new IPTCBlock(blockType, blockNameBytes, blockData));
+ blocks.add(new IptcBlock(blockType, blockNameBytes, blockData));
if ((blockSize % 2) != 0)
bis
@@ -356,7 +356,7 @@
List blocks = data.getRawBlocks();
for (int i = 0; i < blocks.size(); i++)
{
- IPTCBlock block = (IPTCBlock) blocks.get(i);
+ IptcBlock block = (IptcBlock) blocks.get(i);
bos.write(CONST_8BIM);
@@ -410,8 +410,8 @@
Comparator comparator = new Comparator() {
public int compare(Object o1, Object o2)
{
- IPTCRecord e1 = (IPTCRecord) o1;
- IPTCRecord e2 = (IPTCRecord) o2;
+ IptcRecord e1 = (IptcRecord) o1;
+ IptcRecord e2 = (IptcRecord) o2;
return e2.iptcType.type - e1.iptcType.type;
}
};
@@ -421,7 +421,7 @@
// write the list.
for (int i = 0; i < elements.size(); i++)
{
- IPTCRecord element = (IPTCRecord) elements.get(i);
+ IptcRecord element = (IptcRecord) elements.get(i);
if (element.iptcType.type == IPTC_TYPE_RECORD_VERSION.type)
continue; // ignore
diff --git a/src/main/java/org/apache/commons/sanselan/formats/jpeg/iptc/IPTCRecord.java b/src/main/java/org/apache/commons/sanselan/formats/jpeg/iptc/IptcRecord.java
similarity index 87%
rename from src/main/java/org/apache/commons/sanselan/formats/jpeg/iptc/IPTCRecord.java
rename to src/main/java/org/apache/commons/sanselan/formats/jpeg/iptc/IptcRecord.java
index 410e3c4..6e3a879 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/jpeg/iptc/IPTCRecord.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/jpeg/iptc/IptcRecord.java
@@ -21,12 +21,12 @@
/*
* Represents an IPTC record, a single key-value pair of Photoshop IPTC data.
*/
-public class IPTCRecord
+public class IptcRecord
{
- public final IPTCType iptcType;
+ public final IptcType iptcType;
public final String value;
- public IPTCRecord(IPTCType iptcType, String value)
+ public IptcRecord(IptcType iptcType, String value)
{
this.iptcType = iptcType;
this.value = value;
@@ -45,8 +45,8 @@
public static final Comparator COMPARATOR = new Comparator() {
public int compare(Object o1, Object o2)
{
- IPTCRecord e1 = (IPTCRecord) o1;
- IPTCRecord e2 = (IPTCRecord) o2;
+ IptcRecord e1 = (IptcRecord) o1;
+ IptcRecord e2 = (IptcRecord) o2;
return e1.iptcType.type - e2.iptcType.type;
}
};
diff --git a/src/main/java/org/apache/commons/sanselan/formats/jpeg/iptc/IPTCType.java b/src/main/java/org/apache/commons/sanselan/formats/jpeg/iptc/IptcType.java
similarity index 85%
rename from src/main/java/org/apache/commons/sanselan/formats/jpeg/iptc/IPTCType.java
rename to src/main/java/org/apache/commons/sanselan/formats/jpeg/iptc/IptcType.java
index bdd6533..e898f18 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/jpeg/iptc/IPTCType.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/jpeg/iptc/IptcType.java
@@ -18,12 +18,12 @@
import org.apache.commons.sanselan.formats.jpeg.JpegConstants;
-public class IPTCType implements JpegConstants, IPTCConstants
+public class IptcType implements JpegConstants, IptcConstants
{
public final int type;
public final String name;
- public IPTCType(int type, String name)
+ public IptcType(int type, String name)
{
this.type = type;
this.name = name;
@@ -34,9 +34,9 @@
return name + " (" + type + ")";
}
- public static IPTCType getUnknown(int type)
+ public static IptcType getUnknown(int type)
{
- return new IPTCType(type, "Unknown");
+ return new IptcType(type, "Unknown");
}
}
\ No newline at end of file
diff --git a/src/main/java/org/apache/commons/sanselan/formats/jpeg/iptc/IPTCTypeLookup.java b/src/main/java/org/apache/commons/sanselan/formats/jpeg/iptc/IptcTypeLookup.java
similarity index 83%
rename from src/main/java/org/apache/commons/sanselan/formats/jpeg/iptc/IPTCTypeLookup.java
rename to src/main/java/org/apache/commons/sanselan/formats/jpeg/iptc/IptcTypeLookup.java
index aac2507..50e0329 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/jpeg/iptc/IPTCTypeLookup.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/jpeg/iptc/IptcTypeLookup.java
@@ -19,7 +19,7 @@
import java.util.HashMap;
import java.util.Map;
-public abstract class IPTCTypeLookup implements IPTCConstants
+public abstract class IptcTypeLookup implements IptcConstants
{
private static final Map IPTC_TYPE_MAP = new HashMap();
@@ -27,17 +27,17 @@
{
for (int i = 0; i < IPTC_TYPES.length; i++)
{
- IPTCType iptcType = IPTC_TYPES[i];
+ IptcType iptcType = IPTC_TYPES[i];
Integer key = new Integer(iptcType.type);
IPTC_TYPE_MAP.put(key, iptcType);
}
}
- public static final IPTCType getIptcType(int type)
+ public static final IptcType getIptcType(int type)
{
Integer key = new Integer(type);
if (!IPTC_TYPE_MAP.containsKey(key))
- return IPTCType.getUnknown(type);
- return (IPTCType) IPTC_TYPE_MAP.get(key);
+ return IptcType.getUnknown(type);
+ return (IptcType) IPTC_TYPE_MAP.get(key);
}
}
\ No newline at end of file
diff --git a/src/main/java/org/apache/commons/sanselan/formats/jpeg/iptc/JpegIptcRewriter.java b/src/main/java/org/apache/commons/sanselan/formats/jpeg/iptc/JpegIptcRewriter.java
index 6e649d0..daefa24 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/jpeg/iptc/JpegIptcRewriter.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/jpeg/iptc/JpegIptcRewriter.java
@@ -40,9 +40,9 @@
* <p>
* See the source of the IPTCUpdateExample class for example usage.
*
- * @see org.apache.commons.sanselan.sampleUsage.WriteIPTCExample
+ * @see org.apache.commons.sanselan.examples.WriteIPTCExample
*/
-public class JpegIptcRewriter extends JpegRewriter implements IPTCConstants
+public class JpegIptcRewriter extends JpegRewriter implements IptcConstants
{
/**
@@ -129,13 +129,13 @@
JFIFPieceSegment oldSegment = (JFIFPieceSegment) photoshopApp13Segments
.get(0);
Map params = new HashMap();
- PhotoshopApp13Data oldData = new IPTCParser()
+ PhotoshopApp13Data oldData = new IptcParser()
.parsePhotoshopSegment(oldSegment.segmentData, params);
List newBlocks = oldData.getNonIptcBlocks();
List newRecords = new ArrayList();
PhotoshopApp13Data newData = new PhotoshopApp13Data(newRecords,
newBlocks);
- byte segmentBytes[] = new IPTCParser()
+ byte segmentBytes[] = new IptcParser()
.writePhotoshopApp13Segment(newData);
JFIFPieceSegment newSegment = new JFIFPieceSegment(
oldSegment.marker, segmentBytes);
@@ -231,18 +231,18 @@
{
// discard old iptc blocks.
List newBlocks = newData.getNonIptcBlocks();
- byte[] newBlockBytes = new IPTCParser().writeIPTCBlock(newData
+ byte[] newBlockBytes = new IptcParser().writeIPTCBlock(newData
.getRecords());
int blockType = IMAGE_RESOURCE_BLOCK_IPTC_DATA;
byte[] blockNameBytes = new byte[0];
- IPTCBlock newBlock = new IPTCBlock(blockType, blockNameBytes,
+ IptcBlock newBlock = new IptcBlock(blockType, blockNameBytes,
newBlockBytes);
newBlocks.add(newBlock);
newData = new PhotoshopApp13Data(newData.getRecords(), newBlocks);
- byte segmentBytes[] = new IPTCParser()
+ byte segmentBytes[] = new IptcParser()
.writePhotoshopApp13Segment(newData);
JFIFPieceSegment newSegment = new JFIFPieceSegment(
JPEG_APP13_Marker, segmentBytes);
diff --git a/src/main/java/org/apache/commons/sanselan/formats/jpeg/iptc/PhotoshopApp13Data.java b/src/main/java/org/apache/commons/sanselan/formats/jpeg/iptc/PhotoshopApp13Data.java
index af06c7b..61d5f9c 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/jpeg/iptc/PhotoshopApp13Data.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/jpeg/iptc/PhotoshopApp13Data.java
@@ -20,7 +20,7 @@
import java.util.ArrayList;
import java.util.List;
-public class PhotoshopApp13Data implements IPTCConstants
+public class PhotoshopApp13Data implements IptcConstants
{
private final List records;
private final List rawBlocks;
@@ -46,7 +46,7 @@
List result = new ArrayList();
for (int i = 0; i < rawBlocks.size(); i++)
{
- IPTCBlock block = (IPTCBlock) rawBlocks.get(i);
+ IptcBlock block = (IptcBlock) rawBlocks.get(i);
if (!block.isIPTCBlock())
result.add(block);
}
diff --git a/src/main/java/org/apache/commons/sanselan/formats/jpeg/segments/App13Segment.java b/src/main/java/org/apache/commons/sanselan/formats/jpeg/segments/App13Segment.java
index 0cbed63..ef386ad 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/jpeg/segments/App13Segment.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/jpeg/segments/App13Segment.java
@@ -23,10 +23,10 @@
import org.apache.commons.sanselan.ImageReadException;
import org.apache.commons.sanselan.formats.jpeg.JpegImageParser;
-import org.apache.commons.sanselan.formats.jpeg.iptc.IPTCParser;
+import org.apache.commons.sanselan.formats.jpeg.iptc.IptcParser;
import org.apache.commons.sanselan.formats.jpeg.iptc.PhotoshopApp13Data;
-public class App13Segment extends APPNSegment
+public class App13Segment extends AppnSegment
{
protected final JpegImageParser parser;
@@ -46,7 +46,7 @@
super(marker, marker_length, is);
this.parser = parser;
- // isIPTCJpegSegment = new IPTCParser().isIPTCJpegSegment(bytes);
+ // isIPTCJpegSegment = new IptcParser().isIPTCJpegSegment(bytes);
// if (isIPTCJpegSegment)
// {
// /*
@@ -56,14 +56,14 @@
// */
// boolean verbose = false;
// boolean strict = false;
- // elements.addAll(new IPTCParser().parseIPTCJPEGSegment(bytes,
+ // elements.addAll(new IptcParser().parseIPTCJPEGSegment(bytes,
// verbose, strict));
// }
}
public boolean isPhotoshopJpegSegment() throws ImageReadException, IOException
{
- return new IPTCParser().isPhotoshopJpegSegment(bytes);
+ return new IptcParser().isPhotoshopJpegSegment(bytes);
}
public PhotoshopApp13Data parsePhotoshopSegment(Map params)
@@ -74,9 +74,9 @@
* metadata. However, we should not treat App13 signatures without
* Photoshop's signature as Photoshop/IPTC segments.
*/
- if (!new IPTCParser().isPhotoshopJpegSegment(bytes))
+ if (!new IptcParser().isPhotoshopJpegSegment(bytes))
return null;
- return new IPTCParser().parsePhotoshopSegment(bytes, params);
+ return new IptcParser().parsePhotoshopSegment(bytes, params);
}
}
\ No newline at end of file
diff --git a/src/main/java/org/apache/commons/sanselan/formats/jpeg/segments/App2Segment.java b/src/main/java/org/apache/commons/sanselan/formats/jpeg/segments/App2Segment.java
index 421a872..d558366 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/jpeg/segments/App2Segment.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/jpeg/segments/App2Segment.java
@@ -23,7 +23,7 @@
import org.apache.commons.sanselan.ImageReadException;
import org.apache.commons.sanselan.formats.jpeg.JpegImageParser;
-public class App2Segment extends APPNSegment implements Comparable
+public class App2Segment extends AppnSegment implements Comparable
{
public final byte icc_bytes[];
public final int cur_marker, num_markers;
diff --git a/src/main/java/org/apache/commons/sanselan/formats/jpeg/segments/APPNSegment.java b/src/main/java/org/apache/commons/sanselan/formats/jpeg/segments/AppnSegment.java
similarity index 92%
rename from src/main/java/org/apache/commons/sanselan/formats/jpeg/segments/APPNSegment.java
rename to src/main/java/org/apache/commons/sanselan/formats/jpeg/segments/AppnSegment.java
index 164895e..7fd5ddb 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/jpeg/segments/APPNSegment.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/jpeg/segments/AppnSegment.java
@@ -22,9 +22,9 @@
import org.apache.commons.sanselan.ImageReadException;
import org.apache.commons.sanselan.formats.jpeg.JpegImageParser;
-public class APPNSegment extends GenericSegment
+public class AppnSegment extends GenericSegment
{
- public APPNSegment(int marker, int marker_length, InputStream is)
+ public AppnSegment(int marker, int marker_length, InputStream is)
throws ImageReadException, IOException
{
super(marker, marker_length, is);
diff --git a/src/main/java/org/apache/commons/sanselan/formats/jpeg/segments/COMSegment.java b/src/main/java/org/apache/commons/sanselan/formats/jpeg/segments/ComSegment.java
similarity index 89%
rename from src/main/java/org/apache/commons/sanselan/formats/jpeg/segments/COMSegment.java
rename to src/main/java/org/apache/commons/sanselan/formats/jpeg/segments/ComSegment.java
index 80c6105..3736f64 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/jpeg/segments/COMSegment.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/jpeg/segments/ComSegment.java
@@ -23,23 +23,23 @@
import org.apache.commons.sanselan.ImageReadException;
-public class COMSegment extends Segment
+public class ComSegment extends Segment
{
public final byte[] comment;
- public COMSegment(int marker, byte segmentData[])
+ public ComSegment(int marker, byte segmentData[])
throws ImageReadException, IOException
{
this(marker, segmentData.length, new ByteArrayInputStream(segmentData));
}
- public COMSegment(int marker, int marker_length, InputStream is)
+ public ComSegment(int marker, int marker_length, InputStream is)
throws ImageReadException, IOException
{
super(marker, marker_length);
if (getDebug())
- System.out.println("COMSegment marker_length: " + marker_length);
+ System.out.println("ComSegment marker_length: " + marker_length);
comment = readByteArray("Comment", marker_length, is, "Error reading JPEG comment");
diff --git a/src/main/java/org/apache/commons/sanselan/formats/jpeg/segments/DHTSegment.java b/src/main/java/org/apache/commons/sanselan/formats/jpeg/segments/DhtSegment.java
similarity index 96%
rename from src/main/java/org/apache/commons/sanselan/formats/jpeg/segments/DHTSegment.java
rename to src/main/java/org/apache/commons/sanselan/formats/jpeg/segments/DhtSegment.java
index 7e98aa2..f98b490 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/jpeg/segments/DHTSegment.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/jpeg/segments/DhtSegment.java
@@ -22,7 +22,7 @@
import org.apache.commons.sanselan.ImageReadException;
-public class DHTSegment extends Segment
+public class DhtSegment extends Segment
{
public final ArrayList huffmanTables = new ArrayList();
@@ -122,13 +122,13 @@
}
- public DHTSegment(int marker, byte[] segmentData)
+ public DhtSegment(int marker, byte[] segmentData)
throws ImageReadException, IOException
{
this(marker, segmentData.length, new ByteArrayInputStream(segmentData));
}
- public DHTSegment(int marker, int length, InputStream is)
+ public DhtSegment(int marker, int length, InputStream is)
throws ImageReadException, IOException
{
super(marker, length);
diff --git a/src/main/java/org/apache/commons/sanselan/formats/jpeg/segments/DQTSegment.java b/src/main/java/org/apache/commons/sanselan/formats/jpeg/segments/DqtSegment.java
similarity index 94%
rename from src/main/java/org/apache/commons/sanselan/formats/jpeg/segments/DQTSegment.java
rename to src/main/java/org/apache/commons/sanselan/formats/jpeg/segments/DqtSegment.java
index eea6e30..dcbb610 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/jpeg/segments/DQTSegment.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/jpeg/segments/DqtSegment.java
@@ -22,7 +22,7 @@
import org.apache.commons.sanselan.ImageReadException;
-public class DQTSegment extends Segment
+public class DqtSegment extends Segment
{
public final ArrayList quantizationTables = new ArrayList();
@@ -41,13 +41,13 @@
}
}
- public DQTSegment(int marker, byte[] segmentData)
+ public DqtSegment(int marker, byte[] segmentData)
throws ImageReadException, IOException
{
this(marker, segmentData.length, new ByteArrayInputStream(segmentData));
}
- public DQTSegment(int marker, int length, InputStream is)
+ public DqtSegment(int marker, int length, InputStream is)
throws ImageReadException, IOException
{
super(marker, length);
diff --git a/src/main/java/org/apache/commons/sanselan/formats/jpeg/segments/JFIFSegment.java b/src/main/java/org/apache/commons/sanselan/formats/jpeg/segments/JfifSegment.java
similarity index 93%
rename from src/main/java/org/apache/commons/sanselan/formats/jpeg/segments/JFIFSegment.java
rename to src/main/java/org/apache/commons/sanselan/formats/jpeg/segments/JfifSegment.java
index 7a27d05..478a90f 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/jpeg/segments/JFIFSegment.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/jpeg/segments/JfifSegment.java
@@ -23,7 +23,7 @@
import org.apache.commons.sanselan.ImageReadException;
import org.apache.commons.sanselan.formats.jpeg.JpegConstants;
-public class JFIFSegment extends Segment implements JpegConstants
+public class JfifSegment extends Segment implements JpegConstants
{
public final int jfifMajorVersion;
public final int jfifMinorVersion;
@@ -40,13 +40,13 @@
return "JFIF (" + getSegmentType() + ")";
}
- public JFIFSegment(int marker, byte segmentData[])
+ public JfifSegment(int marker, byte segmentData[])
throws ImageReadException, IOException
{
this(marker, segmentData.length, new ByteArrayInputStream(segmentData));
}
- public JFIFSegment(int marker, int marker_length, InputStream is)
+ public JfifSegment(int marker, int marker_length, InputStream is)
throws ImageReadException, IOException
{
super(marker, marker_length);
diff --git a/src/main/java/org/apache/commons/sanselan/formats/jpeg/segments/Segment.java b/src/main/java/org/apache/commons/sanselan/formats/jpeg/segments/Segment.java
index 3417747..473fbe2 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/jpeg/segments/Segment.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/jpeg/segments/Segment.java
@@ -50,34 +50,34 @@
switch (marker)
{
case 0xffc0 :
- return "Start Of Frame, Baseline DCT, Huffman coding";
+ return "Start Of Frame, Baseline Dct, Huffman coding";
case 0xffc1 :
- return "Start Of Frame, Extended sequential DCT, Huffman coding";
+ return "Start Of Frame, Extended sequential Dct, Huffman coding";
case 0xffc2 :
- return "Start Of Frame, Progressive DCT, Huffman coding";
+ return "Start Of Frame, Progressive Dct, Huffman coding";
case 0xffc3 :
return "Start Of Frame, Lossless (sequential), Huffman coding";
case 0xffc5 :
- return "Start Of Frame, Differential sequential DCT, Huffman coding";
+ return "Start Of Frame, Differential sequential Dct, Huffman coding";
case 0xffc6 :
- return "Start Of Frame, Differential progressive DCT, Huffman coding";
+ return "Start Of Frame, Differential progressive Dct, Huffman coding";
case 0xffc7 :
return "Start Of Frame, Differential lossless (sequential), Huffman coding";
case 0xffc8 :
return "Start Of Frame, Reserved for JPEG extensions, arithmetic coding";
case 0xffc9 :
- return "Start Of Frame, Extended sequential DCT, arithmetic coding";
+ return "Start Of Frame, Extended sequential Dct, arithmetic coding";
case 0xffca :
- return "Start Of Frame, Progressive DCT, arithmetic coding";
+ return "Start Of Frame, Progressive Dct, arithmetic coding";
case 0xffcb :
return "Start Of Frame, Lossless (sequential), arithmetic coding";
case 0xffcd :
- return "Start Of Frame, Differential sequential DCT, arithmetic coding";
+ return "Start Of Frame, Differential sequential Dct, arithmetic coding";
case 0xffce :
- return "Start Of Frame, Differential progressive DCT, arithmetic coding";
+ return "Start Of Frame, Differential progressive Dct, arithmetic coding";
case 0xffcf :
return "Start Of Frame, Differential lossless (sequential), arithmetic coding";
diff --git a/src/main/java/org/apache/commons/sanselan/formats/jpeg/segments/SOFNSegment.java b/src/main/java/org/apache/commons/sanselan/formats/jpeg/segments/SofnSegment.java
similarity index 95%
rename from src/main/java/org/apache/commons/sanselan/formats/jpeg/segments/SOFNSegment.java
rename to src/main/java/org/apache/commons/sanselan/formats/jpeg/segments/SofnSegment.java
index b05d8fe..1042e6c 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/jpeg/segments/SOFNSegment.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/jpeg/segments/SofnSegment.java
@@ -23,7 +23,7 @@
import org.apache.commons.sanselan.ImageReadException;
import org.apache.commons.sanselan.formats.jpeg.JpegImageParser;
-public class SOFNSegment extends Segment
+public class SofnSegment extends Segment
{
public final int width, height;
public final int numberOfComponents;
@@ -49,13 +49,13 @@
}
}
- public SOFNSegment(int marker, byte segmentData[])
+ public SofnSegment(int marker, byte segmentData[])
throws ImageReadException, IOException
{
this(marker, segmentData.length, new ByteArrayInputStream(segmentData));
}
- public SOFNSegment(int marker, int marker_length, InputStream is)
+ public SofnSegment(int marker, int marker_length, InputStream is)
throws ImageReadException, IOException
{
super(marker, marker_length);
diff --git a/src/main/java/org/apache/commons/sanselan/formats/jpeg/segments/SOSSegment.java b/src/main/java/org/apache/commons/sanselan/formats/jpeg/segments/SosSegment.java
similarity index 95%
rename from src/main/java/org/apache/commons/sanselan/formats/jpeg/segments/SOSSegment.java
rename to src/main/java/org/apache/commons/sanselan/formats/jpeg/segments/SosSegment.java
index b200c25..a6da6f7 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/jpeg/segments/SOSSegment.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/jpeg/segments/SosSegment.java
@@ -22,7 +22,7 @@
import org.apache.commons.sanselan.ImageReadException;
-public class SOSSegment extends Segment
+public class SosSegment extends Segment
{
public final int numberOfComponents;
public final Component[] components;
@@ -47,19 +47,19 @@
}
}
- public SOSSegment(int marker, byte[] segmentData)
+ public SosSegment(int marker, byte[] segmentData)
throws ImageReadException, IOException
{
this(marker, segmentData.length, new ByteArrayInputStream(segmentData));
}
- public SOSSegment(int marker, int marker_length, InputStream is)
+ public SosSegment(int marker, int marker_length, InputStream is)
throws ImageReadException, IOException
{
super(marker, marker_length);
if (getDebug())
- System.out.println("SOSSegment marker_length: " + marker_length);
+ System.out.println("SosSegment marker_length: " + marker_length);
// Debug.debug("SOS", marker_length);
diff --git a/src/main/java/org/apache/commons/sanselan/formats/jpeg/xmp/JpegRewriter.java b/src/main/java/org/apache/commons/sanselan/formats/jpeg/xmp/JpegRewriter.java
index ae1d6e1..50ec32a 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/jpeg/xmp/JpegRewriter.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/jpeg/xmp/JpegRewriter.java
@@ -27,7 +27,7 @@
import org.apache.commons.sanselan.common.bytesource.ByteSource;
import org.apache.commons.sanselan.formats.jpeg.JpegConstants;
import org.apache.commons.sanselan.formats.jpeg.JpegUtils;
-import org.apache.commons.sanselan.formats.jpeg.iptc.IPTCParser;
+import org.apache.commons.sanselan.formats.jpeg.iptc.IptcParser;
/**
* Interface for Exif write/update/remove functionality for Jpeg/JFIF images.
@@ -35,7 +35,7 @@
* <p>
* See the source of the XmpXmlUpdateExample class for example usage.
*
- * @see org.apache.commons.sanselan.sampleUsage.WriteXmpXmlExample
+ * @see org.apache.commons.sanselan.examples.WriteXmpXmlExample
*/
public class JpegRewriter extends BinaryFileParser implements JpegConstants
{
@@ -131,7 +131,7 @@
{
if (marker != JPEG_APP13_Marker)
return false;
- if (!new IPTCParser().isPhotoshopJpegSegment(segmentData))
+ if (!new IptcParser().isPhotoshopJpegSegment(segmentData))
return false;
return true;
}
diff --git a/src/main/java/org/apache/commons/sanselan/formats/jpeg/xmp/JpegXmpRewriter.java b/src/main/java/org/apache/commons/sanselan/formats/jpeg/xmp/JpegXmpRewriter.java
index 4243d71..5e0f217 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/jpeg/xmp/JpegXmpRewriter.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/jpeg/xmp/JpegXmpRewriter.java
@@ -37,7 +37,7 @@
* <p>
* See the source of the XmpXmlUpdateExample class for example usage.
*
- * @see org.apache.commons.sanselan.sampleUsage.WriteXmpXmlExample
+ * @see org.apache.commons.sanselan.examples.WriteXmpXmlExample
*/
public class JpegXmpRewriter extends JpegRewriter
{
diff --git a/src/main/java/org/apache/commons/sanselan/formats/png/PngImageParser.java b/src/main/java/org/apache/commons/sanselan/formats/png/PngImageParser.java
index 29dfdc0..8777b2c 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/png/PngImageParser.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/png/PngImageParser.java
@@ -43,17 +43,17 @@
import org.apache.commons.sanselan.common.IImageMetadata;
import org.apache.commons.sanselan.common.ImageMetadata;
import org.apache.commons.sanselan.common.bytesource.ByteSource;
-import org.apache.commons.sanselan.formats.png.chunks.PNGChunk;
-import org.apache.commons.sanselan.formats.png.chunks.PNGChunkIDAT;
-import org.apache.commons.sanselan.formats.png.chunks.PNGChunkIHDR;
-import org.apache.commons.sanselan.formats.png.chunks.PNGChunkPLTE;
-import org.apache.commons.sanselan.formats.png.chunks.PNGChunkgAMA;
-import org.apache.commons.sanselan.formats.png.chunks.PNGChunkiCCP;
-import org.apache.commons.sanselan.formats.png.chunks.PNGChunkiTXt;
-import org.apache.commons.sanselan.formats.png.chunks.PNGChunkpHYs;
-import org.apache.commons.sanselan.formats.png.chunks.PNGChunktEXt;
-import org.apache.commons.sanselan.formats.png.chunks.PNGChunkzTXt;
-import org.apache.commons.sanselan.formats.png.chunks.PNGTextChunk;
+import org.apache.commons.sanselan.formats.png.chunks.PngChunk;
+import org.apache.commons.sanselan.formats.png.chunks.PngChunkIdat;
+import org.apache.commons.sanselan.formats.png.chunks.PngChunkIhdr;
+import org.apache.commons.sanselan.formats.png.chunks.PngChunkPlte;
+import org.apache.commons.sanselan.formats.png.chunks.PngChunkGama;
+import org.apache.commons.sanselan.formats.png.chunks.PngChunkIccp;
+import org.apache.commons.sanselan.formats.png.chunks.PngChunkItxt;
+import org.apache.commons.sanselan.formats.png.chunks.PngChunkPhys;
+import org.apache.commons.sanselan.formats.png.chunks.PngChunkText;
+import org.apache.commons.sanselan.formats.png.chunks.PngChunkZtxt;
+import org.apache.commons.sanselan.formats.png.chunks.PngTextChunk;
import org.apache.commons.sanselan.formats.transparencyfilters.TransparencyFilter;
import org.apache.commons.sanselan.formats.transparencyfilters.TransparencyFilterGrayscale;
import org.apache.commons.sanselan.formats.transparencyfilters.TransparencyFilterIndexedColor;
@@ -113,7 +113,7 @@
List chunks = readChunks(is, null, false);
List chunkTypes = new ArrayList();
for (int i=0; i<chunks.size(); i++) {
- PNGChunk chunk = (PNGChunk) chunks.get(i);
+ PngChunk chunk = (PngChunk) chunks.get(i);
chunkTypes.add(getChunkTypeName(chunk.chunkType));
}
return chunkTypes;
@@ -198,25 +198,25 @@
if (keep)
{
if (chunkType == iCCP)
- result.add(new PNGChunkiCCP(length, chunkType, CRC, bytes));
+ result.add(new PngChunkIccp(length, chunkType, CRC, bytes));
else if (chunkType == tEXt)
- result.add(new PNGChunktEXt(length, chunkType, CRC, bytes));
+ result.add(new PngChunkText(length, chunkType, CRC, bytes));
else if (chunkType == zTXt)
- result.add(new PNGChunkzTXt(length, chunkType, CRC, bytes));
+ result.add(new PngChunkZtxt(length, chunkType, CRC, bytes));
else if (chunkType == IHDR)
- result.add(new PNGChunkIHDR(length, chunkType, CRC, bytes));
+ result.add(new PngChunkIhdr(length, chunkType, CRC, bytes));
else if (chunkType == PLTE)
- result.add(new PNGChunkPLTE(length, chunkType, CRC, bytes));
+ result.add(new PngChunkPlte(length, chunkType, CRC, bytes));
else if (chunkType == pHYs)
- result.add(new PNGChunkpHYs(length, chunkType, CRC, bytes));
+ result.add(new PngChunkPhys(length, chunkType, CRC, bytes));
else if (chunkType == IDAT)
- result.add(new PNGChunkIDAT(length, chunkType, CRC, bytes));
+ result.add(new PngChunkIdat(length, chunkType, CRC, bytes));
else if (chunkType == gAMA)
- result.add(new PNGChunkgAMA(length, chunkType, CRC, bytes));
+ result.add(new PngChunkGama(length, chunkType, CRC, bytes));
else if (chunkType == iTXt)
- result.add(new PNGChunkiTXt(length, chunkType, CRC, bytes));
+ result.add(new PngChunkItxt(length, chunkType, CRC, bytes));
else
- result.add(new PNGChunk(length, chunkType, CRC, bytes));
+ result.add(new PngChunk(length, chunkType, CRC, bytes));
if (returnAfterFirst)
return result;
@@ -282,7 +282,7 @@
throw new ImageReadException(
"PNG contains more than one ICC Profile ");
- PNGChunkiCCP pngChunkiCCP = (PNGChunkiCCP) chunks.get(0);
+ PngChunkIccp pngChunkiCCP = (PngChunkIccp) chunks.get(0);
byte bytes[] = pngChunkiCCP.UncompressedProfile;
return (bytes);
@@ -299,7 +299,7 @@
if (chunks.size() > 1)
throw new ImageReadException("PNG contains more than one Header");
- PNGChunkIHDR pngChunkIHDR = (PNGChunkIHDR) chunks.get(0);
+ PngChunkIhdr pngChunkIHDR = (PngChunkIhdr) chunks.get(0);
return new Dimension(pngChunkIHDR.width, pngChunkIHDR.height);
}
@@ -327,7 +327,7 @@
for (int i = 0; i < chunks.size(); i++)
{
- PNGTextChunk chunk = (PNGTextChunk) chunks.get(i);
+ PngTextChunk chunk = (PngTextChunk) chunks.get(i);
result.add(chunk.getKeyword(), chunk.getText());
}
@@ -437,7 +437,7 @@
for (int i = 0; i < v.size(); i++)
{
- PNGChunk chunk = (PNGChunk) v.get(i);
+ PngChunk chunk = (PngChunk) v.get(i);
if (chunk.chunkType == type)
result.add(chunk);
}
@@ -496,7 +496,7 @@
// I may not have always preserved byte order correctly.
private TransparencyFilter getTransparencyFilter(int ColorType,
- PNGChunk pngChunktRNS) throws ImageReadException, IOException
+ PngChunk pngChunktRNS) throws ImageReadException, IOException
{
// this.printCharQuad("pngChunktRNS.ChunkType", pngChunktRNS.ChunkType);
// this.debugNumber("pngChunktRNS.Length", pngChunktRNS.Length);
@@ -537,8 +537,8 @@
if (IHDRs.size() != 1)
throw new ImageReadException("PNG contains more than one Header");
- PNGChunkIHDR pngChunkIHDR = (PNGChunkIHDR) IHDRs.get(0);
- PNGChunk pngChunktRNS = null;
+ PngChunkIhdr pngChunkIHDR = (PngChunkIhdr) IHDRs.get(0);
+ PngChunk pngChunktRNS = null;
boolean isTransparent = false;
@@ -546,21 +546,21 @@
if (tRNSs.size() > 0)
{
isTransparent = true;
- pngChunktRNS = (PNGChunk) IHDRs.get(0);
+ pngChunktRNS = (PngChunk) IHDRs.get(0);
} else {
// CE - Fix Alpha.
isTransparent = hasAlphaChannel(pngChunkIHDR.colorType);
// END FIX
}
- PNGChunkpHYs pngChunkpHYs = null;
+ PngChunkPhys pngChunkpHYs = null;
ArrayList pHYss = filterChunks(chunks, pHYs);
if (pHYss.size() > 1)
throw new ImageReadException("PNG contains more than one pHYs: "
+ pHYss.size());
else if (pHYss.size() == 1)
- pngChunkpHYs = (PNGChunkpHYs) pHYss.get(0);
+ pngChunkpHYs = (PngChunkPhys) pHYss.get(0);
ArrayList tEXts = filterChunks(chunks, tEXt);
ArrayList zTXts = filterChunks(chunks, zTXt);
@@ -572,19 +572,19 @@
for (int i = 0; i < tEXts.size(); i++)
{
- PNGChunktEXt pngChunktEXt = (PNGChunktEXt) tEXts.get(i);
+ PngChunkText pngChunktEXt = (PngChunkText) tEXts.get(i);
comments.add(pngChunktEXt.keyword + ": " + pngChunktEXt.text);
textChunks.add(pngChunktEXt.getContents());
}
for (int i = 0; i < zTXts.size(); i++)
{
- PNGChunkzTXt pngChunkzTXt = (PNGChunkzTXt) zTXts.get(i);
+ PngChunkZtxt pngChunkzTXt = (PngChunkZtxt) zTXts.get(i);
comments.add(pngChunkzTXt.keyword + ": " + pngChunkzTXt.text);
textChunks.add(pngChunkzTXt.getContents());
}
for (int i = 0; i < iTXts.size(); i++)
{
- PNGChunkiTXt pngChunkiTXt = (PNGChunkiTXt) iTXts.get(i);
+ PngChunkItxt pngChunkiTXt = (PngChunkItxt) iTXts.get(i);
comments.add(pngChunkiTXt.keyword + ": " + pngChunkiTXt.text);
textChunks.add(pngChunkiTXt.getContents());
}
@@ -697,15 +697,15 @@
if (IHDRs.size() != 1)
throw new ImageReadException("PNG contains more than one Header");
- PNGChunkIHDR pngChunkIHDR = (PNGChunkIHDR) IHDRs.get(0);
+ PngChunkIhdr pngChunkIHDR = (PngChunkIhdr) IHDRs.get(0);
ArrayList PLTEs = filterChunks(chunks, PLTE);
if (PLTEs.size() > 1)
throw new ImageReadException("PNG contains more than one Palette");
- PNGChunkPLTE pngChunkPLTE = null;
+ PngChunkPlte pngChunkPLTE = null;
if (PLTEs.size() == 1)
- pngChunkPLTE = (PNGChunkPLTE) PLTEs.get(0);
+ pngChunkPLTE = (PngChunkPlte) PLTEs.get(0);
// -----
@@ -716,7 +716,7 @@
ByteArrayOutputStream baos = new ByteArrayOutputStream();
for (int i = 0; i < IDATs.size(); i++)
{
- PNGChunkIDAT pngChunkIDAT = (PNGChunkIDAT) IDATs.get(i);
+ PngChunkIdat pngChunkIDAT = (PngChunkIdat) IDATs.get(i);
byte bytes[] = pngChunkIDAT.bytes;
// System.out.println(i + ": bytes: " + bytes.length);
baos.write(bytes);
@@ -731,7 +731,7 @@
ArrayList tRNSs = filterChunks(chunks, tRNS);
if (tRNSs.size() > 0)
{
- PNGChunk pngChunktRNS = (PNGChunk) tRNSs.get(0);
+ PngChunk pngChunktRNS = (PngChunk) tRNSs.get(0);
transparencyFilter = getTransparencyFilter(pngChunkIHDR.colorType,
pngChunktRNS);
}
@@ -759,13 +759,13 @@
if (debug)
System.out.println("iCCP.");
- PNGChunkiCCP pngChunkiCCP = (PNGChunkiCCP) iCCPs.get(0);
+ PngChunkIccp pngChunkiCCP = (PngChunkIccp) iCCPs.get(0);
byte bytes[] = pngChunkiCCP.UncompressedProfile;
icc_profile = ICC_Profile.getInstance(bytes);
} else if (gAMAs.size() == 1)
{
- PNGChunkgAMA pngChunkgAMA = (PNGChunkgAMA) gAMAs.get(0);
+ PngChunkGama pngChunkgAMA = (PngChunkGama) gAMAs.get(0);
double gamma = pngChunkgAMA.getGamma();
// charles: what is the correct target value here?
@@ -869,7 +869,7 @@
System.out.println("PNG contains more than one Header");
return false;
}
- PNGChunkIHDR pngChunkIHDR = (PNGChunkIHDR) IHDRs.get(0);
+ PngChunkIhdr pngChunkIHDR = (PngChunkIhdr) IHDRs.get(0);
pw.println("Color: "
+ getColorTypeDescription(pngChunkIHDR.colorType));
}
@@ -881,7 +881,7 @@
for (int i = 0; i < chunks.size(); i++)
{
- PNGChunk chunk = (PNGChunk) chunks.get(i);
+ PngChunk chunk = (PngChunk) chunks.get(i);
printCharQuad(pw, "\t" + i + ": ", chunk.chunkType);
}
}
@@ -921,7 +921,7 @@
List xmpChunks = new ArrayList();
for (int i = 0; i < chunks.size(); i++)
{
- PNGChunkiTXt chunk = (PNGChunkiTXt) chunks.get(i);
+ PngChunkItxt chunk = (PngChunkItxt) chunks.get(i);
if (!chunk.getKeyword().equals(XMP_KEYWORD))
continue;
xmpChunks.add(chunk);
@@ -933,7 +933,7 @@
throw new ImageReadException(
"PNG contains more than one XMP chunk.");
- PNGChunkiTXt chunk = (PNGChunkiTXt) xmpChunks.get(0);
+ PngChunkItxt chunk = (PngChunkItxt) xmpChunks.get(0);
return chunk.getText();
}
diff --git a/src/main/java/org/apache/commons/sanselan/formats/png/ScanExpediter.java b/src/main/java/org/apache/commons/sanselan/formats/png/ScanExpediter.java
index 8ee02b6..8fca366 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/png/ScanExpediter.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/png/ScanExpediter.java
@@ -22,7 +22,7 @@
import org.apache.commons.sanselan.ImageReadException;
import org.apache.commons.sanselan.common.BinaryFileParser;
-import org.apache.commons.sanselan.formats.png.chunks.PNGChunkPLTE;
+import org.apache.commons.sanselan.formats.png.chunks.PngChunkPlte;
import org.apache.commons.sanselan.formats.png.scanlinefilters.ScanlineFilter;
import org.apache.commons.sanselan.formats.png.scanlinefilters.ScanlineFilterAverage;
import org.apache.commons.sanselan.formats.png.scanlinefilters.ScanlineFilterNone;
@@ -41,13 +41,13 @@
protected final int bitDepth;
protected final int bytesPerPixel;
protected final int bitsPerPixel;
- protected final PNGChunkPLTE pngChunkPLTE;
+ protected final PngChunkPlte pngChunkPLTE;
protected final GammaCorrection gammaCorrection;
protected final TransparencyFilter transparencyFilter;
public ScanExpediter(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)
{
diff --git a/src/main/java/org/apache/commons/sanselan/formats/png/ScanExpediterInterlaced.java b/src/main/java/org/apache/commons/sanselan/formats/png/ScanExpediterInterlaced.java
index 0f07ed0..bd23ede 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/png/ScanExpediterInterlaced.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/png/ScanExpediterInterlaced.java
@@ -21,14 +21,14 @@
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 ScanExpediterInterlaced extends ScanExpediter
{
public ScanExpediterInterlaced(int width, int height, InputStream is,
BufferedImage bi, int color_type, int BitDepth, int bits_per_pixel,
- PNGChunkPLTE fPNGChunkPLTE, GammaCorrection fGammaCorrection,
+ PngChunkPlte fPNGChunkPLTE, GammaCorrection fGammaCorrection,
TransparencyFilter fTransparencyFilter)
{
@@ -38,7 +38,7 @@
private void visit(int x, int y, BufferedImage bi, BitParser fBitParser,
int color_type, int pixel_index_in_scanline,
- PNGChunkPLTE fPNGChunkPLTE, GammaCorrection fGammaCorrection)
+ PngChunkPlte fPNGChunkPLTE, GammaCorrection fGammaCorrection)
throws ImageReadException, IOException
{
int rgb = getRGB(fBitParser,
diff --git a/src/main/java/org/apache/commons/sanselan/formats/png/ScanExpediterSimple.java b/src/main/java/org/apache/commons/sanselan/formats/png/ScanExpediterSimple.java
index 7b64ad2..b93aae2 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/png/ScanExpediterSimple.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/png/ScanExpediterSimple.java
@@ -21,14 +21,14 @@
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)
{
diff --git a/src/main/java/org/apache/commons/sanselan/formats/png/chunks/PNGChunk.java b/src/main/java/org/apache/commons/sanselan/formats/png/chunks/PngChunk.java
similarity index 94%
rename from src/main/java/org/apache/commons/sanselan/formats/png/chunks/PNGChunk.java
rename to src/main/java/org/apache/commons/sanselan/formats/png/chunks/PngChunk.java
index edb32a6..e851523 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/png/chunks/PNGChunk.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/png/chunks/PngChunk.java
@@ -20,7 +20,7 @@
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 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;
diff --git a/src/main/java/org/apache/commons/sanselan/formats/png/chunks/PNGChunkgAMA.java b/src/main/java/org/apache/commons/sanselan/formats/png/chunks/PngChunkGama.java
similarity index 92%
rename from src/main/java/org/apache/commons/sanselan/formats/png/chunks/PNGChunkgAMA.java
rename to src/main/java/org/apache/commons/sanselan/formats/png/chunks/PngChunkGama.java
index f24e4dc..c52223e 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/png/chunks/PNGChunkgAMA.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/png/chunks/PngChunkGama.java
@@ -21,11 +21,11 @@
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);
diff --git a/src/main/java/org/apache/commons/sanselan/formats/png/chunks/PNGChunkiCCP.java b/src/main/java/org/apache/commons/sanselan/formats/png/chunks/PngChunkIccp.java
similarity index 95%
rename from src/main/java/org/apache/commons/sanselan/formats/png/chunks/PNGChunkiCCP.java
rename to src/main/java/org/apache/commons/sanselan/formats/png/chunks/PngChunkIccp.java
index 09c5d4b..e5b939f 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/png/chunks/PNGChunkiCCP.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/png/chunks/PngChunkIccp.java
@@ -21,7 +21,7 @@
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 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 @@
{
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);
diff --git a/src/main/java/org/apache/commons/sanselan/formats/png/chunks/PNGChunkIDAT.java b/src/main/java/org/apache/commons/sanselan/formats/png/chunks/PngChunkIdat.java
similarity index 89%
rename from src/main/java/org/apache/commons/sanselan/formats/png/chunks/PNGChunkIDAT.java
rename to src/main/java/org/apache/commons/sanselan/formats/png/chunks/PngChunkIdat.java
index f56a64d..a804d83 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/png/chunks/PNGChunkIDAT.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/png/chunks/PngChunkIdat.java
@@ -18,9 +18,9 @@
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);
diff --git a/src/main/java/org/apache/commons/sanselan/formats/png/chunks/PNGChunkIHDR.java b/src/main/java/org/apache/commons/sanselan/formats/png/chunks/PngChunkIhdr.java
similarity index 94%
rename from src/main/java/org/apache/commons/sanselan/formats/png/chunks/PNGChunkIHDR.java
rename to src/main/java/org/apache/commons/sanselan/formats/png/chunks/PngChunkIhdr.java
index 5e7ef07..a6c2a9c 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/png/chunks/PNGChunkIHDR.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/png/chunks/PngChunkIhdr.java
@@ -21,7 +21,7 @@
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 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);
diff --git a/src/main/java/org/apache/commons/sanselan/formats/png/chunks/PNGChunkiTXt.java b/src/main/java/org/apache/commons/sanselan/formats/png/chunks/PngChunkItxt.java
similarity index 97%
rename from src/main/java/org/apache/commons/sanselan/formats/png/chunks/PNGChunkiTXt.java
rename to src/main/java/org/apache/commons/sanselan/formats/png/chunks/PngChunkItxt.java
index f445cef..6013ea2 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/png/chunks/PNGChunkiTXt.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/png/chunks/PngChunkItxt.java
@@ -23,7 +23,7 @@
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 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);
diff --git a/src/main/java/org/apache/commons/sanselan/formats/png/chunks/PNGChunkpHYs.java b/src/main/java/org/apache/commons/sanselan/formats/png/chunks/PngChunkPhys.java
similarity index 93%
rename from src/main/java/org/apache/commons/sanselan/formats/png/chunks/PNGChunkpHYs.java
rename to src/main/java/org/apache/commons/sanselan/formats/png/chunks/PngChunkPhys.java
index 5cb7b56..53d4ff8 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/png/chunks/PNGChunkpHYs.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/png/chunks/PngChunkPhys.java
@@ -21,13 +21,13 @@
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);
diff --git a/src/main/java/org/apache/commons/sanselan/formats/png/chunks/PNGChunkPLTE.java b/src/main/java/org/apache/commons/sanselan/formats/png/chunks/PngChunkPlte.java
similarity index 95%
rename from src/main/java/org/apache/commons/sanselan/formats/png/chunks/PNGChunkPLTE.java
rename to src/main/java/org/apache/commons/sanselan/formats/png/chunks/PngChunkPlte.java
index 58288a1..a21b957 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/png/chunks/PNGChunkPLTE.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/png/chunks/PngChunkPlte.java
@@ -22,11 +22,11 @@
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);
diff --git a/src/main/java/org/apache/commons/sanselan/formats/png/chunks/PNGChunktEXt.java b/src/main/java/org/apache/commons/sanselan/formats/png/chunks/PngChunkText.java
similarity index 94%
rename from src/main/java/org/apache/commons/sanselan/formats/png/chunks/PNGChunktEXt.java
rename to src/main/java/org/apache/commons/sanselan/formats/png/chunks/PngChunkText.java
index 89975c6..e38817b 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/png/chunks/PNGChunktEXt.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/png/chunks/PngChunkText.java
@@ -21,11 +21,11 @@
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);
diff --git a/src/main/java/org/apache/commons/sanselan/formats/png/chunks/PNGChunkzTXt.java b/src/main/java/org/apache/commons/sanselan/formats/png/chunks/PngChunkZtxt.java
similarity index 95%
rename from src/main/java/org/apache/commons/sanselan/formats/png/chunks/PNGChunkzTXt.java
rename to src/main/java/org/apache/commons/sanselan/formats/png/chunks/PngChunkZtxt.java
index 38d2597..25aae76 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/png/chunks/PNGChunkzTXt.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/png/chunks/PngChunkZtxt.java
@@ -23,12 +23,12 @@
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);
diff --git a/src/main/java/org/apache/commons/sanselan/formats/png/chunks/PNGTextChunk.java b/src/main/java/org/apache/commons/sanselan/formats/png/chunks/PngTextChunk.java
similarity index 91%
rename from src/main/java/org/apache/commons/sanselan/formats/png/chunks/PNGTextChunk.java
rename to src/main/java/org/apache/commons/sanselan/formats/png/chunks/PngTextChunk.java
index d9e7ebd..ecb7bc0 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/png/chunks/PNGTextChunk.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/png/chunks/PngTextChunk.java
@@ -20,10 +20,10 @@
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);
diff --git a/src/main/java/org/apache/commons/sanselan/formats/pnm/PBMFileInfo.java b/src/main/java/org/apache/commons/sanselan/formats/pnm/PbmFileInfo.java
similarity index 96%
rename from src/main/java/org/apache/commons/sanselan/formats/pnm/PBMFileInfo.java
rename to src/main/java/org/apache/commons/sanselan/formats/pnm/PbmFileInfo.java
index 7ef7d73..463a544 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/pnm/PBMFileInfo.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/pnm/PbmFileInfo.java
@@ -22,9 +22,9 @@
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);
}
diff --git a/src/main/java/org/apache/commons/sanselan/formats/pnm/PBMWriter.java b/src/main/java/org/apache/commons/sanselan/formats/pnm/PbmWriter.java
similarity index 96%
rename from src/main/java/org/apache/commons/sanselan/formats/pnm/PBMWriter.java
rename to src/main/java/org/apache/commons/sanselan/formats/pnm/PbmWriter.java
index 151ae0e..d54f425 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/pnm/PBMWriter.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/pnm/PbmWriter.java
@@ -23,9 +23,9 @@
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);
}
diff --git a/src/main/java/org/apache/commons/sanselan/formats/pnm/PGMFileInfo.java b/src/main/java/org/apache/commons/sanselan/formats/pnm/PgmFileInfo.java
similarity index 95%
rename from src/main/java/org/apache/commons/sanselan/formats/pnm/PGMFileInfo.java
rename to src/main/java/org/apache/commons/sanselan/formats/pnm/PgmFileInfo.java
index fbe1a36..80f0c6c 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/pnm/PGMFileInfo.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/pnm/PgmFileInfo.java
@@ -22,11 +22,11 @@
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);
diff --git a/src/main/java/org/apache/commons/sanselan/formats/pnm/PGMWriter.java b/src/main/java/org/apache/commons/sanselan/formats/pnm/PgmWriter.java
similarity index 95%
rename from src/main/java/org/apache/commons/sanselan/formats/pnm/PGMWriter.java
rename to src/main/java/org/apache/commons/sanselan/formats/pnm/PgmWriter.java
index b232068..1f09daf 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/pnm/PGMWriter.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/pnm/PgmWriter.java
@@ -23,9 +23,9 @@
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);
}
diff --git a/src/main/java/org/apache/commons/sanselan/formats/pnm/PNMConstants.java b/src/main/java/org/apache/commons/sanselan/formats/pnm/PnmConstants.java
similarity index 97%
rename from src/main/java/org/apache/commons/sanselan/formats/pnm/PNMConstants.java
rename to src/main/java/org/apache/commons/sanselan/formats/pnm/PnmConstants.java
index 32fdab8..f593467 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/pnm/PNMConstants.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/pnm/PnmConstants.java
@@ -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
diff --git a/src/main/java/org/apache/commons/sanselan/formats/pnm/PNMImageParser.java b/src/main/java/org/apache/commons/sanselan/formats/pnm/PnmImageParser.java
similarity index 93%
rename from src/main/java/org/apache/commons/sanselan/formats/pnm/PNMImageParser.java
rename to src/main/java/org/apache/commons/sanselan/formats/pnm/PnmImageParser.java
index 3210f3e..49c6cb7 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/pnm/PNMImageParser.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/pnm/PnmImageParser.java
@@ -36,10 +36,10 @@
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 @@
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 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 @@
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);
diff --git a/src/main/java/org/apache/commons/sanselan/formats/pnm/PNMWriter.java b/src/main/java/org/apache/commons/sanselan/formats/pnm/PnmWriter.java
similarity index 94%
rename from src/main/java/org/apache/commons/sanselan/formats/pnm/PNMWriter.java
rename to src/main/java/org/apache/commons/sanselan/formats/pnm/PnmWriter.java
index ae86df8..abc9ad6 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/pnm/PNMWriter.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/pnm/PnmWriter.java
@@ -23,11 +23,11 @@
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;
}
diff --git a/src/main/java/org/apache/commons/sanselan/formats/pnm/PPMFileInfo.java b/src/main/java/org/apache/commons/sanselan/formats/pnm/PpmFileInfo.java
similarity index 96%
rename from src/main/java/org/apache/commons/sanselan/formats/pnm/PPMFileInfo.java
rename to src/main/java/org/apache/commons/sanselan/formats/pnm/PpmFileInfo.java
index 385315c..0b50cb7 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/pnm/PPMFileInfo.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/pnm/PpmFileInfo.java
@@ -22,11 +22,11 @@
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);
diff --git a/src/main/java/org/apache/commons/sanselan/formats/pnm/PPMWriter.java b/src/main/java/org/apache/commons/sanselan/formats/pnm/PpmWriter.java
similarity index 96%
rename from src/main/java/org/apache/commons/sanselan/formats/pnm/PPMWriter.java
rename to src/main/java/org/apache/commons/sanselan/formats/pnm/PpmWriter.java
index 4b90e46..316ac19 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/pnm/PPMWriter.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/pnm/PpmWriter.java
@@ -23,9 +23,9 @@
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);
}
diff --git a/src/main/java/org/apache/commons/sanselan/formats/psd/ImageContents.java b/src/main/java/org/apache/commons/sanselan/formats/psd/ImageContents.java
index 167d217..bde8d17 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/psd/ImageContents.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/psd/ImageContents.java
@@ -20,14 +20,14 @@
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)
diff --git a/src/main/java/org/apache/commons/sanselan/formats/psd/PSDConstants.java b/src/main/java/org/apache/commons/sanselan/formats/psd/PsdConstants.java
similarity index 99%
rename from src/main/java/org/apache/commons/sanselan/formats/psd/PSDConstants.java
rename to src/main/java/org/apache/commons/sanselan/formats/psd/PsdConstants.java
index 985ec71..0a1a4a0 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/psd/PSDConstants.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/psd/PsdConstants.java
@@ -18,7 +18,7 @@
import org.apache.commons.sanselan.util.Debug;
-public class PSDConstants
+public class PsdConstants
{
public static final ImageResourceType fImageResourceTypes[];
@@ -197,7 +197,7 @@
}
catch (Exception e)
{
- Debug.debug(PSDConstants.class, e);
+ Debug.debug(PsdConstants.class, e);
}
fImageResourceTypes = temp;
}
diff --git a/src/main/java/org/apache/commons/sanselan/formats/psd/PSDHeaderInfo.java b/src/main/java/org/apache/commons/sanselan/formats/psd/PsdHeaderInfo.java
similarity index 96%
rename from src/main/java/org/apache/commons/sanselan/formats/psd/PSDHeaderInfo.java
rename to src/main/java/org/apache/commons/sanselan/formats/psd/PsdHeaderInfo.java
index 72d96fd..bf10ad4 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/psd/PSDHeaderInfo.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/psd/PsdHeaderInfo.java
@@ -18,7 +18,7 @@
import java.io.PrintWriter;
-public class PSDHeaderInfo
+public class PsdHeaderInfo
{
public final int Version;
public final byte Reserved[];
@@ -28,7 +28,7 @@
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;
diff --git a/src/main/java/org/apache/commons/sanselan/formats/psd/PsdImageParser.java b/src/main/java/org/apache/commons/sanselan/formats/psd/PsdImageParser.java
index e61c97b..8325220 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/psd/PsdImageParser.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/psd/PsdImageParser.java
@@ -36,11 +36,11 @@
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 @@
};
}
- private PSDHeaderInfo readHeader(ByteSource byteSource)
+ private PsdHeaderInfo readHeader(ByteSource byteSource)
throws ImageReadException, IOException
{
InputStream is = null;
@@ -105,7 +105,7 @@
}
}
- 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 @@
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 @@
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 @@
{
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 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 @@
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 @@
// + block.getClass().getName()
// + ", "
+ " data: " + block.data.length + " type: '"
- + new PSDConstants().getDescription(block.id) + "' "
+ + new PsdConstants().getDescription(block.id) + "' "
+ ")");
}
@@ -664,7 +664,7 @@
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 @@
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 @@
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");
diff --git a/src/main/java/org/apache/commons/sanselan/formats/psd/dataparsers/DataParser.java b/src/main/java/org/apache/commons/sanselan/formats/psd/dataparsers/DataParser.java
index f6b2c30..a4f7658 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/psd/dataparsers/DataParser.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/psd/dataparsers/DataParser.java
@@ -20,7 +20,7 @@
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 @@
{
DataBuffer buffer = bi.getRaster().getDataBuffer();
- PSDHeaderInfo header = imageContents.header;
+ PsdHeaderInfo header = imageContents.header;
int width = header.Columns;
int height = header.Rows;
diff --git a/src/main/java/org/apache/commons/sanselan/formats/psd/dataparsers/DataParserCMYK.java b/src/main/java/org/apache/commons/sanselan/formats/psd/dataparsers/DataParserCmyk.java
similarity index 96%
rename from src/main/java/org/apache/commons/sanselan/formats/psd/dataparsers/DataParserCMYK.java
rename to src/main/java/org/apache/commons/sanselan/formats/psd/dataparsers/DataParserCmyk.java
index 7634474..415eed0 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/psd/dataparsers/DataParserCMYK.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/psd/dataparsers/DataParserCmyk.java
@@ -19,7 +19,7 @@
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)
diff --git a/src/main/java/org/apache/commons/sanselan/formats/psd/dataparsers/DataParserRGB.java b/src/main/java/org/apache/commons/sanselan/formats/psd/dataparsers/DataParserRgb.java
similarity index 96%
rename from src/main/java/org/apache/commons/sanselan/formats/psd/dataparsers/DataParserRGB.java
rename to src/main/java/org/apache/commons/sanselan/formats/psd/dataparsers/DataParserRgb.java
index 3f1f9c5..942e289 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/psd/dataparsers/DataParserRGB.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/psd/dataparsers/DataParserRgb.java
@@ -18,7 +18,7 @@
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)
diff --git a/src/main/java/org/apache/commons/sanselan/formats/psd/datareaders/CompressedDataReader.java b/src/main/java/org/apache/commons/sanselan/formats/psd/datareaders/CompressedDataReader.java
index 2425e36..7ec148d 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/psd/datareaders/CompressedDataReader.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/psd/datareaders/CompressedDataReader.java
@@ -27,7 +27,7 @@
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 @@
ImageContents imageContents, BinaryFileParser bfp)
throws ImageReadException, IOException
{
- PSDHeaderInfo header = imageContents.header;
+ PsdHeaderInfo header = imageContents.header;
int width = header.Columns;
int height = header.Rows;
diff --git a/src/main/java/org/apache/commons/sanselan/formats/psd/datareaders/UncompressedDataReader.java b/src/main/java/org/apache/commons/sanselan/formats/psd/datareaders/UncompressedDataReader.java
index 6c1661b..d095f39 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/psd/datareaders/UncompressedDataReader.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/psd/datareaders/UncompressedDataReader.java
@@ -25,7 +25,7 @@
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 @@
ImageContents imageContents, BinaryFileParser bfp)
throws ImageReadException, IOException
{
- PSDHeaderInfo header = imageContents.header;
+ PsdHeaderInfo header = imageContents.header;
int width = header.Columns;
int height = header.Rows;
diff --git a/src/main/java/org/apache/commons/sanselan/formats/tiff/TiffImageParser.java b/src/main/java/org/apache/commons/sanselan/formats/tiff/TiffImageParser.java
index 7304aa5..7996b58 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/tiff/TiffImageParser.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/tiff/TiffImageParser.java
@@ -39,11 +39,11 @@
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 @@
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 @@
}
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);
}
diff --git a/src/main/java/org/apache/commons/sanselan/formats/tiff/constants/AllTagConstants.java b/src/main/java/org/apache/commons/sanselan/formats/tiff/constants/AllTagConstants.java
index ab9b6fb..d339ddf 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/tiff/constants/AllTagConstants.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/tiff/constants/AllTagConstants.java
@@ -23,7 +23,7 @@
SanselanConstants,
TiffTagConstants,
ExifTagConstants,
- GPSTagConstants
+ GpsTagConstants
{
public static final TagInfo ALL_TAGS[] = TagConstantsUtils
.mergeTagLists(new TagInfo[][]{
diff --git a/src/main/java/org/apache/commons/sanselan/formats/tiff/constants/GPSTagConstants.java b/src/main/java/org/apache/commons/sanselan/formats/tiff/constants/GpsTagConstants.java
similarity index 99%
rename from src/main/java/org/apache/commons/sanselan/formats/tiff/constants/GPSTagConstants.java
rename to src/main/java/org/apache/commons/sanselan/formats/tiff/constants/GpsTagConstants.java
index f69e07b..bac194a 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/tiff/constants/GPSTagConstants.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/tiff/constants/GpsTagConstants.java
@@ -16,7 +16,7 @@
*/
package org.apache.commons.sanselan.formats.tiff.constants;
-public interface GPSTagConstants
+public interface GpsTagConstants
extends
TiffDirectoryConstants,
TiffFieldTypeConstants
diff --git a/src/main/java/org/apache/commons/sanselan/formats/tiff/constants/TiffFieldTypeConstants.java b/src/main/java/org/apache/commons/sanselan/formats/tiff/constants/TiffFieldTypeConstants.java
index 84dd2ab..7b3aebc 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/tiff/constants/TiffFieldTypeConstants.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/tiff/constants/TiffFieldTypeConstants.java
@@ -18,7 +18,7 @@
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 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,
diff --git a/src/main/java/org/apache/commons/sanselan/formats/tiff/datareaders/DataReader.java b/src/main/java/org/apache/commons/sanselan/formats/tiff/datareaders/DataReader.java
index 7da8d67..ec754fa 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/tiff/datareaders/DataReader.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/tiff/datareaders/DataReader.java
@@ -26,7 +26,7 @@
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 @@
int LZWMinimumCodeSize = 8;
- MyLZWDecompressor myLzwDecompressor = new MyLZWDecompressor(
+ MyLzwDecompressor myLzwDecompressor = new MyLzwDecompressor(
LZWMinimumCodeSize, BYTE_ORDER_NETWORK);
myLzwDecompressor.setTiffLZWMode();
diff --git a/src/main/java/org/apache/commons/sanselan/formats/tiff/fieldtypes/FieldTypeASCII.java b/src/main/java/org/apache/commons/sanselan/formats/tiff/fieldtypes/FieldTypeAscii.java
similarity index 95%
rename from src/main/java/org/apache/commons/sanselan/formats/tiff/fieldtypes/FieldTypeASCII.java
rename to src/main/java/org/apache/commons/sanselan/formats/tiff/fieldtypes/FieldTypeAscii.java
index e562e94..aeaf10e 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/tiff/fieldtypes/FieldTypeASCII.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/tiff/fieldtypes/FieldTypeAscii.java
@@ -19,9 +19,9 @@
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);
}
diff --git a/src/main/java/org/apache/commons/sanselan/formats/tiff/photometricinterpreters/PhotometricInterpreterCIELAB.java b/src/main/java/org/apache/commons/sanselan/formats/tiff/photometricinterpreters/PhotometricInterpreterCieLab.java
similarity index 92%
rename from src/main/java/org/apache/commons/sanselan/formats/tiff/photometricinterpreters/PhotometricInterpreterCIELAB.java
rename to src/main/java/org/apache/commons/sanselan/formats/tiff/photometricinterpreters/PhotometricInterpreterCieLab.java
index ec3e0d3..05934ed 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/tiff/photometricinterpreters/PhotometricInterpreterCIELAB.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/tiff/photometricinterpreters/PhotometricInterpreterCieLab.java
@@ -22,9 +22,9 @@
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);
diff --git a/src/main/java/org/apache/commons/sanselan/formats/tiff/photometricinterpreters/PhotometricInterpreterCMYK.java b/src/main/java/org/apache/commons/sanselan/formats/tiff/photometricinterpreters/PhotometricInterpreterCmyk.java
similarity index 92%
rename from src/main/java/org/apache/commons/sanselan/formats/tiff/photometricinterpreters/PhotometricInterpreterCMYK.java
rename to src/main/java/org/apache/commons/sanselan/formats/tiff/photometricinterpreters/PhotometricInterpreterCmyk.java
index d4e15ec..0017e2d 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/tiff/photometricinterpreters/PhotometricInterpreterCMYK.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/tiff/photometricinterpreters/PhotometricInterpreterCmyk.java
@@ -22,9 +22,9 @@
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);
diff --git a/src/main/java/org/apache/commons/sanselan/formats/tiff/photometricinterpreters/PhotometricInterpreterLogLUV.java b/src/main/java/org/apache/commons/sanselan/formats/tiff/photometricinterpreters/PhotometricInterpreterLogLuv.java
similarity index 97%
rename from src/main/java/org/apache/commons/sanselan/formats/tiff/photometricinterpreters/PhotometricInterpreterLogLUV.java
rename to src/main/java/org/apache/commons/sanselan/formats/tiff/photometricinterpreters/PhotometricInterpreterLogLuv.java
index 8c250ba..cefc054 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/tiff/photometricinterpreters/PhotometricInterpreterLogLUV.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/tiff/photometricinterpreters/PhotometricInterpreterLogLuv.java
@@ -21,11 +21,11 @@
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)
{
diff --git a/src/main/java/org/apache/commons/sanselan/formats/tiff/photometricinterpreters/PhotometricInterpreterRGB.java b/src/main/java/org/apache/commons/sanselan/formats/tiff/photometricinterpreters/PhotometricInterpreterRgb.java
similarity index 92%
rename from src/main/java/org/apache/commons/sanselan/formats/tiff/photometricinterpreters/PhotometricInterpreterRGB.java
rename to src/main/java/org/apache/commons/sanselan/formats/tiff/photometricinterpreters/PhotometricInterpreterRgb.java
index 5b41bf7..bb40143 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/tiff/photometricinterpreters/PhotometricInterpreterRGB.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/tiff/photometricinterpreters/PhotometricInterpreterRgb.java
@@ -21,9 +21,9 @@
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);
diff --git a/src/main/java/org/apache/commons/sanselan/formats/tiff/write/TiffImageWriterBase.java b/src/main/java/org/apache/commons/sanselan/formats/tiff/write/TiffImageWriterBase.java
index fdc4c20..58b9ed0 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/tiff/write/TiffImageWriterBase.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/tiff/write/TiffImageWriterBase.java
@@ -30,7 +30,7 @@
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 @@
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);
diff --git a/src/main/java/org/apache/commons/sanselan/util/IOUtils.java b/src/main/java/org/apache/commons/sanselan/util/IoUtils.java
similarity index 98%
rename from src/main/java/org/apache/commons/sanselan/util/IOUtils.java
rename to src/main/java/org/apache/commons/sanselan/util/IoUtils.java
index a6776f7..ae60437 100644
--- a/src/main/java/org/apache/commons/sanselan/util/IOUtils.java
+++ b/src/main/java/org/apache/commons/sanselan/util/IoUtils.java
@@ -30,12 +30,12 @@
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()
{
}
diff --git a/src/site/xdoc/sampleusage.xml b/src/site/xdoc/sampleusage.xml
index a041f98..6277e13 100644
--- a/src/site/xdoc/sampleusage.xml
+++ b/src/site/xdoc/sampleusage.xml
@@ -26,7 +26,7 @@
<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>
diff --git a/src/test/java/org/apache/commons/sanselan/SanselanTest.java b/src/test/java/org/apache/commons/sanselan/SanselanTest.java
index b53c896..bd2255d 100644
--- a/src/test/java/org/apache/commons/sanselan/SanselanTest.java
+++ b/src/test/java/org/apache/commons/sanselan/SanselanTest.java
@@ -27,7 +27,7 @@
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 @@
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 @@
return true;
}
};
- new FSTraversal().traverseFiles(imagesFolder, visitor);
+ new FileSystemTraversal().traverseFiles(imagesFolder, visitor);
}
protected List getTestImages(final ImageFilter filter, final int max)
diff --git a/src/test/java/org/apache/commons/sanselan/common/bytesource/ByteSourceDataTest.java b/src/test/java/org/apache/commons/sanselan/common/bytesource/ByteSourceDataTest.java
index 4cf4f9c..8aac956 100644
--- a/src/test/java/org/apache/commons/sanselan/common/bytesource/ByteSourceDataTest.java
+++ b/src/test/java/org/apache/commons/sanselan/common/bytesource/ByteSourceDataTest.java
@@ -26,7 +26,7 @@
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 @@
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 @@
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++)
diff --git a/src/test/java/org/apache/commons/sanselan/common/bytesource/ByteSourceImageTest.java b/src/test/java/org/apache/commons/sanselan/common/bytesource/ByteSourceImageTest.java
index 5675ff8..b3ffa37 100644
--- a/src/test/java/org/apache/commons/sanselan/common/bytesource/ByteSourceImageTest.java
+++ b/src/test/java/org/apache/commons/sanselan/common/bytesource/ByteSourceImageTest.java
@@ -33,7 +33,7 @@
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 @@
Debug.debug("imageFile", imageFile);
assertNotNull(imageFile);
- byte imageFileBytes[] = IOUtils.getFileBytes(imageFile);
+ byte imageFileBytes[] = IoUtils.getFileBytes(imageFile);
assertNotNull(imageFileBytes);
assertTrue(imageFileBytes.length == imageFile.length());
diff --git a/src/test/java/org/apache/commons/sanselan/sampleUsage/ImageReadExample.java b/src/test/java/org/apache/commons/sanselan/examples/ImageReadExample.java
similarity index 97%
rename from src/test/java/org/apache/commons/sanselan/sampleUsage/ImageReadExample.java
rename to src/test/java/org/apache/commons/sanselan/examples/ImageReadExample.java
index 564bacd..3a96e08 100644
--- a/src/test/java/org/apache/commons/sanselan/sampleUsage/ImageReadExample.java
+++ b/src/test/java/org/apache/commons/sanselan/examples/ImageReadExample.java
@@ -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;
diff --git a/src/test/java/org/apache/commons/sanselan/sampleUsage/ImageWriteExample.java b/src/test/java/org/apache/commons/sanselan/examples/ImageWriteExample.java
similarity index 97%
rename from src/test/java/org/apache/commons/sanselan/sampleUsage/ImageWriteExample.java
rename to src/test/java/org/apache/commons/sanselan/examples/ImageWriteExample.java
index e8895a5..f7671be 100644
--- a/src/test/java/org/apache/commons/sanselan/sampleUsage/ImageWriteExample.java
+++ b/src/test/java/org/apache/commons/sanselan/examples/ImageWriteExample.java
@@ -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;
diff --git a/src/test/java/org/apache/commons/sanselan/sampleUsage/MetadataExample.java b/src/test/java/org/apache/commons/sanselan/examples/MetadataExample.java
similarity index 99%
rename from src/test/java/org/apache/commons/sanselan/sampleUsage/MetadataExample.java
rename to src/test/java/org/apache/commons/sanselan/examples/MetadataExample.java
index f225bf6..886223e 100644
--- a/src/test/java/org/apache/commons/sanselan/sampleUsage/MetadataExample.java
+++ b/src/test/java/org/apache/commons/sanselan/examples/MetadataExample.java
@@ -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;
diff --git a/src/test/java/org/apache/commons/sanselan/sampleUsage/SampleUsage.java b/src/test/java/org/apache/commons/sanselan/examples/SampleUsage.java
similarity index 98%
rename from src/test/java/org/apache/commons/sanselan/sampleUsage/SampleUsage.java
rename to src/test/java/org/apache/commons/sanselan/examples/SampleUsage.java
index 73720bd..961782b 100644
--- a/src/test/java/org/apache/commons/sanselan/sampleUsage/SampleUsage.java
+++ b/src/test/java/org/apache/commons/sanselan/examples/SampleUsage.java
@@ -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;
diff --git a/src/test/java/org/apache/commons/sanselan/sampleUsage/WriteExifMetadataExample.java b/src/test/java/org/apache/commons/sanselan/examples/WriteExifMetadataExample.java
similarity index 98%
rename from src/test/java/org/apache/commons/sanselan/sampleUsage/WriteExifMetadataExample.java
rename to src/test/java/org/apache/commons/sanselan/examples/WriteExifMetadataExample.java
index b29ad84..a79bece 100644
--- a/src/test/java/org/apache/commons/sanselan/sampleUsage/WriteExifMetadataExample.java
+++ b/src/test/java/org/apache/commons/sanselan/examples/WriteExifMetadataExample.java
@@ -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.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 @@
{
// 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;
}
diff --git a/src/test/java/org/apache/commons/sanselan/formats/bmp/BmpRoundtripTest.java b/src/test/java/org/apache/commons/sanselan/formats/bmp/BmpRoundtripTest.java
index e61de37..1dcf723 100644
--- a/src/test/java/org/apache/commons/sanselan/formats/bmp/BmpRoundtripTest.java
+++ b/src/test/java/org/apache/commons/sanselan/formats/bmp/BmpRoundtripTest.java
@@ -29,7 +29,7 @@
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 @@
// Debug.debug("bytes", bytes);
File tempFile = createTempFile("temp", ".bmp");
- IOUtils.writeToFile(bytes, tempFile);
+ IoUtils.writeToFile(bytes, tempFile);
BufferedImage dstImage = Sanselan.getBufferedImage(bytes);
diff --git a/src/test/java/org/apache/commons/sanselan/formats/icns/IcnsRoundTripTest.java b/src/test/java/org/apache/commons/sanselan/formats/icns/IcnsRoundTripTest.java
index 2dedcb9..3a0240e 100644
--- a/src/test/java/org/apache/commons/sanselan/formats/icns/IcnsRoundTripTest.java
+++ b/src/test/java/org/apache/commons/sanselan/formats/icns/IcnsRoundTripTest.java
@@ -29,7 +29,7 @@
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 @@
{
// 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);
diff --git a/src/test/java/org/apache/commons/sanselan/formats/ico/IcoRoundtripTest.java b/src/test/java/org/apache/commons/sanselan/formats/ico/IcoRoundtripTest.java
index b65f505..7853c16 100644
--- a/src/test/java/org/apache/commons/sanselan/formats/ico/IcoRoundtripTest.java
+++ b/src/test/java/org/apache/commons/sanselan/formats/ico/IcoRoundtripTest.java
@@ -30,7 +30,7 @@
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 @@
{
// 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);
diff --git a/src/test/java/org/apache/commons/sanselan/formats/jpeg/exif/ExifRewriteTest.java b/src/test/java/org/apache/commons/sanselan/formats/jpeg/exif/ExifRewriteTest.java
index 52181b6..644c2d8 100644
--- a/src/test/java/org/apache/commons/sanselan/formats/jpeg/exif/ExifRewriteTest.java
+++ b/src/test/java/org/apache/commons/sanselan/formats/jpeg/exif/ExifRewriteTest.java
@@ -42,7 +42,7 @@
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 @@
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 @@
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 @@
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 @@
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));
diff --git a/src/test/java/org/apache/commons/sanselan/formats/jpeg/exif/WriteExifMetadataExampleTest.java b/src/test/java/org/apache/commons/sanselan/formats/jpeg/exif/WriteExifMetadataExampleTest.java
index 4225704..033812f 100644
--- a/src/test/java/org/apache/commons/sanselan/formats/jpeg/exif/WriteExifMetadataExampleTest.java
+++ b/src/test/java/org/apache/commons/sanselan/formats/jpeg/exif/WriteExifMetadataExampleTest.java
@@ -23,9 +23,9 @@
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
diff --git a/src/test/java/org/apache/commons/sanselan/formats/jpeg/iptc/IptcDumpTest.java b/src/test/java/org/apache/commons/sanselan/formats/jpeg/iptc/IptcDumpTest.java
index 378f088..2dd925e 100644
--- a/src/test/java/org/apache/commons/sanselan/formats/jpeg/iptc/IptcDumpTest.java
+++ b/src/test/java/org/apache/commons/sanselan/formats/jpeg/iptc/IptcDumpTest.java
@@ -27,8 +27,8 @@
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 @@
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);
diff --git a/src/test/java/org/apache/commons/sanselan/formats/jpeg/iptc/IptcUpdateTest.java b/src/test/java/org/apache/commons/sanselan/formats/jpeg/iptc/IptcUpdateTest.java
index 42152eb..3993f12 100644
--- a/src/test/java/org/apache/commons/sanselan/formats/jpeg/iptc/IptcUpdateTest.java
+++ b/src/test/java/org/apache/commons/sanselan/formats/jpeg/iptc/IptcUpdateTest.java
@@ -33,8 +33,8 @@
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 @@
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 @@
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 @@
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 @@
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,
diff --git a/src/test/java/org/apache/commons/sanselan/formats/png/PngTextTest.java b/src/test/java/org/apache/commons/sanselan/formats/png/PngTextTest.java
index 6a56625..c908315 100644
--- a/src/test/java/org/apache/commons/sanselan/formats/png/PngTextTest.java
+++ b/src/test/java/org/apache/commons/sanselan/formats/png/PngTextTest.java
@@ -33,7 +33,7 @@
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 @@
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);
diff --git a/src/test/java/org/apache/commons/sanselan/formats/png/PngWriteReadTest.java b/src/test/java/org/apache/commons/sanselan/formats/png/PngWriteReadTest.java
index a63a503..342a361 100644
--- a/src/test/java/org/apache/commons/sanselan/formats/png/PngWriteReadTest.java
+++ b/src/test/java/org/apache/commons/sanselan/formats/png/PngWriteReadTest.java
@@ -29,7 +29,7 @@
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 @@
// Debug.debug("bytes", bytes);
File tempFile = createTempFile("temp", ".png");
- IOUtils.writeToFile(bytes, tempFile);
+ IoUtils.writeToFile(bytes, tempFile);
BufferedImage dstImage = Sanselan.getBufferedImage(bytes);
diff --git a/src/test/java/org/apache/commons/sanselan/formats/tiff/TiffLZWTest.java b/src/test/java/org/apache/commons/sanselan/formats/tiff/TiffLzwTest.java
similarity index 92%
rename from src/test/java/org/apache/commons/sanselan/formats/tiff/TiffLZWTest.java
rename to src/test/java/org/apache/commons/sanselan/formats/tiff/TiffLzwTest.java
index fb71f16..c9ad0e1 100644
--- a/src/test/java/org/apache/commons/sanselan/formats/tiff/TiffLZWTest.java
+++ b/src/test/java/org/apache/commons/sanselan/formats/tiff/TiffLzwTest.java
@@ -24,11 +24,11 @@
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 @@
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 @@
}
};
- 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 @@
};
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 @@
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 @@
};
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 @@
};
- 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);
diff --git a/src/test/java/org/apache/commons/sanselan/roundtrip/RoundtripTest.java b/src/test/java/org/apache/commons/sanselan/roundtrip/RoundtripTest.java
index 51fdb34..339f816 100644
--- a/src/test/java/org/apache/commons/sanselan/roundtrip/RoundtripTest.java
+++ b/src/test/java/org/apache/commons/sanselan/roundtrip/RoundtripTest.java
@@ -31,7 +31,7 @@
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 @@
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++)
{
diff --git a/src/test/java/org/apache/commons/sanselan/test/util/FSTraversal.java b/src/test/java/org/apache/commons/sanselan/test/util/FileSystemTraversal.java
similarity index 99%
rename from src/test/java/org/apache/commons/sanselan/test/util/FSTraversal.java
rename to src/test/java/org/apache/commons/sanselan/test/util/FileSystemTraversal.java
index bf050fd..e0bf3d0 100644
--- a/src/test/java/org/apache/commons/sanselan/test/util/FSTraversal.java
+++ b/src/test/java/org/apache/commons/sanselan/test/util/FileSystemTraversal.java
@@ -21,7 +21,7 @@
import org.apache.commons.sanselan.util.Debug;
-public class FSTraversal
+public class FileSystemTraversal
{
public static final int MODE_FILES = 1;
