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:26:11 UTC
svn commit: r1747594 [1/2] - 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/common/itu_t4/
main/java/org/apache/commons/imaging/common/mylzw/...
Author: ggregory
Date: Thu Jun 9 20:26:10 2016
New Revision: 1747594
URL: http://svn.apache.org/viewvc?rev=1747594&view=rev
Log:
Use Java 7 diamonds.
Modified:
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/FormatCompliance.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/ImageInfo.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/ImageParser.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/Imaging.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/itu_t4/HuffmanTree.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/itu_t4/T4AndT6Compression.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/mylzw/MyLzwCompressor.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/BmpImageParser.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/dcx/DcxImageParser.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/gif/GifImageParser.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/icns/IcnsDecoder.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/icns/IcnsImageParser.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/ico/IcoImageParser.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/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/IptcTypeLookup.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/JpegIptcRewriter.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/PhotoshopApp13Data.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/segments/DhtSegment.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/segments/DqtSegment.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/jpeg/xmp/JpegXmpRewriter.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pcx/PcxImageParser.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pcx/PcxWriter.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/PngImageInfo.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/PngImageParser.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/pnm/PnmImageParser.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/PsdImageParser.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffContents.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffDirectory.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImageMetadata.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImageParser.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/TiffTags.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfo.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffImageWriterBase.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/formats/tiff/write/TiffOutputSet.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputSummary.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/wbmp/WbmpImageParser.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/xbm/XbmImageParser.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/xpm/XpmImageParser.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/MedianCutQuantizer.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/PaletteFactory.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/util/Debug.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/ByteSourceImageTest.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/examples/ApacheImagingSpeedAndMemoryTest.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/examples/ImageWriteExample.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/examples/SampleUsage.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/bmp/BmpRoundtripTest.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/JpegReadTest.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/JpegWithJpegThumbnailTest.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/AsciiFieldTest.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/ExifDumpTest.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/exif/GpsTest.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/MicrosoftTagTest.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/SpecificExifTagTest.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcAddTest.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcDumpTest.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcUpdateTest.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/xmp/JpegXmpDumpTest.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/xmp/JpegXmpRewriteTest.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/pam/PamReadTest.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/pcx/PcxReadTest.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/ConvertPngToGifTest.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/PngMultipleRoundtripTest.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/PngTextTest.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/PngWriteForceTrueColorText.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/PngWriteReadTest.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/psd/PsdReadTest.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffCcittTest.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/tiff/TiffReadWriteTagsTest.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffRoundtripTest.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffSubImageTest.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/wbmp/WbmpReadTest.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/xbm/XbmReadTest.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/xmp/XmpUpdateTest.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/xpm/XpmReadTest.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/roundtrip/RoundtripTest.java
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/FormatCompliance.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/FormatCompliance.java?rev=1747594&r1=1747593&r2=1747594&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/FormatCompliance.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/FormatCompliance.java Thu Jun 9 20:26:10 2016
@@ -30,7 +30,7 @@ import java.util.List;
public class FormatCompliance {
private final boolean failOnError;
private final String description;
- private final List<String> comments = new ArrayList<String>();
+ private final List<String> comments = new ArrayList<>();
public FormatCompliance(final String description) {
this.description = description;
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/ImageInfo.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/ImageInfo.java?rev=1747594&r1=1747593&r2=1747594&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/ImageInfo.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/ImageInfo.java Thu Jun 9 20:26:10 2016
@@ -146,7 +146,7 @@ public class ImageInfo {
* This is mostly obsolete.
*/
public List<String> getComments() {
- return new ArrayList<String>(comments);
+ return new ArrayList<>(comments);
}
/**
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/ImageParser.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/ImageParser.java?rev=1747594&r1=1747593&r2=1747594&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/ImageParser.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/ImageParser.java Thu Jun 9 20:26:10 2016
@@ -447,7 +447,7 @@ public abstract class ImageParser extend
throws ImageReadException, IOException {
final BufferedImage bi = getBufferedImage(byteSource, null);
- final List<BufferedImage> result = new ArrayList<BufferedImage>();
+ final List<BufferedImage> result = new ArrayList<>();
// FIXME this doesn't look like we're actually getting all images contained in the given ByteSource...
result.add(bi);
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/Imaging.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/Imaging.java?rev=1747594&r1=1747593&r2=1747594&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/Imaging.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/Imaging.java Thu Jun 9 20:26:10 2016
@@ -1401,7 +1401,7 @@ public final class Imaging {
Map<String, Object> params) throws ImageReadException, IOException {
final ImageParser imageParser = getImageParser(byteSource);
if (null == params) {
- params = new HashMap<String, Object>();
+ params = new HashMap<>();
}
return imageParser.getBufferedImage(byteSource, params);
@@ -1511,7 +1511,7 @@ public final class Imaging {
// make sure params are non-null
if (params == null) {
- params = new HashMap<String, Object>();
+ params = new HashMap<>();
}
params.put(PARAM_KEY_FORMAT, format);
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=1747594&r1=1747593&r2=1747594&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:26:10 2016
@@ -21,7 +21,7 @@ import java.util.List;
public class GenericImageMetadata implements ImageMetadata {
private static final String NEWLINE = System.getProperty("line.separator");
- private final List<ImageMetadataItem> items = new ArrayList<ImageMetadataItem>();
+ private final List<ImageMetadataItem> items = new ArrayList<>();
public void add(final String keyword, final String text) {
add(new GenericImageMetadataItem(keyword, text));
@@ -32,7 +32,7 @@ public class GenericImageMetadata implem
}
public List<? extends ImageMetadataItem> getItems() {
- return new ArrayList<ImageMetadataItem>(items);
+ return new ArrayList<>(items);
}
@Override
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/itu_t4/HuffmanTree.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/itu_t4/HuffmanTree.java?rev=1747594&r1=1747593&r2=1747594&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/itu_t4/HuffmanTree.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/itu_t4/HuffmanTree.java Thu Jun 9 20:26:10 2016
@@ -24,7 +24,7 @@ import java.util.List;
* A Huffman tree implemented as 1 array for high locality of reference.
*/
class HuffmanTree<T> {
- private final List<Node<T>> nodes = new ArrayList<Node<T>>();
+ private final List<Node<T>> nodes = new ArrayList<>();
private static final class Node<T> {
boolean empty = true;
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/itu_t4/T4AndT6Compression.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/itu_t4/T4AndT6Compression.java?rev=1747594&r1=1747593&r2=1747594&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/itu_t4/T4AndT6Compression.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/itu_t4/T4AndT6Compression.java Thu Jun 9 20:26:10 2016
@@ -25,9 +25,9 @@ import org.apache.commons.imaging.common
import org.apache.commons.imaging.util.IoUtils;
public final class T4AndT6Compression {
- private static final HuffmanTree<Integer> WHITE_RUN_LENGTHS = new HuffmanTree<Integer>();
- private static final HuffmanTree<Integer> BLACK_RUN_LENGTHS = new HuffmanTree<Integer>();
- private static final HuffmanTree<Entry> CONTROL_CODES = new HuffmanTree<Entry>();
+ private static final HuffmanTree<Integer> WHITE_RUN_LENGTHS = new HuffmanTree<>();
+ private static final HuffmanTree<Integer> BLACK_RUN_LENGTHS = new HuffmanTree<>();
+ private static final HuffmanTree<Entry> CONTROL_CODES = new HuffmanTree<>();
public static final int WHITE = 0;
public static final int BLACK = 1;
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/mylzw/MyLzwCompressor.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/mylzw/MyLzwCompressor.java?rev=1747594&r1=1747593&r2=1747594&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/mylzw/MyLzwCompressor.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/mylzw/MyLzwCompressor.java Thu Jun 9 20:26:10 2016
@@ -32,7 +32,7 @@ public class MyLzwCompressor {
private final int clearCode;
private final int eoiCode;
private final Listener listener;
- private final Map<ByteArray, Integer> map = new HashMap<ByteArray, Integer>();
+ private final Map<ByteArray, Integer> map = new HashMap<>();
public MyLzwCompressor(final int initialCodeSize, final ByteOrder byteOrder,
final boolean earlyLimit) {
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/BmpImageParser.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/BmpImageParser.java?rev=1747594&r1=1747593&r2=1747594&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/BmpImageParser.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/BmpImageParser.java Thu Jun 9 20:26:10 2016
@@ -495,7 +495,7 @@ public class BmpImageParser extends Imag
public Dimension getImageSize(final ByteSource byteSource, Map<String, Object> params)
throws ImageReadException, IOException {
// make copy of params; we'll clear keys as we consume them.
- params = (params == null) ? new HashMap<String, Object>() : new HashMap<String, Object>(params);
+ params = (params == null) ? new HashMap<String, Object>() : new HashMap<>(params);
final boolean verbose = Boolean.TRUE.equals(params.get(PARAM_KEY_VERBOSE));
@@ -552,7 +552,7 @@ public class BmpImageParser extends Imag
public ImageInfo getImageInfo(final ByteSource byteSource, Map<String, Object> params)
throws ImageReadException, IOException {
// make copy of params; we'll clear keys as we consume them.
- params = (params == null) ? new HashMap<String, Object>() : new HashMap<String, Object>(params);
+ params = (params == null) ? new HashMap<String, Object>() : new HashMap<>(params);
final boolean verbose = Boolean.TRUE.equals(params.get(PARAM_KEY_VERBOSE));
@@ -590,7 +590,7 @@ public class BmpImageParser extends Imag
final int height = bhi.height;
final int width = bhi.width;
- final List<String> comments = new ArrayList<String>();
+ final List<String> comments = new ArrayList<>();
// TODO: comments...
final int bitsPerPixel = bhi.bitsPerPixel;
@@ -680,7 +680,7 @@ public class BmpImageParser extends Imag
public BufferedImage getBufferedImage(final InputStream inputStream, Map<String, Object> params)
throws ImageReadException, IOException {
// make copy of params; we'll clear keys as we consume them.
- params = (params == null) ? new HashMap<String, Object>() : new HashMap<String, Object>(params);
+ params = (params == null) ? new HashMap<String, Object>() : new HashMap<>(params);
final boolean verbose = Boolean.TRUE.equals(params.get(PARAM_KEY_VERBOSE));
@@ -728,7 +728,7 @@ public class BmpImageParser extends Imag
public void writeImage(final BufferedImage src, final OutputStream os, Map<String, Object> params)
throws ImageWriteException, IOException {
// make copy of params; we'll clear keys as we consume them.
- params = (params == null) ? new HashMap<String, Object>() : new HashMap<String, Object>(params);
+ params = (params == null) ? new HashMap<String, Object>() : new HashMap<>(params);
PixelDensity pixelDensity = null;
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/dcx/DcxImageParser.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/dcx/DcxImageParser.java?rev=1747594&r1=1747593&r2=1747594&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/dcx/DcxImageParser.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/dcx/DcxImageParser.java Thu Jun 9 20:26:10 2016
@@ -131,7 +131,7 @@ public class DcxImageParser extends Imag
try {
is = byteSource.getInputStream();
final int id = read4Bytes("Id", is, "Not a Valid DCX File", getByteOrder());
- final List<Long> pageTable = new ArrayList<Long>(1024);
+ final List<Long> pageTable = new ArrayList<>(1024);
for (int i = 0; i < 1024; i++) {
final long pageOffset = 0xFFFFffffL & read4Bytes("PageTable", is,
"Not a Valid DCX File", getByteOrder());
@@ -185,7 +185,7 @@ public class DcxImageParser extends Imag
public List<BufferedImage> getAllBufferedImages(final ByteSource byteSource)
throws ImageReadException, IOException {
final DcxHeader dcxHeader = readDcxHeader(byteSource);
- final List<BufferedImage> images = new ArrayList<BufferedImage>();
+ final List<BufferedImage> images = new ArrayList<>();
final PcxImageParser pcxImageParser = new PcxImageParser();
for (final long element : dcxHeader.pageTable) {
InputStream stream = null;
@@ -209,9 +209,9 @@ public class DcxImageParser extends Imag
public void writeImage(final BufferedImage src, final OutputStream os, Map<String, Object> params)
throws ImageWriteException, IOException {
// make copy of params; we'll clear keys as we consume them.
- params = (params == null) ? new HashMap<String, Object>() : new HashMap<String, Object>(params);
+ params = (params == null) ? new HashMap<String, Object>() : new HashMap<>(params);
- final HashMap<String, Object> pcxParams = new HashMap<String, Object>();
+ final HashMap<String, Object> pcxParams = new HashMap<>();
// clear format key.
if (params.containsKey(PARAM_KEY_FORMAT)) {
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/gif/GifImageParser.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/gif/GifImageParser.java?rev=1747594&r1=1747593&r2=1747594&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/gif/GifImageParser.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/gif/GifImageParser.java Thu Jun 9 20:26:10 2016
@@ -218,7 +218,7 @@ public class GifImageParser extends Imag
private GenericGifBlock readGenericGIFBlock(final InputStream is, final int code,
final byte[] first) throws IOException {
- final List<byte[]> subblocks = new ArrayList<byte[]>();
+ final List<byte[]> subblocks = new ArrayList<>();
if (first != null) {
subblocks.add(first);
@@ -238,7 +238,7 @@ public class GifImageParser extends Imag
private List<GifBlock> readBlocks(final GifHeaderInfo ghi, final InputStream is,
final boolean stopBeforeImageData, final FormatCompliance formatCompliance)
throws ImageReadException, IOException {
- final List<GifBlock> result = new ArrayList<GifBlock>();
+ final List<GifBlock> result = new ArrayList<>();
while (true) {
final int code = is.read();
@@ -504,7 +504,7 @@ public class GifImageParser extends Imag
}
private List<String> getComments(final List<GifBlock> blocks) throws IOException {
- final List<String> result = new ArrayList<String>();
+ final List<String> result = new ArrayList<>();
final int code = 0x21fe;
for (GifBlock block : blocks) {
@@ -758,7 +758,7 @@ public class GifImageParser extends Imag
public void writeImage(final BufferedImage src, final OutputStream os, Map<String, Object> params)
throws ImageWriteException, IOException {
// make copy of params; we'll clear keys as we consume them.
- params = new HashMap<String, Object>(params);
+ params = new HashMap<>(params);
final boolean verbose = Boolean.TRUE.equals(params.get(PARAM_KEY_VERBOSE));
@@ -1020,7 +1020,7 @@ public class GifImageParser extends Imag
final List<GifBlock> blocks = readBlocks(ghi, is, true, formatCompliance);
- final List<String> result = new ArrayList<String>();
+ final List<String> result = new ArrayList<>();
for (GifBlock block : blocks) {
if (block.blockCode != XMP_COMPLETE_CODE) {
continue;
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/icns/IcnsDecoder.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/icns/IcnsDecoder.java?rev=1747594&r1=1747593&r2=1747594&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/icns/IcnsDecoder.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/icns/IcnsDecoder.java Thu Jun 9 20:26:10 2016
@@ -192,7 +192,7 @@ final class IcnsDecoder {
public static List<BufferedImage> decodeAllImages(final IcnsImageParser.IcnsElement[] icnsElements)
throws ImageReadException {
- final List<BufferedImage> result = new ArrayList<BufferedImage>();
+ final List<BufferedImage> result = new ArrayList<>();
for (final IcnsElement imageElement : icnsElements) {
final IcnsType imageType = IcnsType.findImageType(imageElement.type);
if (imageType == null) {
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/icns/IcnsImageParser.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/icns/IcnsImageParser.java?rev=1747594&r1=1747593&r2=1747594&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/icns/IcnsImageParser.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/icns/IcnsImageParser.java Thu Jun 9 20:26:10 2016
@@ -82,7 +82,7 @@ public class IcnsImageParser extends Ima
public ImageInfo getImageInfo(final ByteSource byteSource, Map<String, Object> params)
throws ImageReadException, IOException {
// make copy of params; we'll clear keys as we consume them.
- params = (params == null) ? new HashMap<String, Object>() : new HashMap<String, Object>(params);
+ params = (params == null) ? new HashMap<String, Object>() : new HashMap<>(params);
if (params.containsKey(PARAM_KEY_VERBOSE)) {
params.remove(PARAM_KEY_VERBOSE);
@@ -112,7 +112,7 @@ public class IcnsImageParser extends Ima
public Dimension getImageSize(final ByteSource byteSource, Map<String, Object> params)
throws ImageReadException, IOException {
// make copy of params; we'll clear keys as we consume them.
- params = (params == null) ? new HashMap<String, Object>() : new HashMap<String, Object>(params);
+ params = (params == null) ? new HashMap<String, Object>() : new HashMap<>(params);
if (params.containsKey(PARAM_KEY_VERBOSE)) {
params.remove(PARAM_KEY_VERBOSE);
@@ -234,7 +234,7 @@ public class IcnsImageParser extends Ima
is = byteSource.getInputStream();
final IcnsHeader icnsHeader = readIcnsHeader(is);
- final List<IcnsElement> icnsElementList = new ArrayList<IcnsElement>();
+ final List<IcnsElement> icnsElementList = new ArrayList<>();
for (int remainingSize = icnsHeader.fileSize - 8; remainingSize > 0;) {
final IcnsElement icnsElement = readIcnsElement(is);
icnsElementList.add(icnsElement);
@@ -288,7 +288,7 @@ public class IcnsImageParser extends Ima
public void writeImage(final BufferedImage src, final OutputStream os, Map<String, Object> params)
throws ImageWriteException, IOException {
// make copy of params; we'll clear keys as we consume them.
- params = (params == null) ? new HashMap<String, Object>() : new HashMap<String, Object>(params);
+ params = (params == null) ? new HashMap<String, Object>() : new HashMap<>(params);
// clear format key.
if (params.containsKey(PARAM_KEY_FORMAT)) {
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/ico/IcoImageParser.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/ico/IcoImageParser.java?rev=1747594&r1=1747593&r2=1747594&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/ico/IcoImageParser.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/ico/IcoImageParser.java Thu Jun 9 20:26:10 2016
@@ -598,7 +598,7 @@ public class IcoImageParser extends Imag
@Override
public List<BufferedImage> getAllBufferedImages(final ByteSource byteSource)
throws ImageReadException, IOException {
- final List<BufferedImage> result = new ArrayList<BufferedImage>();
+ final List<BufferedImage> result = new ArrayList<>();
final ImageContents contents = readImage(byteSource);
final FileHeader fileHeader = contents.fileHeader;
@@ -641,7 +641,7 @@ public class IcoImageParser extends Imag
public void writeImage(final BufferedImage src, final OutputStream os, Map<String, Object> params)
throws ImageWriteException, IOException {
// make copy of params; we'll clear keys as we consume them.
- params = (params == null) ? new HashMap<String, Object>() : new HashMap<String, Object>(params);
+ params = (params == null) ? new HashMap<String, Object>() : new HashMap<>(params);
// clear format key.
if (params.containsKey(PARAM_KEY_FORMAT)) {
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=1747594&r1=1747593&r2=1747594&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:26:10 2016
@@ -185,7 +185,7 @@ public class JpegImageMetadata implement
}
public List<ImageMetadataItem> getItems() {
- final List<ImageMetadataItem> result = new ArrayList<ImageMetadataItem>();
+ final List<ImageMetadataItem> result = new ArrayList<>();
if (null != exif) {
result.addAll(exif.getItems());
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=1747594&r1=1747593&r2=1747594&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:26:10 2016
@@ -115,7 +115,7 @@ public class JpegImageParser extends Ima
public List<Segment> readSegments(final ByteSource byteSource,
final int[] markers, final boolean returnAfterFirst,
final boolean readEverything) throws ImageReadException, IOException {
- final List<Segment> result = new ArrayList<Segment>();
+ final List<Segment> result = new ArrayList<>();
final JpegImageParser parser = this;
final int[] sofnSegments = {
// kJFIFMarker,
@@ -278,7 +278,7 @@ public class JpegImageParser extends Ima
final List<Segment> segments = readSegments(byteSource,
new int[] { JpegConstants.JPEG_APP2_MARKER, }, false);
- final List<App2Segment> filtered = new ArrayList<App2Segment>();
+ final List<App2Segment> filtered = new ArrayList<>();
if (segments != null) {
// throw away non-icc profile app2 segments.
for (Segment s : segments) {
@@ -326,7 +326,7 @@ public class JpegImageParser extends Ima
}
private List<Segment> filterAPP1Segments(final List<Segment> segments) {
- final List<Segment> result = new ArrayList<Segment>();
+ final List<Segment> result = new ArrayList<>();
for (Segment s : segments) {
final GenericSegment segment = (GenericSegment) s;
@@ -346,7 +346,7 @@ public class JpegImageParser extends Ima
}
if (params == null) {
- params = new HashMap<String, Object>();
+ params = new HashMap<>();
}
if (!params.containsKey(PARAM_KEY_READ_THUMBNAILS)) {
params.put(PARAM_KEY_READ_THUMBNAILS, Boolean.TRUE);
@@ -524,7 +524,7 @@ public class JpegImageParser extends Ima
public String getXmpXml(final ByteSource byteSource, final Map<String, Object> params)
throws ImageReadException, IOException {
- final List<String> result = new ArrayList<String>();
+ final List<String> result = new ArrayList<>();
final JpegUtils.Visitor visitor = new JpegUtils.Visitor() {
// return false to exit before reading image data.
@@ -779,7 +779,7 @@ public class JpegImageParser extends Ima
physicalHeightInch = (float) (height / (yDensity * unitsPerInch));
}
- final List<String> comments = new ArrayList<String>();
+ final List<String> comments = new ArrayList<>();
final List<Segment> commentSegments = readSegments(byteSource,
new int[] { JpegConstants.COM_MARKER}, false);
for (Segment commentSegment : commentSegments) {
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=1747594&r1=1747593&r2=1747594&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:26:10 2016
@@ -139,8 +139,8 @@ public class ExifRewriter extends Binary
throws ImageReadException, IOException
// , ImageWriteException
{
- final List<JFIFPiece> pieces = new ArrayList<JFIFPiece>();
- final List<JFIFPiece> exifPieces = new ArrayList<JFIFPiece>();
+ final List<JFIFPiece> pieces = new ArrayList<>();
+ final List<JFIFPiece> exifPieces = new ArrayList<>();
final JpegUtils.Visitor visitor = new JpegUtils.Visitor() {
// return false to exit before reading image data.
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=1747594&r1=1747593&r2=1747594&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:26:10 2016
@@ -106,7 +106,7 @@ public class IptcParser extends BinaryFi
public PhotoshopApp13Data parsePhotoshopSegment(final byte[] bytes,
final boolean verbose, final boolean strict) throws ImageReadException,
IOException {
- final List<IptcRecord> records = new ArrayList<IptcRecord>();
+ final List<IptcRecord> records = new ArrayList<>();
final List<IptcBlock> blocks = parseAllBlocks(bytes, verbose, strict);
@@ -124,7 +124,7 @@ public class IptcParser extends BinaryFi
protected List<IptcRecord> parseIPTCBlock(final byte[] bytes, final boolean verbose)
throws IOException {
- final List<IptcRecord> elements = new ArrayList<IptcRecord>();
+ final List<IptcRecord> elements = new ArrayList<>();
int index = 0;
// Integer recordVersion = null;
@@ -250,7 +250,7 @@ public class IptcParser extends BinaryFi
protected List<IptcBlock> parseAllBlocks(final byte[] bytes, final boolean verbose,
final boolean strict) throws ImageReadException, IOException {
- final List<IptcBlock> blocks = new ArrayList<IptcBlock>();
+ final List<IptcBlock> blocks = new ArrayList<>();
InputStream bis = null;
boolean canThrow = false;
@@ -412,7 +412,7 @@ public class IptcParser extends BinaryFi
bos.write2Bytes(2); // record version value
// make a copy of the list.
- elements = new ArrayList<IptcRecord>(elements);
+ elements = new ArrayList<>(elements);
// sort the list. Records must be in numerical order.
final Comparator<IptcRecord> comparator = new Comparator<IptcRecord>() {
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcTypeLookup.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcTypeLookup.java?rev=1747594&r1=1747593&r2=1747594&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcTypeLookup.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcTypeLookup.java Thu Jun 9 20:26:10 2016
@@ -21,7 +21,7 @@ import java.util.Map;
public final class IptcTypeLookup {
- private static final Map<Integer, IptcType> IPTC_TYPE_MAP = new HashMap<Integer, IptcType>();
+ private static final Map<Integer, IptcType> IPTC_TYPE_MAP = new HashMap<>();
static {
for (final IptcType iptcType : IptcTypes.values()) {
IPTC_TYPE_MAP.put(iptcType.getType(), iptcType);
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/JpegIptcRewriter.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/JpegIptcRewriter.java?rev=1747594&r1=1747593&r2=1747594&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/JpegIptcRewriter.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/JpegIptcRewriter.java Thu Jun 9 20:26:10 2016
@@ -194,11 +194,11 @@ public class JpegIptcRewriter extends Jp
if (!removeSegment && photoshopApp13Segments.size() == 1) {
final JFIFPieceSegment oldSegment = (JFIFPieceSegment) photoshopApp13Segments
.get(0);
- final Map<String, Object> params = new HashMap<String, Object>();
+ final Map<String, Object> params = new HashMap<>();
final PhotoshopApp13Data oldData = new IptcParser()
.parsePhotoshopSegment(oldSegment.segmentData, params);
final List<IptcBlock> newBlocks = oldData.getNonIptcBlocks();
- final List<IptcRecord> newRecords = new ArrayList<IptcRecord>();
+ final List<IptcRecord> newRecords = new ArrayList<>();
final PhotoshopApp13Data newData = new PhotoshopApp13Data(newRecords,
newBlocks);
final byte[] segmentBytes = new IptcParser()
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/PhotoshopApp13Data.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/PhotoshopApp13Data.java?rev=1747594&r1=1747593&r2=1747594&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/PhotoshopApp13Data.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/PhotoshopApp13Data.java Thu Jun 9 20:26:10 2016
@@ -31,15 +31,15 @@ public class PhotoshopApp13Data {
}
public List<IptcRecord> getRecords() {
- return new ArrayList<IptcRecord>(records);
+ return new ArrayList<>(records);
}
public List<IptcBlock> getRawBlocks() {
- return new ArrayList<IptcBlock>(rawBlocks);
+ return new ArrayList<>(rawBlocks);
}
public List<IptcBlock> getNonIptcBlocks() {
- final List<IptcBlock> result = new ArrayList<IptcBlock>();
+ final List<IptcBlock> result = new ArrayList<>();
for (IptcBlock block : rawBlocks) {
if (!block.isIPTCBlock()) {
result.add(block);
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/segments/DhtSegment.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/segments/DhtSegment.java?rev=1747594&r1=1747593&r2=1747594&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/segments/DhtSegment.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/segments/DhtSegment.java Thu Jun 9 20:26:10 2016
@@ -152,7 +152,7 @@ public class DhtSegment extends Segment
throws IOException {
super(marker, length);
- final ArrayList<HuffmanTable> huffmanTables = new ArrayList<DhtSegment.HuffmanTable>();
+ final ArrayList<HuffmanTable> huffmanTables = new ArrayList<>();
while (length > 0) {
final int tableClassAndDestinationId = 0xff & readByte(
"TableClassAndDestinationId", is, "Not a Valid JPEG File");
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/segments/DqtSegment.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/segments/DqtSegment.java?rev=1747594&r1=1747593&r2=1747594&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/segments/DqtSegment.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/segments/DqtSegment.java Thu Jun 9 20:26:10 2016
@@ -26,7 +26,7 @@ import org.apache.commons.imaging.ImageR
import static org.apache.commons.imaging.common.BinaryFunctions.*;
public class DqtSegment extends Segment {
- public final List<QuantizationTable> quantizationTables = new ArrayList<QuantizationTable>();
+ public final List<QuantizationTable> quantizationTables = new ArrayList<>();
public static class QuantizationTable {
public final int precision;
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=1747594&r1=1747593&r2=1747594&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:26:10 2016
@@ -179,8 +179,8 @@ public class JpegRewriter extends Binary
throws ImageReadException, IOException
// , ImageWriteException
{
- final List<JFIFPiece> pieces = new ArrayList<JFIFPiece>();
- final List<JFIFPiece> segmentPieces = new ArrayList<JFIFPiece>();
+ final List<JFIFPiece> pieces = new ArrayList<>();
+ final List<JFIFPiece> segmentPieces = new ArrayList<>();
final JpegUtils.Visitor visitor = new JpegUtils.Visitor() {
// return false to exit before reading image data.
@@ -239,7 +239,7 @@ public class JpegRewriter extends Binary
protected <T extends JFIFPiece> List<T> filterSegments(final List<T> segments,
final SegmentFilter filter, final boolean reverse) {
- final List<T> result = new ArrayList<T>();
+ final List<T> result = new ArrayList<>();
for (T piece : segments) {
if (piece instanceof JFIFPieceSegment) {
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/xmp/JpegXmpRewriter.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/xmp/JpegXmpRewriter.java?rev=1747594&r1=1747593&r2=1747594&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/xmp/JpegXmpRewriter.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/xmp/JpegXmpRewriter.java Thu Jun 9 20:26:10 2016
@@ -175,7 +175,7 @@ public class JpegXmpRewriter extends Jpe
List<JFIFPiece> pieces = jfifPieces.pieces;
pieces = removeXmpSegments(pieces);
- final List<JFIFPieceSegment> newPieces = new ArrayList<JFIFPieceSegment>();
+ final List<JFIFPieceSegment> newPieces = new ArrayList<>();
final byte[] xmpXmlBytes = xmpXml.getBytes("utf-8");
int index = 0;
while (index < xmpXmlBytes.length) {
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pcx/PcxImageParser.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pcx/PcxImageParser.java?rev=1747594&r1=1747593&r2=1747594&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pcx/PcxImageParser.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pcx/PcxImageParser.java Thu Jun 9 20:26:10 2016
@@ -515,7 +515,7 @@ public class PcxImageParser extends Imag
@Override
public final BufferedImage getBufferedImage(final ByteSource byteSource,
Map<String, Object> params) throws ImageReadException, IOException {
- params = (params == null) ? new HashMap<String, Object>() : new HashMap<String, Object>(params);
+ params = (params == null) ? new HashMap<String, Object>() : new HashMap<>(params);
boolean isStrict = false;
final Object strictness = params.get(PARAM_KEY_STRICT);
if (strictness != null) {
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pcx/PcxWriter.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pcx/PcxWriter.java?rev=1747594&r1=1747593&r2=1747594&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pcx/PcxWriter.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pcx/PcxWriter.java Thu Jun 9 20:26:10 2016
@@ -37,7 +37,7 @@ class PcxWriter {
public PcxWriter(Map<String, Object> params) throws ImageWriteException {
// make copy of params; we'll clear keys as we consume them.
- params = (params == null) ? new HashMap<String, Object>() : new HashMap<String, Object>(params);
+ params = (params == null) ? new HashMap<String, Object>() : new HashMap<>(params);
// clear format key.
if (params.containsKey(ImagingConstants.PARAM_KEY_FORMAT)) {
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/PngImageInfo.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/PngImageInfo.java?rev=1747594&r1=1747593&r2=1747594&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/PngImageInfo.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/PngImageInfo.java Thu Jun 9 20:26:10 2016
@@ -43,7 +43,7 @@ public class PngImageInfo extends ImageI
}
public List<PngText> getTextChunks() {
- return new ArrayList<PngText>(textChunks);
+ return new ArrayList<>(textChunks);
}
}
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/PngImageParser.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/PngImageParser.java?rev=1747594&r1=1747593&r2=1747594&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/PngImageParser.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/PngImageParser.java Thu Jun 9 20:26:10 2016
@@ -107,7 +107,7 @@ public class PngImageParser extends Imag
public List<String> getChuckTypes(final InputStream is)
throws ImageReadException, IOException {
final List<PngChunk> chunks = readChunks(is, null, false);
- final List<String> chunkTypes = new ArrayList<String>();
+ final List<String> chunkTypes = new ArrayList<>();
for (PngChunk chunk : chunks) {
chunkTypes.add(getChunkTypeName(chunk.chunkType));
}
@@ -146,7 +146,7 @@ public class PngImageParser extends Imag
private List<PngChunk> readChunks(final InputStream is, final ChunkType[] chunkTypes,
final boolean returnAfterFirst) throws ImageReadException, IOException {
- final List<PngChunk> result = new ArrayList<PngChunk>();
+ final List<PngChunk> result = new ArrayList<>();
while (true) {
if (getDebug()) {
@@ -301,7 +301,7 @@ public class PngImageParser extends Imag
}
private List<PngChunk> filterChunks(final List<PngChunk> chunks, final ChunkType type) {
- final List<PngChunk> result = new ArrayList<PngChunk>();
+ final List<PngChunk> result = new ArrayList<>();
for (PngChunk chunk : chunks) {
if (chunk.chunkType == type.value) {
@@ -384,8 +384,8 @@ public class PngImageParser extends Imag
final List<PngChunk> zTXts = filterChunks(chunks, ChunkType.zTXt);
final List<PngChunk> iTXts = filterChunks(chunks, ChunkType.iTXt);
- final List<String> comments = new ArrayList<String>();
- final List<PngText> textChunks = new ArrayList<PngText>();
+ final List<String> comments = new ArrayList<>();
+ final List<PngText> textChunks = new ArrayList<>();
for (PngChunk tEXt : tEXts) {
final PngChunkText pngChunktEXt = (PngChunkText) tEXt;
@@ -471,7 +471,7 @@ public class PngImageParser extends Imag
@Override
public BufferedImage getBufferedImage(final ByteSource byteSource, Map<String, Object> params)
throws ImageReadException, IOException {
- params = (params == null) ? new HashMap<String, Object>() : new HashMap<String, Object>(params);
+ params = (params == null) ? new HashMap<String, Object>() : new HashMap<>(params);
if (params.containsKey(PARAM_KEY_VERBOSE)) {
params.remove(PARAM_KEY_VERBOSE);
@@ -707,7 +707,7 @@ public class PngImageParser extends Imag
return null;
}
- final List<PngChunkItxt> xmpChunks = new ArrayList<PngChunkItxt>();
+ final List<PngChunkItxt> xmpChunks = new ArrayList<>();
for (PngChunk chunk : chunks) {
final PngChunkItxt itxtChunk = (PngChunkItxt) chunk;
if (!itxtChunk.getKeyword().equals(PngConstants.XMP_KEYWORD)) {
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=1747594&r1=1747593&r2=1747594&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:26:10 2016
@@ -369,7 +369,7 @@ class PngWriter {
public void writeImage(final BufferedImage src, final OutputStream os, Map<String, Object> params)
throws ImageWriteException, IOException {
// make copy of params; we'll clear keys as we consume them.
- params = new HashMap<String, Object>(params);
+ params = new HashMap<>(params);
// clear format key.
if (params.containsKey(ImagingConstants.PARAM_KEY_FORMAT)) {
@@ -380,7 +380,7 @@ class PngWriter {
params.remove(ImagingConstants.PARAM_KEY_VERBOSE);
}
- final Map<String, Object> rawParams = new HashMap<String, Object>(params);
+ final Map<String, Object> rawParams = new HashMap<>(params);
if (params.containsKey(PngConstants.PARAM_KEY_PNG_FORCE_TRUE_COLOR)) {
params.remove(PngConstants.PARAM_KEY_PNG_FORCE_TRUE_COLOR);
}
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pnm/PnmImageParser.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pnm/PnmImageParser.java?rev=1747594&r1=1747593&r2=1747594&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pnm/PnmImageParser.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pnm/PnmImageParser.java Thu Jun 9 20:26:10 2016
@@ -243,7 +243,7 @@ public class PnmImageParser extends Imag
throw new ImageReadException("PNM: Couldn't read Header");
}
- final List<String> comments = new ArrayList<String>();
+ final List<String> comments = new ArrayList<>();
final int bitsPerPixel = info.getBitDepth() * info.getNumComponents();
final ImageFormat format = info.getImageType();
@@ -356,9 +356,9 @@ public class PnmImageParser extends Imag
// make copy of params; we'll clear keys as we consume them.
if (params != null) {
- params = new HashMap<String, Object>(params);
+ params = new HashMap<>(params);
} else {
- params = new HashMap<String, Object>();
+ params = new HashMap<>();
}
// clear format key.
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/PsdImageParser.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/PsdImageParser.java?rev=1747594&r1=1747593&r2=1747594&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/PsdImageParser.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/PsdImageParser.java Thu Jun 9 20:26:10 2016
@@ -184,7 +184,7 @@ public class PsdImageParser extends Imag
private List<ImageResourceBlock> readImageResourceBlocks(final InputStream is,
final int[] imageResourceIDs, final int maxBlocksToRead, int available)
throws ImageReadException, IOException {
- final List<ImageResourceBlock> result = new ArrayList<ImageResourceBlock>();
+ final List<ImageResourceBlock> result = new ArrayList<>();
while (available > 0) {
readAndVerifyBytes(is, new byte[] { 56, 66, 73, 77 },
@@ -489,7 +489,7 @@ public class PsdImageParser extends Imag
final int width = header.columns;
final int height = header.rows;
- final List<String> comments = new ArrayList<String>();
+ final List<String> comments = new ArrayList<>();
// TODO: comments...
int BitsPerPixel = header.depth * getChannelsPerMode(header.mode);
@@ -741,7 +741,7 @@ public class PsdImageParser extends Imag
return null;
}
- final List<ImageResourceBlock> xmpBlocks = new ArrayList<ImageResourceBlock>();
+ final List<ImageResourceBlock> xmpBlocks = new ArrayList<>();
// if (false) {
// // TODO: for PSD 7 and later, verify "XMP" name.
// for (int i = 0; i < blocks.size(); i++) {
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffContents.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffContents.java?rev=1747594&r1=1747593&r2=1747594&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffContents.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffContents.java Thu Jun 9 20:26:10 2016
@@ -34,7 +34,7 @@ public class TiffContents {
}
public List<TiffElement> getElements() throws ImageReadException {
- final List<TiffElement> result = new ArrayList<TiffElement>();
+ final List<TiffElement> result = new ArrayList<>();
result.add(header);
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffDirectory.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffDirectory.java?rev=1747594&r1=1747593&r2=1747594&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffDirectory.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffDirectory.java Thu Jun 9 20:26:10 2016
@@ -112,7 +112,7 @@ public class TiffDirectory extends TiffE
public List<TiffField> getDirectoryEntries() {
- return new ArrayList<TiffField>(entries);
+ return new ArrayList<>(entries);
}
public void dump() {
@@ -636,7 +636,7 @@ public class TiffDirectory extends TiffE
+ ") != byteCounts.length(" + byteCounts.length + ")");
}
- final List<ImageDataElement> result = new ArrayList<ImageDataElement>();
+ final List<ImageDataElement> result = new ArrayList<>();
for (int i = 0; i < offsets.length; i++) {
result.add(new ImageDataElement(offsets[i], byteCounts[i]));
}
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImageMetadata.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImageMetadata.java?rev=1747594&r1=1747593&r2=1747594&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImageMetadata.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImageMetadata.java Thu Jun 9 20:26:10 2016
@@ -166,7 +166,7 @@ public class TiffImageMetadata extends G
@Override
public List<? extends ImageMetadataItem> getItems() {
- final List<ImageMetadataItem> result = new ArrayList<ImageMetadataItem>();
+ final List<ImageMetadataItem> result = new ArrayList<>();
final List<? extends ImageMetadataItem> items = super.getItems();
for (ImageMetadataItem item : items) {
@@ -437,7 +437,7 @@ public class TiffImageMetadata extends G
}
public List<TiffField> getAllFields() {
- final List<TiffField> result = new ArrayList<TiffField>();
+ final List<TiffField> result = new ArrayList<>();
final List<? extends ImageMetadataItem> directories = getDirectories();
for (ImageMetadataItem directory1 : directories) {
final Directory directory = (Directory) directory1;
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImageParser.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImageParser.java?rev=1747594&r1=1747593&r2=1747594&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImageParser.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImageParser.java Thu Jun 9 20:26:10 2016
@@ -232,7 +232,7 @@ public class TiffImageParser extends Ima
// -------------------
- final List<String> comments = new ArrayList<String>();
+ final List<String> comments = new ArrayList<>();
final List<TiffField> entries = directory.entries;
for (TiffField field : entries) {
final String comment = field.toString();
@@ -403,7 +403,7 @@ public class TiffImageParser extends Ima
final TiffContents contents = new TiffReader(isStrict(params))
.readDirectories(byteSource, true, formatCompliance);
- final List<byte[]> result = new ArrayList<byte[]>();
+ final List<byte[]> result = new ArrayList<>();
for (int i = 0; i < contents.directories.size(); i++) {
final TiffDirectory directory = contents.directories.get(i);
final List<ImageDataElement> dataElements = directory
@@ -474,7 +474,7 @@ public class TiffImageParser extends Ima
final TiffReader tiffReader = new TiffReader(true);
final TiffContents contents = tiffReader.readDirectories(byteSource, true,
formatCompliance);
- final List<BufferedImage> results = new ArrayList<BufferedImage>();
+ final List<BufferedImage> results = new ArrayList<>();
for (int i = 0; i < contents.directories.size(); i++) {
final TiffDirectory directory = contents.directories.get(i);
final BufferedImage result = directory.getTiffImage(
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=1747594&r1=1747593&r2=1747594&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:26:10 2016
@@ -111,7 +111,7 @@ public class TiffReader extends BinaryFi
final long offset = tiffHeader.offsetToFirstIFD;
final int dirType = TiffDirectoryConstants.DIRECTORY_TYPE_ROOT;
- final List<Number> visited = new ArrayList<Number>();
+ final List<Number> visited = new ArrayList<>();
readDirectory(byteSource, offset, dirType, formatCompliance, listener, visited);
}
@@ -144,7 +144,7 @@ public class TiffReader extends BinaryFi
is = byteSource.getInputStream();
skipBytes(is, directoryOffset);
- final List<TiffField> fields = new ArrayList<TiffField>();
+ final List<TiffField> fields = new ArrayList<>();
int entryCount;
try {
@@ -301,8 +301,8 @@ public class TiffReader extends BinaryFi
private static class Collector implements Listener {
private TiffHeader tiffHeader;
- private final List<TiffDirectory> directories = new ArrayList<TiffDirectory>();
- private final List<TiffField> fields = new ArrayList<TiffField>();
+ private final List<TiffDirectory> directories = new ArrayList<>();
+ private final List<TiffField> fields = new ArrayList<>();
private final boolean readThumbnails;
public Collector() {
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffTags.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffTags.java?rev=1747594&r1=1747593&r2=1747594&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffTags.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffTags.java Thu Jun 9 20:26:10 2016
@@ -54,7 +54,7 @@ final class TiffTags {
private static final Map<Integer, Integer> TAG_COUNTS = countTags(TiffTags.ALL_TAGS);
private static List<TagInfo> makeMergedTagList() {
- final ArrayList<TagInfo> result = new ArrayList<TagInfo>();
+ final ArrayList<TagInfo> result = new ArrayList<>();
result.addAll(AdobePageMaker6TagConstants.ALL_ADOBE_PAGEMAKER_6_TAGS);
result.addAll(AdobePhotoshopTagConstants.ALL_ADOBE_PHOTOSHOP_TAGS);
result.addAll(AliasSketchbookProTagConstants.ALL_ALIAS_SKETCHBOOK_PRO_TAGS);
@@ -81,12 +81,12 @@ final class TiffTags {
private static Map<Integer, List<TagInfo>> makeTagMap(
final List<TagInfo> tags) {
// make sure to use the thread-safe version; this is shared state.
- final Map<Integer, List<TagInfo>> map = new HashMap<Integer, List<TagInfo>>();
+ final Map<Integer, List<TagInfo>> map = new HashMap<>();
for (TagInfo tag : tags) {
List<TagInfo> tagList = map.get(tag.tag);
if (tagList == null) {
- tagList = new ArrayList<TagInfo>();
+ tagList = new ArrayList<>();
map.put(tag.tag, tagList);
}
tagList.add(tag);
@@ -96,7 +96,7 @@ final class TiffTags {
}
private static Map<Integer, Integer> countTags(final List<TagInfo> tags) {
- final Map<Integer, Integer> map = new HashMap<Integer, Integer>();
+ final Map<Integer, Integer> map = new HashMap<>();
for (TagInfo tag : tags) {
final Integer count = map.get(tag.tag);
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfo.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfo.java?rev=1747594&r1=1747593&r2=1747594&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfo.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfo.java Thu Jun 9 20:26:10 2016
@@ -68,7 +68,7 @@ public class TagInfo {
final TiffDirectoryType exifDirectory, final boolean isOffset) {
this.name = name;
this.tag = tag;
- this.dataTypes = Collections.unmodifiableList(new ArrayList<FieldType>(
+ this.dataTypes = Collections.unmodifiableList(new ArrayList<>(
dataTypes));
this.length = length;
this.directoryType = exifDirectory;
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffImageWriterBase.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffImageWriterBase.java?rev=1747594&r1=1747593&r2=1747594&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffImageWriterBase.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffImageWriterBase.java Thu Jun 9 20:26:10 2016
@@ -77,8 +77,8 @@ public abstract class TiffImageWriterBas
TiffOutputField gpsDirectoryOffsetField = null;
TiffOutputField interoperabilityDirectoryOffsetField = null;
- final List<Integer> directoryIndices = new ArrayList<Integer>();
- final Map<Integer, TiffOutputDirectory> directoryTypeMap = new HashMap<Integer, TiffOutputDirectory>();
+ final List<Integer> directoryIndices = new ArrayList<>();
+ final Map<Integer, TiffOutputDirectory> directoryTypeMap = new HashMap<>();
for (TiffOutputDirectory directory : directories) {
final int dirType = directory.type;
directoryTypeMap.put(dirType, directory);
@@ -124,7 +124,7 @@ public abstract class TiffImageWriterBas
// dirMap.put(arg0, arg1)
}
- final HashSet<Integer> fieldTags = new HashSet<Integer>();
+ final HashSet<Integer> fieldTags = new HashSet<>();
final List<TiffOutputField> fields = directory.getFields();
for (TiffOutputField field : fields) {
if (fieldTags.contains(field.tag)) {
@@ -246,7 +246,7 @@ public abstract class TiffImageWriterBas
public void writeImage(final BufferedImage src, final OutputStream os, Map<String, Object> params)
throws ImageWriteException, IOException {
// make copy of params; we'll clear keys as we consume them.
- params = new HashMap<String, Object>(params);
+ params = new HashMap<>(params);
// clear format key.
if (params.containsKey(ImagingConstants.PARAM_KEY_FORMAT)) {
@@ -303,7 +303,7 @@ public abstract class TiffImageWriterBas
params.remove(PARAM_KEY_LZW_COMPRESSION_BLOCK_SIZE);
}
}
- final HashMap<String, Object> rawParams = new HashMap<String, Object>(params);
+ final HashMap<String, Object> rawParams = new HashMap<>(params);
params.remove(PARAM_KEY_T4_OPTIONS);
params.remove(PARAM_KEY_T6_OPTIONS);
if (!params.isEmpty()) {
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=1747594&r1=1747593&r2=1747594&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:26:10 2016
@@ -75,7 +75,7 @@ public class TiffImageWriterLossless ext
final TiffContents contents = new TiffReader(false).readContents(
byteSource, params, formatCompliance);
- final List<TiffElement> elements = new ArrayList<TiffElement>();
+ final List<TiffElement> elements = new ArrayList<>();
// result.add(contents.header); // ?
final List<TiffDirectory> directories = contents.directories;
@@ -113,7 +113,7 @@ public class TiffImageWriterLossless ext
// dumpElements(byteSource, elements);
- final List<TiffElement> rewritableElements = new ArrayList<TiffElement>();
+ final List<TiffElement> rewritableElements = new ArrayList<>();
{
final int TOLERANCE = 3;
// int last = TIFF_HEADER_SIZE;
@@ -152,7 +152,7 @@ public class TiffImageWriterLossless ext
throws IOException, ImageWriteException {
// There are some fields whose address in the file must not change,
// unless of course their value is changed.
- final Map<Integer, TiffOutputField> frozenFields = new HashMap<Integer, TiffOutputField>();
+ final Map<Integer, TiffOutputField> frozenFields = new HashMap<>();
final TiffOutputField makerNoteField = outputSet.findField(ExifTagConstants.EXIF_TAG_MAKER_NOTE);
if (makerNoteField != null && makerNoteField.getSeperateValue() != null) {
frozenFields.put(ExifTagConstants.EXIF_TAG_MAKER_NOTE.tag, makerNoteField);
@@ -171,7 +171,7 @@ public class TiffImageWriterLossless ext
return;
}
}
- final Map<Long, TiffOutputField> frozenFieldOffsets = new HashMap<Long, TiffOutputField>();
+ final Map<Long, TiffOutputField> frozenFieldOffsets = new HashMap<>();
for (final Map.Entry<Integer, TiffOutputField> entry : frozenFields.entrySet()) {
final TiffOutputField frozenField = entry.getValue();
if (frozenField.getSeperateValue().getOffset() != TiffOutputItem.UNDEFINED_VALUE) {
@@ -183,7 +183,7 @@ public class TiffImageWriterLossless ext
final List<TiffOutputItem> allOutputItems = outputSet
.getOutputItems(outputSummary);
- final List<TiffOutputItem> outputItems = new ArrayList<TiffOutputItem>();
+ final List<TiffOutputItem> outputItems = new ArrayList<>();
for (final TiffOutputItem outputItem : allOutputItems) {
if (!frozenFieldOffsets.containsKey(outputItem.getOffset())) {
outputItems.add(outputItem);
@@ -204,7 +204,7 @@ public class TiffImageWriterLossless ext
long overflowIndex = exifBytes.length;
// make copy.
- final List<TiffElement> unusedElements = new ArrayList<TiffElement>(analysis);
+ final List<TiffElement> unusedElements = new ArrayList<>(analysis);
// should already be in order of offset, but make sure.
Collections.sort(unusedElements, TiffElement.COMPARATOR);
@@ -227,7 +227,7 @@ public class TiffImageWriterLossless ext
Collections.reverse(unusedElements);
// make copy.
- final List<TiffOutputItem> unplacedItems = new ArrayList<TiffOutputItem>(
+ final List<TiffOutputItem> unplacedItems = new ArrayList<>(
outputItems);
Collections.sort(unplacedItems, ITEM_SIZE_COMPARATOR);
Collections.reverse(unplacedItems);
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=1747594&r1=1747593&r2=1747594&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:26:10 2016
@@ -58,7 +58,7 @@ import static org.apache.commons.imaging
public final class TiffOutputDirectory extends TiffOutputItem {
public final int type;
- private final List<TiffOutputField> fields = new ArrayList<TiffOutputField>();
+ private final List<TiffOutputField> fields = new ArrayList<>();
private final ByteOrder byteOrder;
private TiffOutputDirectory nextDirectory;
public static final Comparator<TiffOutputDirectory> COMPARATOR = new Comparator<TiffOutputDirectory>() {
@@ -410,7 +410,7 @@ public final class TiffOutputDirectory e
}
public List<TiffOutputField> getFields() {
- return new ArrayList<TiffOutputField>(fields);
+ return new ArrayList<>(fields);
}
public void removeField(final TagInfo tagInfo) {
@@ -418,7 +418,7 @@ public final class TiffOutputDirectory e
}
public void removeField(final int tag) {
- final List<TiffOutputField> matches = new ArrayList<TiffOutputField>();
+ final List<TiffOutputField> matches = new ArrayList<>();
for (TiffOutputField field : fields) {
if (field.tag == tag) {
matches.add(field);
@@ -625,7 +625,7 @@ public final class TiffOutputDirectory e
// --------------------------------------------------------------
- final List<TiffOutputItem> result = new ArrayList<TiffOutputItem>();
+ final List<TiffOutputItem> result = new ArrayList<>();
result.add(this);
sortFields();
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputSet.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputSet.java?rev=1747594&r1=1747593&r2=1747594&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputSet.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputSet.java Thu Jun 9 20:26:10 2016
@@ -31,7 +31,7 @@ import static org.apache.commons.imaging
public final class TiffOutputSet {
public final ByteOrder byteOrder;
- private final List<TiffOutputDirectory> directories = new ArrayList<TiffOutputDirectory>();
+ private final List<TiffOutputDirectory> directories = new ArrayList<>();
private static final String NEWLINE = System.getProperty("line.separator");
public TiffOutputSet() {
@@ -45,7 +45,7 @@ public final class TiffOutputSet {
protected List<TiffOutputItem> getOutputItems(
final TiffOutputSummary outputSummary) throws ImageWriteException {
- final List<TiffOutputItem> result = new ArrayList<TiffOutputItem>();
+ final List<TiffOutputItem> result = new ArrayList<>();
for (TiffOutputDirectory directory : directories) {
result.addAll(directory.getOutputItems(outputSummary));
@@ -64,7 +64,7 @@ public final class TiffOutputSet {
}
public List<TiffOutputDirectory> getDirectories() {
- return new ArrayList<TiffOutputDirectory>(directories);
+ return new ArrayList<>(directories);
}
public TiffOutputDirectory getRootDirectory() {
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputSummary.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputSummary.java?rev=1747594&r1=1747593&r2=1747594&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputSummary.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputSummary.java Thu Jun 9 20:26:10 2016
@@ -28,8 +28,8 @@ class TiffOutputSummary {
public final ByteOrder byteOrder;
public final TiffOutputDirectory rootDirectory;
public final Map<Integer, TiffOutputDirectory> directoryTypeMap;
- private final List<OffsetItem> offsetItems = new ArrayList<OffsetItem>();
- private final List<ImageDataOffsets> imageDataItems = new ArrayList<ImageDataOffsets>();
+ private final List<OffsetItem> offsetItems = new ArrayList<>();
+ private final List<ImageDataOffsets> imageDataItems = new ArrayList<>();
public TiffOutputSummary(final ByteOrder byteOrder,
final TiffOutputDirectory rootDirectory,
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/wbmp/WbmpImageParser.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/wbmp/WbmpImageParser.java?rev=1747594&r1=1747593&r2=1747594&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/wbmp/WbmpImageParser.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/wbmp/WbmpImageParser.java Thu Jun 9 20:26:10 2016
@@ -234,7 +234,7 @@ public class WbmpImageParser extends Ima
public void writeImage(final BufferedImage src, final OutputStream os, Map<String, Object> params)
throws ImageWriteException, IOException {
// make copy of params; we'll clear keys as we consume them.
- params = (params == null) ? new HashMap<String, Object>() : new HashMap<String, Object>(params);
+ params = (params == null) ? new HashMap<String, Object>() : new HashMap<>(params);
// clear format key.
if (params.containsKey(PARAM_KEY_FORMAT)) {
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/xbm/XbmImageParser.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/xbm/XbmImageParser.java?rev=1747594&r1=1747593&r2=1747594&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/xbm/XbmImageParser.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/xbm/XbmImageParser.java Thu Jun 9 20:26:10 2016
@@ -145,7 +145,7 @@ public class XbmImageParser extends Imag
boolean canThrow = false;
try {
is = byteSource.getInputStream();
- final Map<String, String> defines = new HashMap<String, String>();
+ final Map<String, String> defines = new HashMap<>();
final ByteArrayOutputStream preprocessedFile = BasicCParser.preprocess(
is, null, defines);
int width = -1;
@@ -326,7 +326,7 @@ public class XbmImageParser extends Imag
public void writeImage(final BufferedImage src, final OutputStream os, Map<String, Object> params)
throws ImageWriteException, IOException {
// make copy of params; we'll clear keys as we consume them.
- params = (params == null) ? new HashMap<String, Object>() : new HashMap<String, Object>(params);
+ params = (params == null) ? new HashMap<String, Object>() : new HashMap<>(params);
// clear format key.
if (params.containsKey(PARAM_KEY_FORMAT)) {
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/xpm/XpmImageParser.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/xpm/XpmImageParser.java?rev=1747594&r1=1747593&r2=1747594&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/xpm/XpmImageParser.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/xpm/XpmImageParser.java Thu Jun 9 20:26:10 2016
@@ -79,7 +79,7 @@ public class XpmImageParser extends Imag
if (rgbTxtStream == null) {
throw new ImageReadException("Couldn't find rgb.txt in our resources");
}
- final Map<String, Integer> colors = new HashMap<String, Integer>();
+ final Map<String, Integer> colors = new HashMap<>();
BufferedReader reader = null;
boolean canThrow = false;
try {
@@ -187,7 +187,7 @@ public class XpmImageParser extends Imag
int yHotSpot = -1;
boolean xpmExt;
- Map<Object, PaletteEntry> palette = new HashMap<Object, PaletteEntry>();
+ Map<Object, PaletteEntry> palette = new HashMap<>();
public XpmHeader(final int width, final int height, final int numColors,
final int numCharsPerPixel, final int xHotSpot, final int yHotSpot, final boolean xpmExt) {
@@ -654,7 +654,7 @@ public class XpmImageParser extends Imag
public void writeImage(final BufferedImage src, final OutputStream os, Map<String, Object> params)
throws ImageWriteException, IOException {
// make copy of params; we'll clear keys as we consume them.
- params = (params == null) ? new HashMap<String, Object>() : new HashMap<String, Object>(params);
+ params = (params == null) ? new HashMap<String, Object>() : new HashMap<>(params);
// clear format key.
if (params.containsKey(PARAM_KEY_FORMAT)) {