1 files changed, 24 insertions, 0 deletions
diff --git a/pdf-as-common/src/main/java/at/gv/egiz/pdfas/common/settings/SignatureProfileSettings.java b/pdf-as-common/src/main/java/at/gv/egiz/pdfas/common/settings/SignatureProfileSettings.java
index 5c443039..456e58b2 100644
--- a/pdf-as-common/src/main/java/at/gv/egiz/pdfas/common/settings/SignatureProfileSettings.java
+++ b/pdf-as-common/src/main/java/at/gv/egiz/pdfas/common/settings/SignatureProfileSettings.java
@@ -46,6 +46,15 @@ public class SignatureProfileSettings implements IProfileConstants {
 				String valueValue = values.get(valuesPrefix + KEY_SEPARATOR
 						+ key);
 
+				// Lookup default values
+				if(valueKey == null) {
+					valueKey = DefaultSignatureProfileSettings.getDefaultKeyCaption(key);
+				}
+				
+				if(valueValue == null) {
+					valueValue = DefaultSignatureProfileSettings.getDefaultKeyValue(key);
+				}
+				
 				SignatureProfileEntry entry = new SignatureProfileEntry();
 				entry.setKey(key);
 				entry.setCaption(valueKey);
@@ -66,6 +75,11 @@ public class SignatureProfileSettings implements IProfileConstants {
 				String valueValue = values.get(valuesPrefix + KEY_SEPARATOR
 						+ key);
 
+				// Lookup default values			
+				if(valueValue == null) {
+					valueValue = DefaultSignatureProfileSettings.getDefaultKeyValue(key);
+				}
+				
 				SignatureProfileEntry entry = profileInformations.get(key);
 				if (entry == null) {
 					entry = new SignatureProfileEntry();
@@ -100,6 +114,16 @@ public class SignatureProfileSettings implements IProfileConstants {
 
 			logger.debug("   Settings: " + key + " : " + value);
 		}
+		
+		
+		Iterator<SignatureProfileEntry> dumpIterator = 
+				profileInformations.values().iterator();
+		
+		logger.debug("Settings for profile {}", profileID);
+		while(dumpIterator.hasNext()) {
+			SignatureProfileEntry entry = dumpIterator.next();
+			logger.debug("  " + entry.toString());
+		}
 	}
 
 	public String getCaption(String key) {