summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Abraham <andreas.abraham@egiz.gv.at>2020-11-13 12:18:13 +0100
committerAndreas Abraham <andreas.abraham@egiz.gv.at>2020-11-13 12:18:13 +0100
commita43f3b3f266a63a505ae866a2378f01e5b508cc9 (patch)
tree9c03a385d696f5c7871776a0f8c158bb77b4a81f
parent1ccaee68474946e2509854a62b6d7e380bca6e7c (diff)
downloadpdf-over-a43f3b3f266a63a505ae866a2378f01e5b508cc9.tar.gz
pdf-over-a43f3b3f266a63a505ae866a2378f01e5b508cc9.tar.bz2
pdf-over-a43f3b3f266a63a505ae866a2378f01e5b508cc9.zip
new module pdf-over-commons added
-rw-r--r--.gitignore3
-rw-r--r--pdf-over-commons/pdf-over-commons.iml15
-rw-r--r--pdf-over-commons/pom.xml15
-rw-r--r--pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/SimpleConfigurationComposite.java2
-rw-r--r--pdf-over-signer/pdf-over-sigpdfas4/src/main/java/at/asit/pdfover/signer/pdfas/PdfAs4SignatureParameter.java22
-rw-r--r--pom.xml1
6 files changed, 47 insertions, 11 deletions
diff --git a/.gitignore b/.gitignore
index 6787d1cc..8ec0355c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,4 +15,5 @@ log/
*pom.xml.releaseBackup
pdf-over-build/
release.properties
-*.jar-bak \ No newline at end of file
+*.jar-bak
+*.iml \ No newline at end of file
diff --git a/pdf-over-commons/pdf-over-commons.iml b/pdf-over-commons/pdf-over-commons.iml
new file mode 100644
index 00000000..c035f0b0
--- /dev/null
+++ b/pdf-over-commons/pdf-over-commons.iml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+ <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
+ <output url="file://$MODULE_DIR$/target/classes" />
+ <output-test url="file://$MODULE_DIR$/target/test-classes" />
+ <content url="file://$MODULE_DIR$">
+ <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+ <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+ <excludeFolder url="file://$MODULE_DIR$/target" />
+ </content>
+ <orderEntry type="inheritedJdk" />
+ <orderEntry type="sourceFolder" forTests="false" />
+ </component>
+</module> \ No newline at end of file
diff --git a/pdf-over-commons/pom.xml b/pdf-over-commons/pom.xml
new file mode 100644
index 00000000..1a68b59a
--- /dev/null
+++ b/pdf-over-commons/pom.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <parent>
+ <artifactId>pdf-over</artifactId>
+ <groupId>at.a-sit</groupId>
+ <version>4.2.4-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+
+ <artifactId>pdf-over-commons</artifactId>
+
+
+</project> \ No newline at end of file
diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/SimpleConfigurationComposite.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/SimpleConfigurationComposite.java
index 26f67da3..d65c45a5 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/SimpleConfigurationComposite.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/SimpleConfigurationComposite.java
@@ -767,7 +767,7 @@ public class SimpleConfigurationComposite extends BaseConfigurationComposite {
param.setSignatureProfile(this.configurationContainer.getSignatureProfile().getName());
} catch (Exception e){
- log.debug("Cannot save siganture profile" + e.getMessage());
+ log.debug("Cannot save signature profile" + e.getMessage());
}
}
diff --git a/pdf-over-signer/pdf-over-sigpdfas4/src/main/java/at/asit/pdfover/signer/pdfas/PdfAs4SignatureParameter.java b/pdf-over-signer/pdf-over-sigpdfas4/src/main/java/at/asit/pdfover/signer/pdfas/PdfAs4SignatureParameter.java
index 57f36fbd..5d286d44 100644
--- a/pdf-over-signer/pdf-over-sigpdfas4/src/main/java/at/asit/pdfover/signer/pdfas/PdfAs4SignatureParameter.java
+++ b/pdf-over-signer/pdf-over-sigpdfas4/src/main/java/at/asit/pdfover/signer/pdfas/PdfAs4SignatureParameter.java
@@ -34,6 +34,7 @@ import at.gv.egiz.pdfas.lib.api.Configuration;
import at.gv.egiz.pdfas.lib.api.PdfAs;
import at.gv.egiz.pdfas.lib.api.PdfAsFactory;
import at.gv.egiz.pdfas.lib.api.sign.SignParameter;
+import at.asit.pdfover.gui.Constants;
/**
* Implementation of SignatureParameter for PDF-AS 4 Library
@@ -49,7 +50,7 @@ public class PdfAs4SignatureParameter extends SignatureParameter {
private static final String PROFILE_ID_NOTE = "_NOTE";
/** The profile ID extension for PDF/A compatibility */
private static final String PROFILE_ID_PDFA = "_PDFA";
-
+
/**
* Visibility of signature block
*/
@@ -58,7 +59,7 @@ public class PdfAs4SignatureParameter extends SignatureParameter {
private HashMap<String, String> genericProperties = new HashMap<String, String>();
/**
- * This parameters are defining the signature block size
+ * This parameters are defining the signature block size
*/
private int sig_w = 229;
private int sig_h = 77;
@@ -131,7 +132,7 @@ public class PdfAs4SignatureParameter extends SignatureParameter {
/**
* Gets the Signature Position String for PDF-AS
- *
+ *
* @return Signature Position String
*/
public String getPdfAsSignaturePosition() {
@@ -168,14 +169,16 @@ public class PdfAs4SignatureParameter extends SignatureParameter {
//Add Signature Param here//
String profileId;
-
-
-
+
+
+
if (!PROFILE_VISIBILITY || this.profile.equals("Unsichtbar"))
{
- profileId ="INVISIBLE";
+ //TODO set base profile id using the this.profile
+ //TODO verifiy
+ profileId = "INVISIBLE";
} else {
- profileId = PROFILE_ID_BASE;
+ profileId = Constants.PROFILE.getProfile(this.profile).name();//PROFILE_ID_BASE;
profileId += (lang != null && lang.equals("en")) ?
PROFILE_ID_LANG_EN : PROFILE_ID_LANG_DE;
}
@@ -187,7 +190,8 @@ public class PdfAs4SignatureParameter extends SignatureParameter {
if (usePdfACompat)
profileId += PROFILE_ID_PDFA;
- log.debug("Profile ID: {0}", profileId);
+ log.debug("Profile ID: {}", profileId);
+ System.out.println(profileId);
return profileId;
}
diff --git a/pom.xml b/pom.xml
index 822e6ade..cc7914c8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -85,6 +85,7 @@
<module>pdf-over-gui</module>
<module>pdf-over-signator</module>
<module>pdf-over-signer</module>
+ <module>pdf-over-commons</module>
</modules>
<properties>