chore(core): optimize error-handling

2 files changed, 19 insertions, 17 deletions

diff --git a/pdf-as-pdfbox-2/src/main/java/at/gv/egiz/pdfas/lib/impl/signing/pdfbox2/PADESPDFBOXSigner.java b/pdf-as-pdfbox-2/src/main/java/at/gv/egiz/pdfas/lib/impl/signing/pdfbox2/PADESPDFBOXSigner.java
index b32935c6..37ceee97 100644
--- a/pdf-as-pdfbox-2/src/main/java/at/gv/egiz/pdfas/lib/impl/signing/pdfbox2/PADESPDFBOXSigner.java
+++ b/pdf-as-pdfbox-2/src/main/java/at/gv/egiz/pdfas/lib/impl/signing/pdfbox2/PADESPDFBOXSigner.java
@@ -431,11 +431,13 @@ public class PADESPDFBOXSigner implements IPdfSigner, IConfigurationConstants {
       final PDDocumentCatalog root = doc.getDocumentCatalog();
       final PDStructureTreeRoot structureTreeRoot = root.getStructureTreeRoot();
       if (structureTreeRoot != null) {
-        log.info("Tree Root: {}", structureTreeRoot.toString());
+        log.debug("Tree Root: {}", structureTreeRoot.toString());
         final List<Object> kids = structureTreeRoot.getKids();
 
-        if (kids == null) {
-          log.info("No kid-elements in structure tree Root, maybe not PDF/UA document");
+        if (kids == null || kids.isEmpty()) {
+          log.info("No kid-elements in structure tree Root, maybe not PDF/UA document. Skipping PDF/UA injection ... ");
+          return;
+          
         }
 
         PDStructureElement docElement = null;
@@ -556,7 +558,12 @@ public class PADESPDFBOXSigner implements IPdfSigner, IConfigurationConstants {
         throw new PdfAsException("error.pdf.sig.pdfua.1", e);
         
       } else {
-        log.info("Could not create PDF-UA conform signature");
+        if (log.isDebugEnabled()) {
+          log.debug("Could not create PDF-UA conform signature. Reason: {}", e.getMessage(), e);
+          
+        } else {
+          log.info("Could not create PDF-UA conform signature. Reason: {}", e.getMessage());
+        }
       }
     }
     
diff --git a/pdf-as-pdfbox-2/src/main/java/at/gv/egiz/pdfas/lib/impl/stamping/pdfbox2/PDFBoxFont.java b/pdf-as-pdfbox-2/src/main/java/at/gv/egiz/pdfas/lib/impl/stamping/pdfbox2/PDFBoxFont.java
index a63d9d6f..5607d582 100644
--- a/pdf-as-pdfbox-2/src/main/java/at/gv/egiz/pdfas/lib/impl/stamping/pdfbox2/PDFBoxFont.java
+++ b/pdf-as-pdfbox-2/src/main/java/at/gv/egiz/pdfas/lib/impl/stamping/pdfbox2/PDFBoxFont.java
@@ -27,8 +27,6 @@ import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 
-import at.gv.egiz.pdfas.common.settings.SignatureProfileSettings;
-import at.gv.egiz.pdfas.lib.impl.stamping.TableFactory;
 import org.apache.pdfbox.pdmodel.font.PDFont;
 import org.apache.pdfbox.pdmodel.font.PDType0Font;
 import org.apache.pdfbox.pdmodel.font.PDType1Font;
@@ -158,23 +156,17 @@ public class PDFBoxFont {
 //		return null;
 //	}
 
-	private PDFont generateTTF(String fonttype, PDFBOXObject pdfObject)
-			throws IOException {
-
-
+	private PDFont generateTTF(String fonttype, PDFBOXObject pdfObject) throws IOException {
 		ttfFontDesc = fonttype;
 		String fontName = fonttype.replaceFirst("TTF:", "");
-		String fontPath = this.settings.getWorkingDirectory() + File.separator
-				+ "fonts" + File.separator + fontName;
+		String fontPath = this.settings.getWorkingDirectory() + File.separator + "fonts" + File.separator + fontName;
 		
 		logger.debug("Font from: \"" + fontPath + "\".");
-
-
-		PDFAsFontCache fontCache = pdfObject.getSigBlockFontCache();
-		
+		PDFAsFontCache fontCache = pdfObject.getSigBlockFontCache();		
 		if(fontCache.contains(fontPath)){
 			logger.debug("Using cached font.");
 			return fontCache.getFont(fontPath);
+			
 		}
 
 		
@@ -209,6 +201,7 @@ public class PDFBoxFont {
 		if (fonttype.startsWith("TTF:")) {
 			// Load TTF Font
 			return generateTTF(fonttype, pdfObject);
+			
 		} else {
 			if (fontder == null) {
 				fontder = NORMAL;
@@ -219,8 +212,10 @@ public class PDFBoxFont {
 			if (font == null) {
 				pdfObject.getSigBlockFontCache().showAvailableFonts();
 				throw new IOException("Invalid font descriptor \"" + fontDesc + "\"");
-			}
+				
+			}			
 			return font;
+			
 		}
 	}