GH-79 attempted cleanup/removal of throwable from code base.

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

@@ -17,7 +17,6 @@
 
 import org.icepdf.core.SecurityCallback;
 import org.icepdf.core.application.ProductInfo;
-import org.icepdf.core.exceptions.PDFException;
 import org.icepdf.core.exceptions.PdfSecurityException;
 import org.icepdf.core.pobjects.acroform.FieldDictionary;
 import org.icepdf.core.pobjects.acroform.InteractiveForm;
@@ -183,13 +182,12 @@ private String getDocumentCachedFilePath() {
      * Load a PDF file from the given path and initiates the document's Catalog.
      *
      * @param filepath path of PDF document.
-     * @throws PDFException         if an invalid file encoding.
      * @throws PdfSecurityException if a security provider cannot be found
      *                              or there is an error decrypting the file.
      * @throws IOException          if a problem setting up, or parsing the file.
      */
     public void setFile(String filepath)
-            throws PDFException, PdfSecurityException, IOException {
+            throws PdfSecurityException, IOException {
         setDocumentOrigin(filepath);
 
         File file = new File(filepath);
@@ -198,7 +196,7 @@ public void setFile(String filepath)
             ByteBuffer mappedFileByteBuffer = documentFileChannel.map(
                     FileChannel.MapMode.READ_ONLY, 0, documentFileChannel.size());
             setInputStream(mappedFileByteBuffer);
-        } catch (Throwable e) {
+        } catch (Exception e) {
             logger.log(Level.SEVERE, "Failed to set document file path", e);
         }
     }
@@ -210,13 +208,12 @@ public void setFile(String filepath)
      * be stored in memory.
      *
      * @param url location of file.
-     * @throws PDFException         an invalid file encoding.
      * @throws PdfSecurityException if a security provider can not be found
      *                              or there is an error decrypting the file.
      * @throws IOException          if a problem downloading, setting up, or parsing the file.
      */
     public void setUrl(URL url)
-            throws PDFException, PdfSecurityException, IOException {
+            throws PdfSecurityException, IOException {
         InputStream in = null;
         try {
             // make a connection
@@ -243,13 +240,12 @@ public void setUrl(URL url)
      *
      * @param inputStream input stream containing PDF data
      * @param pathOrURL   value assigned to document origin
-     * @throws PDFException         an invalid stream or file encoding
      * @throws PdfSecurityException if a security provider can not be found
      *                              or there is an error decrypting the file.
      * @throws IOException          if a problem setting up, or parsing the SeekableInput.
      */
     public void setInputStream(InputStream inputStream, String pathOrURL)
-            throws PDFException, PdfSecurityException, IOException {
+            throws PdfSecurityException, IOException {
         setDocumentOrigin(pathOrURL);
 
         if (!isCachingEnabled) {
@@ -259,7 +255,6 @@ public void setInputStream(InputStream inputStream, String pathOrURL)
         }
         // if caching is allowed cache the url to file
         else {
-//System.out.println("Started  downloading PDF to disk : " + (new java.util.Date()));
             // create tmp file and write bytes to it.
             File tempFile = File.createTempFile(
                     "ICEpdfTempFile" + getClass().hashCode(),
@@ -276,8 +271,9 @@ public void setInputStream(InputStream inputStream, String pathOrURL)
                 ByteBuffer mappedFileByteBuffer = documentFileChannel.map(
                         FileChannel.MapMode.READ_ONLY, 0, documentFileChannel.size());
                 setInputStream(mappedFileByteBuffer);
-            } catch (Throwable e) {
+            } catch (Exception e) {
                 logger.log(Level.SEVERE, "Failed to set document input stream", e);
+                throw e;
             }
         }
     }
@@ -294,13 +290,12 @@ public void setInputStream(InputStream inputStream, String pathOrURL)
      * @param offset    the index into the byte array where the PDF data begins
      * @param length    the number of bytes in the byte array belonging to the PDF data
      * @param pathOrURL value assigned to document origin
-     * @throws PDFException         an invalid stream or file encoding
      * @throws PdfSecurityException if a security provider can not be found
      *                              or there is an error decrypting the file.
      * @throws IOException          if a problem setting up, or parsing the SeekableInput.
      */
     public void setByteArray(byte[] data, int offset, int length, String pathOrURL)
-            throws PDFException, PdfSecurityException, IOException {
+            throws PdfSecurityException, IOException {
         setDocumentOrigin(pathOrURL);
 
         if (!isCachingEnabled) {
@@ -318,9 +313,9 @@ public void setByteArray(byte[] data, int offset, int length, String pathOrURL)
             // Write the data to the temp file.
             try {
                 Files.copy(new ByteArrayInputStream(data), tempFile.toPath());
-            } catch (Throwable e) {
+            } catch (IOException e) {
                 logger.log(Level.FINE, "Error writing PDF output stream.", e);
-                throw new IOException(e.getMessage());
+                throw e;
             }
 
             setDocumentCachedFilePath(tempFile.getAbsolutePath());
@@ -330,8 +325,9 @@ public void setByteArray(byte[] data, int offset, int length, String pathOrURL)
                 ByteBuffer mappedFileByteBuffer = documentFileChannel.map(
                         FileChannel.MapMode.READ_ONLY, 0, documentFileChannel.size());
                 setInputStream(mappedFileByteBuffer);
-            } catch (Throwable e) {
+            } catch (Exception e) {
                 logger.log(Level.SEVERE, "Failed to set document input stream", e);
+                throw e;
             }
         }
     }
@@ -340,12 +336,11 @@ public void setByteArray(byte[] data, int offset, int length, String pathOrURL)
      * Sets the input stream of the PDF file to be rendered.
      *
      * @param input ByteBuffer containing PDF data stream
-     * @throws PDFException         if error occurs
      * @throws PdfSecurityException security error
      * @throws IOException          io error during stream handling
      */
     private void setInputStream(ByteBuffer input)
-            throws PDFException, PdfSecurityException, IOException {
+            throws PdfSecurityException, IOException {
         try {
             // load the head
             header = new Header();
@@ -360,7 +355,7 @@ private void setInputStream(ByteBuffer input)
             Trailer trailer = new Trailer();
             try {
                 trailer.parseXrefOffset(input);
-            } catch (Throwable e) {
+            } catch (Exception e) {
                 trailer.setLazyInitializationFailed(true);
                 logger.log(Level.WARNING, "Trailer loading failed, reindexing file.", e);
             }
@@ -370,7 +365,7 @@ private void setInputStream(ByteBuffer input)
                     crossReferenceRoot.setTrailer(trailer);
                     crossReferenceRoot.initialize(input);
                     library.setCrossReferenceRoot(crossReferenceRoot);
-                } catch (Throwable e) {
+                } catch (Exception e) {
                     crossReferenceRoot.setLazyInitializationFailed(true);
                     logger.log(Level.WARNING, "Cross reference loading failed, reindexing file.");
                 }
@@ -401,7 +396,7 @@ private void setInputStream(ByteBuffer input)
             library.setStateManager(stateManager);
         } catch (PdfSecurityException | IOException e) {
             dispose();
-            logger.log(Level.SEVERE, "Error loading PDF Document.", e);
+            logger.log(Level.SEVERE, "Failed to load PDF Document.", e);
             throw e;
         } catch (Exception e) {
             dispose();
@@ -577,9 +572,9 @@ public long writeToOutputStream(OutputStream out) throws IOException {
                             this,
                             new BufferedOutputStream(out),
                             documentLength);
-                } catch (Throwable e) {
+                } catch (IOException e) {
                     logger.log(Level.FINE, "Error writing PDF output stream.", e);
-                    throw new IOException(e.getMessage());
+                    throw e;
                 }
                 return documentLength + appendedLength;
             }

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

@@ -190,11 +190,11 @@ public synchronized void init() throws InterruptedException {
                 shapes = new Shapes();
                 logger.log(Level.FINE, "Parsing form interrupted parsing Form content stream.", e);
                 throw new InterruptedException(e.getMessage());
-            } catch (Throwable e) {
-                // some parsing or other wise unrecoverable problem, we'll try to render the page none the less.
+            } catch (Exception e) {
+                // some parsing or otherwise unrecoverable problem, we'll try to render the page nonetheless.
                 // but not this form object.
                 shapes = new Shapes();
-                logger.log(Level.FINE, "Error parsing Form content stream.", e);
+                logger.log(Level.WARNING, "Error parsing Form content stream.", e);
             }
         }
     }

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

@@ -142,7 +142,7 @@ public int getUnsignedInt(int start, int offset) {
                     stringData.substring(start, start + offset), 16);
         } catch (NumberFormatException e) {
             if (logger.isLoggable(Level.FINER)) {
-                logger.finer("Number Format Exception " + unsignedInt);
+                logger.finer("Number Format Exception " + unsignedInt + " " + stringData.substring(start, start + offset));
             }
         }
         return unsignedInt;

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

@@ -161,10 +161,9 @@ private String convertHexChars(StringBuilder name) {
                     }
                 }
             }
