You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2016/06/09 20:28:12 UTC
svn commit: r1747595 - in /commons/proper/imaging/trunk/src:
main/java/org/apache/commons/imaging/
main/java/org/apache/commons/imaging/common/
main/java/org/apache/commons/imaging/formats/bmp/
main/java/org/apache/commons/imaging/formats/jpeg/ main/ja...
Author: ggregory
Date: Thu Jun 9 20:28:11 2016
New Revision: 1747595
URL: http://svn.apache.org/viewvc?rev=1747595&view=rev
Log:
Add missing @Override annotations.
Modified:
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/ImageFormats.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/GenericImageMetadata.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/ImageMetadata.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/RgbBufferedImageFactory.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/SimpleBufferedImageFactory.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/BmpWriterPalette.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/BmpWriterRgb.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegImageMetadata.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegImageParser.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegUtils.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/decoder/JpegDecoder.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/exif/ExifRewriter.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcParser.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcRecord.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcType.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcTypes.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/segments/App2Segment.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/xmp/JpegRewriter.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/PngWriter.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/scanlinefilters/ScanlineFilterAverage.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/scanlinefilters/ScanlineFilterNone.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/scanlinefilters/ScanlineFilterPaeth.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/scanlinefilters/ScanlineFilterSub.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/scanlinefilters/ScanlineFilterUp.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pnm/PamWriter.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pnm/PbmWriter.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pnm/PgmWriter.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pnm/PpmWriter.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/datareaders/CompressedDataReader.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/datareaders/UncompressedDataReader.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/rgbe/RgbeInfo.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffElement.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffReader.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffImageWriterLossless.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputDirectory.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/icc/IccTagDataTypes.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/icc/IccTagTypes.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/palette/ColorSpaceSubset.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/palette/LongestAxisMedianCut.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/palette/MostPopulatedBoxesMedianCut.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/palette/QuantizedPalette.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/palette/SimplePalette.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/ImagingTest.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/common/bytesource/ByteSourceDataTest.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/examples/ImageReadExample.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/bmp/BmpBaseTest.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/dcx/DcxBaseTest.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/gif/GifBaseTest.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/icns/IcnsBaseTest.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/ico/IcoBaseTest.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/ico/IcoRoundtripTest.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/JpegBaseTest.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/ExifBaseTest.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/ExifRewriteTest.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcBaseTest.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/xmp/JpegXmpBaseTest.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/pam/PamBaseTest.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/pcx/PcxBaseTest.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/PngBaseTest.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/psd/PsdBaseTest.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/rgbe/RgbeBaseTest.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffBaseTest.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffLzwTest.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/wbmp/WbmpBaseTest.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/xbm/XbmBaseTest.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/xpm/XpmBaseTest.java
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/ImageFormats.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/ImageFormats.java?rev=1747595&r1=1747594&r2=1747595&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/ImageFormats.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/ImageFormats.java Thu Jun 9 20:28:11 2016
@@ -43,10 +43,12 @@ public enum ImageFormats implements Imag
XBM,
XPM;
+ @Override
public String getName() {
return name();
}
+ @Override
public String getExtension() {
return name();
}
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/GenericImageMetadata.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/GenericImageMetadata.java?rev=1747595&r1=1747594&r2=1747595&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/GenericImageMetadata.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/GenericImageMetadata.java Thu Jun 9 20:28:11 2016
@@ -31,6 +31,7 @@ public class GenericImageMetadata implem
items.add(item);
}
+ @Override
public List<? extends ImageMetadataItem> getItems() {
return new ArrayList<>(items);
}
@@ -40,6 +41,7 @@ public class GenericImageMetadata implem
return toString(null);
}
+ @Override
public String toString(String prefix) {
if (null == prefix) {
prefix = "";
@@ -85,6 +87,7 @@ public class GenericImageMetadata implem
return toString(null);
}
+ @Override
public String toString(final String prefix) {
final String result = keyword + ": " + text;
if (null != prefix) {
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/ImageMetadata.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/ImageMetadata.java?rev=1747595&r1=1747594&r2=1747595&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/ImageMetadata.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/ImageMetadata.java Thu Jun 9 20:28:11 2016
@@ -26,6 +26,7 @@ public interface ImageMetadata {
interface ImageMetadataItem {
String toString(String prefix);
+ @Override
String toString();
}
}
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/RgbBufferedImageFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/RgbBufferedImageFactory.java?rev=1747595&r1=1747594&r2=1747595&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/RgbBufferedImageFactory.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/RgbBufferedImageFactory.java Thu Jun 9 20:28:11 2016
@@ -20,6 +20,7 @@ package org.apache.commons.imaging.commo
import java.awt.image.BufferedImage;
public class RgbBufferedImageFactory implements BufferedImageFactory {
+ @Override
public BufferedImage getColorBufferedImage(final int width, final int height,
final boolean hasAlpha) {
if (hasAlpha) {
@@ -28,6 +29,7 @@ public class RgbBufferedImageFactory imp
return new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB);
}
+ @Override
public BufferedImage getGrayscaleBufferedImage(final int width, final int height,
final boolean hasAlpha) {
// always use color.
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/SimpleBufferedImageFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/SimpleBufferedImageFactory.java?rev=1747595&r1=1747594&r2=1747595&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/SimpleBufferedImageFactory.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/SimpleBufferedImageFactory.java Thu Jun 9 20:28:11 2016
@@ -20,6 +20,7 @@ package org.apache.commons.imaging.commo
import java.awt.image.BufferedImage;
public class SimpleBufferedImageFactory implements BufferedImageFactory {
+ @Override
public BufferedImage getColorBufferedImage(final int width, final int height,
final boolean hasAlpha) {
if (hasAlpha) {
@@ -28,6 +29,7 @@ public class SimpleBufferedImageFactory
return new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB);
}
+ @Override
public BufferedImage getGrayscaleBufferedImage(final int width, final int height,
final boolean hasAlpha) {
if (hasAlpha) {
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/BmpWriterPalette.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/BmpWriterPalette.java?rev=1747595&r1=1747594&r2=1747595&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/BmpWriterPalette.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/BmpWriterPalette.java Thu Jun 9 20:28:11 2016
@@ -40,14 +40,17 @@ class BmpWriterPalette implements BmpWri
}
}
+ @Override
public int getPaletteSize() {
return palette.length();
}
+ @Override
public int getBitsPerPixel() {
return bitsPerSample;
}
+ @Override
public void writePalette(final BinaryOutputStream bos) throws IOException {
for (int i = 0; i < palette.length(); i++) {
final int rgb = palette.getEntry(i);
@@ -63,6 +66,7 @@ class BmpWriterPalette implements BmpWri
}
}
+ @Override
public byte[] getImageData(final BufferedImage src) {
final int width = src.getWidth();
final int height = src.getHeight();
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/BmpWriterRgb.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/BmpWriterRgb.java?rev=1747595&r1=1747594&r2=1747595&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/BmpWriterRgb.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/BmpWriterRgb.java Thu Jun 9 20:28:11 2016
@@ -30,19 +30,23 @@ class BmpWriterRgb implements BmpWriter
// this.alpha = alpha;
// }
+ @Override
public int getPaletteSize() {
return 0;
}
+ @Override
public int getBitsPerPixel() {
// return alpha ? 32 : 24;
return 24;
}
+ @Override
public void writePalette(final BinaryOutputStream bos) throws IOException {
// no palette
}
+ @Override
public byte[] getImageData(final BufferedImage src) {
final int width = src.getWidth();
final int height = src.getHeight();
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegImageMetadata.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegImageMetadata.java?rev=1747595&r1=1747594&r2=1747595&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegImageMetadata.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegImageMetadata.java Thu Jun 9 20:28:11 2016
@@ -184,6 +184,7 @@ public class JpegImageMetadata implement
return null;
}
+ @Override
public List<ImageMetadataItem> getItems() {
final List<ImageMetadataItem> result = new ArrayList<>();
@@ -203,6 +204,7 @@ public class JpegImageMetadata implement
return toString(null);
}
+ @Override
public String toString(String prefix) {
if (prefix == null) {
prefix = "";
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegImageParser.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegImageParser.java?rev=1747595&r1=1747594&r2=1747595&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegImageParser.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegImageParser.java Thu Jun 9 20:28:11 2016
@@ -136,16 +136,19 @@ public class JpegImageParser extends Ima
final JpegUtils.Visitor visitor = new JpegUtils.Visitor() {
// return false to exit before reading image data.
+ @Override
public boolean beginSOS() {
return false;
}
+ @Override
public void visitSOS(final int marker, final byte[] markerBytes,
final byte[] imageData) {
// don't need image data
}
// return false to exit traversal.
+ @Override
public boolean visitSegment(final int marker, final byte[] markerBytes,
final int markerLength, final byte[] markerLengthBytes,
final byte[] segmentData) throws ImageReadException, IOException {
@@ -400,16 +403,19 @@ public class JpegImageParser extends Ima
final JpegUtils.Visitor visitor = new JpegUtils.Visitor() {
// return false to exit before reading image data.
+ @Override
public boolean beginSOS() {
return false;
}
+ @Override
public void visitSOS(final int marker, final byte[] markerBytes,
final byte[] imageData) {
// don't need image data
}
// return false to exit traversal.
+ @Override
public boolean visitSegment(final int marker, final byte[] markerBytes,
final int markerLength, final byte[] markerLengthBytes,
final byte[] segmentData) throws ImageReadException, IOException {
@@ -439,16 +445,19 @@ public class JpegImageParser extends Ima
final JpegUtils.Visitor visitor = new JpegUtils.Visitor() {
// return false to exit before reading image data.
+ @Override
public boolean beginSOS() {
return false;
}
+ @Override
public void visitSOS(final int marker, final byte[] markerBytes,
final byte[] imageData) {
// don't need image data
}
// return false to exit traversal.
+ @Override
public boolean visitSegment(final int marker, final byte[] markerBytes,
final int markerLength, final byte[] markerLengthBytes,
final byte[] segmentData) throws ImageReadException, IOException {
@@ -478,16 +487,19 @@ public class JpegImageParser extends Ima
final JpegUtils.Visitor visitor = new JpegUtils.Visitor() {
// return false to exit before reading image data.
+ @Override
public boolean beginSOS() {
return false;
}
+ @Override
public void visitSOS(final int marker, final byte[] markerBytes,
final byte[] imageData) {
// don't need image data
}
// return false to exit traversal.
+ @Override
public boolean visitSegment(final int marker, final byte[] markerBytes,
final int markerLength, final byte[] markerLengthBytes,
final byte[] segmentData) throws ImageReadException, IOException {
@@ -528,16 +540,19 @@ public class JpegImageParser extends Ima
final JpegUtils.Visitor visitor = new JpegUtils.Visitor() {
// return false to exit before reading image data.
+ @Override
public boolean beginSOS() {
return false;
}
+ @Override
public void visitSOS(final int marker, final byte[] markerBytes,
final byte[] imageData) {
// don't need image data
}
// return false to exit traversal.
+ @Override
public boolean visitSegment(final int marker, final byte[] markerBytes,
final int markerLength, final byte[] markerLengthBytes,
final byte[] segmentData) throws ImageReadException, IOException {
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegUtils.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegUtils.java?rev=1747595&r1=1747594&r2=1747595&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegUtils.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegUtils.java Thu Jun 9 20:28:11 2016
@@ -164,16 +164,19 @@ public class JpegUtils extends BinaryFil
IOException {
final Visitor visitor = new Visitor() {
// return false to exit before reading image data.
+ @Override
public boolean beginSOS() {
return true;
}
+ @Override
public void visitSOS(final int marker, final byte[] markerBytes, final byte[] imageData) {
Debug.debug("SOS marker. " + imageData.length + " bytes of image data.");
Debug.debug("");
}
// return false to exit traversal.
+ @Override
public boolean visitSegment(final int marker, final byte[] markerBytes,
final int segmentLength, final byte[] segmentLengthBytes,
final byte[] segmentData) {
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/decoder/JpegDecoder.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/decoder/JpegDecoder.java?rev=1747595&r1=1747594&r2=1747595&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/decoder/JpegDecoder.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/decoder/JpegDecoder.java Thu Jun 9 20:28:11 2016
@@ -61,10 +61,12 @@ public class JpegDecoder extends BinaryF
private final int[] blockInt = new int[64];
private final float[] block = new float[64];
+ @Override
public boolean beginSOS() {
return true;
}
+ @Override
public void visitSOS(final int marker, final byte[] markerBytes, final byte[] imageData) {
final ByteArrayInputStream is = new ByteArrayInputStream(imageData);
try {
@@ -169,6 +171,7 @@ public class JpegDecoder extends BinaryF
}
}
+ @Override
public boolean visitSegment(final int marker, final byte[] markerBytes,
final int segmentLength, final byte[] segmentLengthBytes, final byte[] segmentData)
throws ImageReadException, IOException {
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/exif/ExifRewriter.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/exif/ExifRewriter.java?rev=1747595&r1=1747594&r2=1747595&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/exif/ExifRewriter.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/exif/ExifRewriter.java Thu Jun 9 20:28:11 2016
@@ -144,15 +144,18 @@ public class ExifRewriter extends Binary
final JpegUtils.Visitor visitor = new JpegUtils.Visitor() {
// return false to exit before reading image data.
+ @Override
public boolean beginSOS() {
return true;
}
+ @Override
public void visitSOS(final int marker, final byte[] markerBytes, final byte[] imageData) {
pieces.add(new JFIFPieceImageData(markerBytes, imageData));
}
// return false to exit traversal.
+ @Override
public boolean visitSegment(final int marker, final byte[] markerBytes,
final int markerLength, final byte[] markerLengthBytes,
final byte[] segmentData) throws
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcParser.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcParser.java?rev=1747595&r1=1747594&r2=1747595&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcParser.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcParser.java Thu Jun 9 20:28:11 2016
@@ -416,6 +416,7 @@ public class IptcParser extends BinaryFi
// sort the list. Records must be in numerical order.
final Comparator<IptcRecord> comparator = new Comparator<IptcRecord>() {
+ @Override
public int compare(final IptcRecord e1, final IptcRecord e2) {
return e2.iptcType.getType() - e1.iptcType.getType();
}
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcRecord.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcRecord.java?rev=1747595&r1=1747594&r2=1747595&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcRecord.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcRecord.java Thu Jun 9 20:28:11 2016
@@ -27,6 +27,7 @@ public class IptcRecord {
private final byte[] bytes;
public final String value;
public static final Comparator<IptcRecord> COMPARATOR = new Comparator<IptcRecord>() {
+ @Override
public int compare(final IptcRecord e1, final IptcRecord e2) {
return e1.iptcType.getType() - e2.iptcType.getType();
}
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcType.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcType.java?rev=1747595&r1=1747594&r2=1747595&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcType.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcType.java Thu Jun 9 20:28:11 2016
@@ -21,5 +21,6 @@ public interface IptcType {
String getName();
+ @Override
String toString();
}
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcTypes.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcTypes.java?rev=1747595&r1=1747594&r2=1747595&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcTypes.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcTypes.java Thu Jun 9 20:28:11 2016
@@ -140,10 +140,12 @@ public enum IptcTypes implements IptcTyp
this.name = name;
}
+ @Override
public String getName() {
return name;
}
+ @Override
public int getType() {
return type;
}
@@ -155,10 +157,12 @@ public enum IptcTypes implements IptcTyp
public static IptcType getUnknown(final int type) {
return new IptcType() {
+ @Override
public String getName() {
return "Unknown";
}
+ @Override
public int getType() {
return type;
}
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/segments/App2Segment.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/segments/App2Segment.java?rev=1747595&r1=1747594&r2=1747595&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/segments/App2Segment.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/segments/App2Segment.java Thu Jun 9 20:28:11 2016
@@ -75,6 +75,7 @@ public class App2Segment extends AppnSeg
return curMarker;
}
+ @Override
public int compareTo(final App2Segment other) {
return curMarker - other.curMarker;
}
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/xmp/JpegRewriter.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/xmp/JpegRewriter.java?rev=1747595&r1=1747594&r2=1747595&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/xmp/JpegRewriter.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/xmp/JpegRewriter.java Thu Jun 9 20:28:11 2016
@@ -40,16 +40,19 @@ import static org.apache.commons.imaging
public class JpegRewriter extends BinaryFileParser {
private static final ByteOrder JPEG_BYTE_ORDER = ByteOrder.BIG_ENDIAN;
private static final SegmentFilter EXIF_SEGMENT_FILTER = new SegmentFilter() {
+ @Override
public boolean filter(final JFIFPieceSegment segment) {
return segment.isExifSegment();
}
};
private static final SegmentFilter XMP_SEGMENT_FILTER = new SegmentFilter() {
+ @Override
public boolean filter(final JFIFPieceSegment segment) {
return segment.isXmpSegment();
}
};
private static final SegmentFilter PHOTOSHOP_APP13_SEGMENT_FILTER = new SegmentFilter() {
+ @Override
public boolean filter(final JFIFPieceSegment segment) {
return segment.isPhotoshopApp13Segment();
}
@@ -184,15 +187,18 @@ public class JpegRewriter extends Binary
final JpegUtils.Visitor visitor = new JpegUtils.Visitor() {
// return false to exit before reading image data.
+ @Override
public boolean beginSOS() {
return true;
}
+ @Override
public void visitSOS(final int marker, final byte[] markerBytes, final byte[] imageData) {
pieces.add(new JFIFPieceImageData(markerBytes, imageData));
}
// return false to exit traversal.
+ @Override
public boolean visitSegment(final int marker, final byte[] markerBytes,
final int segmentLength, final byte[] segmentLengthBytes,
final byte[] segmentData) throws ImageReadException, IOException {
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/PngWriter.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/PngWriter.java?rev=1747595&r1=1747594&r2=1747595&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/PngWriter.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/PngWriter.java Thu Jun 9 20:28:11 2016
@@ -316,6 +316,7 @@ class PngWriter {
this.palette = palette;
}
+ @Override
public int getEntry(final int index) {
if (index == 0) {
return 0x00000000;
@@ -323,10 +324,12 @@ class PngWriter {
return palette.getEntry(index - 1);
}
+ @Override
public int length() {
return 1 + palette.length();
}
+ @Override
public int getPaletteIndex(final int rgb) throws ImageWriteException {
if (rgb == 0x00000000) {
return 0;
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/scanlinefilters/ScanlineFilterAverage.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/scanlinefilters/ScanlineFilterAverage.java?rev=1747595&r1=1747594&r2=1747595&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/scanlinefilters/ScanlineFilterAverage.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/scanlinefilters/ScanlineFilterAverage.java Thu Jun 9 20:28:11 2016
@@ -27,6 +27,7 @@ public class ScanlineFilterAverage imple
this.bytesPerPixel = bytesPerPixel;
}
+ @Override
public void unfilter(final byte[] src, final byte[] dst, final byte[] up)
throws ImageReadException, IOException {
for (int i = 0; i < src.length; i++) {
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/scanlinefilters/ScanlineFilterNone.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/scanlinefilters/ScanlineFilterNone.java?rev=1747595&r1=1747594&r2=1747595&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/scanlinefilters/ScanlineFilterNone.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/scanlinefilters/ScanlineFilterNone.java Thu Jun 9 20:28:11 2016
@@ -22,6 +22,7 @@ import org.apache.commons.imaging.ImageR
public class ScanlineFilterNone implements ScanlineFilter {
+ @Override
public void unfilter(final byte[] src, final byte[] dst, final byte[] up)
throws ImageReadException, IOException {
System.arraycopy(src, 0, dst, 0, src.length);
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/scanlinefilters/ScanlineFilterPaeth.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/scanlinefilters/ScanlineFilterPaeth.java?rev=1747595&r1=1747594&r2=1747595&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/scanlinefilters/ScanlineFilterPaeth.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/scanlinefilters/ScanlineFilterPaeth.java Thu Jun 9 20:28:11 2016
@@ -44,6 +44,7 @@ public class ScanlineFilterPaeth impleme
}
}
+ @Override
public void unfilter(final byte[] src, final byte[] dst, final byte[] up)
throws ImageReadException, IOException {
for (int i = 0; i < src.length; i++) {
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/scanlinefilters/ScanlineFilterSub.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/scanlinefilters/ScanlineFilterSub.java?rev=1747595&r1=1747594&r2=1747595&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/scanlinefilters/ScanlineFilterSub.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/scanlinefilters/ScanlineFilterSub.java Thu Jun 9 20:28:11 2016
@@ -27,6 +27,7 @@ public class ScanlineFilterSub implement
this.bytesPerPixel = bytesPerPixel;
}
+ @Override
public void unfilter(final byte[] src, final byte[] dst, final byte[] up)
throws ImageReadException, IOException {
for (int i = 0; i < src.length; i++) {
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/scanlinefilters/ScanlineFilterUp.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/scanlinefilters/ScanlineFilterUp.java?rev=1747595&r1=1747594&r2=1747595&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/scanlinefilters/ScanlineFilterUp.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/scanlinefilters/ScanlineFilterUp.java Thu Jun 9 20:28:11 2016
@@ -22,6 +22,7 @@ import org.apache.commons.imaging.ImageR
public class ScanlineFilterUp implements ScanlineFilter {
+ @Override
public void unfilter(final byte[] src, final byte[] dst, final byte[] up)
throws ImageReadException, IOException {
for (int i = 0; i < src.length; i++) {
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pnm/PamWriter.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pnm/PamWriter.java?rev=1747595&r1=1747594&r2=1747595&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pnm/PamWriter.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pnm/PamWriter.java Thu Jun 9 20:28:11 2016
@@ -26,6 +26,7 @@ import org.apache.commons.imaging.ImageW
class PamWriter implements PnmWriter {
+ @Override
public void writeImage(final BufferedImage src, final OutputStream os,
final Map<String, Object> params) throws ImageWriteException, IOException {
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pnm/PbmWriter.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pnm/PbmWriter.java?rev=1747595&r1=1747594&r2=1747595&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pnm/PbmWriter.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pnm/PbmWriter.java Thu Jun 9 20:28:11 2016
@@ -31,6 +31,7 @@ class PbmWriter implements PnmWriter {
this.rawbits = rawbits;
}
+ @Override
public void writeImage(final BufferedImage src, final OutputStream os, final Map<String, Object> params)
throws ImageWriteException, IOException {
os.write(PnmConstants.PNM_PREFIX_BYTE);
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pnm/PgmWriter.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pnm/PgmWriter.java?rev=1747595&r1=1747594&r2=1747595&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pnm/PgmWriter.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pnm/PgmWriter.java Thu Jun 9 20:28:11 2016
@@ -31,6 +31,7 @@ class PgmWriter implements PnmWriter {
this.rawbits = rawbits;
}
+ @Override
public void writeImage(final BufferedImage src, final OutputStream os, final Map<String, Object> params)
throws ImageWriteException, IOException {
// System.out.println
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pnm/PpmWriter.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pnm/PpmWriter.java?rev=1747595&r1=1747594&r2=1747595&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pnm/PpmWriter.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pnm/PpmWriter.java Thu Jun 9 20:28:11 2016
@@ -31,6 +31,7 @@ class PpmWriter implements PnmWriter {
this.rawbits = rawbits;
}
+ @Override
public void writeImage(final BufferedImage src, final OutputStream os, final Map<String, Object> params)
throws ImageWriteException, IOException {
// System.out.println
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/datareaders/CompressedDataReader.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/datareaders/CompressedDataReader.java?rev=1747595&r1=1747594&r2=1747595&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/datareaders/CompressedDataReader.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/datareaders/CompressedDataReader.java Thu Jun 9 20:28:11 2016
@@ -41,6 +41,7 @@ public class CompressedDataReader implem
this.dataParser = dataParser;
}
+ @Override
public void readData(final InputStream is, final BufferedImage bi,
final ImageContents imageContents, final BinaryFileParser bfp)
throws ImageReadException, IOException {
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/datareaders/UncompressedDataReader.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/datareaders/UncompressedDataReader.java?rev=1747595&r1=1747594&r2=1747595&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/datareaders/UncompressedDataReader.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/datareaders/UncompressedDataReader.java Thu Jun 9 20:28:11 2016
@@ -38,6 +38,7 @@ public class UncompressedDataReader impl
this.dataParser = dataParser;
}
+ @Override
public void readData(final InputStream is, final BufferedImage bi,
final ImageContents imageContents, final BinaryFileParser bfp)
throws ImageReadException, IOException {
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/rgbe/RgbeInfo.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/rgbe/RgbeInfo.java?rev=1747595&r1=1747594&r2=1747595&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/rgbe/RgbeInfo.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/rgbe/RgbeInfo.java Thu Jun 9 20:28:11 2016
@@ -71,6 +71,7 @@ class RgbeInfo implements Closeable {
return height;
}
+ @Override
public void close() throws IOException {
in.close();
}
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffElement.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffElement.java?rev=1747595&r1=1747594&r2=1747595&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffElement.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffElement.java Thu Jun 9 20:28:11 2016
@@ -22,6 +22,7 @@ public abstract class TiffElement {
public final long offset;
public final int length;
public static final Comparator<TiffElement> COMPARATOR = new Comparator<TiffElement>() {
+ @Override
public int compare(final TiffElement e1, final TiffElement e2) {
if (e1.offset < e2.offset) {
return -1;
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffReader.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffReader.java?rev=1747595&r1=1747594&r2=1747595&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffReader.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffReader.java Thu Jun 9 20:28:11 2016
@@ -318,25 +318,30 @@ public class TiffReader extends BinaryFi
this.readThumbnails = tmpReadThumbnails;
}
+ @Override
public boolean setTiffHeader(final TiffHeader tiffHeader) {
this.tiffHeader = tiffHeader;
return true;
}
+ @Override
public boolean addDirectory(final TiffDirectory directory) {
directories.add(directory);
return true;
}
+ @Override
public boolean addField(final TiffField field) {
fields.add(field);
return true;
}
+ @Override
public boolean readImageData() {
return readThumbnails;
}
+ @Override
public boolean readOffsetDirectories() {
return true;
}
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffImageWriterLossless.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffImageWriterLossless.java?rev=1747595&r1=1747594&r2=1747595&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffImageWriterLossless.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffImageWriterLossless.java Thu Jun 9 20:28:11 2016
@@ -47,11 +47,13 @@ import static org.apache.commons.imaging
public class TiffImageWriterLossless extends TiffImageWriterBase {
private final byte[] exifBytes;
private static final Comparator<TiffElement> ELEMENT_SIZE_COMPARATOR = new Comparator<TiffElement>() {
+ @Override
public int compare(final TiffElement e1, final TiffElement e2) {
return e1.length - e2.length;
}
};
private static final Comparator<TiffOutputItem> ITEM_SIZE_COMPARATOR = new Comparator<TiffOutputItem>() {
+ @Override
public int compare(final TiffOutputItem e1, final TiffOutputItem e2) {
return e1.getItemLength() - e2.getItemLength();
}
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputDirectory.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputDirectory.java?rev=1747595&r1=1747594&r2=1747595&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputDirectory.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputDirectory.java Thu Jun 9 20:28:11 2016
@@ -62,6 +62,7 @@ public final class TiffOutputDirectory e
private final ByteOrder byteOrder;
private TiffOutputDirectory nextDirectory;
public static final Comparator<TiffOutputDirectory> COMPARATOR = new Comparator<TiffOutputDirectory>() {
+ @Override
public int compare(final TiffOutputDirectory o1, final TiffOutputDirectory o2) {
if (o1.type < o2.type) {
return -1;
@@ -464,6 +465,7 @@ public final class TiffOutputDirectory e
public void sortFields() {
final Comparator<TiffOutputField> comparator = new Comparator<TiffOutputField>() {
+ @Override
public int compare(final TiffOutputField e1, final TiffOutputField e2) {
if (e1.tag != e2.tag) {
return e1.tag - e2.tag;
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/icc/IccTagDataTypes.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/icc/IccTagDataTypes.java?rev=1747595&r1=1747594&r2=1747595&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/icc/IccTagDataTypes.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/icc/IccTagDataTypes.java Thu Jun 9 20:28:11 2016
@@ -29,6 +29,7 @@ import static org.apache.commons.imaging
public enum IccTagDataTypes implements IccTagDataType {
DESC_TYPE(
"descType", 0x64657363) {
+ @Override
public void dump(final String prefix, final byte[] bytes)
throws ImageReadException, IOException
{
@@ -55,6 +56,7 @@ public enum IccTagDataTypes implements I
DATA_TYPE(
"dataType", 0x64617461) {
+ @Override
public void dump(final String prefix, final byte[] bytes)
throws ImageReadException, IOException
{
@@ -73,6 +75,7 @@ public enum IccTagDataTypes implements I
MULTI_LOCALIZED_UNICODE_TYPE(
"multiLocalizedUnicodeType", (0x6D6C7563)) {
+ @Override
public void dump(final String prefix, final byte[] bytes)
throws ImageReadException, IOException
{
@@ -91,6 +94,7 @@ public enum IccTagDataTypes implements I
SIGNATURE_TYPE(
"signatureType", ((0x73696720))) {
+ @Override
public void dump(final String prefix, final byte[] bytes)
throws ImageReadException, IOException
{
@@ -121,6 +125,7 @@ public enum IccTagDataTypes implements I
TEXT_TYPE(
"textType", 0x74657874) {
+ @Override
public void dump(final String prefix, final byte[] bytes)
throws ImageReadException, IOException
{
@@ -148,10 +153,12 @@ public enum IccTagDataTypes implements I
this.signature = signature;
}
+ @Override
public String getName() {
return name;
}
+ @Override
public int getSignature() {
return signature;
}
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/icc/IccTagTypes.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/icc/IccTagTypes.java?rev=1747595&r1=1747594&r2=1747595&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/icc/IccTagTypes.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/icc/IccTagTypes.java Thu Jun 9 20:28:11 2016
@@ -324,14 +324,17 @@ public enum IccTagTypes implements IccTa
this.signature = signature;
}
+ @Override
public String getName() {
return name;
}
+ @Override
public String getTypeDescription() {
return typeDescription;
}
+ @Override
public int getSignature() {
return signature;
}
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/palette/ColorSpaceSubset.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/palette/ColorSpaceSubset.java?rev=1747595&r1=1747594&r2=1747595&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/palette/ColorSpaceSubset.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/palette/ColorSpaceSubset.java Thu Jun 9 20:28:11 2016
@@ -168,6 +168,7 @@ class ColorSpaceSubset {
public static class RgbComparator implements Comparator<ColorSpaceSubset>, Serializable {
private static final long serialVersionUID = 509214838111679029L;
+ @Override
public int compare(final ColorSpaceSubset c1, final ColorSpaceSubset c2) {
return c1.rgb - c2.rgb;
}
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/palette/LongestAxisMedianCut.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/palette/LongestAxisMedianCut.java?rev=1747595&r1=1747594&r2=1747595&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/palette/LongestAxisMedianCut.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/palette/LongestAxisMedianCut.java Thu Jun 9 20:28:11 2016
@@ -25,6 +25,7 @@ import org.apache.commons.imaging.ImageW
public class LongestAxisMedianCut implements MedianCut {
private static final Comparator<ColorGroup> COMPARATOR = new Comparator<ColorGroup>() {
+ @Override
public int compare(final ColorGroup cg1, final ColorGroup cg2) {
if (cg1.maxDiff == cg2.maxDiff) {
return cg2.diffTotal - cg1.diffTotal;
@@ -33,6 +34,7 @@ public class LongestAxisMedianCut implem
}
};
+ @Override
public boolean performNextMedianCut(final List<ColorGroup> colorGroups, final boolean ignoreAlpha)
throws ImageWriteException {
Collections.sort(colorGroups, COMPARATOR);
@@ -61,6 +63,7 @@ public class LongestAxisMedianCut implem
final List<ColorGroup> colorGroups, final boolean ignoreAlpha) throws ImageWriteException {
final Comparator<ColorCount> comp = new Comparator<ColorCount>() {
+ @Override
public int compare(final ColorCount c1, final ColorCount c2) {
switch (mode) {
case ALPHA:
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/palette/MostPopulatedBoxesMedianCut.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/palette/MostPopulatedBoxesMedianCut.java?rev=1747595&r1=1747594&r2=1747595&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/palette/MostPopulatedBoxesMedianCut.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/palette/MostPopulatedBoxesMedianCut.java Thu Jun 9 20:28:11 2016
@@ -26,6 +26,7 @@ import org.apache.commons.imaging.ImageW
public class MostPopulatedBoxesMedianCut implements MedianCut {
+ @Override
public boolean performNextMedianCut(final List<ColorGroup> colorGroups,
final boolean ignoreAlpha) throws ImageWriteException {
int maxPoints = 0;
@@ -143,6 +144,7 @@ public class MostPopulatedBoxesMedianCut
this.colorComponent = colorComponent;
}
+ @Override
public int compare(final ColorCount c1, final ColorCount c2) {
switch (colorComponent) {
case ALPHA:
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/palette/QuantizedPalette.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/palette/QuantizedPalette.java?rev=1747595&r1=1747594&r2=1747595&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/palette/QuantizedPalette.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/palette/QuantizedPalette.java Thu Jun 9 20:28:11 2016
@@ -47,6 +47,7 @@ public class QuantizedPalette implements
}
}
+ @Override
public int getPaletteIndex(final int rgb) throws ImageWriteException {
final int precisionMask = (1 << precision) - 1;
@@ -57,11 +58,13 @@ public class QuantizedPalette implements
return straight[index].getIndex();
}
+ @Override
public int getEntry(final int index) {
final ColorSpaceSubset subset = subsets.get(index);
return subset.rgb;
}
+ @Override
public int length() {
return subsets.size();
}
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/palette/SimplePalette.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/palette/SimplePalette.java?rev=1747595&r1=1747594&r2=1747595&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/palette/SimplePalette.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/palette/SimplePalette.java Thu Jun 9 20:28:11 2016
@@ -23,6 +23,7 @@ public class SimplePalette implements Pa
this.palette = palette;
}
+ @Override
public int getPaletteIndex(final int rgb) {
for (int i = 0; i < palette.length; i++) {
if (palette[i] == rgb) {
@@ -33,10 +34,12 @@ public class SimplePalette implements Pa
return -1;
}
+ @Override
public int getEntry(final int index) {
return palette[index];
}
+ @Override
public int length() {
return palette.length;
}
Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/ImagingTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/ImagingTest.java?rev=1747595&r1=1747594&r2=1747595&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/ImagingTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/ImagingTest.java Thu Jun 9 20:28:11 2016
@@ -56,6 +56,7 @@ public abstract class ImagingTest implem
protected File getTestImageByName(final String filename)
throws IOException, ImageReadException {
return getTestImage(new ImageFilter() {
+ @Override
public boolean accept(final File file) throws IOException,
ImageReadException {
return file.getName().equals(filename);
@@ -93,6 +94,7 @@ public abstract class ImagingTest implem
final FileSystemTraversal.Visitor visitor = new FileSystemTraversal.Visitor() {
+ @Override
public boolean visit(final File file, final double progressEstimate) {
if (!Imaging.hasImageFileExtension(file)) {
return true;
Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/common/bytesource/ByteSourceDataTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/common/bytesource/ByteSourceDataTest.java?rev=1747595&r1=1747594&r2=1747595&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/common/bytesource/ByteSourceDataTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/common/bytesource/ByteSourceDataTest.java Thu Jun 9 20:28:11 2016
@@ -53,6 +53,7 @@ public class ByteSourceDataTest extends
}
private class ByteSourceFileFactory implements ByteSourceFactory {
+ @Override
public ByteSource getByteSource(final byte src[]) throws IOException {
final File file = createTempFile(src);
@@ -65,6 +66,7 @@ public class ByteSourceDataTest extends
}
private class ByteSourceInputStreamFileFactory implements ByteSourceFactory {
+ @Override
public ByteSource getByteSource(final byte src[]) throws IOException {
final File file = createTempFile(src);
@@ -76,6 +78,7 @@ public class ByteSourceDataTest extends
}
private class ByteSourceInputStreamRawFactory implements ByteSourceFactory {
+ @Override
public ByteSource getByteSource(final byte src[]) throws IOException {
final ByteArrayInputStream is = new ByteArrayInputStream(src);
Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/examples/ImageReadExample.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/examples/ImageReadExample.java?rev=1747595&r1=1747594&r2=1747595&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/examples/ImageReadExample.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/examples/ImageReadExample.java Thu Jun 9 20:28:11 2016
@@ -48,6 +48,7 @@ public class ImageReadExample {
public static class ManagedImageBufferedImageFactory implements
BufferedImageFactory {
+ @Override
public BufferedImage getColorBufferedImage(final int width, final int height,
final boolean hasAlpha) {
final GraphicsEnvironment ge = GraphicsEnvironment
@@ -58,6 +59,7 @@ public class ImageReadExample {
Transparency.TRANSLUCENT);
}
+ @Override
public BufferedImage getGrayscaleBufferedImage(final int width, final int height,
final boolean hasAlpha) {
return getColorBufferedImage(width, height, hasAlpha);
Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/bmp/BmpBaseTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/bmp/BmpBaseTest.java?rev=1747595&r1=1747594&r2=1747595&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/bmp/BmpBaseTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/bmp/BmpBaseTest.java Thu Jun 9 20:28:11 2016
@@ -36,6 +36,7 @@ public abstract class BmpBaseTest extend
}
private static final ImageFilter IMAGE_FILTER = new ImageFilter() {
+ @Override
public boolean accept(final File file) throws IOException, ImageReadException {
return isBmp(file);
}
Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/dcx/DcxBaseTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/dcx/DcxBaseTest.java?rev=1747595&r1=1747594&r2=1747595&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/dcx/DcxBaseTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/dcx/DcxBaseTest.java Thu Jun 9 20:28:11 2016
@@ -36,6 +36,7 @@ public abstract class DcxBaseTest extend
}
private static final ImageFilter IMAGE_FILTER = new ImageFilter() {
+ @Override
public boolean accept(final File file) throws IOException, ImageReadException {
return isDcx(file);
}
Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/gif/GifBaseTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/gif/GifBaseTest.java?rev=1747595&r1=1747594&r2=1747595&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/gif/GifBaseTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/gif/GifBaseTest.java Thu Jun 9 20:28:11 2016
@@ -36,6 +36,7 @@ public abstract class GifBaseTest extend
}
private static final ImageFilter IMAGE_FILTER = new ImageFilter() {
+ @Override
public boolean accept(final File file) throws IOException, ImageReadException {
return isGif(file);
}
Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/icns/IcnsBaseTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/icns/IcnsBaseTest.java?rev=1747595&r1=1747594&r2=1747595&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/icns/IcnsBaseTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/icns/IcnsBaseTest.java Thu Jun 9 20:28:11 2016
@@ -36,6 +36,7 @@ public abstract class IcnsBaseTest exten
}
private static final ImageFilter IMAGE_FILTER = new ImageFilter() {
+ @Override
public boolean accept(final File file) throws IOException, ImageReadException {
return isIcns(file);
}
Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/ico/IcoBaseTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/ico/IcoBaseTest.java?rev=1747595&r1=1747594&r2=1747595&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/ico/IcoBaseTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/ico/IcoBaseTest.java Thu Jun 9 20:28:11 2016
@@ -32,6 +32,7 @@ public abstract class IcoBaseTest extend
}
private static final ImageFilter IMAGE_FILTER = new ImageFilter() {
+ @Override
public boolean accept(final File file) throws IOException, ImageReadException {
return isIco(file);
}
Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/ico/IcoRoundtripTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/ico/IcoRoundtripTest.java?rev=1747595&r1=1747594&r2=1747595&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/ico/IcoRoundtripTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/ico/IcoRoundtripTest.java Thu Jun 9 20:28:11 2016
@@ -74,6 +74,7 @@ public class IcoRoundtripTest extends Ic
}
private class GeneratorFor1BitBitmaps implements BitmapGenerator {
+ @Override
public byte[] generateBitmap(final int foreground, final int background,
final int paletteSize) throws IOException, ImageWriteException {
final ByteArrayOutputStream byteArrayStream = new ByteArrayOutputStream();
@@ -118,6 +119,7 @@ public class IcoRoundtripTest extends Ic
}
private class GeneratorFor4BitBitmaps implements BitmapGenerator {
+ @Override
public byte[] generateBitmap(final int foreground, final int background,
final int paletteSize) throws IOException, ImageWriteException {
final ByteArrayOutputStream byteArrayStream = new ByteArrayOutputStream();
@@ -153,6 +155,7 @@ public class IcoRoundtripTest extends Ic
}
private class GeneratorFor8BitBitmaps implements BitmapGenerator {
+ @Override
public byte[] generateBitmap(final int foreground, final int background,
final int paletteSize) throws IOException, ImageWriteException {
final ByteArrayOutputStream byteArrayStream = new ByteArrayOutputStream();
@@ -187,6 +190,7 @@ public class IcoRoundtripTest extends Ic
}
private class GeneratorFor16BitBitmaps implements BitmapGenerator {
+ @Override
public byte[] generateBitmap(final int foreground, final int background,
final int paletteSize) throws IOException, ImageWriteException {
final ByteArrayOutputStream byteArrayStream = new ByteArrayOutputStream();
@@ -225,6 +229,7 @@ public class IcoRoundtripTest extends Ic
}
private class GeneratorFor24BitBitmaps implements BitmapGenerator {
+ @Override
public byte[] generateBitmap(final int foreground, final int background,
final int paletteSize) throws IOException, ImageWriteException {
final ByteArrayOutputStream byteArrayStream = new ByteArrayOutputStream();
@@ -259,6 +264,7 @@ public class IcoRoundtripTest extends Ic
}
private class GeneratorFor32BitBitmaps implements BitmapGenerator {
+ @Override
public byte[] generateBitmap(final int foreground, final int background,
final int paletteSize) throws IOException, ImageWriteException {
return generate32bitRGBABitmap(foreground, background, paletteSize,
Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/JpegBaseTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/JpegBaseTest.java?rev=1747595&r1=1747594&r2=1747595&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/JpegBaseTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/JpegBaseTest.java Thu Jun 9 20:28:11 2016
@@ -36,6 +36,7 @@ public abstract class JpegBaseTest exten
}
public static final ImageFilter imageFilter = new ImageFilter() {
+ @Override
public boolean accept(final File file) throws IOException, ImageReadException {
return isJpeg(file);
}
Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/ExifBaseTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/ExifBaseTest.java?rev=1747595&r1=1747594&r2=1747595&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/ExifBaseTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/ExifBaseTest.java Thu Jun 9 20:28:11 2016
@@ -43,12 +43,14 @@ public abstract class ExifBaseTest exten
}
private static final ImageFilter HAS_EXIF_IMAGE_FILTER = new ImageFilter() {
+ @Override
public boolean accept(final File file) throws IOException, ImageReadException {
return hasExifData(file);
}
};
private static final ImageFilter JPEG_IMAGE_FILTER = new ImageFilter() {
+ @Override
public boolean accept(final File file) throws IOException, ImageReadException {
return file.getName().toLowerCase().endsWith(".jpg");
}
Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/ExifRewriteTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/ExifRewriteTest.java?rev=1747595&r1=1747594&r2=1747595&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/ExifRewriteTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/ExifRewriteTest.java Thu Jun 9 20:28:11 2016
@@ -254,6 +254,7 @@ public class ExifRewriteTest extends Exi
@Test
public void testRewriteLossy() throws Exception {
final Rewriter rewriter = new Rewriter() {
+ @Override
public void rewrite(final ByteSource byteSource, final OutputStream os,
final TiffOutputSet outputSet) throws ImageReadException,
IOException, ImageWriteException {
@@ -268,6 +269,7 @@ public class ExifRewriteTest extends Exi
@Test
public void testRewriteLossless() throws Exception {
final Rewriter rewriter = new Rewriter() {
+ @Override
public void rewrite(final ByteSource byteSource, final OutputStream os,
final TiffOutputSet outputSet) throws ImageReadException,
IOException, ImageWriteException {
Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcBaseTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcBaseTest.java?rev=1747595&r1=1747594&r2=1747595&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcBaseTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcBaseTest.java Thu Jun 9 20:28:11 2016
@@ -50,12 +50,14 @@ public abstract class IptcBaseTest exten
}
private static final ImageFilter HAS_IPTC_IMAGE_FILTER = new ImageFilter() {
+ @Override
public boolean accept(final File file) throws IOException, ImageReadException {
return hasIptcData(file);
}
};
private static final ImageFilter JPEG_IMAGE_FILTER = new ImageFilter() {
+ @Override
public boolean accept(final File file) throws IOException, ImageReadException {
return file.getName().toLowerCase().endsWith(".jpg");
}
Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/xmp/JpegXmpBaseTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/xmp/JpegXmpBaseTest.java?rev=1747595&r1=1747594&r2=1747595&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/xmp/JpegXmpBaseTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/xmp/JpegXmpBaseTest.java Thu Jun 9 20:28:11 2016
@@ -51,6 +51,7 @@ public abstract class JpegXmpBaseTest ex
}
private static final ImageFilter HAS_JPEG_XMP_IMAGE_FILTER = new ImageFilter() {
+ @Override
public boolean accept(final File file) throws IOException, ImageReadException {
return hasJpegXmpData(file);
}
Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/pam/PamBaseTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/pam/PamBaseTest.java?rev=1747595&r1=1747594&r2=1747595&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/pam/PamBaseTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/pam/PamBaseTest.java Thu Jun 9 20:28:11 2016
@@ -36,6 +36,7 @@ public abstract class PamBaseTest extend
}
private static final ImageFilter IMAGE_FILTER = new ImageFilter() {
+ @Override
public boolean accept(final File file) throws IOException, ImageReadException {
return isPam(file);
}
Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/pcx/PcxBaseTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/pcx/PcxBaseTest.java?rev=1747595&r1=1747594&r2=1747595&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/pcx/PcxBaseTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/pcx/PcxBaseTest.java Thu Jun 9 20:28:11 2016
@@ -31,6 +31,7 @@ public abstract class PcxBaseTest extend
}
private static final ImageFilter IMAGE_FILTER = new ImageFilter() {
+ @Override
public boolean accept(final File file) throws IOException, ImageReadException {
return isPcx(file);
}
Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/PngBaseTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/PngBaseTest.java?rev=1747595&r1=1747594&r2=1747595&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/PngBaseTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/PngBaseTest.java Thu Jun 9 20:28:11 2016
@@ -36,6 +36,7 @@ public abstract class PngBaseTest extend
}
private static final ImageFilter IMAGE_FILTER = new ImageFilter() {
+ @Override
public boolean accept(final File file) throws IOException, ImageReadException {
return isPng(file);
}
Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/psd/PsdBaseTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/psd/PsdBaseTest.java?rev=1747595&r1=1747594&r2=1747595&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/psd/PsdBaseTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/psd/PsdBaseTest.java Thu Jun 9 20:28:11 2016
@@ -34,6 +34,7 @@ public abstract class PsdBaseTest extend
}
private static final ImageFilter IMAGE_FILTER = new ImageFilter() {
+ @Override
public boolean accept(final File file) throws IOException, ImageReadException {
return isPsd(file);
}
Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/rgbe/RgbeBaseTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/rgbe/RgbeBaseTest.java?rev=1747595&r1=1747594&r2=1747595&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/rgbe/RgbeBaseTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/rgbe/RgbeBaseTest.java Thu Jun 9 20:28:11 2016
@@ -34,6 +34,7 @@ public abstract class RgbeBaseTest exten
}
private static final ImageFilter IMAGE_FILTER = new ImageFilter() {
+ @Override
public boolean accept(final File file) throws IOException, ImageReadException {
return isRgbe(file);
}
Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffBaseTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffBaseTest.java?rev=1747595&r1=1747594&r2=1747595&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffBaseTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffBaseTest.java Thu Jun 9 20:28:11 2016
@@ -36,6 +36,7 @@ public abstract class TiffBaseTest exten
}
private static final ImageFilter IMAGE_FILTER = new ImageFilter() {
+ @Override
public boolean accept(final File file) throws IOException, ImageReadException {
return isTiff(file);
}
Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffLzwTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffLzwTest.java?rev=1747595&r1=1747594&r2=1747595&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffLzwTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffLzwTest.java Thu Jun 9 20:28:11 2016
@@ -90,18 +90,22 @@ public class TiffLzwTest extends TiffBas
final int LZW_MINIMUM_CODE_SIZE = 8;
final List<Integer> codes = new ArrayList<>();
final MyLzwCompressor.Listener compressionListener = new MyLzwCompressor.Listener() {
+ @Override
public void dataCode(final int code) {
codes.add(code);
}
+ @Override
public void eoiCode(final int code) {
codes.add(code);
}
+ @Override
public void clearCode(final int code) {
codes.add(code);
}
+ @Override
public void init(final int clearCode, final int eoiCode) {
}
};
@@ -115,6 +119,7 @@ public class TiffLzwTest extends TiffBas
int index = 0;
int clearCode, eoiCode;
+ @Override
public void code(final int code) {
if (DEBUG) {
if (code == clearCode) {
@@ -146,6 +151,7 @@ public class TiffLzwTest extends TiffBas
}
}
+ @Override
public void init(final int clearCode, final int eoiCode) {
this.clearCode = clearCode;
this.eoiCode = eoiCode;
@@ -175,6 +181,7 @@ public class TiffLzwTest extends TiffBas
final MyLzwDecompressor.Listener decompressionListener = new MyLzwDecompressor.Listener() {
+ @Override
public void code(final int code) {
Debug.debug("listener code: " + code + " (0x"
+ Integer.toHexString(code) + ") "
@@ -183,6 +190,7 @@ public class TiffLzwTest extends TiffBas
codes.add(code);
}
+ @Override
public void init(final int clearCode, final int eoiCode) {
}
@@ -198,6 +206,7 @@ public class TiffLzwTest extends TiffBas
int clearCode, eoiCode;
+ @Override
public void init(final int clearCode, final int eoiCode) {
this.clearCode = clearCode;
this.eoiCode = eoiCode;
@@ -235,14 +244,17 @@ public class TiffLzwTest extends TiffBas
}
}
+ @Override
public void dataCode(final int code) {
code(code);
}
+ @Override
public void eoiCode(final int code) {
code(code);
}
+ @Override
public void clearCode(final int code) {
code(code);
}
Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/wbmp/WbmpBaseTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/wbmp/WbmpBaseTest.java?rev=1747595&r1=1747594&r2=1747595&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/wbmp/WbmpBaseTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/wbmp/WbmpBaseTest.java Thu Jun 9 20:28:11 2016
@@ -28,6 +28,7 @@ public abstract class WbmpBaseTest exten
}
private static final ImageFilter IMAGE_FILTER = new ImageFilter() {
+ @Override
public boolean accept(final File file) throws IOException, ImageReadException {
return isWbmp(file);
}
Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/xbm/XbmBaseTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/xbm/XbmBaseTest.java?rev=1747595&r1=1747594&r2=1747595&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/xbm/XbmBaseTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/xbm/XbmBaseTest.java Thu Jun 9 20:28:11 2016
@@ -29,6 +29,7 @@ public abstract class XbmBaseTest extend
}
private static final ImageFilter IMAGE_FILTER = new ImageFilter() {
+ @Override
public boolean accept(final File file) throws IOException, ImageReadException {
return isXbm(file);
}
Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/xpm/XpmBaseTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/xpm/XpmBaseTest.java?rev=1747595&r1=1747594&r2=1747595&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/xpm/XpmBaseTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/xpm/XpmBaseTest.java Thu Jun 9 20:28:11 2016
@@ -29,6 +29,7 @@ public abstract class XpmBaseTest extend
}
private static final ImageFilter IMAGE_FILTER = new ImageFilter() {
+ @Override
public boolean accept(final File file) throws IOException, ImageReadException {
return isXpm(file);
}