Change visibility of Type3Font to internal.

DEVSIX-1468

Author: pavel-alay

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

@@ -107,8 +107,8 @@ public class PdfType3Font extends PdfSimpleFont<Type3Font> {
      */
     PdfType3Font(PdfDocument document, String fontName, String fontFamily, boolean colorized) {
         this(document, colorized);
-        ((Type3Font)fontProgram).setFontName(fontName);
-        ((Type3Font)fontProgram).setFontFamily(fontFamily);
+        ((Type3Font) fontProgram).setFontName(fontName);
+        ((Type3Font) fontProgram).setFontFamily(fontFamily);
     }
 
     /**
@@ -157,7 +157,7 @@ public class PdfType3Font extends PdfSimpleFont<Type3Font> {
      * @param fontName the PostScript name of the font, shall not be null or empty.
      */
     public void setFontName(String fontName) {
-        ((Type3Font)fontProgram).setFontName(fontName);
+        ((Type3Font) fontProgram).setFontName(fontName);
     }
 
     /**
@@ -166,7 +166,7 @@ public void setFontName(String fontName) {
      * @param fontFamily a preferred font family name.
      */
     public void setFontFamily(String fontFamily) {
-        ((Type3Font)fontProgram).setFontFamily(fontFamily);
+        ((Type3Font) fontProgram).setFontFamily(fontFamily);
     }
 
     /**
@@ -175,7 +175,7 @@ public void setFontFamily(String fontFamily) {
      * @param fontWeight integer form 100 to 900. See {@link FontWeights}.
      */
     public void setFontWeight(int fontWeight) {
-        ((Type3Font)fontProgram).setFontWeight(fontWeight);
+        ((Type3Font) fontProgram).setFontWeight(fontWeight);
     }
 
     /**
@@ -186,7 +186,7 @@ public void setFontWeight(int fontWeight) {
      * @param italicAngle in counter-clockwise degrees from the vertical
      */
     public void setItalicAngle(int italicAngle) {
-        ((Type3Font)fontProgram).setItalicAngle(italicAngle);
+        ((Type3Font) fontProgram).setItalicAngle(italicAngle);
     }
 
     /**
@@ -195,17 +195,17 @@ public void setItalicAngle(int italicAngle) {
      * @param fontWidth {@link FontStretches}.
      */
     public void setFontStretch(String fontWidth) {
-        ((Type3Font)fontProgram).setFontStretch(fontWidth);
+        ((Type3Font) fontProgram).setFontStretch(fontWidth);
     }
 
     /**
      * Sets Font descriptor flags.
-     * @see FontDescriptorFlags
      *
      * @param flags font descriptor flags.
+     * @see FontDescriptorFlags
      */
     public void setPdfFontFlags(int flags) {
-        ((Type3Font)fontProgram).setPdfFontFlags(flags);
+        ((Type3Font) fontProgram).setPdfFontFlags(flags);
     }
 
 
@@ -232,6 +232,15 @@ public void setFontMatrix(double[] fontMatrix) {
         this.fontMatrix = fontMatrix;
     }
 
+    /**
+     * Gets count of glyphs in Type 3 font.
+     *
+     * @return number of glyphs.
+     */
+    public int getGlyphsCount() {
+        return ((Type3Font) getFontProgram()).getGlyphsCount();
+    }
+
     /**
      * Defines a glyph. If the character was already defined it will return the same content
      *
@@ -293,6 +302,32 @@ public boolean containsGlyph(int unicode) {
                 && getFontProgram().getGlyph(fontEncoding.getUnicodeDifference(unicode)) != null;
     }
 
+    @Override
+    public void flush() {
+        ensureUnderlyingObjectHasIndirectReference();
+        if (((Type3Font) getFontProgram()).getGlyphsCount() < 1) {
+            throw new PdfException("no.glyphs.defined.fo r.type3.font");
+        }
+
+        PdfDictionary charProcs = new PdfDictionary();
+        for (int i = 0; i < 256; i++) {
+            if (fontEncoding.canDecode(i)) {
+                Type3Glyph glyph = getType3Glyph(fontEncoding.getUnicode(i));
+                if (glyph != null) {
+                    charProcs.put(new PdfName(fontEncoding.getDifference(i)), glyph.getContentStream());
+                    glyph.getContentStream().flush();
+                }
+            }
+        }
+
+        getPdfObject().put(PdfName.CharProcs, charProcs);
+        getPdfObject().put(PdfName.FontMatrix, new PdfArray(getFontMatrix()));
+        getPdfObject().put(PdfName.FontBBox, new PdfArray(fontProgram.getFontMetrics().getBbox()));
+
+        super.flushFontData(fontProgram.getFontNames().getFontName(), PdfName.Type3);
+        super.flush();
+    }
+
     @Override
     protected PdfDictionary getFontDescriptor(String fontName) {
         if (fontName != null && fontName.length() > 0) {
@@ -332,31 +367,6 @@ protected PdfDocument getDocument() {
         return getPdfObject().getIndirectReference().getDocument();
     }
 
-    @Override
-    public void flush() {
-        ensureUnderlyingObjectHasIndirectReference();
-        if (((Type3Font) getFontProgram()).getGlyphsCount() < 1) {
-            throw new PdfException("no.glyphs.defined.fo r.type3.font");
-        }
-
-        PdfDictionary charProcs = new PdfDictionary();
-        for (int i = 0; i < 256; i++) {
-            if (fontEncoding.canDecode(i)) {
-                Type3Glyph glyph = getType3Glyph(fontEncoding.getUnicode(i));
-                if (glyph != null) {
-                    charProcs.put(new PdfName(fontEncoding.getDifference(i)), glyph.getContentStream());
-                    glyph.getContentStream().flush();
-                }
-            }
-        }
-
-        getPdfObject().put(PdfName.CharProcs, charProcs);
-        getPdfObject().put(PdfName.FontMatrix, new PdfArray(getFontMatrix()));
-        getPdfObject().put(PdfName.FontBBox, new PdfArray(fontProgram.getFontMetrics().getBbox()));
-
-        super.flushFontData(fontProgram.getFontNames().getFontName(), PdfName.Type3);
-        super.flush();
-    }
 
     /**
      * Gets first empty code, that could use with {@see addSymbol()}

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

@@ -53,15 +53,21 @@ This file is part of the iText (R) project.
 import java.util.HashMap;
 import java.util.Map;
 
-public class Type3Font extends FontProgram {
+class Type3Font extends FontProgram {
 
 	private static final long serialVersionUID = 1027076515537536993L;
 
 	private final Map<Integer, Type3Glyph> type3Glyphs = new HashMap<>();
     private boolean colorized = false;
     private int flags = 0;
 
-    public Type3Font(boolean colorized) {
+    /**
+     * Creates a Type 3 font programm.
+     *
+     * @param colorized defines whether the glyph color is specified in the glyph descriptions in the font.
+     * @deprecated Type 3 font should contain font name and font family in case tagged PDF.
+     */
+    Type3Font(boolean colorized) {
         this.colorized = colorized;
         this.fontNames = new FontNames();
         getFontMetrics().setBbox(0, 0, 0, 0);
@@ -120,7 +126,7 @@ protected void setFontFamily(String fontFamily) {
      * @param fontWeight integer form 100 to 900. See {@link FontWeights}.
      */
     @Override   //This dummy override allows PdfType3Font to set font weight.
-    protected void setFontWeight(int fontWeight) {
+    public void setFontWeight(int fontWeight) {
         super.setFontWeight(fontWeight);
     }
 

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

@@ -64,7 +64,6 @@ 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.Type3Font;
 import com.itextpdf.kernel.font.Type3Glyph;
 import com.itextpdf.kernel.geom.PageSize;
 import com.itextpdf.kernel.pdf.canvas.PdfCanvas;
@@ -883,7 +882,7 @@ public void testUpdateType3FontBasedExistingFont() throws IOException, Interrupt
         page.flush();
         pdfDoc.close();
 
-        Assert.assertEquals(6, ((Type3Font) pdfType3Font.getFontProgram()).getGlyphsCount());
+        Assert.assertEquals(6, pdfType3Font.getGlyphsCount());
 
         Assert.assertNull(new CompareTool().compareByContent(outputFileName, cmpOutputFileName, destinationFolder, "diff_"));
     }
@@ -926,7 +925,7 @@ public void testNewType3FontBasedExistingFont() throws IOException, InterruptedE
         page.flush();
         outputPdfDoc.close();
 
-        Assert.assertEquals(6, ((Type3Font) pdfType3Font.getFontProgram()).getGlyphsCount());
+        Assert.assertEquals(6, pdfType3Font.getGlyphsCount());
 
         Assert.assertNull(new CompareTool().compareByContent(outputFileName, cmpOutputFileName, destinationFolder, "diff_"));
     }