diff options
4 files changed, 22 insertions, 11 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) { diff --git a/pdf-over-signer/pdf-over-sigpdfas4/pom.xml b/pdf-over-signer/pdf-over-sigpdfas4/pom.xml index ef889af9..80bd6547 100644 --- a/pdf-over-signer/pdf-over-sigpdfas4/pom.xml +++ b/pdf-over-signer/pdf-over-sigpdfas4/pom.xml @@ -10,7 +10,7 @@ <name>PDF-Over PDF-AS 4 Signer</name>
<properties>
<project.maindir>${project.basedir}/../..</project.maindir>
- <pdf-as.version>4.2.0-pdfOver</pdf-as.version>
+ <pdf-as.version>4.2.1-snapshot</pdf-as.version>
</properties>
<dependencies>
<dependency>
@@ -59,6 +59,11 @@ <version>${project.parent.version}</version>
<scope>compile</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.pdfbox</groupId>
+ <artifactId>pdfbox</artifactId>
+ <version>2.0.24</version>
+ </dependency>
</dependencies>
<repositories>
<repository>
@@ -76,9 +81,9 @@ <url>file://${project.maindir}/repo</url>
</repository>
<repository>
- <id>EGIZ SNAPSHOT Repo</id>
- <name>EGIZ SNAPSHOT Maven Repository</name>
- <url>https://apps.egiz.gv.at/snapshots/</url>
+ <id>EGIZ SNAPSHOT Repo 2</id>
+ <name>EGIZ SNAPSHOT Maven Repository 2</name>
+ <url>https://apps.egiz.gv.at/snapshot/</url>
</repository>
</repositories>
</project>
@@ -238,5 +238,10 @@ <name>Internal Repository</name>
<url>https://apps.egiz.gv.at/maven/</url>
</repository>
+ <repository>
+ <id>EGIZ Maven Snapshot</id>
+ <name>EGIZ Maven Snapshot Repository</name>
+ <url>https://apps.egiz.gv.at/maven-snapshot/</url>
+ </repository>
</repositories>
</project>
|