From 42b326277b1c5e559a415fe83ee9ae44f0de772f Mon Sep 17 00:00:00 2001 From: tkellner Date: Wed, 10 Apr 2013 19:08:16 +0000 Subject: Changed ErrorDialog to use SWT Messagebox for OS specific error messages git-svn-id: https://joinup.ec.europa.eu/svn/pdf-over/trunk@152 174cde9d-5d70-4d2a-aa98-46368bc2aaf7 --- .../main/java/at/asit/pdfover/gui/workflow/states/LocalBKUState.java | 4 ++-- .../main/java/at/asit/pdfover/gui/workflow/states/MobileBKUState.java | 3 +-- .../main/java/at/asit/pdfover/gui/workflow/states/OutputState.java | 4 ++-- .../asit/pdfover/gui/workflow/states/PrepareConfigurationState.java | 4 ++-- .../java/at/asit/pdfover/gui/workflow/states/PrepareSigningState.java | 2 +- .../main/java/at/asit/pdfover/gui/workflow/states/SigningState.java | 2 +- 6 files changed, 9 insertions(+), 10 deletions(-) (limited to 'pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states') 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 0c8c7047..e09f2a03 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 @@ -170,9 +170,9 @@ public class LocalBKUState extends State { if (this.threadException != null) { ErrorDialog dialog = new ErrorDialog( - this.stateMachine.getGUIProvider().getMainShell(), SWT.NONE, + this.stateMachine.getGUIProvider().getMainShell(), Messages.getString("error.LocalBKU"), //$NON-NLS-1$ - this.threadException, true); + true); if (!dialog.open()) { this.stateMachine.exit(); return; 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 bf624083..326eb12f 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 @@ -152,8 +152,7 @@ public class MobileBKUState extends State { if (this.threadException != null) { ErrorDialog error = new ErrorDialog( this.stateMachine.getGUIProvider().getMainShell(), - SWT.NONE, - Messages.getString("error.Unexpected"), this.threadException, false); //$NON-NLS-1$ + Messages.getString("error.Unexpected"), false); //$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 e6ba02d8..5ed273ca 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 @@ -99,8 +99,8 @@ public class OutputState extends State { output.close(); } catch (IOException e) { log.error("Failed to save signed document to configured output folder.", e); //$NON-NLS-1$ - ErrorDialog dialog = new ErrorDialog(outputComposite.getShell(), SWT.NONE, - Messages.getString("error.SaveOutputFolder"), e, false); //$NON-NLS-1$ + ErrorDialog dialog = new ErrorDialog(outputComposite.getShell(), + Messages.getString("error.SaveOutputFolder"), false); //$NON-NLS-1$ dialog.open(); } } 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 b4398581..22dfe56a 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 @@ -243,9 +243,9 @@ public class PrepareConfigurationState extends State { } catch (InitializationException e) { log.error("Failed to initialize: ", e); //$NON-NLS-1$ ErrorDialog error = new ErrorDialog(this.stateMachine - .getGUIProvider().getMainShell(), SWT.NONE, + .getGUIProvider().getMainShell(), Messages.getString("error.Initialization"), //$NON-NLS-1$ - e, false); + false); // 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 f51a3289..6381038f 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 @@ -154,7 +154,7 @@ public class PrepareSigningState extends State { if(this.threadException != null) { ErrorDialog error = new ErrorDialog(this.stateMachine.getGUIProvider().getMainShell(), - SWT.NONE, Messages.getString("error.PrepareDocument"), this.threadException, //$NON-NLS-1$ + Messages.getString("error.PrepareDocument"), //$NON-NLS-1$ true); this.threadException = null; if(error.open()) { 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 3b782119..a173bb21 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 @@ -88,7 +88,7 @@ public class SigningState extends State { if(this.threadException != null) { ErrorDialog error = new ErrorDialog(this.stateMachine.getGUIProvider().getMainShell(), - SWT.NONE, Messages.getString("error.Signatur"), this.threadException, true); //$NON-NLS-1$ + Messages.getString("error.Signatur"), true); //$NON-NLS-1$ this.threadException = null; if(error.open()) { this.setNextState(new BKUSelectionState(this.stateMachine)); -- cgit v1.2.3