diff options
Diffstat (limited to 'pdf-as-common/src/main')
4 files changed, 8 insertions, 13 deletions
diff --git a/pdf-as-common/src/main/java/at/gv/egiz/pdfas/common/settings/DefaultSignatureProfileSettings.java b/pdf-as-common/src/main/java/at/gv/egiz/pdfas/common/settings/DefaultSignatureProfileSettings.java index 6e288a27..c1f9e031 100644 --- a/pdf-as-common/src/main/java/at/gv/egiz/pdfas/common/settings/DefaultSignatureProfileSettings.java +++ b/pdf-as-common/src/main/java/at/gv/egiz/pdfas/common/settings/DefaultSignatureProfileSettings.java @@ -65,7 +65,7 @@ public class DefaultSignatureProfileSettings { public static final String VALUE_SIG_DATE_DEFAULT = "yyyy-MM-dd'T'HH:mm:ssXXX"; - public static final String SIG_BLOCK_PARAMETER_DEFAULT_KEY_REGEX = "^([A-za-z]){1,20}$"; + public static final String SIG_BLOCK_PARAMETER_DEFAULT_KEY_REGEX = "^([A-Za-z]){1,20}$"; // public static final String SIG_BLOCK_PARAMETER_DEFAULT_VALUE_REGEX = "^([\\p{Print}-ß_'\\+\\!\u00e4\u00f6\u00fc" + // "\u00c4\u00d6\u00dc]){1,100}$"; public static final String SIG_BLOCK_PARAMETER_DEFAULT_VALUE_REGEX = "^([\\p{Print}\u00df\u00A7\u20AC\u00e4\u00f6\u00fc\u00c4\u00d6\u00dc]){1,100}$"; diff --git a/pdf-as-common/src/main/java/at/gv/egiz/pdfas/common/settings/IProfileConstants.java b/pdf-as-common/src/main/java/at/gv/egiz/pdfas/common/settings/IProfileConstants.java index 95eaa8ea..fdc67d70 100644 --- a/pdf-as-common/src/main/java/at/gv/egiz/pdfas/common/settings/IProfileConstants.java +++ b/pdf-as-common/src/main/java/at/gv/egiz/pdfas/common/settings/IProfileConstants.java @@ -89,7 +89,6 @@ public interface IProfileConstants { public final static String TMP_DIR_DEFAULT_VALUE = "pdfastmp"; public final static String SIGNING_REASON = "adobeSignReasonValue"; - public final static String SIGNFIELD_VALUE = "adobeSignFieldValue"; public final static String TIMEZONE_BASE = "timezone"; public final static String SIG_PDFA1B_VALID = "SIG_PDFA1B_VALID"; public final static String SIG_PDFA_VALID = "SIG_PDFA_VALID"; 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 65722f88..5a6f7791 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 @@ -190,10 +190,6 @@ public class SignatureProfileSettings implements IProfileConstants { return this.getValue(SIGNING_REASON); } - public String getSignFieldValue() { - return this.getValue(SIGNFIELD_VALUE); - } - public String getProfileTimeZone() { return this.getValue(TIMEZONE_BASE); } @@ -211,13 +207,13 @@ public class SignatureProfileSettings implements IProfileConstants { SignatureProfileEntry entry = profileInformations.get(SIG_PDFA_VALID); if (entry != null) { final String value = entry.getCaption(); - return "true".equals(value); + return Boolean.parseBoolean(value); } entry = profileInformations.get(SIG_PDFA1B_VALID); if (entry != null) { final String value = entry.getCaption(); - return "true".equals(value); + return Boolean.parseBoolean(value); } return false; } @@ -226,7 +222,7 @@ public class SignatureProfileSettings implements IProfileConstants { final SignatureProfileEntry entry = profileInformations.get(SIG_PDFUA_FORCE); if (entry != null) { final String value = entry.getCaption(); - return "true".equals(value); + return Boolean.parseBoolean(value); } return false; } @@ -235,7 +231,7 @@ public class SignatureProfileSettings implements IProfileConstants { final SignatureProfileEntry entry = profileInformations.get(LATIN1_ENCODING); if (entry != null) { final String value = entry.getCaption(); - return "true".equals(value); + return Boolean.parseBoolean(value); } return false; } @@ -248,7 +244,7 @@ public class SignatureProfileSettings implements IProfileConstants { final SignatureProfileEntry entry = profileInformations.get(SIG_PDFA_VALID); if (entry != null) { final String value = entry.getCaption(); - return "true".equals(value); + return Boolean.parseBoolean(value); } return false; } diff --git a/pdf-as-common/src/main/java/at/gv/egiz/pdfas/common/utils/SettingsUtils.java b/pdf-as-common/src/main/java/at/gv/egiz/pdfas/common/utils/SettingsUtils.java index 7628406d..c0428afd 100644 --- a/pdf-as-common/src/main/java/at/gv/egiz/pdfas/common/utils/SettingsUtils.java +++ b/pdf-as-common/src/main/java/at/gv/egiz/pdfas/common/utils/SettingsUtils.java @@ -6,9 +6,9 @@ public class SettingsUtils { public static boolean getBooleanValue(ISettings setting, String key, boolean defaultValue) { String theValue = setting.getValue(key); if(theValue != null) { - if(theValue.equals("true")) { + if(theValue.equalsIgnoreCase("true")) { return true; - } else if(theValue.equals("false")) { + } else if(theValue.equalsIgnoreCase("false")) { return false; } else { return defaultValue; |