Fixed some TODOs...

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

7 files changed, 47 insertions, 21 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 0e78e507..d95bb466 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
@@ -50,12 +50,13 @@ import org.eclipse.swt.layout.FormAttachment;
 public class ConfigurationComposite extends StateComposite {
 
 	/**
-	 * 
+	 * Configuration Mode selection listener
 	 */
 	private final class ConfigurationModeSelectionListener implements
 			SelectionListener {
+		
 		/**
-		 * 
+		 * Constructor 
 		 */
 		public ConfigurationModeSelectionListener() {
 			// Nothing to do
@@ -100,22 +101,50 @@ public class ConfigurationComposite extends StateComposite {
 	private static final Logger log = LoggerFactory
 			.getLogger(ConfigurationComposite.class);
 
+	/**
+	 * configuration manipulator
+	 */
 	ConfigManipulator configManipulator = null;
 
+	/**
+	 * configuration provider
+	 */
 	ConfigProvider configProvider = null;
 
+	/**
+	 * current base configuration composite
+	 */
 	BaseConfigurationComposite configComposite;
 
+	/**
+	 * configuration container
+	 * Keeps state for current configuration changes
+	 */
 	ConfigurationContainer configurationContainer = new ConfigurationContainerImpl();
 
+	/**
+	 * The stack layout 
+	 */
 	StackLayout compositeStack = new StackLayout();
 
+	/**
+	 * SWT style
+	 */
 	int style;
 
+	/**
+	 * base configuration container
+	 */
 	Composite containerComposite;
 
+	/**
+	 * checks wether the user is done
+	 */
 	boolean userDone = false;
 
+	/**
+	 * Button advanced
+	 */
 	Button btnAdvanced;
 
 	/**
diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/DataSourceSelectComposite.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/DataSourceSelectComposite.java
index afa7be3e..8146a02d 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/DataSourceSelectComposite.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/DataSourceSelectComposite.java
@@ -195,7 +195,7 @@ public class DataSourceSelectComposite extends StateComposite {
 			}
 		});
 
-		final Label lbl_drag = new Label(this.drop_area, SWT.NONE | SWT.RESIZE);
+		final Label lbl_drag = new Label(this.drop_area, SWT.NONE | SWT.RESIZE );
 		this.fd_lbl_drag = new FormData();
 		this.fd_lbl_drag.left = new FormAttachment(0, 10);
 		this.fd_lbl_drag.right = new FormAttachment(100, -10);
diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/ErrorComposite.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/ErrorComposite.java
index f8a6fbcb..c85d046e 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/ErrorComposite.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/ErrorComposite.java
@@ -114,7 +114,7 @@ public class ErrorComposite extends StateComposite {
 	 */
 	@Override
 	public void doLayout() {
-		// TODO Auto-generated method stub
+		// Nothing to do
 	}
 
 }
diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/MobileBKUEnterNumberComposite.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/MobileBKUEnterNumberComposite.java
index 595ca1bd..6552c3d5 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/MobileBKUEnterNumberComposite.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/MobileBKUEnterNumberComposite.java
@@ -99,8 +99,7 @@ public class MobileBKUEnterNumberComposite extends StateComposite {
 		 */
 		@Override
 		public void widgetDefaultSelected(SelectionEvent e) {
-			// TODO Auto-generated method stub
-			
+			// Nothing to do here
 		}
 	}
 
diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/MobileBKUEnterTANComposite.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/MobileBKUEnterTANComposite.java
index 95184775..ff8d5c63 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/MobileBKUEnterTANComposite.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/MobileBKUEnterTANComposite.java
@@ -61,8 +61,6 @@ public class MobileBKUEnterTANComposite extends StateComposite {
 				return;
 			}
 			
-			// TODO: Check TAN!
-			
 			MobileBKUEnterTANComposite.this.tan = tan;
 			MobileBKUEnterTANComposite.this.setUserAck(true);
 			MobileBKUEnterTANComposite.this.state.updateStateMachine();
@@ -227,8 +225,7 @@ public class MobileBKUEnterTANComposite extends StateComposite {
 	 */
 	@Override
 	public void doLayout() {
-		// TODO Auto-generated method stub
-		
+		// Nothing to do
 	}
 
 }
diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/OutputComposite.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/OutputComposite.java
index 26e5480c..afa2a2e7 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/OutputComposite.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/OutputComposite.java
@@ -32,6 +32,7 @@ import org.eclipse.swt.widgets.FileDialog;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import at.asit.pdfover.gui.controls.ErrorDialog;
 import at.asit.pdfover.gui.workflow.states.State;
 import at.asit.pdfover.signator.DocumentSource;
 
@@ -116,7 +117,9 @@ public class OutputComposite extends StateComposite {
 						return;
 					}
 				} else {
-					// TODO: Handle exception ...
+					log.error("OutputComposite:OpenSelectionListener:widgetSelected -> source is null!!"); //$NON-NLS-1$
+					ErrorDialog dialog = new ErrorDialog(getShell(), SWT.NONE, "Failed to get signed document.", "");
+					dialog.open();
 				}
 			} catch (Exception ex) {
 				log.error("OpenSelectionListener: ", ex); //$NON-NLS-1$
@@ -200,8 +203,7 @@ public class OutputComposite extends StateComposite {
 	 */
 	@Override
 	public void doLayout() {
-		// TODO Auto-generated method stub
-
+		// Nothing to do
 	}
 
 }
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 3830d6cf..a0977b9e 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
@@ -54,6 +54,7 @@ import org.eclipse.swt.widgets.Text;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import at.asit.pdfover.gui.controls.ErrorDialog;
 import at.asit.pdfover.gui.controls.ErrorMarker;
 import at.asit.pdfover.gui.exceptions.InvalidEmblemFile;
 import at.asit.pdfover.gui.exceptions.InvalidNumberException;
@@ -75,7 +76,7 @@ public class SimpleConfigurationComposite extends BaseConfigurationComposite {
 		 * 
 		 */
 		public ImageFileBrowser() {
-			// TODO Auto-generated constructor stub
+			// Nothing to do
 		}
 
 		@Override
@@ -224,8 +225,9 @@ public class SimpleConfigurationComposite extends BaseConfigurationComposite {
 			// String filename = this.txtEmblemFile.getText();
 			plainEmblemSetter(filename);
 		} catch (Exception ex) {
-			// TODO: Show error message!
 			log.error("processEmblemChanged: ", ex); //$NON-NLS-1$
+			ErrorDialog dialog = new ErrorDialog(getShell(), SWT.NONE, "Failed to load the emblem", ex);
+			dialog.open();
 		}
 	}
 
@@ -244,7 +246,6 @@ public class SimpleConfigurationComposite extends BaseConfigurationComposite {
 			this.txtMobileNumberErrorMarker.setVisible(false);
 			plainMobileNumberSetter();
 		} catch (Exception ex) {
-			// TODO: Show error message!
 			this.txtMobileNumberErrorMarker.setVisible(true);
 			this.txtMobileNumberErrorMarker
 					.setToolTipText("Phone number is invalid! Please provide in the form: +43676123456789");
@@ -271,7 +272,6 @@ public class SimpleConfigurationComposite extends BaseConfigurationComposite {
 			this.proxyHostErrorMarker.setVisible(false);
 			plainProxyHostSetter();
 		} catch (Exception ex) {
-			// TODO: Show error message!
 			this.proxyHostErrorMarker.setVisible(true);
 			this.proxyHostErrorMarker.setToolTipText(ex.getMessage());
 			log.error("processProxyHost: ", ex); //$NON-NLS-1$
@@ -291,7 +291,6 @@ public class SimpleConfigurationComposite extends BaseConfigurationComposite {
 			this.txtProxyPortErrorMarker.setVisible(false);
 			plainProxyPortSetter();
 		} catch (Exception ex) {
-			// TODO: Show error message!
 			this.txtProxyPortErrorMarker.setVisible(true);
 			this.txtProxyPortErrorMarker.setToolTipText(ex.getMessage());
 			log.error("processProxyPort: ", ex); //$NON-NLS-1$
@@ -513,8 +512,7 @@ public class SimpleConfigurationComposite extends BaseConfigurationComposite {
 						SimpleConfigurationComposite.this.configurationContainer
 								.setEmblem(null);
 					} catch (InvalidEmblemFile e1) {
-						// TODO Auto-generated catch block
-						e1.printStackTrace();
+						log.error("THIS EXCEPTION IS IMPOSSIBLE! ", e1); //$NON-NLS-1$
 					}
 				}
 			}
@@ -729,8 +727,9 @@ public class SimpleConfigurationComposite extends BaseConfigurationComposite {
 				this.setEmblemFileInternal(emblemFile, true);
 				this.btnUseImage.setSelection(true);
 			} catch (Exception e1) {
-				// TODO Auto-generated catch block
 				log.error("Failed to load emblem: ", e1); //$NON-NLS-1$
+				ErrorDialog dialog = new ErrorDialog(getShell(), SWT.NONE, "Failed to load emblem.", e1);
+				dialog.open();
 			}
 		}