PDFBOX-2941: refactor / improve encoding name

git-svn-id: https://svn.apache.org/repos/asf/pdfbox/trunk@1928082 13f79535-47bb-0310-9956-ffa450edef68

Author: THausherr

debugger/src/main/java/org/apache/pdfbox/debugger/fontencodingpane/SimpleFont.java

@@ -102,9 +102,13 @@ private Object[][] getGlyphs(PDSimpleFont font) throws IOException
         return glyphs;
     }
 
-    private String getEncodingName(PDSimpleFont font)
+    static String getEncodingName(PDSimpleFont font)
     {
-        return font.getEncoding().getClass().getSimpleName() + " / " +  font.getEncoding().getEncodingName();
+        if (font.getEncoding() == null)
+        {
+            return "(null)";
+        }
+        return font.getClass().getSimpleName() + " / " + font.getEncoding().getEncodingName();
     }
 
     @Override

debugger/src/main/java/org/apache/pdfbox/debugger/fontencodingpane/Type0Font.java

@@ -52,26 +52,24 @@ class Type0Font extends FontPane
     Type0Font(PDCIDFont descendantFont, PDType0Font parentFont) throws IOException
     {
         Object[][] cidtogid = readCIDToGIDMap(descendantFont, parentFont);
+        Map<String, String> attributes = new LinkedHashMap<>();
+        attributes.put("Font", descendantFont.getName());
         if (cidtogid != null)
         {
-            Map<String, String> attributes = new LinkedHashMap<>();
-            attributes.put("Font", descendantFont.getName());
             attributes.put("CIDs", Integer.toString(cidtogid.length));
             attributes.put("Embedded", Boolean.toString(descendantFont.isEmbedded()));
-
+            attributes.put("Encoding", getEncodingName(parentFont));
             view = new FontEncodingView(cidtogid, attributes, 
                     new String[]{"CID", "GID", "Unicode Character", "Glyph"}, getYBounds(cidtogid, 3));
         }
         else
         {
             Object[][] tab = readMap(descendantFont, parentFont);
-            Map<String, String> attributes = new LinkedHashMap<>();
-            attributes.put("Font", descendantFont.getName());
             attributes.put("CIDs", Integer.toString(tab.length));
             attributes.put("Glyphs", Integer.toString(totalAvailableGlyph));
             attributes.put("Standard 14", Boolean.toString(parentFont.isStandard14()));
             attributes.put("Embedded", Boolean.toString(descendantFont.isEmbedded()));
-
+            attributes.put("Encoding", getEncodingName(parentFont));
             view = new FontEncodingView(tab, attributes, 
                     new String[]{"Code", "CID", "GID", "Unicode Character", "Glyph"}, getYBounds(tab, 4));
         }
@@ -154,4 +152,10 @@ public JPanel getPanel()
         panel.setPreferredSize(new Dimension(300, 500));
         return panel;
     }
+
+    private String getEncodingName(PDFont font)
+    {
+        String encodingName = font.getCOSObject().getNameAsString(COSName.ENCODING);
+        return encodingName == null ? font.getCOSObject().getClass().getSimpleName() : encodingName;
+    }
 }

debugger/src/main/java/org/apache/pdfbox/debugger/fontencodingpane/Type3Font.java

@@ -25,6 +25,7 @@
 import javax.swing.JPanel;
 
 import org.apache.fontbox.util.BoundingBox;
+import static org.apache.pdfbox.debugger.fontencodingpane.SimpleFont.getEncodingName;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.PDPage;
 import org.apache.pdfbox.pdmodel.PDPageContentStream;
@@ -195,11 +196,6 @@ private BufferedImage renderType3Glyph(PDType3Font font, int index) throws IOExc
         }
     }
 
-    private String getEncodingName(PDType3Font font)
-    {
-        return font.getEncoding().getClass().getSimpleName() + " / " +  font.getEncoding().getEncodingName();
-    }
-
     @Override
     public JPanel getPanel()
     {