Pdf AS validation

2 files changed, 28 insertions, 1 deletions

diff --git a/pdf-as-common/src/main/java/at/gv/egiz/pdfas/common/exceptions/PdfAsValidationException.java b/pdf-as-common/src/main/java/at/gv/egiz/pdfas/common/exceptions/PdfAsValidationException.java
new file mode 100644
index 00000000..61bfffda
--- /dev/null
+++ b/pdf-as-common/src/main/java/at/gv/egiz/pdfas/common/exceptions/PdfAsValidationException.java
@@ -0,0 +1,23 @@
+package at.gv.egiz.pdfas.common.exceptions;
+
+import at.gv.egiz.pdfas.common.messages.MessageResolver;
+
+public class PdfAsValidationException extends PdfAsException {
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -2428540014894153122L;
+
+	private String parameter;
+	
+	public PdfAsValidationException(String msgId, String parameter) {
+		super(msgId);
+		this.parameter = parameter;
+	}
+	
+	@Override
+	protected String localizeMessage(String msgId) {
+        return String.format(MessageResolver.resolveMessage(msgId), parameter);
+    }
+}
diff --git a/pdf-as-common/src/main/java/at/gv/egiz/pdfas/common/settings/Settings.java b/pdf-as-common/src/main/java/at/gv/egiz/pdfas/common/settings/Settings.java
index f3e17ab8..255c8ba8 100644
--- a/pdf-as-common/src/main/java/at/gv/egiz/pdfas/common/settings/Settings.java
+++ b/pdf-as-common/src/main/java/at/gv/egiz/pdfas/common/settings/Settings.java
@@ -42,7 +42,11 @@ public class Settings implements ISettings, IProfileConstants{
             	while(includeIterator.hasNext()) {
             		String includeFile = configDir + File.separator + includeIterator.next();
             		logger.debug("Loading included cfg file: " + includeFile);
-            		properties.load(new FileInputStream(includeFile));
+            		try {
+            			properties.load(new FileInputStream(includeFile));
+            		} catch(Throwable e) {
+            			logger.error("Failed to load cfg file " + includeFile, e);
+            		}
             	}
             }