+ fixed last TODOs

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

5 files changed, 16 insertions, 9 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 f9ff5b7f..63372f63 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
@@ -193,7 +193,7 @@ public class ConfigurationComposite extends StateComposite {
 			this.simpleConfigComposite.setSigner(getSigner());
 		}
 		if (this.advancedConfigComposite != null) {
-			// TODO: not needed
+			// not needed at the moment
 			this.advancedConfigComposite.setSigner(getSigner());
 		}
 	}
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 64df41f6..34b52a21 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
@@ -23,8 +23,13 @@ import org.eclipse.swt.SWT;
 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.ErrorDialog;
+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;
+import at.asit.pdfover.signator.SignatureException;
+import at.knowcenter.wag.egov.egiz.exceptions.ConnectorException;
 
 /**
  * Procduces the output of the signature process. (save file, open file)
@@ -64,7 +69,13 @@ public class OutputState extends State {
 		Status status = this.stateMachine.getStatus();
 
 		if (status.getSignResult() == null) {
-			// TODO
+			ErrorDialog error = new ErrorDialog(this.stateMachine.getGUIProvider().getMainShell(),
+					Messages.getString("error.Signatur"), BUTTONS.RETRY_CANCEL); //$NON-NLS-1$
+			if(error.open() == SWT.RETRY) {
+				this.setNextState(new PrepareSigningState(this.stateMachine));
+			} else {
+				this.setNextState(new BKUSelectionState(this.stateMachine));
+			}
 			return;
 		}
 
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 0c6b2c8b..2d610f24 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
@@ -102,8 +102,7 @@ public class PositioningState extends State {
 			PositioningComposite position = null;
 			try {
 				position = this.getPositioningComposite();
-			} catch (IOException e) {
-				// FIXME 
+			} catch (IOException e) { 
 				this.positionComposite = null;
 				log.error("Failed to display PDF document", e); //$NON-NLS-1$
 				String message = e.getLocalizedMessage();
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 803590e7..c58417ac 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
@@ -167,8 +167,6 @@ public class PrepareSigningState extends State {
 			if(error.open() == SWT.RETRY) {
 				this.stateMachine.update();
 			} else {
-				// FIXME: exit?
-				//this.stateMachine.exit();
 				this.setNextState(new BKUSelectionState(this.stateMachine));
 			}
 			return;
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 70a5a9d0..87201e2f 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
@@ -100,10 +100,9 @@ public class SigningState extends State {
 					message, BUTTONS.RETRY_CANCEL);
 			this.threadException = null;
 			if(error.open() == SWT.RETRY) {
-				this.setNextState(new BKUSelectionState(this.stateMachine));
+				this.setNextState(new PrepareSigningState(this.stateMachine));
 			} else {
-				// FIXME: Exit?
-				this.stateMachine.exit();
+				this.setNextState(new BKUSelectionState(this.stateMachine));
 			}
 			return;
 		}