From 782c82871bdea8d6091e9335823240af8e0f04d7 Mon Sep 17 00:00:00 2001
From: tkellner <tkellner@174cde9d-5d70-4d2a-aa98-46368bc2aaf7>
Date: Wed, 10 Apr 2013 19:10:00 +0000
Subject: + ignore option for error dialog + resumeable exception for settings
 validation

git-svn-id: https://joinup.ec.europa.eu/svn/pdf-over/trunk@168 174cde9d-5d70-4d2a-aa98-46368bc2aaf7
---
 .../composites/AdvancedConfigurationComposite.java | 42 +++++++++++++++-------
 1 file changed, 30 insertions(+), 12 deletions(-)

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

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 72e047c4..05b16824 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
@@ -43,6 +43,9 @@ import org.slf4j.LoggerFactory;
 import at.asit.pdfover.gui.Constants;
 import at.asit.pdfover.gui.Messages;
 import at.asit.pdfover.gui.controls.ErrorDialog;
+import at.asit.pdfover.gui.controls.ErrorDialog.ERROR_BUTTONS;
+import at.asit.pdfover.gui.exceptions.OutputfolderDontExistException;
+import at.asit.pdfover.gui.exceptions.OutputfolderNotADirectoryException;
 import at.asit.pdfover.gui.workflow.ConfigurationContainer;
 import at.asit.pdfover.gui.workflow.states.State;
 import at.asit.pdfover.signator.BKUs;
@@ -106,10 +109,14 @@ public class AdvancedConfigurationComposite extends BaseConfigurationComposite {
 
 		FontData[] fD_btnAutomatischePositionierung = this.btnAutomatischePositionierung
 				.getFont().getFontData();
-		fD_btnAutomatischePositionierung[0].setHeight(Constants.TEXT_SIZE_BUTTON);
+		fD_btnAutomatischePositionierung[0]
+				.setHeight(Constants.TEXT_SIZE_BUTTON);
 		this.btnAutomatischePositionierung.setFont(new Font(Display
 				.getCurrent(), fD_btnAutomatischePositionierung[0]));
 
+		this.btnAutomatischePositionierung.setToolTipText(Messages
+				.getString("advanced_config.AutoPosition_ToolTip")); //$NON-NLS-1$
+
 		this.btnAutomatischePositionierung
 				.addSelectionListener(new SelectionAdapter() {
 
@@ -225,6 +232,9 @@ public class AdvancedConfigurationComposite extends BaseConfigurationComposite {
 
 		this.cmbBKUAuswahl.setLayoutData(fd_cmbBKUAuswahl);
 
+		this.cmbBKUAuswahl.setToolTipText(Messages
+				.getString("advanced_config.BKUSelection_ToolTip")); //$NON-NLS-1$
+
 		this.cmbBKUAuswahl.addSelectionListener(new SelectionAdapter() {
 
 			@Override
@@ -294,6 +304,9 @@ public class AdvancedConfigurationComposite extends BaseConfigurationComposite {
 			}
 		});
 
+		this.txtOutputFolder.setToolTipText(Messages
+				.getString("advanced_config.OutputFolder_ToolTip")); //$NON-NLS-1$
+
 		Button btnBrowse = new Button(grpSpeicherort, SWT.NONE);
 		fd_text.right = new FormAttachment(btnBrowse, -5);
 
@@ -383,7 +396,8 @@ public class AdvancedConfigurationComposite extends BaseConfigurationComposite {
 			this.performBKUSelectionChanged(bkuvalue);
 		} catch (Exception ex) {
 			log.error("Failed to parse BKU value: " + selected, ex); //$NON-NLS-1$
-			ErrorDialog dialog = new ErrorDialog(getShell(), Messages.getString("error.InvalidBKU"), false); //$NON-NLS-1$
+			ErrorDialog dialog = new ErrorDialog(getShell(),
+					Messages.getString("error.InvalidBKU"), ERROR_BUTTONS.OK); //$NON-NLS-1$
 			dialog.open();
 		}
 	}
@@ -451,19 +465,23 @@ public class AdvancedConfigurationComposite extends BaseConfigurationComposite {
 	 * ()
 	 */
 	@Override
-	public void validateSettings() throws Exception {
+	public void validateSettings(int resumeIndex) throws Exception {
 		
 		String foldername = this.configurationContainer.getOutputFolder();
 		
-		if (foldername != null && !foldername.equals("")) { //$NON-NLS-1$
-			File outputFolder = new File(foldername);
-			if (!outputFolder.exists()) {
-				throw new Exception(String.format(Messages.getString("exception.PathNotExist"), outputFolder.getAbsolutePath())); //$NON-NLS-1$
-			}
-
-			if (!outputFolder.isDirectory()) {
-				throw new Exception(String.format(Messages.getString("exception.PathNotDirectory"), outputFolder.getAbsolutePath())); //$NON-NLS-1$
-			}
+		switch (resumeIndex) {
+			case 0:
+				if (foldername != null && !foldername.isEmpty()) {
+					File outputFolder = new File(foldername);
+					if (!outputFolder.exists()) {
+						throw new OutputfolderDontExistException(outputFolder, 1); 
+					}
+					if (!outputFolder.isDirectory()) {
+						throw new OutputfolderNotADirectoryException(outputFolder);
+					}
+				}
+				// Fall through
+			case 1:
 		}
 	}
 }
-- 
cgit v1.2.3