8 files changed, 19 insertions, 22 deletions
diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/BKUSelectionState.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/BKUSelectionState.java
index 01df1863..5023781a 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/BKUSelectionState.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/BKUSelectionState.java
@@ -27,7 +27,6 @@ import at.asit.pdfover.gui.MainWindowBehavior;
 import at.asit.pdfover.gui.composites.BKUSelectionComposite;
 import at.asit.pdfover.gui.workflow.StateMachine;
 import at.asit.pdfover.gui.workflow.Status;
-import at.asit.pdfover.gui.workflow.config.ConfigProvider;
 import at.asit.pdfover.signator.BKUs;
 
 /**
@@ -76,8 +75,7 @@ public class BKUSelectionState extends State {
 		)) {
 			status.bku = BKUs.NONE;
 		} else if(!(status.getPreviousState() instanceof BKUSelectionState)) {
-			ConfigProvider config = getStateMachine().configProvider;
-			status.bku = config.getDefaultBKU();
+			getStateMachine().configProvider.getDefaultBKU();
 		}
 
 		if(status.bku == BKUs.NONE) {
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 94171262..3e74f9ec 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
@@ -30,7 +30,7 @@ import at.asit.pdfover.gui.controls.PasswordInputDialog;
 import at.asit.pdfover.commons.Messages;
 import at.asit.pdfover.gui.workflow.StateMachine;
 import at.asit.pdfover.gui.workflow.Status;
-import at.asit.pdfover.gui.workflow.config.ConfigProvider;
+import at.asit.pdfover.gui.workflow.config.ConfigProviderImpl;
 import at.asit.pdfover.signator.SignatureException;
 import at.asit.pdfover.signator.SigningState;
 
@@ -64,7 +64,7 @@ public class KSState extends State {
 		Status status = getStateMachine().status;
 
 		SigningState signingState = status.signingState;
-		ConfigProvider config = getStateMachine().configProvider;
+		ConfigProviderImpl config = getStateMachine().configProvider;
 
 		try {
 			String file = config.getKeyStoreFile();
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 6d59dfd5..3595e003 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
@@ -46,7 +46,7 @@ import at.asit.pdfover.gui.controls.Dialog.BUTTONS;
 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.ConfigProvider;
+import at.asit.pdfover.gui.workflow.config.ConfigProviderImpl;
 import at.asit.pdfover.signator.SigningState;
 
 /**
@@ -64,7 +64,7 @@ public class MobileBKUState extends State {
 
 	public MobileBKUState(StateMachine stateMachine) {
 		super(stateMachine);
-		ConfigProvider provider = stateMachine.configProvider;
+		ConfigProviderImpl provider = stateMachine.configProvider;
 		switch(provider.getMobileBKUType()) {
 			case A_TRUST:
 				this.status = new ATrustStatus(provider);
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 4457f902..77e1edf4 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
@@ -40,7 +40,7 @@ import at.asit.pdfover.gui.composites.DataSourceSelectComposite;
 import at.asit.pdfover.commons.Messages;
 import at.asit.pdfover.gui.workflow.StateMachine;
 import at.asit.pdfover.gui.workflow.Status;
-import at.asit.pdfover.gui.workflow.config.ConfigProvider;
+import at.asit.pdfover.gui.workflow.config.ConfigProviderImpl;
 import at.asit.pdfover.signator.SignaturePosition;
 import at.gv.egiz.pdfas.lib.impl.placeholder.SignaturePlaceholderData;
 
@@ -81,7 +81,7 @@ public class OpenState extends State {
 
 	@Override
 	public void run() {
-		ConfigProvider config = getStateMachine().configProvider;
+		ConfigProviderImpl config = getStateMachine().configProvider;
 		Status status = getStateMachine().status;
 		if (!(status.getPreviousState() instanceof PrepareConfigurationState)
 				&& !(status.getPreviousState() instanceof OpenState)) {
diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/OutputState.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/OutputState.java
index e8b9402d..0a6db176 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/OutputState.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/OutputState.java
@@ -28,7 +28,7 @@ import at.asit.pdfover.gui.controls.Dialog.BUTTONS;
 import at.asit.pdfover.commons.Messages;
 import at.asit.pdfover.gui.workflow.StateMachine;
 import at.asit.pdfover.gui.workflow.Status;
-import at.asit.pdfover.gui.workflow.config.ConfigProvider;
+import at.asit.pdfover.gui.workflow.config.ConfigProviderImpl;
 
 /**
  * Produces the output of the signature process. (save file, open file)
@@ -49,7 +49,7 @@ public class OutputState extends State {
 			this.outputComposite = getStateMachine()
 					.createComposite(OutputComposite.class, SWT.RESIZE, this);
 
-			ConfigProvider config = getStateMachine().configProvider;
+			ConfigProviderImpl config = getStateMachine().configProvider;
 			Status status = getStateMachine().status;
 
 			File tmpDir = new File(config.getConfigurationDirectory() + File.separator + "tmp");
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 6d00cce0..84d61cb0 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
@@ -35,7 +35,7 @@ import at.asit.pdfover.commons.Messages;
 import at.asit.pdfover.gui.utils.SignaturePlaceholderCache;
 import at.asit.pdfover.gui.workflow.StateMachine;
 import at.asit.pdfover.gui.workflow.Status;
-import at.asit.pdfover.gui.workflow.config.ConfigProvider;
+import at.asit.pdfover.gui.workflow.config.ConfigProviderImpl;
 import at.asit.pdfover.signator.CachedFileNameEmblem;
 import at.asit.pdfover.signator.Emblem;
 import at.asit.pdfover.signator.SignatureParameter;
@@ -119,7 +119,7 @@ public class PositioningState extends State {
 			this.positionComposite.displayDocument(document);
 		}
 		// Update possibly changed values
-		ConfigProvider config = stateMachine.configProvider;
+		ConfigProviderImpl config = stateMachine.configProvider;
 		SignatureParameter param = stateMachine.pdfSigner.getPDFSigner().newParameter();
 		Emblem emblem = new CachedFileNameEmblem(config.getDefaultEmblem());
 		param.setEmblem(emblem);
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 451f2b55..616fa63f 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
@@ -53,7 +53,7 @@ import at.asit.pdfover.gui.utils.Zipper;
 import at.asit.pdfover.gui.workflow.GUIProvider;
 import at.asit.pdfover.gui.workflow.StateMachine;
 import at.asit.pdfover.gui.workflow.Status;
-import at.asit.pdfover.gui.workflow.config.ConfigProvider;
+import at.asit.pdfover.gui.workflow.config.ConfigProviderImpl;
 import at.asit.pdfover.signator.Signator;
 
 /**
@@ -109,10 +109,9 @@ public class PrepareConfigurationState extends State {
 			throws InitializationException {
 		try {
 
+			// TODO: move this to ConfigProviderImpl to mirror save logic
 			try {
-				getStateMachine().configProvider.loadConfiguration(
-						new FileInputStream(
-								getStateMachine().configProvider.getConfigurationDirectory() + FILE_SEPARATOR + filename));
+				getStateMachine().configProvider.loadConfiguration(new FileInputStream(getStateMachine().configProvider.getConfigurationDirectory() + FILE_SEPARATOR + filename));
 
 				log.info("Loaded config from file : " + filename);
 			} catch (FileNotFoundException ex) {
@@ -144,7 +143,7 @@ public class PrepareConfigurationState extends State {
 	 * Update configuration values as necessary
 	 */
 	private void updateConfiguration() {
-		ConfigProvider config = getStateMachine().configProvider;
+		ConfigProviderImpl config = getStateMachine().configProvider;
 
 		//Update signature note if old default is used
 		String note = config.getSignatureNote();
@@ -155,7 +154,7 @@ public class PrepareConfigurationState extends State {
 			resetSignatureNoteField(config);
 	}
 
-	private void resetSignatureNoteField(ConfigProvider config){
+	private void resetSignatureNoteField(ConfigProviderImpl config){
 		getStateMachine().configProvider.setSignatureNote(
 			Profile.getProfile(config.getSignatureProfile()).getDefaultSignatureBlockNote(config.getLocale())
 		);
@@ -399,7 +398,7 @@ public class PrepareConfigurationState extends State {
 		// Read config file
 		try {
 			StateMachine stateMachine = getStateMachine();
-			ConfigProvider config = stateMachine.configProvider;
+			ConfigProviderImpl config = stateMachine.configProvider;
 			final GUIProvider gui = stateMachine;
 			String cDir = config.getConfigurationDirectory();
 			File configDir = new File(cDir);
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 5bc9ec54..364da8c7 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
@@ -31,7 +31,7 @@ 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.Status;
-import at.asit.pdfover.gui.workflow.config.ConfigProvider;
+import at.asit.pdfover.gui.workflow.config.ConfigProviderImpl;
 import at.asit.pdfover.signator.CachedFileNameEmblem;
 import at.asit.pdfover.signator.PDFFileDocumentSource;
 import at.asit.pdfover.signator.SignatureParameter;
@@ -69,7 +69,7 @@ public class PrepareSigningState extends State {
 
 				Status status = this.state.getStateMachine().status;
 
-				ConfigProvider configuration = this.state.getStateMachine().configProvider;
+				ConfigProviderImpl configuration = this.state.getStateMachine().configProvider;
 
 				// SET PROXY HOST and PORT settings
 				final String proxyHost = configuration.getProxyHost();