From 15df4c768b00bf964ee1006d68d847b252ad115d Mon Sep 17 00:00:00 2001
From: tkellner <tkellner@174cde9d-5d70-4d2a-aa98-46368bc2aaf7>
Date: Wed, 10 Apr 2013 19:22:36 +0000
Subject: 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
---
.../composites/AdvancedConfigurationComposite.java | 4 +-
.../gui/composites/ConfigurationComposite.java | 10 +-
.../composites/SimpleConfigurationComposite.java | 6 +-
.../java/at/asit/pdfover/gui/controls/Dialog.java | 120 +++++++++++++++++++++
.../at/asit/pdfover/gui/controls/ErrorDialog.java | 61 +----------
.../pdfover/gui/workflow/StateMachineImpl.java | 4 +-
.../pdfover/gui/workflow/states/LocalBKUState.java | 4 +-
.../gui/workflow/states/MobileBKUState.java | 4 +-
.../pdfover/gui/workflow/states/OutputState.java | 6 +-
.../gui/workflow/states/PositioningState.java | 6 +-
.../workflow/states/PrepareConfigurationState.java | 4 +-
.../gui/workflow/states/PrepareSigningState.java | 4 +-
.../pdfover/gui/workflow/states/SigningState.java | 4 +-
13 files changed, 153 insertions(+), 84 deletions(-)
create mode 100644 pdf-over-gui/src/main/java/at/asit/pdfover/gui/controls/Dialog.java
(limited to 'pdf-over-gui/src')
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();
}
}
diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/controls/Dialog.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/controls/Dialog.java
new file mode 100644
index 00000000..e6f62637
--- /dev/null
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/controls/Dialog.java
@@ -0,0 +1,120 @@
+/*
+ * Copyright 2012 by A-SIT, Secure Information Technology Center Austria
+ *
+ * Licensed under the EUPL, Version 1.1 or - as soon they will be approved by
+ * the European Commission - subsequent versions of the EUPL (the "Licence");
+ * You may not use this work except in compliance with the Licence.
+ * You may obtain a copy of the Licence at:
+ * http://joinup.ec.europa.eu/software/page/eupl
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the Licence is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the Licence for the specific language governing permissions and
+ * limitations under the Licence.
+ */
+package at.asit.pdfover.gui.controls;
+
+// Imports
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.widgets.MessageBox;
+import org.eclipse.swt.widgets.Shell;
+
+import at.asit.pdfover.gui.utils.Messages;
+
+/**
+ * A Message dialog
+ */
+public class Dialog {
+
+ private MessageBox box;
+
+ /**
+ * Message box buttons
+ */
+ public enum BUTTONS {
+ /** Display only ok button */
+ OK,
+ /** Display buttons ok and cancel */
+ OK_CANCEL,
+ /** Display retry and cancel buttons */
+ RETRY_CANCEL,
+ /** Display abort, retry and ignore buttons */
+ ABORT_RETRY_IGNORE
+ };
+
+ /**
+ * Message box icon
+ */
+ public enum ICON {
+ /** Error icon */
+ ERROR,
+ /** Information icon */
+ INFORMATION,
+ /** Question icon */
+ QUESTION,
+ /** Warning icon */
+ WARNING,
+ /** Working icon */
+ WORKING
+ };
+
+ /**
+ * @param parent The parent shell
+ * @param message The error message
+ * @param button The BUTTONS to be shown
+ * @param icon The ICON to be displayed
+ */
+ public Dialog(Shell parent, String message, BUTTONS button, ICON icon) {
+ this.initialize(parent, message, button, icon);
+ }
+
+ private void initialize(Shell parent, String message, BUTTONS button, ICON icon) {
+ int boxstyle = 0;
+ switch (icon) {
+ case ERROR:
+ boxstyle |= SWT.ICON_ERROR;
+ break;
+ case INFORMATION:
+ boxstyle |= SWT.ICON_INFORMATION;
+ break;
+ case QUESTION:
+ boxstyle |= SWT.ICON_QUESTION;
+ break;
+ case WARNING:
+ boxstyle |= SWT.ICON_WARNING;
+ break;
+ case WORKING:
+ boxstyle |= SWT.ICON_WORKING;
+ break;
+ }
+
+ switch(button) {
+ case OK:
+ boxstyle |= SWT.OK;
+ break;
+ case OK_CANCEL:
+ boxstyle |= SWT.OK | SWT.CANCEL;
+ break;
+ case RETRY_CANCEL:
+ boxstyle |= SWT.RETRY | SWT.CANCEL;
+ break;
+ case ABORT_RETRY_IGNORE:
+ boxstyle |= SWT.RETRY | SWT.ABORT | SWT.IGNORE;
+ break;
+ }
+
+ this.box = new MessageBox(parent, boxstyle);
+ this.box.setMessage(message);
+ this.box.setText(Messages.getString("error.Title")); //$NON-NLS-1$
+ }
+
+ /**
+ * Open error dialog
+ *
+ * @return SWT.OK | SWT.IGNORE | SWT.ABORT | SWT.RETRY | SWT.CANCEL
+ */
+ public int open() {
+ return this.box.open();
+ }
+}
diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/controls/ErrorDialog.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/controls/ErrorDialog.java
index 5e329df4..6ae8af0e 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/controls/ErrorDialog.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/controls/ErrorDialog.java
@@ -16,71 +16,18 @@
package at.asit.pdfover.gui.controls;
// Imports
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.MessageBox;
import org.eclipse.swt.widgets.Shell;
-import at.asit.pdfover.gui.utils.Messages;
-
/**
- *
+ * An error dialog
*/
-public class ErrorDialog {
-
- private MessageBox box;
-
- /**
- * Message box buttons
- */
- public enum ERROR_BUTTONS {
- /**
- * Display only ok button
- */
- OK,
- /**
- * Display retry and cancel buttons
- */
- RETRY_CANCEL,
- /**
- * Display abort, retry and ignore buttons
- */
- ABORT_RETRY_IGNORE
- };
-
+public class ErrorDialog extends Dialog {
/**
* @param parent The parent shell
* @param message The error message
* @param button The buttons to be shown
*/
- public ErrorDialog(Shell parent, String message, ERROR_BUTTONS button) {
- this.initialize(parent, message, button);
- }
-
- private void initialize(Shell parent, String message, ERROR_BUTTONS button) {
- int boxstyle = SWT.ICON_ERROR ;
- switch(button) {
- case OK:
- boxstyle |= SWT.OK;
- break;
- case RETRY_CANCEL:
- boxstyle |= SWT.RETRY| SWT.CANCEL;
- break;
- case ABORT_RETRY_IGNORE:
- boxstyle |= SWT.RETRY| SWT.ABORT | SWT.IGNORE;
- break;
- }
-
- this.box = new MessageBox(parent, boxstyle);
- this.box.setMessage(message);
- this.box.setText(Messages.getString("error.Title")); //$NON-NLS-1$
- }
-
- /**
- * Open error dialog
- *
- * @return SWT.OK | SWT.IGNORE | SWT.ABORT | SWT.RETRY | SWT.CANCEL
- */
- public int open() {
- return this.box.open();
+ public ErrorDialog(Shell parent, String message, BUTTONS button) {
+ super(parent, message, button, ICON.ERROR);
}
}
diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/StateMachineImpl.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/StateMachineImpl.java
index 5fe5f0fa..18943cbe 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/StateMachineImpl.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/StateMachineImpl.java
@@ -26,7 +26,7 @@ import org.slf4j.LoggerFactory;
import at.asit.pdfover.gui.MainWindow;
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.utils.Messages;
import at.asit.pdfover.gui.workflow.states.PrepareConfigurationState;
import at.asit.pdfover.gui.workflow.states.State;
@@ -88,7 +88,7 @@ public class StateMachineImpl implements StateMachine, GUIProvider {
} catch (Exception e) {
log.error("StateMachine update: ", e); //$NON-NLS-1$
ErrorDialog errorState = new ErrorDialog(this.getMainShell(),
- Messages.getString("error.Unexpected"), ERROR_BUTTONS.OK); //$NON-NLS-1$
+ Messages.getString("error.Unexpected"), BUTTONS.OK); //$NON-NLS-1$
//errorState.setException(e);
//jumpToState(errorState);
errorState.open();
diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/LocalBKUState.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/LocalBKUState.java
index 367af3d1..78310925 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/LocalBKUState.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/LocalBKUState.java
@@ -27,7 +27,7 @@ import org.slf4j.LoggerFactory;
import at.asit.pdfover.gui.MainWindow.Buttons;
import at.asit.pdfover.gui.MainWindowBehavior;
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.utils.Messages;
import at.asit.pdfover.gui.workflow.StateMachine;
import at.asit.pdfover.gui.workflow.Status;
@@ -173,7 +173,7 @@ public class LocalBKUState extends State {
ErrorDialog dialog = new ErrorDialog(
this.stateMachine.getGUIProvider().getMainShell(),
Messages.getString("error.LocalBKU"), //$NON-NLS-1$
- ERROR_BUTTONS.RETRY_CANCEL);
+ BUTTONS.RETRY_CANCEL);
if (dialog.open() != SWT.RETRY) {
//this.stateMachine.exit();
this.setNextState(new BKUSelectionState(this.stateMachine));
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 dca4d8e5..1a13c794 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
@@ -26,7 +26,7 @@ import at.asit.pdfover.gui.composites.MobileBKUEnterNumberComposite;
import at.asit.pdfover.gui.composites.MobileBKUEnterTANComposite;
import at.asit.pdfover.gui.composites.WaitingComposite;
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.utils.Messages;
import at.asit.pdfover.gui.workflow.StateMachine;
import at.asit.pdfover.gui.workflow.states.mobilebku.MobileBKUCommunicationState;
@@ -153,7 +153,7 @@ public class MobileBKUState extends State {
if (this.threadException != null) {
ErrorDialog error = new ErrorDialog(
this.stateMachine.getGUIProvider().getMainShell(),
- Messages.getString("error.Unexpected"), ERROR_BUTTONS.OK); //$NON-NLS-1$
+ Messages.getString("error.Unexpected"), BUTTONS.OK); //$NON-NLS-1$
// error.setException(this.threadException);
// this.setNextState(error);
error.open();
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 a7dcbd0a..cdf8694a 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
@@ -27,8 +27,10 @@ import org.slf4j.LoggerFactory;
import at.asit.pdfover.gui.MainWindow.Buttons;
import at.asit.pdfover.gui.MainWindowBehavior;
import at.asit.pdfover.gui.composites.OutputComposite;
+import at.asit.pdfover.gui.controls.Dialog;
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.controls.Dialog.ICON;
import at.asit.pdfover.gui.utils.Messages;
import at.asit.pdfover.gui.workflow.StateMachine;
import at.asit.pdfover.gui.workflow.Status;
@@ -101,7 +103,7 @@ public class OutputState extends State {
} catch (IOException e) {
log.error("Failed to save signed document to configured output folder.", e); //$NON-NLS-1$
ErrorDialog dialog = new ErrorDialog(outputComposite.getShell(),
- Messages.getString("error.SaveOutputFolder"), ERROR_BUTTONS.OK); //$NON-NLS-1$
+ Messages.getString("error.SaveOutputFolder"), BUTTONS.OK); //$NON-NLS-1$
dialog.open();
}
}
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 6f052f1a..6c3265bc 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
@@ -26,7 +26,7 @@ import at.asit.pdfover.gui.MainWindow.Buttons;
import at.asit.pdfover.gui.MainWindowBehavior;
import at.asit.pdfover.gui.composites.PositioningComposite;
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.utils.Messages;
import at.asit.pdfover.gui.workflow.StateMachine;
import at.asit.pdfover.gui.workflow.Status;
@@ -102,7 +102,7 @@ public class PositioningState extends State {
log.error("Failed to display PDF document", e); //$NON-NLS-1$
ErrorDialog dialog = new ErrorDialog(
this.stateMachine.getGUIProvider().getMainShell(),
- e.getLocalizedMessage(), ERROR_BUTTONS.RETRY_CANCEL);
+ e.getLocalizedMessage(), BUTTONS.RETRY_CANCEL);
if(dialog.open() == SWT.RETRY) {
this.stateMachine.update();
} else {
@@ -113,7 +113,7 @@ public class PositioningState extends State {
log.error("Failed to create composite (seems like a mac ...)", ex); //$NON-NLS-1$
ErrorDialog dialog = new ErrorDialog(
this.stateMachine.getGUIProvider().getMainShell(),
- Messages.getString("error.PositioningNotPossible"), ERROR_BUTTONS.OK); //$NON-NLS-1$
+ Messages.getString("error.PositioningNotPossible"), BUTTONS.OK); //$NON-NLS-1$
dialog.open();
status.setSignaturePosition(new SignaturePosition());
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 41ad5ff4..41d44f52 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
@@ -38,7 +38,7 @@ import at.asit.pdfover.gui.cliarguments.PhoneNumberArgument;
import at.asit.pdfover.gui.cliarguments.ProxyHostArgument;
import at.asit.pdfover.gui.cliarguments.ProxyPortArgument;
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.InitializationException;
import at.asit.pdfover.gui.utils.Messages;
import at.asit.pdfover.gui.utils.Unzipper;
@@ -262,7 +262,7 @@ public class PrepareConfigurationState extends State {
ErrorDialog error = new ErrorDialog(this.stateMachine
.getGUIProvider().getMainShell(),
Messages.getString("error.Initialization"), //$NON-NLS-1$
- ERROR_BUTTONS.OK);
+ BUTTONS.OK);
// error.setException(e);
// this.setNextState(error);
error.open();
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 843ed962..803590e7 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
@@ -24,7 +24,7 @@ import at.asit.pdfover.gui.MainWindow.Buttons;
import at.asit.pdfover.gui.MainWindowBehavior;
import at.asit.pdfover.gui.composites.WaitingComposite;
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.utils.Messages;
import at.asit.pdfover.gui.workflow.ConfigProvider;
import at.asit.pdfover.gui.workflow.StateMachine;
@@ -162,7 +162,7 @@ public class PrepareSigningState extends State {
if(this.threadException != null) {
ErrorDialog error = new ErrorDialog(this.stateMachine.getGUIProvider().getMainShell(),
Messages.getString("error.PrepareDocument"), //$NON-NLS-1$
- ERROR_BUTTONS.RETRY_CANCEL);
+ BUTTONS.RETRY_CANCEL);
this.threadException = null;
if(error.open() == SWT.RETRY) {
this.stateMachine.update();
diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/SigningState.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/SigningState.java
index 15baa36c..e7a412d5 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/SigningState.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/SigningState.java
@@ -21,7 +21,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
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.utils.Messages;
import at.asit.pdfover.gui.workflow.StateMachine;
import at.asit.pdfover.gui.workflow.Status;
@@ -89,7 +89,7 @@ public class SigningState extends State {
if(this.threadException != null) {
ErrorDialog error = new ErrorDialog(this.stateMachine.getGUIProvider().getMainShell(),
- Messages.getString("error.Signatur"), ERROR_BUTTONS.RETRY_CANCEL); //$NON-NLS-1$
+ Messages.getString("error.Signatur"), BUTTONS.RETRY_CANCEL); //$NON-NLS-1$
this.threadException = null;
if(error.open() == SWT.RETRY) {
this.setNextState(new BKUSelectionState(this.stateMachine));
--
cgit v1.2.3