diff options
| author | Emina Ahmetovic <emina.ahmetovic@egiz.gv.at> | 2020-09-24 09:46:48 +0200 |
|---|---|---|
| committer | Emina Ahmetovic <emina.ahmetovic@egiz.gv.at> | 2020-09-24 09:46:48 +0200 |
| commit | 7f66428916800f37fcc3ea67310d2ef73eb2fa38 (patch) | |
| tree | fa85a78c66e86ee39ca3f57397bde06d1976c8e4 /pdf-as-lib/src/main | |
| parent | a07da1a7cf59e01e4125c82fafe3a2ab837e6a53 (diff) | |
| download | pdf-as-4-7f66428916800f37fcc3ea67310d2ef73eb2fa38.tar.gz pdf-as-4-7f66428916800f37fcc3ea67310d2ef73eb2fa38.tar.bz2 pdf-as-4-7f66428916800f37fcc3ea67310d2ef73eb2fa38.zip | |
update libraries, use StringUtils
Diffstat (limited to 'pdf-as-lib/src/main')
| -rw-r--r-- | pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/placeholder/PlaceholderFilter.java | 11 | ||||
| -rw-r--r-- | pdf-as-lib/src/main/resources/config/config.zip | bin | 1277230 -> 1276558 bytes |
2 files changed, 6 insertions, 5 deletions
diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/placeholder/PlaceholderFilter.java b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/placeholder/PlaceholderFilter.java index 5919ee5d..500b9e24 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/placeholder/PlaceholderFilter.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/placeholder/PlaceholderFilter.java @@ -32,6 +32,7 @@ import at.gv.egiz.pdfas.common.settings.ISettings; import at.gv.egiz.pdfas.lib.api.IConfigurationConstants; import at.gv.egiz.pdfas.lib.impl.configuration.PlaceholderWebConfiguration; import at.gv.egiz.pdfas.lib.impl.status.OperationStatus; +import org.apache.commons.lang3.StringUtils; public class PlaceholderFilter implements IConfigurationConstants, PlaceholderExtractorConstants { @@ -45,18 +46,18 @@ public class PlaceholderFilter implements IConfigurationConstants, if (status.getPlaceholderConfiguration().isGlobalPlaceholderEnabled()) { PlaceholderExtractor extractor = status.getBackend().getPlaceholderExtractor(); - if(signatureLocation!=null) { + if(StringUtils.isNotEmpty(signatureLocation)) { placeholderID = signatureLocation; } else { placeholderID = PlaceholderWebConfiguration.getValue(PLACEHOLDER_WEB_ID); - if(placeholderID == null) { + if(StringUtils.isEmpty(placeholderID)) { placeholderID = settings.getValue(PLACEHOLDER_ID); } } String placeholderModeString = settings.getValue(PLACEHOLDER_MODE); int placeholderMode = PLACEHOLDER_MATCH_MODE_MODERATE; - if (placeholderModeString != null) { + if (StringUtils.isNotEmpty(placeholderModeString)) { try { placeholderMode = Integer.parseInt(placeholderModeString); if (placeholderMode < PLACEHOLDER_MODE_MIN @@ -78,11 +79,11 @@ public class PlaceholderFilter implements IConfigurationConstants, int placeholderMode = PLACEHOLDER_MATCH_MODE_SORTED; placeholderID = status.getPlaceholderConfiguration().getProfilePlaceholderID(status.getRequestedSignature().getSignatureProfileID()); - if(placeholderID != null) { + if(StringUtils.isNotEmpty(placeholderID)) { placeholderMode = PLACEHOLDER_MATCH_MODE_MODERATE; } String placeholderModeString = settings.getValue(PLACEHOLDER_MODE); - if (placeholderModeString != null) { + if (StringUtils.isNotEmpty(placeholderModeString)) { try { placeholderMode = Integer.parseInt(placeholderModeString); if (placeholderMode < PLACEHOLDER_MODE_MIN diff --git a/pdf-as-lib/src/main/resources/config/config.zip b/pdf-as-lib/src/main/resources/config/config.zip Binary files differindex 666b61a6..ebfeee02 100644 --- a/pdf-as-lib/src/main/resources/config/config.zip +++ b/pdf-as-lib/src/main/resources/config/config.zip |