Introduce StandardFontFamilies class, remove TIMES constant from StandardFonts

DEVSIX-1789

Author: LodrKumquat

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

@@ -186,11 +186,4 @@ public class FontConstants {
      */
     @Deprecated
     public static final String ZAPFDINGBATS = "ZapfDingbats";
-
-    /**
-     * This is a possible value of a base 14 type 1 font
-     * @deprecated use {@link com.itextpdf.io.font.constants.StandardFonts#TIMES} instead.
-     */
-    @Deprecated
-    public static final String TIMES = "Times";
 }

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

@@ -45,6 +45,7 @@ This file is part of the iText (R) project.
 
 import com.itextpdf.io.IOException;
 import com.itextpdf.io.font.constants.FontStyles;
+import com.itextpdf.io.font.constants.StandardFontFamilies;
 import com.itextpdf.io.font.constants.StandardFonts;
 import com.itextpdf.io.util.FileUtil;
 import com.itextpdf.io.util.MessageFormatUtil;
@@ -115,7 +116,8 @@ FontProgram getFont(String fontName, int style, boolean cached) throws java.io.I
         if (fontName == null)
             return null;
         String lowerCaseFontName = fontName.toLowerCase();
-        List<String> family = fontFamilies.get(lowerCaseFontName);
+        List<String> family = !lowerCaseFontName.equalsIgnoreCase(StandardFonts.TIMES_ROMAN) ?
+                fontFamilies.get(lowerCaseFontName) : fontFamilies.get(StandardFontFamilies.TIMES.toLowerCase());
         if (family != null) {
             synchronized (family) {
                 // some bugs were fixed here by Daniel Marczisovszky
@@ -159,26 +161,25 @@ protected void registerStandardFontFamilies() {
         family.add(StandardFonts.COURIER_BOLD);
         family.add(StandardFonts.COURIER_OBLIQUE);
         family.add(StandardFonts.COURIER_BOLDOBLIQUE);
-        fontFamilies.put(StandardFonts.COURIER.toLowerCase(), family);
+        fontFamilies.put(StandardFontFamilies.COURIER.toLowerCase(), family);
         family = new ArrayList<>();
         family.add(StandardFonts.HELVETICA);
         family.add(StandardFonts.HELVETICA_BOLD);
         family.add(StandardFonts.HELVETICA_OBLIQUE);
         family.add(StandardFonts.HELVETICA_BOLDOBLIQUE);
-        fontFamilies.put(StandardFonts.HELVETICA.toLowerCase(), family);
+        fontFamilies.put(StandardFontFamilies.HELVETICA.toLowerCase(), family);
         family = new ArrayList<>();
         family.add(StandardFonts.SYMBOL);
-        fontFamilies.put(StandardFonts.SYMBOL.toLowerCase(), family);
+        fontFamilies.put(StandardFontFamilies.SYMBOL.toLowerCase(), family);
         family = new ArrayList<>();
         family.add(StandardFonts.TIMES_ROMAN);
         family.add(StandardFonts.TIMES_BOLD);
         family.add(StandardFonts.TIMES_ITALIC);
         family.add(StandardFonts.TIMES_BOLDITALIC);
-        fontFamilies.put(StandardFonts.TIMES.toLowerCase(), family);
-        fontFamilies.put(StandardFonts.TIMES_ROMAN.toLowerCase(), family);
+        fontFamilies.put(StandardFontFamilies.TIMES.toLowerCase(), family);
         family = new ArrayList<>();
         family.add(StandardFonts.ZAPFDINGBATS);
-        fontFamilies.put(StandardFonts.ZAPFDINGBATS.toLowerCase(), family);
+        fontFamilies.put(StandardFontFamilies.ZAPFDINGBATS.toLowerCase(), family);
     }
 
     protected FontProgram getFontProgram(String fontName, boolean cached) throws java.io.IOException {

io/src/main/java/com/itextpdf/io/font/constants/StandardFontFamilies.java

@@ -0,0 +1,39 @@
+package com.itextpdf.io.font.constants;
+
+/**
+ * Class containing families for {@link StandardFonts}.
+ * This class was made for {@link com.itextpdf.io.font.FontRegisterProvider}.
+ */
+public final class StandardFontFamilies {
+
+    private StandardFontFamilies() {
+    }
+
+    /**
+     * Font family for {@link StandardFonts#COURIER}, {@link StandardFonts#COURIER_BOLD},
+     * {@link StandardFonts#COURIER_OBLIQUE} and {@link StandardFonts#COURIER_BOLDOBLIQUE}.
+     */
+    public static final String COURIER = "Courier";
+
+    /**
+     * Font family for {@link StandardFonts#HELVETICA}, {@link StandardFonts#HELVETICA_BOLD},
+     * {@link StandardFonts#HELVETICA_OBLIQUE} and {@link StandardFonts#HELVETICA_BOLDOBLIQUE}.
+     */
+    public static final String HELVETICA = "Helvetica";
+
+    /**
+     * Font family for {@link StandardFonts#SYMBOL}.
+     */
+    public static final String SYMBOL = "Symbol";
+
+    /**
+     * Font family for {@link StandardFonts#ZAPFDINGBATS}.
+     */
+    public static final String ZAPFDINGBATS = "ZapfDingbats";
+
+    /**
+     * Font family for {@link StandardFonts#TIMES_ROMAN}, {@link StandardFonts#TIMES_BOLD},
+     * {@link StandardFonts#TIMES_ITALIC} and {@link StandardFonts#TIMES_BOLDITALIC}.
+     */
+    public static final String TIMES = "Times";
+}

io/src/main/java/com/itextpdf/io/font/constants/StandardFonts.java

@@ -143,7 +143,4 @@ public static boolean isStandardFont(String fontName) {
      * This is a possible value of a base 14 type 1 font
      */
     public static final String ZAPFDINGBATS = "ZapfDingbats";
-
-    public static final String TIMES = "Times";
-
 }