Remove PdfFontFactory#createStandardFont() and #createType1Font()

Remove #createStandardFont() in favour to #createFont().
If user wants to create specific PdfType1Font, he should firstly create FontProgram with FontFactory.createType1Font()

Author: pavel-alay

barcodes/src/main/java/com/itextpdf/barcodes/Barcode128.java

@@ -187,7 +187,7 @@ public Barcode128(PdfDocument document) {
         super(document);
         try {
             x = 0.8f;
-            font = PdfFontFactory.createStandardFont(FontConstants.HELVETICA, PdfEncodings.WINANSI);
+            font = PdfFontFactory.createFont(FontConstants.HELVETICA, PdfEncodings.WINANSI);
             size = 8;
             baseline = size;
             barHeight = size * 3;

barcodes/src/main/java/com/itextpdf/barcodes/Barcode39.java

@@ -93,7 +93,7 @@ public Barcode39(PdfDocument document) {
         try {
             x = 0.8f;
             n = 2;
-            font = PdfFontFactory.createStandardFont(FontConstants.HELVETICA, PdfEncodings.WINANSI);
+            font = PdfFontFactory.createFont(FontConstants.HELVETICA, PdfEncodings.WINANSI);
             size = 8;
             baseline = size;
             barHeight = size * 3;

barcodes/src/main/java/com/itextpdf/barcodes/BarcodeCodabar.java

@@ -53,7 +53,7 @@ public BarcodeCodabar(PdfDocument document) {
         try {
             x = 0.8f;
             n = 2;
-            font = PdfFontFactory.createStandardFont(FontConstants.HELVETICA, PdfEncodings.WINANSI);
+            font = PdfFontFactory.createFont(FontConstants.HELVETICA, PdfEncodings.WINANSI);
             size = 8;
             baseline = size;
             barHeight = size * 3;

barcodes/src/main/java/com/itextpdf/barcodes/BarcodeEAN.java

@@ -170,7 +170,7 @@ public BarcodeEAN(PdfDocument document) {
         super(document);
         try {
             x = 0.8f;
-            font = PdfFontFactory.createStandardFont(FontConstants.HELVETICA, PdfEncodings.WINANSI);
+            font = PdfFontFactory.createFont(FontConstants.HELVETICA, PdfEncodings.WINANSI);
             size = 8;
             baseline = size;
             barHeight = size * 3;

barcodes/src/main/java/com/itextpdf/barcodes/BarcodeInter25.java

@@ -57,7 +57,7 @@ public BarcodeInter25(PdfDocument document) {
         try {
             x = 0.8f;
             n = 2;
-            font = PdfFontFactory.createStandardFont(FontConstants.HELVETICA, PdfEncodings.WINANSI);
+            font = PdfFontFactory.createFont(FontConstants.HELVETICA, PdfEncodings.WINANSI);
             size = 8;
             baseline = size;
             barHeight = size * 3;

forms/src/main/java/com/itextpdf/forms/fields/PdfFormField.java

@@ -1356,7 +1356,7 @@ public void setCheckType(int checkType) {
         this.checkType = checkType;
         text = typeChars[checkType - 1];
         try {
-            font = PdfFontFactory.createStandardFont(FontConstants.ZAPFDINGBATS);
+            font = PdfFontFactory.createFont(FontConstants.ZAPFDINGBATS);
         } catch (IOException e) {
             throw new PdfException(e.getLocalizedMessage());
         }

io/src/main/java/com/itextpdf/io/font/FontCache.java

@@ -116,14 +116,21 @@ public static FontProgram getFont(String fontName) {
         return fontCache.get(key);
     }
 
-    public static void saveFont(FontProgram font, String fontName) {
+    public static FontProgram saveFont(FontProgram font, String fontName) {
         // for most of the fonts we can retrieve encoding from FontProgram, but
         // for Cid there is no such possibility, since it is used in conjunction
         // with cmap to produce Type0 font, so I added fontName and encoding parameters
         // just for convenience.
         // TODO: probably it's better to declare saveFont(FontProgram) and saveFont(CidFont, encoding or cmap) in the future
+        FontProgram fontFound = getFont(fontName);
+        if (fontFound != null) {
+            //TODO add close method
+            //fontBuilt.close();
+            return fontFound;
+        }
         String key = getFontCacheKey(fontName);
         fontCache.put(key, font);
+        return font;
     }
 
     private static void loadRegistry() throws java.io.IOException {

io/src/main/java/com/itextpdf/io/font/FontFactory.java

@@ -32,30 +32,14 @@ public class Type1Font extends FontProgram {
     private byte[] fontStreamBytes;
     private int[] fontStreamLengths;
 
-    public static Type1Font createStandardFont(String name) throws java.io.IOException {
+    protected static Type1Font createStandardFont(String name) throws java.io.IOException {
         if (FontConstants.BUILTIN_FONTS_14.contains(name)) {
-            return createFont(name);
+            return new Type1Font(name, null, null, null);
         } else {
             throw new IOException("1.is.not.a.standard.type1.font").setMessageParams(name);
         }
     }
 
-    public static Type1Font createFont(String metricsPath) throws java.io.IOException {
-        return new Type1Font(metricsPath, null, null, null);
-    }
-
-    public static Type1Font createFont(String metricsPath, String binaryPath) throws java.io.IOException {
-        return new Type1Font(metricsPath, binaryPath, null, null);
-    }
-
-    public static Type1Font createFont(byte[] metricsData) throws java.io.IOException {
-        return new Type1Font(null, null, metricsData, null);
-    }
-
-    public static Type1Font createFont(byte[] metricsData, byte[] binaryData) throws java.io.IOException {
-        return new Type1Font(null, null, metricsData, binaryData);
-    }
-
     protected Type1Font(String metricsPath, String binaryPath, byte[] afm, byte[] pfb) throws java.io.IOException {
         checkFilePath(metricsPath);
         checkFilePath(binaryPath);

io/src/main/java/com/itextpdf/io/font/Type1Font.java

@@ -33,7 +33,7 @@ static Type1Font createFontProgram(PdfDictionary fontDictionary, FontEncoding fo
             try {
                 //if there are no font modifiers, cached font could be used,
                 //otherwise a new instance should be created.
-                type1StdFont = createStandardFont(baseFont);
+                type1StdFont = Type1Font.createStandardFont(baseFont);
             } catch (Exception e) {
                 type1StdFont = null;
             }