Add new Dialog class to display a general messagebox

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

3 files changed, 10 insertions, 10 deletions

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 a3348ccd..7e846d13 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,7 +43,7 @@ import org.slf4j.LoggerFactory;
 
 import at.asit.pdfover.gui.Constants;
 import at.asit.pdfover.gui.controls.ErrorDialog;
-import at.asit.pdfover.gui.controls.ErrorDialog.ERROR_BUTTONS;
+import at.asit.pdfover.gui.controls.Dialog.BUTTONS;
 import at.asit.pdfover.gui.exceptions.OutputfolderDontExistException;
 import at.asit.pdfover.gui.exceptions.OutputfolderNotADirectoryException;
 import at.asit.pdfover.gui.utils.Messages;
@@ -427,7 +427,7 @@ public class AdvancedConfigurationComposite extends BaseConfigurationComposite {
 		} catch (Exception ex) {
 			log.error("Failed to parse BKU value: " + selected, ex); //$NON-NLS-1$
 			ErrorDialog dialog = new ErrorDialog(getShell(),
-					Messages.getString("error.InvalidBKU"), ERROR_BUTTONS.OK); //$NON-NLS-1$
+					Messages.getString("error.InvalidBKU"), BUTTONS.OK); //$NON-NLS-1$
 			dialog.open();
 		}
 	}
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 820b69b6..6e1ae0e0 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
@@ -28,7 +28,7 @@ import org.slf4j.LoggerFactory;
 
 import at.asit.pdfover.gui.Constants;
 import at.asit.pdfover.gui.controls.ErrorDialog;
-import at.asit.pdfover.gui.controls.ErrorDialog.ERROR_BUTTONS;
+import at.asit.pdfover.gui.controls.Dialog.BUTTONS;
 import at.asit.pdfover.gui.exceptions.InvalidEmblemFile;
 import at.asit.pdfover.gui.exceptions.InvalidNumberException;
 import at.asit.pdfover.gui.exceptions.InvalidPortException;
@@ -340,7 +340,7 @@ public class ConfigurationComposite extends StateComposite {
 				} catch (ResumableException e) {
 					log.error("Settings validation failed!", e); //$NON-NLS-1$
 					ErrorDialog dialog = new ErrorDialog(getShell(),
-							e.getMessage(), ERROR_BUTTONS.ABORT_RETRY_IGNORE);
+							e.getMessage(), BUTTONS.ABORT_RETRY_IGNORE);
 					int rc = dialog.open();
 
 					redo = (rc == SWT.RETRY);
@@ -369,7 +369,7 @@ public class ConfigurationComposite extends StateComposite {
 				} catch (ResumableException e) {
 					log.error("Settings validation failed!", e); //$NON-NLS-1$
 					ErrorDialog dialog = new ErrorDialog(getShell(),
-							e.getMessage(), ERROR_BUTTONS.ABORT_RETRY_IGNORE);
+							e.getMessage(), BUTTONS.ABORT_RETRY_IGNORE);
 					int rc = dialog.open();
 
 					redo = (rc == SWT.RETRY);
@@ -383,7 +383,7 @@ public class ConfigurationComposite extends StateComposite {
 		} catch (Exception e) {
 			log.error("Settings validation failed!", e); //$NON-NLS-1$
 			ErrorDialog dialog = new ErrorDialog(getShell(), e.getMessage(),
-					ERROR_BUTTONS.OK);
+					BUTTONS.OK);
 			dialog.open();
 			return false;
 		}
@@ -437,7 +437,7 @@ public class ConfigurationComposite extends StateComposite {
 				log.error("Failed to save configuration to file!", e); //$NON-NLS-1$
 				ErrorDialog dialog = new ErrorDialog(
 						getShell(),
-						Messages.getString("error.FailedToSaveSettings"), ERROR_BUTTONS.RETRY_CANCEL); //$NON-NLS-1$
+						Messages.getString("error.FailedToSaveSettings"), BUTTONS.RETRY_CANCEL); //$NON-NLS-1$
 				redo = (dialog.open() == SWT.RETRY);
 
 				// return false;
diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/SimpleConfigurationComposite.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/SimpleConfigurationComposite.java
index 5779f36c..a267e521 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/SimpleConfigurationComposite.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/SimpleConfigurationComposite.java
@@ -61,7 +61,7 @@ import org.slf4j.LoggerFactory;
 import at.asit.pdfover.gui.Constants;
 import at.asit.pdfover.gui.controls.ErrorDialog;
 import at.asit.pdfover.gui.controls.ErrorMarker;
-import at.asit.pdfover.gui.controls.ErrorDialog.ERROR_BUTTONS;
+import at.asit.pdfover.gui.controls.Dialog.BUTTONS;
 import at.asit.pdfover.gui.exceptions.InvalidNumberException;
 import at.asit.pdfover.gui.exceptions.InvalidPortException;
 import at.asit.pdfover.gui.utils.ImageConverter;
@@ -877,7 +877,7 @@ public class SimpleConfigurationComposite extends BaseConfigurationComposite {
 			log.error("processEmblemChanged: ", ex); //$NON-NLS-1$
 			ErrorDialog dialog = new ErrorDialog(
 					getShell(),
-					Messages.getString("error.FailedToLoadEmblem"), ERROR_BUTTONS.OK); //$NON-NLS-1$
+					Messages.getString("error.FailedToLoadEmblem"), BUTTONS.OK); //$NON-NLS-1$
 			dialog.open();
 		}
 	}
@@ -1044,7 +1044,7 @@ public class SimpleConfigurationComposite extends BaseConfigurationComposite {
 				log.error("Failed to load emblem: ", e1); //$NON-NLS-1$
 				ErrorDialog dialog = new ErrorDialog(
 						getShell(),
-						Messages.getString("error.FailedToLoadEmblem"), ERROR_BUTTONS.OK); //$NON-NLS-1$
+						Messages.getString("error.FailedToLoadEmblem"), BUTTONS.OK); //$NON-NLS-1$
 				dialog.open();
 			}
 		}