Rename Type3FontProgram to Type3Font

DEVSIX-1468

Author: pavel-alay

kernel/src/main/java/com/itextpdf/kernel/font/PdfType3Font.java

@@ -67,9 +67,10 @@ This file is part of the iText (R) project.
  * To be able to be wrapped with this {@link PdfObjectWrapper} the {@link PdfObject}
  * must be indirect.
  */
-public class PdfType3Font extends PdfSimpleFont<Type3FontProgram> {
+public class PdfType3Font extends PdfSimpleFont<Type3Font> {
 
     private static final long serialVersionUID = 4940119184993066859L;
+    //todo use default font matrix constant
     private double[] fontMatrix = {0.001, 0, 0, 0.001, 0, 0};
 
     /**
@@ -82,7 +83,7 @@ public class PdfType3Font extends PdfSimpleFont<Type3FontProgram> {
         makeIndirect(document);
         subset = true;
         embedded = true;
-        fontProgram = new Type3FontProgram(colorized);
+        fontProgram = new Type3Font(colorized);
         fontEncoding = FontEncoding.createEmptyFontEncoding();
     }
 
@@ -96,7 +97,7 @@ public class PdfType3Font extends PdfSimpleFont<Type3FontProgram> {
         ensureObjectIsAddedToDocument(fontDictionary);
         subset = true;
         embedded = true;
-        fontProgram = new Type3FontProgram(false);
+        fontProgram = new Type3Font(false);
         CMapToUnicode toUni = FontUtil.processToUnicode(fontDictionary.get(PdfName.ToUnicode));
         fontEncoding = DocFontEncoding.createDocFontEncoding(fontDictionary.get(PdfName.Encoding), toUni);
         PdfDictionary charProcsDic = getPdfObject().getAsDictionary(PdfName.CharProcs);
@@ -121,13 +122,13 @@ public class PdfType3Font extends PdfSimpleFont<Type3FontProgram> {
             int unicode = AdobeGlyphList.nameToUnicode(glyphName.getValue());
             if (unicode != -1 && fontEncoding.canEncode(unicode)) {
                 int code = fontEncoding.convertToByte(unicode);
-                ((Type3FontProgram) getFontProgram()).addGlyph(code, unicode, widths[code], null, new Type3Glyph(charProcsDic.getAsStream(glyphName), getDocument()));
+                ((Type3Font) getFontProgram()).addGlyph(code, unicode, widths[code], null, new Type3Glyph(charProcsDic.getAsStream(glyphName), getDocument()));
             }
         }
     }
 
     public Type3Glyph getType3Glyph(int unicode) {
-        return ((Type3FontProgram) getFontProgram()).getType3Glyph(unicode);
+        return ((Type3Font) getFontProgram()).getType3Glyph(unicode);
     }
 
     @Override
@@ -170,11 +171,11 @@ public Type3Glyph addGlyph(char c, int wx, int llx, int lly, int urx, int ury) {
             return glyph;
         }
         int code = getFirstEmptyCode();
-        glyph = new Type3Glyph(getDocument(), wx, llx, lly, urx, ury, ((Type3FontProgram) getFontProgram()).isColorized());
-        ((Type3FontProgram) getFontProgram()).addGlyph(code, c, wx, new int[]{llx, lly, urx, ury}, glyph);
+        glyph = new Type3Glyph(getDocument(), wx, llx, lly, urx, ury, ((Type3Font) getFontProgram()).isColorized());
+        ((Type3Font) getFontProgram()).addGlyph(code, c, wx, new int[]{llx, lly, urx, ury}, glyph);
         fontEncoding.addSymbol((byte) code, c);
 
-        if (!((Type3FontProgram) getFontProgram()).isColorized()) {
+        if (!((Type3Font) getFontProgram()).isColorized()) {
             if (fontProgram.countOfGlyphs() == 0) {
                 fontProgram.getFontMetrics().setBbox(llx, lly, urx, ury);
             } else {
@@ -226,7 +227,7 @@ protected PdfDocument getDocument() {
     @Override
     public void flush() {
         ensureUnderlyingObjectHasIndirectReference();
-        if (((Type3FontProgram) getFontProgram()).getGlyphsCount() < 1) {
+        if (((Type3Font) getFontProgram()).getGlyphsCount() < 1) {
             throw new PdfException("no.glyphs.defined.fo r.type3.font");
         }
         PdfDictionary charProcs = new PdfDictionary();

kernel/src/main/java/com/itextpdf/kernel/font/Type3FontProgram.java renamed to kernel/src/main/java/com/itextpdf/kernel/font/Type3Font.java

@@ -50,15 +50,15 @@ This file is part of the iText (R) project.
 import java.util.HashMap;
 import java.util.Map;
 
-public class Type3FontProgram extends FontProgram {
+public class Type3Font extends FontProgram {
 
 	private static final long serialVersionUID = 1027076515537536993L;
 
 	private final Map<Integer, Type3Glyph> type3Glyphs = new HashMap<>();
     private boolean colorized = false;
 
 
-    public Type3FontProgram(boolean colorized) {
+    public Type3Font(boolean colorized) {
         this.colorized = colorized;
         getFontMetrics().setBbox(0, 0, 0, 0);
         fontNames = new FontNames();

kernel/src/test/java/com/itextpdf/kernel/pdf/PdfFontTest.java

@@ -64,7 +64,7 @@ This file is part of the iText (R) project.
 import com.itextpdf.kernel.font.PdfType0Font;
 import com.itextpdf.kernel.font.PdfType1Font;
 import com.itextpdf.kernel.font.PdfType3Font;
-import com.itextpdf.kernel.font.Type3FontProgram;
+import com.itextpdf.kernel.font.Type3Font;
 import com.itextpdf.kernel.font.Type3Glyph;
 import com.itextpdf.kernel.geom.PageSize;
 import com.itextpdf.kernel.pdf.canvas.PdfCanvas;
@@ -816,7 +816,7 @@ public void testUpdateType3FontBasedExistingFont() throws IOException, Interrupt
         page.flush();
         pdfDoc.close();
 
-        Assert.assertEquals(6, ((Type3FontProgram) pdfType3Font.getFontProgram()).getGlyphsCount());
+        Assert.assertEquals(6, ((Type3Font) pdfType3Font.getFontProgram()).getGlyphsCount());
 
         Assert.assertNull(new CompareTool().compareByContent(outputFileName, cmpOutputFileName, destinationFolder, "diff_"));
     }
@@ -859,7 +859,7 @@ public void testNewType3FontBasedExistingFont() throws IOException, InterruptedE
         page.flush();
         outputPdfDoc.close();
 
-        Assert.assertEquals(6, ((Type3FontProgram) pdfType3Font.getFontProgram()).getGlyphsCount());
+        Assert.assertEquals(6, ((Type3Font) pdfType3Font.getFontProgram()).getGlyphsCount());
 
         Assert.assertNull(new CompareTool().compareByContent(outputFileName, cmpOutputFileName, destinationFolder, "diff_"));
     }