From af14459241ed7c653531f769216d4e97d3c9ef2f Mon Sep 17 00:00:00 2001 From: Andreas Abraham Date: Wed, 18 Nov 2020 13:54:40 +0100 Subject: changes in pom and SignatureProfle --- .../main/java/at/asit/pdfover/commons/Profile.java | 15 ++++++--------- .../config/ConfigurationContainerImpl.java | 2 +- .../src/main/resources/cfg/PDFASConfig.zip | Bin 1269980 -> 1269817 bytes pdf-over-signer/pdf-over-sigpdfas4/pom.xml | 10 ++-------- 4 files changed, 9 insertions(+), 18 deletions(-) diff --git a/pdf-over-commons/src/main/java/at/asit/pdfover/commons/Profile.java b/pdf-over-commons/src/main/java/at/asit/pdfover/commons/Profile.java index 84de1aaa..d9694f18 100644 --- a/pdf-over-commons/src/main/java/at/asit/pdfover/commons/Profile.java +++ b/pdf-over-commons/src/main/java/at/asit/pdfover/commons/Profile.java @@ -2,13 +2,12 @@ package at.asit.pdfover.commons; public enum Profile { - SIGNATURBLOCK("Signaturblock Normal") , //$NON-NLS-1$ - SIGNATURBLOCK_SMALL("Signaturblock Klein"), //$NON-NLS-1$ + SIGNATURBLOCK_SMALL("Signaturblock Normal"), //$NON-NLS-1$ AMTSSIGNATURBLOCK("Amtssignatur"), //$NON-NLS-1$ - LOGO_ONLY("Nur Bildmarke"), //$NON-NLS-1$ + BASE_LOGO("Nur Bildmarke"), //$NON-NLS-1$ INVISIBLE("Unsichtbar"); - public static int length = 5; + public static int length = 4; private String name; Profile(String profile){ @@ -38,14 +37,12 @@ public enum Profile { } public static Profile getProfile(String profile) { - if (SIGNATURBLOCK.getName().equals(profile)) { - return SIGNATURBLOCK; - } else if (SIGNATURBLOCK_SMALL.getName().equals(profile)) { + if (SIGNATURBLOCK_SMALL.getName().equals(profile)) { return SIGNATURBLOCK_SMALL; } else if (AMTSSIGNATURBLOCK.getName().equals(profile)) { return AMTSSIGNATURBLOCK; - } else if (LOGO_ONLY.getName().equals(profile)) { - return LOGO_ONLY; + } else if (BASE_LOGO.getName().equals(profile)) { + return BASE_LOGO; } else if (INVISIBLE.getName().equals(profile)){ return INVISIBLE; } diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/config/ConfigurationContainerImpl.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/config/ConfigurationContainerImpl.java index 7d2c77c4..e00e04d6 100644 --- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/config/ConfigurationContainerImpl.java +++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/config/ConfigurationContainerImpl.java @@ -731,7 +731,7 @@ public class ConfigurationContainerImpl implements ConfigurationContainer { @Override public Profile getSignatureProfile() { if (this.signatureProfile == null) { - this.signatureProfile = Profile.SIGNATURBLOCK; + this.signatureProfile = Profile.SIGNATURBLOCK_SMALL; } return this.signatureProfile; } diff --git a/pdf-over-gui/src/main/resources/cfg/PDFASConfig.zip b/pdf-over-gui/src/main/resources/cfg/PDFASConfig.zip index 141fe64d..37fb63da 100644 Binary files a/pdf-over-gui/src/main/resources/cfg/PDFASConfig.zip and b/pdf-over-gui/src/main/resources/cfg/PDFASConfig.zip differ diff --git a/pdf-over-signer/pdf-over-sigpdfas4/pom.xml b/pdf-over-signer/pdf-over-sigpdfas4/pom.xml index 8319c8b9..f297577b 100644 --- a/pdf-over-signer/pdf-over-sigpdfas4/pom.xml +++ b/pdf-over-signer/pdf-over-sigpdfas4/pom.xml @@ -62,16 +62,10 @@ - pdf-as-4 - PDF-AS 4 Repository + EGIZ Repo + EGIZ Internal Repository https://apps.egiz.gv.at/maven/ - - pdf-as-4-rc - PDF-AS 4 Repository RC - https://apps.egiz.gv.at/releases/pdf-as/release/4.1.6RC/mvn-repo/releases/ - - local-repo file://${project.maindir}/repo -- cgit v1.2.3