YAGNI: SigningState interface

7 files changed, 17 insertions, 15 deletions

diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/bku/MobileBKUConnector.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/bku/MobileBKUConnector.java
index d7d98172..2944dd07 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/bku/MobileBKUConnector.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/bku/MobileBKUConnector.java
@@ -54,7 +54,7 @@ public class MobileBKUConnector implements BkuSlConnector {
 	 */

 	@Override

 	public SLResponse handleSLRequest(SLRequest request) throws SignatureException {

-		PdfAs4SigningState signingState = (PdfAs4SigningState) this.state.getSigningState();

+		PdfAs4SigningState signingState = this.state.getSigningState();

 		signingState.setSignatureRequest(request);

 

 		MobileBKUHandler handler = this.state.handler;

diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/bku/mobile/MobileBKUHandler.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/bku/mobile/MobileBKUHandler.java
index 90e4ff46..b3231cf2 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/bku/mobile/MobileBKUHandler.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/bku/mobile/MobileBKUHandler.java
@@ -39,7 +39,7 @@ import at.asit.pdfover.gui.utils.FileUploadSource;
 import at.asit.pdfover.gui.workflow.states.LocalBKUState;

 import at.asit.pdfover.gui.workflow.states.MobileBKUState;

 import at.asit.pdfover.signator.SLRequest;

-import at.asit.pdfover.signator.SigningState;

+import at.asit.pdfover.signer.pdfas.PdfAs4SigningState;

 

 /**

  * A mobile BKU Handler

@@ -151,7 +151,7 @@ public abstract class MobileBKUHandler {
 	 * Get the SigningState

 	 * @return the SigningState

 	 */

-	protected SigningState getSigningState() {

+	protected PdfAs4SigningState getSigningState() {

 		return state.getSigningState();

 	}

 

diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/Status.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/Status.java
index 3920b4d7..a6e6c28a 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/Status.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/Status.java
@@ -26,7 +26,7 @@ import at.asit.pdfover.gui.workflow.states.State;
 import at.asit.pdfover.signator.BKUs;
 import at.asit.pdfover.signator.SignResult;
 import at.asit.pdfover.signator.SignaturePosition;
-import at.asit.pdfover.signator.SigningState;
+import at.asit.pdfover.signer.pdfas.PdfAs4SigningState;
 
 public class Status {
 	private static final Logger log = LoggerFactory.getLogger(Status.class);
@@ -41,7 +41,7 @@ public class Status {
 
 	private State previousState = null;
 
-	public SigningState signingState = null;
+	public PdfAs4SigningState signingState = null;
 
 	public SignResult signResult = null;
 
diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/KSState.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/KSState.java
index 443f54af..ad0f1863 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/KSState.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/KSState.java
@@ -37,7 +37,7 @@ import at.asit.pdfover.gui.workflow.Status;
 import at.asit.pdfover.gui.workflow.config.ConfigurationManager;
 import at.asit.pdfover.gui.workflow.config.ConfigurationDataInMemory.KeyStorePassStorageType;
 import at.asit.pdfover.signator.SignatureException;
-import at.asit.pdfover.signator.SigningState;
+import at.asit.pdfover.signer.pdfas.PdfAs4SigningState;
 
 /**
  * Logical state for performing the BKU Request to a local BKU
@@ -78,7 +78,7 @@ public class KSState extends State {
 	public void run() {
 		Status status = getStateMachine().status;
 
-		SigningState signingState = status.signingState;
+		PdfAs4SigningState signingState = status.signingState;
 		ConfigurationManager config = getStateMachine().configProvider;
 
 		try {
diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/LocalBKUState.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/LocalBKUState.java
index 51151338..779d39c7 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/LocalBKUState.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/LocalBKUState.java
@@ -36,7 +36,7 @@ import at.asit.pdfover.commons.Messages;
 import at.asit.pdfover.gui.workflow.StateMachine;
 import at.asit.pdfover.gui.workflow.Status;
 import at.asit.pdfover.signator.SLResponse;
-import at.asit.pdfover.signator.SigningState;
+import at.asit.pdfover.signer.pdfas.PdfAs4SigningState;
 
 /**
  * Logical state for performing the BKU Request to a local BKU
@@ -88,14 +88,14 @@ public class LocalBKUState extends State {
 	private final class SignLocalBKUThread implements Runnable {
 
 		private LocalBKUState state;
-		private SigningState signingState;
+		private PdfAs4SigningState signingState;
 
 
 		/**
 		 * @param localBKUState
 		 * @param signingState
 		 */
-		public SignLocalBKUThread(LocalBKUState localBKUState, SigningState signingState) {
+		public SignLocalBKUThread(LocalBKUState localBKUState, PdfAs4SigningState signingState) {
 			this.state = localBKUState;
 			this.signingState = signingState;
 		}
@@ -173,7 +173,7 @@ public class LocalBKUState extends State {
 	public void run() {
 		Status status = getStateMachine().status;
 
-		SigningState signingState = status.signingState;
+		PdfAs4SigningState signingState = status.signingState;
 
 		if (!signingState.hasSignatureResponse()
 				&& this.threadException == null) {
diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/MobileBKUState.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/MobileBKUState.java
index fc4025c0..e74ba969 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/MobileBKUState.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/MobileBKUState.java
@@ -24,6 +24,8 @@ import java.util.TimerTask;
 // Imports

 import at.asit.pdfover.gui.exceptions.ATrustConnectionException;

 import at.asit.pdfover.signator.SignatureException;

+import at.asit.pdfover.signer.pdfas.PdfAs4SigningState;

+

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.widgets.Display;

 import org.slf4j.Logger;

@@ -49,7 +51,6 @@ import at.asit.pdfover.gui.controls.ErrorDialog;
 import at.asit.pdfover.commons.Messages;

 import at.asit.pdfover.gui.workflow.StateMachine;

 import at.asit.pdfover.gui.workflow.config.ConfigurationManager;

-import at.asit.pdfover.signator.SigningState;

 

 /**

  * Logical state for performing the BKU Request to the A-Trust Mobile BKU

@@ -57,7 +58,7 @@ import at.asit.pdfover.signator.SigningState;
 public class MobileBKUState extends State {

 	static final Logger log = LoggerFactory.getLogger(MobileBKUState.class);

 

-	SigningState signingState;

+	PdfAs4SigningState signingState;

 

 	public Exception threadException = null;

 

@@ -155,7 +156,7 @@ public class MobileBKUState extends State {
 	/**

 	 * @return the signingState

 	 */

-	public SigningState getSigningState() {

+	public PdfAs4SigningState getSigningState() {

 		return this.signingState;

 	}

 

diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/PrepareSigningState.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/PrepareSigningState.java
index e6a10aa6..26fd0cab 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/PrepareSigningState.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/PrepareSigningState.java
@@ -36,6 +36,7 @@ import at.asit.pdfover.signator.CachedFileNameEmblem;
 import at.asit.pdfover.signator.PDFFileDocumentSource;
 import at.asit.pdfover.signer.pdfas.PdfAs4SignatureParameter;
 import at.asit.pdfover.signer.pdfas.PdfAs4Signer;
+import at.asit.pdfover.signer.pdfas.PdfAs4SigningState;
 
 /**
  * User waiting state, wait for PDF Signator library to prepare document for
@@ -180,7 +181,7 @@ public class PrepareSigningState extends State {
 		return this.waitingComposite;
 	}
 
-	at.asit.pdfover.signator.SigningState signingState = null;
+	PdfAs4SigningState signingState = null;
 
 	Exception threadException = null;