Removed Error State and replaced it with ErrorDialog

To get a stable user experience in case of an error.
ErrorDialog was improved to let the user decide if he wants to retry an
action.

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

1 files changed, 25 insertions, 19 deletions

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 d95bb466..bb6d47a5 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
@@ -54,9 +54,9 @@ public class ConfigurationComposite extends StateComposite {
 	 */
 	private final class ConfigurationModeSelectionListener implements
 			SelectionListener {
-		
+
 		/**
-		 * Constructor 
+		 * Constructor
 		 */
 		public ConfigurationModeSelectionListener() {
 			// Nothing to do
@@ -117,13 +117,12 @@ public class ConfigurationComposite extends StateComposite {
 	BaseConfigurationComposite configComposite;
 
 	/**
-	 * configuration container
-	 * Keeps state for current configuration changes
+	 * configuration container Keeps state for current configuration changes
 	 */
 	ConfigurationContainer configurationContainer = new ConfigurationContainerImpl();
 
 	/**
-	 * The stack layout 
+	 * The stack layout
 	 */
 	StackLayout compositeStack = new StackLayout();
 
@@ -290,8 +289,7 @@ public class ConfigurationComposite extends StateComposite {
 				this.configManipulator
 						.setDefaultSignaturePosition(new SignaturePosition());
 			} else {
-				this.configManipulator
-				.setDefaultSignaturePosition(null);
+				this.configManipulator.setDefaultSignaturePosition(null);
 			}
 
 			this.configManipulator
@@ -311,21 +309,29 @@ public class ConfigurationComposite extends StateComposite {
 					getShell(),
 					SWT.NONE,
 					"Invalid settings are still present. Please check your input.",
-					e);
+					e, false);
 			dialog.open();
 			return false;
 		}
-		// Save current config to file
-		try {
-			this.configManipulator.saveCurrentConfiguration();
-		} catch (IOException e) {
-			log.error("Failed to save configuration to file!", e); //$NON-NLS-1$
-			ErrorDialog dialog = new ErrorDialog(getShell(), SWT.NONE,
-					"Failed to save configuration file!", e);
-			dialog.open();
-			return false;
-		}
-		return true;
+
+		boolean status = false;
+		boolean redo = false;
+		do {
+			// Save current config to file
+			try {
+				this.configManipulator.saveCurrentConfiguration();
+				redo = false;
+				status = true;
+			} catch (IOException e) {
+				log.error("Failed to save configuration to file!", e); //$NON-NLS-1$
+				ErrorDialog dialog = new ErrorDialog(getShell(), SWT.NONE,
+						"Failed to save configuration file!", e, true);
+				redo = dialog.open();
+				
+				//return false;
+			}
+		} while (redo);
+		return status;
 	}
 
 	/**