You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by se...@apache.org on 2012/04/01 13:11:50 UTC
svn commit: r1308075 [1/3] - in /commons/proper/sanselan/trunk/src:
main/java/org/apache/commons/sanselan/
main/java/org/apache/commons/sanselan/color/
main/java/org/apache/commons/sanselan/common/
main/java/org/apache/commons/sanselan/common/bytesourc...
Author: sebb
Date: Sun Apr 1 11:11:43 2012
New Revision: 1308075
URL: http://svn.apache.org/viewvc?rev=1308075&view=rev
Log:
MIssing @Overrides
Modified:
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/FormatCompliance.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/ImageFormat.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/ImageInfo.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/color/ColorCieLab.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/color/ColorCieLch.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/color/ColorCieLuv.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/color/ColorCmy.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/color/ColorCmyk.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/color/ColorHsl.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/color/ColorHsv.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/color/ColorHunterLab.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/color/ColorXyz.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/common/BinaryInputStream.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/common/BinaryOutputStream.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/common/BitInputStream.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/common/BitInputStreamFlexible.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/common/ImageMetadata.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/common/MyByteArrayOutputStream.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/common/RationalNumber.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/common/RationalNumberUtilities.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/common/bytesource/ByteSourceArray.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/common/bytesource/ByteSourceFile.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/common/bytesource/ByteSourceInputStream.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/common/mylzw/BitsToByteInputStream.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/common/mylzw/MyBitInputStream.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/common/mylzw/MyBitOutputStream.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/common/mylzw/MyLzwCompressor.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/bmp/BmpImageParser.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/bmp/pixelparsers/PixelParserBitFields.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/bmp/pixelparsers/PixelParserRgb.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/bmp/pixelparsers/PixelParserRle.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/bmp/pixelparsers/PixelParserSimple.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/bmp/writers/BmpWriterPalette.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/bmp/writers/BmpWriterRgb.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/dcx/DcxImageParser.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/gif/GifImageParser.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/icns/IcnsImageParser.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/icns/IcnsType.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/ico/IcoImageParser.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg/JpegImageMetadata.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg/JpegImageParser.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg/exif/ExifRewriter.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg/iptc/IptcTypes.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg/segments/AppnSegment.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg/segments/ComSegment.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg/segments/DhtSegment.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg/segments/DqtSegment.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg/segments/GenericSegment.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg/segments/JfifSegment.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg/segments/Segment.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg/segments/SofnSegment.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg/segments/SosSegment.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg/segments/UnknownSegment.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg/xmp/JpegRewriter.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/pcx/PcxImageParser.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/png/PngImageParser.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/png/ScanExpediterInterlaced.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/png/ScanExpediterSimple.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/png/chunks/PngChunkItxt.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/png/chunks/PngChunkText.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/png/chunks/PngChunkZtxt.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/png/scanlinefilters/ScanlineFilterAverage.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/png/scanlinefilters/ScanlineFilterNone.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/png/scanlinefilters/ScanlineFilterPaeth.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/png/scanlinefilters/ScanlineFilterSub.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/png/scanlinefilters/ScanlineFilterUp.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/pnm/PbmFileInfo.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/pnm/PbmWriter.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/pnm/PgmFileInfo.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/pnm/PgmWriter.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/pnm/PnmImageParser.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/pnm/PpmFileInfo.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/pnm/PpmWriter.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/psd/PsdImageParser.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/psd/dataparsers/DataParserBitmap.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/psd/dataparsers/DataParserCmyk.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/psd/dataparsers/DataParserGrayscale.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/psd/dataparsers/DataParserIndexed.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/psd/dataparsers/DataParserLab.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/psd/dataparsers/DataParserRgb.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/psd/dataparsers/DataParserStub.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/psd/datareaders/CompressedDataReader.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/psd/datareaders/UncompressedDataReader.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/rgbe/RgbeImageParser.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/JpegImageData.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/TiffDirectory.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/TiffElement.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/TiffField.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/TiffHeader.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/TiffImageData.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/TiffImageMetadata.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/TiffImageParser.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/TiffReader.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/datareaders/DataReaderStrips.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/datareaders/DataReaderTiled.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/fieldtypes/FieldType.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/fieldtypes/FieldTypeAscii.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/fieldtypes/FieldTypeByte.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/fieldtypes/FieldTypeDouble.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/fieldtypes/FieldTypeFloat.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/fieldtypes/FieldTypeLong.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/fieldtypes/FieldTypeRational.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/fieldtypes/FieldTypeShort.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/fieldtypes/FieldTypeUnknown.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/photometricinterpreters/PhotometricInterpreterBiLevel.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/photometricinterpreters/PhotometricInterpreterCieLab.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/photometricinterpreters/PhotometricInterpreterCmyk.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/photometricinterpreters/PhotometricInterpreterLogLuv.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/photometricinterpreters/PhotometricInterpreterPalette.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/photometricinterpreters/PhotometricInterpreterRgb.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/photometricinterpreters/PhotometricInterpreterYCbCr.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/taginfos/TagInfo.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/taginfos/TagInfoGpsText.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/write/TiffImageWriterLossless.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/write/TiffImageWriterLossy.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/write/TiffOutputDirectory.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/write/TiffOutputField.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/write/TiffOutputItem.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/write/TiffOutputSet.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/transparencyfilters/TransparencyFilterGrayscale.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/transparencyfilters/TransparencyFilterIndexedColor.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/transparencyfilters/TransparencyFilterTrueColor.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/wbmp/WbmpImageParser.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/xbm/XbmImageParser.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/xpm/XpmImageParser.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/icc/IccProfileInfo.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/palette/MedianCutQuantizer.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/palette/QuantizedPalette.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/palette/SimplePalette.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/util/CachingInputStream.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/util/CachingOutputStream.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/util/DebugInputStream.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/util/DebugOutputStream.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/util/UnicodeUtils.java
commons/proper/sanselan/trunk/src/test/java/org/apache/commons/sanselan/formats/jpeg/exif/MakerNoteFieldTest.java
commons/proper/sanselan/trunk/src/test/java/org/apache/commons/sanselan/formats/jpeg/exif/TextFieldTest.java
commons/proper/sanselan/trunk/src/test/java/org/apache/commons/sanselan/formats/jpeg/iptc/IptcUpdateTest.java
Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/FormatCompliance.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/FormatCompliance.java?rev=1308075&r1=1308074&r2=1308075&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/FormatCompliance.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/FormatCompliance.java Sun Apr 1 11:11:43 2012
@@ -57,6 +57,7 @@ public class FormatCompliance
addComment(s + ": " + getValueDescription(value));
}
+ @Override
public String toString()
{
StringWriter sw = new StringWriter();
Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/ImageFormat.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/ImageFormat.java?rev=1308075&r1=1308074&r2=1308075&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/ImageFormat.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/ImageFormat.java Sun Apr 1 11:11:43 2012
@@ -36,6 +36,7 @@ public class ImageFormat
actual = true;
}
+ @Override
public boolean equals(Object o)
{
if (!(o instanceof ImageFormat))
@@ -47,11 +48,13 @@ public class ImageFormat
}
+ @Override
public String toString()
{
return "{" + name + ": " + extension + "}";
}
+ @Override
public int hashCode()
{
return name.hashCode();
Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/ImageInfo.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/ImageInfo.java?rev=1308075&r1=1308074&r2=1308075&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/ImageInfo.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/ImageInfo.java Sun Apr 1 11:11:43 2012
@@ -292,6 +292,7 @@ public class ImageInfo
System.out.print(toString());
}
+ @Override
public String toString()
{
try
Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/color/ColorCieLab.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/color/ColorCieLab.java?rev=1308075&r1=1308074&r2=1308075&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/color/ColorCieLab.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/color/ColorCieLab.java Sun Apr 1 11:11:43 2012
@@ -27,6 +27,7 @@ public final class ColorCieLab
this.b = b;
}
+ @Override
public final String toString()
{
return "{L: " + L + ", a: " + a + ", b: " + b + "}";
Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/color/ColorCieLch.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/color/ColorCieLch.java?rev=1308075&r1=1308074&r2=1308075&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/color/ColorCieLch.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/color/ColorCieLch.java Sun Apr 1 11:11:43 2012
@@ -27,6 +27,7 @@ public final class ColorCieLch
this.H = H;
}
+ @Override
public String toString()
{
return "{L: " + L + ", C: " + C + ", H: " + H + "}";
Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/color/ColorCieLuv.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/color/ColorCieLuv.java?rev=1308075&r1=1308074&r2=1308075&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/color/ColorCieLuv.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/color/ColorCieLuv.java Sun Apr 1 11:11:43 2012
@@ -27,6 +27,7 @@ public final class ColorCieLuv
this.v = v;
}
+ @Override
public String toString()
{
return "{L: " + L + ", u: " + u + ", v: " + v + "}";
Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/color/ColorCmy.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/color/ColorCmy.java?rev=1308075&r1=1308074&r2=1308075&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/color/ColorCmy.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/color/ColorCmy.java Sun Apr 1 11:11:43 2012
@@ -27,6 +27,7 @@ public final class ColorCmy
this.Y = Y;
}
+ @Override
public final String toString()
{
return "{C: " + C + ", M: " + M + ", Y: " + Y + "}";
Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/color/ColorCmyk.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/color/ColorCmyk.java?rev=1308075&r1=1308074&r2=1308075&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/color/ColorCmyk.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/color/ColorCmyk.java Sun Apr 1 11:11:43 2012
@@ -28,6 +28,7 @@ public final class ColorCmyk
this.K = K;
}
+ @Override
public final String toString()
{
return "{C: " + C + ", M: " + M + ", Y: " + Y + ", K: " + K + "}";
Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/color/ColorHsl.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/color/ColorHsl.java?rev=1308075&r1=1308074&r2=1308075&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/color/ColorHsl.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/color/ColorHsl.java Sun Apr 1 11:11:43 2012
@@ -27,6 +27,7 @@ public final class ColorHsl
L = v;
}
+ @Override
public final String toString()
{
return "{H: " + H + ", S: " + S + ", L: " + L + "}";
Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/color/ColorHsv.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/color/ColorHsv.java?rev=1308075&r1=1308074&r2=1308075&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/color/ColorHsv.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/color/ColorHsv.java Sun Apr 1 11:11:43 2012
@@ -27,6 +27,7 @@ public final class ColorHsv
V = v;
}
+ @Override
public final String toString()
{
return "{H: " + H + ", S: " + S + ", V: " + V + "}";
Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/color/ColorHunterLab.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/color/ColorHunterLab.java?rev=1308075&r1=1308074&r2=1308075&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/color/ColorHunterLab.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/color/ColorHunterLab.java Sun Apr 1 11:11:43 2012
@@ -27,6 +27,7 @@ public final class ColorHunterLab
this.b = b;
}
+ @Override
public final String toString()
{
return "{L: " + L + ", a: " + a + ", b: " + b + "}";
Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/color/ColorXyz.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/color/ColorXyz.java?rev=1308075&r1=1308074&r2=1308075&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/color/ColorXyz.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/color/ColorXyz.java Sun Apr 1 11:11:43 2012
@@ -27,6 +27,7 @@ public final class ColorXyz
Z = z;
}
+ @Override
public final String toString()
{
return "{X: " + X + ", Y: " + Y + ", Z: " + Z + "}";
Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/common/BinaryInputStream.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/common/BinaryInputStream.java?rev=1308075&r1=1308074&r2=1308075&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/common/BinaryInputStream.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/common/BinaryInputStream.java Sun Apr 1 11:11:43 2012
@@ -83,6 +83,7 @@ public class BinaryInputStream extends I
return byteOrder;
}
+ @Override
public int read() throws IOException
{
return is.read();
Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/common/BinaryOutputStream.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/common/BinaryOutputStream.java?rev=1308075&r1=1308074&r2=1308075&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/common/BinaryOutputStream.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/common/BinaryOutputStream.java Sun Apr 1 11:11:43 2012
@@ -76,6 +76,7 @@ public class BinaryOutputStream extends
return byteOrder;
}
+ @Override
public void write(int i) throws IOException
{
os.write(i);
Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/common/BitInputStream.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/common/BitInputStream.java?rev=1308075&r1=1308074&r2=1308075&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/common/BitInputStream.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/common/BitInputStream.java Sun Apr 1 11:11:43 2012
@@ -32,6 +32,7 @@ public class BitInputStream extends Inpu
// super(is);
}
+ @Override
public int read() throws IOException
{
if (cacheBitsRemaining > 0)
Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/common/BitInputStreamFlexible.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/common/BitInputStreamFlexible.java?rev=1308075&r1=1308074&r2=1308075&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/common/BitInputStreamFlexible.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/common/BitInputStreamFlexible.java Sun Apr 1 11:11:43 2012
@@ -33,6 +33,7 @@ public class BitInputStreamFlexible exte
// super(is);
}
+ @Override
public int read() throws IOException
{
if (cacheBitsRemaining > 0)
Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/common/ImageMetadata.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/common/ImageMetadata.java?rev=1308075&r1=1308074&r2=1308075&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/common/ImageMetadata.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/common/ImageMetadata.java Sun Apr 1 11:11:43 2012
@@ -40,6 +40,7 @@ public class ImageMetadata implements II
protected static final String newline = System.getProperty("line.separator");
+ @Override
public String toString()
{
return toString(null);
@@ -89,6 +90,7 @@ public class ImageMetadata implements II
return text;
}
+ @Override
public String toString()
{
return toString(null);
Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/common/MyByteArrayOutputStream.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/common/MyByteArrayOutputStream.java?rev=1308075&r1=1308074&r2=1308075&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/common/MyByteArrayOutputStream.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/common/MyByteArrayOutputStream.java Sun Apr 1 11:11:43 2012
@@ -31,6 +31,7 @@ public class MyByteArrayOutputStream ext
private int count = 0;
+ @Override
public void write(int value) throws IOException
{
if (count >= bytes.length)
Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/common/RationalNumber.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/common/RationalNumber.java?rev=1308075&r1=1308074&r2=1308075&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/common/RationalNumber.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/common/RationalNumber.java Sun Apr 1 11:11:43 2012
@@ -79,21 +79,25 @@ public class RationalNumber extends Numb
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 @@ public class RationalNumber extends Numb
private static final NumberFormat nf = DecimalFormat.getInstance();
+ @Override
public String toString()
{
if (divisor == 0)
Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/common/RationalNumberUtilities.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/common/RationalNumberUtilities.java?rev=1308075&r1=1308074&r2=1308075&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/common/RationalNumberUtilities.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/common/RationalNumberUtilities.java Sun Apr 1 11:11:43 2012
@@ -38,6 +38,7 @@ public abstract class RationalNumberUtil
- value));
}
+ @Override
public String toString()
{
return rationalNumber.toString();
Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/common/bytesource/ByteSourceArray.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/common/bytesource/ByteSourceArray.java?rev=1308075&r1=1308074&r2=1308075&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/common/bytesource/ByteSourceArray.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/common/bytesource/ByteSourceArray.java Sun Apr 1 11:11:43 2012
@@ -36,11 +36,13 @@ public class ByteSourceArray extends Byt
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 @@ public class ByteSourceArray extends Byt
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";
Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/common/bytesource/ByteSourceFile.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/common/bytesource/ByteSourceFile.java?rev=1308075&r1=1308074&r2=1308075&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/common/bytesource/ByteSourceFile.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/common/bytesource/ByteSourceFile.java Sun Apr 1 11:11:43 2012
@@ -36,6 +36,7 @@ public class ByteSourceFile extends Byte
this.file = file;
}
+ @Override
public InputStream getInputStream() throws IOException
{
FileInputStream is = null;
@@ -45,6 +46,7 @@ public class ByteSourceFile extends Byte
return bis;
}
+ @Override
public byte[] getBlock(int start, int length) throws IOException
{
@@ -79,11 +81,13 @@ public class ByteSourceFile extends Byte
}
}
+ @Override
public long getLength()
{
return file.length();
}
+ @Override
public byte[] getAll() throws IOException
{
ByteArrayOutputStream baos = new ByteArrayOutputStream();
@@ -115,6 +119,7 @@ public class ByteSourceFile extends Byte
}
}
+ @Override
public String getDescription()
{
return "File: '" + file.getAbsolutePath() + "'";
Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/common/bytesource/ByteSourceInputStream.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/common/bytesource/ByteSourceInputStream.java?rev=1308075&r1=1308074&r2=1308075&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/common/bytesource/ByteSourceInputStream.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/common/bytesource/ByteSourceInputStream.java Sun Apr 1 11:11:43 2012
@@ -96,6 +96,7 @@ public class ByteSourceInputStream exten
private boolean readFirst = false;
private int blockIndex = 0;
+ @Override
public int read() throws IOException
{
if (null == block)
@@ -121,6 +122,7 @@ public class ByteSourceInputStream exten
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 @@ public class ByteSourceInputStream exten
}
+ @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 @@ public class ByteSourceInputStream exten
private Long streamLength = null;
+ @Override
public long getLength() throws IOException
{
if (streamLength != null)
@@ -211,6 +216,7 @@ public class ByteSourceInputStream exten
return result;
}
+ @Override
public byte[] getAll() throws IOException
{
ByteArrayOutputStream baos = new ByteArrayOutputStream();
@@ -224,6 +230,7 @@ public class ByteSourceInputStream exten
return baos.toByteArray();
}
+ @Override
public String getDescription()
{
return "Inputstream: '" + filename + "'";
Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/common/mylzw/BitsToByteInputStream.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/common/mylzw/BitsToByteInputStream.java?rev=1308075&r1=1308074&r2=1308075&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/common/mylzw/BitsToByteInputStream.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/common/mylzw/BitsToByteInputStream.java Sun Apr 1 11:11:43 2012
@@ -30,6 +30,7 @@ public class BitsToByteInputStream exten
this.desiredDepth = desiredDepth;
}
+ @Override
public int read() throws IOException
{
return readBits(8);
Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/common/mylzw/MyBitInputStream.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/common/mylzw/MyBitInputStream.java?rev=1308075&r1=1308074&r2=1308075&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/common/mylzw/MyBitInputStream.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/common/mylzw/MyBitInputStream.java Sun Apr 1 11:11:43 2012
@@ -33,6 +33,7 @@ public class MyBitInputStream extends In
this.is = is;
}
+ @Override
public int read() throws IOException
{
return readBits(8);
Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/common/mylzw/MyBitOutputStream.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/common/mylzw/MyBitOutputStream.java?rev=1308075&r1=1308074&r2=1308075&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/common/mylzw/MyBitOutputStream.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/common/mylzw/MyBitOutputStream.java Sun Apr 1 11:11:43 2012
@@ -32,6 +32,7 @@ public class MyBitOutputStream extends O
this.os = os;
}
+ @Override
public void write(int value) throws IOException
{
writeBits(value, 8);
Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/common/mylzw/MyLzwCompressor.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/common/mylzw/MyLzwCompressor.java?rev=1308075&r1=1308074&r2=1308075&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/common/mylzw/MyLzwCompressor.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/common/mylzw/MyLzwCompressor.java Sun Apr 1 11:11:43 2012
@@ -126,11 +126,13 @@ public class MyLzwCompressor
hash = tempHash;
}
+ @Override
public final int hashCode()
{
return hash;
}
+ @Override
public final boolean equals(Object o)
{
if (o instanceof ByteArray) {
Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/bmp/BmpImageParser.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/bmp/BmpImageParser.java?rev=1308075&r1=1308074&r2=1308075&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/bmp/BmpImageParser.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/bmp/BmpImageParser.java Sun Apr 1 11:11:43 2012
@@ -60,11 +60,13 @@ public class BmpImageParser extends Imag
super.setByteOrder(BYTE_ORDER_INTEL);
}
+ @Override
public String getName()
{
return "Bmp-Custom";
}
+ @Override
public String getDefaultExtension()
{
return DEFAULT_EXTENSION;
@@ -74,11 +76,13 @@ public class BmpImageParser extends Imag
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 @@ public class BmpImageParser extends Imag
}
}
+ @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 @@ public class BmpImageParser extends Imag
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 @@ public class BmpImageParser extends Imag
return "Unknown";
}
+ @Override
public ImageInfo getImageInfo(ByteSource byteSource, Map params)
throws ImageReadException, IOException
{
@@ -659,6 +668,7 @@ public class BmpImageParser extends Imag
return result;
}
+ @Override
public boolean dumpImageFile(PrintWriter pw, ByteSource byteSource)
throws ImageReadException, IOException
{
@@ -675,6 +685,7 @@ public class BmpImageParser extends Imag
return true;
}
+ @Override
public FormatCompliance getFormatCompliance(ByteSource byteSource)
throws ImageReadException, IOException
{
@@ -699,6 +710,7 @@ public class BmpImageParser extends Imag
return result;
}
+ @Override
public BufferedImage getBufferedImage(ByteSource byteSource, Map params)
throws ImageReadException, IOException
{
@@ -767,6 +779,7 @@ public class BmpImageParser extends Imag
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 @@ public class BmpImageParser extends Imag
* 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
{
Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/bmp/pixelparsers/PixelParserBitFields.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/bmp/pixelparsers/PixelParserBitFields.java?rev=1308075&r1=1308074&r2=1308075&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/bmp/pixelparsers/PixelParserBitFields.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/bmp/pixelparsers/PixelParserBitFields.java Sun Apr 1 11:11:43 2012
@@ -72,6 +72,7 @@ public class PixelParserBitFields extend
}
private int bytecount = 0;
+ @Override
public int getNextRGB() throws ImageReadException, IOException
{
int data;
@@ -115,6 +116,7 @@ public class PixelParserBitFields extend
return rgb;
}
+ @Override
public void newline() throws ImageReadException, IOException
{
while (((bytecount) % 4) != 0)
Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/bmp/pixelparsers/PixelParserRgb.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/bmp/pixelparsers/PixelParserRgb.java?rev=1308075&r1=1308074&r2=1308075&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/bmp/pixelparsers/PixelParserRgb.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/bmp/pixelparsers/PixelParserRgb.java Sun Apr 1 11:11:43 2012
@@ -36,6 +36,7 @@ public class PixelParserRgb extends Pixe
int pixelCount = 0;
+ @Override
public int getNextRGB() throws ImageReadException, IOException
{
pixelCount++;
@@ -115,6 +116,7 @@ public class PixelParserRgb extends Pixe
+ bhi.bitsPerPixel);
}
+ @Override
public void newline() throws ImageReadException, IOException
{
cached_bit_count = 0;
Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/bmp/pixelparsers/PixelParserRle.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/bmp/pixelparsers/PixelParserRle.java?rev=1308075&r1=1308074&r2=1308075&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/bmp/pixelparsers/PixelParserRle.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/bmp/pixelparsers/PixelParserRle.java Sun Apr 1 11:11:43 2012
@@ -99,6 +99,7 @@ public class PixelParserRle extends Pixe
return pixels_written;
}
+ @Override
public void processImage(ImageBuilder imageBuilder) throws ImageReadException,
IOException
{
Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/bmp/pixelparsers/PixelParserSimple.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/bmp/pixelparsers/PixelParserSimple.java?rev=1308075&r1=1308074&r2=1308075&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/bmp/pixelparsers/PixelParserSimple.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/bmp/pixelparsers/PixelParserSimple.java Sun Apr 1 11:11:43 2012
@@ -34,6 +34,7 @@ public abstract class PixelParserSimple
public abstract void newline() throws ImageReadException, IOException;
+ @Override
public void processImage(ImageBuilder imageBuilder) throws ImageReadException,
IOException
{
Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/bmp/writers/BmpWriterPalette.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/bmp/writers/BmpWriterPalette.java?rev=1308075&r1=1308074&r2=1308075&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/bmp/writers/BmpWriterPalette.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/bmp/writers/BmpWriterPalette.java Sun Apr 1 11:11:43 2012
@@ -40,16 +40,19 @@ public class BmpWriterPalette extends Bm
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 @@ public class BmpWriterPalette extends Bm
}
}
+ @Override
public byte[] getImageData(BufferedImage src)
{
int width = src.getWidth();
Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/bmp/writers/BmpWriterRgb.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/bmp/writers/BmpWriterRgb.java?rev=1308075&r1=1308074&r2=1308075&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/bmp/writers/BmpWriterRgb.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/bmp/writers/BmpWriterRgb.java Sun Apr 1 11:11:43 2012
@@ -31,21 +31,25 @@ public class BmpWriterRgb extends BmpWri
// 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();
Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/dcx/DcxImageParser.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/dcx/DcxImageParser.java?rev=1308075&r1=1308074&r2=1308075&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/dcx/DcxImageParser.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/dcx/DcxImageParser.java Sun Apr 1 11:11:43 2012
@@ -49,11 +49,13 @@ public class DcxImageParser extends Imag
super.setByteOrder(BYTE_ORDER_LSB);
}
+ @Override
public String getName()
{
return "Dcx-Custom";
}
+ @Override
public String getDefaultExtension()
{
return DEFAULT_EXTENSION;
@@ -64,11 +66,13 @@ public class DcxImageParser extends Imag
".dcx",
};
+ @Override
protected String[] getAcceptedExtensions()
{
return ACCEPTED_EXTENSIONS;
}
+ @Override
protected ImageFormat[] getAcceptedTypes()
{
return new ImageFormat[]
@@ -77,23 +81,27 @@ public class DcxImageParser extends Imag
};
}
+ @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 @@ public class DcxImageParser extends Imag
return null;
}
+ @Override
public byte[] getICCProfileBytes(ByteSource byteSource,
Map params)
throws ImageReadException, IOException
@@ -175,6 +184,7 @@ public class DcxImageParser extends Imag
}
}
+ @Override
public boolean dumpImageFile(PrintWriter pw, ByteSource byteSource)
throws ImageReadException, IOException
{
@@ -182,6 +192,7 @@ public class DcxImageParser extends Imag
return true;
}
+ @Override
public final BufferedImage getBufferedImage(ByteSource byteSource,
Map params) throws ImageReadException, IOException
{
@@ -191,6 +202,7 @@ public class DcxImageParser extends Imag
return list.get(0);
}
+ @Override
public List<BufferedImage> getAllBufferedImages(ByteSource byteSource)
throws ImageReadException, IOException
{
@@ -222,6 +234,7 @@ public class DcxImageParser extends Imag
return images;
}
+ @Override
public void writeImage(BufferedImage src, OutputStream os, Map params)
throws ImageWriteException, IOException
{
@@ -270,6 +283,7 @@ public class DcxImageParser extends Imag
* 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
{
Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/gif/GifImageParser.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/gif/GifImageParser.java?rev=1308075&r1=1308074&r2=1308075&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/gif/GifImageParser.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/gif/GifImageParser.java Sun Apr 1 11:11:43 2012
@@ -56,11 +56,13 @@ public class GifImageParser extends Imag
super.setByteOrder(BYTE_ORDER_LSB);
}
+ @Override
public String getName()
{
return "Gif-Custom";
}
+ @Override
public String getDefaultExtension()
{
return DEFAULT_EXTENSION;
@@ -70,11 +72,13 @@ public class GifImageParser extends Imag
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 @@ public class GifImageParser extends Imag
}
}
+ @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 @@ public class GifImageParser extends Imag
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 @@ public class GifImageParser extends Imag
return result;
}
+ @Override
public ImageInfo getImageInfo(ByteSource byteSource, Map params)
throws ImageReadException, IOException
{
@@ -636,6 +645,7 @@ public class GifImageParser extends Imag
return result;
}
+ @Override
public boolean dumpImageFile(PrintWriter pw, ByteSource byteSource)
throws ImageReadException, IOException
{
@@ -694,6 +704,7 @@ public class GifImageParser extends Imag
return result;
}
+ @Override
public FormatCompliance getFormatCompliance(ByteSource byteSource)
throws ImageReadException, IOException
{
@@ -705,6 +716,7 @@ public class GifImageParser extends Imag
return result;
}
+ @Override
public BufferedImage getBufferedImage(ByteSource byteSource, Map params)
throws ImageReadException, IOException
{
@@ -824,6 +836,7 @@ public class GifImageParser extends Imag
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 @@ public class GifImageParser extends Imag
* 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
{
Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/icns/IcnsImageParser.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/icns/IcnsImageParser.java?rev=1308075&r1=1308074&r2=1308075&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/icns/IcnsImageParser.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/icns/IcnsImageParser.java Sun Apr 1 11:11:43 2012
@@ -48,11 +48,13 @@ public class IcnsImageParser extends Ima
super.setByteOrder(BYTE_ORDER_MSB);
}
+ @Override
public String getName()
{
return "icns-Custom";
}
+ @Override
public String getDefaultExtension()
{
return DEFAULT_EXTENSION;
@@ -64,11 +66,13 @@ public class IcnsImageParser extends Ima
".icns",
};
+ @Override
protected String[] getAcceptedExtensions()
{
return ACCEPTED_EXTENSIONS;
}
+ @Override
protected ImageFormat[] getAcceptedTypes()
{
return new ImageFormat[]{
@@ -76,17 +80,20 @@ public class IcnsImageParser extends Ima
};
}
+ @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 @@ public class IcnsImageParser extends Ima
ImageInfo.COMPRESSION_ALGORITHM_UNKNOWN);
}
+ @Override
public Dimension getImageSize(ByteSource byteSource,
Map params)
throws ImageReadException, IOException
@@ -143,6 +151,7 @@ public class IcnsImageParser extends Ima
return new Dimension(image0.getWidth(), image0.getHeight());
}
+ @Override
public byte[] getICCProfileBytes(ByteSource byteSource,
Map params)
throws ImageReadException, IOException
@@ -274,6 +283,7 @@ public class IcnsImageParser extends Ima
}
}
+ @Override
public boolean dumpImageFile(PrintWriter pw, ByteSource byteSource)
throws ImageReadException, IOException
{
@@ -284,6 +294,7 @@ public class IcnsImageParser extends Ima
return true;
}
+ @Override
public final BufferedImage getBufferedImage(ByteSource byteSource,
Map params) throws ImageReadException, IOException
{
@@ -295,6 +306,7 @@ public class IcnsImageParser extends Ima
throw new ImageReadException("No icons in ICNS file");
}
+ @Override
public List<BufferedImage> getAllBufferedImages(ByteSource byteSource)
throws ImageReadException, IOException
{
@@ -302,6 +314,7 @@ public class IcnsImageParser extends Ima
return IcnsDecoder.decodeAllImages(icnsContents.icnsElements);
}
+ @Override
public void writeImage(BufferedImage src, OutputStream os, Map params)
throws ImageWriteException, IOException
{
@@ -373,6 +386,7 @@ public class IcnsImageParser extends Ima
* 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
{
Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/icns/IcnsType.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/icns/IcnsType.java?rev=1308075&r1=1308074&r2=1308075&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/icns/IcnsType.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/icns/IcnsType.java Sun Apr 1 11:11:43 2012
@@ -132,6 +132,7 @@ public class IcnsType
return hasMask;
}
+ @Override
public String toString()
{
return getClass().getName() + "[" +
Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/ico/IcoImageParser.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/ico/IcoImageParser.java?rev=1308075&r1=1308074&r2=1308075&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/ico/IcoImageParser.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/ico/IcoImageParser.java Sun Apr 1 11:11:43 2012
@@ -52,11 +52,13 @@ public class IcoImageParser extends Imag
super.setByteOrder(BYTE_ORDER_LSB);
}
+ @Override
public String getName()
{
return "ico-Custom";
}
+ @Override
public String getDefaultExtension()
{
return DEFAULT_EXTENSION;
@@ -68,11 +70,13 @@ public class IcoImageParser extends Imag
".ico", ".cur",
};
+ @Override
protected String[] getAcceptedExtensions()
{
return ACCEPTED_EXTENSIONS;
}
+ @Override
protected ImageFormat[] getAcceptedTypes()
{
return new ImageFormat[]{
@@ -80,23 +84,27 @@ public class IcoImageParser extends Imag
};
}
+ @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 @@ public class IcoImageParser extends Imag
return null;
}
+ @Override
public byte[] getICCProfileBytes(ByteSource byteSource,
Map params)
throws ImageReadException, IOException
@@ -290,11 +299,13 @@ public class IcoImageParser extends Imag
this.bufferedImage = bufferedImage;
}
+ @Override
public BufferedImage readBufferedImage() throws ImageReadException
{
return bufferedImage;
}
+ @Override
protected void dumpSubclass(PrintWriter pw)
{
pw.println("BitmapIconData");
@@ -313,11 +324,13 @@ public class IcoImageParser extends Imag
this.bufferedImage = bufferedImage;
}
+ @Override
public BufferedImage readBufferedImage()
{
return bufferedImage;
}
+ @Override
protected void dumpSubclass(PrintWriter pw)
{
pw.println("PNGIconData");
@@ -541,6 +554,7 @@ public class IcoImageParser extends Imag
}
}
+ @Override
public boolean dumpImageFile(PrintWriter pw, ByteSource byteSource)
throws ImageReadException, IOException
{
@@ -551,6 +565,7 @@ public class IcoImageParser extends Imag
return true;
}
+ @Override
public final BufferedImage getBufferedImage(ByteSource byteSource,
Map params) throws ImageReadException, IOException
{
@@ -562,6 +577,7 @@ public class IcoImageParser extends Imag
throw new ImageReadException("No icons in ICO file");
}
+ @Override
public List<BufferedImage> getAllBufferedImages(ByteSource byteSource)
throws ImageReadException, IOException
{
@@ -605,6 +621,7 @@ public class IcoImageParser extends Imag
// return true;
// }
+ @Override
public void writeImage(BufferedImage src, OutputStream os, Map params)
throws ImageWriteException, IOException
{
@@ -805,6 +822,7 @@ public class IcoImageParser extends Imag
* 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;
Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg/JpegImageMetadata.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg/JpegImageMetadata.java?rev=1308075&r1=1308074&r2=1308075&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg/JpegImageMetadata.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg/JpegImageMetadata.java Sun Apr 1 11:11:43 2012
@@ -178,6 +178,7 @@ public class JpegImageMetadata implement
private static final String newline = System.getProperty("line.separator");
+ @Override
public String toString() {
return toString(null);
}
Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg/JpegImageParser.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg/JpegImageParser.java?rev=1308075&r1=1308074&r2=1308075&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg/JpegImageParser.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg/JpegImageParser.java Sun Apr 1 11:11:43 2012
@@ -63,17 +63,20 @@ public class JpegImageParser extends Ima
// 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 @@ public class JpegImageParser extends Ima
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 @@ public class JpegImageParser extends Ima
return readSegments(byteSource, markers, returnAfterFirst, false);
}
+ @Override
public byte[] getICCProfileBytes(ByteSource byteSource, Map params)
throws ImageReadException, IOException
{
@@ -317,6 +323,7 @@ public class JpegImageParser extends Ima
return (bytes);
}
+ @Override
public IImageMetadata getMetadata(ByteSource byteSource, Map params)
throws ImageReadException, IOException
{
@@ -541,6 +548,7 @@ public class JpegImageParser extends Ima
* 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 @@ public class JpegImageParser extends Ima
return new JpegPhotoshopMetadata(photoshopApp13Data);
}
+ @Override
public Dimension getImageSize(ByteSource byteSource, Map params)
throws ImageReadException, IOException
{
@@ -647,11 +656,13 @@ public class JpegImageParser extends Ima
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 @@ public class JpegImageParser extends Ima
// return result;
// }
+ @Override
public boolean dumpImageFile(PrintWriter pw, ByteSource byteSource)
throws ImageReadException, IOException
{
Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg/exif/ExifRewriter.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg/exif/ExifRewriter.java?rev=1308075&r1=1308074&r2=1308075&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg/exif/ExifRewriter.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg/exif/ExifRewriter.java Sun Apr 1 11:11:43 2012
@@ -103,6 +103,7 @@ public class ExifRewriter extends Binary
this.segmentData = segmentData;
}
+ @Override
protected void write(OutputStream os) throws IOException
{
os.write(markerBytes);
@@ -134,6 +135,7 @@ public class ExifRewriter extends Binary
this.imageData = imageData;
}
+ @Override
protected void write(OutputStream os) throws IOException
{
os.write(markerBytes);
Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg/iptc/IptcTypes.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg/iptc/IptcTypes.java?rev=1308075&r1=1308074&r2=1308075&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg/iptc/IptcTypes.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg/iptc/IptcTypes.java Sun Apr 1 11:11:43 2012
@@ -133,6 +133,7 @@ public enum IptcTypes implements IptcTyp
return type;
}
+ @Override
public String toString()
{
return name + " (" + type + ")";
@@ -148,6 +149,7 @@ public enum IptcTypes implements IptcTyp
return type;
}
+ @Override
public String toString() {
return "Unknown (" + type + ")";
}
Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg/segments/AppnSegment.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg/segments/AppnSegment.java?rev=1308075&r1=1308074&r2=1308075&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg/segments/AppnSegment.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg/segments/AppnSegment.java Sun Apr 1 11:11:43 2012
@@ -29,6 +29,7 @@ public class AppnSegment extends Generic
super(marker, marker_length, is);
}
+ @Override
public String getDescription()
{
return "APPN (APP" + (marker - JpegImageParser.JPEG_APP0_Marker)
Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg/segments/ComSegment.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg/segments/ComSegment.java?rev=1308075&r1=1308074&r2=1308075&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg/segments/ComSegment.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg/segments/ComSegment.java Sun Apr 1 11:11:43 2012
@@ -45,6 +45,7 @@ public class ComSegment extends Segment
System.out.println("");
}
+ @Override
public String getDescription()
{
String commentString = "";
Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg/segments/DhtSegment.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg/segments/DhtSegment.java?rev=1308075&r1=1308074&r2=1308075&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg/segments/DhtSegment.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg/segments/DhtSegment.java Sun Apr 1 11:11:43 2012
@@ -160,6 +160,7 @@ public class DhtSegment extends Segment
}
}
+ @Override
public String getDescription()
{
return "DHT (" + getSegmentType() + ")";
Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg/segments/DqtSegment.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg/segments/DqtSegment.java?rev=1308075&r1=1308074&r2=1308075&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg/segments/DqtSegment.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg/segments/DqtSegment.java Sun Apr 1 11:11:43 2012
@@ -89,6 +89,7 @@ public class DqtSegment extends Segment
}
}
+ @Override
public String getDescription()
{
return "DQT (" + getSegmentType() + ")";
Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg/segments/GenericSegment.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg/segments/GenericSegment.java?rev=1308075&r1=1308074&r2=1308075&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg/segments/GenericSegment.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg/segments/GenericSegment.java Sun Apr 1 11:11:43 2012
@@ -40,6 +40,7 @@ public abstract class GenericSegment ext
this.bytes = bytes;
}
+ @Override
public void dump(PrintWriter pw)
{
dump(pw, 0);
Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg/segments/JfifSegment.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg/segments/JfifSegment.java?rev=1308075&r1=1308074&r2=1308075&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg/segments/JfifSegment.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg/segments/JfifSegment.java Sun Apr 1 11:11:43 2012
@@ -35,6 +35,7 @@ public class JfifSegment extends Segment
public final int yThumbnail;
public final int thumbnailSize;
+ @Override
public String getDescription()
{
return "JFIF (" + getSegmentType() + ")";
Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg/segments/Segment.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg/segments/Segment.java?rev=1308075&r1=1308074&r2=1308075&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg/segments/Segment.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg/segments/Segment.java Sun Apr 1 11:11:43 2012
@@ -39,6 +39,7 @@ public abstract class Segment extends Bi
public abstract String getDescription();
+ @Override
public String toString()
{
return "[Segment: " + getDescription() + "]";
Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg/segments/SofnSegment.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg/segments/SofnSegment.java?rev=1308075&r1=1308074&r2=1308075&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg/segments/SofnSegment.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg/segments/SofnSegment.java Sun Apr 1 11:11:43 2012
@@ -89,6 +89,7 @@ public class SofnSegment extends Segment
System.out.println("");
}
+ @Override
public String getDescription()
{
return "SOFN (SOF" + (marker - JpegImageParser.SOF0Marker) + ") ("
Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg/segments/SosSegment.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg/segments/SosSegment.java?rev=1308075&r1=1308074&r2=1308075&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg/segments/SosSegment.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg/segments/SosSegment.java Sun Apr 1 11:11:43 2012
@@ -103,6 +103,7 @@ public class SosSegment extends Segment
System.out.println("");
}
+ @Override
public String getDescription()
{
return "SOS (" + getSegmentType() + ")";
Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg/segments/UnknownSegment.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg/segments/UnknownSegment.java?rev=1308075&r1=1308074&r2=1308075&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg/segments/UnknownSegment.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg/segments/UnknownSegment.java Sun Apr 1 11:11:43 2012
@@ -32,6 +32,7 @@ public class UnknownSegment extends Gene
super(marker, bytes);
}
+ @Override
public String getDescription()
{
return "Unknown (" + getSegmentType() + ")";
Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg/xmp/JpegRewriter.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg/xmp/JpegRewriter.java?rev=1308075&r1=1308074&r2=1308075&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg/xmp/JpegRewriter.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/jpeg/xmp/JpegRewriter.java Sun Apr 1 11:11:43 2012
@@ -67,6 +67,7 @@ public class JpegRewriter extends Binary
{
protected abstract void write(OutputStream os) throws IOException;
+ @Override
public String toString()
{
return "[" + this.getClass().getName() + "]";
@@ -96,11 +97,13 @@ public class JpegRewriter extends Binary
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 @@ public class JpegRewriter extends Binary
this.imageData = imageData;
}
+ @Override
protected void write(OutputStream os) throws IOException
{
os.write(markerBytes);
Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/pcx/PcxImageParser.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/pcx/PcxImageParser.java?rev=1308075&r1=1308074&r2=1308075&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/pcx/PcxImageParser.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/pcx/PcxImageParser.java Sun Apr 1 11:11:43 2012
@@ -64,11 +64,13 @@ public class PcxImageParser extends Imag
super.setByteOrder(BYTE_ORDER_LSB);
}
+ @Override
public String getName()
{
return "Pcx-Custom";
}
+ @Override
public String getDefaultExtension()
{
return DEFAULT_EXTENSION;
@@ -79,11 +81,13 @@ public class PcxImageParser extends Imag
".pcx", ".pcc",
};
+ @Override
protected String[] getAcceptedExtensions()
{
return ACCEPTED_EXTENSIONS;
}
+ @Override
protected ImageFormat[] getAcceptedTypes()
{
return new ImageFormat[]
@@ -92,17 +96,20 @@ public class PcxImageParser extends Imag
};
}
+ @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 @@ public class PcxImageParser extends Imag
ImageInfo.COMPRESSION_ALGORITHM_RLE : ImageInfo.COMPRESSION_ALGORITHM_NONE);
}
+ @Override
public Dimension getImageSize(ByteSource byteSource,
Map params)
throws ImageReadException, IOException
@@ -135,6 +143,7 @@ public class PcxImageParser extends Imag
return new Dimension(xSize, ySize);
}
+ @Override
public byte[] getICCProfileBytes(ByteSource byteSource,
Map params)
throws ImageReadException, IOException
@@ -300,6 +309,7 @@ public class PcxImageParser extends Imag
nPlanes, bytesPerLine, paletteInfo, hScreenSize, vScreenSize);
}
+ @Override
public boolean dumpImageFile(PrintWriter pw, ByteSource byteSource)
throws ImageReadException, IOException
{
@@ -534,6 +544,7 @@ public class PcxImageParser extends Imag
}
}
+ @Override
public final BufferedImage getBufferedImage(ByteSource byteSource,
Map params) throws ImageReadException, IOException
{
@@ -563,6 +574,7 @@ public class PcxImageParser extends Imag
}
}
+ @Override
public void writeImage(BufferedImage src, OutputStream os, Map params)
throws ImageWriteException, IOException
{
@@ -579,6 +591,7 @@ public class PcxImageParser extends Imag
* 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
{