Add final modifier to local variables. git-svn-id: https://svn.apache.org/repos/asf/commons/proper/imaging/trunk@1775889 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/commons-imaging/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-imaging/commit/38c8705a Tree: http://git-wip-us.apache.org/repos/asf/commons-imaging/tree/38c8705a Diff: http://git-wip-us.apache.org/repos/asf/commons-imaging/diff/38c8705a Branch: refs/heads/master Commit: 38c8705afebec5b0ceb5e32c6f395fa5774bc2b2 Parents: 56e0133 Author: Gary D. Gregory <[email protected]> Authored: Fri Dec 23 18:59:18 2016 +0000 Committer: Gary D. Gregory <[email protected]> Committed: Fri Dec 23 18:59:18 2016 +0000 ---------------------------------------------------------------------- .../commons/imaging/color/ColorCieLab.java | 2 +- .../commons/imaging/color/ColorCieLch.java | 2 +- .../commons/imaging/color/ColorCieLuv.java | 2 +- .../apache/commons/imaging/color/ColorCmy.java | 2 +- .../apache/commons/imaging/color/ColorCmyk.java | 2 +- .../apache/commons/imaging/color/ColorHsl.java | 2 +- .../apache/commons/imaging/color/ColorHsv.java | 2 +- .../commons/imaging/color/ColorHunterLab.java | 2 +- .../apache/commons/imaging/color/ColorXyz.java | 2 +- .../common/itu_t4/T4AndT6Compression.java | 4 +-- .../imaging/formats/gif/GifImageParser.java | 6 ++-- .../imaging/formats/jpeg/JpegImageMetadata.java | 6 ++-- .../imaging/formats/jpeg/JpegImageParser.java | 12 +++---- .../formats/jpeg/JpegPhotoshopMetadata.java | 2 +- .../imaging/formats/jpeg/iptc/IptcParser.java | 6 ++-- .../formats/jpeg/iptc/JpegIptcRewriter.java | 4 +-- .../formats/jpeg/iptc/PhotoshopApp13Data.java | 2 +- .../imaging/formats/jpeg/xmp/JpegRewriter.java | 4 +-- .../commons/imaging/formats/png/ChunkType.java | 4 +-- .../imaging/formats/png/PngColorType.java | 2 +- .../imaging/formats/png/PngImageParser.java | 18 +++++----- .../commons/imaging/formats/png/PngWriter.java | 4 +-- .../imaging/formats/png/ScanExpediter.java | 2 +- .../formats/png/chunks/PngChunkIhdr.java | 4 +-- .../formats/png/chunks/PngChunkScal.java | 2 +- .../scanlinefilters/ScanlineFilterPaeth.java | 2 +- .../TransparencyFilterGrayscale.java | 2 +- .../TransparencyFilterTrueColor.java | 8 ++--- .../imaging/formats/pnm/PnmImageParser.java | 4 +-- .../imaging/formats/psd/ImageResourceType.java | 2 +- .../imaging/formats/tiff/TiffContents.java | 8 ++--- .../imaging/formats/tiff/TiffDirectory.java | 10 +++--- .../imaging/formats/tiff/TiffImageMetadata.java | 16 ++++----- .../imaging/formats/tiff/TiffImageParser.java | 18 +++++----- .../commons/imaging/formats/tiff/TiffTags.java | 10 +++--- .../formats/tiff/write/TiffImageWriterBase.java | 4 +-- .../tiff/write/TiffImageWriterLossless.java | 6 ++-- .../tiff/write/TiffImageWriterLossy.java | 4 +-- .../formats/tiff/write/TiffOutputDirectory.java | 12 +++---- .../formats/tiff/write/TiffOutputSet.java | 10 +++--- .../formats/tiff/write/TiffOutputSummary.java | 4 +-- .../imaging/formats/xbm/XbmImageParser.java | 8 ++--- .../commons/imaging/icc/IccProfileParser.java | 4 +-- .../commons/imaging/palette/ColorGroup.java | 4 +-- .../imaging/palette/LongestAxisMedianCut.java | 4 +-- .../palette/MostPopulatedBoxesMedianCut.java | 2 +- .../commons/imaging/palette/PaletteFactory.java | 8 ++--- .../org/apache/commons/imaging/util/Debug.java | 2 +- .../commons/imaging/ImagingGuessFormatTest.java | 2 +- .../common/bytesource/ByteSourceImageTest.java | 2 +- .../formats/jpeg/exif/AsciiFieldTest.java | 2 +- .../formats/jpeg/exif/MicrosoftTagTest.java | 10 +++--- .../imaging/formats/jpeg/iptc/IptcAddTest.java | 2 +- .../formats/jpeg/iptc/IptcFullDiscardTest.java | 26 +++++++------- .../imaging/formats/png/PngTextTest.java | 2 +- .../imaging/formats/pnm/PnmImageParserTest.java | 26 +++++++------- .../imaging/formats/tiff/TiffLzwTest.java | 10 +++--- .../formats/tiff/TiffReadWriteTagsTest.java | 38 ++++++++++---------- .../imaging/formats/tiff/TiffRoundtripTest.java | 2 +- .../imaging/formats/tiff/TiffSubImageTest.java | 8 ++--- .../formats/tiff/TiffTagIntegrityTest.java | 4 +-- .../tiff/write/TiffOutputDirectoryTest.java | 4 +-- .../formats/tiff/write/TiffOutputSetTest.java | 2 +- .../palette/PaletteQuantizationTest.java | 16 ++++----- .../roundtrip/GrayscaleRountripTest.java | 2 +- .../roundtrip/NullParametersRoundtripTest.java | 2 +- 66 files changed, 206 insertions(+), 206 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/commons-imaging/blob/38c8705a/src/main/java/org/apache/commons/imaging/color/ColorCieLab.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/imaging/color/ColorCieLab.java b/src/main/java/org/apache/commons/imaging/color/ColorCieLab.java index e9167f2..5e1ad64 100644 --- a/src/main/java/org/apache/commons/imaging/color/ColorCieLab.java +++ b/src/main/java/org/apache/commons/imaging/color/ColorCieLab.java @@ -92,7 +92,7 @@ public final class ColorCieLab { return false; } - ColorCieLab that = (ColorCieLab) o; + final ColorCieLab that = (ColorCieLab) o; if (Double.compare(that.L, L) != 0) { return false; } http://git-wip-us.apache.org/repos/asf/commons-imaging/blob/38c8705a/src/main/java/org/apache/commons/imaging/color/ColorCieLch.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/imaging/color/ColorCieLch.java b/src/main/java/org/apache/commons/imaging/color/ColorCieLch.java index 8c9314a..77be4dd 100644 --- a/src/main/java/org/apache/commons/imaging/color/ColorCieLch.java +++ b/src/main/java/org/apache/commons/imaging/color/ColorCieLch.java @@ -92,7 +92,7 @@ public final class ColorCieLch { return false; } - ColorCieLch that = (ColorCieLch) o; + final ColorCieLch that = (ColorCieLch) o; if (Double.compare(that.C, C) != 0) { return false; } http://git-wip-us.apache.org/repos/asf/commons-imaging/blob/38c8705a/src/main/java/org/apache/commons/imaging/color/ColorCieLuv.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/imaging/color/ColorCieLuv.java b/src/main/java/org/apache/commons/imaging/color/ColorCieLuv.java index 456aa36..da96e88 100644 --- a/src/main/java/org/apache/commons/imaging/color/ColorCieLuv.java +++ b/src/main/java/org/apache/commons/imaging/color/ColorCieLuv.java @@ -92,7 +92,7 @@ public final class ColorCieLuv { return false; } - ColorCieLuv that = (ColorCieLuv) o; + final ColorCieLuv that = (ColorCieLuv) o; if (Double.compare(that.L, L) != 0) { return false; } http://git-wip-us.apache.org/repos/asf/commons-imaging/blob/38c8705a/src/main/java/org/apache/commons/imaging/color/ColorCmy.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/imaging/color/ColorCmy.java b/src/main/java/org/apache/commons/imaging/color/ColorCmy.java index 15a1483..f2e8281 100644 --- a/src/main/java/org/apache/commons/imaging/color/ColorCmy.java +++ b/src/main/java/org/apache/commons/imaging/color/ColorCmy.java @@ -122,7 +122,7 @@ public final class ColorCmy { return false; } - ColorCmy colorCmy = (ColorCmy) o; + final ColorCmy colorCmy = (ColorCmy) o; if (Double.compare(colorCmy.C, C) != 0) { return false; } http://git-wip-us.apache.org/repos/asf/commons-imaging/blob/38c8705a/src/main/java/org/apache/commons/imaging/color/ColorCmyk.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/imaging/color/ColorCmyk.java b/src/main/java/org/apache/commons/imaging/color/ColorCmyk.java index 15e1858..6c2b29c 100644 --- a/src/main/java/org/apache/commons/imaging/color/ColorCmyk.java +++ b/src/main/java/org/apache/commons/imaging/color/ColorCmyk.java @@ -132,7 +132,7 @@ public final class ColorCmyk { return false; } - ColorCmyk colorCmyk = (ColorCmyk) o; + final ColorCmyk colorCmyk = (ColorCmyk) o; if (Double.compare(colorCmyk.C, C) != 0) { return false; } http://git-wip-us.apache.org/repos/asf/commons-imaging/blob/38c8705a/src/main/java/org/apache/commons/imaging/color/ColorHsl.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/imaging/color/ColorHsl.java b/src/main/java/org/apache/commons/imaging/color/ColorHsl.java index c08b3d8..00f645d 100644 --- a/src/main/java/org/apache/commons/imaging/color/ColorHsl.java +++ b/src/main/java/org/apache/commons/imaging/color/ColorHsl.java @@ -92,7 +92,7 @@ public final class ColorHsl { return false; } - ColorHsl colorHsl = (ColorHsl) o; + final ColorHsl colorHsl = (ColorHsl) o; if (Double.compare(colorHsl.H, H) != 0) { return false; } http://git-wip-us.apache.org/repos/asf/commons-imaging/blob/38c8705a/src/main/java/org/apache/commons/imaging/color/ColorHsv.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/imaging/color/ColorHsv.java b/src/main/java/org/apache/commons/imaging/color/ColorHsv.java index 4e2b63a..6dd1fa1 100644 --- a/src/main/java/org/apache/commons/imaging/color/ColorHsv.java +++ b/src/main/java/org/apache/commons/imaging/color/ColorHsv.java @@ -92,7 +92,7 @@ public final class ColorHsv { return false; } - ColorHsv colorHsv = (ColorHsv) o; + final ColorHsv colorHsv = (ColorHsv) o; if (Double.compare(colorHsv.H, H) != 0) { return false; } http://git-wip-us.apache.org/repos/asf/commons-imaging/blob/38c8705a/src/main/java/org/apache/commons/imaging/color/ColorHunterLab.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/imaging/color/ColorHunterLab.java b/src/main/java/org/apache/commons/imaging/color/ColorHunterLab.java index ee719d8..4a0e482 100644 --- a/src/main/java/org/apache/commons/imaging/color/ColorHunterLab.java +++ b/src/main/java/org/apache/commons/imaging/color/ColorHunterLab.java @@ -92,7 +92,7 @@ public final class ColorHunterLab { return false; } - ColorHunterLab that = (ColorHunterLab) o; + final ColorHunterLab that = (ColorHunterLab) o; if (Double.compare(that.L, L) != 0) { return false; } http://git-wip-us.apache.org/repos/asf/commons-imaging/blob/38c8705a/src/main/java/org/apache/commons/imaging/color/ColorXyz.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/imaging/color/ColorXyz.java b/src/main/java/org/apache/commons/imaging/color/ColorXyz.java index 68491e2..629edfe 100644 --- a/src/main/java/org/apache/commons/imaging/color/ColorXyz.java +++ b/src/main/java/org/apache/commons/imaging/color/ColorXyz.java @@ -92,7 +92,7 @@ public final class ColorXyz { return false; } - ColorXyz colorXyz = (ColorXyz) o; + final ColorXyz colorXyz = (ColorXyz) o; if (Double.compare(colorXyz.X, X) != 0) { return false; } http://git-wip-us.apache.org/repos/asf/commons-imaging/blob/38c8705a/src/main/java/org/apache/commons/imaging/common/itu_t4/T4AndT6Compression.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/imaging/common/itu_t4/T4AndT6Compression.java b/src/main/java/org/apache/commons/imaging/common/itu_t4/T4AndT6Compression.java index 79f67fd..96169d8 100644 --- a/src/main/java/org/apache/commons/imaging/common/itu_t4/T4AndT6Compression.java +++ b/src/main/java/org/apache/commons/imaging/common/itu_t4/T4AndT6Compression.java @@ -212,7 +212,7 @@ public final class T4AndT6Compression { for (int y = 0; y < height; y++) { int rowLength; try { - T4_T6_Tables.Entry entry = CONTROL_CODES.decode(inputStream); + final T4_T6_Tables.Entry entry = CONTROL_CODES.decode(inputStream); if (!isEOL(entry, hasFill)) { throw new ImageReadException("Expected EOL not found"); } @@ -560,7 +560,7 @@ public final class T4AndT6Compression { for (int a0 = 0; a0 < width;) { int a1; int a2; - T4_T6_Tables.Entry entry = CONTROL_CODES.decode(inputStream); + final T4_T6_Tables.Entry entry = CONTROL_CODES.decode(inputStream); if (entry == T4_T6_Tables.P) { fillRange(outputStream, referenceLine, a0, b2, codingA0Color); a0 = b2; http://git-wip-us.apache.org/repos/asf/commons-imaging/blob/38c8705a/src/main/java/org/apache/commons/imaging/formats/gif/GifImageParser.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/imaging/formats/gif/GifImageParser.java b/src/main/java/org/apache/commons/imaging/formats/gif/GifImageParser.java index 993fa08..ae23539 100644 --- a/src/main/java/org/apache/commons/imaging/formats/gif/GifImageParser.java +++ b/src/main/java/org/apache/commons/imaging/formats/gif/GifImageParser.java @@ -427,7 +427,7 @@ public class GifImageParser extends ImageParser { } private GifBlock findBlock(final List<GifBlock> blocks, final int code) { - for (GifBlock gifBlock : blocks) { + for (final GifBlock gifBlock : blocks) { if (gifBlock.blockCode == code) { return gifBlock; } @@ -505,7 +505,7 @@ public class GifImageParser extends ImageParser { final List<String> result = new ArrayList<>(); final int code = 0x21fe; - for (GifBlock block : blocks) { + for (final GifBlock block : blocks) { if (block.blockCode == code) { final byte[] bytes = ((GenericGifBlock) block).appendSubBlocks(); result.add(new String(bytes, "US-ASCII")); @@ -1014,7 +1014,7 @@ public class GifImageParser extends ImageParser { final List<GifBlock> blocks = readBlocks(ghi, is, true, formatCompliance); final List<String> result = new ArrayList<>(); - for (GifBlock block : blocks) { + for (final GifBlock block : blocks) { if (block.blockCode != XMP_COMPLETE_CODE) { continue; } http://git-wip-us.apache.org/repos/asf/commons-imaging/blob/38c8705a/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegImageMetadata.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegImageMetadata.java b/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegImageMetadata.java index 4dc2a62..f0816a6 100644 --- a/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegImageMetadata.java +++ b/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegImageMetadata.java @@ -100,7 +100,7 @@ public class JpegImageMetadata implements ImageMetadata { return null; } final List<? extends ImageMetadataItem> dirs = exif.getDirectories(); - for (ImageMetadataItem d : dirs) { + for (final ImageMetadataItem d : dirs) { final TiffImageMetadata.Directory dir = (TiffImageMetadata.Directory) d; byte[] data = null; @@ -132,7 +132,7 @@ public class JpegImageMetadata implements ImageMetadata { } final List<? extends ImageMetadataItem> dirs = exif.getDirectories(); - for (ImageMetadataItem d : dirs) { + for (final ImageMetadataItem d : dirs) { final TiffImageMetadata.Directory dir = (TiffImageMetadata.Directory) d; // Debug.debug("dir", dir); BufferedImage image = dir.getThumbnail(); @@ -172,7 +172,7 @@ public class JpegImageMetadata implements ImageMetadata { return null; } final List<? extends ImageMetadataItem> dirs = exif.getDirectories(); - for (ImageMetadataItem d : dirs) { + for (final ImageMetadataItem d : dirs) { final TiffImageMetadata.Directory dir = (TiffImageMetadata.Directory) d; // Debug.debug("dir", dir); final TiffImageData rawImageData = dir.getTiffImageData(); http://git-wip-us.apache.org/repos/asf/commons-imaging/blob/38c8705a/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegImageParser.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegImageParser.java b/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegImageParser.java index 6b11c3a..bcd54f2 100644 --- a/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegImageParser.java +++ b/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegImageParser.java @@ -202,7 +202,7 @@ public class JpegImageParser extends ImageParser { private byte[] assembleSegments(final List<App2Segment> segments) throws ImageReadException { try { return assembleSegments(segments, false); - } catch (ImageReadException e) { + } catch (final ImageReadException e) { return assembleSegments(segments, true); } } @@ -250,7 +250,7 @@ public class JpegImageParser extends ImageParser { final byte[] result = new byte[total]; int progress = 0; - for (App2Segment segment : segments) { + for (final App2Segment segment : segments) { System.arraycopy(segment.getIccBytes(), 0, result, progress, segment.getIccBytes().length); progress += segment.getIccBytes().length; } @@ -284,7 +284,7 @@ public class JpegImageParser extends ImageParser { final List<App2Segment> filtered = new ArrayList<>(); if (segments != null) { // throw away non-icc profile app2 segments. - for (Segment s : segments) { + for (final Segment s : segments) { final App2Segment segment = (App2Segment) s; if (segment.getIccBytes() != null) { filtered.add(segment); @@ -331,7 +331,7 @@ public class JpegImageParser extends ImageParser { private List<Segment> filterAPP1Segments(final List<Segment> segments) { final List<Segment> result = new ArrayList<>(); - for (Segment s : segments) { + for (final Segment s : segments) { final GenericSegment segment = (GenericSegment) s; if (isExifAPP1Segment(segment)) { result.add(segment); @@ -593,7 +593,7 @@ public class JpegImageParser extends ImageParser { PhotoshopApp13Data photoshopApp13Data = null; - for (Segment s : segments) { + for (final Segment s : segments) { final App13Segment segment = (App13Segment) s; final PhotoshopApp13Data data = segment.parsePhotoshopSegment(params); @@ -793,7 +793,7 @@ public class JpegImageParser extends ImageParser { final List<String> comments = new ArrayList<>(); final List<Segment> commentSegments = readSegments(byteSource, new int[] { JpegConstants.COM_MARKER}, false); - for (Segment commentSegment : commentSegments) { + for (final Segment commentSegment : commentSegments) { final ComSegment comSegment = (ComSegment) commentSegment; String comment = ""; try { http://git-wip-us.apache.org/repos/asf/commons-imaging/blob/38c8705a/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegPhotoshopMetadata.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegPhotoshopMetadata.java b/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegPhotoshopMetadata.java index cb8c710..802d164 100644 --- a/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegPhotoshopMetadata.java +++ b/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegPhotoshopMetadata.java @@ -34,7 +34,7 @@ public class JpegPhotoshopMetadata extends GenericImageMetadata { final List<IptcRecord> records = photoshopApp13Data.getRecords(); Collections.sort(records, IptcRecord.COMPARATOR); - for (IptcRecord element : records) { + for (final IptcRecord element : records) { if (element.iptcType != IptcTypes.RECORD_VERSION) { add(element.getIptcTypeName(), element.getValue()); } http://git-wip-us.apache.org/repos/asf/commons-imaging/blob/38c8705a/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcParser.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcParser.java b/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcParser.java index 4825da4..7e5d687 100644 --- a/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcParser.java +++ b/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcParser.java @@ -114,7 +114,7 @@ public class IptcParser extends BinaryFileParser { final List<IptcBlock> blocks = parseAllBlocks(bytes, verbose, strict); - for (IptcBlock block : blocks) { + for (final IptcBlock block : blocks) { // Ignore everything but IPTC data. if (!block.isIPTCBlock()) { continue; @@ -357,7 +357,7 @@ public class IptcParser extends BinaryFileParser { JpegConstants.PHOTOSHOP_IDENTIFICATION_STRING.writeTo(bos); final List<IptcBlock> blocks = data.getRawBlocks(); - for (IptcBlock block : blocks) { + for (final IptcBlock block : blocks) { bos.write4Bytes(JpegConstants.CONST_8BIM); if (block.blockType < 0 || block.blockType > 0xffff) { @@ -419,7 +419,7 @@ public class IptcParser extends BinaryFileParser { // TODO: make sure order right // write the list. - for (IptcRecord element : elements) { + for (final IptcRecord element : elements) { if (element.iptcType == IptcTypes.RECORD_VERSION) { continue; // ignore } http://git-wip-us.apache.org/repos/asf/commons-imaging/blob/38c8705a/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/JpegIptcRewriter.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/JpegIptcRewriter.java b/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/JpegIptcRewriter.java index dbc1c18..bd52215 100644 --- a/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/JpegIptcRewriter.java +++ b/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/JpegIptcRewriter.java @@ -300,8 +300,8 @@ public class JpegIptcRewriter extends JpegRewriter { newData = new PhotoshopApp13Data(newData.getRecords(), newBlocks); - byte[] segmentBytes = new IptcParser().writePhotoshopApp13Segment(newData); - JFIFPieceSegment newSegment = new JFIFPieceSegment(JpegConstants.JPEG_APP13_MARKER, segmentBytes); + final byte[] segmentBytes = new IptcParser().writePhotoshopApp13Segment(newData); + final JFIFPieceSegment newSegment = new JFIFPieceSegment(JpegConstants.JPEG_APP13_MARKER, segmentBytes); newPieces = insertAfterLastAppSegments(newPieces, Arrays.asList(newSegment)); } http://git-wip-us.apache.org/repos/asf/commons-imaging/blob/38c8705a/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/PhotoshopApp13Data.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/PhotoshopApp13Data.java b/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/PhotoshopApp13Data.java index f709a32..6d83564 100644 --- a/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/PhotoshopApp13Data.java +++ b/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/PhotoshopApp13Data.java @@ -40,7 +40,7 @@ public class PhotoshopApp13Data { public List<IptcBlock> getNonIptcBlocks() { final List<IptcBlock> result = new ArrayList<>(); - for (IptcBlock block : rawBlocks) { + for (final IptcBlock block : rawBlocks) { if (!block.isIPTCBlock()) { result.add(block); } http://git-wip-us.apache.org/repos/asf/commons-imaging/blob/38c8705a/src/main/java/org/apache/commons/imaging/formats/jpeg/xmp/JpegRewriter.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/imaging/formats/jpeg/xmp/JpegRewriter.java b/src/main/java/org/apache/commons/imaging/formats/jpeg/xmp/JpegRewriter.java index 99a2e70..1e1d2cc 100644 --- a/src/main/java/org/apache/commons/imaging/formats/jpeg/xmp/JpegRewriter.java +++ b/src/main/java/org/apache/commons/imaging/formats/jpeg/xmp/JpegRewriter.java @@ -251,7 +251,7 @@ public class JpegRewriter extends BinaryFileParser { final SegmentFilter filter, final boolean reverse) { final List<T> result = new ArrayList<>(); - for (T piece : segments) { + for (final T piece : segments) { if (piece instanceof JFIFPieceSegment) { if (filter.filter((JFIFPieceSegment) piece) ^ !reverse) { result.add(piece); @@ -322,7 +322,7 @@ public class JpegRewriter extends BinaryFileParser { try (DataOutputStream os = new DataOutputStream(outputStream)) { JpegConstants.SOI.writeTo(os); - for (JFIFPiece piece : segments) { + for (final JFIFPiece piece : segments) { piece.write(os); } } http://git-wip-us.apache.org/repos/asf/commons-imaging/blob/38c8705a/src/main/java/org/apache/commons/imaging/formats/png/ChunkType.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/imaging/formats/png/ChunkType.java b/src/main/java/org/apache/commons/imaging/formats/png/ChunkType.java index 0035bb7..cd48648 100644 --- a/src/main/java/org/apache/commons/imaging/formats/png/ChunkType.java +++ b/src/main/java/org/apache/commons/imaging/formats/png/ChunkType.java @@ -88,10 +88,10 @@ public enum ChunkType { final int value; private ChunkType() { - char[] chars = name().toCharArray(); + final char[] chars = name().toCharArray(); try { array = name().getBytes("UTF-8"); - } catch (UnsupportedEncodingException e) { + } catch (final UnsupportedEncodingException e) { // will not happen since UTF-8 is one of the StandardCharsets of the Java platform throw new RuntimeException(e); } http://git-wip-us.apache.org/repos/asf/commons-imaging/blob/38c8705a/src/main/java/org/apache/commons/imaging/formats/png/PngColorType.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/imaging/formats/png/PngColorType.java b/src/main/java/org/apache/commons/imaging/formats/png/PngColorType.java index 4be7660..a7b7b77 100644 --- a/src/main/java/org/apache/commons/imaging/formats/png/PngColorType.java +++ b/src/main/java/org/apache/commons/imaging/formats/png/PngColorType.java @@ -64,7 +64,7 @@ public enum PngColorType { } public static PngColorType getColorType(final int value) { - for (PngColorType type : values()) { + for (final PngColorType type : values()) { if (type.value == value) { return type; } http://git-wip-us.apache.org/repos/asf/commons-imaging/blob/38c8705a/src/main/java/org/apache/commons/imaging/formats/png/PngImageParser.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/imaging/formats/png/PngImageParser.java b/src/main/java/org/apache/commons/imaging/formats/png/PngImageParser.java index 0dfa167..a9ab830 100644 --- a/src/main/java/org/apache/commons/imaging/formats/png/PngImageParser.java +++ b/src/main/java/org/apache/commons/imaging/formats/png/PngImageParser.java @@ -112,7 +112,7 @@ public class PngImageParser extends ImageParser { throws ImageReadException, IOException { final List<PngChunk> chunks = readChunks(is, null, false); final List<String> chunkTypes = new ArrayList<>(); - for (PngChunk chunk : chunks) { + for (final PngChunk chunk : chunks) { chunkTypes.add(getChunkTypeName(chunk.chunkType)); } return chunkTypes; @@ -281,7 +281,7 @@ public class PngImageParser extends ImageParser { final GenericImageMetadata result = new GenericImageMetadata(); - for (PngChunk chunk : chunks) { + for (final PngChunk chunk : chunks) { final PngTextChunk textChunk = (PngTextChunk) chunk; result.add(textChunk.getKeyword(), textChunk.getText()); @@ -293,7 +293,7 @@ public class PngImageParser extends ImageParser { private List<PngChunk> filterChunks(final List<PngChunk> chunks, final ChunkType type) { final List<PngChunk> result = new ArrayList<>(); - for (PngChunk chunk : chunks) { + for (final PngChunk chunk : chunks) { if (chunk.chunkType == type.value) { result.add(chunk); } @@ -378,7 +378,7 @@ public class PngImageParser extends ImageParser { throw new ImageReadException("PNG contains more than one sCAL:" + sCALs.size()); } else if (sCALs.size() == 1) { - PngChunkScal pngChunkScal = (PngChunkScal) sCALs.get(0); + final PngChunkScal pngChunkScal = (PngChunkScal) sCALs.get(0); if (pngChunkScal.unitSpecifier == 1) { physicalScale = PhysicalScale.createFromMeters(pngChunkScal.unitsPerPixelXAxis, pngChunkScal.unitsPerPixelYAxis); @@ -395,17 +395,17 @@ public class PngImageParser extends ImageParser { final List<String> comments = new ArrayList<>(); final List<PngText> textChunks = new ArrayList<>(); - for (PngChunk tEXt : tEXts) { + for (final PngChunk tEXt : tEXts) { final PngChunkText pngChunktEXt = (PngChunkText) tEXt; comments.add(pngChunktEXt.keyword + ": " + pngChunktEXt.text); textChunks.add(pngChunktEXt.getContents()); } - for (PngChunk zTXt : zTXts) { + for (final PngChunk zTXt : zTXts) { final PngChunkZtxt pngChunkzTXt = (PngChunkZtxt) zTXt; comments.add(pngChunkzTXt.keyword + ": " + pngChunkzTXt.text); textChunks.add(pngChunkzTXt.getContents()); } - for (PngChunk iTXt : iTXts) { + for (final PngChunk iTXt : iTXts) { final PngChunkItxt pngChunkiTXt = (PngChunkItxt) iTXt; comments.add(pngChunkiTXt.keyword + ": " + pngChunkiTXt.text); textChunks.add(pngChunkiTXt.getContents()); @@ -530,7 +530,7 @@ public class PngImageParser extends ImageParser { } ByteArrayOutputStream baos = new ByteArrayOutputStream(); - for (PngChunk IDAT : IDATs) { + for (final PngChunk IDAT : IDATs) { final PngChunkIdat pngChunkIDAT = (PngChunkIdat) IDAT; final byte[] bytes = pngChunkIDAT.getBytes(); // System.out.println(i + ": bytes: " + bytes.length); @@ -717,7 +717,7 @@ public class PngImageParser extends ImageParser { } final List<PngChunkItxt> xmpChunks = new ArrayList<>(); - for (PngChunk chunk : chunks) { + for (final PngChunk chunk : chunks) { final PngChunkItxt itxtChunk = (PngChunkItxt) chunk; if (!itxtChunk.getKeyword().equals(PngConstants.XMP_KEYWORD)) { continue; http://git-wip-us.apache.org/repos/asf/commons-imaging/blob/38c8705a/src/main/java/org/apache/commons/imaging/formats/png/PngWriter.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/imaging/formats/png/PngWriter.java b/src/main/java/org/apache/commons/imaging/formats/png/PngWriter.java index 2589a14..f08f882 100644 --- a/src/main/java/org/apache/commons/imaging/formats/png/PngWriter.java +++ b/src/main/java/org/apache/commons/imaging/formats/png/PngWriter.java @@ -312,7 +312,7 @@ class PngWriter { private byte getBitDepth(final PngColorType pngColorType, final Map<String, Object> params) { byte depth = 8; - Object o = params.get(PngConstants.PARAM_KEY_PNG_BIT_DEPTH); + final Object o = params.get(PngConstants.PARAM_KEY_PNG_BIT_DEPTH); if (o instanceof Number) { depth = ((Number) o).byteValue(); } @@ -543,7 +543,7 @@ class PngWriter { if (params.containsKey(PngConstants.PARAM_KEY_PNG_TEXT_CHUNKS)) { final List<?> outputTexts = (List<?>) params.get(PngConstants.PARAM_KEY_PNG_TEXT_CHUNKS); - for (Object outputText : outputTexts) { + for (final Object outputText : outputTexts) { final PngText text = (PngText) outputText; if (text instanceof PngText.Text) { writeChunktEXt(os, (PngText.Text) text); http://git-wip-us.apache.org/repos/asf/commons-imaging/blob/38c8705a/src/main/java/org/apache/commons/imaging/formats/png/ScanExpediter.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/imaging/formats/png/ScanExpediter.java b/src/main/java/org/apache/commons/imaging/formats/png/ScanExpediter.java index 4d58f79..df119d1 100644 --- a/src/main/java/org/apache/commons/imaging/formats/png/ScanExpediter.java +++ b/src/main/java/org/apache/commons/imaging/formats/png/ScanExpediter.java @@ -207,7 +207,7 @@ abstract class ScanExpediter { throw new ImageReadException("PNG: unknown filterType: " + filterType); } - byte[] scanline = readBytes("scanline", is, length, "PNG: missing image data"); + final byte[] scanline = readBytes("scanline", is, length, "PNG: missing image data"); return unfilterScanline(FilterType.values()[filterType], scanline, prev, bytesPerPixel); } http://git-wip-us.apache.org/repos/asf/commons-imaging/blob/38c8705a/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngChunkIhdr.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngChunkIhdr.java b/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngChunkIhdr.java index cb5ffab..a864202 100644 --- a/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngChunkIhdr.java +++ b/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngChunkIhdr.java @@ -41,14 +41,14 @@ public class PngChunkIhdr extends PngChunk { width = read4Bytes("Width", is, "Not a Valid Png File: IHDR Corrupt", getByteOrder()); height = read4Bytes("Height", is, "Not a Valid Png File: IHDR Corrupt", getByteOrder()); bitDepth = readByte("BitDepth", is, "Not a Valid Png File: IHDR Corrupt"); - int type = readByte("ColorType", is, "Not a Valid Png File: IHDR Corrupt"); + final int type = readByte("ColorType", is, "Not a Valid Png File: IHDR Corrupt"); pngColorType = PngColorType.getColorType(type); if (pngColorType == null) { throw new ImageReadException("PNG: unknown color type: " + type); } compressionMethod = readByte("CompressionMethod", is, "Not a Valid Png File: IHDR Corrupt"); filterMethod = readByte("FilterMethod", is, "Not a Valid Png File: IHDR Corrupt"); - int method = readByte("InterlaceMethod", is, "Not a Valid Png File: IHDR Corrupt"); + final int method = readByte("InterlaceMethod", is, "Not a Valid Png File: IHDR Corrupt"); if (method < 0 && method >= InterlaceMethod.values().length) { throw new ImageReadException("PNG: unknown interlace method: " + method); } http://git-wip-us.apache.org/repos/asf/commons-imaging/blob/38c8705a/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngChunkScal.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngChunkScal.java b/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngChunkScal.java index 6de9c99..f4c8823 100644 --- a/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngChunkScal.java +++ b/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngChunkScal.java @@ -57,7 +57,7 @@ public class PngChunkScal extends PngChunk { private double toDouble(final String str) throws ImageReadException { try { return Double.valueOf(str); - } catch (NumberFormatException e) { + } catch (final NumberFormatException e) { throw new ImageReadException("PNG sCAL error reading axis value - " + str); } } http://git-wip-us.apache.org/repos/asf/commons-imaging/blob/38c8705a/src/main/java/org/apache/commons/imaging/formats/png/scanlinefilters/ScanlineFilterPaeth.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/imaging/formats/png/scanlinefilters/ScanlineFilterPaeth.java b/src/main/java/org/apache/commons/imaging/formats/png/scanlinefilters/ScanlineFilterPaeth.java index 065303c..df66c5d 100644 --- a/src/main/java/org/apache/commons/imaging/formats/png/scanlinefilters/ScanlineFilterPaeth.java +++ b/src/main/java/org/apache/commons/imaging/formats/png/scanlinefilters/ScanlineFilterPaeth.java @@ -66,7 +66,7 @@ public class ScanlineFilterPaeth implements ScanlineFilter { } // upperleft = 255; - int paethPredictor = paethPredictor(0xff & left, 0xff & above, 0xff & upperleft); + final int paethPredictor = paethPredictor(0xff & left, 0xff & above, 0xff & upperleft); dst[i] = (byte) ((src[i] + paethPredictor) % 256); // dst[i] = (byte) ((src[i] + paethPredictor) ); http://git-wip-us.apache.org/repos/asf/commons-imaging/blob/38c8705a/src/main/java/org/apache/commons/imaging/formats/png/transparencyfilters/TransparencyFilterGrayscale.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/imaging/formats/png/transparencyfilters/TransparencyFilterGrayscale.java b/src/main/java/org/apache/commons/imaging/formats/png/transparencyfilters/TransparencyFilterGrayscale.java index fb121c6..b5bb710 100644 --- a/src/main/java/org/apache/commons/imaging/formats/png/transparencyfilters/TransparencyFilterGrayscale.java +++ b/src/main/java/org/apache/commons/imaging/formats/png/transparencyfilters/TransparencyFilterGrayscale.java @@ -29,7 +29,7 @@ public class TransparencyFilterGrayscale extends TransparencyFilter { public TransparencyFilterGrayscale(final byte[] bytes) throws IOException { super(bytes); - ByteArrayInputStream is = new ByteArrayInputStream(bytes); + final ByteArrayInputStream is = new ByteArrayInputStream(bytes); transparentColor = read2Bytes("transparentColor", is, "tRNS: Missing transparentColor", getByteOrder()); } http://git-wip-us.apache.org/repos/asf/commons-imaging/blob/38c8705a/src/main/java/org/apache/commons/imaging/formats/png/transparencyfilters/TransparencyFilterTrueColor.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/imaging/formats/png/transparencyfilters/TransparencyFilterTrueColor.java b/src/main/java/org/apache/commons/imaging/formats/png/transparencyfilters/TransparencyFilterTrueColor.java index ecc42d9..9ad774e 100644 --- a/src/main/java/org/apache/commons/imaging/formats/png/transparencyfilters/TransparencyFilterTrueColor.java +++ b/src/main/java/org/apache/commons/imaging/formats/png/transparencyfilters/TransparencyFilterTrueColor.java @@ -29,10 +29,10 @@ public class TransparencyFilterTrueColor extends TransparencyFilter { public TransparencyFilterTrueColor(final byte[] bytes) throws IOException { super(bytes); - ByteArrayInputStream is = new ByteArrayInputStream(bytes); - int transparentRed = read2Bytes("transparentRed", is, "tRNS: Missing transparentColor", getByteOrder()); - int transparentGreen = read2Bytes("transparentGreen", is, "tRNS: Missing transparentColor", getByteOrder()); - int transparentBlue = read2Bytes("transparentBlue", is, "tRNS: Missing transparentColor", getByteOrder()); + final ByteArrayInputStream is = new ByteArrayInputStream(bytes); + final int transparentRed = read2Bytes("transparentRed", is, "tRNS: Missing transparentColor", getByteOrder()); + final int transparentGreen = read2Bytes("transparentGreen", is, "tRNS: Missing transparentColor", getByteOrder()); + final int transparentBlue = read2Bytes("transparentBlue", is, "tRNS: Missing transparentColor", getByteOrder()); transparentColor = ((0xff & transparentRed) << 16) | ((0xff & transparentGreen) << 8) http://git-wip-us.apache.org/repos/asf/commons-imaging/blob/38c8705a/src/main/java/org/apache/commons/imaging/formats/pnm/PnmImageParser.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/imaging/formats/pnm/PnmImageParser.java b/src/main/java/org/apache/commons/imaging/formats/pnm/PnmImageParser.java index 4acd09d..c55e797 100644 --- a/src/main/java/org/apache/commons/imaging/formats/pnm/PnmImageParser.java +++ b/src/main/java/org/apache/commons/imaging/formats/pnm/PnmImageParser.java @@ -103,13 +103,13 @@ public class PnmImageParser extends ImageParser { final int width; try { width = Integer.parseInt(wsr.readtoWhiteSpace()); - } catch (NumberFormatException e) { + } catch (final NumberFormatException e) { throw new ImageReadException("Invalid width specified." , e); } final int height; try { height = Integer.parseInt(wsr.readtoWhiteSpace()); - } catch (NumberFormatException e) { + } catch (final NumberFormatException e) { throw new ImageReadException("Invalid height specified." , e); } http://git-wip-us.apache.org/repos/asf/commons-imaging/blob/38c8705a/src/main/java/org/apache/commons/imaging/formats/psd/ImageResourceType.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/imaging/formats/psd/ImageResourceType.java b/src/main/java/org/apache/commons/imaging/formats/psd/ImageResourceType.java index 5b330b5..602a1b3 100644 --- a/src/main/java/org/apache/commons/imaging/formats/psd/ImageResourceType.java +++ b/src/main/java/org/apache/commons/imaging/formats/psd/ImageResourceType.java @@ -114,7 +114,7 @@ class ImageResourceType { }; public static String getDescription(final int id) { - for (ImageResourceType type : TYPES) { + for (final ImageResourceType type : TYPES) { if (type.from <= id && id <= type.to) { return type.description; } http://git-wip-us.apache.org/repos/asf/commons-imaging/blob/38c8705a/src/main/java/org/apache/commons/imaging/formats/tiff/TiffContents.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/imaging/formats/tiff/TiffContents.java b/src/main/java/org/apache/commons/imaging/formats/tiff/TiffContents.java index 81709b2..cb9f255 100644 --- a/src/main/java/org/apache/commons/imaging/formats/tiff/TiffContents.java +++ b/src/main/java/org/apache/commons/imaging/formats/tiff/TiffContents.java @@ -38,11 +38,11 @@ public class TiffContents { result.add(header); - for (TiffDirectory directory : directories) { + for (final TiffDirectory directory : directories) { result.add(directory); final List<TiffField> fields = directory.entries; - for (TiffField field : fields) { + for (final TiffField field : fields) { final TiffElement oversizeValue = field.getOversizeValueElement(); if (null != oversizeValue) { result.add(oversizeValue); @@ -61,7 +61,7 @@ public class TiffContents { } public TiffField findField(final TagInfo tag) throws ImageReadException { - for (TiffDirectory directory : directories) { + for (final TiffDirectory directory : directories) { final TiffField field = directory.findField(tag); if (null != field) { return field; @@ -77,7 +77,7 @@ public class TiffContents { Collections.sort(elements, TiffElement.COMPARATOR); long lastEnd = 0; - for (TiffElement element : elements) { + for (final TiffElement element : elements) { if (element.offset > lastEnd) { Debug.debug("\t" + "gap: " + (element.offset - lastEnd)); } http://git-wip-us.apache.org/repos/asf/commons-imaging/blob/38c8705a/src/main/java/org/apache/commons/imaging/formats/tiff/TiffDirectory.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/imaging/formats/tiff/TiffDirectory.java b/src/main/java/org/apache/commons/imaging/formats/tiff/TiffDirectory.java index 84cd1c8..f321c28 100644 --- a/src/main/java/org/apache/commons/imaging/formats/tiff/TiffDirectory.java +++ b/src/main/java/org/apache/commons/imaging/formats/tiff/TiffDirectory.java @@ -87,7 +87,7 @@ public class TiffDirectory extends TiffElement { long entryOffset = offset + TiffConstants.TIFF_DIRECTORY_HEADER_LENGTH; final StringBuilder result = new StringBuilder(); - for (TiffField entry : entries) { + for (final TiffField entry : entries) { result.append(String.format("\t[%d]: %s (%d, 0x%x), %s, %d: %s%n", entryOffset, entry.getTagInfo().name, entry.getTag(), entry.getTag(), @@ -126,7 +126,7 @@ public class TiffDirectory extends TiffElement { } public void dump() { - for (TiffField entry : entries) { + for (final TiffField entry : entries) { entry.dump(); } @@ -178,7 +178,7 @@ public class TiffDirectory extends TiffElement { return null; } - for (TiffField field : entries) { + for (final TiffField field : entries) { if (field.getTag() == tag.tag) { return field; } @@ -766,8 +766,8 @@ public class TiffDirectory extends TiffElement { } public ImageDataElement getJpegRawImageDataElement() throws ImageReadException { - TiffField jpegInterchangeFormat = findField(TiffTagConstants.TIFF_TAG_JPEG_INTERCHANGE_FORMAT); - TiffField jpegInterchangeFormatLength = findField(TiffTagConstants.TIFF_TAG_JPEG_INTERCHANGE_FORMAT_LENGTH); + final TiffField jpegInterchangeFormat = findField(TiffTagConstants.TIFF_TAG_JPEG_INTERCHANGE_FORMAT); + final TiffField jpegInterchangeFormatLength = findField(TiffTagConstants.TIFF_TAG_JPEG_INTERCHANGE_FORMAT_LENGTH); if (jpegInterchangeFormat != null && jpegInterchangeFormatLength != null) { final int offSet = jpegInterchangeFormat.getIntArrayValue()[0]; http://git-wip-us.apache.org/repos/asf/commons-imaging/blob/38c8705a/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImageMetadata.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImageMetadata.java b/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImageMetadata.java index 3dfc3cb..e6fec64 100644 --- a/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImageMetadata.java +++ b/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImageMetadata.java @@ -111,7 +111,7 @@ public class TiffImageMetadata extends GenericImageMetadata { byteOrder); final List<? extends ImageMetadataItem> entries = getItems(); - for (ImageMetadataItem entry : entries) { + for (final ImageMetadataItem entry : entries) { final TiffMetadataItem item = (TiffMetadataItem) entry; final TiffField srcField = item.getTiffField(); @@ -169,7 +169,7 @@ public class TiffImageMetadata extends GenericImageMetadata { final List<ImageMetadataItem> result = new ArrayList<>(); final List<? extends ImageMetadataItem> items = super.getItems(); - for (ImageMetadataItem item : items) { + for (final ImageMetadataItem item : items) { final Directory dir = (Directory) item; result.addAll(dir.getItems()); } @@ -197,7 +197,7 @@ public class TiffImageMetadata extends GenericImageMetadata { final TiffOutputSet result = new TiffOutputSet(byteOrder); final List<? extends ImageMetadataItem> srcDirs = getDirectories(); - for (ImageMetadataItem srcDir1 : srcDirs) { + for (final ImageMetadataItem srcDir1 : srcDirs) { final Directory srcDir = (Directory) srcDir1; if (null != result.findDirectory(srcDir.type)) { @@ -227,7 +227,7 @@ public class TiffImageMetadata extends GenericImageMetadata { final List<? extends ImageMetadataItem> directories = getDirectories(); if (exactDirectoryMatch || tagInfo.directoryType != TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN) { - for (ImageMetadataItem directory1 : directories) { + for (final ImageMetadataItem directory1 : directories) { final Directory directory = (Directory) directory1; if (directory.type == tagInfo.directoryType.directoryType) { final TiffField field = directory.findField(tagInfo); @@ -239,7 +239,7 @@ public class TiffImageMetadata extends GenericImageMetadata { if (exactDirectoryMatch || tagsMatching > 1) { return null; } - for (ImageMetadataItem directory1 : directories) { + for (final ImageMetadataItem directory1 : directories) { final Directory directory = (Directory) directory1; if (tagInfo.directoryType.isImageDirectory() && directory.type >= 0) { @@ -257,7 +257,7 @@ public class TiffImageMetadata extends GenericImageMetadata { } } - for (ImageMetadataItem directory1 : directories) { + for (final ImageMetadataItem directory1 : directories) { final Directory directory = (Directory) directory1; final TiffField field = directory.findField(tagInfo); if (field != null) { @@ -426,7 +426,7 @@ public class TiffImageMetadata extends GenericImageMetadata { public TiffDirectory findDirectory(final int directoryType) { final List<? extends ImageMetadataItem> directories = getDirectories(); - for (ImageMetadataItem directory1 : directories) { + for (final ImageMetadataItem directory1 : directories) { final Directory directory = (Directory) directory1; if (directory.type == directoryType) { return directory.directory; @@ -438,7 +438,7 @@ public class TiffImageMetadata extends GenericImageMetadata { public List<TiffField> getAllFields() { final List<TiffField> result = new ArrayList<>(); final List<? extends ImageMetadataItem> directories = getDirectories(); - for (ImageMetadataItem directory1 : directories) { + for (final ImageMetadataItem directory1 : directories) { final Directory directory = (Directory) directory1; result.addAll(directory.getAllFields()); } http://git-wip-us.apache.org/repos/asf/commons-imaging/blob/38c8705a/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImageParser.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImageParser.java b/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImageParser.java index 1750abd..5aa653f 100644 --- a/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImageParser.java +++ b/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImageParser.java @@ -127,13 +127,13 @@ public class TiffImageParser extends ImageParser { final TiffImageMetadata result = new TiffImageMetadata(contents); - for (TiffDirectory dir : directories) { + for (final TiffDirectory dir : directories) { final TiffImageMetadata.Directory metadataDirectory = new TiffImageMetadata.Directory( tiffReader.getByteOrder(), dir); final List<TiffField> entries = dir.getDirectoryEntries(); - for (TiffField entry : entries) { + for (final TiffField entry : entries) { metadataDirectory.add(entry); } @@ -229,7 +229,7 @@ public class TiffImageParser extends ImageParser { final List<String> comments = new ArrayList<>(); final List<TiffField> entries = directory.entries; - for (TiffField field : entries) { + for (final TiffField field : entries) { final String comment = field.toString(); comments.add(comment); } @@ -365,7 +365,7 @@ public class TiffImageParser extends ImageParser { // Debug.debug("directory offset", directory.offset); - for (TiffField field : entries) { + for (final TiffField field : entries) { field.dump(pw, Integer.toString(d)); } } @@ -405,7 +405,7 @@ public class TiffImageParser extends ImageParser { for (int i = 0; i < contents.directories.size(); i++) { final TiffDirectory directory = contents.directories.get(i); final List<ImageDataElement> dataElements = directory.getTiffRawImageDataElements(); - for (ImageDataElement element : dataElements) { + for (final ImageDataElement element : dataElements) { final byte[] bytes = byteSource.getBlock(element.offset, element.length); result.add(bytes); @@ -507,10 +507,10 @@ public class TiffImageParser extends ImageParser { final Map<String, Object> params) throws ImageReadException { - Integer ix0 = getIntegerParameter(TiffConstants.PARAM_KEY_SUBIMAGE_X, params); - Integer iy0 = getIntegerParameter(TiffConstants.PARAM_KEY_SUBIMAGE_Y, params); - Integer iwidth = getIntegerParameter(TiffConstants.PARAM_KEY_SUBIMAGE_WIDTH, params); - Integer iheight = getIntegerParameter(TiffConstants.PARAM_KEY_SUBIMAGE_HEIGHT, params); + final Integer ix0 = getIntegerParameter(TiffConstants.PARAM_KEY_SUBIMAGE_X, params); + final Integer iy0 = getIntegerParameter(TiffConstants.PARAM_KEY_SUBIMAGE_Y, params); + final Integer iwidth = getIntegerParameter(TiffConstants.PARAM_KEY_SUBIMAGE_WIDTH, params); + final Integer iheight = getIntegerParameter(TiffConstants.PARAM_KEY_SUBIMAGE_HEIGHT, params); if (ix0 == null && iy0 == null && iwidth == null && iheight == null) { return null; http://git-wip-us.apache.org/repos/asf/commons-imaging/blob/38c8705a/src/main/java/org/apache/commons/imaging/formats/tiff/TiffTags.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/imaging/formats/tiff/TiffTags.java b/src/main/java/org/apache/commons/imaging/formats/tiff/TiffTags.java index 339726c..fbf95b0 100644 --- a/src/main/java/org/apache/commons/imaging/formats/tiff/TiffTags.java +++ b/src/main/java/org/apache/commons/imaging/formats/tiff/TiffTags.java @@ -83,7 +83,7 @@ final class TiffTags { // make sure to use the thread-safe version; this is shared state. final Map<Integer, List<TagInfo>> map = new HashMap<>(); - for (TagInfo tag : tags) { + for (final TagInfo tag : tags) { List<TagInfo> tagList = map.get(tag.tag); if (tagList == null) { tagList = new ArrayList<>(); @@ -98,7 +98,7 @@ final class TiffTags { private static Map<Integer, Integer> countTags(final List<TagInfo> tags) { final Map<Integer, Integer> map = new HashMap<>(); - for (TagInfo tag : tags) { + for (final TagInfo tag : tags) { final Integer count = map.get(tag.tag); if (count == null) { map.put(tag.tag, 1); @@ -132,7 +132,7 @@ final class TiffTags { } // first search for exact match. - for (TagInfo tagInfo : possibleMatches) { + for (final TagInfo tagInfo : possibleMatches) { if (tagInfo.directoryType == TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN) { // pass continue; @@ -142,7 +142,7 @@ final class TiffTags { } // accept an inexact match. - for (TagInfo tagInfo : possibleMatches) { + for (final TagInfo tagInfo : possibleMatches) { if (tagInfo.directoryType == TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN) { // pass continue; @@ -156,7 +156,7 @@ final class TiffTags { } // accept a wildcard match. - for (TagInfo tagInfo : possibleMatches) { + for (final TagInfo tagInfo : possibleMatches) { if (tagInfo.directoryType == TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN) { return tagInfo; } http://git-wip-us.apache.org/repos/asf/commons-imaging/blob/38c8705a/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffImageWriterBase.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffImageWriterBase.java b/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffImageWriterBase.java index eb78d98..aeffa81 100644 --- a/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffImageWriterBase.java +++ b/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffImageWriterBase.java @@ -79,7 +79,7 @@ public abstract class TiffImageWriterBase { final List<Integer> directoryIndices = new ArrayList<>(); final Map<Integer, TiffOutputDirectory> directoryTypeMap = new HashMap<>(); - for (TiffOutputDirectory directory : directories) { + for (final TiffOutputDirectory directory : directories) { final int dirType = directory.type; directoryTypeMap.put(dirType, directory); // Debug.debug("validating dirType", dirType + " (" @@ -126,7 +126,7 @@ public abstract class TiffImageWriterBase { final HashSet<Integer> fieldTags = new HashSet<>(); final List<TiffOutputField> fields = directory.getFields(); - for (TiffOutputField field : fields) { + for (final TiffOutputField field : fields) { if (fieldTags.contains(field.tag)) { throw new ImageWriteException("Tag (" + field.tagInfo.getDescription() http://git-wip-us.apache.org/repos/asf/commons-imaging/blob/38c8705a/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffImageWriterLossless.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffImageWriterLossless.java b/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffImageWriterLossless.java index 97290fb..30b152b 100644 --- a/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffImageWriterLossless.java +++ b/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffImageWriterLossless.java @@ -84,7 +84,7 @@ public class TiffImageWriterLossless extends TiffImageWriterBase { for (final TiffDirectory directory : directories) { elements.add(directory); - for (TiffField field : directory.getDirectoryEntries()) { + for (final TiffField field : directory.getDirectoryEntries()) { final TiffElement oversizeValue = field.getOversizeValueElement(); if (oversizeValue != null) { final TiffOutputField frozenField = frozenFields.get(field.getTag()); @@ -232,7 +232,7 @@ public class TiffImageWriterLossless extends TiffImageWriterBase { // search for the smallest possible element large enough to hold the // item. TiffElement bestFit = null; - for (TiffElement element : unusedElements) { + for (final TiffElement element : unusedElements) { if (element.length >= outputItemLength) { bestFit = element; } else { @@ -314,7 +314,7 @@ public class TiffImageWriterLossless extends TiffImageWriterBase { } // write in the new items - for (TiffOutputItem outputItem : outputItems) { + for (final TiffOutputItem outputItem : outputItems) { final BufferOutputStream tos = new BufferOutputStream(output, (int) outputItem.getOffset()); final BinaryOutputStream bos = new BinaryOutputStream(tos, byteOrder); http://git-wip-us.apache.org/repos/asf/commons-imaging/blob/38c8705a/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffImageWriterLossy.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffImageWriterLossy.java b/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffImageWriterLossy.java index 6e215ed..c83d990 100644 --- a/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffImageWriterLossy.java +++ b/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffImageWriterLossy.java @@ -55,7 +55,7 @@ public class TiffImageWriterLossy extends TiffImageWriterBase { private void updateOffsetsStep(final List<TiffOutputItem> outputItems) { int offset = TIFF_HEADER_SIZE; - for (TiffOutputItem outputItem : outputItems) { + for (final TiffOutputItem outputItem : outputItems) { outputItem.setOffset(offset); final int itemLength = outputItem.getItemLength(); offset += itemLength; @@ -70,7 +70,7 @@ public class TiffImageWriterLossy extends TiffImageWriterBase { ImageWriteException { writeImageFileHeader(bos); - for (TiffOutputItem outputItem : outputItems) { + for (final TiffOutputItem outputItem : outputItems) { outputItem.writeItem(bos); final int length = outputItem.getItemLength(); http://git-wip-us.apache.org/repos/asf/commons-imaging/blob/38c8705a/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputDirectory.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputDirectory.java b/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputDirectory.java index a1e8a09..02ceeac 100644 --- a/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputDirectory.java +++ b/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputDirectory.java @@ -553,7 +553,7 @@ public final class TiffOutputDirectory extends TiffOutputItem { public void removeField(final int tag) { final List<TiffOutputField> matches = new ArrayList<>(); - for (TiffOutputField field : fields) { + for (final TiffOutputField field : fields) { if (field.tag == tag) { matches.add(field); } @@ -588,7 +588,7 @@ public final class TiffOutputDirectory extends TiffOutputItem { * @see #findField(TagInfo) */ public TiffOutputField findField(final int tag) { - for (TiffOutputField field : fields) { + for (final TiffOutputField field : fields) { if (field.tag == tag) { return field; } @@ -620,7 +620,7 @@ public final class TiffOutputDirectory extends TiffOutputItem { bos.write2Bytes(fields.size()); // DirectoryFieldCount // Write Fields - for (TiffOutputField field : fields) { + for (final TiffOutputField field : fields) { field.writeField(bos); // Debug.debug("\t" + "writing field (" + field.tag + ", 0x" + @@ -730,8 +730,8 @@ public final class TiffOutputDirectory extends TiffOutputItem { // TiffOutputField imageDataOffsetsField = null; - int[] imageDataOffsets = new int[imageData.length]; - int[] imageDataByteCounts = new int[imageData.length]; + final int[] imageDataOffsets = new int[imageData.length]; + final int[] imageDataByteCounts = new int[imageData.length]; for (int i = 0; i < imageData.length; i++) { imageDataByteCounts[i] = imageData[i].length; } @@ -764,7 +764,7 @@ public final class TiffOutputDirectory extends TiffOutputItem { result.add(this); sortFields(); - for (TiffOutputField field : fields) { + for (final TiffOutputField field : fields) { if (field.isLocalValue()) { continue; } http://git-wip-us.apache.org/repos/asf/commons-imaging/blob/38c8705a/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputSet.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputSet.java b/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputSet.java index 9e08380..9d3cd82 100644 --- a/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputSet.java +++ b/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputSet.java @@ -47,7 +47,7 @@ public final class TiffOutputSet { final TiffOutputSummary outputSummary) throws ImageWriteException { final List<TiffOutputItem> result = new ArrayList<>(); - for (TiffOutputDirectory directory : directories) { + for (final TiffOutputDirectory directory : directories) { result.addAll(directory.getOutputItems(outputSummary)); } @@ -117,7 +117,7 @@ public final class TiffOutputSet { } public TiffOutputDirectory findDirectory(final int directoryType) { - for (TiffOutputDirectory directory : directories) { + for (final TiffOutputDirectory directory : directories) { if (directory.type == directoryType) { return directory; } @@ -195,7 +195,7 @@ public final class TiffOutputSet { } public void removeField(final int tag) { - for (TiffOutputDirectory directory : directories) { + for (final TiffOutputDirectory directory : directories) { directory.removeField(tag); } } @@ -205,7 +205,7 @@ public final class TiffOutputSet { } public TiffOutputField findField(final int tag) { - for (TiffOutputDirectory directory : directories) { + for (final TiffOutputDirectory directory : directories) { final TiffOutputField field = directory.findField(tag); if (null != field) { return field; @@ -272,7 +272,7 @@ public final class TiffOutputSet { prefix, i, directory.description(), directory.type)); final List<TiffOutputField> fields = directory.getFields(); - for (TiffOutputField field : fields) { + for (final TiffOutputField field : fields) { result.append(prefix); result.append("\t\tfield " + i + ": " + field.tagInfo); result.append(NEWLINE); http://git-wip-us.apache.org/repos/asf/commons-imaging/blob/38c8705a/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputSummary.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputSummary.java b/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputSummary.java index 732b8fd..c26045c 100644 --- a/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputSummary.java +++ b/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputSummary.java @@ -57,13 +57,13 @@ class TiffOutputSummary { } public void updateOffsets(final ByteOrder byteOrder) throws ImageWriteException { - for (OffsetItem offset : offsetItems) { + for (final OffsetItem offset : offsetItems) { final byte[] value = FieldType.LONG.writeData( (int) offset.item.getOffset(), byteOrder); offset.itemOffsetField.setData(value); } - for (ImageDataOffsets imageDataInfo : imageDataItems) { + for (final ImageDataOffsets imageDataInfo : imageDataItems) { for (int j = 0; j < imageDataInfo.outputItems.length; j++) { final TiffOutputItem item = imageDataInfo.outputItems[j]; imageDataInfo.imageDataOffsets[j] = (int) item.getOffset(); http://git-wip-us.apache.org/repos/asf/commons-imaging/blob/38c8705a/src/main/java/org/apache/commons/imaging/formats/xbm/XbmImageParser.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/imaging/formats/xbm/XbmImageParser.java b/src/main/java/org/apache/commons/imaging/formats/xbm/XbmImageParser.java index a57fd78..4a3d8a4 100644 --- a/src/main/java/org/apache/commons/imaging/formats/xbm/XbmImageParser.java +++ b/src/main/java/org/apache/commons/imaging/formats/xbm/XbmImageParser.java @@ -267,10 +267,10 @@ public class XbmImageParser extends ImageParser { } } - int[] palette = { 0xffffff, 0x000000 }; - ColorModel colorModel = new IndexColorModel(1, 2, palette, 0, false, -1, DataBuffer.TYPE_BYTE); - DataBufferByte dataBuffer = new DataBufferByte(imageData, imageData.length); - WritableRaster raster = Raster.createPackedRaster(dataBuffer, xbmHeader.width, xbmHeader.height, 1, null); + final int[] palette = { 0xffffff, 0x000000 }; + final ColorModel colorModel = new IndexColorModel(1, 2, palette, 0, false, -1, DataBuffer.TYPE_BYTE); + final DataBufferByte dataBuffer = new DataBufferByte(imageData, imageData.length); + final WritableRaster raster = Raster.createPackedRaster(dataBuffer, xbmHeader.width, xbmHeader.height, 1, null); return new BufferedImage(colorModel, raster, colorModel.isAlphaPremultiplied(), new Properties()); } http://git-wip-us.apache.org/repos/asf/commons-imaging/blob/38c8705a/src/main/java/org/apache/commons/imaging/icc/IccProfileParser.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/imaging/icc/IccProfileParser.java b/src/main/java/org/apache/commons/imaging/icc/IccProfileParser.java index 0e05f94..f11ce6f 100644 --- a/src/main/java/org/apache/commons/imaging/icc/IccProfileParser.java +++ b/src/main/java/org/apache/commons/imaging/icc/IccProfileParser.java @@ -68,7 +68,7 @@ public class IccProfileParser extends BinaryFileParser { try { is = byteSource.getInputStream(); - IccProfileInfo result = readICCProfileInfo(is); + final IccProfileInfo result = readICCProfileInfo(is); if (result == null) { return null; @@ -332,7 +332,7 @@ public class IccProfileParser extends BinaryFileParser { printCharQuad("DeviceModel", deviceModel); } - boolean result = deviceManufacturer == IccConstants.IEC && deviceModel == IccConstants.sRGB; + final boolean result = deviceManufacturer == IccConstants.IEC && deviceModel == IccConstants.sRGB; return result; } } http://git-wip-us.apache.org/repos/asf/commons-imaging/blob/38c8705a/src/main/java/org/apache/commons/imaging/palette/ColorGroup.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/imaging/palette/ColorGroup.java b/src/main/java/org/apache/commons/imaging/palette/ColorGroup.java index 297f1ac..9d87686 100644 --- a/src/main/java/org/apache/commons/imaging/palette/ColorGroup.java +++ b/src/main/java/org/apache/commons/imaging/palette/ColorGroup.java @@ -55,7 +55,7 @@ class ColorGroup { } int total = 0; - for (ColorCount color : colorCounts) { + for (final ColorCount color : colorCounts) { total += color.count; minAlpha = Math.min(minAlpha, color.alpha); @@ -107,7 +107,7 @@ class ColorGroup { long greenTotal = 0; long blueTotal = 0; - for (ColorCount color : colorCounts) { + for (final ColorCount color : colorCounts) { countTotal += color.count; alphaTotal += color.count * color.alpha; redTotal += color.count * color.red; http://git-wip-us.apache.org/repos/asf/commons-imaging/blob/38c8705a/src/main/java/org/apache/commons/imaging/palette/LongestAxisMedianCut.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/imaging/palette/LongestAxisMedianCut.java b/src/main/java/org/apache/commons/imaging/palette/LongestAxisMedianCut.java index f3149d7..8b3b4c6 100644 --- a/src/main/java/org/apache/commons/imaging/palette/LongestAxisMedianCut.java +++ b/src/main/java/org/apache/commons/imaging/palette/LongestAxisMedianCut.java @@ -114,9 +114,9 @@ public class LongestAxisMedianCut implements MedianCut { colorGroup.colorCounts.subList(medianIndex + 1, colorGroup.colorCounts.size())); - ColorGroup less = new ColorGroup(new ArrayList<>(colorCounts1), ignoreAlpha); + final ColorGroup less = new ColorGroup(new ArrayList<>(colorCounts1), ignoreAlpha); colorGroups.add(less); - ColorGroup more = new ColorGroup(new ArrayList<>(colorCounts2), ignoreAlpha); + final ColorGroup more = new ColorGroup(new ArrayList<>(colorCounts2), ignoreAlpha); colorGroups.add(more); final ColorCount medianValue = colorGroup.colorCounts.get(medianIndex); http://git-wip-us.apache.org/repos/asf/commons-imaging/blob/38c8705a/src/main/java/org/apache/commons/imaging/palette/MostPopulatedBoxesMedianCut.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/imaging/palette/MostPopulatedBoxesMedianCut.java b/src/main/java/org/apache/commons/imaging/palette/MostPopulatedBoxesMedianCut.java index af31092..aa9eab0 100644 --- a/src/main/java/org/apache/commons/imaging/palette/MostPopulatedBoxesMedianCut.java +++ b/src/main/java/org/apache/commons/imaging/palette/MostPopulatedBoxesMedianCut.java @@ -31,7 +31,7 @@ public class MostPopulatedBoxesMedianCut implements MedianCut { final boolean ignoreAlpha) throws ImageWriteException { int maxPoints = 0; ColorGroup colorGroup = null; - for (ColorGroup group : colorGroups) { + for (final ColorGroup group : colorGroups) { if (group.maxDiff > 0) { if (group.totalPoints > maxPoints) { colorGroup = group; http://git-wip-us.apache.org/repos/asf/commons-imaging/blob/38c8705a/src/main/java/org/apache/commons/imaging/palette/PaletteFactory.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/imaging/palette/PaletteFactory.java b/src/main/java/org/apache/commons/imaging/palette/PaletteFactory.java index b8e6da5..8ebe4fe 100644 --- a/src/main/java/org/apache/commons/imaging/palette/PaletteFactory.java +++ b/src/main/java/org/apache/commons/imaging/palette/PaletteFactory.java @@ -202,8 +202,8 @@ public class PaletteFactory { } } - int sum2 = sum1 - last; - int slice2 = slice1 - 1; + final int sum2 = sum1 - last; + final int slice2 = slice1 - 1; final DivisionCandidate dc1 = finishDivision(subset, component, precision, sum1, slice1); final DivisionCandidate dc2 = finishDivision(subset, component, precision, sum2, slice2); @@ -231,7 +231,7 @@ public class PaletteFactory { DivisionCandidate bestV = null; double bestScore = Double.MAX_VALUE; - for (DivisionCandidate dc : dcs) { + for (final DivisionCandidate dc : dcs) { final ColorSpaceSubset first = dc.dst_a; final ColorSpaceSubset second = dc.dst_b; final int area1 = first.total; @@ -273,7 +273,7 @@ public class PaletteFactory { int maxArea = -1; ColorSpaceSubset maxSubset = null; - for (ColorSpaceSubset subset : v) { + for (final ColorSpaceSubset subset : v) { if (ignore.contains(subset)) { continue; } http://git-wip-us.apache.org/repos/asf/commons-imaging/blob/38c8705a/src/main/java/org/apache/commons/imaging/util/Debug.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/imaging/util/Debug.java b/src/main/java/org/apache/commons/imaging/util/Debug.java index 8b33014..e3b4f09 100644 --- a/src/main/java/org/apache/commons/imaging/util/Debug.java +++ b/src/main/java/org/apache/commons/imaging/util/Debug.java @@ -229,7 +229,7 @@ public final class Debug { final String suffix = " [" + counter++ + "]"; debug(message + " (" + v.size() + ")" + suffix); - for (Object aV : v) { + for (final Object aV : v) { debug("\t" + aV.toString() + suffix); } debug(); http://git-wip-us.apache.org/repos/asf/commons-imaging/blob/38c8705a/src/test/java/org/apache/commons/imaging/ImagingGuessFormatTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/imaging/ImagingGuessFormatTest.java b/src/test/java/org/apache/commons/imaging/ImagingGuessFormatTest.java index a15a317..ac0118a 100644 --- a/src/test/java/org/apache/commons/imaging/ImagingGuessFormatTest.java +++ b/src/test/java/org/apache/commons/imaging/ImagingGuessFormatTest.java @@ -79,7 +79,7 @@ public class ImagingGuessFormatTest extends ImagingTest { @Test public void testGuessFormat() throws Exception { - String imagePath = FilenameUtils.separatorsToSystem(pathToFile); + final String imagePath = FilenameUtils.separatorsToSystem(pathToFile); final File imageFile = new File(TEST_IMAGE_FOLDER, imagePath); final ImageFormat guessedFormat = Imaging.guessFormat(imageFile); http://git-wip-us.apache.org/repos/asf/commons-imaging/blob/38c8705a/src/test/java/org/apache/commons/imaging/common/bytesource/ByteSourceImageTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/imaging/common/bytesource/ByteSourceImageTest.java b/src/test/java/org/apache/commons/imaging/common/bytesource/ByteSourceImageTest.java index 0593640..614a47e 100644 --- a/src/test/java/org/apache/commons/imaging/common/bytesource/ByteSourceImageTest.java +++ b/src/test/java/org/apache/commons/imaging/common/bytesource/ByteSourceImageTest.java @@ -105,7 +105,7 @@ public class ByteSourceImageTest extends ByteSourceTest { } public void checkGetBufferedImage(final File file, final byte[] bytes) throws Exception { - BufferedImage bufferedImage = Imaging.getBufferedImage(file); + final BufferedImage bufferedImage = Imaging.getBufferedImage(file); assertNotNull(bufferedImage); assertTrue(bufferedImage.getWidth() > 0); assertTrue(bufferedImage.getHeight() > 0); http://git-wip-us.apache.org/repos/asf/commons-imaging/blob/38c8705a/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/AsciiFieldTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/AsciiFieldTest.java b/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/AsciiFieldTest.java index 098c211..719ea1d 100644 --- a/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/AsciiFieldTest.java +++ b/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/AsciiFieldTest.java @@ -67,7 +67,7 @@ public class AsciiFieldTest extends ExifBaseTest { TiffTagConstants.TIFF_TAG_DATE_TIME.tag, "2007:12:25 13:34:39"); - for (Map.Entry<Integer, Object> tag : expectedFieldValues.entrySet()) { + for (final Map.Entry<Integer, Object> tag : expectedFieldValues.entrySet()) { assertTrue(fieldMap.containsKey(tag.getKey())); final TiffField field = fieldMap.get(tag.getKey()); assertNotNull(field); http://git-wip-us.apache.org/repos/asf/commons-imaging/blob/38c8705a/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/MicrosoftTagTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/MicrosoftTagTest.java b/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/MicrosoftTagTest.java index 9333c96..ea6b7dc 100644 --- a/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/MicrosoftTagTest.java +++ b/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/MicrosoftTagTest.java @@ -119,11 +119,11 @@ public class MicrosoftTagTest extends ExifBaseTest { final TiffImageMetadata metadata = toTiffMetadata(Imaging.getMetadata(file)); // field values may be duplicated between directories, we have to check all - List<Object> authorValues = new ArrayList<>(); - List<Object> commentValues = new ArrayList<>(); - List<Object> subjectValues = new ArrayList<>(); - List<Object> titleValues = new ArrayList<>(); - for (TiffDirectory d : metadata.contents.directories) { + final List<Object> authorValues = new ArrayList<>(); + final List<Object> commentValues = new ArrayList<>(); + final List<Object> subjectValues = new ArrayList<>(); + final List<Object> titleValues = new ArrayList<>(); + for (final TiffDirectory d : metadata.contents.directories) { titleValues.add(d.getFieldValue(MicrosoftTagConstants.EXIF_TAG_XPTITLE, false)); authorValues.add(d.getFieldValue(MicrosoftTagConstants.EXIF_TAG_XPAUTHOR, false)); commentValues.add(d.getFieldValue(MicrosoftTagConstants.EXIF_TAG_XPCOMMENT, false)); http://git-wip-us.apache.org/repos/asf/commons-imaging/blob/38c8705a/src/test/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcAddTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcAddTest.java b/src/test/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcAddTest.java index 5c7128c..ebe6cdd 100644 --- a/src/test/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcAddTest.java +++ b/src/test/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcAddTest.java @@ -75,7 +75,7 @@ public class IptcAddTest extends IptcBaseTest { newBlocks.addAll(metadata.photoshopApp13Data.getNonIptcBlocks()); final List<IptcRecord> oldRecords = metadata.photoshopApp13Data.getRecords(); - List<IptcRecord> newRecords = new ArrayList<>(); + final List<IptcRecord> newRecords = new ArrayList<>(); for (final IptcRecord record : oldRecords) { if (record.iptcType != IptcTypes.CITY && record.iptcType != IptcTypes.CREDIT) { http://git-wip-us.apache.org/repos/asf/commons-imaging/blob/38c8705a/src/test/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcFullDiscardTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcFullDiscardTest.java b/src/test/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcFullDiscardTest.java index faafec3..ef62946 100644 --- a/src/test/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcFullDiscardTest.java +++ b/src/test/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcFullDiscardTest.java @@ -30,41 +30,41 @@ import org.junit.Test; public class IptcFullDiscardTest { private byte[] addMetaData(final byte[] bytes) throws Exception { - IptcRecord record = new IptcRecord(IptcTypes.KEYWORDS, "meta; data"); - PhotoshopApp13Data data = new PhotoshopApp13Data(Collections.singletonList(record), Collections.<IptcBlock> emptyList()); - ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream(); + final IptcRecord record = new IptcRecord(IptcTypes.KEYWORDS, "meta; data"); + final PhotoshopApp13Data data = new PhotoshopApp13Data(Collections.singletonList(record), Collections.<IptcBlock> emptyList()); + final ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream(); new JpegIptcRewriter().writeIPTC(bytes, byteArrayOutputStream, data); return byteArrayOutputStream.toByteArray(); } private byte[] generateImage() throws Exception { - BufferedImage image = new BufferedImage(100, 50, BufferedImage.TYPE_3BYTE_BGR); // was TYPE_INT_ARGB but that fails on Continuum - Graphics2D graphics2D = image.createGraphics(); + final BufferedImage image = new BufferedImage(100, 50, BufferedImage.TYPE_3BYTE_BGR); // was TYPE_INT_ARGB but that fails on Continuum + final Graphics2D graphics2D = image.createGraphics(); graphics2D.drawString("Hello World!", 10, 10); - ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream(); + final ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream(); ImageIO.write(image, "jpg", byteArrayOutputStream); return byteArrayOutputStream.toByteArray(); } private byte[] removeMetaData(final byte[] bytes, final boolean removeApp13Segment) throws Exception { - ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream(); + final ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream(); new JpegIptcRewriter().removeIPTC(bytes, byteArrayOutputStream, removeApp13Segment); return byteArrayOutputStream.toByteArray(); } @Test public void leaveApp13Segment() throws Exception { - byte[] originalImage = generateImage(); - byte[] taggedImage = addMetaData(originalImage); - byte[] untaggedImage = removeMetaData(taggedImage, false); + final byte[] originalImage = generateImage(); + final byte[] taggedImage = addMetaData(originalImage); + final byte[] untaggedImage = removeMetaData(taggedImage, false); Assert.assertEquals(18, untaggedImage.length - originalImage.length); } @Test public void removeApp13Segment() throws Exception { - byte[] originalImage = generateImage(); - byte[] taggedImage = addMetaData(originalImage); - byte[] untaggedImage = removeMetaData(taggedImage, true); + final byte[] originalImage = generateImage(); + final byte[] taggedImage = addMetaData(originalImage); + final byte[] untaggedImage = removeMetaData(taggedImage, true); Assert.assertEquals(originalImage.length, untaggedImage.length); } }
