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 2019/09/26 19:10:23 UTC
svn commit: r1867604 - in
/pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox:
afm/FontMetrics.java cmap/CMap.java ttf/TTFSubsetter.java
util/autodetect/FontFileFinder.java
Author: tilman
Date: Thu Sep 26 19:10:23 2019
New Revision: 1867604
URL: http://svn.apache.org/viewvc?rev=1867604&view=rev
Log:
PDFBOX-4071: use jdk8 lambda expressions and streams
Modified:
pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/afm/FontMetrics.java
pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cmap/CMap.java
pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/TTFSubsetter.java
pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/util/autodetect/FontFileFinder.java
Modified: pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/afm/FontMetrics.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/afm/FontMetrics.java?rev=1867604&r1=1867603&r2=1867604&view=diff
==============================================================================
--- pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/afm/FontMetrics.java (original)
+++ pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/afm/FontMetrics.java Thu Sep 26 19:10:23 2019
@@ -699,17 +699,16 @@ public class FontMetrics
return Collections.unmodifiableList(charMetrics);
}
- /** Setter for property charMetrics.
+ /**
+ * Setter for property charMetrics.
+ *
* @param charMetricsValue New value of property charMetrics.
*/
public void setCharMetrics(List<CharMetric> charMetricsValue)
{
charMetrics = charMetricsValue;
charMetricsMap = new HashMap<>(charMetrics.size());
- for (CharMetric metric : charMetricsValue)
- {
- charMetricsMap.put( metric.getName(), metric );
- }
+ charMetricsValue.forEach(metric -> charMetricsMap.put(metric.getName(), metric));
}
/**
Modified: pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cmap/CMap.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cmap/CMap.java?rev=1867604&r1=1867603&r2=1867604&view=diff
==============================================================================
--- pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cmap/CMap.java (original)
+++ pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cmap/CMap.java Thu Sep 26 19:10:23 2019
@@ -257,12 +257,9 @@ public class CMap
*
* @param cmap The cmap to load mappings from.
*/
- void useCmap( CMap cmap )
+ void useCmap(CMap cmap)
{
- for (CodespaceRange codespaceRange : cmap.codespaceRanges)
- {
- addCodespaceRange(codespaceRange);
- }
+ cmap.codespaceRanges.forEach(this::addCodespaceRange);
charToUnicode.putAll(cmap.charToUnicode);
codeToCid.putAll(cmap.codeToCid);
codeToCidRanges.addAll(cmap.codeToCidRanges);
Modified: pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/TTFSubsetter.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/TTFSubsetter.java?rev=1867604&r1=1867603&r2=1867604&view=diff
==============================================================================
--- pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/TTFSubsetter.java (original)
+++ pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/TTFSubsetter.java Thu Sep 26 19:10:23 2019
@@ -126,10 +126,7 @@ public final class TTFSubsetter
*/
public void addAll(Set<Integer> unicodeSet)
{
- for (int unicode : unicodeSet)
- {
- add(unicode);
- }
+ unicodeSet.forEach(unicode -> add(unicode));
}
/**
Modified: pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/util/autodetect/FontFileFinder.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/util/autodetect/FontFileFinder.java?rev=1867604&r1=1867603&r2=1867604&view=diff
==============================================================================
--- pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/util/autodetect/FontFileFinder.java (original)
+++ pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/util/autodetect/FontFileFinder.java Thu Sep 26 19:10:23 2019
@@ -76,10 +76,7 @@ public class FontFileFinder
}
List<File> fontDirs = fontDirFinder.find();
List<URI> results = new ArrayList<>();
- for (File dir : fontDirs)
- {
- walk(dir, results);
- }
+ fontDirs.forEach(dir -> walk(dir, results));
return results;
}