StateMachine cleanup

JumpToState stuff

git-svn-id: https://joinup.ec.europa.eu/svn/pdf-over/trunk@24 174cde9d-5d70-4d2a-aa98-46368bc2aaf7

1 files changed, 22 insertions, 4 deletions

diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/PositioningState.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/PositioningState.java
index c7c92a89..2809bd25 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/PositioningState.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/PositioningState.java
@@ -23,7 +23,9 @@ import org.slf4j.LoggerFactory;
 import at.asit.pdfover.gui.MainWindowBehavior;
 import at.asit.pdfover.gui.MainWindow.Buttons;
 import at.asit.pdfover.gui.composites.PositioningComposite;
+import at.asit.pdfover.gui.workflow.ConfigProvider;
 import at.asit.pdfover.gui.workflow.StateMachine;
+import at.asit.pdfover.gui.workflow.Status;
 
 /**
  * Decides where to position the signature block
@@ -57,15 +59,22 @@ public class PositioningState extends State {
 
 	@Override
 	public void run() {
-		
-		if(this.stateMachine.getStatus().getSignaturePosition() == null) {
+		Status status = this.stateMachine.getStatus();
+		if (!(status.getPreviousState() instanceof PositioningState) &&
+			!(status.getPreviousState() instanceof OpenState))
+		{
+			status.setSignaturePosition(null);
+		}
+
+
+		if(status.getSignaturePosition() == null) {
 			PositioningComposite position = this.getPositioningComosite();
 			
 			this.stateMachine.getGUIProvider().display(position);
 			
-			this.stateMachine.getStatus().setSignaturePosition(position.getPosition());
+			status.setSignaturePosition(position.getPosition());
 			
-			if(this.stateMachine.getStatus().getSignaturePosition() == null) {
+			if(status.getSignaturePosition() == null) {
 				return;
 			}
 		}
@@ -73,6 +82,15 @@ public class PositioningState extends State {
 	}
 
 	/* (non-Javadoc)
+	 * @see at.asit.pdfover.gui.workflow.states.State#cleanUp()
+	 */
+	@Override
+	public void cleanUp() {
+		if (this.positionComposite != null)
+			this.positionComposite.dispose();
+	}
+
+	/* (non-Javadoc)
 	 * @see at.asit.pdfover.gui.workflow.states.State#setMainWindowBehavior()
 	 */
 	@Override