GH-79 touch up digital signatures to use the new nio file access.

core/core-awt/src/main/java/org/icepdf/core/io/RandomAccessFileInputStream.java

@@ -70,9 +70,7 @@ public int available() {
         try {
             return (int) (m_RandomAccessFile.getFilePointer());
         } catch (IOException e) {
-            if (logger.isLoggable(Level.FINE)) {
-                logger.log(Level.WARNING, "Error calling available", e);
-            }
+            logger.log(Level.WARNING, "Error calling available", e);
         }
         return 0;
     }

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

@@ -82,9 +82,7 @@ public class Catalog extends Dictionary {
 
     // Announce ICEpdf Core
     static {
-        if (logger.isLoggable(Level.INFO)) {
-            logger.info("ICEpdf Core " + Document.getLibraryVersion());
-        }
+        logger.log(Level.INFO, () -> "ICEpdf Core " + Document.getLibraryVersion());
     }
 
     public Catalog(Library library, DictionaryEntries dictionaryEntries) {
@@ -160,15 +158,13 @@ public PageTree getPageTree() {
      * {@link OutlineItem}
      */
     public Outlines getOutlines() {
-        if (!outlinesInited) {
-            synchronized (this) {
-                if (!outlinesInited) {
-                    Object o = library.getObject(entries, OUTLINES_KEY);
-                    if (o != null) {
-                        outlines = new Outlines(library, (DictionaryEntries) o);
-                    }
-                    outlinesInited = true;
+        synchronized (this) {
+            if (!outlinesInited) {
+                Object o = library.getObject(entries, OUTLINES_KEY);
+                if (o != null) {
+                    outlines = new Outlines(library, (DictionaryEntries) o);
                 }
+                outlinesInited = true;
             }
         }
         return outlines;
@@ -294,15 +290,13 @@ public NameTree getEmbeddedFilesNameTree() {
      */
     @SuppressWarnings("unchecked")
     public NamedDestinations getDestinations() {
-        if (!destsInited) {
-            synchronized (this) {
-                if (!destsInited) {
-                    Object o = library.getObject(entries, DESTS_KEY);
-                    if (o instanceof DictionaryEntries) {
-                        dests = new NamedDestinations(library, (DictionaryEntries) o);
-                    }
-                    destsInited = true;
+        synchronized (this) {
+            if (!destsInited) {
+                Object o = library.getObject(entries, DESTS_KEY);
+                if (o instanceof DictionaryEntries) {
+                    dests = new NamedDestinations(library, (DictionaryEntries) o);
                 }
+                destsInited = true;
             }
         }
         return dests;
@@ -316,22 +310,20 @@ public NamedDestinations getDestinations() {
      * @return the constructed ViewerPreferences object
      */
     public ViewerPreferences getViewerPreferences() {
-        if (!viewerPrefInited) {
-            synchronized (this) {
-                if (!viewerPrefInited) {
-                    Object o = library.getObject(entries, VIEWERPREFERENCES_KEY);
-                    if (o != null) {
-                        if (o instanceof DictionaryEntries) {
-                            viewerPref = new ViewerPreferences(library, (DictionaryEntries) o);
-                            viewerPref.init();
-                        } // strange corner case where there is a incorrect reference.
-                        else if (o instanceof Catalog) {
-                            viewerPref = new ViewerPreferences(library, ((Catalog) o).getEntries());
-                            viewerPref.init();
-                        }
+        synchronized (this) {
+            if (!viewerPrefInited) {
+                Object o = library.getObject(entries, VIEWERPREFERENCES_KEY);
+                if (o != null) {
+                    if (o instanceof DictionaryEntries) {
+                        viewerPref = new ViewerPreferences(library, (DictionaryEntries) o);
+                        viewerPref.init();
+                    } // strange corner case where there is a incorrect reference.
+                    else if (o instanceof Catalog) {
+                        viewerPref = new ViewerPreferences(library, ((Catalog) o).getEntries());
+                        viewerPref.init();
                     }
-                    viewerPrefInited = true;
                 }
+                viewerPrefInited = true;
             }
         }
         return viewerPref;
@@ -343,19 +335,17 @@ else if (o instanceof Catalog) {
      * @return OptionalContent dictionary, null if none exists.
      */
     public OptionalContent getOptionalContent() {
-        if (!optionalContentInited) {
-            synchronized (this) {
-                if (!optionalContentInited) {
-                    Object o = library.getObject(entries, OCPROPERTIES_KEY);
-                    if (o instanceof DictionaryEntries) {
-                        optionalContent = new OptionalContent(library, (DictionaryEntries) o);
-                        optionalContent.init();
-                    } else {
-                        optionalContent = new OptionalContent(library, new DictionaryEntries());
-                        optionalContent.init();
-                    }
-                    optionalContentInited = true;
+        synchronized (this) {
+            if (!optionalContentInited) {
+                Object o = library.getObject(entries, OCPROPERTIES_KEY);
+                if (o instanceof DictionaryEntries) {
+                    optionalContent = new OptionalContent(library, (DictionaryEntries) o);
+                    optionalContent.init();
+                } else {
+                    optionalContent = new OptionalContent(library, new DictionaryEntries());
+                    optionalContent.init();
                 }
+                optionalContentInited = true;
             }
         }
         return optionalContent;

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

@@ -204,9 +204,7 @@ else if (object instanceof Name || object instanceof StringObject) {
                         else if (ob instanceof HashMap) {
                             parse((List) (((HashMap) ob).get(D_KEY)));
                         } else {
-                            if (logger.isLoggable(Level.FINE)) {
-                                logger.warning("Destination type missed=" + ob);
-                            }
+                            logger.log(Level.FINE, () -> "Destination type missed=" + ob);
                         }
                     }
                 }

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

@@ -150,7 +150,7 @@ public void setWatermarkCallback(WatermarkCallback watermarkCallback) {
      */
     private void setDocumentOrigin(String o) {
         origin = o;
-        if (logger.isLoggable(Level.CONFIG)) {
+        if (logger.isLoggable(Level.FINE)) {
             logger.config(
                     "MEMFREE: " + Runtime.getRuntime().freeMemory() + " of " +
                             Runtime.getRuntime().totalMemory());
@@ -542,8 +542,8 @@ public void dispose() {
         if (fileToDelete != null) {
             File file = new File(fileToDelete);
             boolean success = file.delete();
-            if (!success && logger.isLoggable(Level.WARNING)) {
-                logger.warning("Error deleting URL cached to file " + fileToDelete);
+            if (!success) {
+                logger.log(Level.WARNING, () -> "Error deleting URL cached to file " + fileToDelete);
             }
         }
     }

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

@@ -179,9 +179,7 @@ public synchronized void init() throws InterruptedException {
         byte[] in = getDecodedStreamBytes();
         if (in != null) {
             try {
-                if (logger.isLoggable(Level.FINER)) {
-                    logger.finer("Parsing form " + getPObjectReference());
-                }
+                logger.log(Level.FINER, () -> "Parsing form " + getPObjectReference());
                 shapes = cp.parse(new byte[][]{in}, new Reference[]{this.getPObjectReference()}, null).getShapes();
                 inited = true;
             } catch (InterruptedException e) {

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

@@ -141,9 +141,8 @@ public int getUnsignedInt(int start, int offset) {
             unsignedInt = Integer.parseInt(
                     stringData.substring(start, start + offset), 16);
         } catch (NumberFormatException e) {
-            if (logger.isLoggable(Level.FINER)) {
-                logger.finer("Number Format Exception " + unsignedInt + " " + stringData.substring(start, start + offset));
-            }
+            int finalUnsignedInt = unsignedInt;
+            logger.log(Level.FINER, () -> "Number Format Exception " + finalUnsignedInt + " " + stringData.substring(start, start + offset));
         }
         return unsignedInt;
     }
@@ -153,9 +152,8 @@ public int getUnsignedInt(String data) {
         try {
             unsignedInt = Integer.parseInt(data, 16);
         } catch (NumberFormatException e) {
-            if (logger.isLoggable(Level.FINER)) {
-                logger.finer("Number Format Exception " + unsignedInt);
-            }
+            int finalUnsignedInt = unsignedInt;
+            logger.log(Level.FINER, () -> "Number Format Exception " + finalUnsignedInt);
         }
         return unsignedInt;
     }
@@ -239,7 +237,7 @@ public StringBuilder getLiteralStringBuffer(final int fontFormat, FontFile font)
                 // 0 cid is valid, so we have ot be careful we don't exclude the
                 // cid 00 = 0 or 0000 = 0, not 0000 = 00.
                 // removed font check as it was causing problems with a lot of Latin based hex strings
-                // may need to revisit in the future when getting back to multibyte encodings. 
+                // may need to revisit in the future when getting back to multibyte encodings.
                 if (!(offset < length && charValue == 0)) {
                     tmp.append((char) charValue);
                     lastIndex = 0;

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

@@ -117,16 +117,8 @@ public org.icepdf.core.pobjects.fonts.Font getFont(Name s) {
         org.icepdf.core.pobjects.fonts.Font font = null;
         if (fonts != null) {
             Object ob = fonts.get(s);
-            // check to make sure the library contains a font
-            if (ob instanceof org.icepdf.core.pobjects.fonts.Font) {
-                font = (org.icepdf.core.pobjects.fonts.Font) ob;
-            }
-            // corner case where font is just a inline dictionary.
-            else if (ob instanceof DictionaryEntries) {
-                font = FontFactory.getInstance().getFont(library, (DictionaryEntries) ob);
-            }
             // the default value is most likely Reference
-            else if (ob instanceof Reference) {
+            if (ob instanceof Reference) {
                 Reference ref = (Reference) ob;
                 ob = library.getObject((Reference) ob);
                 if (ob instanceof org.icepdf.core.pobjects.fonts.Font) {
@@ -140,6 +132,14 @@ else if (ob instanceof Reference) {
                     font.setPObjectReference(ref);
                 }
             }
+            // check to make sure the library contains a font
+            else if (ob instanceof org.icepdf.core.pobjects.fonts.Font) {
+                font = (org.icepdf.core.pobjects.fonts.Font) ob;
+            }
+            // corner case where font is just a inline dictionary.
+            else if (ob instanceof DictionaryEntries) {
+                font = FontFactory.getInstance().getFont(library, (DictionaryEntries) ob);
+            }
             // if still null do a deeper search checking the base font name of
             // each font for a match to the needed font name.  We have a few
             // malformed documents that don't refer to a font by the base name