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 fef7177 Inline Collections.sort(Comparator).
fef7177 is described below
commit fef7177e9d9c2bf65e84b088df830ef8771f522e
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Sun Feb 13 11:52:28 2022 -0500
Inline Collections.sort(Comparator).
---
.../imaging/formats/jpeg/JpegImageParser.java | 35 +++++++++++-----------
.../imaging/formats/jpeg/iptc/IptcParser.java | 3 +-
.../formats/tiff/write/TiffImageWriterBase.java | 2 +-
.../imaging/formats/jpeg/exif/ExifRewriteTest.java | 8 ++---
4 files changed, 23 insertions(+), 25 deletions(-)
diff --git
a/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegImageParser.java
b/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegImageParser.java
index b1f4d53..4cc967c 100644
--- a/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegImageParser.java
+++ b/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegImageParser.java
@@ -16,6 +16,22 @@
*/
package org.apache.commons.imaging.formats.jpeg;
+import static org.apache.commons.imaging.common.BinaryFunctions.remainingBytes;
+import static org.apache.commons.imaging.common.BinaryFunctions.startsWith;
+
+import java.awt.Dimension;
+import java.awt.image.BufferedImage;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.nio.ByteOrder;
+import java.nio.charset.StandardCharsets;
+import java.text.NumberFormat;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
import org.apache.commons.imaging.ImageFormat;
import org.apache.commons.imaging.ImageFormats;
import org.apache.commons.imaging.ImageInfo;
@@ -46,23 +62,6 @@ import
org.apache.commons.imaging.formats.tiff.TiffImagingParameters;
import org.apache.commons.imaging.formats.tiff.constants.TiffTagConstants;
import org.apache.commons.imaging.internal.Debug;
-import java.awt.Dimension;
-import java.awt.image.BufferedImage;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.nio.ByteOrder;
-import java.nio.charset.StandardCharsets;
-import java.text.NumberFormat;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import static org.apache.commons.imaging.common.BinaryFunctions.remainingBytes;
-import static org.apache.commons.imaging.common.BinaryFunctions.startsWith;
-
public class JpegImageParser extends ImageParser<JpegImagingParameters>
implements XmpEmbeddable {
private static final Logger LOGGER =
Logger.getLogger(JpegImageParser.class.getName());
@@ -231,7 +230,7 @@ public class JpegImageParser extends
ImageParser<JpegImagingParameters> implemen
+ segments.size() + ", Expected: " + markerCount + ".");
}
- Collections.sort(segments);
+ segments.sort(null);
final int offset = startWithZero ? 0 : 1;
diff --git
a/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcParser.java
b/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcParser.java
index 2bd435b..c68b09e 100644
--- a/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcParser.java
+++ b/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcParser.java
@@ -33,7 +33,6 @@ import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Arrays;
-import java.util.Collections;
import java.util.Comparator;
import java.util.List;
import java.util.Objects;
@@ -450,7 +449,7 @@ public class IptcParser extends BinaryFileParser {
// sort the list. Records must be in numerical order.
final Comparator<IptcRecord> comparator = (e1, e2) ->
e2.iptcType.getType() - e1.iptcType.getType();
- Collections.sort(elements, comparator);
+ elements.sort(comparator);
// TODO: make sure order right
// write the list.
diff --git
a/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffImageWriterBase.java
b/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffImageWriterBase.java
index fa401dd..f79b355 100644
---
a/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffImageWriterBase.java
+++
b/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffImageWriterBase.java
@@ -175,7 +175,7 @@ public abstract class TiffImageWriterBase {
// "normal" TIFF directories should have continous indices starting
with
// 0, ie. 0, 1, 2...
- Collections.sort(directoryIndices);
+ directoryIndices.sort(null);
TiffOutputDirectory previousDirectory = null;
for (int i = 0; i < directoryIndices.size(); i++) {
diff --git
a/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/ExifRewriteTest.java
b/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/ExifRewriteTest.java
index 7b94610..fde7eeb 100644
---
a/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/ExifRewriteTest.java
+++
b/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/ExifRewriteTest.java
@@ -291,9 +291,9 @@ public class ExifRewriteTest extends ExifBaseTest {
assertEquals(oldDirectories.size(), oldDirectoryMap.size());
final List<Integer> oldDirectoryTypes = new
ArrayList<>(oldDirectoryMap.keySet());
- Collections.sort(oldDirectoryTypes);
+ oldDirectoryTypes.sort(null);
final List<Integer> newDirectoryTypes = new
ArrayList<>(newDirectoryMap.keySet());
- Collections.sort(newDirectoryTypes);
+ newDirectoryTypes.sort(null);
assertEquals(oldDirectoryTypes, newDirectoryTypes);
for (final Integer dirType : oldDirectoryTypes) {
@@ -326,9 +326,9 @@ public class ExifRewriteTest extends ExifBaseTest {
assertEquals(oldFieldMap.keySet(), newFieldMap.keySet());
final List<Integer> oldFieldTags = new
ArrayList<>(oldFieldMap.keySet());
- Collections.sort(oldFieldTags);
+ oldFieldTags.sort(null);
final List<Integer> newFieldTags = new
ArrayList<>(newFieldMap.keySet());
- Collections.sort(newFieldTags);
+ newFieldTags.sort(null);
assertEquals(oldFieldTags, newFieldTags);
for (final Integer fieldTag : oldFieldTags) {
