From 2513de9079b48864c89d7a633a0a4fa43d2f313f Mon Sep 17 00:00:00 2001 From: Jakob Heher Date: Tue, 2 Aug 2022 13:59:54 +0200 Subject: cleanup --- .../pdfover/gui/cliarguments/InvisibleProfile.java | 1 + .../signer/pdfas/PdfAs4SignatureParameter.java | 29 +++++----------------- 2 files changed, 7 insertions(+), 23 deletions(-) diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/cliarguments/InvisibleProfile.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/cliarguments/InvisibleProfile.java index 0da8aa40..f3e7c1e2 100644 --- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/cliarguments/InvisibleProfile.java +++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/cliarguments/InvisibleProfile.java @@ -51,6 +51,7 @@ public class InvisibleProfile extends Argument { log.info("Set Profile Invisible"); if (args.length > argOffset + 1) { + // TODO: this is a colossal monumental terrible hack PdfAs4SignatureParameter.PROFILE_VISIBILITY=false; log.debug("We are setting the profile visibility to false"); return argOffset + 1; diff --git a/pdf-over-signer/src/main/java/at/asit/pdfover/signer/pdfas/PdfAs4SignatureParameter.java b/pdf-over-signer/src/main/java/at/asit/pdfover/signer/pdfas/PdfAs4SignatureParameter.java index b54064ab..99b6e238 100644 --- a/pdf-over-signer/src/main/java/at/asit/pdfover/signer/pdfas/PdfAs4SignatureParameter.java +++ b/pdf-over-signer/src/main/java/at/asit/pdfover/signer/pdfas/PdfAs4SignatureParameter.java @@ -41,27 +41,10 @@ import at.asit.pdfover.commons.Profile; * Implementation of SignatureParameter for PDF-AS 4 Library */ public class PdfAs4SignatureParameter extends SignatureParameter { - /** - * The profile ID extension for the German signature block - */ - private static final String PROFILE_ID_LANG_DE = "_DE"; - /** - * The profile ID extension for the English signature block - */ - private static final String PROFILE_ID_LANG_EN = "_EN"; - /** - * The profile ID extension for the signature note - */ - private static final String PROFILE_ID_NOTE = "_NOTE"; - /** - * The profile ID extension for PDF/A compatibility - */ - private static final String PROFILE_ID_PDFA = "_PDFA"; - - private static final String PROFILE_ID_RECOMMENDED = "_RECOMMENDED"; /** - * Visibility of signature block + * this is set by CliArguments.InvisibleProfile + * TODO: this is a no good, very bad, hack */ public static boolean PROFILE_VISIBILITY = true; @@ -191,7 +174,7 @@ public class PdfAs4SignatureParameter extends SignatureParameter { case AMTSSIGNATURBLOCK: profileId = this.profile; profileId += getLangProfilePart(lang); - profileId += PROFILE_ID_RECOMMENDED; + profileId += "_RECOMMENDED"; return profileId; default: profileId = this.profile; @@ -200,17 +183,17 @@ public class PdfAs4SignatureParameter extends SignatureParameter { } if (useNote) - profileId += PROFILE_ID_NOTE; + profileId += "_NOTE"; if (usePdfACompat) - profileId += PROFILE_ID_PDFA; + profileId += "_PDFA"; log.debug("Profile ID: {}", profileId); return profileId; } private static String getLangProfilePart(String lang) { - return ("en".equals(lang)) ? PROFILE_ID_LANG_EN : PROFILE_ID_LANG_DE; + return ("en".equals(lang)) ? "_EN" : "_DE"; } @Override -- cgit v1.2.3