You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by ti...@apache.org on 2023/09/16 12:52:36 UTC
svn commit: r1912349 - in /pdfbox/trunk: debugger/src/main/java/org/apache/pdfbox/debugger/ui/ fontbox/src/main/java/org/apache/fontbox/cff/ fontbox/src/main/java/org/apache/fontbox/ttf/ pdfbox/src/main/java/org/apache/pdfbox/cos/ pdfbox/src/main/java/...
Author: tilman
Date: Sat Sep 16 12:52:35 2023
New Revision: 1912349
URL: http://svn.apache.org/viewvc?rev=1912349&view=rev
Log:
PDFBOX-5673: refactor collection operations, as suggested by Axel Howind
Modified:
pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/ui/RecentFiles.java
pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cff/CFFParser.java
pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cff/Type2CharString.java
pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/GlyphSubstitutionTable.java
pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/OpenTypeScript.java
pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/TrueTypeFont.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSInputStream.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/multipdf/PDFMergerUtility.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDDeviceN.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=1912349&r1=1912348&r2=1912349&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 Sat Sep 16 12:52:35 2023
@@ -97,10 +97,7 @@ public class RecentFiles
*/
public void removeFile(String path)
{
- if (filePaths.contains(path))
- {
- filePaths.remove(path);
- }
+ filePaths.remove(path);
}
/**
Modified: pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cff/CFFParser.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cff/CFFParser.java?rev=1912349&r1=1912348&r2=1912349&view=diff
==============================================================================
--- pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cff/CFFParser.java (original)
+++ pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cff/CFFParser.java Sat Sep 16 12:52:35 2023
@@ -515,12 +515,12 @@ public class CFFParser
font.addValueToTopDict("UnderlineThickness", topDict.getNumber("UnderlineThickness", 50));
font.addValueToTopDict("PaintType", topDict.getNumber("PaintType", 0));
font.addValueToTopDict("CharstringType", topDict.getNumber("CharstringType", 2));
- font.addValueToTopDict("FontMatrix", topDict.getArray("FontMatrix", Arrays.<Number>asList(
- 0.001, (double) 0, (double) 0, 0.001,
- (double) 0, (double) 0)));
+ font.addValueToTopDict("FontMatrix", topDict.getArray("FontMatrix", List.of(
+ 0.001, 0.0, 0.0, 0.001,
+ 0.0, 0.0)));
font.addValueToTopDict("UniqueID", topDict.getNumber("UniqueID", null));
font.addValueToTopDict("FontBBox", topDict.getArray("FontBBox",
- Arrays.<Number> asList(0, 0, 0, 0)));
+ List.of(0, 0, 0, 0)));
font.addValueToTopDict("StrokeWidth", topDict.getNumber("StrokeWidth", 0));
font.addValueToTopDict("XUID", topDict.getArray("XUID", null));
@@ -616,7 +616,7 @@ public class CFFParser
{
// default
font.addValueToTopDict("FontMatrix", topDict.getArray("FontMatrix",
- Arrays.<Number> asList(0.001, 0.0, 0.0, 0.001, 0.0, 0.0)));
+ List.of(0.001, 0.0, 0.0, 0.001, 0.0, 0.0)));
}
}
else if (privMatrix != null)
Modified: pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cff/Type2CharString.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cff/Type2CharString.java?rev=1912349&r1=1912348&r2=1912349&view=diff
==============================================================================
--- pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cff/Type2CharString.java (original)
+++ pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cff/Type2CharString.java Sat Sep 16 12:52:35 2023
@@ -269,7 +269,7 @@ public class Type2CharString extends Typ
: null;
if (command != null && command.getType1KeyWord() != Type1KeyWord.CLOSEPATH)
{
- addCommand(Collections.<Number> emptyList(), CharStringCommand.COMMAND_CLOSEPATH);
+ addCommand(Collections.emptyList(), CharStringCommand.COMMAND_CLOSEPATH);
}
}
Modified: pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/GlyphSubstitutionTable.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/GlyphSubstitutionTable.java?rev=1912349&r1=1912348&r2=1912349&view=diff
==============================================================================
--- pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/GlyphSubstitutionTable.java (original)
+++ pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/GlyphSubstitutionTable.java Sat Sep 16 12:52:35 2023
@@ -21,8 +21,8 @@ import java.io.IOException;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
+import java.util.Comparator;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
@@ -654,8 +654,7 @@ public class GlyphSubstitutionTable exte
if (enabledFeatures != null && result.size() > 1)
{
- result.sort((o1, o2) -> Integer.compare(enabledFeatures.indexOf(o1.getFeatureTag()),
- enabledFeatures.indexOf(o2.getFeatureTag())));
+ result.sort(Comparator.comparingInt(o -> enabledFeatures.indexOf(o.getFeatureTag())));
}
return result;
@@ -669,14 +668,7 @@ public class GlyphSubstitutionTable exte
private void removeFeature(List<FeatureRecord> featureRecords, String featureTag)
{
- Iterator<FeatureRecord> iter = featureRecords.iterator();
- while (iter.hasNext())
- {
- if (iter.next().getFeatureTag().equals(featureTag))
- {
- iter.remove();
- }
- }
+ featureRecords.removeIf(featureRecord -> featureRecord.getFeatureTag().equals(featureTag));
}
private int applyFeature(FeatureRecord featureRecord, int gid)
Modified: pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/OpenTypeScript.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/OpenTypeScript.java?rev=1912349&r1=1912348&r2=1912349&view=diff
==============================================================================
--- pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/OpenTypeScript.java (original)
+++ pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/OpenTypeScript.java Sat Sep 16 12:52:35 2023
@@ -22,6 +22,7 @@ import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.LineNumberReader;
import java.util.Arrays;
+import java.util.Comparator;
import java.util.HashMap;
import java.util.Map;
import java.util.Map.Entry;
@@ -237,7 +238,7 @@ public final class OpenTypeScript
private static void parseScriptsFile(InputStream inputStream) throws IOException
{
- Map<int[], String> unicodeRanges = new TreeMap<>((o1, o2) -> Integer.compare(o1[0], o2[0]));
+ Map<int[], String> unicodeRanges = new TreeMap<>(Comparator.comparingInt(o -> o[0]));
try (LineNumberReader rd = new LineNumberReader(new InputStreamReader(inputStream)))
{
int[] lastRange = { Integer.MIN_VALUE, Integer.MIN_VALUE };
Modified: pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/TrueTypeFont.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/TrueTypeFont.java?rev=1912349&r1=1912348&r2=1912349&view=diff
==============================================================================
--- pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/TrueTypeFont.java (original)
+++ pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/TrueTypeFont.java Sat Sep 16 12:52:35 2023
@@ -735,7 +735,7 @@ public class TrueTypeFont implements Fon
public List<Number> getFontMatrix() throws IOException
{
float scale = 1000f / getUnitsPerEm();
- return Arrays.<Number>asList(0.001f * scale, 0, 0, 0.001f * scale, 0, 0);
+ return List.of(0.001f * scale, 0, 0, 0.001f * scale, 0, 0);
}
/**
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSInputStream.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSInputStream.java?rev=1912349&r1=1912348&r2=1912349&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSInputStream.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSInputStream.java Sat Sep 16 12:52:35 2023
@@ -67,7 +67,7 @@ public final class COSInputStream extend
{
if (filters.isEmpty())
{
- return new COSInputStream(in, Collections.<DecodeResult>emptyList());
+ return new COSInputStream(in, Collections.emptyList());
}
List<DecodeResult> results = new ArrayList<>(filters.size());
RandomAccessRead decoded = Filter.decode(in, filters, parameters, options, results);
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/multipdf/PDFMergerUtility.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/multipdf/PDFMergerUtility.java?rev=1912349&r1=1912348&r2=1912349&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/multipdf/PDFMergerUtility.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/multipdf/PDFMergerUtility.java Sat Sep 16 12:52:35 2023
@@ -525,7 +525,7 @@ public class PDFMergerUtility
PDDocumentInformation destInfo = destination.getDocumentInformation();
PDDocumentInformation srcInfo = source.getDocumentInformation();
- mergeInto(srcInfo.getCOSObject(), destInfo.getCOSObject(), Collections.<COSName>emptySet());
+ mergeInto(srcInfo.getCOSObject(), destInfo.getCOSObject(), Collections.emptySet());
// use the highest version number for the resulting pdf
float destVersion = destination.getVersion();
@@ -910,7 +910,7 @@ public class PDFMergerUtility
destCatalog.setViewerPreferences(destViewerPreferences);
}
mergeInto(srcViewerPreferences.getCOSObject(), destViewerPreferences.getCOSObject(),
- Collections.<COSName>emptySet());
+ Collections.emptySet());
// check the booleans - set to true if one is set and true
if (srcViewerPreferences.hideToolbar() || destViewerPreferences.hideToolbar())
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDDeviceN.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDDeviceN.java?rev=1912349&r1=1912348&r2=1912349&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDDeviceN.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDDeviceN.java Sat Sep 16 12:52:35 2023
@@ -24,6 +24,7 @@ import java.awt.image.DataBuffer;
import java.awt.image.Raster;
import java.awt.image.WritableRaster;
import java.io.IOException;
+import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -100,10 +101,7 @@ public class PDDeviceN extends PDSpecial
// set initial color space
int n = getNumberOfComponents();
float[] initial = new float[n];
- for (int i = 0; i < n; i++)
- {
- initial[i] = 1;
- }
+ Arrays.fill(initial, 1);
initialColor = new PDColor(initial, this);
}