From 04a3b1d060e8ecb08e43e9ecf3b7fa3e1d48d362 Mon Sep 17 00:00:00 2001 From: Jakob Heher Date: Thu, 7 Jul 2022 15:38:46 +0200 Subject: cleanup unused imports/methods --- .../src/main/java/at/asit/pdfover/gui/PlaceholderSelectionGui.java | 4 ---- .../src/main/java/at/asit/pdfover/signator/Signator.java | 6 ++++-- .../src/main/java/at/asit/pdfover/signator/SignerFactory.java | 2 -- .../at/asit/pdfover/signer/pdfas/PdfAs4SignatureParameter.java | 7 ------- .../main/java/at/asit/pdfover/signer/pdfas/PdfAs4SigningState.java | 2 -- 5 files changed, 4 insertions(+), 17 deletions(-) diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/PlaceholderSelectionGui.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/PlaceholderSelectionGui.java index 0aaf52a6..eab3de92 100644 --- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/PlaceholderSelectionGui.java +++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/PlaceholderSelectionGui.java @@ -17,9 +17,6 @@ package at.asit.pdfover.gui; import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Shell; -// Imports -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import at.asit.pdfover.commons.Messages; @@ -42,7 +39,6 @@ public class PlaceholderSelectionGui extends Dialog { /** * SLF4J Logger instance **/ - private static final Logger log = LoggerFactory.getLogger(PlaceholderSelectionGui.class); protected Object result; protected Shell shlInfo; protected Combo placeholderNameDropDown; diff --git a/pdf-over-signator/src/main/java/at/asit/pdfover/signator/Signator.java b/pdf-over-signator/src/main/java/at/asit/pdfover/signator/Signator.java index 31cf18be..798788d2 100644 --- a/pdf-over-signator/src/main/java/at/asit/pdfover/signator/Signator.java +++ b/pdf-over-signator/src/main/java/at/asit/pdfover/signator/Signator.java @@ -18,6 +18,8 @@ package at.asit.pdfover.signator; //Imports import org.slf4j.Logger; import org.slf4j.LoggerFactory; + +import java.lang.reflect.InvocationTargetException; import java.util.EnumMap; import java.util.Map; @@ -55,12 +57,12 @@ public class Signator { // SignerFactory factory = (SignerFactory)pdfAsClass.newInstance(); // registerSigner(Signers.PDFAS, factory); Class pdfAs4Class = Class.forName("at.asit.pdfover.signer.pdfas.PdfAs4SignerFactory"); - SignerFactory factory = (SignerFactory)pdfAs4Class.newInstance(); + SignerFactory factory = (SignerFactory)pdfAs4Class.getDeclaredConstructor().newInstance(); registerSigner(Signers.PDFAS4, factory); } catch (ClassNotFoundException e) { log.error("PDF Signer Factory not found", e); throw new RuntimeException("PDF Signer Factory not found", e); - } catch (InstantiationException e) { + } catch (InstantiationException | InvocationTargetException | NoSuchMethodException e) { log.error("PDF Signer Factory could not be instantiated", e); throw new RuntimeException("PDF Signer Factory could not be instantiated", e); } catch (IllegalAccessException e) { diff --git a/pdf-over-signator/src/main/java/at/asit/pdfover/signator/SignerFactory.java b/pdf-over-signator/src/main/java/at/asit/pdfover/signator/SignerFactory.java index 24b86300..cde150f8 100644 --- a/pdf-over-signator/src/main/java/at/asit/pdfover/signator/SignerFactory.java +++ b/pdf-over-signator/src/main/java/at/asit/pdfover/signator/SignerFactory.java @@ -15,8 +15,6 @@ */ package at.asit.pdfover.signator; -import at.asit.pdfover.signator.Signer; - /** * A Signer factory * Creates Signer instances 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 fc469bf6..127df8cf 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 @@ -212,13 +212,6 @@ public class PdfAs4SignatureParameter extends SignatureParameter { return profileId; } - private String getProfileName() { - if (this.profile == null) { - this.profile = Profile.SIGNATURBLOCK_SMALL.name(); - } - return Profile.getProfile(this.profile).name(); - } - private String getLangProfilePart(String lang) { return (lang != null && lang.equals("en")) ? PROFILE_ID_LANG_EN : PROFILE_ID_LANG_DE; } diff --git a/pdf-over-signer/pdf-over-sigpdfas4/src/main/java/at/asit/pdfover/signer/pdfas/PdfAs4SigningState.java b/pdf-over-signer/pdf-over-sigpdfas4/src/main/java/at/asit/pdfover/signer/pdfas/PdfAs4SigningState.java index 8d8456b8..f0aff1c8 100644 --- a/pdf-over-signer/pdf-over-sigpdfas4/src/main/java/at/asit/pdfover/signer/pdfas/PdfAs4SigningState.java +++ b/pdf-over-signer/pdf-over-sigpdfas4/src/main/java/at/asit/pdfover/signer/pdfas/PdfAs4SigningState.java @@ -56,8 +56,6 @@ public class PdfAs4SigningState implements SigningState { private boolean useBase64Request; - private boolean searchForPlaceholderSignature; - /* (non-Javadoc) * @see at.asit.pdfover.signator.SigningState#getSignatureRequest() */ -- cgit v1.2.3