From 8ed5f06151298b222408535ccb916a32e7dc32e5 Mon Sep 17 00:00:00 2001 From: Koen De Groote Date: Tue, 22 Oct 2019 01:58:08 +0200 Subject: [PATCH 1/2] Changes suggested by Intellij in the category "Performance". Updated. --- .../src/main/java/com/twelvemonkeys/io/FileUtil.java | 2 +- .../src/main/java/com/twelvemonkeys/lang/BeanUtil.java | 4 ++-- .../twelvemonkeys/util/regex/WildcardStringParser.java | 2 +- .../imageio/plugins/bmp/BMPImageReader.java | 3 ++- .../imageio/plugins/pict/PICTImageReader.java | 9 +++++---- 5 files changed, 11 insertions(+), 9 deletions(-) diff --git a/common/common-io/src/main/java/com/twelvemonkeys/io/FileUtil.java b/common/common-io/src/main/java/com/twelvemonkeys/io/FileUtil.java index 91a6a7d5..8178ab86 100755 --- a/common/common-io/src/main/java/com/twelvemonkeys/io/FileUtil.java +++ b/common/common-io/src/main/java/com/twelvemonkeys/io/FileUtil.java @@ -922,7 +922,7 @@ public final class FileUtil { // A URL should never be able to represent an opaque URI, test anyway throw new IllegalArgumentException("URI is not hierarchical"); } - if (path.equals("")) { + if (path.isEmpty()) { throw new IllegalArgumentException("URI path component is empty"); } diff --git a/common/common-lang/src/main/java/com/twelvemonkeys/lang/BeanUtil.java b/common/common-lang/src/main/java/com/twelvemonkeys/lang/BeanUtil.java index 45077253..b6c6a4a1 100755 --- a/common/common-lang/src/main/java/com/twelvemonkeys/lang/BeanUtil.java +++ b/common/common-lang/src/main/java/com/twelvemonkeys/lang/BeanUtil.java @@ -88,7 +88,7 @@ public final class BeanUtil { while (begIdx < pProperty.length() && begIdx >= 0) { - endIdx = pProperty.indexOf(".", endIdx + 1); + endIdx = pProperty.indexOf('.', endIdx + 1); if (endIdx > 0) { subProp = pProperty.substring(begIdx, endIdx); begIdx = endIdx + 1; @@ -106,7 +106,7 @@ public final class BeanUtil { Class[] paramClass = new Class[0]; int begBracket; - if ((begBracket = subProp.indexOf("[")) > 0) { + if ((begBracket = subProp.indexOf('[')) > 0) { // An error if there is no matching bracket if (!subProp.endsWith("]")) { return null; diff --git a/common/common-lang/src/main/java/com/twelvemonkeys/util/regex/WildcardStringParser.java b/common/common-lang/src/main/java/com/twelvemonkeys/util/regex/WildcardStringParser.java index 13128f32..c13bf51e 100755 --- a/common/common-lang/src/main/java/com/twelvemonkeys/util/regex/WildcardStringParser.java +++ b/common/common-lang/src/main/java/com/twelvemonkeys/util/regex/WildcardStringParser.java @@ -622,7 +622,7 @@ public class WildcardStringParser { buffer.append("\n"); buffer.append(" Format: : ()"); buffer.append("\n"); - buffer.append(" Number of strings parsed: " + totalNumberOfStringsParsed); + buffer.append(" Number of strings parsed: ").append(totalNumberOfStringsParsed); buffer.append("\n"); } return buffer.toString(); diff --git a/imageio/imageio-bmp/src/main/java/com/twelvemonkeys/imageio/plugins/bmp/BMPImageReader.java b/imageio/imageio-bmp/src/main/java/com/twelvemonkeys/imageio/plugins/bmp/BMPImageReader.java index c40070fd..215c82c8 100755 --- a/imageio/imageio-bmp/src/main/java/com/twelvemonkeys/imageio/plugins/bmp/BMPImageReader.java +++ b/imageio/imageio-bmp/src/main/java/com/twelvemonkeys/imageio/plugins/bmp/BMPImageReader.java @@ -54,6 +54,7 @@ import java.io.File; import java.io.IOException; import java.nio.ByteOrder; import java.util.Arrays; +import java.util.Collections; import java.util.Iterator; /** @@ -196,7 +197,7 @@ public final class BMPImageReader extends ImageReaderBase { checkBounds(pImageIndex); // TODO: Better implementation, include INT_RGB types for 3BYTE_BGR and 4BYTE_ABGR for INT_ARGB - return Arrays.asList(getRawImageType(pImageIndex)).iterator(); + return Collections.singletonList(getRawImageType(pImageIndex)).iterator(); } @Override diff --git a/imageio/imageio-pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/PICTImageReader.java b/imageio/imageio-pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/PICTImageReader.java index 564f119a..b1d2b681 100644 --- a/imageio/imageio-pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/PICTImageReader.java +++ b/imageio/imageio-pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/PICTImageReader.java @@ -78,6 +78,7 @@ import java.awt.image.*; import java.io.*; import java.util.ArrayList; import java.util.Arrays; +import java.util.Collections; import java.util.Iterator; import java.util.List; @@ -181,7 +182,7 @@ public final class PICTImageReader extends ImageReaderBase { readPICTHeader0(pStream); } } - + private void readPICTHeader0(final ImageInputStream pStream) throws IOException { // Get size picSize = pStream.readUnsignedShort(); @@ -325,7 +326,7 @@ public final class PICTImageReader extends ImageReaderBase { /** * Reads the PICT stream. - * The contents of the stream will be drawn onto the supplied graphics + * The contents of the stream will be drawn onto the supplied graphics * object. *

* If "DEBUG" is true, the elements read are listed on stdout. @@ -510,7 +511,7 @@ public final class PICTImageReader extends ImageReaderBase { ovSize.setLocation(x, y); /* ovSize.x *= 2;// Don't know why, but has to be multiplied by 2 - + ovSize.y *= 2; */ if (DEBUG) { @@ -2627,7 +2628,7 @@ public final class PICTImageReader extends ImageReaderBase { public Iterator getImageTypes(int pIndex) throws IOException { // TODO: The images look slightly different in Preview.. Could indicate the color space is wrong... - return Arrays.asList( + return Collections.singletonList( ImageTypeSpecifiers.createPacked( ColorSpace.getInstance(ColorSpace.CS_sRGB), 0xff0000, 0xff00, 0xff, 0xff000000, DataBuffer.TYPE_INT, false From d41f6a4465cc0c5a0c0dc0622b4477032615bc52 Mon Sep 17 00:00:00 2001 From: Koen De Groote Date: Sat, 2 Nov 2019 21:09:25 +0100 Subject: [PATCH 2/2] Update BMPImageReader.java Not using this change for now --- .../com/twelvemonkeys/imageio/plugins/bmp/BMPImageReader.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/imageio/imageio-bmp/src/main/java/com/twelvemonkeys/imageio/plugins/bmp/BMPImageReader.java b/imageio/imageio-bmp/src/main/java/com/twelvemonkeys/imageio/plugins/bmp/BMPImageReader.java index 215c82c8..c40070fd 100755 --- a/imageio/imageio-bmp/src/main/java/com/twelvemonkeys/imageio/plugins/bmp/BMPImageReader.java +++ b/imageio/imageio-bmp/src/main/java/com/twelvemonkeys/imageio/plugins/bmp/BMPImageReader.java @@ -54,7 +54,6 @@ import java.io.File; import java.io.IOException; import java.nio.ByteOrder; import java.util.Arrays; -import java.util.Collections; import java.util.Iterator; /** @@ -197,7 +196,7 @@ public final class BMPImageReader extends ImageReaderBase { checkBounds(pImageIndex); // TODO: Better implementation, include INT_RGB types for 3BYTE_BGR and 4BYTE_ABGR for INT_ARGB - return Collections.singletonList(getRawImageType(pImageIndex)).iterator(); + return Arrays.asList(getRawImageType(pImageIndex)).iterator(); } @Override