diff options
3 files changed, 33 insertions, 89 deletions
diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/PDFSigner.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/PDFSigner.java index 9d174302..2f670556 100644 --- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/PDFSigner.java +++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/PDFSigner.java @@ -16,28 +16,44 @@ package at.asit.pdfover.gui.workflow; // Imports +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import at.asit.pdfover.signator.Signator; +import at.asit.pdfover.signator.Signator.Signers; import at.asit.pdfover.signator.Signer; /** * */ -public interface PDFSigner { +public class PDFSigner { /** - * Gets the PDF Signer Type - * @return the signer type - */ - public Signator.Signers getUsedPDFSignerLibrary(); + * SLF4J Logger instance + **/ + @SuppressWarnings("unused") + private static final Logger log = LoggerFactory.getLogger(PDFSigner.class); - /** - * Set PDF Signer Type - * @param signer the signer type - */ - public void setUsedPDFSignerLibrary(Signator.Signers signer); + private Signers signer = Signator.Signers.PDFAS4; + + public Signers getUsedPDFSignerLibrary() { + return this.signer; + } + + public void setUsedPDFSignerLibrary(Signers signer) { + if(signer != this.signer) { + // TYPE CHANGE remove cached signer! + this.signerLib = null; + } + this.signer = signer; + } + + private Signer signerLib; + + public Signer getPDFSigner() { + if(this.signerLib == null) { + this.signerLib = Signator.getSigner(getUsedPDFSignerLibrary()); + } + return this.signerLib; + } - /** - * Gets the currently used PDF Signer - * @return the pdf signer - */ - public Signer getPDFSigner(); } diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/PDFSignerImpl.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/PDFSignerImpl.java deleted file mode 100644 index c858f46d..00000000 --- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/PDFSignerImpl.java +++ /dev/null @@ -1,72 +0,0 @@ -/* - * Copyright 2012 by A-SIT, Secure Information Technology Center Austria - * - * Licensed under the EUPL, Version 1.1 or - as soon they will be approved by - * the European Commission - subsequent versions of the EUPL (the "Licence"); - * You may not use this work except in compliance with the Licence. - * You may obtain a copy of the Licence at: - * http://joinup.ec.europa.eu/software/page/eupl - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the Licence is distributed on an "AS IS" basis, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the Licence for the specific language governing permissions and - * limitations under the Licence. - */ -package at.asit.pdfover.gui.workflow; - -// Imports -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import at.asit.pdfover.signator.Signator; -import at.asit.pdfover.signator.Signator.Signers; -import at.asit.pdfover.signator.Signer; - -/** - * - */ -public class PDFSignerImpl implements PDFSigner { - /** - * SLF4J Logger instance - **/ - @SuppressWarnings("unused") - private static final Logger log = LoggerFactory - .getLogger(PDFSignerImpl.class); - - private Signers signer = Signator.Signers.PDFAS4; - - /* (non-Javadoc) - * @see at.asit.pdfover.gui.workflow.PDFSigner#getPDFSignerType() - */ - @Override - public Signers getUsedPDFSignerLibrary() { - return this.signer; - } - - /* (non-Javadoc) - * @see at.asit.pdfover.gui.workflow.PDFSigner#setPDFSignerType(at.asit.pdfover.signator.Signator.Signers) - */ - @Override - public void setUsedPDFSignerLibrary(Signers signer) { - if(signer != this.signer) { - // TYPE CHANGE remove cached signer! - this.signerLib = null; - } - this.signer = signer; - } - - private Signer signerLib; - - /* (non-Javadoc) - * @see at.asit.pdfover.gui.workflow.PDFSigner#getPDFSigner() - */ - @Override - public Signer getPDFSigner() { - if(this.signerLib == null) { - this.signerLib = Signator.getSigner(getUsedPDFSignerLibrary()); - } - return this.signerLib; - } - -} diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/StateMachine.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/StateMachine.java index 9a71bde2..5a1248d7 100644 --- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/StateMachine.java +++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/StateMachine.java @@ -46,7 +46,7 @@ public class StateMachine implements GUIProvider { private Status status; - private PDFSignerImpl pdfSigner; + private PDFSigner pdfSigner; private ConfigProviderImpl configProvider; @@ -58,7 +58,7 @@ public class StateMachine implements GUIProvider { public StateMachine(String[] cmdLineArgs) { this.status = new Status(); this.status.setCurrentState(new PrepareConfigurationState(this)); - this.pdfSigner = new PDFSignerImpl(); + this.pdfSigner = new PDFSigner(); this.configProvider = new ConfigProviderImpl(); setCmdLineArgs(cmdLineArgs); } |