Author: tilman
Date: Sun Sep 3 02:54:16 2023
New Revision: 1912063
URL: http://svn.apache.org/viewvc?rev=1912063&view=rev
Log:
PDFBOX-5669: use JDK 11 built-in methods, as suggested by Axel Howind
Modified:
pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/ui/RecentFiles.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfwriter/COSWriter.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/common/PDNameTreeNode.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/CloudyBorder.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDAbstractAppearanceHandler.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/text/PDFTextStripper.java
Modified:
pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/ui/RecentFiles.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/ui/RecentFiles.java?rev=1912063&r1=1912062&r2=1912063&view=diff
==============================================================================
---
pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/ui/RecentFiles.java
(original)
+++
pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/ui/RecentFiles.java
Sun Sep 3 02:54:16 2023
@@ -150,7 +150,7 @@ public class RecentFiles
beginIndex = endIndex;
remainingLength = fullPath.length() - endIndex;
}
- return pieces.toArray(new String[pieces.size()]);
+ return pieces.toArray(String[]::new);
}
private void writeHistoryToPref(Queue<String> filePaths)
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfwriter/COSWriter.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfwriter/COSWriter.java?rev=1912063&r1=1912062&r2=1912063&view=diff
==============================================================================
---
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfwriter/COSWriter.java
(original)
+++
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfwriter/COSWriter.java
Sun Sep 3 02:54:16 2023
@@ -1059,7 +1059,7 @@ public class COSWriter implements ICOSVi
list.add(last - count + 1);
list.add(count);
}
- return list.toArray(new Long[list.size()]);
+ return list.toArray(Long[]::new);
}
/**
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/common/PDNameTreeNode.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/common/PDNameTreeNode.java?rev=1912063&r1=1912062&r2=1912063&view=diff
==============================================================================
---
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/common/PDNameTreeNode.java
(original)
+++
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/common/PDNameTreeNode.java
Sun Sep 3 02:54:16 2023
@@ -183,7 +183,7 @@ public abstract class PDNameTreeNode<T e
if (names != null && names.size() > 0)
{
Set<String> strings = names.keySet();
- String[] keys = strings.toArray(new
String[strings.size()]);
+ String[] keys = strings.toArray(String[]::new);
String lowerLimit = keys[0];
setLowerLimit(lowerLimit);
String upperLimit = keys[keys.length-1];
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/CloudyBorder.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/CloudyBorder.java?rev=1912063&r1=1912062&r2=1912063&view=diff
==============================================================================
---
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/CloudyBorder.java
(original)
+++
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/CloudyBorder.java
Sun Sep 3 02:54:16 2023
@@ -466,7 +466,7 @@ class CloudyBorder
getArcSegment(a + ANGLE_90_DEG, a + ANGLE_180_DEG - ANGLE_34_DEG,
0, 0, r, r, points, false);
- return points.toArray(new Point2D.Double[points.size()]);
+ return points.toArray(Point2D.Double[]::new);
}
/**
@@ -734,7 +734,7 @@ class CloudyBorder
{
points.add(points.get(points.size() - 1));
}
- return points.toArray(new Point2D.Double[points.size()]);
+ return points.toArray(Point2D.Double[]::new);
}
/**
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDAbstractAppearanceHandler.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDAbstractAppearanceHandler.java?rev=1912063&r1=1912062&r2=1912063&view=diff
==============================================================================
---
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDAbstractAppearanceHandler.java
(original)
+++
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDAbstractAppearanceHandler.java
Sun Sep 3 02:54:16 2023
@@ -435,36 +435,36 @@ public abstract class PDAbstractAppearan
private static Set<String> createShortStyles()
{
- Set<String> shortStyles = new HashSet<>();
- shortStyles.add(PDAnnotationLine.LE_OPEN_ARROW);
- shortStyles.add(PDAnnotationLine.LE_CLOSED_ARROW);
- shortStyles.add(PDAnnotationLine.LE_SQUARE);
- shortStyles.add(PDAnnotationLine.LE_CIRCLE);
- shortStyles.add(PDAnnotationLine.LE_DIAMOND);
- return Collections.unmodifiableSet(shortStyles);
+ return Set.of(
+ PDAnnotationLine.LE_OPEN_ARROW,
+ PDAnnotationLine.LE_CLOSED_ARROW,
+ PDAnnotationLine.LE_SQUARE,
+ PDAnnotationLine.LE_CIRCLE,
+ PDAnnotationLine.LE_DIAMOND
+ );
}
private static Set<String> createInteriorColorStyles()
{
- Set<String> interiorColorStyles = new HashSet<>();
- interiorColorStyles.add(PDAnnotationLine.LE_CLOSED_ARROW);
- interiorColorStyles.add(PDAnnotationLine.LE_CIRCLE);
- interiorColorStyles.add(PDAnnotationLine.LE_DIAMOND);
- interiorColorStyles.add(PDAnnotationLine.LE_R_CLOSED_ARROW);
- interiorColorStyles.add(PDAnnotationLine.LE_SQUARE);
- return Collections.unmodifiableSet(interiorColorStyles);
+ return Set.of(
+ PDAnnotationLine.LE_CLOSED_ARROW,
+ PDAnnotationLine.LE_CIRCLE,
+ PDAnnotationLine.LE_DIAMOND,
+ PDAnnotationLine.LE_R_CLOSED_ARROW,
+ PDAnnotationLine.LE_SQUARE
+ );
}
private static Set<String> createAngledStyles()
{
- Set<String> angledStyles = new HashSet<>();
- angledStyles.add(PDAnnotationLine.LE_CLOSED_ARROW);
- angledStyles.add(PDAnnotationLine.LE_OPEN_ARROW);
- angledStyles.add(PDAnnotationLine.LE_R_CLOSED_ARROW);
- angledStyles.add(PDAnnotationLine.LE_R_OPEN_ARROW);
- angledStyles.add(PDAnnotationLine.LE_BUTT);
- angledStyles.add(PDAnnotationLine.LE_SLASH);
- return Collections.unmodifiableSet(angledStyles);
+ return Set.of(
+ PDAnnotationLine.LE_CLOSED_ARROW,
+ PDAnnotationLine.LE_OPEN_ARROW,
+ PDAnnotationLine.LE_R_CLOSED_ARROW,
+ PDAnnotationLine.LE_R_OPEN_ARROW,
+ PDAnnotationLine.LE_BUTT,
+ PDAnnotationLine.LE_SLASH
+ );
}
/**
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/text/PDFTextStripper.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/text/PDFTextStripper.java?rev=1912063&r1=1912062&r2=1912063&view=diff
==============================================================================
---
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/text/PDFTextStripper.java
(original)
+++
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/text/PDFTextStripper.java
Sun Sep 3 02:54:16 2023
@@ -502,7 +502,7 @@ public class PDFTextStripper extends Leg
// a custom mergesort implementation (which is slower,
unfortunately).
try
{
- Collections.sort(textList, comparator);
+ textList.sort(comparator);
}
catch (IllegalArgumentException e)
{
