YAGNI: at.asit.pdfover.signatur.SigningState.Status

1 files changed, 14 insertions, 65 deletions

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 14d917d0..3b03de78 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
@@ -31,23 +31,23 @@ import at.asit.pdfover.signator.SigningState;
 public class Status {
 	private static final Logger log = LoggerFactory.getLogger(Status.class);
 
-	private File document = null;
+	public File document = null;
 
-	private SignaturePosition signaturePosition = null;
+	public SignaturePosition signaturePosition = null;
 
-	private BKUs bku = BKUs.NONE;
+	public BKUs bku = BKUs.NONE;
 
 	private State currentState = null;
 
 	private State previousState = null;
 
-	private SigningState signingState = null;
+	public SigningState signingState = null;
 
-	private SignResult signResult = null;
+	public SignResult signResult = null;
 
-	private MainWindowBehavior behavior;
+	public final MainWindowBehavior behavior;
 
-	private boolean searchForPlacehoderSignature = false;
+	public boolean searchForPlacehoderSignature = false;
 
 	public Status() {
 		this.behavior = new MainWindowBehavior();
@@ -58,15 +58,16 @@ public class Status {
 	}
 
 	public void setCurrentState(State currentState) {
-		//if (this.previousState == this.currentState)
-		//	log.error("Changing to same state? " + this.currentState);
+		log.debug("Changing from " + this.currentState + " to " + currentState);
 
 		if (this.previousState != this.currentState)
 		{
-			//Reference to previous state will be lost - perform cleanup
-			log.debug("Changing from " + this.currentState + " to " + currentState); //
-			log.debug("Cleaning up " + this.previousState);
-			this.previousState.cleanUp();
+			// Reference to previous state will be lost - perform cleanup
+			if (this.previousState != null)
+			{
+				log.debug("Cleaning up " + this.previousState);
+				this.previousState.cleanUp();
+			}
 		}
 
 		this.previousState = this.currentState;
@@ -76,56 +77,4 @@ public class Status {
 	public State getPreviousState() {
 		return this.previousState;
 	}
-
-	public void setDocument(File document) {
-		this.document = document;
-	}
-
-	public File getDocument() {
-		return this.document;
-	}
-
-	public void setSignaturePosition(SignaturePosition position) {
-		this.signaturePosition = position;
-	}
-
-	public SignaturePosition getSignaturePosition() {
-		return this.signaturePosition;
-	}
-
-	public void setBKU(BKUs bku) {
-		this.bku = bku;
-	}
-
-	public BKUs getBKU() {
-		return this.bku;
-	}
-
-	public MainWindowBehavior getBehavior() {
-		return this.behavior;
-	}
-
-	public SigningState getSigningState() {
-		return this.signingState;
-	}
-
-	public void setSigningState(SigningState state) {
-		this.signingState = state;
-	}
-
-	public void setSignResult(SignResult signResult) {
-		this.signResult = signResult;
-	}
-
-	public SignResult getSignResult() {
-		return this.signResult;
-	}
-
-	public boolean isSearchForPlaceholderSignature() {
-		return this.searchForPlacehoderSignature;
-	}
-
-	public void setSearchForPlaceholderSignature(boolean value) {
-		this.searchForPlacehoderSignature = value;
-	}
 }