From 4b1050681e9456e282d8843d751ed0dbc36d24b9 Mon Sep 17 00:00:00 2001
From: tkellner <tkellner@174cde9d-5d70-4d2a-aa98-46368bc2aaf7>
Date: Wed, 10 Apr 2013 19:38:34 +0000
Subject: Throw away unneded AutomaticPositioning config entry

git-svn-id: https://joinup.ec.europa.eu/svn/pdf-over/trunk@431 174cde9d-5d70-4d2a-aa98-46368bc2aaf7
---
 .../gui/composites/AdvancedConfigurationComposite.java |  9 ++++++---
 .../pdfover/gui/composites/ConfigurationComposite.java | 18 +++++-------------
 2 files changed, 11 insertions(+), 16 deletions(-)

(limited to 'pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites')

diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/AdvancedConfigurationComposite.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/AdvancedConfigurationComposite.java
index 59c77b3c..04b6c226 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/AdvancedConfigurationComposite.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/AdvancedConfigurationComposite.java
@@ -50,6 +50,7 @@ import at.asit.pdfover.gui.utils.Messages;
 import at.asit.pdfover.gui.workflow.config.ConfigurationContainer;
 import at.asit.pdfover.gui.workflow.states.State;
 import at.asit.pdfover.signator.BKUs;
+import at.asit.pdfover.signator.SignaturePosition;
 
 /**
  * Composite for advanced configuration
@@ -465,7 +466,8 @@ public class AdvancedConfigurationComposite extends BaseConfigurationComposite {
 
 	void performPositionSelection(boolean automatic) {
 		log.debug("Selected Position: " + automatic); //$NON-NLS-1$
-		this.configurationContainer.setAutomaticPositioning(automatic);
+		SignaturePosition pos = automatic ? new SignaturePosition() : null;
+		this.configurationContainer.setDefaultSignaturePosition(pos);
 		this.btnAutomatischePositionierung.setSelection(automatic);
 	}
 
@@ -499,8 +501,9 @@ public class AdvancedConfigurationComposite extends BaseConfigurationComposite {
 		if (outputFolder != null) {
 			this.performOutputFolderChanged(outputFolder);
 		}
-		this.performPositionSelection(this.configurationContainer
-				.getAutomaticPositioning());
+		SignaturePosition pos = this.configurationContainer
+				.getDefaultSignaturePosition();
+		this.performPositionSelection(pos != null && pos.useAutoPositioning());
 		this.sclTransparenz.setSelection(this.configurationContainer
 				.getPlaceholderTransparency());
 		this.performLocaleSelectionChanged(this.configurationContainer.getLocale());
diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/ConfigurationComposite.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/ConfigurationComposite.java
index c2c53ac4..960d1d5e 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/ConfigurationComposite.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/ConfigurationComposite.java
@@ -40,7 +40,6 @@ import at.asit.pdfover.gui.workflow.config.ConfigurationContainer;
 import at.asit.pdfover.gui.workflow.config.ConfigurationContainerImpl;
 import at.asit.pdfover.gui.workflow.config.PersistentConfigProvider;
 import at.asit.pdfover.gui.workflow.states.State;
-import at.asit.pdfover.signator.SignaturePosition;
 
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Button;
@@ -276,12 +275,9 @@ public class ConfigurationComposite extends StateComposite {
 		if (this.configProvider != null) {
 
 			// Initialize Configuration Container
-			if (this.configProvider.getDefaultSignaturePositionPersistent() != null) {
-				this.configurationContainer
-						.setAutomaticPositioning(this.configProvider
-								.getDefaultSignaturePositionPersistent()
-								.useAutoPositioning());
-			}
+			this.configurationContainer
+						.setDefaultSignaturePosition(this.configProvider
+								.getDefaultSignaturePositionPersistent());
 
 			this.configurationContainer
 					.setPlaceholderTransparency(this.configProvider
@@ -400,12 +396,8 @@ public class ConfigurationComposite extends StateComposite {
 				.getDefaultBKU());
 		this.configManipulator
 				.setDefaultMobileNumber(this.configurationContainer.getMobileNumber());
-		if (this.configurationContainer.getAutomaticPositioning()) {
-			this.configManipulator
-					.setDefaultSignaturePosition(new SignaturePosition());
-		} else {
-			this.configManipulator.setDefaultSignaturePosition(null);
-		}
+		this.configManipulator
+				.setDefaultSignaturePosition(this.configurationContainer.getDefaultSignaturePosition());
 
 		this.configManipulator.setLocale(this.configurationContainer.getLocale());
 		this.configManipulator.setSignLocale(this.configurationContainer.getSignLocale());
-- 
cgit v1.2.3