summaryrefslogtreecommitdiff
path: root/pdf-over-gui
diff options
context:
space:
mode:
authorAndreas Abraham <andreas.abraham@egiz.gv.at>2021-08-13 14:43:48 +0200
committerAndreas Abraham <andreas.abraham@egiz.gv.at>2021-08-13 14:43:48 +0200
commitab9a63655476c392d95fca3beff8eb59edeccc39 (patch)
tree12393a0de6789844a8b6d922993cfe7195c0467b /pdf-over-gui
parent96a342a4a75684d521d2abfbd912531a6f150d08 (diff)
downloadpdf-over-ab9a63655476c392d95fca3beff8eb59edeccc39.tar.gz
pdf-over-ab9a63655476c392d95fca3beff8eb59edeccc39.tar.bz2
pdf-over-ab9a63655476c392d95fca3beff8eb59edeccc39.zip
updated PDF-AS version
Diffstat (limited to 'pdf-over-gui')
-rw-r--r--pdf-over-gui/src/main/java/at/asit/pdfover/gui/bku/MobileBKUConnector.java2
-rw-r--r--pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/OpenState.java13
2 files changed, 8 insertions, 7 deletions
diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/bku/MobileBKUConnector.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/bku/MobileBKUConnector.java
index 09e8d17d..b24761a9 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/bku/MobileBKUConnector.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/bku/MobileBKUConnector.java
@@ -50,7 +50,7 @@ public class MobileBKUConnector implements BkuSlConnector {
this.state = state;
}
- /* (non-Javadoc)
+ /** (non-Javadoc)
* @see at.asit.pdfover.signator.BkuSlConnector#handleSLRequest(java.lang.String)
*/
@Override
diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/OpenState.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/OpenState.java
index e9f23b2c..89ca3ef9 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/OpenState.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/OpenState.java
@@ -21,6 +21,9 @@ import java.io.FileWriter;
import java.io.IOException;
import java.io.InputStreamReader;
import java.util.List;
+
+import at.gv.egiz.pdfas.lib.impl.pdfbox2.placeholder.SignatureFieldsAndPlaceHolderExtractor;
+
import org.apache.pdfbox.pdmodel.PDDocument;
//Imports
@@ -39,11 +42,9 @@ import at.asit.pdfover.gui.workflow.StateMachine;
import at.asit.pdfover.gui.workflow.Status;
import at.asit.pdfover.gui.workflow.config.ConfigProvider;
import at.asit.pdfover.signator.SignaturePosition;
-import at.gv.egiz.pdfas.common.exceptions.PdfAsException;
import at.gv.egiz.pdfas.lib.impl.placeholder.SignaturePlaceholderData;
-import at.gv.egiz.pdfas.lib.impl.pdfbox2.placeholder.SignatureFieldsExtractor;
-import at.gv.egiz.pdfas.lib.impl.pdfbox2.placeholder.SignaturePlaceholderExtractor;
-//import at.gv.egiz.pdfas.lib.impl.pdfbox2.placeholder.
+
+
import org.apache.commons.configuration.PropertiesConfiguration;
import org.apache.commons.configuration.PropertiesConfigurationLayout;
@@ -114,7 +115,7 @@ public class OpenState extends State {
//first check the signature fields placeholder
if (getStateMachine().getConfigProvider().getUseSignatureFields()) {
- List<String> fields = SignatureFieldsExtractor.findEmptySignatureFields(pddocument);
+ List<String> fields = SignatureFieldsAndPlaceHolderExtractor.findEmptySignatureFields(pddocument);
if (fields.size() > 0) {
@@ -157,7 +158,7 @@ public class OpenState extends State {
// second check if qr code placeholder search is enabled
} else if (getStateMachine().getConfigProvider().getUseMarker()) {
- SignaturePlaceholderData signaturePlaceholderData = SignatureFieldsExtractor.getNextSignaturePlaceHolder(pddocument);
+ SignaturePlaceholderData signaturePlaceholderData = SignatureFieldsAndPlaceHolderExtractor.getNextUnusedSignaturePlaceHolder(pddocument);
if (null != signaturePlaceholderData) {