Allow choosing OFont or NFont

core/core-awt/src/main/java/org/icepdf/core/SystemProperties.java

@@ -0,0 +1,22 @@
+package org.icepdf.core;
+
+import org.icepdf.core.util.Defs;
+
+public final class SystemProperties {
+    //System properties
+    public static final String OS_NAME = Defs.sysProperty("os.name");
+    public static final String JAVA_HOME = Defs.sysProperty("java.home");
+    public static final String USER_NAME = Defs.sysProperty("user.name");
+
+    //ICEpdf-specifics
+    public static final boolean PRIVATE_PROPERTY_ENABLED = Defs.booleanProperty(
+            "org.icepdf.core.page.annotation.privateProperty.enabled", false);
+    public static boolean USE_NFONT = Defs.sysPropertyBoolean("org.icepdf.core.useNFont", true);
+
+    private SystemProperties() {
+    }
+
+    public static void setUseNFont(boolean useNFont) {
+        USE_NFONT = useNFont;
+    }
+}

core/core-awt/src/main/java/org/icepdf/core/pobjects/Page.java

@@ -15,6 +15,7 @@
  */
 package org.icepdf.core.pobjects;
 
+import org.icepdf.core.SystemProperties;
 import org.icepdf.core.events.*;
 import org.icepdf.core.io.SeekableInput;
 import org.icepdf.core.pobjects.annotations.Annotation;
@@ -76,9 +77,6 @@ public class Page extends Dictionary {
      */
     public static final float SELECTION_ALPHA = 0.3f;
 
-    public static boolean PRIVATE_PROPERTY_ENABLED = Defs.booleanProperty(
-            "org.icepdf.core.page.annotation.privateProperty.enabled", false);
-
     // text selection colour
     public static Color selectionColor;
 
@@ -206,8 +204,6 @@ public class Page extends Dictionary {
     // page has default rotation value
     private float pageRotation = 0;
 
-    private String userName = System.getProperty("user.name");
-
     private int pageIndex;
     private int imageCount;
     private boolean pageInitialized;
@@ -341,24 +337,23 @@ else if (annotObj instanceof HashMap) { // HashMap lacks "Type"->"Annot" entry
                     if (ref != null && a != null) {
                         a.setPObjectReference(ref);
                         a.init();
-                    }
-                    if (PRIVATE_PROPERTY_ENABLED && a.getFlagPrivateContents()) {
-                        // check to make sure we don't show an annotation if the username doesn't match the creator
-                        if (a instanceof MarkupAnnotation) {
+                        if (SystemProperties.PRIVATE_PROPERTY_ENABLED && a instanceof MarkupAnnotation && a.getFlagPrivateContents()) {
+                            // check to make sure we don't show an annotation if the username doesn't match the creator
                             MarkupAnnotation markupAnnotation = (MarkupAnnotation) a;
                             String creator = markupAnnotation.getTitleText();
-                            if (creator.equals(userName)) {
+                            if (creator.equals(SystemProperties.USER_NAME)) {
                                 annotations.add(a);
                             } else {
                                 // other wise we skip it all together but make sure the popup is hidden.
                                 if (markupAnnotation.getPopupAnnotation() != null) {
                                     markupAnnotation.getPopupAnnotation().setOpen(false);
                                 }
                             }
+
+                        } else {
+                            // add any found annotations to the vector.
+                            annotations.add(a);
                         }
-                    } else {
-                        // add any found annotations to the vector.
-                        annotations.add(a);
                     }
                 } catch (IllegalStateException e) {
                     logger.warning("Malformed annotation could not be initialized. " +