MIssing @Overrides
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/sanselan/trunk@1308075 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/main/java/org/apache/commons/sanselan/FormatCompliance.java b/src/main/java/org/apache/commons/sanselan/FormatCompliance.java
index 230ca17..56096a7 100644
--- a/src/main/java/org/apache/commons/sanselan/FormatCompliance.java
+++ b/src/main/java/org/apache/commons/sanselan/FormatCompliance.java
@@ -57,6 +57,7 @@
addComment(s + ": " + getValueDescription(value));
}
+ @Override
public String toString()
{
StringWriter sw = new StringWriter();
diff --git a/src/main/java/org/apache/commons/sanselan/ImageFormat.java b/src/main/java/org/apache/commons/sanselan/ImageFormat.java
index 770832f..a82d284 100644
--- a/src/main/java/org/apache/commons/sanselan/ImageFormat.java
+++ b/src/main/java/org/apache/commons/sanselan/ImageFormat.java
@@ -36,6 +36,7 @@
actual = true;
}
+ @Override
public boolean equals(Object o)
{
if (!(o instanceof ImageFormat))
@@ -47,11 +48,13 @@
}
+ @Override
public String toString()
{
return "{" + name + ": " + extension + "}";
}
+ @Override
public int hashCode()
{
return name.hashCode();
diff --git a/src/main/java/org/apache/commons/sanselan/ImageInfo.java b/src/main/java/org/apache/commons/sanselan/ImageInfo.java
index 11fa62b..a6f90cd 100644
--- a/src/main/java/org/apache/commons/sanselan/ImageInfo.java
+++ b/src/main/java/org/apache/commons/sanselan/ImageInfo.java
@@ -292,6 +292,7 @@
System.out.print(toString());
}
+ @Override
public String toString()
{
try
diff --git a/src/main/java/org/apache/commons/sanselan/color/ColorCieLab.java b/src/main/java/org/apache/commons/sanselan/color/ColorCieLab.java
index 26cb8e3..5ba5be9 100644
--- a/src/main/java/org/apache/commons/sanselan/color/ColorCieLab.java
+++ b/src/main/java/org/apache/commons/sanselan/color/ColorCieLab.java
@@ -27,6 +27,7 @@
this.b = b;
}
+ @Override
public final String toString()
{
return "{L: " + L + ", a: " + a + ", b: " + b + "}";
diff --git a/src/main/java/org/apache/commons/sanselan/color/ColorCieLch.java b/src/main/java/org/apache/commons/sanselan/color/ColorCieLch.java
index 4ec5d07..93abd68 100644
--- a/src/main/java/org/apache/commons/sanselan/color/ColorCieLch.java
+++ b/src/main/java/org/apache/commons/sanselan/color/ColorCieLch.java
@@ -27,6 +27,7 @@
this.H = H;
}
+ @Override
public String toString()
{
return "{L: " + L + ", C: " + C + ", H: " + H + "}";
diff --git a/src/main/java/org/apache/commons/sanselan/color/ColorCieLuv.java b/src/main/java/org/apache/commons/sanselan/color/ColorCieLuv.java
index be289fa..c847072 100644
--- a/src/main/java/org/apache/commons/sanselan/color/ColorCieLuv.java
+++ b/src/main/java/org/apache/commons/sanselan/color/ColorCieLuv.java
@@ -27,6 +27,7 @@
this.v = v;
}
+ @Override
public String toString()
{
return "{L: " + L + ", u: " + u + ", v: " + v + "}";
diff --git a/src/main/java/org/apache/commons/sanselan/color/ColorCmy.java b/src/main/java/org/apache/commons/sanselan/color/ColorCmy.java
index b3c8339..9eebc07 100644
--- a/src/main/java/org/apache/commons/sanselan/color/ColorCmy.java
+++ b/src/main/java/org/apache/commons/sanselan/color/ColorCmy.java
@@ -27,6 +27,7 @@
this.Y = Y;
}
+ @Override
public final String toString()
{
return "{C: " + C + ", M: " + M + ", Y: " + Y + "}";
diff --git a/src/main/java/org/apache/commons/sanselan/color/ColorCmyk.java b/src/main/java/org/apache/commons/sanselan/color/ColorCmyk.java
index 2cb93c1..a4c1b6e 100644
--- a/src/main/java/org/apache/commons/sanselan/color/ColorCmyk.java
+++ b/src/main/java/org/apache/commons/sanselan/color/ColorCmyk.java
@@ -28,6 +28,7 @@
this.K = K;
}
+ @Override
public final String toString()
{
return "{C: " + C + ", M: " + M + ", Y: " + Y + ", K: " + K + "}";
diff --git a/src/main/java/org/apache/commons/sanselan/color/ColorHsl.java b/src/main/java/org/apache/commons/sanselan/color/ColorHsl.java
index 5c6517f..29d8412 100644
--- a/src/main/java/org/apache/commons/sanselan/color/ColorHsl.java
+++ b/src/main/java/org/apache/commons/sanselan/color/ColorHsl.java
@@ -27,6 +27,7 @@
L = v;
}
+ @Override
public final String toString()
{
return "{H: " + H + ", S: " + S + ", L: " + L + "}";
diff --git a/src/main/java/org/apache/commons/sanselan/color/ColorHsv.java b/src/main/java/org/apache/commons/sanselan/color/ColorHsv.java
index f8db2ea..862bf3d 100644
--- a/src/main/java/org/apache/commons/sanselan/color/ColorHsv.java
+++ b/src/main/java/org/apache/commons/sanselan/color/ColorHsv.java
@@ -27,6 +27,7 @@
V = v;
}
+ @Override
public final String toString()
{
return "{H: " + H + ", S: " + S + ", V: " + V + "}";
diff --git a/src/main/java/org/apache/commons/sanselan/color/ColorHunterLab.java b/src/main/java/org/apache/commons/sanselan/color/ColorHunterLab.java
index e8eae7f..e315f62 100644
--- a/src/main/java/org/apache/commons/sanselan/color/ColorHunterLab.java
+++ b/src/main/java/org/apache/commons/sanselan/color/ColorHunterLab.java
@@ -27,6 +27,7 @@
this.b = b;
}
+ @Override
public final String toString()
{
return "{L: " + L + ", a: " + a + ", b: " + b + "}";
diff --git a/src/main/java/org/apache/commons/sanselan/color/ColorXyz.java b/src/main/java/org/apache/commons/sanselan/color/ColorXyz.java
index 2cf7077..1f48f4a 100644
--- a/src/main/java/org/apache/commons/sanselan/color/ColorXyz.java
+++ b/src/main/java/org/apache/commons/sanselan/color/ColorXyz.java
@@ -27,6 +27,7 @@
Z = z;
}
+ @Override
public final String toString()
{
return "{X: " + X + ", Y: " + Y + ", Z: " + Z + "}";
diff --git a/src/main/java/org/apache/commons/sanselan/common/BinaryInputStream.java b/src/main/java/org/apache/commons/sanselan/common/BinaryInputStream.java
index d682202..0012bd1 100644
--- a/src/main/java/org/apache/commons/sanselan/common/BinaryInputStream.java
+++ b/src/main/java/org/apache/commons/sanselan/common/BinaryInputStream.java
@@ -83,6 +83,7 @@
return byteOrder;
}
+ @Override
public int read() throws IOException
{
return is.read();
diff --git a/src/main/java/org/apache/commons/sanselan/common/BinaryOutputStream.java b/src/main/java/org/apache/commons/sanselan/common/BinaryOutputStream.java
index 9e54500..5c92e2d 100644
--- a/src/main/java/org/apache/commons/sanselan/common/BinaryOutputStream.java
+++ b/src/main/java/org/apache/commons/sanselan/common/BinaryOutputStream.java
@@ -76,6 +76,7 @@
return byteOrder;
}
+ @Override
public void write(int i) throws IOException
{
os.write(i);
diff --git a/src/main/java/org/apache/commons/sanselan/common/BitInputStream.java b/src/main/java/org/apache/commons/sanselan/common/BitInputStream.java
index 49fef0b..b5f740b 100644
--- a/src/main/java/org/apache/commons/sanselan/common/BitInputStream.java
+++ b/src/main/java/org/apache/commons/sanselan/common/BitInputStream.java
@@ -32,6 +32,7 @@
// super(is);
}
+ @Override
public int read() throws IOException
{
if (cacheBitsRemaining > 0)
diff --git a/src/main/java/org/apache/commons/sanselan/common/BitInputStreamFlexible.java b/src/main/java/org/apache/commons/sanselan/common/BitInputStreamFlexible.java
index c555370..d846eba 100644
--- a/src/main/java/org/apache/commons/sanselan/common/BitInputStreamFlexible.java
+++ b/src/main/java/org/apache/commons/sanselan/common/BitInputStreamFlexible.java
@@ -33,6 +33,7 @@
// super(is);
}
+ @Override
public int read() throws IOException
{
if (cacheBitsRemaining > 0)
diff --git a/src/main/java/org/apache/commons/sanselan/common/ImageMetadata.java b/src/main/java/org/apache/commons/sanselan/common/ImageMetadata.java
index 87c9a79..bdf6419 100644
--- a/src/main/java/org/apache/commons/sanselan/common/ImageMetadata.java
+++ b/src/main/java/org/apache/commons/sanselan/common/ImageMetadata.java
@@ -40,6 +40,7 @@
protected static final String newline = System.getProperty("line.separator");
+ @Override
public String toString()
{
return toString(null);
@@ -89,6 +90,7 @@
return text;
}
+ @Override
public String toString()
{
return toString(null);
diff --git a/src/main/java/org/apache/commons/sanselan/common/MyByteArrayOutputStream.java b/src/main/java/org/apache/commons/sanselan/common/MyByteArrayOutputStream.java
index 91546ad..e28f14f 100644
--- a/src/main/java/org/apache/commons/sanselan/common/MyByteArrayOutputStream.java
+++ b/src/main/java/org/apache/commons/sanselan/common/MyByteArrayOutputStream.java
@@ -31,6 +31,7 @@
private int count = 0;
+ @Override
public void write(int value) throws IOException
{
if (count >= bytes.length)
diff --git a/src/main/java/org/apache/commons/sanselan/common/RationalNumber.java b/src/main/java/org/apache/commons/sanselan/common/RationalNumber.java
index 361210c..7963c3b 100644
--- a/src/main/java/org/apache/commons/sanselan/common/RationalNumber.java
+++ b/src/main/java/org/apache/commons/sanselan/common/RationalNumber.java
@@ -79,21 +79,25 @@
return new RationalNumber(-numerator, divisor);
}
+ @Override
public double doubleValue()
{
return (double) numerator / (double) divisor;
}
+ @Override
public float floatValue()
{
return (float) numerator / (float) divisor;
}
+ @Override
public int intValue()
{
return numerator / divisor;
}
+ @Override
public long longValue()
{
return (long) numerator / (long) divisor;
@@ -106,6 +110,7 @@
private static final NumberFormat nf = DecimalFormat.getInstance();
+ @Override
public String toString()
{
if (divisor == 0)
diff --git a/src/main/java/org/apache/commons/sanselan/common/RationalNumberUtilities.java b/src/main/java/org/apache/commons/sanselan/common/RationalNumberUtilities.java
index 7a7a58c..1d5e8c8 100644
--- a/src/main/java/org/apache/commons/sanselan/common/RationalNumberUtilities.java
+++ b/src/main/java/org/apache/commons/sanselan/common/RationalNumberUtilities.java
@@ -38,6 +38,7 @@
- value));
}
+ @Override
public String toString()
{
return rationalNumber.toString();
diff --git a/src/main/java/org/apache/commons/sanselan/common/bytesource/ByteSourceArray.java b/src/main/java/org/apache/commons/sanselan/common/bytesource/ByteSourceArray.java
index 5b967b2..0e67ce9 100644
--- a/src/main/java/org/apache/commons/sanselan/common/bytesource/ByteSourceArray.java
+++ b/src/main/java/org/apache/commons/sanselan/common/bytesource/ByteSourceArray.java
@@ -36,11 +36,13 @@
this.bytes = bytes;
}
+ @Override
public InputStream getInputStream()
{
return new ByteArrayInputStream(bytes);
}
+ @Override
public byte[] getBlock(int start, int length) throws IOException
{
// We include a separate check for int overflow.
@@ -55,16 +57,19 @@
return result;
}
+ @Override
public long getLength()
{
return bytes.length;
}
+ @Override
public byte[] getAll() throws IOException
{
return bytes;
}
+ @Override
public String getDescription()
{
return bytes.length + " byte array";
diff --git a/src/main/java/org/apache/commons/sanselan/common/bytesource/ByteSourceFile.java b/src/main/java/org/apache/commons/sanselan/common/bytesource/ByteSourceFile.java
index c862282..458fdd9 100644
--- a/src/main/java/org/apache/commons/sanselan/common/bytesource/ByteSourceFile.java
+++ b/src/main/java/org/apache/commons/sanselan/common/bytesource/ByteSourceFile.java
@@ -36,6 +36,7 @@
this.file = file;
}
+ @Override
public InputStream getInputStream() throws IOException
{
FileInputStream is = null;
@@ -45,6 +46,7 @@
return bis;
}
+ @Override
public byte[] getBlock(int start, int length) throws IOException
{
@@ -79,11 +81,13 @@
}
}
+ @Override
public long getLength()
{
return file.length();
}
+ @Override
public byte[] getAll() throws IOException
{
ByteArrayOutputStream baos = new ByteArrayOutputStream();
@@ -115,6 +119,7 @@
}
}
+ @Override
public String getDescription()
{
return "File: '" + file.getAbsolutePath() + "'";
diff --git a/src/main/java/org/apache/commons/sanselan/common/bytesource/ByteSourceInputStream.java b/src/main/java/org/apache/commons/sanselan/common/bytesource/ByteSourceInputStream.java
index b91c693..4e10242 100644
--- a/src/main/java/org/apache/commons/sanselan/common/bytesource/ByteSourceInputStream.java
+++ b/src/main/java/org/apache/commons/sanselan/common/bytesource/ByteSourceInputStream.java
@@ -96,6 +96,7 @@
private boolean readFirst = false;
private int blockIndex = 0;
+ @Override
public int read() throws IOException
{
if (null == block)
@@ -121,6 +122,7 @@
return 0xff & block.bytes[blockIndex++];
}
+ @Override
public int read(byte b[], int off, int len) throws IOException
{
// first section copied verbatim from InputStream
@@ -162,11 +164,13 @@
}
+ @Override
public InputStream getInputStream() throws IOException
{
return new CacheReadingInputStream();
}
+ @Override
public byte[] getBlock(int blockStart, int blockLength) throws IOException
{
// We include a separate check for int overflow.
@@ -197,6 +201,7 @@
private Long streamLength = null;
+ @Override
public long getLength() throws IOException
{
if (streamLength != null)
@@ -211,6 +216,7 @@
return result;
}
+ @Override
public byte[] getAll() throws IOException
{
ByteArrayOutputStream baos = new ByteArrayOutputStream();
@@ -224,6 +230,7 @@
return baos.toByteArray();
}
+ @Override
public String getDescription()
{
return "Inputstream: '" + filename + "'";
diff --git a/src/main/java/org/apache/commons/sanselan/common/mylzw/BitsToByteInputStream.java b/src/main/java/org/apache/commons/sanselan/common/mylzw/BitsToByteInputStream.java
index 914f829..6ae9697 100644
--- a/src/main/java/org/apache/commons/sanselan/common/mylzw/BitsToByteInputStream.java
+++ b/src/main/java/org/apache/commons/sanselan/common/mylzw/BitsToByteInputStream.java
@@ -30,6 +30,7 @@
this.desiredDepth = desiredDepth;
}
+ @Override
public int read() throws IOException
{
return readBits(8);
diff --git a/src/main/java/org/apache/commons/sanselan/common/mylzw/MyBitInputStream.java b/src/main/java/org/apache/commons/sanselan/common/mylzw/MyBitInputStream.java
index d4c0c9c..1ffd884 100644
--- a/src/main/java/org/apache/commons/sanselan/common/mylzw/MyBitInputStream.java
+++ b/src/main/java/org/apache/commons/sanselan/common/mylzw/MyBitInputStream.java
@@ -33,6 +33,7 @@
this.is = is;
}
+ @Override
public int read() throws IOException
{
return readBits(8);
diff --git a/src/main/java/org/apache/commons/sanselan/common/mylzw/MyBitOutputStream.java b/src/main/java/org/apache/commons/sanselan/common/mylzw/MyBitOutputStream.java
index ee433b0..44c033c 100644
--- a/src/main/java/org/apache/commons/sanselan/common/mylzw/MyBitOutputStream.java
+++ b/src/main/java/org/apache/commons/sanselan/common/mylzw/MyBitOutputStream.java
@@ -32,6 +32,7 @@
this.os = os;
}
+ @Override
public void write(int value) throws IOException
{
writeBits(value, 8);
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
index 5cbfddc..30f2452 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
@@ -126,11 +126,13 @@
hash = tempHash;
}
+ @Override
public final int hashCode()
{
return hash;
}
+ @Override
public final boolean equals(Object o)
{
if (o instanceof ByteArray) {
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 642b2dc..e5992f5 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
@@ -60,11 +60,13 @@
super.setByteOrder(BYTE_ORDER_INTEL);
}
+ @Override
public String getName()
{
return "Bmp-Custom";
}
+ @Override
public String getDefaultExtension()
{
return DEFAULT_EXTENSION;
@@ -74,11 +76,13 @@
private static final String ACCEPTED_EXTENSIONS[] = { DEFAULT_EXTENSION, };
+ @Override
protected String[] getAcceptedExtensions()
{
return ACCEPTED_EXTENSIONS;
}
+ @Override
protected ImageFormat[] getAcceptedTypes()
{
return new ImageFormat[] { ImageFormat.IMAGE_FORMAT_BMP, //
@@ -509,12 +513,14 @@
}
}
+ @Override
public byte[] getICCProfileBytes(ByteSource byteSource, Map params)
throws ImageReadException, IOException
{
return null;
}
+ @Override
public Dimension getImageSize(ByteSource byteSource, Map params)
throws ImageReadException, IOException
{
@@ -547,11 +553,13 @@
return null;
}
+ @Override
public boolean embedICCProfile(File src, File dst, byte profile[])
{
return false;
}
+ @Override
public IImageMetadata getMetadata(ByteSource byteSource, Map params)
throws ImageReadException, IOException
{
@@ -576,6 +584,7 @@
return "Unknown";
}
+ @Override
public ImageInfo getImageInfo(ByteSource byteSource, Map params)
throws ImageReadException, IOException
{
@@ -659,6 +668,7 @@
return result;
}
+ @Override
public boolean dumpImageFile(PrintWriter pw, ByteSource byteSource)
throws ImageReadException, IOException
{
@@ -675,6 +685,7 @@
return true;
}
+ @Override
public FormatCompliance getFormatCompliance(ByteSource byteSource)
throws ImageReadException, IOException
{
@@ -699,6 +710,7 @@
return result;
}
+ @Override
public BufferedImage getBufferedImage(ByteSource byteSource, Map params)
throws ImageReadException, IOException
{
@@ -767,6 +779,7 @@
private static final int BITMAP_FILE_HEADER_SIZE = 14;
private static final int BITMAP_INFO_HEADER_SIZE = 40;
+ @Override
public void writeImage(BufferedImage src, OutputStream os, Map params)
throws ImageWriteException, IOException
{
@@ -855,6 +868,7 @@
* Map of optional parameters, defined in SanselanConstants.
* @return Xmp Xml as String, if present. Otherwise, returns null.
*/
+ @Override
public String getXmpXml(ByteSource byteSource, Map params)
throws ImageReadException, IOException
{
diff --git a/src/main/java/org/apache/commons/sanselan/formats/bmp/pixelparsers/PixelParserBitFields.java b/src/main/java/org/apache/commons/sanselan/formats/bmp/pixelparsers/PixelParserBitFields.java
index 5b0c3eb..788daa9 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/bmp/pixelparsers/PixelParserBitFields.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/bmp/pixelparsers/PixelParserBitFields.java
@@ -72,6 +72,7 @@
}
private int bytecount = 0;
+ @Override
public int getNextRGB() throws ImageReadException, IOException
{
int data;
@@ -115,6 +116,7 @@
return rgb;
}
+ @Override
public void newline() throws ImageReadException, IOException
{
while (((bytecount) % 4) != 0)
diff --git a/src/main/java/org/apache/commons/sanselan/formats/bmp/pixelparsers/PixelParserRgb.java b/src/main/java/org/apache/commons/sanselan/formats/bmp/pixelparsers/PixelParserRgb.java
index b3e9eed..9b737e4 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/bmp/pixelparsers/PixelParserRgb.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/bmp/pixelparsers/PixelParserRgb.java
@@ -36,6 +36,7 @@
int pixelCount = 0;
+ @Override
public int getNextRGB() throws ImageReadException, IOException
{
pixelCount++;
@@ -115,6 +116,7 @@
+ bhi.bitsPerPixel);
}
+ @Override
public void newline() throws ImageReadException, IOException
{
cached_bit_count = 0;
diff --git a/src/main/java/org/apache/commons/sanselan/formats/bmp/pixelparsers/PixelParserRle.java b/src/main/java/org/apache/commons/sanselan/formats/bmp/pixelparsers/PixelParserRle.java
index 7d65ea2..672fc72 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/bmp/pixelparsers/PixelParserRle.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/bmp/pixelparsers/PixelParserRle.java
@@ -99,6 +99,7 @@
return pixels_written;
}
+ @Override
public void processImage(ImageBuilder imageBuilder) throws ImageReadException,
IOException
{
diff --git a/src/main/java/org/apache/commons/sanselan/formats/bmp/pixelparsers/PixelParserSimple.java b/src/main/java/org/apache/commons/sanselan/formats/bmp/pixelparsers/PixelParserSimple.java
index 4f3a650..29c7e53 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/bmp/pixelparsers/PixelParserSimple.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/bmp/pixelparsers/PixelParserSimple.java
@@ -34,6 +34,7 @@
public abstract void newline() throws ImageReadException, IOException;
+ @Override
public void processImage(ImageBuilder imageBuilder) throws ImageReadException,
IOException
{
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
index 32259f3..e12e0e2 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
@@ -40,16 +40,19 @@
bitsPerSample = 8;
}
+ @Override
public int getPaletteSize()
{
return palette.length();
}
+ @Override
public int getBitsPerPixel()
{
return bitsPerSample;
}
+ @Override
public void writePalette(BinaryOutputStream bos) throws IOException
{
for (int i = 0; i < palette.length(); i++)
@@ -67,6 +70,7 @@
}
}
+ @Override
public byte[] getImageData(BufferedImage src)
{
int width = src.getWidth();
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
index 3072841..9fb3231 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
@@ -31,21 +31,25 @@
// this.alpha = alpha;
// }
+ @Override
public int getPaletteSize()
{
return 0;
}
+ @Override
public int getBitsPerPixel()
{
// return alpha ? 32 : 24;
return 24;
}
+ @Override
public void writePalette(BinaryOutputStream bos) throws IOException
{
}
+ @Override
public byte[] getImageData(BufferedImage src)
{
int width = src.getWidth();
diff --git a/src/main/java/org/apache/commons/sanselan/formats/dcx/DcxImageParser.java b/src/main/java/org/apache/commons/sanselan/formats/dcx/DcxImageParser.java
index 099ca61..5d20bcc 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/dcx/DcxImageParser.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/dcx/DcxImageParser.java
@@ -49,11 +49,13 @@
super.setByteOrder(BYTE_ORDER_LSB);
}
+ @Override
public String getName()
{
return "Dcx-Custom";
}
+ @Override
public String getDefaultExtension()
{
return DEFAULT_EXTENSION;
@@ -64,11 +66,13 @@
".dcx",
};
+ @Override
protected String[] getAcceptedExtensions()
{
return ACCEPTED_EXTENSIONS;
}
+ @Override
protected ImageFormat[] getAcceptedTypes()
{
return new ImageFormat[]
@@ -77,23 +81,27 @@
};
}
+ @Override
public boolean embedICCProfile(File src, File dst, byte profile[])
{
return false;
}
+ @Override
public IImageMetadata getMetadata(ByteSource byteSource, Map params)
throws ImageReadException, IOException
{
return null;
}
+ @Override
public ImageInfo getImageInfo(ByteSource byteSource, Map params)
throws ImageReadException, IOException
{
return null;
}
+ @Override
public Dimension getImageSize(ByteSource byteSource,
Map params)
throws ImageReadException, IOException
@@ -101,6 +109,7 @@
return null;
}
+ @Override
public byte[] getICCProfileBytes(ByteSource byteSource,
Map params)
throws ImageReadException, IOException
@@ -175,6 +184,7 @@
}
}
+ @Override
public boolean dumpImageFile(PrintWriter pw, ByteSource byteSource)
throws ImageReadException, IOException
{
@@ -182,6 +192,7 @@
return true;
}
+ @Override
public final BufferedImage getBufferedImage(ByteSource byteSource,
Map params) throws ImageReadException, IOException
{
@@ -191,6 +202,7 @@
return list.get(0);
}
+ @Override
public List<BufferedImage> getAllBufferedImages(ByteSource byteSource)
throws ImageReadException, IOException
{
@@ -222,6 +234,7 @@
return images;
}
+ @Override
public void writeImage(BufferedImage src, OutputStream os, Map params)
throws ImageWriteException, IOException
{
@@ -270,6 +283,7 @@
* Map of optional parameters, defined in SanselanConstants.
* @return Xmp Xml as String, if present. Otherwise, returns null.
*/
+ @Override
public String getXmpXml(ByteSource byteSource, Map params)
throws ImageReadException, IOException
{
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 b10c749..311e774 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
@@ -56,11 +56,13 @@
super.setByteOrder(BYTE_ORDER_LSB);
}
+ @Override
public String getName()
{
return "Gif-Custom";
}
+ @Override
public String getDefaultExtension()
{
return DEFAULT_EXTENSION;
@@ -70,11 +72,13 @@
private static final String ACCEPTED_EXTENSIONS[] = { DEFAULT_EXTENSION, };
+ @Override
protected String[] getAcceptedExtensions()
{
return ACCEPTED_EXTENSIONS;
}
+ @Override
protected ImageFormat[] getAcceptedTypes()
{
return new ImageFormat[] { ImageFormat.IMAGE_FORMAT_GIF, //
@@ -511,12 +515,14 @@
}
}
+ @Override
public byte[] getICCProfileBytes(ByteSource byteSource, Map params)
throws ImageReadException, IOException
{
return null;
}
+ @Override
public Dimension getImageSize(ByteSource byteSource, Map params)
throws ImageReadException, IOException
{
@@ -543,11 +549,13 @@
return null;
}
+ @Override
public boolean embedICCProfile(File src, File dst, byte profile[])
{
return false;
}
+ @Override
public IImageMetadata getMetadata(ByteSource byteSource, Map params)
throws ImageReadException, IOException
{
@@ -572,6 +580,7 @@
return result;
}
+ @Override
public ImageInfo getImageInfo(ByteSource byteSource, Map params)
throws ImageReadException, IOException
{
@@ -636,6 +645,7 @@
return result;
}
+ @Override
public boolean dumpImageFile(PrintWriter pw, ByteSource byteSource)
throws ImageReadException, IOException
{
@@ -694,6 +704,7 @@
return result;
}
+ @Override
public FormatCompliance getFormatCompliance(ByteSource byteSource)
throws ImageReadException, IOException
{
@@ -705,6 +716,7 @@
return result;
}
+ @Override
public BufferedImage getBufferedImage(ByteSource byteSource, Map params)
throws ImageReadException, IOException
{
@@ -824,6 +836,7 @@
private static final int INTERLACE_FLAG_MASK = 1 << 6;
private static final int SORT_FLAG_MASK = 1 << 5;
+ @Override
public void writeImage(BufferedImage src, OutputStream os, Map params)
throws ImageWriteException, IOException
{
@@ -1096,6 +1109,7 @@
* Map of optional parameters, defined in SanselanConstants.
* @return Xmp Xml as String, if present. Otherwise, returns null.
*/
+ @Override
public String getXmpXml(ByteSource byteSource, Map params)
throws ImageReadException, IOException
{
diff --git a/src/main/java/org/apache/commons/sanselan/formats/icns/IcnsImageParser.java b/src/main/java/org/apache/commons/sanselan/formats/icns/IcnsImageParser.java
index c47d1fa..c2ab581 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/icns/IcnsImageParser.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/icns/IcnsImageParser.java
@@ -48,11 +48,13 @@
super.setByteOrder(BYTE_ORDER_MSB);
}
+ @Override
public String getName()
{
return "icns-Custom";
}
+ @Override
public String getDefaultExtension()
{
return DEFAULT_EXTENSION;
@@ -64,11 +66,13 @@
".icns",
};
+ @Override
protected String[] getAcceptedExtensions()
{
return ACCEPTED_EXTENSIONS;
}
+ @Override
protected ImageFormat[] getAcceptedTypes()
{
return new ImageFormat[]{
@@ -76,17 +80,20 @@
};
}
+ @Override
public boolean embedICCProfile(File src, File dst, byte profile[])
{
return false;
}
+ @Override
public IImageMetadata getMetadata(ByteSource byteSource, Map params)
throws ImageReadException, IOException
{
return null;
}
+ @Override
public ImageInfo getImageInfo(ByteSource byteSource, Map params)
throws ImageReadException, IOException
{
@@ -116,6 +123,7 @@
ImageInfo.COMPRESSION_ALGORITHM_UNKNOWN);
}
+ @Override
public Dimension getImageSize(ByteSource byteSource,
Map params)
throws ImageReadException, IOException
@@ -143,6 +151,7 @@
return new Dimension(image0.getWidth(), image0.getHeight());
}
+ @Override
public byte[] getICCProfileBytes(ByteSource byteSource,
Map params)
throws ImageReadException, IOException
@@ -274,6 +283,7 @@
}
}
+ @Override
public boolean dumpImageFile(PrintWriter pw, ByteSource byteSource)
throws ImageReadException, IOException
{
@@ -284,6 +294,7 @@
return true;
}
+ @Override
public final BufferedImage getBufferedImage(ByteSource byteSource,
Map params) throws ImageReadException, IOException
{
@@ -295,6 +306,7 @@
throw new ImageReadException("No icons in ICNS file");
}
+ @Override
public List<BufferedImage> getAllBufferedImages(ByteSource byteSource)
throws ImageReadException, IOException
{
@@ -302,6 +314,7 @@
return IcnsDecoder.decodeAllImages(icnsContents.icnsElements);
}
+ @Override
public void writeImage(BufferedImage src, OutputStream os, Map params)
throws ImageWriteException, IOException
{
@@ -373,6 +386,7 @@
* Map of optional parameters, defined in SanselanConstants.
* @return Xmp Xml as String, if present. Otherwise, returns null.
*/
+ @Override
public String getXmpXml(ByteSource byteSource, Map params)
throws ImageReadException, IOException
{
diff --git a/src/main/java/org/apache/commons/sanselan/formats/icns/IcnsType.java b/src/main/java/org/apache/commons/sanselan/formats/icns/IcnsType.java
index 62d4fb2..989d558 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/icns/IcnsType.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/icns/IcnsType.java
@@ -132,6 +132,7 @@
return hasMask;
}
+ @Override
public String toString()
{
return getClass().getName() + "[" +
diff --git a/src/main/java/org/apache/commons/sanselan/formats/ico/IcoImageParser.java b/src/main/java/org/apache/commons/sanselan/formats/ico/IcoImageParser.java
index d222a6e..f66f9ca 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/ico/IcoImageParser.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/ico/IcoImageParser.java
@@ -52,11 +52,13 @@
super.setByteOrder(BYTE_ORDER_LSB);
}
+ @Override
public String getName()
{
return "ico-Custom";
}
+ @Override
public String getDefaultExtension()
{
return DEFAULT_EXTENSION;
@@ -68,11 +70,13 @@
".ico", ".cur",
};
+ @Override
protected String[] getAcceptedExtensions()
{
return ACCEPTED_EXTENSIONS;
}
+ @Override
protected ImageFormat[] getAcceptedTypes()
{
return new ImageFormat[]{
@@ -80,23 +84,27 @@
};
}
+ @Override
public boolean embedICCProfile(File src, File dst, byte profile[])
{
return false;
}
+ @Override
public IImageMetadata getMetadata(ByteSource byteSource, Map params)
throws ImageReadException, IOException
{
return null;
}
+ @Override
public ImageInfo getImageInfo(ByteSource byteSource, Map params)
throws ImageReadException, IOException
{
return null;
}
+ @Override
public Dimension getImageSize(ByteSource byteSource,
Map params)
throws ImageReadException, IOException
@@ -104,6 +112,7 @@
return null;
}
+ @Override
public byte[] getICCProfileBytes(ByteSource byteSource,
Map params)
throws ImageReadException, IOException
@@ -290,11 +299,13 @@
this.bufferedImage = bufferedImage;
}
+ @Override
public BufferedImage readBufferedImage() throws ImageReadException
{
return bufferedImage;
}
+ @Override
protected void dumpSubclass(PrintWriter pw)
{
pw.println("BitmapIconData");
@@ -313,11 +324,13 @@
this.bufferedImage = bufferedImage;
}
+ @Override
public BufferedImage readBufferedImage()
{
return bufferedImage;
}
+ @Override
protected void dumpSubclass(PrintWriter pw)
{
pw.println("PNGIconData");
@@ -541,6 +554,7 @@
}
}
+ @Override
public boolean dumpImageFile(PrintWriter pw, ByteSource byteSource)
throws ImageReadException, IOException
{
@@ -551,6 +565,7 @@
return true;
}
+ @Override
public final BufferedImage getBufferedImage(ByteSource byteSource,
Map params) throws ImageReadException, IOException
{
@@ -562,6 +577,7 @@
throw new ImageReadException("No icons in ICO file");
}
+ @Override
public List<BufferedImage> getAllBufferedImages(ByteSource byteSource)
throws ImageReadException, IOException
{
@@ -605,6 +621,7 @@
// return true;
// }
+ @Override
public void writeImage(BufferedImage src, OutputStream os, Map params)
throws ImageWriteException, IOException
{
@@ -805,6 +822,7 @@
* Map of optional parameters, defined in SanselanConstants.
* @return Xmp Xml as String, if present. Otherwise, returns null.
*/
+ @Override
public String getXmpXml(ByteSource byteSource, Map params)
throws ImageReadException, IOException {
return null;
diff --git a/src/main/java/org/apache/commons/sanselan/formats/jpeg/JpegImageMetadata.java b/src/main/java/org/apache/commons/sanselan/formats/jpeg/JpegImageMetadata.java
index 362bc7a..02df5d5 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/jpeg/JpegImageMetadata.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/jpeg/JpegImageMetadata.java
@@ -178,6 +178,7 @@
private static final String newline = System.getProperty("line.separator");
+ @Override
public String toString() {
return toString(null);
}
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 5e6957e..7869fac 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
@@ -63,17 +63,20 @@
// setDebug(true);
}
+ @Override
protected ImageFormat[] getAcceptedTypes()
{
return new ImageFormat[] { ImageFormat.IMAGE_FORMAT_JPEG, //
};
}
+ @Override
public String getName()
{
return "Jpeg-Custom";
}
+ @Override
public String getDefaultExtension()
{
return DEFAULT_EXTENSION;
@@ -83,11 +86,13 @@
private static final String ACCEPTED_EXTENSIONS[] = { ".jpg", ".jpeg", };
+ @Override
protected String[] getAcceptedExtensions()
{
return ACCEPTED_EXTENSIONS;
}
+ @Override
public final BufferedImage getBufferedImage(ByteSource byteSource,
Map params) throws ImageReadException, IOException
{
@@ -284,6 +289,7 @@
return readSegments(byteSource, markers, returnAfterFirst, false);
}
+ @Override
public byte[] getICCProfileBytes(ByteSource byteSource, Map params)
throws ImageReadException, IOException
{
@@ -317,6 +323,7 @@
return (bytes);
}
+ @Override
public IImageMetadata getMetadata(ByteSource byteSource, Map params)
throws ImageReadException, IOException
{
@@ -541,6 +548,7 @@
* Map of optional parameters, defined in SanselanConstants.
* @return Xmp Xml as String, if present. Otherwise, returns null.
*/
+ @Override
public String getXmpXml(ByteSource byteSource, Map params)
throws ImageReadException, IOException
{
@@ -618,6 +626,7 @@
return new JpegPhotoshopMetadata(photoshopApp13Data);
}
+ @Override
public Dimension getImageSize(ByteSource byteSource, Map params)
throws ImageReadException, IOException
{
@@ -647,11 +656,13 @@
return null;
}
+ @Override
public boolean embedICCProfile(File src, File dst, byte profile[])
{
return false;
}
+ @Override
public ImageInfo getImageInfo(ByteSource byteSource, Map params)
throws ImageReadException, IOException
{
@@ -1005,6 +1016,7 @@
// return result;
// }
+ @Override
public boolean dumpImageFile(PrintWriter pw, ByteSource byteSource)
throws ImageReadException, IOException
{
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 6e07537..101d255 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
@@ -103,6 +103,7 @@
this.segmentData = segmentData;
}
+ @Override
protected void write(OutputStream os) throws IOException
{
os.write(markerBytes);
@@ -134,6 +135,7 @@
this.imageData = imageData;
}
+ @Override
protected void write(OutputStream os) throws IOException
{
os.write(markerBytes);
diff --git a/src/main/java/org/apache/commons/sanselan/formats/jpeg/iptc/IptcTypes.java b/src/main/java/org/apache/commons/sanselan/formats/jpeg/iptc/IptcTypes.java
index 10fd71a..4e4825d 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/jpeg/iptc/IptcTypes.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/jpeg/iptc/IptcTypes.java
@@ -133,6 +133,7 @@
return type;
}
+ @Override
public String toString()
{
return name + " (" + type + ")";
@@ -148,6 +149,7 @@
return type;
}
+ @Override
public String toString() {
return "Unknown (" + type + ")";
}
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
index 73942da..6a180e8 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
@@ -29,6 +29,7 @@
super(marker, marker_length, is);
}
+ @Override
public String getDescription()
{
return "APPN (APP" + (marker - JpegImageParser.JPEG_APP0_Marker)
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
index 329b25a..2ffc62a 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
@@ -45,6 +45,7 @@
System.out.println("");
}
+ @Override
public String getDescription()
{
String commentString = "";
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
index b1444e1..1891050 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
@@ -160,6 +160,7 @@
}
}
+ @Override
public String getDescription()
{
return "DHT (" + getSegmentType() + ")";
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
index 734ac3c..2ee5960 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
@@ -89,6 +89,7 @@
}
}
+ @Override
public String getDescription()
{
return "DQT (" + getSegmentType() + ")";
diff --git a/src/main/java/org/apache/commons/sanselan/formats/jpeg/segments/GenericSegment.java b/src/main/java/org/apache/commons/sanselan/formats/jpeg/segments/GenericSegment.java
index f54a6bf..0d3cc79 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/jpeg/segments/GenericSegment.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/jpeg/segments/GenericSegment.java
@@ -40,6 +40,7 @@
this.bytes = bytes;
}
+ @Override
public void dump(PrintWriter pw)
{
dump(pw, 0);
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
index b701f3d..e7081f8 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
@@ -35,6 +35,7 @@
public final int yThumbnail;
public final int thumbnailSize;
+ @Override
public String getDescription()
{
return "JFIF (" + getSegmentType() + ")";
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 473fbe2..40603ad 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
@@ -39,6 +39,7 @@
public abstract String getDescription();
+ @Override
public String toString()
{
return "[Segment: " + getDescription() + "]";
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
index 1042e6c..df9590b 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
@@ -89,6 +89,7 @@
System.out.println("");
}
+ @Override
public String getDescription()
{
return "SOFN (SOF" + (marker - JpegImageParser.SOF0Marker) + ") ("
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
index 4632ae8..9a8e5cd 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
@@ -103,6 +103,7 @@
System.out.println("");
}
+ @Override
public String getDescription()
{
return "SOS (" + getSegmentType() + ")";
diff --git a/src/main/java/org/apache/commons/sanselan/formats/jpeg/segments/UnknownSegment.java b/src/main/java/org/apache/commons/sanselan/formats/jpeg/segments/UnknownSegment.java
index f10c3ba..df44fa3 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/jpeg/segments/UnknownSegment.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/jpeg/segments/UnknownSegment.java
@@ -32,6 +32,7 @@
super(marker, bytes);
}
+ @Override
public String getDescription()
{
return "Unknown (" + getSegmentType() + ")";
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 758f6bc..12e4293 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
@@ -67,6 +67,7 @@
{
protected abstract void write(OutputStream os) throws IOException;
+ @Override
public String toString()
{
return "[" + this.getClass().getName() + "]";
@@ -96,11 +97,13 @@
this.segmentData = segmentData;
}
+ @Override
public String toString()
{
return "[" + this.getClass().getName() + " (0x" + Integer.toHexString(marker) + ")]";
}
+ @Override
protected void write(OutputStream os) throws IOException
{
os.write(markerBytes);
@@ -160,6 +163,7 @@
this.imageData = imageData;
}
+ @Override
protected void write(OutputStream os) throws IOException
{
os.write(markerBytes);
diff --git a/src/main/java/org/apache/commons/sanselan/formats/pcx/PcxImageParser.java b/src/main/java/org/apache/commons/sanselan/formats/pcx/PcxImageParser.java
index 1f83ac1..51ff7c2 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/pcx/PcxImageParser.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/pcx/PcxImageParser.java
@@ -64,11 +64,13 @@
super.setByteOrder(BYTE_ORDER_LSB);
}
+ @Override
public String getName()
{
return "Pcx-Custom";
}
+ @Override
public String getDefaultExtension()
{
return DEFAULT_EXTENSION;
@@ -79,11 +81,13 @@
".pcx", ".pcc",
};
+ @Override
protected String[] getAcceptedExtensions()
{
return ACCEPTED_EXTENSIONS;
}
+ @Override
protected ImageFormat[] getAcceptedTypes()
{
return new ImageFormat[]
@@ -92,17 +96,20 @@
};
}
+ @Override
public boolean embedICCProfile(File src, File dst, byte profile[])
{
return false;
}
+ @Override
public IImageMetadata getMetadata(ByteSource byteSource, Map params)
throws ImageReadException, IOException
{
return null;
}
+ @Override
public ImageInfo getImageInfo(ByteSource byteSource, Map params)
throws ImageReadException, IOException
{
@@ -121,6 +128,7 @@
ImageInfo.COMPRESSION_ALGORITHM_RLE : ImageInfo.COMPRESSION_ALGORITHM_NONE);
}
+ @Override
public Dimension getImageSize(ByteSource byteSource,
Map params)
throws ImageReadException, IOException
@@ -135,6 +143,7 @@
return new Dimension(xSize, ySize);
}
+ @Override
public byte[] getICCProfileBytes(ByteSource byteSource,
Map params)
throws ImageReadException, IOException
@@ -300,6 +309,7 @@
nPlanes, bytesPerLine, paletteInfo, hScreenSize, vScreenSize);
}
+ @Override
public boolean dumpImageFile(PrintWriter pw, ByteSource byteSource)
throws ImageReadException, IOException
{
@@ -534,6 +544,7 @@
}
}
+ @Override
public final BufferedImage getBufferedImage(ByteSource byteSource,
Map params) throws ImageReadException, IOException
{
@@ -563,6 +574,7 @@
}
}
+ @Override
public void writeImage(BufferedImage src, OutputStream os, Map params)
throws ImageWriteException, IOException
{
@@ -579,6 +591,7 @@
* Map of optional parameters, defined in SanselanConstants.
* @return Xmp Xml as String, if present. Otherwise, returns null.
*/
+ @Override
public String getXmpXml(ByteSource byteSource, Map params)
throws ImageReadException, IOException
{
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 bccd2f8..e76aef2 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
@@ -70,11 +70,13 @@
// setDebug(true);
}
+ @Override
public String getName()
{
return "Png-Custom";
}
+ @Override
public String getDefaultExtension()
{
return DEFAULT_EXTENSION;
@@ -84,11 +86,13 @@
private static final String ACCEPTED_EXTENSIONS[] = { DEFAULT_EXTENSION, };
+ @Override
protected String[] getAcceptedExtensions()
{
return ACCEPTED_EXTENSIONS;
}
+ @Override
protected ImageFormat[] getAcceptedTypes()
{
return new ImageFormat[] { ImageFormat.IMAGE_FORMAT_PNG, //
@@ -266,6 +270,7 @@
}
}
+ @Override
public byte[] getICCProfileBytes(ByteSource byteSource, Map params)
throws ImageReadException, IOException
{
@@ -287,6 +292,7 @@
return (bytes);
}
+ @Override
public Dimension getImageSize(ByteSource byteSource, Map params)
throws ImageReadException, IOException
{
@@ -308,11 +314,13 @@
return null;
}
+ @Override
public boolean embedICCProfile(File src, File dst, byte profile[])
{
return false;
}
+ @Override
public IImageMetadata getMetadata(ByteSource byteSource, Map params)
throws ImageReadException, IOException
{
@@ -519,6 +527,7 @@
}
}
+ @Override
public ImageInfo getImageInfo(ByteSource byteSource, Map params)
throws ImageReadException, IOException
{
@@ -668,6 +677,7 @@
}
}
+ @Override
public BufferedImage getBufferedImage(ByteSource byteSource, Map params)
throws ImageReadException, IOException
{
@@ -845,6 +855,7 @@
}
+ @Override
public boolean dumpImageFile(PrintWriter pw, ByteSource byteSource)
throws ImageReadException, IOException
{
@@ -888,6 +899,7 @@
return true;
}
+ @Override
public void writeImage(BufferedImage src, OutputStream os, Map params)
throws ImageWriteException, IOException
{
@@ -904,6 +916,7 @@
* Map of optional parameters, defined in SanselanConstants.
* @return Xmp Xml as String, if present. Otherwise, returns null.
*/
+ @Override
public String getXmpXml(ByteSource byteSource, Map params)
throws ImageReadException, IOException
{
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 afb3914..ffc6cff 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
@@ -73,6 +73,7 @@
8, 4, 4, 2, 2, 1, 1
};
+ @Override
public void drive() throws ImageReadException, IOException
{
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 b93aae2..f88ca8b 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
@@ -36,6 +36,7 @@
pngChunkPLTE, gammaCorrection, transparencyFilter);
}
+ @Override
public void drive() throws ImageReadException, IOException
{
int bitsPerScanLine = bitsPerPixel * width;
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
index 6013ea2..e2e5849 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
@@ -109,6 +109,7 @@
/**
* @return Returns the keyword.
*/
+ @Override
public String getKeyword()
{
return keyword;
@@ -117,11 +118,13 @@
/**
* @return Returns the text.
*/
+ @Override
public String getText()
{
return text;
}
+ @Override
public PngText getContents()
{
return new PngText.iTXt(keyword, text, languageTag, translatedKeyword);
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
index e38817b..111c261 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
@@ -52,6 +52,7 @@
/**
* @return Returns the keyword.
*/
+ @Override
public String getKeyword()
{
return keyword;
@@ -60,11 +61,13 @@
/**
* @return Returns the text.
*/
+ @Override
public String getText()
{
return text;
}
+ @Override
public PngText getContents()
{
return new PngText.tEXt(keyword, text);
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
index 25aae76..34aa101 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
@@ -61,6 +61,7 @@
/**
* @return Returns the keyword.
*/
+ @Override
public String getKeyword()
{
return keyword;
@@ -69,11 +70,13 @@
/**
* @return Returns the text.
*/
+ @Override
public String getText()
{
return text;
}
+ @Override
public PngText getContents()
{
return new PngText.zTXt(keyword, text);
diff --git a/src/main/java/org/apache/commons/sanselan/formats/png/scanlinefilters/ScanlineFilterAverage.java b/src/main/java/org/apache/commons/sanselan/formats/png/scanlinefilters/ScanlineFilterAverage.java
index 389ca45..5734b64 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/png/scanlinefilters/ScanlineFilterAverage.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/png/scanlinefilters/ScanlineFilterAverage.java
@@ -29,6 +29,7 @@
this.BytesPerPixel = BytesPerPixel;
}
+ @Override
public void unfilter(byte src[], byte dst[], byte up[])
throws ImageReadException, IOException
{
diff --git a/src/main/java/org/apache/commons/sanselan/formats/png/scanlinefilters/ScanlineFilterNone.java b/src/main/java/org/apache/commons/sanselan/formats/png/scanlinefilters/ScanlineFilterNone.java
index dfe173b..e468d0e 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/png/scanlinefilters/ScanlineFilterNone.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/png/scanlinefilters/ScanlineFilterNone.java
@@ -22,6 +22,7 @@
public class ScanlineFilterNone extends ScanlineFilter
{
+ @Override
public void unfilter(byte src[], byte dst[], byte up[])
throws ImageReadException, IOException
{
diff --git a/src/main/java/org/apache/commons/sanselan/formats/png/scanlinefilters/ScanlineFilterPaeth.java b/src/main/java/org/apache/commons/sanselan/formats/png/scanlinefilters/ScanlineFilterPaeth.java
index 199574e..558416f 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/png/scanlinefilters/ScanlineFilterPaeth.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/png/scanlinefilters/ScanlineFilterPaeth.java
@@ -46,6 +46,7 @@
return c;
}
+ @Override
public void unfilter(byte src[], byte dst[], byte up[])
throws ImageReadException, IOException
{
diff --git a/src/main/java/org/apache/commons/sanselan/formats/png/scanlinefilters/ScanlineFilterSub.java b/src/main/java/org/apache/commons/sanselan/formats/png/scanlinefilters/ScanlineFilterSub.java
index be49dad..3200a54 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/png/scanlinefilters/ScanlineFilterSub.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/png/scanlinefilters/ScanlineFilterSub.java
@@ -29,6 +29,7 @@
this.BytesPerPixel = BytesPerPixel;
}
+ @Override
public void unfilter(byte src[], byte dst[], byte up[])
throws ImageReadException, IOException
{
diff --git a/src/main/java/org/apache/commons/sanselan/formats/png/scanlinefilters/ScanlineFilterUp.java b/src/main/java/org/apache/commons/sanselan/formats/png/scanlinefilters/ScanlineFilterUp.java
index 7381742..f27a61a 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/png/scanlinefilters/ScanlineFilterUp.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/png/scanlinefilters/ScanlineFilterUp.java
@@ -29,6 +29,7 @@
this.BytesPerPixel = BytesPerPixel;
}
+ @Override
public void unfilter(byte src[], byte dst[], byte up[])
throws ImageReadException, IOException
{
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
index 463a544..6a2314a 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
@@ -29,36 +29,43 @@
super(width, height, RAWBITS);
}
+ @Override
public int getNumComponents()
{
return 1;
}
+ @Override
public int getBitDepth()
{
return 1;
}
+ @Override
public ImageFormat getImageType()
{
return ImageFormat.IMAGE_FORMAT_PBM;
}
+ @Override
public int getColorType()
{
return ImageInfo.COLOR_TYPE_BW;
}
+ @Override
public String getImageTypeDescription()
{
return "PBM: portable bitmap fileformat";
}
+ @Override
public String getMIMEType()
{
return "image/x-portable-bitmap";
}
+ @Override
protected void newline()
{
bitcache = 0;
@@ -69,6 +76,7 @@
private int bitcache = 0;
private int bits_in_cache = 0;
+ @Override
public int getRGB(InputStream is) throws IOException
{
if (bits_in_cache < 1)
@@ -91,6 +99,7 @@
throw new IOException("PBM: bad bit: " + bit);
}
+ @Override
public int getRGB(WhiteSpaceReader wsr) throws IOException
{
int bit = Integer.parseInt(wsr.readtoWhiteSpace());
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
index 7e1a7a1..e3c316d 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
@@ -30,6 +30,7 @@
super(RAWBITS);
}
+ @Override
public void writeImage(BufferedImage src, OutputStream os, Map params)
throws ImageWriteException, IOException
{
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
index 80f0c6c..fe36eea 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
@@ -33,36 +33,43 @@
this.max = max;
}
+ @Override
public int getNumComponents()
{
return 1;
}
+ @Override
public int getBitDepth()
{
return 8;
}
+ @Override
public ImageFormat getImageType()
{
return ImageFormat.IMAGE_FORMAT_PPM;
}
+ @Override
public String getImageTypeDescription()
{
return "PGM: portable pixmap file format";
}
+ @Override
public String getMIMEType()
{
return "image/x-portable-pixmap";
}
+ @Override
public int getColorType()
{
return ImageInfo.COLOR_TYPE_RGB;
}
+ @Override
public int getRGB(InputStream is) throws IOException
{
int sample = is.read();
@@ -77,6 +84,7 @@
return rgb;
}
+ @Override
public int getRGB(WhiteSpaceReader wsr) throws IOException
{
int sample = Integer.parseInt(wsr.readtoWhiteSpace());
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
index f22dcf3..95516f1 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
@@ -30,6 +30,7 @@
super(RAWBITS);
}
+ @Override
public void writeImage(BufferedImage src, OutputStream os, Map params)
throws ImageWriteException, IOException
{
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
index 5839fe2..4e4bccd 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
@@ -47,11 +47,13 @@
// setDebug(true);
}
+ @Override
public String getName()
{
return "Pbm-Custom";
}
+ @Override
public String getDefaultExtension()
{
return DEFAULT_EXTENSION;
@@ -62,11 +64,13 @@
private static final String ACCEPTED_EXTENSIONS[] = { ".pbm", ".pgm",
".ppm", ".pnm", };
+ @Override
protected String[] getAcceptedExtensions()
{
return ACCEPTED_EXTENSIONS;
}
+ @Override
protected ImageFormat[] getAcceptedTypes()
{
return new ImageFormat[] { ImageFormat.IMAGE_FORMAT_PBM, //
@@ -145,12 +149,14 @@
}
}
+ @Override
public byte[] getICCProfileBytes(ByteSource byteSource, Map params)
throws ImageReadException, IOException
{
return null;
}
+ @Override
public Dimension getImageSize(ByteSource byteSource, Map params)
throws ImageReadException, IOException
{
@@ -167,17 +173,20 @@
return null;
}
+ @Override
public boolean embedICCProfile(File src, File dst, byte profile[])
{
return false;
}
+ @Override
public IImageMetadata getMetadata(ByteSource byteSource, Map params)
throws ImageReadException, IOException
{
return null;
}
+ @Override
public ImageInfo getImageInfo(ByteSource byteSource, Map params)
throws ImageReadException, IOException
{
@@ -219,6 +228,7 @@
return result;
}
+ @Override
public boolean dumpImageFile(PrintWriter pw, ByteSource byteSource)
throws ImageReadException, IOException
{
@@ -261,6 +271,7 @@
return result;
}
+ @Override
public BufferedImage getBufferedImage(ByteSource byteSource, Map params)
throws ImageReadException, IOException
{
@@ -298,6 +309,7 @@
public static final String PARAM_VALUE_PNM_RAWBITS_YES = "YES";
public static final String PARAM_VALUE_PNM_RAWBITS_NO = "NO";
+ @Override
public void writeImage(BufferedImage src, OutputStream os, Map params)
throws ImageWriteException, IOException
{
@@ -358,6 +370,7 @@
* Map of optional parameters, defined in SanselanConstants.
* @return Xmp Xml as String, if present. Otherwise, returns null.
*/
+ @Override
public String getXmpXml(ByteSource byteSource, Map params)
throws ImageReadException, IOException
{
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
index 0b50cb7..4dcaa8d 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
@@ -33,36 +33,43 @@
this.max = max;
}
+ @Override
public int getNumComponents()
{
return 3;
}
+ @Override
public int getBitDepth()
{
return 8;
}
+ @Override
public ImageFormat getImageType()
{
return ImageFormat.IMAGE_FORMAT_PGM;
}
+ @Override
public String getImageTypeDescription()
{
return "PGM: portable graymap file format";
}
+ @Override
public String getMIMEType()
{
return "image/x-portable-graymap";
}
+ @Override
public int getColorType()
{
return ImageInfo.COLOR_TYPE_GRAYSCALE;
}
+ @Override
public int getRGB(InputStream is) throws IOException
{
int red = is.read();
@@ -80,6 +87,7 @@
return rgb;
}
+ @Override
public int getRGB(WhiteSpaceReader wsr) throws IOException
{
int red = Integer.parseInt(wsr.readtoWhiteSpace());
@@ -94,6 +102,7 @@
return rgb;
}
+ @Override
public void dump()
{
// System.out.println("count: " + count);
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
index 4adf81e..6e7c826 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
@@ -30,6 +30,7 @@
super(RAWBITS);
}
+ @Override
public void writeImage(BufferedImage src, OutputStream os, Map params)
throws ImageWriteException, IOException
{
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 f5f94be..f454743 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
@@ -55,11 +55,13 @@
// setDebug(true);
}
+ @Override
public String getName()
{
return "PSD-Custom";
}
+ @Override
public String getDefaultExtension()
{
return DEFAULT_EXTENSION;
@@ -69,11 +71,13 @@
private static final String ACCEPTED_EXTENSIONS[] = { DEFAULT_EXTENSION, };
+ @Override
protected String[] getAcceptedExtensions()
{
return ACCEPTED_EXTENSIONS;
}
+ @Override
protected ImageFormat[] getAcceptedTypes()
{
return new ImageFormat[] { ImageFormat.IMAGE_FORMAT_PSD, //
@@ -466,6 +470,7 @@
public final static int IMAGE_RESOURCE_ID_ICC_PROFILE = 0x040F;
+ @Override
public byte[] getICCProfileBytes(ByteSource byteSource, Map params)
throws ImageReadException, IOException
{
@@ -482,6 +487,7 @@
return bytes;
}
+ @Override
public Dimension getImageSize(ByteSource byteSource, Map params)
throws ImageReadException, IOException
{
@@ -498,11 +504,13 @@
return null;
}
+ @Override
public boolean embedICCProfile(File src, File dst, byte profile[])
{
return false;
}
+ @Override
public IImageMetadata getMetadata(ByteSource byteSource, Map params)
throws ImageReadException, IOException
{
@@ -535,6 +543,7 @@
}
}
+ @Override
public ImageInfo getImageInfo(ByteSource byteSource, Map params)
throws ImageReadException, IOException
{
@@ -615,6 +624,7 @@
return null;
}
+ @Override
public boolean dumpImageFile(PrintWriter pw, ByteSource byteSource)
throws ImageReadException, IOException
{
@@ -666,6 +676,7 @@
private static final int COLOR_MODE_INDEXED = 2;
+ @Override
public BufferedImage getBufferedImage(ByteSource byteSource, Map params)
throws ImageReadException, IOException
{
@@ -806,6 +817,7 @@
* Map of optional parameters, defined in SanselanConstants.
* @return Xmp Xml as String, if present. Otherwise, returns null.
*/
+ @Override
public String getXmpXml(ByteSource byteSource, Map params)
throws ImageReadException, IOException
{
diff --git a/src/main/java/org/apache/commons/sanselan/formats/psd/dataparsers/DataParserBitmap.java b/src/main/java/org/apache/commons/sanselan/formats/psd/dataparsers/DataParserBitmap.java
index 8ade2c2..af82652 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/psd/dataparsers/DataParserBitmap.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/psd/dataparsers/DataParserBitmap.java
@@ -21,6 +21,7 @@
public class DataParserBitmap extends DataParser
{
+ @Override
protected int getRGB(int data[][][], int x, int y,
ImageContents imageContents)
{
@@ -38,6 +39,7 @@
return rgb;
}
+ @Override
public int getBasicChannelsCount()
{
return 1;
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
index 415eed0..614dc69 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
@@ -21,6 +21,7 @@
public class DataParserCmyk extends DataParser
{
+ @Override
protected int getRGB(int data[][][], int x, int y,
ImageContents imageContents)
{
@@ -40,6 +41,7 @@
return rgb;
}
+ @Override
public int getBasicChannelsCount()
{
return 4;
diff --git a/src/main/java/org/apache/commons/sanselan/formats/psd/dataparsers/DataParserGrayscale.java b/src/main/java/org/apache/commons/sanselan/formats/psd/dataparsers/DataParserGrayscale.java
index 60b5955..23fb36c 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/psd/dataparsers/DataParserGrayscale.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/psd/dataparsers/DataParserGrayscale.java
@@ -20,6 +20,7 @@
public class DataParserGrayscale extends DataParser
{
+ @Override
protected int getRGB(int data[][][], int x, int y,
ImageContents imageContents)
{
@@ -32,6 +33,7 @@
return rgb;
}
+ @Override
public int getBasicChannelsCount()
{
return 1;
diff --git a/src/main/java/org/apache/commons/sanselan/formats/psd/dataparsers/DataParserIndexed.java b/src/main/java/org/apache/commons/sanselan/formats/psd/dataparsers/DataParserIndexed.java
index 70bdab7..22b9036 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/psd/dataparsers/DataParserIndexed.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/psd/dataparsers/DataParserIndexed.java
@@ -39,6 +39,7 @@
}
}
+ @Override
protected int getRGB(int data[][][], int x, int y,
ImageContents imageContents)
{
@@ -48,6 +49,7 @@
return rgb;
}
+ @Override
public int getBasicChannelsCount()
{
return 1;
diff --git a/src/main/java/org/apache/commons/sanselan/formats/psd/dataparsers/DataParserLab.java b/src/main/java/org/apache/commons/sanselan/formats/psd/dataparsers/DataParserLab.java
index e360421..e2eb1d2 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/psd/dataparsers/DataParserLab.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/psd/dataparsers/DataParserLab.java
@@ -27,6 +27,7 @@
}
+ @Override
protected int getRGB(int data[][][], int x, int y,
ImageContents imageContents)
{
@@ -42,11 +43,13 @@
return rgb;
}
+ @Override
public int getBasicChannelsCount()
{
return 3;
}
+ @Override
public void dump()
{
// for(int i=0;i<3;i++)
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
index 942e289..789ff55 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
@@ -20,6 +20,7 @@
public class DataParserRgb extends DataParser
{
+ @Override
protected int getRGB(int data[][][], int x, int y,
ImageContents imageContents)
{
@@ -34,6 +35,7 @@
return rgb;
}
+ @Override
public int getBasicChannelsCount()
{
return 3;
diff --git a/src/main/java/org/apache/commons/sanselan/formats/psd/dataparsers/DataParserStub.java b/src/main/java/org/apache/commons/sanselan/formats/psd/dataparsers/DataParserStub.java
index 09146d4..94c4134 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/psd/dataparsers/DataParserStub.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/psd/dataparsers/DataParserStub.java
@@ -20,12 +20,14 @@
public class DataParserStub extends DataParser
{
+ @Override
protected int getRGB(int data[][][], int x, int y,
ImageContents imageContents)
{
return 0;
}
+ @Override
public int getBasicChannelsCount()
{
return 1;
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 7ec148d..5498f03 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
@@ -38,6 +38,7 @@
super(fDataParser);
}
+ @Override
public void readData(InputStream is, BufferedImage bi,
ImageContents imageContents, BinaryFileParser bfp)
throws ImageReadException, IOException
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 d095f39..c521ffa 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
@@ -35,6 +35,7 @@
super(fDataParser);
}
+ @Override
public void readData(InputStream is, BufferedImage bi,
ImageContents imageContents, BinaryFileParser bfp)
throws ImageReadException, IOException
diff --git a/src/main/java/org/apache/commons/sanselan/formats/rgbe/RgbeImageParser.java b/src/main/java/org/apache/commons/sanselan/formats/rgbe/RgbeImageParser.java
index 8cd1d5f..6281266 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/rgbe/RgbeImageParser.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/rgbe/RgbeImageParser.java
@@ -50,22 +50,27 @@
setByteOrder( BinaryConstants.BYTE_ORDER_BIG_ENDIAN );
}
+ @Override
public String getName() {
return "Radiance HDR";
}
+ @Override
public String getDefaultExtension() {
return ".hdr";
}
+ @Override
protected String[] getAcceptedExtensions() {
return new String[]{ ".hdr", ".pic" };
}
+ @Override
protected ImageFormat[] getAcceptedTypes() {
return new ImageFormat[]{ ImageFormat.IMAGE_FORMAT_RGBE };
}
+ @Override
public IImageMetadata getMetadata( ByteSource byteSource, Map params ) throws ImageReadException, IOException {
RgbeInfo info = new RgbeInfo( byteSource );
@@ -76,6 +81,7 @@
}
}
+ @Override
public ImageInfo getImageInfo( ByteSource byteSource, Map params ) throws ImageReadException, IOException {
RgbeInfo info = new RgbeInfo( byteSource );
@@ -103,6 +109,7 @@
}
}
+ @Override
public BufferedImage getBufferedImage( ByteSource byteSource, Map params ) throws ImageReadException, IOException {
RgbeInfo info = new RgbeInfo( byteSource );
@@ -130,6 +137,7 @@
}
}
+ @Override
public Dimension getImageSize( ByteSource byteSource, Map params ) throws ImageReadException, IOException {
RgbeInfo info = new RgbeInfo( byteSource );
@@ -140,14 +148,17 @@
}
}
+ @Override
public byte[] getICCProfileBytes( ByteSource byteSource, Map params ) throws ImageReadException, IOException {
return null;
}
+ @Override
public boolean embedICCProfile( File src, File dst, byte[] profile ) {
return false;
}
+ @Override
public String getXmpXml( ByteSource byteSource, Map params ) throws ImageReadException, IOException {
return null;
}
diff --git a/src/main/java/org/apache/commons/sanselan/formats/tiff/JpegImageData.java b/src/main/java/org/apache/commons/sanselan/formats/tiff/JpegImageData.java
index b29bae6..cc62599 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/tiff/JpegImageData.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/tiff/JpegImageData.java
@@ -24,6 +24,7 @@
super(offset, length, data);
}
+ @Override
public String getElementDescription(boolean verbose)
{
return "Jpeg image data: " + data.length + " bytes";
diff --git a/src/main/java/org/apache/commons/sanselan/formats/tiff/TiffDirectory.java b/src/main/java/org/apache/commons/sanselan/formats/tiff/TiffDirectory.java
index e2484c8..9a28c2d 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/tiff/TiffDirectory.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/tiff/TiffDirectory.java
@@ -50,6 +50,7 @@
return TiffDirectory.description(type);
}
+ @Override
public String getElementDescription(boolean verbose)
{
if (!verbose)
@@ -354,6 +355,7 @@
super(offset, length);
}
+ @Override
public String getElementDescription(boolean verbose)
{
if (verbose)
diff --git a/src/main/java/org/apache/commons/sanselan/formats/tiff/TiffElement.java b/src/main/java/org/apache/commons/sanselan/formats/tiff/TiffElement.java
index 7ef2117..9d32d30 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/tiff/TiffElement.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/tiff/TiffElement.java
@@ -64,6 +64,7 @@
super(offset, length);
}
+ @Override
public String getElementDescription(boolean verbose)
{
return "Element, offset: " + offset + ", length: " + length
diff --git a/src/main/java/org/apache/commons/sanselan/formats/tiff/TiffField.java b/src/main/java/org/apache/commons/sanselan/formats/tiff/TiffField.java
index 72ec3aa..a2e9061 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/tiff/TiffField.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/tiff/TiffField.java
@@ -86,6 +86,7 @@
super(offset, length);
}
+ @Override
public String getElementDescription(boolean verbose)
{
if (verbose)
@@ -554,6 +555,7 @@
+ "): ";
}
+ @Override
public String toString()
{
StringBuffer result = new StringBuffer();
diff --git a/src/main/java/org/apache/commons/sanselan/formats/tiff/TiffHeader.java b/src/main/java/org/apache/commons/sanselan/formats/tiff/TiffHeader.java
index e170ff8..1b6eced 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/tiff/TiffHeader.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/tiff/TiffHeader.java
@@ -33,6 +33,7 @@
this.offsetToFirstIFD = offsetToFirstIFD;
}
+ @Override
public String getElementDescription(boolean verbose)
{
if (verbose)
diff --git a/src/main/java/org/apache/commons/sanselan/formats/tiff/TiffImageData.java b/src/main/java/org/apache/commons/sanselan/formats/tiff/TiffImageData.java
index 800bed0..bf31c56 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/tiff/TiffImageData.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/tiff/TiffImageData.java
@@ -42,16 +42,19 @@
this.tileLength = tileLength;
}
+ @Override
public TiffElement.DataElement[] getImageData()
{
return tiles;
}
+ @Override
public boolean stripsNotTiles()
{
return false;
}
+ @Override
public DataReader getDataReader(TiffDirectory directory,
PhotometricInterpreter photometricInterpreter,
int bitsPerPixel, int bitsPerSample[], int predictor,
@@ -82,16 +85,19 @@
this.rowsPerStrip = rowsPerStrip;
}
+ @Override
public TiffElement.DataElement[] getImageData()
{
return strips;
}
+ @Override
public boolean stripsNotTiles()
{
return true;
}
+ @Override
public DataReader getDataReader(TiffDirectory directory,
PhotometricInterpreter photometricInterpreter,
int bitsPerPixel, int bitsPerSample[], int predictor,
@@ -128,6 +134,7 @@
super(offset, length, data);
}
+ @Override
public String getElementDescription(boolean verbose)
{
return "Tiff image data: " + data.length + " bytes";
diff --git a/src/main/java/org/apache/commons/sanselan/formats/tiff/TiffImageMetadata.java b/src/main/java/org/apache/commons/sanselan/formats/tiff/TiffImageMetadata.java
index 95a4813..195059e 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/tiff/TiffImageMetadata.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/tiff/TiffImageMetadata.java
@@ -127,6 +127,7 @@
return directory.getJpegImageData();
}
+ @Override
public String toString(String prefix)
{
return (prefix != null ? prefix : "") + directory.description()
@@ -205,6 +206,7 @@
return super.getItems();
}
+ @Override
public List<? extends IImageMetadataItem> getItems()
{
List<IImageMetadataItem> result = new ArrayList<IImageMetadataItem>();
@@ -574,6 +576,7 @@
this.longitudeSeconds = longitudeSeconds;
}
+ @Override
public String toString()
{
// This will format the gps info like so:
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 5db4f6f..152c897 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
@@ -58,11 +58,13 @@
// setDebug(true);
}
+ @Override
public String getName()
{
return "Tiff-Custom";
}
+ @Override
public String getDefaultExtension()
{
return DEFAULT_EXTENSION;
@@ -72,17 +74,20 @@
private static final String ACCEPTED_EXTENSIONS[] = { ".tif", ".tiff", };
+ @Override
protected String[] getAcceptedExtensions()
{
return ACCEPTED_EXTENSIONS;
}
+ @Override
protected ImageFormat[] getAcceptedTypes()
{
return new ImageFormat[] { ImageFormat.IMAGE_FORMAT_TIFF, //
};
}
+ @Override
public byte[] getICCProfileBytes(ByteSource byteSource, Map params)
throws ImageReadException, IOException
{
@@ -94,6 +99,7 @@
return directory.getFieldValue(AllTagConstants.EXIF_TAG_ICC_PROFILE);
}
+ @Override
public Dimension getImageSize(ByteSource byteSource, Map params)
throws ImageReadException, IOException
{
@@ -120,11 +126,13 @@
return null;
}
+ @Override
public boolean embedICCProfile(File src, File dst, byte profile[])
{
return false;
}
+ @Override
public IImageMetadata getMetadata(ByteSource byteSource, Map params)
throws ImageReadException, IOException
{
@@ -157,6 +165,7 @@
return result;
}
+ @Override
public ImageInfo getImageInfo(ByteSource byteSource, Map params)
throws ImageReadException, IOException
{
@@ -313,6 +322,7 @@
return result;
}
+ @Override
public String getXmpXml(ByteSource byteSource, Map params)
throws ImageReadException, IOException
{
@@ -337,6 +347,7 @@
}
}
+ @Override
public boolean dumpImageFile(PrintWriter pw, ByteSource byteSource)
throws ImageReadException, IOException
{
@@ -403,6 +414,7 @@
}
}
+ @Override
public FormatCompliance getFormatCompliance(ByteSource byteSource)
throws ImageReadException, IOException
{
@@ -438,6 +450,7 @@
return result;
}
+ @Override
public BufferedImage getBufferedImage(ByteSource byteSource, Map params)
throws ImageReadException, IOException
{
@@ -452,6 +465,7 @@
return result;
}
+ @Override
public List<BufferedImage> getAllBufferedImages(ByteSource byteSource)
throws ImageReadException, IOException
{
@@ -611,6 +625,7 @@
}
}
+ @Override
public void writeImage(BufferedImage src, OutputStream os, Map params)
throws ImageWriteException, IOException
{
diff --git a/src/main/java/org/apache/commons/sanselan/formats/tiff/TiffReader.java b/src/main/java/org/apache/commons/sanselan/formats/tiff/TiffReader.java
index d73b162..93d5acc 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/tiff/TiffReader.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/tiff/TiffReader.java
@@ -382,12 +382,14 @@
this.readImageData = readImageData;
}
+ @Override
public boolean addDirectory(TiffDirectory directory)
{
super.addDirectory(directory);
return false;
}
+ @Override
public boolean readImageData()
{
return readImageData;
@@ -403,12 +405,14 @@
this.readImageData = readImageData;
}
+ @Override
public boolean addDirectory(TiffDirectory directory)
{
super.addDirectory(directory);
return false;
}
+ @Override
public boolean readImageData()
{
return readImageData;
diff --git a/src/main/java/org/apache/commons/sanselan/formats/tiff/datareaders/DataReaderStrips.java b/src/main/java/org/apache/commons/sanselan/formats/tiff/datareaders/DataReaderStrips.java
index 4611223..51d1a1b 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/tiff/datareaders/DataReaderStrips.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/tiff/datareaders/DataReaderStrips.java
@@ -86,6 +86,7 @@
private int x = 0, y = 0;
+ @Override
public void readImageData(ImageBuilder imageBuilder) throws ImageReadException,
IOException
{
diff --git a/src/main/java/org/apache/commons/sanselan/formats/tiff/datareaders/DataReaderTiled.java b/src/main/java/org/apache/commons/sanselan/formats/tiff/datareaders/DataReaderTiled.java
index e75a358..7ac34a9 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/tiff/datareaders/DataReaderTiled.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/tiff/datareaders/DataReaderTiled.java
@@ -96,6 +96,7 @@
}
}
+ @Override
public void readImageData(ImageBuilder imageBuilder) throws ImageReadException,
IOException
{
diff --git a/src/main/java/org/apache/commons/sanselan/formats/tiff/fieldtypes/FieldType.java b/src/main/java/org/apache/commons/sanselan/formats/tiff/fieldtypes/FieldType.java
index b202524..ae60bf8 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/tiff/fieldtypes/FieldType.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/tiff/fieldtypes/FieldType.java
@@ -106,6 +106,7 @@
//
// public abstract Object[] getValueArray(TiffField entry);
+ @Override
public String toString()
{
return "[" + getClass().getName() + ". type: " + type + ", name: "
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
index 1535c4c..a51face 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
@@ -28,6 +28,7 @@
super(type, 1, name);
}
+ @Override
public Object getSimpleValue(TiffField entry) {
// According to EXIF specification "2 = ASCII An 8-bit byte containing one 7-bit ASCII code. The final byte is terminated with NULL."
byte bytes[] = getRawBytes(entry);
@@ -69,6 +70,7 @@
}
}
+ @Override
public byte[] writeData(Object o, int byteOrder) throws ImageWriteException
{
if (o instanceof byte[]) {
diff --git a/src/main/java/org/apache/commons/sanselan/formats/tiff/fieldtypes/FieldTypeByte.java b/src/main/java/org/apache/commons/sanselan/formats/tiff/fieldtypes/FieldTypeByte.java
index 1a6b52d..98ce3cf 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/tiff/fieldtypes/FieldTypeByte.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/tiff/fieldtypes/FieldTypeByte.java
@@ -27,6 +27,7 @@
super(type, 1, name);
}
+ @Override
public Object getSimpleValue(TiffField entry)
{
if (entry.length == 1)
@@ -35,6 +36,7 @@
return getRawBytes(entry);
}
+ @Override
public byte[] writeData(Object o, int byteOrder) throws ImageWriteException
{
if (o instanceof Byte)
diff --git a/src/main/java/org/apache/commons/sanselan/formats/tiff/fieldtypes/FieldTypeDouble.java b/src/main/java/org/apache/commons/sanselan/formats/tiff/fieldtypes/FieldTypeDouble.java
index 5520ab1..14f21dc 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/tiff/fieldtypes/FieldTypeDouble.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/tiff/fieldtypes/FieldTypeDouble.java
@@ -27,11 +27,13 @@
super(12, 8, "Double");
}
+ @Override
public Object getSimpleValue(TiffField entry)
{
return "?";
}
+ @Override
public byte[] writeData(Object o, int byteOrder) throws ImageWriteException
{
if (o instanceof Double)
diff --git a/src/main/java/org/apache/commons/sanselan/formats/tiff/fieldtypes/FieldTypeFloat.java b/src/main/java/org/apache/commons/sanselan/formats/tiff/fieldtypes/FieldTypeFloat.java
index 27d3954..4f2efc2 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/tiff/fieldtypes/FieldTypeFloat.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/tiff/fieldtypes/FieldTypeFloat.java
@@ -29,6 +29,7 @@
// = new FieldType(11, 4, "Float")
+ @Override
public Object getSimpleValue(TiffField entry)
{
if (entry.length == 1)
@@ -40,6 +41,7 @@
+ ")", getRawBytes(entry), 0, entry.length, entry.byteOrder);
}
+ @Override
public byte[] writeData(Object o, int byteOrder) throws ImageWriteException
{
if (o instanceof Float)
diff --git a/src/main/java/org/apache/commons/sanselan/formats/tiff/fieldtypes/FieldTypeLong.java b/src/main/java/org/apache/commons/sanselan/formats/tiff/fieldtypes/FieldTypeLong.java
index 48b8b6d..a115300 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/tiff/fieldtypes/FieldTypeLong.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/tiff/fieldtypes/FieldTypeLong.java
@@ -27,6 +27,7 @@
super(type, 4, name);
}
+ @Override
public Object getSimpleValue(TiffField entry)
{
if (entry.length == 1)
@@ -38,6 +39,7 @@
+ ")", getRawBytes(entry), 0, entry.length, entry.byteOrder);
}
+ @Override
public byte[] writeData(Object o, int byteOrder) throws ImageWriteException
{
if (o instanceof Integer)
diff --git a/src/main/java/org/apache/commons/sanselan/formats/tiff/fieldtypes/FieldTypeRational.java b/src/main/java/org/apache/commons/sanselan/formats/tiff/fieldtypes/FieldTypeRational.java
index bd9bda6..3d3c8e6 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/tiff/fieldtypes/FieldTypeRational.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/tiff/fieldtypes/FieldTypeRational.java
@@ -29,6 +29,7 @@
super(type, 8, name);
}
+ @Override
public Object getSimpleValue(TiffField entry)
{
if (entry.length == 1)
@@ -39,6 +40,7 @@
+ ")", getRawBytes(entry), 0, entry.length, entry.byteOrder);
}
+ @Override
public byte[] writeData(Object o, int byteOrder) throws ImageWriteException
{
if (o instanceof RationalNumber)
diff --git a/src/main/java/org/apache/commons/sanselan/formats/tiff/fieldtypes/FieldTypeShort.java b/src/main/java/org/apache/commons/sanselan/formats/tiff/fieldtypes/FieldTypeShort.java
index 95f99e9..ba277de 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/tiff/fieldtypes/FieldTypeShort.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/tiff/fieldtypes/FieldTypeShort.java
@@ -43,6 +43,7 @@
// + ")", getRawBytes(entry), 0, entry.length, entry.byteOrder);
// }
+ @Override
public Object getSimpleValue(TiffField entry) throws ImageReadException
{
if (entry.length == 1)
@@ -51,6 +52,7 @@
return BinaryConversions.convertToShortArray(getRawBytes(entry), entry.byteOrder);
}
+ @Override
public byte[] writeData(Object o, int byteOrder) throws ImageWriteException
{
if (o instanceof Short)
diff --git a/src/main/java/org/apache/commons/sanselan/formats/tiff/fieldtypes/FieldTypeUnknown.java b/src/main/java/org/apache/commons/sanselan/formats/tiff/fieldtypes/FieldTypeUnknown.java
index 3314f9b..ecd7076 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/tiff/fieldtypes/FieldTypeUnknown.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/tiff/fieldtypes/FieldTypeUnknown.java
@@ -27,6 +27,7 @@
super(-1, 1, "Unknown");
}
+ @Override
public Object getSimpleValue(TiffField entry)
{
// Debug.debug("unknown field type. entry", entry.tagInfo.name);
@@ -42,6 +43,7 @@
return getRawBytes(entry);
}
+ @Override
public byte[] writeData(Object o, int byteOrder) throws ImageWriteException
{
if (o instanceof Byte)
diff --git a/src/main/java/org/apache/commons/sanselan/formats/tiff/photometricinterpreters/PhotometricInterpreterBiLevel.java b/src/main/java/org/apache/commons/sanselan/formats/tiff/photometricinterpreters/PhotometricInterpreterBiLevel.java
index 9cde38a..d292f1c 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/tiff/photometricinterpreters/PhotometricInterpreterBiLevel.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/tiff/photometricinterpreters/PhotometricInterpreterBiLevel.java
@@ -37,6 +37,7 @@
// this.bitsPerPixel = fBitsPerPixel;
}
+ @Override
public void interpretPixel(ImageBuilder imageBuilder, int samples[], int x, int y)
throws ImageReadException, IOException
{
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
index 5012068..43e376c 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
@@ -30,10 +30,12 @@
super(fSamplesPerPixel, fBitsPerSample, Predictor, width, height);
}
+ @Override
public void dumpstats() throws ImageReadException, IOException
{
}
+ @Override
public void interpretPixel(ImageBuilder imageBuilder, int samples[], int x, int y)
throws ImageReadException, IOException
{
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
index cb616c2..a7e4ee5 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
@@ -30,6 +30,7 @@
super(fSamplesPerPixel, fBitsPerSample, Predictor, width, height);
}
+ @Override
public void interpretPixel(ImageBuilder imageBuilder, int samples[], int x, int y)
throws ImageReadException, IOException
{
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
index cb967e8..78528d4 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
@@ -34,6 +34,7 @@
// this.yOnly = yonly;
}
+ @Override
public void dumpstats() throws ImageReadException, IOException
{
}
@@ -45,6 +46,7 @@
// private float function_f(float value, )
+ @Override
public void interpretPixel(ImageBuilder imageBuilder, int samples[], int x, int y)
throws ImageReadException, IOException
{
diff --git a/src/main/java/org/apache/commons/sanselan/formats/tiff/photometricinterpreters/PhotometricInterpreterPalette.java b/src/main/java/org/apache/commons/sanselan/formats/tiff/photometricinterpreters/PhotometricInterpreterPalette.java
index 045627e..6d05305 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/tiff/photometricinterpreters/PhotometricInterpreterPalette.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/tiff/photometricinterpreters/PhotometricInterpreterPalette.java
@@ -34,6 +34,7 @@
this.fColorMap = fColorMap;
}
+ @Override
public void interpretPixel(ImageBuilder imageBuilder, int samples[], int x, int y)
throws ImageReadException, IOException
{
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
index 193f0fb..f36c9e3 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
@@ -29,6 +29,7 @@
super(fSamplesPerPixel, fBitsPerSample, Predictor, width, height);
}
+ @Override
public void interpretPixel(ImageBuilder imageBuilder, int samples[], int x, int y)
throws ImageReadException, IOException
{
diff --git a/src/main/java/org/apache/commons/sanselan/formats/tiff/photometricinterpreters/PhotometricInterpreterYCbCr.java b/src/main/java/org/apache/commons/sanselan/formats/tiff/photometricinterpreters/PhotometricInterpreterYCbCr.java
index 7bf385f..f8f5be0 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/tiff/photometricinterpreters/PhotometricInterpreterYCbCr.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/tiff/photometricinterpreters/PhotometricInterpreterYCbCr.java
@@ -65,6 +65,7 @@
return rgb;
}
+ @Override
public void interpretPixel(ImageBuilder imageBuilder, int samples[], int x, int y)
throws ImageReadException, IOException
{
diff --git a/src/main/java/org/apache/commons/sanselan/formats/tiff/taginfos/TagInfo.java b/src/main/java/org/apache/commons/sanselan/formats/tiff/taginfos/TagInfo.java
index 97d28a7..b51caad 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/tiff/taginfos/TagInfo.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/tiff/taginfos/TagInfo.java
@@ -98,6 +98,7 @@
return tag + " (0x" + Integer.toHexString(tag) + ": " + name + "): ";
}
+ @Override
public String toString()
{
return "[TagInfo. tag: " + tag + " (0x" + Integer.toHexString(tag)
diff --git a/src/main/java/org/apache/commons/sanselan/formats/tiff/taginfos/TagInfoGpsText.java b/src/main/java/org/apache/commons/sanselan/formats/tiff/taginfos/TagInfoGpsText.java
index a9bc3f7..f0da951 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/tiff/taginfos/TagInfoGpsText.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/tiff/taginfos/TagInfoGpsText.java
@@ -35,6 +35,7 @@
super(name, tag, dataType, length, exifDirectory);
}
+ @Override
public boolean isText()
{
return true;
diff --git a/src/main/java/org/apache/commons/sanselan/formats/tiff/write/TiffImageWriterLossless.java b/src/main/java/org/apache/commons/sanselan/formats/tiff/write/TiffImageWriterLossless.java
index 943f45c..cf74b28 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/tiff/write/TiffImageWriterLossless.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/tiff/write/TiffImageWriterLossless.java
@@ -222,6 +222,7 @@
}
}
+ @Override
public void write(OutputStream os, TiffOutputSet outputSet)
throws IOException, ImageWriteException
{
@@ -390,6 +391,7 @@
this.index = index;
}
+ @Override
public void write(int b) throws IOException
{
if (index >= buffer.length)
@@ -398,6 +400,7 @@
buffer[index++] = (byte) b;
}
+ @Override
public void write(byte b[], int off, int len) throws IOException
{
if (index + len > buffer.length)
diff --git a/src/main/java/org/apache/commons/sanselan/formats/tiff/write/TiffImageWriterLossy.java b/src/main/java/org/apache/commons/sanselan/formats/tiff/write/TiffImageWriterLossy.java
index 73d8934..6fe40dd 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/tiff/write/TiffImageWriterLossy.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/tiff/write/TiffImageWriterLossy.java
@@ -35,6 +35,7 @@
super(byteOrder);
}
+ @Override
public void write(OutputStream os, TiffOutputSet outputSet)
throws IOException, ImageWriteException
{
diff --git a/src/main/java/org/apache/commons/sanselan/formats/tiff/write/TiffOutputDirectory.java b/src/main/java/org/apache/commons/sanselan/formats/tiff/write/TiffOutputDirectory.java
index 32a3ede..ac50c2d 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/tiff/write/TiffOutputDirectory.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/tiff/write/TiffOutputDirectory.java
@@ -414,6 +414,7 @@
return TiffDirectory.description(type);
}
+ @Override
public void writeItem(BinaryOutputStream bos) throws IOException,
ImageWriteException
{
@@ -467,12 +468,14 @@
return tiffImageData;
}
+ @Override
public int getItemLength()
{
return TIFF_ENTRY_LENGTH * fields.size() + TIFF_DIRECTORY_HEADER_LENGTH
+ TIFF_DIRECTORY_FOOTER_LENGTH;
}
+ @Override
public String getItemDescription()
{
TiffDirectoryType dirType = TagConstantsUtils
diff --git a/src/main/java/org/apache/commons/sanselan/formats/tiff/write/TiffOutputField.java b/src/main/java/org/apache/commons/sanselan/formats/tiff/write/TiffOutputField.java
index f1929c9..883b4b3 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/tiff/write/TiffOutputField.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/tiff/write/TiffOutputField.java
@@ -127,6 +127,7 @@
private static final String newline = System.getProperty("line.separator");
+ @Override
public String toString()
{
return toString(null);
diff --git a/src/main/java/org/apache/commons/sanselan/formats/tiff/write/TiffOutputItem.java b/src/main/java/org/apache/commons/sanselan/formats/tiff/write/TiffOutputItem.java
index 66a8025..27066d7 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/tiff/write/TiffOutputItem.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/tiff/write/TiffOutputItem.java
@@ -56,11 +56,13 @@
this.bytes = bytes;
}
+ @Override
public int getItemLength()
{
return bytes.length;
}
+ @Override
public String getItemDescription()
{
return name;
@@ -74,6 +76,7 @@
System.arraycopy(bytes, 0, this.bytes, 0, bytes.length);
}
+ @Override
public void writeItem(BinaryOutputStream bos) throws IOException,
ImageWriteException
{
diff --git a/src/main/java/org/apache/commons/sanselan/formats/tiff/write/TiffOutputSet.java b/src/main/java/org/apache/commons/sanselan/formats/tiff/write/TiffOutputSet.java
index 80156e1..5c30748 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/tiff/write/TiffOutputSet.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/tiff/write/TiffOutputSet.java
@@ -266,6 +266,7 @@
private static final String newline = System.getProperty("line.separator");
+ @Override
public String toString()
{
return toString(null);
diff --git a/src/main/java/org/apache/commons/sanselan/formats/transparencyfilters/TransparencyFilterGrayscale.java b/src/main/java/org/apache/commons/sanselan/formats/transparencyfilters/TransparencyFilterGrayscale.java
index 819313e..43461ae 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/transparencyfilters/TransparencyFilterGrayscale.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/transparencyfilters/TransparencyFilterGrayscale.java
@@ -35,6 +35,7 @@
"tRNS: Missing transparent_color");
}
+ @Override
public int filter(int rgb, int index) throws ImageReadException,
IOException
{
diff --git a/src/main/java/org/apache/commons/sanselan/formats/transparencyfilters/TransparencyFilterIndexedColor.java b/src/main/java/org/apache/commons/sanselan/formats/transparencyfilters/TransparencyFilterIndexedColor.java
index 410ff00..eff9845 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/transparencyfilters/TransparencyFilterIndexedColor.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/transparencyfilters/TransparencyFilterIndexedColor.java
@@ -30,6 +30,7 @@
int count = 0;
+ @Override
public int filter(int rgb, int index) throws ImageReadException,
IOException
{
diff --git a/src/main/java/org/apache/commons/sanselan/formats/transparencyfilters/TransparencyFilterTrueColor.java b/src/main/java/org/apache/commons/sanselan/formats/transparencyfilters/TransparencyFilterTrueColor.java
index df57d07..88cf703 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/transparencyfilters/TransparencyFilterTrueColor.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/transparencyfilters/TransparencyFilterTrueColor.java
@@ -47,6 +47,7 @@
}
+ @Override
public int filter(int rgb, int sample) throws ImageReadException,
IOException
{
diff --git a/src/main/java/org/apache/commons/sanselan/formats/wbmp/WbmpImageParser.java b/src/main/java/org/apache/commons/sanselan/formats/wbmp/WbmpImageParser.java
index 79e3214..dbd06fc 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/wbmp/WbmpImageParser.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/wbmp/WbmpImageParser.java
@@ -45,11 +45,13 @@
{
}
+ @Override
public String getName()
{
return "Wbmp-Custom";
}
+ @Override
public String getDefaultExtension()
{
return DEFAULT_EXTENSION;
@@ -60,11 +62,13 @@
".wbmp",
};
+ @Override
protected String[] getAcceptedExtensions()
{
return ACCEPTED_EXTENSIONS;
}
+ @Override
protected ImageFormat[] getAcceptedTypes()
{
return new ImageFormat[]
@@ -73,17 +77,20 @@
};
}
+ @Override
public boolean embedICCProfile(File src, File dst, byte profile[])
{
return false;
}
+ @Override
public IImageMetadata getMetadata(ByteSource byteSource, Map params)
throws ImageReadException, IOException
{
return null;
}
+ @Override
public ImageInfo getImageInfo(ByteSource byteSource, Map params)
throws ImageReadException, IOException
{
@@ -98,6 +105,7 @@
ImageInfo.COMPRESSION_ALGORITHM_NONE);
}
+ @Override
public Dimension getImageSize(ByteSource byteSource,
Map params)
throws ImageReadException, IOException
@@ -106,6 +114,7 @@
return new Dimension(wbmpHeader.width, wbmpHeader.height);
}
+ @Override
public byte[] getICCProfileBytes(ByteSource byteSource,
Map params)
throws ImageReadException, IOException
@@ -213,6 +222,7 @@
return new WbmpHeader(typeField, fixHeaderField, width, height);
}
+ @Override
public boolean dumpImageFile(PrintWriter pw, ByteSource byteSource)
throws ImageReadException, IOException
{
@@ -236,6 +246,7 @@
colorModel.isAlphaPremultiplied(), new Properties());
}
+ @Override
public final BufferedImage getBufferedImage(ByteSource byteSource,
Map params) throws ImageReadException, IOException
{
@@ -259,6 +270,7 @@
}
}
+ @Override
public void writeImage(BufferedImage src, OutputStream os, Map params)
throws ImageWriteException, IOException
{
@@ -316,6 +328,7 @@
* Map of optional parameters, defined in SanselanConstants.
* @return Xmp Xml as String, if present. Otherwise, returns null.
*/
+ @Override
public String getXmpXml(ByteSource byteSource, Map params)
throws ImageReadException, IOException
{
diff --git a/src/main/java/org/apache/commons/sanselan/formats/xbm/XbmImageParser.java b/src/main/java/org/apache/commons/sanselan/formats/xbm/XbmImageParser.java
index 072393a..a15e61e 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/xbm/XbmImageParser.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/xbm/XbmImageParser.java
@@ -51,11 +51,13 @@
{
}
+ @Override
public String getName()
{
return "Xbm-Custom";
}
+ @Override
public String getDefaultExtension()
{
return DEFAULT_EXTENSION;
@@ -66,11 +68,13 @@
".xbm",
};
+ @Override
protected String[] getAcceptedExtensions()
{
return ACCEPTED_EXTENSIONS;
}
+ @Override
protected ImageFormat[] getAcceptedTypes()
{
return new ImageFormat[]
@@ -79,17 +83,20 @@
};
}
+ @Override
public boolean embedICCProfile(File src, File dst, byte profile[])
{
return false;
}
+ @Override
public IImageMetadata getMetadata(ByteSource byteSource, Map params)
throws ImageReadException, IOException
{
return null;
}
+ @Override
public ImageInfo getImageInfo(ByteSource byteSource, Map params)
throws ImageReadException, IOException
{
@@ -104,6 +111,7 @@
ImageInfo.COMPRESSION_ALGORITHM_NONE);
}
+ @Override
public Dimension getImageSize(ByteSource byteSource,
Map params)
throws ImageReadException, IOException
@@ -112,6 +120,7 @@
return new Dimension(xbmHeader.width, xbmHeader.height);
}
+ @Override
public byte[] getICCProfileBytes(ByteSource byteSource,
Map params)
throws ImageReadException, IOException
@@ -292,6 +301,7 @@
return image;
}
+ @Override
public boolean dumpImageFile(PrintWriter pw, ByteSource byteSource)
throws ImageReadException, IOException
{
@@ -299,6 +309,7 @@
return true;
}
+ @Override
public final BufferedImage getBufferedImage(ByteSource byteSource,
Map params) throws ImageReadException, IOException
{
@@ -328,6 +339,7 @@
return "0x0" + s;
}
+ @Override
public void writeImage(BufferedImage src, OutputStream os, Map params)
throws ImageWriteException, IOException
{
@@ -413,6 +425,7 @@
* Map of optional parameters, defined in SanselanConstants.
* @return Xmp Xml as String, if present. Otherwise, returns null.
*/
+ @Override
public String getXmpXml(ByteSource byteSource, Map params)
throws ImageReadException, IOException
{
diff --git a/src/main/java/org/apache/commons/sanselan/formats/xpm/XpmImageParser.java b/src/main/java/org/apache/commons/sanselan/formats/xpm/XpmImageParser.java
index 90cb61f..68c035d 100644
--- a/src/main/java/org/apache/commons/sanselan/formats/xpm/XpmImageParser.java
+++ b/src/main/java/org/apache/commons/sanselan/formats/xpm/XpmImageParser.java
@@ -114,11 +114,13 @@
}
}
+ @Override
public String getName()
{
return "Xpm-Custom";
}
+ @Override
public String getDefaultExtension()
{
return DEFAULT_EXTENSION;
@@ -129,11 +131,13 @@
".xpm",
};
+ @Override
protected String[] getAcceptedExtensions()
{
return ACCEPTED_EXTENSIONS;
}
+ @Override
protected ImageFormat[] getAcceptedTypes()
{
return new ImageFormat[]
@@ -142,17 +146,20 @@
};
}
+ @Override
public boolean embedICCProfile(File src, File dst, byte profile[])
{
return false;
}
+ @Override
public IImageMetadata getMetadata(ByteSource byteSource, Map params)
throws ImageReadException, IOException
{
return null;
}
+ @Override
public ImageInfo getImageInfo(ByteSource byteSource, Map params)
throws ImageReadException, IOException
{
@@ -181,6 +188,7 @@
ImageInfo.COMPRESSION_ALGORITHM_NONE);
}
+ @Override
public Dimension getImageSize(ByteSource byteSource,
Map params)
throws ImageReadException, IOException
@@ -189,6 +197,7 @@
return new Dimension(xpmHeader.width, xpmHeader.height);
}
+ @Override
public byte[] getICCProfileBytes(ByteSource byteSource,
Map params)
throws ImageReadException, IOException
@@ -670,6 +679,7 @@
return image;
}
+ @Override
public boolean dumpImageFile(PrintWriter pw, ByteSource byteSource)
throws ImageReadException, IOException
{
@@ -677,6 +687,7 @@
return true;
}
+ @Override
public final BufferedImage getBufferedImage(ByteSource byteSource,
Map params) throws ImageReadException, IOException
{
@@ -727,6 +738,7 @@
return "#" + hex;
}
+ @Override
public void writeImage(BufferedImage src, OutputStream os, Map params)
throws ImageWriteException, IOException
{
@@ -916,6 +928,7 @@
* Map of optional parameters, defined in SanselanConstants.
* @return Xmp Xml as String, if present. Otherwise, returns null.
*/
+ @Override
public String getXmpXml(ByteSource byteSource, Map params)
throws ImageReadException, IOException
{
diff --git a/src/main/java/org/apache/commons/sanselan/icc/IccProfileInfo.java b/src/main/java/org/apache/commons/sanselan/icc/IccProfileInfo.java
index 82da694..fa0ed0f 100644
--- a/src/main/java/org/apache/commons/sanselan/icc/IccProfileInfo.java
+++ b/src/main/java/org/apache/commons/sanselan/icc/IccProfileInfo.java
@@ -88,6 +88,7 @@
System.out.print(toString());
}
+ @Override
public String toString()
{
try
diff --git a/src/main/java/org/apache/commons/sanselan/palette/MedianCutQuantizer.java b/src/main/java/org/apache/commons/sanselan/palette/MedianCutQuantizer.java
index a64e192..e7c9fe6 100644
--- a/src/main/java/org/apache/commons/sanselan/palette/MedianCutQuantizer.java
+++ b/src/main/java/org/apache/commons/sanselan/palette/MedianCutQuantizer.java
@@ -54,11 +54,13 @@
// super.hashCode();
}
+ @Override
public int hashCode()
{
return argb;
}
+ @Override
public boolean equals(Object o)
{
if (o instanceof ColorCount) {
@@ -170,6 +172,7 @@
return (alpha << 24) | (red << 16) | (green << 8) | blue;
}
+ @Override
public String toString()
{
return "{ColorGroup. min_red: " + Integer.toHexString(min_red)
@@ -496,6 +499,7 @@
this.root = root;
}
+ @Override
public int getPaletteIndex(int rgb)
{
ColorGroup cg = root;
diff --git a/src/main/java/org/apache/commons/sanselan/palette/QuantizedPalette.java b/src/main/java/org/apache/commons/sanselan/palette/QuantizedPalette.java
index 1d72045..4be80f9 100644
--- a/src/main/java/org/apache/commons/sanselan/palette/QuantizedPalette.java
+++ b/src/main/java/org/apache/commons/sanselan/palette/QuantizedPalette.java
@@ -53,6 +53,7 @@
}
+ @Override
public int getPaletteIndex(int rgb) throws ImageWriteException
{
int precisionMask = (1 << precision) - 1;
@@ -64,6 +65,7 @@
return straight[index].index;
}
+ @Override
public void dump()
{
// System.out.println("ColorSpaceSubset.compares: "
@@ -72,12 +74,14 @@
// System.out.println("avg. distance: " + (distance / converted));
}
+ @Override
public int getEntry(int index)
{
ColorSpaceSubset subset = subsets.get(index);
return subset.rgb;
}
+ @Override
public int length()
{
return subsets.size();
diff --git a/src/main/java/org/apache/commons/sanselan/palette/SimplePalette.java b/src/main/java/org/apache/commons/sanselan/palette/SimplePalette.java
index 2647963..8192539 100644
--- a/src/main/java/org/apache/commons/sanselan/palette/SimplePalette.java
+++ b/src/main/java/org/apache/commons/sanselan/palette/SimplePalette.java
@@ -27,11 +27,13 @@
this.palette = palette;
}
+ @Override
public int getPaletteIndex(int rgb)
{
return getPaletteIndex(palette, rgb);
}
+ @Override
public int getEntry(int index)
{
return palette[index];
@@ -56,6 +58,7 @@
return -1;
}
+ @Override
public void dump()
{
for (int i = 0; i < palette.length; i++)
@@ -65,6 +68,7 @@
}
}
+ @Override
public int length()
{
return palette.length;
diff --git a/src/main/java/org/apache/commons/sanselan/util/CachingInputStream.java b/src/main/java/org/apache/commons/sanselan/util/CachingInputStream.java
index 330b589..996ac46 100644
--- a/src/main/java/org/apache/commons/sanselan/util/CachingInputStream.java
+++ b/src/main/java/org/apache/commons/sanselan/util/CachingInputStream.java
@@ -36,6 +36,7 @@
return baos.toByteArray();
}
+ @Override
public int read() throws IOException
{
int result = is.read();
@@ -43,11 +44,13 @@
return result;
}
+ @Override
public int available() throws IOException
{
return is.available();
}
+ @Override
public void close() throws IOException
{
is.close();
diff --git a/src/main/java/org/apache/commons/sanselan/util/CachingOutputStream.java b/src/main/java/org/apache/commons/sanselan/util/CachingOutputStream.java
index b0792dc..ce52feb 100644
--- a/src/main/java/org/apache/commons/sanselan/util/CachingOutputStream.java
+++ b/src/main/java/org/apache/commons/sanselan/util/CachingOutputStream.java
@@ -31,6 +31,7 @@
this.os = os;
}
+ @Override
public void write(int b) throws IOException
{
os.write(b);
@@ -42,11 +43,13 @@
return baos.toByteArray();
}
+ @Override
public void close() throws IOException
{
os.close();
}
+ @Override
public void flush() throws IOException
{
os.flush();
diff --git a/src/main/java/org/apache/commons/sanselan/util/DebugInputStream.java b/src/main/java/org/apache/commons/sanselan/util/DebugInputStream.java
index d10b161..1001f45 100644
--- a/src/main/java/org/apache/commons/sanselan/util/DebugInputStream.java
+++ b/src/main/java/org/apache/commons/sanselan/util/DebugInputStream.java
@@ -31,6 +31,7 @@
private long bytes_read = 0;
+ @Override
public int read() throws IOException
{
int result = is.read();
@@ -38,6 +39,7 @@
return result;
}
+ @Override
public long skip(long n) throws IOException
{
long result = is.skip(n);
@@ -45,11 +47,13 @@
return result;
}
+ @Override
public int available() throws IOException
{
return is.available();
}
+ @Override
public void close() throws IOException
{
is.close();
diff --git a/src/main/java/org/apache/commons/sanselan/util/DebugOutputStream.java b/src/main/java/org/apache/commons/sanselan/util/DebugOutputStream.java
index 66d8c95..3ff4331 100644
--- a/src/main/java/org/apache/commons/sanselan/util/DebugOutputStream.java
+++ b/src/main/java/org/apache/commons/sanselan/util/DebugOutputStream.java
@@ -31,29 +31,34 @@
this.os = os;
}
+ @Override
public void write(int b) throws IOException
{
os.write(b);
count++;
}
+ @Override
public void write(byte b[]) throws IOException
{
os.write(b);
count += b.length;
}
+ @Override
public void write(byte b[], int off, int len) throws IOException
{
os.write(b, off, len);
count += len;
}
+ @Override
public void flush() throws IOException
{
os.flush();
}
+ @Override
public void close() throws IOException
{
os.close();
diff --git a/src/main/java/org/apache/commons/sanselan/util/UnicodeUtils.java b/src/main/java/org/apache/commons/sanselan/util/UnicodeUtils.java
index 7a8cf6b..92f21c2 100644
--- a/src/main/java/org/apache/commons/sanselan/util/UnicodeUtils.java
+++ b/src/main/java/org/apache/commons/sanselan/util/UnicodeUtils.java
@@ -230,6 +230,7 @@
private static class UnicodeMetricsASCII extends UnicodeUtils
{
+ @Override
public int findEnd(byte bytes[], int index, boolean includeTerminator)
throws UnicodeException
{
@@ -261,6 +262,7 @@
private static class UnicodeMetricsUTF8 extends UnicodeUtils
{
+ @Override
public int findEnd(byte bytes[], int index, boolean includeTerminator)
throws UnicodeException
{
@@ -384,6 +386,7 @@
}
}
+ @Override
public int findEnd(byte bytes[], int index, boolean includeTerminator)
throws UnicodeException
{
@@ -437,6 +440,7 @@
super(BYTE_ORDER_BIG_ENDIAN);
}
+ @Override
public int findEnd(byte bytes[], int index, boolean includeTerminator)
throws UnicodeException
{
diff --git a/src/test/java/org/apache/commons/sanselan/formats/jpeg/exif/MakerNoteFieldTest.java b/src/test/java/org/apache/commons/sanselan/formats/jpeg/exif/MakerNoteFieldTest.java
index 4909358..4b069d5 100644
--- a/src/test/java/org/apache/commons/sanselan/formats/jpeg/exif/MakerNoteFieldTest.java
+++ b/src/test/java/org/apache/commons/sanselan/formats/jpeg/exif/MakerNoteFieldTest.java
@@ -33,6 +33,7 @@
// super(name);
// }
+ @Override
protected void checkField(File imageFile, TiffField field)
throws IOException, ImageReadException, ImageWriteException
{
diff --git a/src/test/java/org/apache/commons/sanselan/formats/jpeg/exif/TextFieldTest.java b/src/test/java/org/apache/commons/sanselan/formats/jpeg/exif/TextFieldTest.java
index b8b3482..9aa370e 100644
--- a/src/test/java/org/apache/commons/sanselan/formats/jpeg/exif/TextFieldTest.java
+++ b/src/test/java/org/apache/commons/sanselan/formats/jpeg/exif/TextFieldTest.java
@@ -35,6 +35,7 @@
// super(name);
// }
+ @Override
protected void checkField(File imageFile, TiffField field)
throws IOException, ImageReadException, ImageWriteException
{
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 93c0ab8..7f7aacc 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
@@ -40,6 +40,7 @@
{
private List imagesWithIptcData;
+ @Override
public void setUp() throws Exception
{
super.setUp();
@@ -47,6 +48,7 @@
imagesWithIptcData = getImagesWithIptcData();
}
+ @Override
public void tearDown() throws Exception
{
super.tearDown();
