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 2019/03/31 13:42:48 UTC
[commons-imaging] branch master updated: Clean up generics.
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-imaging.git
The following commit(s) were added to refs/heads/master by this push:
new 92e281c Clean up generics.
92e281c is described below
commit 92e281c27e3b3b9a6bddf9aa6b3c0afbacd8f88f
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sun Mar 31 09:41:51 2019 -0400
Clean up generics.
---
.../org/apache/commons/imaging/formats/bmp/BmpImageParser.java | 8 ++++----
.../org/apache/commons/imaging/formats/dcx/DcxImageParser.java | 2 +-
.../org/apache/commons/imaging/formats/icns/IcnsImageParser.java | 6 +++---
.../org/apache/commons/imaging/formats/ico/IcoImageParser.java | 2 +-
.../org/apache/commons/imaging/formats/jpeg/xmp/JpegRewriter.java | 4 ++--
.../org/apache/commons/imaging/formats/pcx/PcxImageParser.java | 2 +-
.../java/org/apache/commons/imaging/formats/pcx/PcxWriter.java | 2 +-
.../org/apache/commons/imaging/formats/png/PngImageParser.java | 2 +-
.../org/apache/commons/imaging/formats/wbmp/WbmpImageParser.java | 2 +-
.../org/apache/commons/imaging/formats/xbm/XbmImageParser.java | 2 +-
.../org/apache/commons/imaging/formats/xpm/XpmImageParser.java | 2 +-
11 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/src/main/java/org/apache/commons/imaging/formats/bmp/BmpImageParser.java b/src/main/java/org/apache/commons/imaging/formats/bmp/BmpImageParser.java
index e0b015d..0c6b0ba 100644
--- a/src/main/java/org/apache/commons/imaging/formats/bmp/BmpImageParser.java
+++ b/src/main/java/org/apache/commons/imaging/formats/bmp/BmpImageParser.java
@@ -495,7 +495,7 @@ public class BmpImageParser extends ImageParser {
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<>(params);
+ params = (params == null) ? new HashMap<>() : new HashMap<>(params);
if (!params.isEmpty()) {
final Object firstKey = params.keySet().iterator().next();
@@ -546,7 +546,7 @@ public class BmpImageParser extends ImageParser {
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<>(params);
+ params = params == null ? new HashMap<>() : new HashMap<>(params);
if (!params.isEmpty()) {
final Object firstKey = params.keySet().iterator().next();
@@ -648,7 +648,7 @@ public class BmpImageParser extends ImageParser {
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<>(params);
+ params = (params == null) ? new HashMap<>() : new HashMap<>(params);
if (params.containsKey(BUFFERED_IMAGE_FACTORY)) {
params.remove(BUFFERED_IMAGE_FACTORY);
@@ -690,7 +690,7 @@ public class BmpImageParser extends ImageParser {
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<>(params);
+ params = (params == null) ? new HashMap<>() : new HashMap<>(params);
PixelDensity pixelDensity = null;
diff --git a/src/main/java/org/apache/commons/imaging/formats/dcx/DcxImageParser.java b/src/main/java/org/apache/commons/imaging/formats/dcx/DcxImageParser.java
index 4d7dca2..36f6a00 100644
--- a/src/main/java/org/apache/commons/imaging/formats/dcx/DcxImageParser.java
+++ b/src/main/java/org/apache/commons/imaging/formats/dcx/DcxImageParser.java
@@ -197,7 +197,7 @@ public class DcxImageParser extends ImageParser {
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<>(params);
+ params = (params == null) ? new HashMap<>() : new HashMap<>(params);
final HashMap<String, Object> pcxParams = new HashMap<>();
diff --git a/src/main/java/org/apache/commons/imaging/formats/icns/IcnsImageParser.java b/src/main/java/org/apache/commons/imaging/formats/icns/IcnsImageParser.java
index f88d06c..8bb225f 100644
--- a/src/main/java/org/apache/commons/imaging/formats/icns/IcnsImageParser.java
+++ b/src/main/java/org/apache/commons/imaging/formats/icns/IcnsImageParser.java
@@ -82,7 +82,7 @@ public class IcnsImageParser extends ImageParser {
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<>(params);
+ params = params == null ? new HashMap<>() : new HashMap<>(params);
if (!params.isEmpty()) {
final Object firstKey = params.keySet().iterator().next();
@@ -107,7 +107,7 @@ public class IcnsImageParser extends ImageParser {
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<>(params);
+ params = (params == null) ? new HashMap<>() : new HashMap<>(params);
if (!params.isEmpty()) {
final Object firstKey = params.keySet().iterator().next();
@@ -271,7 +271,7 @@ public class IcnsImageParser extends ImageParser {
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<>(params);
+ params = (params == null) ? new HashMap<>() : new HashMap<>(params);
// clear format key.
if (params.containsKey(PARAM_KEY_FORMAT)) {
diff --git a/src/main/java/org/apache/commons/imaging/formats/ico/IcoImageParser.java b/src/main/java/org/apache/commons/imaging/formats/ico/IcoImageParser.java
index 36aec66..23a5472 100644
--- a/src/main/java/org/apache/commons/imaging/formats/ico/IcoImageParser.java
+++ b/src/main/java/org/apache/commons/imaging/formats/ico/IcoImageParser.java
@@ -629,7 +629,7 @@ public class IcoImageParser extends ImageParser {
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<>(params);
+ params = (params == null) ? new HashMap<>() : new HashMap<>(params);
// clear format key.
if (params.containsKey(PARAM_KEY_FORMAT)) {
diff --git a/src/main/java/org/apache/commons/imaging/formats/jpeg/xmp/JpegRewriter.java b/src/main/java/org/apache/commons/imaging/formats/jpeg/xmp/JpegRewriter.java
index cc78451..b113835 100644
--- a/src/main/java/org/apache/commons/imaging/formats/jpeg/xmp/JpegRewriter.java
+++ b/src/main/java/org/apache/commons/imaging/formats/jpeg/xmp/JpegRewriter.java
@@ -278,7 +278,7 @@ public class JpegRewriter extends BinaryFileParser {
}
}
- final List<JFIFPiece> result = new ArrayList<JFIFPiece>(segments);
+ final List<JFIFPiece> result = new ArrayList<>(segments);
if (firstAppIndex == -1) {
throw new ImageWriteException("JPEG file has no APP segments.");
}
@@ -301,7 +301,7 @@ public class JpegRewriter extends BinaryFileParser {
}
}
- final List<JFIFPiece> result = new ArrayList<JFIFPiece>(segments);
+ final List<JFIFPiece> result = new ArrayList<>(segments);
if (lastAppIndex == -1) {
if (segments.size() < 1) {
throw new ImageWriteException("JPEG file has no APP segments.");
diff --git a/src/main/java/org/apache/commons/imaging/formats/pcx/PcxImageParser.java b/src/main/java/org/apache/commons/imaging/formats/pcx/PcxImageParser.java
index 1bca37a..bd756cf 100644
--- a/src/main/java/org/apache/commons/imaging/formats/pcx/PcxImageParser.java
+++ b/src/main/java/org/apache/commons/imaging/formats/pcx/PcxImageParser.java
@@ -475,7 +475,7 @@ public class PcxImageParser extends ImageParser {
@Override
public final BufferedImage getBufferedImage(final ByteSource byteSource,
Map<String, Object> params) throws ImageReadException, IOException {
- params = (params == null) ? new HashMap<String, Object>() : new HashMap<>(params);
+ params = (params == null) ? new HashMap<>() : new HashMap<>(params);
boolean isStrict = false;
final Object strictness = params.get(PARAM_KEY_STRICT);
if (strictness != null) {
diff --git a/src/main/java/org/apache/commons/imaging/formats/pcx/PcxWriter.java b/src/main/java/org/apache/commons/imaging/formats/pcx/PcxWriter.java
index f484df9..1d9fb2a 100644
--- a/src/main/java/org/apache/commons/imaging/formats/pcx/PcxWriter.java
+++ b/src/main/java/org/apache/commons/imaging/formats/pcx/PcxWriter.java
@@ -39,7 +39,7 @@ class PcxWriter {
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<>(params);
+ params = (params == null) ? new HashMap<>() : new HashMap<>(params);
// clear format key.
if (params.containsKey(ImagingConstants.PARAM_KEY_FORMAT)) {
diff --git a/src/main/java/org/apache/commons/imaging/formats/png/PngImageParser.java b/src/main/java/org/apache/commons/imaging/formats/png/PngImageParser.java
index a6decf2..ed7d87f 100644
--- a/src/main/java/org/apache/commons/imaging/formats/png/PngImageParser.java
+++ b/src/main/java/org/apache/commons/imaging/formats/png/PngImageParser.java
@@ -480,7 +480,7 @@ public class PngImageParser extends ImageParser {
@Override
public BufferedImage getBufferedImage(final ByteSource byteSource, Map<String, Object> params)
throws ImageReadException, IOException {
- params = (params == null) ? new HashMap<String, Object>() : new HashMap<>(params);
+ params = (params == null) ? new HashMap<>() : new HashMap<>(params);
// if (params.size() > 0) {
// Object firstKey = params.keySet().iterator().next();
diff --git a/src/main/java/org/apache/commons/imaging/formats/wbmp/WbmpImageParser.java b/src/main/java/org/apache/commons/imaging/formats/wbmp/WbmpImageParser.java
index 61924ac..5e72cce 100644
--- a/src/main/java/org/apache/commons/imaging/formats/wbmp/WbmpImageParser.java
+++ b/src/main/java/org/apache/commons/imaging/formats/wbmp/WbmpImageParser.java
@@ -220,7 +220,7 @@ public class WbmpImageParser extends ImageParser {
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<>(params);
+ params = (params == null) ? new HashMap<>() : new HashMap<>(params);
// clear format key.
if (params.containsKey(PARAM_KEY_FORMAT)) {
diff --git a/src/main/java/org/apache/commons/imaging/formats/xbm/XbmImageParser.java b/src/main/java/org/apache/commons/imaging/formats/xbm/XbmImageParser.java
index c8198ae..bd54b14 100644
--- a/src/main/java/org/apache/commons/imaging/formats/xbm/XbmImageParser.java
+++ b/src/main/java/org/apache/commons/imaging/formats/xbm/XbmImageParser.java
@@ -345,7 +345,7 @@ public class XbmImageParser extends ImageParser {
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<>(params);
+ params = (params == null) ? new HashMap<>() : new HashMap<>(params);
// clear format key.
if (params.containsKey(PARAM_KEY_FORMAT)) {
diff --git a/src/main/java/org/apache/commons/imaging/formats/xpm/XpmImageParser.java b/src/main/java/org/apache/commons/imaging/formats/xpm/XpmImageParser.java
index 1320805..4d57262 100644
--- a/src/main/java/org/apache/commons/imaging/formats/xpm/XpmImageParser.java
+++ b/src/main/java/org/apache/commons/imaging/formats/xpm/XpmImageParser.java
@@ -643,7 +643,7 @@ public class XpmImageParser extends ImageParser {
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<>(params);
+ params = (params == null) ? new HashMap<>() : new HashMap<>(params);
// clear format key.
if (params.containsKey(PARAM_KEY_FORMAT)) {