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 2020/04/06 18:20:47 UTC
svn commit: r1876193 - in /pdfbox/trunk:
fontbox/src/main/java/org/apache/fontbox/cff/
fontbox/src/main/java/org/apache/fontbox/encoding/
fontbox/src/main/java/org/apache/fontbox/ttf/
pdfbox/src/main/java/org/apache/pdfbox/pdmodel/documentinterchange/l...
Author: tilman
Date: Mon Apr 6 18:20:47 2020
New Revision: 1876193
URL: http://svn.apache.org/viewvc?rev=1876193&view=rev
Log:
PDFBOX-4071: use functional syntax
Modified:
pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cff/CFFParser.java
pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/encoding/BuiltInEncoding.java
pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/CmapSubtable.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/documentinterchange/logicalstructure/PDStructureTreeRoot.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/encoding/BuiltInEncoding.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/encoding/Type1Encoding.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/digitalsignature/PDSeedValueCertificate.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/text/PDFTextStripperByArea.java
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=1876193&r1=1876192&r2=1876193&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 Mon Apr 6 18:20:47 2020
@@ -757,10 +757,7 @@ public class CFFParser
// populate private dict
Map<String, Object> privDict = readPrivateDict(privateDict);
- for (Map.Entry<String, Object> entry : privDict.entrySet())
- {
- font.addToPrivateDict(entry.getKey(), entry.getValue());
- }
+ privDict.forEach((key, value) -> font.addToPrivateDict(key, value));
// local subrs
int localSubrOffset = (Integer) privateDict.getNumber("Subrs", 0);
Modified: pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/encoding/BuiltInEncoding.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/encoding/BuiltInEncoding.java?rev=1876193&r1=1876192&r2=1876193&view=diff
==============================================================================
--- pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/encoding/BuiltInEncoding.java (original)
+++ pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/encoding/BuiltInEncoding.java Mon Apr 6 18:20:47 2020
@@ -32,9 +32,6 @@ public class BuiltInEncoding extends Enc
*/
public BuiltInEncoding(Map<Integer, String> codeToName)
{
- for (Map.Entry<Integer, String> entry : codeToName.entrySet())
- {
- addCharacterEncoding(entry.getKey(), entry.getValue());
- }
+ codeToName.forEach((key, value) -> addCharacterEncoding(key, value));
}
}
\ No newline at end of file
Modified: pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/CmapSubtable.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/CmapSubtable.java?rev=1876193&r1=1876192&r2=1876193&view=diff
==============================================================================
--- pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/CmapSubtable.java (original)
+++ pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/CmapSubtable.java Mon Apr 6 18:20:47 2020
@@ -455,7 +455,7 @@ public class CmapSubtable implements Cma
private void buildGlyphIdToCharacterCodeLookup(int maxGlyphId)
{
glyphIdToCharacterCode = newGlyphIdToCharacterCode(maxGlyphId + 1);
- for (Entry<Integer, Integer> entry : characterCodeToGlyphId.entrySet())
+ characterCodeToGlyphId.entrySet().forEach(entry ->
{
if (glyphIdToCharacterCode[entry.getValue()] == -1)
{
@@ -476,7 +476,7 @@ public class CmapSubtable implements Cma
}
mappedValues.add(entry.getKey());
}
- }
+ });
}
/**
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/documentinterchange/logicalstructure/PDStructureTreeRoot.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/documentinterchange/logicalstructure/PDStructureTreeRoot.java?rev=1876193&r1=1876192&r2=1876193&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/documentinterchange/logicalstructure/PDStructureTreeRoot.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/documentinterchange/logicalstructure/PDStructureTreeRoot.java Mon Apr 6 18:20:47 2020
@@ -186,10 +186,7 @@ public class PDStructureTreeRoot extends
public void setRoleMap(Map<String, String> roleMap)
{
COSDictionary rmDic = new COSDictionary();
- for (Map.Entry<String, String> entry : roleMap.entrySet())
- {
- rmDic.setName(entry.getKey(), entry.getValue());
- }
+ roleMap.forEach((key, value) -> rmDic.setName(key, value));
this.getCOSObject().setItem(COSName.ROLE_MAP, rmDic);
}
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/encoding/BuiltInEncoding.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/encoding/BuiltInEncoding.java?rev=1876193&r1=1876192&r2=1876193&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/encoding/BuiltInEncoding.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/encoding/BuiltInEncoding.java Mon Apr 6 18:20:47 2020
@@ -34,10 +34,7 @@ public class BuiltInEncoding extends Enc
*/
public BuiltInEncoding(Map<Integer, String> codeToName)
{
- for (Map.Entry<Integer, String> entry : codeToName.entrySet())
- {
- add(entry.getKey(), entry.getValue());
- }
+ codeToName.forEach((key, value) -> add(key, value));
}
@Override
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/encoding/Type1Encoding.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/encoding/Type1Encoding.java?rev=1876193&r1=1876192&r2=1876193&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/encoding/Type1Encoding.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/encoding/Type1Encoding.java Mon Apr 6 18:20:47 2020
@@ -37,12 +37,7 @@ public class Type1Encoding extends Encod
// todo: could optimise this by looking for specific subclasses
Map<Integer,String> codeToName = encoding.getCodeToNameMap();
Type1Encoding enc = new Type1Encoding();
-
- for (Map.Entry<Integer, String> entry : codeToName.entrySet())
- {
- enc.add(entry.getKey(), entry.getValue());
- }
-
+ codeToName.forEach((key, value) -> enc.add(key, value));
return enc;
}
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/digitalsignature/PDSeedValueCertificate.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/digitalsignature/PDSeedValueCertificate.java?rev=1876193&r1=1876192&r2=1876193&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/digitalsignature/PDSeedValueCertificate.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/digitalsignature/PDSeedValueCertificate.java Mon Apr 6 18:20:47 2020
@@ -328,10 +328,7 @@ public class PDSeedValueCertificate impl
for (Map<String, String> subjectDNItem : subjectDN)
{
COSDictionary dict = new COSDictionary();
- for (Map.Entry<String, String> entry : subjectDNItem.entrySet())
- {
- dict.setItem(entry.getKey(), new COSString(entry.getValue()));
- }
+ subjectDNItem.forEach((key, value) -> dict.setItem(key, new COSString(value)));
subjectDNDict.add(dict);
}
this.dictionary.setItem(COSName.SUBJECT_DN,
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/text/PDFTextStripperByArea.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/text/PDFTextStripperByArea.java?rev=1876193&r1=1876192&r2=1876193&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/text/PDFTextStripperByArea.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/text/PDFTextStripperByArea.java Mon Apr 6 18:20:47 2020
@@ -138,15 +138,14 @@ public class PDFTextStripperByArea exten
@Override
protected void processTextPosition(TextPosition text)
{
- for (Map.Entry<String, Rectangle2D> regionAreaEntry : regionArea.entrySet())
+ regionArea.forEach((key, rect) ->
{
- Rectangle2D rect = regionAreaEntry.getValue();
if (rect.contains(text.getX(), text.getY()))
{
- charactersByArticle = regionCharacterList.get(regionAreaEntry.getKey());
+ charactersByArticle = regionCharacterList.get(key);
super.processTextPosition(text);
}
- }
+ });
}