-        } catch (Throwable e) {
+        } catch (Exception e) {
             logger.finer("Error parsing hexadecimal characters.");
-            //  we are going to bail on any exception and just return the original
-            // string.
+            //  we are going to bail on any exception and just return the original string
             return name.toString();
         }
         return name.toString();

core/core-awt/src/main/java/org/icepdf/core/pobjects/acroform/SignatureHandler.java

@@ -80,7 +80,7 @@ public SignatureValidator validateSignature(SignatureFieldDictionary signatureFi
                 return signatureValidator;
             } catch (SignatureIntegrityException e) {
                 logger.log(Level.WARNING, "Signature certificate could not be initialized.", e);
-            } catch (Throwable e) {
+            } catch (Exception e) {
                 logger.log(Level.WARNING, "Signature validation was unsuccessful.", e);
             }
         }

core/core-awt/src/main/java/org/icepdf/core/pobjects/acroform/VariableTextFieldDictionary.java

@@ -144,7 +144,7 @@ public VariableTextFieldDictionary(Library library, DictionaryEntries entries) {
                             fontName = gs.getTextState().fontName;
                         }
                     }
-                } catch (Throwable e) {
+                } catch (Exception e) {
                     logger.warning("Could not validate default appearance, defaulting.");
                 }
             }
