auto positioning cleanup

2 files changed, 3 insertions, 4 deletions

diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/OpenState.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/OpenState.java
index e7fcb98d..9946f847 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/OpenState.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/OpenState.java
@@ -87,7 +87,7 @@ public class OpenState extends State {
 				&& !(status.getPreviousState() instanceof OpenState)) {
 			status.bku = config.getDefaultBKU();
 			status.document = null;
-			status.signaturePosition = config.getDefaultSignaturePosition();
+			status.signaturePosition = config.getAutoPositionSignature() ? (new SignaturePosition()) : null;
 
 			/* ensure that files get closed */
 			status.getPreviousState().cleanUp();
diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/PrepareConfigurationState.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/PrepareConfigurationState.java
index 01f7a19c..f50f171d 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/PrepareConfigurationState.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/PrepareConfigurationState.java
@@ -28,9 +28,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.net.URI;
-import java.util.Locale;
 
-import at.asit.pdfover.commons.Profile;
 import org.apache.commons.httpclient.HttpClient;
 import org.apache.commons.httpclient.methods.GetMethod;
 import org.eclipse.swt.SWT;
@@ -54,6 +52,7 @@ import at.asit.pdfover.gui.workflow.StateMachine;
 import at.asit.pdfover.gui.workflow.Status;
 import at.asit.pdfover.gui.workflow.config.ConfigurationManager;
 import at.asit.pdfover.signator.Signator;
+import at.asit.pdfover.signator.SignaturePosition;
 
 /**
  * Starting state of workflow proccess
@@ -350,7 +349,7 @@ public class PrepareConfigurationState extends State {
 			// Create PDF Signer
 			Status status = stateMachine.status;
 			status.bku = getStateMachine().configProvider.getDefaultBKU();
-			status.signaturePosition = getStateMachine().configProvider.getDefaultSignaturePosition();
+			status.signaturePosition = getStateMachine().configProvider.getAutoPositionSignature() ? (new SignaturePosition()) : null;
 
 			setNextState(new OpenState(stateMachine));