Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/palette/LongestAxisMedianCut.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/palette/LongestAxisMedianCut.java?rev=1747594&r1=1747593&r2=1747594&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/palette/LongestAxisMedianCut.java (original) +++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/palette/LongestAxisMedianCut.java Thu Jun 9 20:26:10 2016 @@ -105,15 +105,15 @@ public class LongestAxisMedianCut implem } colorGroups.remove(colorGroup); - final List<ColorCount> colorCounts1 = new ArrayList<ColorCount>( + final List<ColorCount> colorCounts1 = new ArrayList<>( colorGroup.colorCounts.subList(0, medianIndex + 1)); - final List<ColorCount> colorCounts2 = new ArrayList<ColorCount>( + final List<ColorCount> colorCounts2 = new ArrayList<>( colorGroup.colorCounts.subList(medianIndex + 1, colorGroup.colorCounts.size())); - ColorGroup less = new ColorGroup(new ArrayList<ColorCount>(colorCounts1), ignoreAlpha); + ColorGroup less = new ColorGroup(new ArrayList<>(colorCounts1), ignoreAlpha); colorGroups.add(less); - ColorGroup more = new ColorGroup(new ArrayList<ColorCount>(colorCounts2), ignoreAlpha); + ColorGroup more = new ColorGroup(new ArrayList<>(colorCounts2), ignoreAlpha); colorGroups.add(more); final ColorCount medianValue = colorGroup.colorCounts.get(medianIndex);
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/palette/MedianCutQuantizer.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/palette/MedianCutQuantizer.java?rev=1747594&r1=1747593&r2=1747594&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/palette/MedianCutQuantizer.java (original) +++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/palette/MedianCutQuantizer.java Thu Jun 9 20:26:10 2016 @@ -34,7 +34,7 @@ public class MedianCutQuantizer { private Map<Integer, ColorCount> groupColors1(final BufferedImage image, final int max, final int mask) { - final Map<Integer, ColorCount> colorMap = new HashMap<Integer, ColorCount>(); + final Map<Integer, ColorCount> colorMap = new HashMap<>(); final int width = image.getWidth(); final int height = image.getHeight(); @@ -94,7 +94,7 @@ public class MedianCutQuantizer { } final int[] palette = new int[discreteColors]; - final List<ColorCount> colorCounts = new ArrayList<ColorCount>( + final List<ColorCount> colorCounts = new ArrayList<>( colorMap.values()); for (int i = 0; i < colorCounts.size(); i++) { @@ -112,8 +112,8 @@ public class MedianCutQuantizer { Debug.debug("discrete colors: " + discreteColors); } - final List<ColorGroup> colorGroups = new ArrayList<ColorGroup>(); - final ColorGroup root = new ColorGroup(new ArrayList<ColorCount>(colorMap.values()), ignoreAlpha); + final List<ColorGroup> colorGroups = new ArrayList<>(); + final ColorGroup root = new ColorGroup(new ArrayList<>(colorMap.values()), ignoreAlpha); colorGroups.add(root); while (colorGroups.size() < maxColors) { Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/palette/MostPopulatedBoxesMedianCut.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/palette/MostPopulatedBoxesMedianCut.java?rev=1747594&r1=1747593&r2=1747594&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/palette/MostPopulatedBoxesMedianCut.java (original) +++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/palette/MostPopulatedBoxesMedianCut.java Thu Jun 9 20:26:10 2016 @@ -77,9 +77,9 @@ public class MostPopulatedBoxesMedianCut } } - final List<ColorCount> lowerColors = new ArrayList<ColorCount>( + final List<ColorCount> lowerColors = new ArrayList<>( colorGroup.colorCounts.subList(0, medianIndex + 1)); - final List<ColorCount> upperColors = new ArrayList<ColorCount>( + final List<ColorCount> upperColors = new ArrayList<>( colorGroup.colorCounts.subList(medianIndex + 1, colorGroup.colorCounts.size())); if (lowerColors.isEmpty() || upperColors.isEmpty()) { @@ -101,9 +101,9 @@ public class MostPopulatedBoxesMedianCut } Collections.sort(colorGroup.colorCounts, new ColorComparer(bestColorComponent)); - final List<ColorCount> lowerColors = new ArrayList<ColorCount>( + final List<ColorCount> lowerColors = new ArrayList<>( colorGroup.colorCounts.subList(0, bestMedianIndex + 1)); - final List<ColorCount> upperColors = new ArrayList<ColorCount>( + final List<ColorCount> upperColors = new ArrayList<>( colorGroup.colorCounts.subList(bestMedianIndex + 1, colorGroup.colorCounts.size())); final ColorGroup lowerGroup = new ColorGroup(lowerColors, ignoreAlpha); Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/palette/PaletteFactory.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/palette/PaletteFactory.java?rev=1747594&r1=1747593&r2=1747594&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/palette/PaletteFactory.java (original) +++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/palette/PaletteFactory.java Thu Jun 9 20:26:10 2016 @@ -208,7 +208,7 @@ public class PaletteFactory { final DivisionCandidate dc1 = finishDivision(subset, component, precision, sum1, slice1); final DivisionCandidate dc2 = finishDivision(subset, component, precision, sum2, slice2); - final List<DivisionCandidate> result = new ArrayList<DivisionCandidate>(); + final List<DivisionCandidate> result = new ArrayList<>(); if (dc1 != null) { result.add(dc1); @@ -222,7 +222,7 @@ public class PaletteFactory { private DivisionCandidate divideSubset2(final int[] table, final ColorSpaceSubset subset, final int precision) { - final List<DivisionCandidate> dcs = new ArrayList<DivisionCandidate>(); + final List<DivisionCandidate> dcs = new ArrayList<>(); dcs.addAll(divideSubset2(table, subset, 0, precision)); dcs.addAll(divideSubset2(table, subset, 1, precision)); @@ -267,7 +267,7 @@ public class PaletteFactory { private List<ColorSpaceSubset> divide(final List<ColorSpaceSubset> v, final int desiredCount, final int[] table, final int precision) { - final List<ColorSpaceSubset> ignore = new ArrayList<ColorSpaceSubset>(); + final List<ColorSpaceSubset> ignore = new ArrayList<>(); while (true) { int maxArea = -1; @@ -330,7 +330,7 @@ public class PaletteFactory { final int width = src.getWidth(); final int height = src.getHeight(); - List<ColorSpaceSubset> subsets = new ArrayList<ColorSpaceSubset>(); + List<ColorSpaceSubset> subsets = new ArrayList<>(); final ColorSpaceSubset all = new ColorSpaceSubset(width * height, precision); subsets.add(all); @@ -402,7 +402,7 @@ public class PaletteFactory { */ public SimplePalette makeExactRgbPaletteSimple(final BufferedImage src, final int max) { // This is not efficient for large values of max, say, max > 256; - final Set<Integer> rgbs = new HashSet<Integer>(); + final Set<Integer> rgbs = new HashSet<>(); final int width = src.getWidth(); final int height = src.getHeight(); Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/util/Debug.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/util/Debug.java?rev=1747594&r1=1747593&r2=1747594&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/util/Debug.java (original) +++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/util/Debug.java Thu Jun 9 20:26:10 2016 @@ -122,7 +122,7 @@ public final class Debug { return message + " map: " + null; } - final List<Object> keys = new ArrayList<Object>(map.keySet()); + final List<Object> keys = new ArrayList<>(map.keySet()); result.append(message + " map: " + keys.size() + NEWLINE); for (int i = 0; i < keys.size(); i++) { final Object key = keys.get(i); Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/ImagingTest.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/ImagingTest.java?rev=1747594&r1=1747593&r2=1747594&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/ImagingTest.java (original) +++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/ImagingTest.java Thu Jun 9 20:26:10 2016 @@ -81,7 +81,7 @@ public abstract class ImagingTest implem return getTestImages(filter, -1); } - private static final List<File> ALL_IMAGES = new ArrayList<File>(); + private static final List<File> ALL_IMAGES = new ArrayList<>(); static { File imagesFolder = TEST_IMAGE_FOLDER; @@ -106,7 +106,7 @@ public abstract class ImagingTest implem protected static List<File> getTestImages(final ImageFilter filter, final int max) throws IOException, ImageReadException { - final List<File> images = new ArrayList<File>(); + final List<File> images = new ArrayList<>(); for (final File file : ALL_IMAGES) { if (!Imaging.hasImageFileExtension(file)) { Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/common/bytesource/ByteSourceImageTest.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/common/bytesource/ByteSourceImageTest.java?rev=1747594&r1=1747593&r2=1747594&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/common/bytesource/ByteSourceImageTest.java (original) +++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/common/bytesource/ByteSourceImageTest.java Thu Jun 9 20:26:10 2016 @@ -168,7 +168,7 @@ public class ByteSourceImageTest extends public void checkGetImageInfo(final File imageFile, final byte[] imageFileBytes) throws IOException, ImageReadException, IllegalAccessException, IllegalArgumentException, InvocationTargetException { - final Map<String, Object> params = new HashMap<String, Object>(); + final Map<String, Object> params = new HashMap<>(); final boolean ignoreImageData = isPhilHarveyTestImage(imageFile); final ImageFormat imageFormat = Imaging.guessFormat(imageFile); if (imageFormat.equals(ImageFormats.TIFF) Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/examples/ApacheImagingSpeedAndMemoryTest.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/examples/ApacheImagingSpeedAndMemoryTest.java?rev=1747594&r1=1747593&r2=1747594&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/examples/ApacheImagingSpeedAndMemoryTest.java (original) +++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/examples/ApacheImagingSpeedAndMemoryTest.java Thu Jun 9 20:26:10 2016 @@ -213,7 +213,7 @@ public class ApacheImagingSpeedAndMemory // ready the parser (you may modify this code block // to use your parser of choice) - HashMap<String, Object> params = new HashMap<String, Object>(); + HashMap<String, Object> params = new HashMap<>(); TiffImageParser tiffImageParser = new TiffImageParser(); // load the file and record time needed to do so Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/examples/ImageReadExample.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/examples/ImageReadExample.java?rev=1747594&r1=1747593&r2=1747594&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/examples/ImageReadExample.java (original) +++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/examples/ImageReadExample.java Thu Jun 9 20:26:10 2016 @@ -31,7 +31,7 @@ import org.apache.commons.imaging.common public class ImageReadExample { public static BufferedImage imageReadExample(final File file) throws ImageReadException, IOException { - final Map<String, Object> params = new HashMap<String, Object>(); + final Map<String, Object> params = new HashMap<>(); // set optional parameters if you like params.put(ImagingConstants.BUFFERED_IMAGE_FACTORY, Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/examples/ImageWriteExample.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/examples/ImageWriteExample.java?rev=1747594&r1=1747593&r2=1747594&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/examples/ImageWriteExample.java (original) +++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/examples/ImageWriteExample.java Thu Jun 9 20:26:10 2016 @@ -37,7 +37,7 @@ public class ImageWriteExample { final BufferedImage image = Imaging.getBufferedImage(file); final ImageFormat format = ImageFormats.TIFF; - final Map<String, Object> params = new HashMap<String, Object>(); + final Map<String, Object> params = new HashMap<>(); // set optional parameters if you like params.put(ImagingConstants.PARAM_KEY_COMPRESSION, new Integer( Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/examples/SampleUsage.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/examples/SampleUsage.java?rev=1747594&r1=1747593&r2=1747594&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/examples/SampleUsage.java (original) +++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/examples/SampleUsage.java Thu Jun 9 20:26:10 2016 @@ -67,7 +67,7 @@ public class SampleUsage { final BufferedImage image = someImage; final File dst = someFile; final ImageFormat format = ImageFormats.PNG; - final Map<String, Object> optionalParams = new HashMap<String, Object>(); + final Map<String, Object> optionalParams = new HashMap<>(); Imaging.writeImage(image, dst, format, optionalParams); final OutputStream os = someOutputStream; Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/bmp/BmpRoundtripTest.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/bmp/BmpRoundtripTest.java?rev=1747594&r1=1747593&r2=1747594&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/bmp/BmpRoundtripTest.java (original) +++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/bmp/BmpRoundtripTest.java Thu Jun 9 20:26:10 2016 @@ -140,7 +140,7 @@ public class BmpRoundtripTest extends Bm ImageReadException, ImageWriteException { final BufferedImage srcImage = imageDataToBufferedImage(rawData); - final Map<String, Object> writeParams = new HashMap<String, Object>(); + final Map<String, Object> writeParams = new HashMap<>(); // writeParams.put(ImagingConstants.PARAM_KEY_FORMAT, // ImageFormat.IMAGE_FORMAT_BMP); // writeParams.put(PngConstants.PARAM_KEY_BMP_FORCE_TRUE_COLOR, Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/ico/IcoRoundtripTest.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/ico/IcoRoundtripTest.java?rev=1747594&r1=1747593&r2=1747594&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/ico/IcoRoundtripTest.java (original) +++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/ico/IcoRoundtripTest.java Thu Jun 9 20:26:10 2016 @@ -57,7 +57,7 @@ public class IcoRoundtripTest extends Ic {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0} }; - private final Map<Integer,BitmapGenerator> generatorMap = new HashMap<Integer,BitmapGenerator>(); + private final Map<Integer,BitmapGenerator> generatorMap = new HashMap<>(); public IcoRoundtripTest() { generatorMap.put(1, new GeneratorFor1BitBitmaps()); Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/JpegReadTest.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/JpegReadTest.java?rev=1747594&r1=1747593&r2=1747594&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/JpegReadTest.java (original) +++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/JpegReadTest.java Thu Jun 9 20:26:10 2016 @@ -52,7 +52,7 @@ public class JpegReadTest extends JpegBa @Test public void test() throws Exception { - final Map<String, Object> params = new HashMap<String, Object>(); + final Map<String, Object> params = new HashMap<>(); final boolean ignoreImageData = isPhilHarveyTestImage(imageFile); params.put(ImagingConstants.PARAM_KEY_READ_THUMBNAILS, new Boolean(!ignoreImageData)); Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/JpegWithJpegThumbnailTest.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/JpegWithJpegThumbnailTest.java?rev=1747594&r1=1747593&r2=1747594&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/JpegWithJpegThumbnailTest.java (original) +++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/JpegWithJpegThumbnailTest.java Thu Jun 9 20:26:10 2016 @@ -35,7 +35,7 @@ public class JpegWithJpegThumbnailTest e public void testSingleImage() throws Exception { final File imageFile = getTestImageByName("img_F028c_small.jpg"); - final Map<String, Object> params = new HashMap<String, Object>(); + final Map<String, Object> params = new HashMap<>(); final ImageMetadata metadata = Imaging.getMetadata(imageFile, params); assertNotNull(metadata); final JpegImageMetadata jpegMetadata = (JpegImageMetadata) metadata; Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/AsciiFieldTest.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/AsciiFieldTest.java?rev=1747594&r1=1747593&r2=1747594&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/AsciiFieldTest.java (original) +++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/AsciiFieldTest.java Thu Jun 9 20:26:10 2016 @@ -40,7 +40,7 @@ public class AsciiFieldTest extends Exif public void testSingleImage() throws Exception { final File imageFile = getTestImageByName("Canon Powershot SD750 - 2007.12.26.n.IMG_3704.JPG"); - final Map<String, Object> params = new HashMap<String, Object>(); + final Map<String, Object> params = new HashMap<>(); final ImageMetadata metadata = Imaging.getMetadata(imageFile, params); assertNotNull(metadata); @@ -49,7 +49,7 @@ public class AsciiFieldTest extends Exif // note that exif might be null if no Exif metadata is found. final TiffImageMetadata exif = jpegMetadata.getExif(); final List<TiffField> fields = exif.getAllFields(); - final Map<Integer,TiffField> fieldMap = new HashMap<Integer, TiffField>(); + final Map<Integer,TiffField> fieldMap = new HashMap<>(); // Build a simplified field tag -> field map, ignoring directory // structures. // Good enough for our purposes, since the image in question is known. @@ -57,7 +57,7 @@ public class AsciiFieldTest extends Exif fieldMap.put(field.getTag(), field); } - final Map<Integer,Object> expectedFieldValues = new HashMap<Integer, Object>(); + final Map<Integer,Object> expectedFieldValues = new HashMap<>(); expectedFieldValues.put( TiffTagConstants.TIFF_TAG_MAKE.tag, "Canon"); expectedFieldValues.put( Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/ExifDumpTest.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/ExifDumpTest.java?rev=1747594&r1=1747593&r2=1747594&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/ExifDumpTest.java (original) +++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/ExifDumpTest.java Thu Jun 9 20:26:10 2016 @@ -59,7 +59,7 @@ public class ExifDumpTest extends ExifBa @Test public void testMetadata() throws Exception { - final Map<String, Object> params = new HashMap<String, Object>(); + final Map<String, Object> params = new HashMap<>(); final boolean ignoreImageData = isPhilHarveyTestImage(imageFile); params.put(ImagingConstants.PARAM_KEY_READ_THUMBNAILS, Boolean.valueOf(!ignoreImageData)); Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/ExifRewriteTest.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/ExifRewriteTest.java?rev=1747594&r1=1747593&r2=1747594&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/ExifRewriteTest.java (original) +++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/ExifRewriteTest.java Thu Jun 9 20:26:10 2016 @@ -280,7 +280,7 @@ public class ExifRewriteTest extends Exi } private Map<Integer,TiffImageMetadata.Directory> makeDirectoryMap(final List<? extends ImageMetadataItem> directories) { - final Map<Integer,TiffImageMetadata.Directory> directoryMap = new HashMap<Integer,TiffImageMetadata.Directory>(); + final Map<Integer,TiffImageMetadata.Directory> directoryMap = new HashMap<>(); for (int i = 0; i < directories.size(); i++) { final TiffImageMetadata.Directory directory = (TiffImageMetadata.Directory) directories .get(i); @@ -290,7 +290,7 @@ public class ExifRewriteTest extends Exi } private Map<Integer,TiffField> makeFieldMap(final List<? extends ImageMetadataItem> items) { - final Map<Integer,TiffField> fieldMap = new HashMap<Integer,TiffField>(); + final Map<Integer,TiffField> fieldMap = new HashMap<>(); for (int i = 0; i < items.size(); i++) { final TiffImageMetadata.TiffMetadataItem item = (TiffImageMetadata.TiffMetadataItem) items.get(i); final TiffField field = item.getTiffField(); @@ -315,9 +315,9 @@ public class ExifRewriteTest extends Exi final Map<Integer,TiffImageMetadata.Directory> newDirectoryMap = makeDirectoryMap(newDirectories); assertEquals(oldDirectories.size(), oldDirectoryMap.keySet().size()); - final List<Integer> oldDirectoryTypes = new ArrayList<Integer>(oldDirectoryMap.keySet()); + final List<Integer> oldDirectoryTypes = new ArrayList<>(oldDirectoryMap.keySet()); Collections.sort(oldDirectoryTypes); - final List<Integer> newDirectoryTypes = new ArrayList<Integer>(newDirectoryMap.keySet()); + final List<Integer> newDirectoryTypes = new ArrayList<>(newDirectoryMap.keySet()); Collections.sort(newDirectoryTypes); assertEquals(oldDirectoryTypes, newDirectoryTypes); @@ -339,10 +339,10 @@ public class ExifRewriteTest extends Exi final Map<Integer,TiffField> oldFieldMap = makeFieldMap(oldItems); final Map<Integer,TiffField> newFieldMap = makeFieldMap(newItems); - final Set<Integer> missingInNew = new HashSet<Integer>(oldFieldMap.keySet()); + final Set<Integer> missingInNew = new HashSet<>(oldFieldMap.keySet()); missingInNew.removeAll(newFieldMap.keySet()); - final Set<Integer> missingInOld = new HashSet<Integer>(newFieldMap.keySet()); + final Set<Integer> missingInOld = new HashSet<>(newFieldMap.keySet()); missingInOld.removeAll(oldFieldMap.keySet()); assertTrue(missingInNew.size() == 0); @@ -352,9 +352,9 @@ public class ExifRewriteTest extends Exi assertEquals(oldFieldMap.keySet(), newFieldMap.keySet()); assertEquals(oldFieldMap.keySet(), newFieldMap.keySet()); - final List<Integer> oldFieldTags = new ArrayList<Integer>(oldFieldMap.keySet()); + final List<Integer> oldFieldTags = new ArrayList<>(oldFieldMap.keySet()); Collections.sort(oldFieldTags); - final List<Integer> newFieldTags = new ArrayList<Integer>(newFieldMap.keySet()); + final List<Integer> newFieldTags = new ArrayList<>(newFieldMap.keySet()); Collections.sort(newFieldTags); assertEquals(oldFieldTags, newFieldTags); Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/GpsTest.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/GpsTest.java?rev=1747594&r1=1747593&r2=1747594&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/GpsTest.java (original) +++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/GpsTest.java Thu Jun 9 20:26:10 2016 @@ -52,7 +52,7 @@ public class GpsTest extends ExifBaseTes return; } - final Map<String, Object> params = new HashMap<String, Object>(); + final Map<String, Object> params = new HashMap<>(); final boolean ignoreImageData = isPhilHarveyTestImage(imageFile); params.put(ImagingConstants.PARAM_KEY_READ_THUMBNAILS, Boolean.valueOf(!ignoreImageData)); Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/MicrosoftTagTest.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/MicrosoftTagTest.java?rev=1747594&r1=1747593&r2=1747594&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/MicrosoftTagTest.java (original) +++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/MicrosoftTagTest.java Thu Jun 9 20:26:10 2016 @@ -53,7 +53,7 @@ public class MicrosoftTagTest extends Ex exif.add(MicrosoftTagConstants.EXIF_TAG_XPCOMMENT, COMMENT); exif.add(MicrosoftTagConstants.EXIF_TAG_XPSUBJECT, SUBJECT); exif.add(MicrosoftTagConstants.EXIF_TAG_XPTITLE, TITLE); - final Map<String, Object> params = new TreeMap<String, Object>(); + final Map<String, Object> params = new TreeMap<>(); params.put(ImagingConstants.PARAM_KEY_EXIF, exifSet); final byte[] bytes = Imaging.writeImageToBytes(image, ImageFormats.TIFF, params); checkFields(bytes); @@ -89,10 +89,10 @@ public class MicrosoftTagTest extends Ex final TiffImageMetadata metadata = toTiffMetadata(Imaging.getMetadata(file)); // field values may be duplicated between directories, we have to check all - List<Object> authorValues = new ArrayList<Object>(); - List<Object> commentValues = new ArrayList<Object>(); - List<Object> subjectValues = new ArrayList<Object>(); - List<Object> titleValues = new ArrayList<Object>(); + 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) { titleValues.add(d.getFieldValue(MicrosoftTagConstants.EXIF_TAG_XPTITLE, false)); authorValues.add(d.getFieldValue(MicrosoftTagConstants.EXIF_TAG_XPAUTHOR, false)); Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/SpecificExifTagTest.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/SpecificExifTagTest.java?rev=1747594&r1=1747593&r2=1747594&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/SpecificExifTagTest.java (original) +++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/SpecificExifTagTest.java Thu Jun 9 20:26:10 2016 @@ -66,7 +66,7 @@ public abstract class SpecificExifTagTes ImageReadException, ImageWriteException { // Debug.debug("imageFile", imageFile.getAbsoluteFile()); - final Map<String, Object> params = new HashMap<String, Object>(); + final Map<String, Object> params = new HashMap<>(); final boolean ignoreImageData = isPhilHarveyTestImage(imageFile); params.put(ImagingConstants.PARAM_KEY_READ_THUMBNAILS, Boolean.valueOf(!ignoreImageData)); Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcAddTest.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcAddTest.java?rev=1747594&r1=1747593&r2=1747594&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcAddTest.java (original) +++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcAddTest.java Thu Jun 9 20:26:10 2016 @@ -62,7 +62,7 @@ public class IptcAddTest extends IptcBas public void testAddIptcData() throws Exception { final ByteSource byteSource = new ByteSourceFile(imageFile); - final Map<String, Object> params = new HashMap<String, Object>(); + final Map<String, Object> params = new HashMap<>(); final boolean ignoreImageData = isPhilHarveyTestImage(imageFile); params.put(ImagingConstants.PARAM_KEY_READ_THUMBNAILS, Boolean.valueOf(!ignoreImageData)); @@ -72,11 +72,11 @@ public class IptcAddTest extends IptcBas return; } - final List<IptcBlock> newBlocks = new ArrayList<IptcBlock>(); + final List<IptcBlock> newBlocks = new ArrayList<>(); newBlocks.addAll(metadata.photoshopApp13Data.getNonIptcBlocks()); final List<IptcRecord> oldRecords = metadata.photoshopApp13Data.getRecords(); - List<IptcRecord> newRecords = new ArrayList<IptcRecord>(); + List<IptcRecord> newRecords = new ArrayList<>(); for (final IptcRecord record : oldRecords) { if (record.iptcType != IptcTypes.CITY && record.iptcType != IptcTypes.CREDIT) { Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcDumpTest.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcDumpTest.java?rev=1747594&r1=1747593&r2=1747594&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcDumpTest.java (original) +++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcDumpTest.java Thu Jun 9 20:26:10 2016 @@ -50,7 +50,7 @@ public class IptcDumpTest extends IptcBa @Test public void test() throws Exception { - final Map<String, Object> params = new HashMap<String, Object>(); + final Map<String, Object> params = new HashMap<>(); final boolean ignoreImageData = isPhilHarveyTestImage(imageFile); params.put(ImagingConstants.PARAM_KEY_READ_THUMBNAILS, Boolean.valueOf(!ignoreImageData)); Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcUpdateTest.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcUpdateTest.java?rev=1747594&r1=1747593&r2=1747594&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcUpdateTest.java (original) +++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcUpdateTest.java Thu Jun 9 20:26:10 2016 @@ -63,7 +63,7 @@ public class IptcUpdateTest extends Iptc public void testRemove() throws Exception { final ByteSource byteSource = new ByteSourceFile(imageFile); - final Map<String, Object> params = new HashMap<String, Object>(); + final Map<String, Object> params = new HashMap<>(); final boolean ignoreImageData = isPhilHarveyTestImage(imageFile); params.put(ImagingConstants.PARAM_KEY_READ_THUMBNAILS, Boolean.valueOf(!ignoreImageData)); @@ -96,7 +96,7 @@ public class IptcUpdateTest extends Iptc public void testInsert() throws Exception { final ByteSource byteSource = new ByteSourceFile(imageFile); - final Map<String, Object> params = new HashMap<String, Object>(); + final Map<String, Object> params = new HashMap<>(); final boolean ignoreImageData = isPhilHarveyTestImage(imageFile); params.put(ImagingConstants.PARAM_KEY_READ_THUMBNAILS, Boolean.valueOf(!ignoreImageData)); @@ -105,8 +105,8 @@ public class IptcUpdateTest extends Iptc final File noIptcFile = removeIptc(byteSource); - final List<IptcBlock> newBlocks = new ArrayList<IptcBlock>(); - final List<IptcRecord> newRecords = new ArrayList<IptcRecord>(); + final List<IptcBlock> newBlocks = new ArrayList<>(); + final List<IptcRecord> newRecords = new ArrayList<>(); newRecords.add(new IptcRecord(IptcTypes.CITY, "Albany, NY")); newRecords.add(new IptcRecord(IptcTypes.CREDIT, @@ -141,7 +141,7 @@ public class IptcUpdateTest extends Iptc public void testUpdate() throws Exception { final ByteSource byteSource = new ByteSourceFile(imageFile); - final Map<String, Object> params = new HashMap<String, Object>(); + final Map<String, Object> params = new HashMap<>(); final boolean ignoreImageData = isPhilHarveyTestImage(imageFile); params.put(ImagingConstants.PARAM_KEY_READ_THUMBNAILS, Boolean.valueOf(!ignoreImageData)); @@ -149,7 +149,7 @@ public class IptcUpdateTest extends Iptc assertNotNull(metadata); final List<IptcBlock> newBlocks = metadata.photoshopApp13Data.getNonIptcBlocks(); - final List<IptcRecord> newRecords = new ArrayList<IptcRecord>(); + final List<IptcRecord> newRecords = new ArrayList<>(); newRecords.add(new IptcRecord(IptcTypes.CITY, "Albany, NY")); newRecords.add(new IptcRecord(IptcTypes.CREDIT, @@ -188,7 +188,7 @@ public class IptcUpdateTest extends Iptc public void testNoChangeUpdate() throws Exception { final ByteSource byteSource = new ByteSourceFile(imageFile); - final Map<String, Object> params = new HashMap<String, Object>(); + final Map<String, Object> params = new HashMap<>(); final boolean ignoreImageData = isPhilHarveyTestImage(imageFile); params.put(ImagingConstants.PARAM_KEY_READ_THUMBNAILS, Boolean.valueOf(!ignoreImageData)); @@ -197,7 +197,7 @@ public class IptcUpdateTest extends Iptc final List<IptcBlock> newBlocks = metadata.photoshopApp13Data.getNonIptcBlocks(); final List<IptcRecord> oldRecords = metadata.photoshopApp13Data.getRecords(); - final List<IptcRecord> newRecords = new ArrayList<IptcRecord>(); + final List<IptcRecord> newRecords = new ArrayList<>(); for (final IptcRecord record : oldRecords) { if (record.iptcType != IptcTypes.CITY && record.iptcType != IptcTypes.CREDIT) { Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/xmp/JpegXmpDumpTest.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/xmp/JpegXmpDumpTest.java?rev=1747594&r1=1747593&r2=1747594&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/xmp/JpegXmpDumpTest.java (original) +++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/xmp/JpegXmpDumpTest.java Thu Jun 9 20:26:10 2016 @@ -48,7 +48,7 @@ public class JpegXmpDumpTest extends Jpe @Test public void test() throws Exception { final ByteSource byteSource = new ByteSourceFile(imageFile); - final Map<String, Object> params = new HashMap<String, Object>(); + final Map<String, Object> params = new HashMap<>(); final String xmpXml = new JpegImageParser().getXmpXml(byteSource, params); // TODO assert more Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/xmp/JpegXmpRewriteTest.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/xmp/JpegXmpRewriteTest.java?rev=1747594&r1=1747593&r2=1747594&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/xmp/JpegXmpRewriteTest.java (original) +++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/xmp/JpegXmpRewriteTest.java Thu Jun 9 20:26:10 2016 @@ -54,7 +54,7 @@ public class JpegXmpRewriteTest extends @Test public void testRemoveInsertUpdate() throws Exception { final ByteSource byteSource = new ByteSourceFile(imageFile); - final Map<String, Object> params = new HashMap<String, Object>(); + final Map<String, Object> params = new HashMap<>(); final String xmpXml = new JpegImageParser().getXmpXml(byteSource, params); assertNotNull(xmpXml); Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/pam/PamReadTest.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/pam/PamReadTest.java?rev=1747594&r1=1747593&r2=1747594&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/pam/PamReadTest.java (original) +++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/pam/PamReadTest.java Thu Jun 9 20:26:10 2016 @@ -47,7 +47,7 @@ public class PamReadTest extends PamBase final ImageMetadata metadata = Imaging.getMetadata(imageFile); Assert.assertFalse(metadata instanceof File); // Dummy check to avoid unused warning (it may be null) - final Map<String, Object> params = new HashMap<String, Object>(); + final Map<String, Object> params = new HashMap<>(); final ImageInfo imageInfo = Imaging.getImageInfo(imageFile, params); assertNotNull(imageInfo); Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/pcx/PcxReadTest.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/pcx/PcxReadTest.java?rev=1747594&r1=1747593&r2=1747594&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/pcx/PcxReadTest.java (original) +++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/pcx/PcxReadTest.java Thu Jun 9 20:26:10 2016 @@ -47,7 +47,7 @@ public class PcxReadTest extends PcxBase final ImageMetadata metadata = Imaging.getMetadata(imageFile); Assert.assertFalse(metadata instanceof File); // Dummy check to avoid unused warning (it may be null) - final Map<String, Object> params = new HashMap<String, Object>(); + final Map<String, Object> params = new HashMap<>(); final ImageInfo imageInfo = Imaging.getImageInfo(imageFile, params); assertNotNull(imageInfo); Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/ConvertPngToGifTest.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/ConvertPngToGifTest.java?rev=1747594&r1=1747593&r2=1747594&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/ConvertPngToGifTest.java (original) +++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/ConvertPngToGifTest.java Thu Jun 9 20:26:10 2016 @@ -46,7 +46,7 @@ public class ConvertPngToGifTest extends // Debug.debug(); } - final Map<String, Object> params = new HashMap<String, Object>(); + final Map<String, Object> params = new HashMap<>(); // params.put(ImagingConstants.PARAM_KEY_VERBOSE, Boolean.TRUE); final BufferedImage image = Imaging.getBufferedImage(imageFile, params); Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/PngMultipleRoundtripTest.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/PngMultipleRoundtripTest.java?rev=1747594&r1=1747593&r2=1747594&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/PngMultipleRoundtripTest.java (original) +++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/PngMultipleRoundtripTest.java Thu Jun 9 20:26:10 2016 @@ -55,7 +55,7 @@ public class PngMultipleRoundtripTest ex File lastFile = imageFile; for (int j = 0; j < 10; j++) { - final Map<String, Object> readParams = new HashMap<String, Object>(); + final Map<String, Object> readParams = new HashMap<>(); // readParams.put(ImagingConstants.BUFFERED_IMAGE_FACTORY, // new RgbBufferedImageFactory()); final BufferedImage image = Imaging.getBufferedImage(lastFile, @@ -66,7 +66,7 @@ public class PngMultipleRoundtripTest ex + ".", ".png"); Debug.debug("tempFile", tempFile); - final Map<String, Object> writeParams = new HashMap<String, Object>(); + final Map<String, Object> writeParams = new HashMap<>(); Imaging.writeImage(image, tempFile, ImageFormats.PNG, writeParams); Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/PngTextTest.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/PngTextTest.java?rev=1747594&r1=1747593&r2=1747594&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/PngTextTest.java (original) +++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/PngTextTest.java Thu Jun 9 20:26:10 2016 @@ -44,9 +44,9 @@ public class PngTextTest extends PngBase BufferedImage.TYPE_INT_ARGB); srcImage.setRGB(0, 0, Color.red.getRGB()); - final Map<String, Object> writeParams = new HashMap<String, Object>(); + final Map<String, Object> writeParams = new HashMap<>(); - final List<PngText> writeTexts = new ArrayList<PngText>(); + final List<PngText> writeTexts = new ArrayList<>(); { final String keyword = "a"; final String text = "b"; Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/PngWriteForceTrueColorText.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/PngWriteForceTrueColorText.java?rev=1747594&r1=1747593&r2=1747594&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/PngWriteForceTrueColorText.java (original) +++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/PngWriteForceTrueColorText.java Thu Jun 9 20:26:10 2016 @@ -56,7 +56,7 @@ public class PngWriteForceTrueColorText final File outFile = createTempFile(imageFile.getName() + ".", ".gif"); // Debug.debug("outFile", outFile); - final Map<String, Object> params = new HashMap<String, Object>(); + final Map<String, Object> params = new HashMap<>(); params.put(PngConstants.PARAM_KEY_PNG_FORCE_TRUE_COLOR, Boolean.TRUE); Imaging.writeImage(image, outFile, Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/PngWriteReadTest.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/PngWriteReadTest.java?rev=1747594&r1=1747593&r2=1747594&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/PngWriteReadTest.java (original) +++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/PngWriteReadTest.java Thu Jun 9 20:26:10 2016 @@ -137,7 +137,7 @@ public class PngWriteReadTest extends Im ImageReadException, ImageWriteException { final BufferedImage srcImage = imageDataToBufferedImage(rawData); - final Map<String, Object> writeParams = new HashMap<String, Object>(); + final Map<String, Object> writeParams = new HashMap<>(); // writeParams.put(ImagingConstants.PARAM_KEY_FORMAT, // ImageFormat.IMAGE_FORMAT_PNG); // writeParams.put(PngConstants.PARAM_KEY_PNG_FORCE_TRUE_COLOR, Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/psd/PsdReadTest.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/psd/PsdReadTest.java?rev=1747594&r1=1747593&r2=1747594&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/psd/PsdReadTest.java (original) +++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/psd/PsdReadTest.java Thu Jun 9 20:26:10 2016 @@ -45,7 +45,7 @@ public class PsdReadTest extends PsdBase final ImageMetadata metadata = Imaging.getMetadata(imageFile); Assert.assertFalse(metadata instanceof File); // Dummy check to avoid unused warning (it may be null) - final Map<String, Object> params = new HashMap<String, Object>(); + final Map<String, Object> params = new HashMap<>(); final ImageInfo imageInfo = Imaging.getImageInfo(imageFile, params); assertNotNull(imageInfo); Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffCcittTest.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffCcittTest.java?rev=1747594&r1=1747593&r2=1747594&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffCcittTest.java (original) +++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffCcittTest.java Thu Jun 9 20:26:10 2016 @@ -178,7 +178,7 @@ public class TiffCcittTest extends TiffB } try { - final HashMap<String, Object> params = new HashMap<String, Object>(); + final HashMap<String, Object> params = new HashMap<>(); params.put(ImagingConstants.PARAM_KEY_COMPRESSION, TiffConstants.TIFF_COMPRESSION_CCITT_1D); final byte[] compressed = Imaging.writeImageToBytes(image, @@ -197,7 +197,7 @@ public class TiffCcittTest extends TiffB } try { - final HashMap<String, Object> params = new HashMap<String, Object>(); + final HashMap<String, Object> params = new HashMap<>(); params.put(ImagingConstants.PARAM_KEY_COMPRESSION, TiffConstants.TIFF_COMPRESSION_CCITT_GROUP_3); params.put(TiffConstants.PARAM_KEY_T4_OPTIONS, 0); @@ -217,7 +217,7 @@ public class TiffCcittTest extends TiffB } try { - final HashMap<String, Object> params = new HashMap<String, Object>(); + final HashMap<String, Object> params = new HashMap<>(); params.put(ImagingConstants.PARAM_KEY_COMPRESSION, TiffConstants.TIFF_COMPRESSION_CCITT_GROUP_3); params.put(TiffConstants.PARAM_KEY_T4_OPTIONS, 4); @@ -237,7 +237,7 @@ public class TiffCcittTest extends TiffB } try { - final HashMap<String, Object> params = new HashMap<String, Object>(); + final HashMap<String, Object> params = new HashMap<>(); params.put(ImagingConstants.PARAM_KEY_COMPRESSION, TiffConstants.TIFF_COMPRESSION_CCITT_GROUP_3); params.put(TiffConstants.PARAM_KEY_T4_OPTIONS, 1); @@ -257,7 +257,7 @@ public class TiffCcittTest extends TiffB } try { - final HashMap<String, Object> params = new HashMap<String, Object>(); + final HashMap<String, Object> params = new HashMap<>(); params.put(ImagingConstants.PARAM_KEY_COMPRESSION, TiffConstants.TIFF_COMPRESSION_CCITT_GROUP_3); params.put(TiffConstants.PARAM_KEY_T4_OPTIONS, 5); @@ -277,7 +277,7 @@ public class TiffCcittTest extends TiffB } try { - final HashMap<String, Object> params = new HashMap<String, Object>(); + final HashMap<String, Object> params = new HashMap<>(); params.put(ImagingConstants.PARAM_KEY_COMPRESSION, TiffConstants.TIFF_COMPRESSION_CCITT_GROUP_4); final byte[] compressed = Imaging.writeImageToBytes(image, Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffLzwTest.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffLzwTest.java?rev=1747594&r1=1747593&r2=1747594&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffLzwTest.java (original) +++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffLzwTest.java Thu Jun 9 20:26:10 2016 @@ -88,7 +88,7 @@ public class TiffLzwTest extends TiffBas } final int LZW_MINIMUM_CODE_SIZE = 8; - final List<Integer> codes = new ArrayList<Integer>(); + final List<Integer> codes = new ArrayList<>(); final MyLzwCompressor.Listener compressionListener = new MyLzwCompressor.Listener() { public void dataCode(final int code) { codes.add(code); @@ -171,7 +171,7 @@ public class TiffLzwTest extends TiffBas Debug.debug(); final int LZW_MINIMUM_CODE_SIZE = 8; - final List<Integer> codes = new ArrayList<Integer>(); + final List<Integer> codes = new ArrayList<>(); final MyLzwDecompressor.Listener decompressionListener = new MyLzwDecompressor.Listener() { Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffReadWriteTagsTest.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffReadWriteTagsTest.java?rev=1747594&r1=1747593&r2=1747594&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffReadWriteTagsTest.java (original) +++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffReadWriteTagsTest.java Thu Jun 9 20:26:10 2016 @@ -68,7 +68,7 @@ public class TiffReadWriteTagsTest exten writer.write(tiff, set); TiffReader reader = new TiffReader(true); - Map<String, Object> params = new TreeMap<String, Object>(); + Map<String, Object> params = new TreeMap<>(); FormatCompliance formatCompliance = new FormatCompliance(""); TiffContents contents = reader.readFirstDirectory(new ByteSourceArray(tiff.toByteArray()), params, true, formatCompliance); TiffDirectory rootDir = contents.directories.get(0); Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffRoundtripTest.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffRoundtripTest.java?rev=1747594&r1=1747593&r2=1747594&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffRoundtripTest.java (original) +++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffRoundtripTest.java Thu Jun 9 20:26:10 2016 @@ -59,7 +59,7 @@ public class TiffRoundtripTest extends T }; for (final int compression : compressions) { final File tempFile = createTempFile(imageFile.getName() + "-" + compression + ".", ".tif"); - final Map<String, Object> params = new HashMap<String, Object>(); + final Map<String, Object> params = new HashMap<>(); params.put(ImagingConstants.PARAM_KEY_COMPRESSION, compression); Imaging.writeImage(image, tempFile, ImageFormats.TIFF, params); Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffSubImageTest.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffSubImageTest.java?rev=1747594&r1=1747593&r2=1747594&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffSubImageTest.java (original) +++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffSubImageTest.java Thu Jun 9 20:26:10 2016 @@ -37,7 +37,7 @@ public class TiffSubImageTest extends Ti BufferedImage src = new BufferedImage(10, 10, BufferedImage.TYPE_INT_RGB); byte[] imageBytes = Imaging.writeImageToBytes(src, ImageFormats.TIFF, null); - Map<String, Object> params = new TreeMap<String, Object>(); + Map<String, Object> params = new TreeMap<>(); params.put(TiffConstants.PARAM_KEY_SUBIMAGE_X, 0); params.put(TiffConstants.PARAM_KEY_SUBIMAGE_Y, 0); params.put(TiffConstants.PARAM_KEY_SUBIMAGE_WIDTH, 2); Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/wbmp/WbmpReadTest.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/wbmp/WbmpReadTest.java?rev=1747594&r1=1747593&r2=1747594&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/wbmp/WbmpReadTest.java (original) +++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/wbmp/WbmpReadTest.java Thu Jun 9 20:26:10 2016 @@ -44,7 +44,7 @@ public class WbmpReadTest extends WbmpBa final ImageMetadata metadata = Imaging.getMetadata(imageFile); Assert.assertFalse(metadata instanceof File); // Dummy check to avoid unused warning (it may be null) - final Map<String, Object> params = new HashMap<String, Object>(); + final Map<String, Object> params = new HashMap<>(); final ImageInfo imageInfo = Imaging.getImageInfo(imageFile, params); assertNotNull(imageInfo); Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/xbm/XbmReadTest.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/xbm/XbmReadTest.java?rev=1747594&r1=1747593&r2=1747594&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/xbm/XbmReadTest.java (original) +++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/xbm/XbmReadTest.java Thu Jun 9 20:26:10 2016 @@ -44,7 +44,7 @@ public class XbmReadTest extends XbmBase final ImageMetadata metadata = Imaging.getMetadata(imageFile); Assert.assertFalse(metadata instanceof File); // Dummy check to avoid unused warning (it may be null) - final Map<String, Object> params = new HashMap<String, Object>(); + final Map<String, Object> params = new HashMap<>(); final ImageInfo imageInfo = Imaging.getImageInfo(imageFile, params); assertNotNull(imageInfo); Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/xmp/XmpUpdateTest.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/xmp/XmpUpdateTest.java?rev=1747594&r1=1747593&r2=1747594&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/xmp/XmpUpdateTest.java (original) +++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/xmp/XmpUpdateTest.java Thu Jun 9 20:26:10 2016 @@ -84,7 +84,7 @@ public class XmpUpdateTest extends Imagi // ---- - final Map<String, Object> params = new HashMap<String, Object>(); + final Map<String, Object> params = new HashMap<>(); params.put(ImagingConstants.PARAM_KEY_XMP_XML, xmpXml); Imaging.writeImage(image, tempFile, imageFormat, params); Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/xpm/XpmReadTest.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/xpm/XpmReadTest.java?rev=1747594&r1=1747593&r2=1747594&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/xpm/XpmReadTest.java (original) +++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/xpm/XpmReadTest.java Thu Jun 9 20:26:10 2016 @@ -44,7 +44,7 @@ public class XpmReadTest extends XpmBase final ImageMetadata metadata = Imaging.getMetadata(imageFile); Assert.assertFalse(metadata instanceof File); // Dummy check to avoid unused warning (it may be null) - final Map<String, Object> params = new HashMap<String, Object>(); + final Map<String, Object> params = new HashMap<>(); final ImageInfo imageInfo = Imaging.getImageInfo(imageFile, params); assertNotNull(imageInfo); Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/roundtrip/RoundtripTest.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/roundtrip/RoundtripTest.java?rev=1747594&r1=1747593&r2=1747594&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/roundtrip/RoundtripTest.java (original) +++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/roundtrip/RoundtripTest.java Thu Jun 9 20:26:10 2016 @@ -416,7 +416,7 @@ public class RoundtripTest extends Imagi final File temp1 = createTempFile("pixeldensity.", "." + formatInfo.format.getExtension()); - final Map<String, Object> params = new HashMap<String, Object>(); + final Map<String, Object> params = new HashMap<>(); final PixelDensity pixelDensity = PixelDensity.createFromPixelsPerInch(75, 150); params.put(ImagingConstants.PARAM_KEY_PIXEL_DENSITY, pixelDensity); Imaging.writeImage(testImage, temp1, formatInfo.format, params); @@ -465,10 +465,10 @@ public class RoundtripTest extends Imagi + formatInfo.format.getExtension()); Debug.debug("tempFile: " + temp1.getName()); - final Map<String, Object> params = new HashMap<String, Object>(); + final Map<String, Object> params = new HashMap<>(); Imaging.writeImage(testImage, temp1, formatInfo.format, params); - final Map<String, Object> readParams = new HashMap<String, Object>(); + final Map<String, Object> readParams = new HashMap<>(); readParams.put(ImagingConstants.BUFFERED_IMAGE_FACTORY, new RgbBufferedImageFactory()); final BufferedImage image2 = Imaging.getBufferedImage(temp1, readParams);