@@ -196,7 +196,7 @@ public String generateDefaultAppearance(String content, Resources resources) {
                     if (gs.getTextState().fontName != null) fontName = gs.getTextState().fontName;
                 }
             }
-        } catch (Throwable e) {
+        } catch (Exception e) {
             logger.warning("Could not generate default appearance stream.");
             if (logger.isLoggable(Level.FINEST)) {
                 logger.log(Level.FINEST, "Error parsing text feld content stream", e);

core/core-awt/src/main/java/org/icepdf/core/pobjects/acroform/signature/AbstractPkcsValidator.java

@@ -155,7 +155,7 @@ protected void parseSignerData(ASN1Sequence signedData, byte[] cmsData) throws S
                     MessageDigest tmp = AlgorithmIdentifier.getDigestInstance(objectId, null);
                     logger.finest("DigestAlgorithmIdentifiers: " + digestAlgorithmName + " " + objectId);
                     logger.finest(tmp.toString());
-                } catch (Throwable ex) {
+                } catch (Exception ex) {
                     logger.log(Level.WARNING, "Error finding iod: " + objectId, ex);
                 }
             }
@@ -270,7 +270,7 @@ protected void parseSignerData(ASN1Sequence signedData, byte[] cmsData) throws S
                 try {
                     new TimeStampToken(contentInfo);
                     isEmbeddedTimeStamp = true;
-                } catch (Throwable e1) {
+                } catch (Exception e1) {
                     throw new SignatureIntegrityException("Valid TimeStamp could now be created");
                 }
             }
@@ -651,7 +651,7 @@ protected void validateDocument() throws SignatureIntegrityException {
         } catch (CertificateException e) {
             logger.log(Level.FINEST, "Certificate exception.", e);
             isCertificateChainTrusted = false;
-        } catch (Throwable e) {
+        } catch (Exception e) {
             logger.log(Level.FINEST, "Error validation certificate chain.", e);
             isCertificateChainTrusted = false;
         }

core/core-awt/src/main/java/org/icepdf/core/pobjects/acroform/signature/certificates/CRLVerifier.java

@@ -19,8 +19,8 @@
 import org.bouncycastle.asn1.ASN1Primitive;
 import org.bouncycastle.asn1.DERIA5String;
 import org.bouncycastle.asn1.DEROctetString;
-import org.bouncycastle.asn1.x509.*;
 import org.bouncycastle.asn1.x509.Extension;
+import org.bouncycastle.asn1.x509.*;
 import org.icepdf.core.pobjects.acroform.signature.exceptions.CertificateVerificationException;
 import org.icepdf.core.pobjects.acroform.signature.exceptions.RevocationVerificationException;
 

core/core-awt/src/main/java/org/icepdf/core/pobjects/filters/CCITTFax.java

@@ -786,7 +786,7 @@ private static BufferedImage deriveBufferedImageFromTIFFBytes(
                     img = (BufferedImage) roGetAsBufferedImage.invoke(javax_media_jai_RenderedOp_op);
                 }
             }
