svn commit: r1882919 - in /pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/afm: AFMParser.java FontMetrics.java

[le...@apache.org]

Author: lehmi
Date: Tue Oct 27 16:36:30 2020
New Revision: 1882919

URL: http://svn.apache.org/viewvc?rev=1882919&view=rev
Log:
PDFBOX-5001: remove setter for CharMetrics, use addCharMetric instead

Modified:
    pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/afm/AFMParser.java
    pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/afm/FontMetrics.java

Modified: pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/afm/AFMParser.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/afm/AFMParser.java?rev=1882919&r1=1882918&r2=1882919&view=diff
==============================================================================
--- pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/afm/AFMParser.java (original)
+++ pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/afm/AFMParser.java Tue Oct 27 16:36:30 2020
@@ -19,8 +19,6 @@ package org.apache.fontbox.afm;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.List;
 import java.util.StringTokenizer;
 
 import org.apache.fontbox.util.BoundingBox;
@@ -688,11 +686,9 @@ public class AFMParser
     private boolean parseCharMetrics(FontMetrics fontMetrics) throws IOException
     {
         int countMetrics = readInt();
-        List<CharMetric> charMetrics = new ArrayList<>(countMetrics);
         for (int i = 0; i < countMetrics; i++)
         {
-            CharMetric charMetric = parseCharMetric();
-            charMetrics.add(charMetric);
+            fontMetrics.addCharMetric(parseCharMetric());
         }
         String endCharMetrics = readString();
         if (!endCharMetrics.equals(END_CHAR_METRICS))
@@ -700,7 +696,6 @@ public class AFMParser
             throw new IOException(
                     "Error: Expected '" + END_CHAR_METRICS + "' actual '" + endCharMetrics + "'");
         }
-        fontMetrics.setCharMetrics(charMetrics);
         return true;
     }
 

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=1882919&r1=1882918&r2=1882919&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 Tue Oct 27 16:36:30 2020
@@ -65,7 +65,7 @@ public class FontMetrics
     private float standardHorizontalWidth;
     private float standardVerticalWidth;
 
-    private List<CharMetric> charMetrics = new ArrayList<>();
+    private final List<CharMetric> charMetrics = new ArrayList<>();
     private Map<String,CharMetric> charMetricsMap = new HashMap<>();
     private final List<TrackKern> trackKern = new ArrayList<>();
     private final List<Composite> composites = new ArrayList<>();
@@ -78,6 +78,7 @@ public class FontMetrics
      */
     public FontMetrics()
     {
+        // Default constructor
     }
 
     /**
@@ -700,18 +701,6 @@ public class FontMetrics
     }
 
     /**
-     * Setter for property charMetrics.
-     *
-     * @param charMetricsValue New value of property charMetrics.
-     */
-    public void setCharMetrics(List<CharMetric> charMetricsValue)
-    {
-        charMetrics = charMetricsValue;
-        charMetricsMap = new HashMap<>(charMetrics.size());
-        charMetricsValue.forEach(metric -> charMetricsMap.put(metric.getName(), metric));
-    }
-
-    /**
      * This will add another character metric.
      *
      * @param metric The character metric to add.