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 2023/05/14 18:09:03 UTC
[commons-imaging] 03/03: Use method instead of property
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
commit 4a6d71d3577be4b1b1ccba509cc7e2887efca186
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sun May 14 14:08:48 2023 -0400
Use method instead of property
Use final
---
src/main/java/org/apache/commons/imaging/ImageParser.java | 2 +-
.../java/org/apache/commons/imaging/common/GenericImageMetadata.java | 2 +-
.../org/apache/commons/imaging/common/mylzw/MyLzwDecompressor.java | 4 ++--
.../org/apache/commons/imaging/formats/gif/GifImageMetadataItem.java | 2 +-
.../org/apache/commons/imaging/formats/jpeg/JpegImageMetadata.java | 2 +-
.../commons/imaging/formats/tiff/write/TiffOutputDirectory.java | 2 +-
.../apache/commons/imaging/formats/tiff/write/TiffOutputField.java | 2 +-
.../org/apache/commons/imaging/formats/tiff/write/TiffOutputSet.java | 2 +-
.../org/apache/commons/imaging/formats/icns/IcnsImageParserTest.java | 2 +-
.../org/apache/commons/imaging/formats/png/PngImageParserTest.java | 2 +-
10 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/main/java/org/apache/commons/imaging/ImageParser.java b/src/main/java/org/apache/commons/imaging/ImageParser.java
index 48028ed5..0b57ac33 100644
--- a/src/main/java/org/apache/commons/imaging/ImageParser.java
+++ b/src/main/java/org/apache/commons/imaging/ImageParser.java
@@ -126,7 +126,7 @@ public abstract class ImageParser<T extends ImagingParameters<T>> extends Binary
// defaults to big endian
}
- public ImageParser(ByteOrder byteOrder) {
+ public ImageParser(final ByteOrder byteOrder) {
super(byteOrder);
}
diff --git a/src/main/java/org/apache/commons/imaging/common/GenericImageMetadata.java b/src/main/java/org/apache/commons/imaging/common/GenericImageMetadata.java
index 11d9def8..ae89d9c9 100644
--- a/src/main/java/org/apache/commons/imaging/common/GenericImageMetadata.java
+++ b/src/main/java/org/apache/commons/imaging/common/GenericImageMetadata.java
@@ -51,7 +51,7 @@ public class GenericImageMetadata implements ImageMetadata {
return result;
}
}
- private static final String NEWLINE = System.getProperty("line.separator");
+ private static final String NEWLINE = System.lineSeparator();
private final List<ImageMetadataItem> items = new ArrayList<>();
diff --git a/src/main/java/org/apache/commons/imaging/common/mylzw/MyLzwDecompressor.java b/src/main/java/org/apache/commons/imaging/common/mylzw/MyLzwDecompressor.java
index 23986db6..d3d0c0e8 100644
--- a/src/main/java/org/apache/commons/imaging/common/mylzw/MyLzwDecompressor.java
+++ b/src/main/java/org/apache/commons/imaging/common/mylzw/MyLzwDecompressor.java
@@ -47,12 +47,12 @@ public final class MyLzwDecompressor {
private int written;
private final boolean tiffLZWMode;
- public MyLzwDecompressor(final int initialCodeSize, final ByteOrder byteOrder, boolean tiffLZWMode) throws ImageReadException {
+ public MyLzwDecompressor(final int initialCodeSize, final ByteOrder byteOrder, final boolean tiffLZWMode) throws ImageReadException {
this(initialCodeSize, byteOrder, tiffLZWMode, null);
}
public MyLzwDecompressor(final int initialCodeSize, final ByteOrder byteOrder,
- boolean tiffLZWMode, final Listener listener) throws ImageReadException {
+ final boolean tiffLZWMode, final Listener listener) throws ImageReadException {
this.listener = listener;
this.byteOrder = byteOrder;
this.tiffLZWMode = tiffLZWMode;
diff --git a/src/main/java/org/apache/commons/imaging/formats/gif/GifImageMetadataItem.java b/src/main/java/org/apache/commons/imaging/formats/gif/GifImageMetadataItem.java
index d5d1e937..d6736e32 100644
--- a/src/main/java/org/apache/commons/imaging/formats/gif/GifImageMetadataItem.java
+++ b/src/main/java/org/apache/commons/imaging/formats/gif/GifImageMetadataItem.java
@@ -19,7 +19,7 @@ package org.apache.commons.imaging.formats.gif;
import org.apache.commons.imaging.common.ImageMetadata;
public class GifImageMetadataItem implements ImageMetadata.ImageMetadataItem {
- private static final String NEWLINE = System.getProperty("line.separator");
+ private static final String NEWLINE = System.lineSeparator();
private final int delay;
private final int leftPosition;
private final int topPosition;
diff --git a/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegImageMetadata.java b/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegImageMetadata.java
index ec1002ee..5431d32d 100644
--- a/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegImageMetadata.java
+++ b/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegImageMetadata.java
@@ -37,7 +37,7 @@ import org.apache.commons.imaging.formats.tiff.taginfos.TagInfo;
import org.apache.commons.imaging.internal.Debug;
public class JpegImageMetadata implements ImageMetadata {
- private static final String NEWLINE = System.getProperty("line.separator");
+ private static final String NEWLINE = System.lineSeparator();
private final JpegPhotoshopMetadata photoshop;
private final TiffImageMetadata exif;
diff --git a/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputDirectory.java b/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputDirectory.java
index 1751c12d..6b22fc77 100644
--- a/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputDirectory.java
+++ b/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputDirectory.java
@@ -73,7 +73,7 @@ import org.apache.commons.imaging.formats.tiff.taginfos.TagInfoShorts;
import org.apache.commons.imaging.formats.tiff.taginfos.TagInfoXpString;
public final class TiffOutputDirectory extends TiffOutputItem implements Iterable<TiffOutputField> {
- public static final Comparator<TiffOutputDirectory> COMPARATOR = Comparator.comparingInt(o -> o.getType());
+ public static final Comparator<TiffOutputDirectory> COMPARATOR = Comparator.comparingInt(TiffOutputDirectory::getType);
private final int type;
private final List<TiffOutputField> fields = new ArrayList<>();
private final ByteOrder byteOrder;
diff --git a/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputField.java b/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputField.java
index a862775e..d9731131 100644
--- a/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputField.java
+++ b/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputField.java
@@ -28,7 +28,7 @@ import org.apache.commons.imaging.formats.tiff.fieldtypes.FieldType;
import org.apache.commons.imaging.formats.tiff.taginfos.TagInfo;
public class TiffOutputField {
- private static final String NEWLINE = System.getProperty("line.separator");
+ private static final String NEWLINE = System.lineSeparator();
protected static TiffOutputField createOffsetField(final TagInfo tagInfo,
final ByteOrder byteOrder) throws ImageWriteException {
return new TiffOutputField(tagInfo, FieldType.LONG, 1,
diff --git a/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputSet.java b/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputSet.java
index 3854dff8..d26e878c 100644
--- a/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputSet.java
+++ b/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputSet.java
@@ -32,7 +32,7 @@ import org.apache.commons.imaging.internal.Debug;
public final class TiffOutputSet implements Iterable<TiffOutputDirectory> {
- private static final String NEWLINE = System.getProperty("line.separator");
+ private static final String NEWLINE = System.lineSeparator();
public final ByteOrder byteOrder;
private final List<TiffOutputDirectory> directories = new ArrayList<>();
diff --git a/src/test/java/org/apache/commons/imaging/formats/icns/IcnsImageParserTest.java b/src/test/java/org/apache/commons/imaging/formats/icns/IcnsImageParserTest.java
index 8423642b..3f1b59f6 100644
--- a/src/test/java/org/apache/commons/imaging/formats/icns/IcnsImageParserTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/icns/IcnsImageParserTest.java
@@ -26,7 +26,7 @@ public class IcnsImageParserTest {
@Test
public void test_getImageSize() throws Exception {
- byte[] bytes = {
+ final byte[] bytes = {
// Header
'i', 'c', 'n', 's',
// (Too large) file size
diff --git a/src/test/java/org/apache/commons/imaging/formats/png/PngImageParserTest.java b/src/test/java/org/apache/commons/imaging/formats/png/PngImageParserTest.java
index 6e8500c9..3f6a3b9a 100644
--- a/src/test/java/org/apache/commons/imaging/formats/png/PngImageParserTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/png/PngImageParserTest.java
@@ -26,7 +26,7 @@ public class PngImageParserTest {
@Test
public void test_getImageSize() throws Exception {
- byte[] bytes = {
+ final byte[] bytes = {
// Header
(byte) 0x89, 'P', 'N', 'G', '\r', '\n', 0x1A, '\n',
// (Too large) Length