-        } catch (Throwable e) {
+        } catch (Exception e) {
             // catch and return a null image so we can try again using a different compression method.
             logger.finer("Decoding TIFF: " + TIFF_COMPRESSION_NAMES[compression] + " failed trying alternative");
         } finally {
@@ -817,9 +817,9 @@ private static BufferedImage applyImageMaskAndDecodeArray(
             // From empirically testing 6 of the 9 possible combinations of
             //  BlackIs1 {true, false, not given} and Decode {[0 1], [1 0], not given}
             //  this is the rule. Unknown combinations:
-            //    BlackIs1=false, Decode=[0 1] 
-            //    BlackIs1=false, Decode=[1 0] 
-            //    BlackIs1=true,  Decode=[0 1] 
+            //    BlackIs1=false, Decode=[0 1]
+            //    BlackIs1=false, Decode=[1 0]
+            //    BlackIs1=true,  Decode=[0 1]
             boolean flag = ((blackIs1 == null) && (!defaultDecode)) ||
                     ((blackIs1 != null) && blackIs1 && (decode == null));
             if (imageMask) {

core/core-awt/src/main/java/org/icepdf/core/pobjects/fonts/FontDescriptor.java

@@ -310,7 +310,7 @@ public synchronized void init(Name subtype) {
         }
         // catch everything, we can fall back to font substitution if a failure
         // occurs.
-        catch (Throwable e) {
+        catch (Exception e) {
             logger.log(Level.FINE, "Error Reading Embedded Font ", e);
             embeddedFontDamaged = true;
         }

core/core-awt/src/main/java/org/icepdf/core/pobjects/fonts/FontFactory.java

@@ -103,7 +103,7 @@ else if (FONT_SUBTYPE_CID_FONT_TYPE_0.equals(subtype)) {
             font = new TypeCidType2Font(library, entries);
         }
         if (font == null) {
-            // create OFont implementation. 
+            // create OFont implementation.
             font = new org.icepdf.core.pobjects.fonts.ofont.Font(library, entries);
         }
         return font;
@@ -127,7 +127,7 @@ public FontFile createFontFile(Stream fontStream, int fontType, Name fontSubType
             } else if (FONT_CID_TYPE_2 == fontType) {
                 fontFile = new ZFontType2(fontStream);
             }
-        } catch (Throwable e) {
+        } catch (Exception e) {
             logger.log(Level.WARNING, "Error reading font file type " + FONT_OPEN_TYPE, e);
         }
         return fontFile;
@@ -136,7 +136,7 @@ public FontFile createFontFile(Stream fontStream, int fontType, Name fontSubType
     public FontFile createFontFile(File file, int fontType, String fontSubType) {
         try {
             return createFontFile(file.toURI().toURL(), fontType, fontSubType);
-        } catch (Throwable e) {
+        } catch (Exception e) {
             logger.log(Level.FINE, "Could not create instance of font file " + fontType, e);
         }
         return null;
@@ -150,7 +150,7 @@ public FontFile createFontFile(URL url, int fontType, String fontSubType) {
             } else if (FONT_TYPE_1 == fontType) {
                 fontFile = new ZFontType1(url);
             }
-        } catch (Throwable e) {
+        } catch (Exception e) {
             logger.log(Level.FINE, "Could not create instance of font file " + fontType, e);
         }
         return fontFile;

core/core-awt/src/main/java/org/icepdf/core/pobjects/fonts/FontManager.java

@@ -318,7 +318,7 @@ public void setFontProperties(Preferences fontPreferences)
                 }
             }
             sortFontListByName();
-        } catch (Throwable e) {
+        } catch (Exception e) {
             logger.log(Level.FINE, "Error setting font properties ", e);
             throw new IllegalArgumentException(errorString);
         }
@@ -439,8 +439,8 @@ private void loadSystemFont(List<String> fontDirectories) {
             }
         } catch (SecurityException e) {
             logger.log(Level.WARNING, "SecurityException: failed to load fonts from directory: ", e);
-        } catch (Throwable e) {
-            logger.log(Level.FINE, "Failed to load fonts from directory: ", e);
+        } catch (Exception e) {
+            logger.log(Level.WARNING, "Failed to load fonts from directory: ", e);
         }
     }
 
@@ -855,7 +855,8 @@ private FontFile buildFont(String fontPath) {
                 }
                 font = buildFont(file);
             }
-        } catch (Throwable e) {
+        } catch (Exception e) {
+            // there are a lot of system font that don't ready correctly, so don't get to noisy
             logger.log(Level.FINE, "Error reading font program.", e);
         }
         return font;
@@ -905,7 +906,7 @@ else if ((fontPath.endsWith(".otf") || fontPath.endsWith(".OTF")) ||
                     (fontPath.endsWith(".otc") || fontPath.endsWith(".OTC"))) {
                 font = fontFactory.createFontFile(fontUri, FontFactory.FONT_OPEN_TYPE, null);
             }
-        } catch (Throwable e) {
+        } catch (Exception e) {
             logger.log(Level.FINE, "Error reading font program.", e);
         }
         return font;

core/core-awt/src/main/java/org/icepdf/core/pobjects/fonts/zfont/SimpleFont.java

@@ -184,8 +184,8 @@ protected void parseToUnicode() {
             try {
                 toUnicodeCMap = new CMap(cMapStream);
                 toUnicodeCMap.init();
-            } catch (Throwable e) {
-                logger.log(Level.SEVERE, "Error reading CMap file.", e);
+            } catch (Exception e) {
+                logger.log(Level.WARNING, "Error reading CMap file.", e);
             }
         }
         else if (objectUnicode instanceof Name) {