remove leftover empty comments after e4767bccc7324d4b61a334bf6c0558d0080045e2

16 files changed, 292 insertions, 292 deletions

diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/BKUSelectionComposite.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/BKUSelectionComposite.java
index 7bba2860..0f9fa724 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/BKUSelectionComposite.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/BKUSelectionComposite.java
@@ -58,7 +58,7 @@ public class BKUSelectionComposite extends StateComposite {
 
 		@Override
 		public void widgetSelected(SelectionEvent e) {
-			log.debug("Setting BKU to LOCAL"); //
+			log.debug("Setting BKU to LOCAL");
 			setSelected(BKUs.LOCAL);
 		}
 	}
@@ -75,7 +75,7 @@ public class BKUSelectionComposite extends StateComposite {
 
 		@Override
 		public void widgetSelected(SelectionEvent e) {
-			log.debug("Setting BKU to MOBILE"); //
+			log.debug("Setting BKU to MOBILE");
 			setSelected(BKUs.MOBILE);
 		}
 	}
@@ -92,7 +92,7 @@ public class BKUSelectionComposite extends StateComposite {
 
 		@Override
 		public void widgetSelected(SelectionEvent e) {
-			log.debug("Setting BKU to KS"); //
+			log.debug("Setting BKU to KS");
 			setSelected(BKUs.KS);
 		}
 	}
@@ -229,9 +229,9 @@ public class BKUSelectionComposite extends StateComposite {
 	 */
 	@Override
 	public void reloadResources() {
-		this.btnMobile.setText(Messages.getString("bku_selection.mobile")); //
-		this.btnCard.setText(Messages.getString("bku_selection.card")); //
+		this.btnMobile.setText(Messages.getString("bku_selection.mobile"));
+		this.btnCard.setText(Messages.getString("bku_selection.card"));
 		if (this.btnKS != null)
-			this.btnKS.setText(Messages.getString("bku_selection.ks")); //
+			this.btnKS.setText(Messages.getString("bku_selection.ks"));
 	}
 }
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 10a2a2f4..3691a519 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
@@ -166,7 +166,7 @@ public class ConfigurationComposite extends StateComposite {
 		this.tabFolder.setFont(new Font(Display.getCurrent(), fD_tabFolder[0]));
 
 		this.simpleTabItem = new TabItem(this.tabFolder, SWT.NONE);
-		this.simpleTabItem.setText(Messages.getString("config.Simple")); //
+		this.simpleTabItem.setText(Messages.getString("config.Simple"));
 
 		ScrolledComposite simpleCompositeScr = new ScrolledComposite(this.tabFolder, (SWT.H_SCROLL | SWT.V_SCROLL));
 		this.simpleTabItem.setControl(simpleCompositeScr);
@@ -177,7 +177,7 @@ public class ConfigurationComposite extends StateComposite {
 		simpleCompositeScr.setMinSize(simpleConfigComposite.computeSize(SWT.DEFAULT, SWT.DEFAULT));
 
 		this.advancedTabItem = new TabItem(this.tabFolder, SWT.NONE);
-		this.advancedTabItem.setText(Messages.getString("config.Advanced")); //
+		this.advancedTabItem.setText(Messages.getString("config.Advanced"));
 
 		ScrolledComposite advancedCompositeScr = new ScrolledComposite(this.tabFolder, (SWT.H_SCROLL | SWT.V_SCROLL));
 		this.advancedTabItem.setControl(advancedCompositeScr);
@@ -188,7 +188,7 @@ public class ConfigurationComposite extends StateComposite {
 		advancedCompositeScr.setMinSize(advancedConfigComposite.computeSize(SWT.DEFAULT, SWT.DEFAULT));
 
 		this.aboutTabItem = new TabItem(this.tabFolder, SWT.NONE);
-		this.aboutTabItem.setText(String.format(Messages.getString("config.About"), Constants.APP_NAME)); //
+		this.aboutTabItem.setText(String.format(Messages.getString("config.About"), Constants.APP_NAME));
 
 		ScrolledComposite aboutCompositeScr = new ScrolledComposite(this.tabFolder, (SWT.H_SCROLL | SWT.V_SCROLL));
 		this.aboutTabItem.setControl(aboutCompositeScr);
@@ -219,7 +219,7 @@ public class ConfigurationComposite extends StateComposite {
 				}
 			}
 		});
-		this.btnSpeichern.setText(Messages.getString("common.Save")); //
+		this.btnSpeichern.setText(Messages.getString("common.Save"));
 		getShell().setDefaultButton(this.btnSpeichern);
 
 		FontData[] fD_btnSpeichern = this.btnSpeichern.getFont().getFontData();
@@ -231,7 +231,7 @@ public class ConfigurationComposite extends StateComposite {
 		fd_btnAbrechen.right = new FormAttachment(this.btnSpeichern, -10);
 		fd_btnAbrechen.bottom = new FormAttachment(this.btnSpeichern, 0, SWT.BOTTOM);
 		this.btnAbbrechen.setLayoutData(fd_btnAbrechen);
-		this.btnAbbrechen.setText(Messages.getString("common.Cancel")); //
+		this.btnAbbrechen.setText(Messages.getString("common.Cancel"));
 		this.btnAbbrechen.addSelectionListener(new SelectionAdapter() {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
@@ -287,7 +287,7 @@ public class ConfigurationComposite extends StateComposite {
 	public void keystoreEnabled(boolean enabled) {
 		if (enabled && this.keystoreConfigComposite == null) {
 			this.keystoreTabItem = new TabItem(this.tabFolder, SWT.NONE, 2);
-			this.keystoreTabItem.setText(Messages.getString("config.Keystore")); //
+			this.keystoreTabItem.setText(Messages.getString("config.Keystore"));
 
 			ScrolledComposite keystoreCompositeScr = new ScrolledComposite(
 					this.tabFolder, SWT.H_SCROLL | SWT.V_SCROLL);
@@ -351,7 +351,7 @@ public class ConfigurationComposite extends StateComposite {
 					redo = false;
 					status = true;
 				} catch (ResumableException e) {
-					log.error("Settings validation failed!", e); //
+					log.error("Settings validation failed!", e);
 					ErrorDialog dialog = new ErrorDialog(getShell(),
 							e.getMessage(), BUTTONS.ABORT_RETRY_IGNORE);
 					int rc = dialog.open();
@@ -380,7 +380,7 @@ public class ConfigurationComposite extends StateComposite {
 					redo = false;
 					status = true;
 				} catch (ResumableException e) {
-					log.error("Settings validation failed!", e); //
+					log.error("Settings validation failed!", e);
 					ErrorDialog dialog = new ErrorDialog(getShell(),
 							e.getMessage(), BUTTONS.ABORT_RETRY_IGNORE);
 					int rc = dialog.open();
@@ -410,7 +410,7 @@ public class ConfigurationComposite extends StateComposite {
 						redo = false;
 						status = true;
 					} catch (ResumableException e) {
-						log.error("Settings validation failed!", e); //
+						log.error("Settings validation failed!", e);
 						ErrorDialog dialog = new ErrorDialog(getShell(),
 								e.getMessage(), BUTTONS.ABORT_RETRY_IGNORE);
 						int rc = dialog.open();
@@ -429,10 +429,10 @@ public class ConfigurationComposite extends StateComposite {
 				}
 			}
 		} catch (Exception e) {
-			log.error("Settings validation failed!", e); //
+			log.error("Settings validation failed!", e);
 			String message = e.getMessage();
 			if (message == null)
-				message = Messages.getString("error.Unexpected"); //
+				message = Messages.getString("error.Unexpected");
 			ErrorDialog dialog = new ErrorDialog(getShell(), message,
 					BUTTONS.OK);
 			dialog.open();
@@ -461,9 +461,9 @@ public class ConfigurationComposite extends StateComposite {
 				redo = false;
 				status = true;
 			} catch (IOException e) {
-				log.error("Failed to save configuration to file!", e); //
+				log.error("Failed to save configuration to file!", e);
 				ErrorDialog dialog = new ErrorDialog(getShell(),
-						Messages.getString("error.FailedToSaveSettings"), BUTTONS.RETRY_CANCEL); //
+						Messages.getString("error.FailedToSaveSettings"), BUTTONS.RETRY_CANCEL);
 				redo = (dialog.open() == SWT.RETRY);
 
 				// return false;
@@ -509,10 +509,10 @@ public class ConfigurationComposite extends StateComposite {
 	 */
 	@Override
 	public void reloadResources() {
-		this.simpleTabItem.setText(Messages.getString("config.Simple")); //
-		this.advancedTabItem.setText(Messages.getString("config.Advanced")); //
-		this.aboutTabItem.setText(String.format(Messages.getString("config.About"), Constants.APP_NAME)); //
-		this.btnSpeichern.setText(Messages.getString("common.Save")); //
-		this.btnAbbrechen.setText(Messages.getString("common.Cancel")); //
+		this.simpleTabItem.setText(Messages.getString("config.Simple"));
+		this.advancedTabItem.setText(Messages.getString("config.Advanced"));
+		this.aboutTabItem.setText(String.format(Messages.getString("config.About"), Constants.APP_NAME));
+		this.btnSpeichern.setText(Messages.getString("common.Save"));
+		this.btnAbbrechen.setText(Messages.getString("common.Cancel"));
 	}
 }
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 dda55a47..3f89338a 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
@@ -59,10 +59,10 @@ public class DataSourceSelectComposite extends StateComposite {
 	public void openFileDialog() {
 		FileDialog dialog = new FileDialog(
 				DataSourceSelectComposite.this.getShell(), SWT.OPEN);
-		dialog.setFilterExtensions(new String[] { "*.pdf", "*" }); // //
+		dialog.setFilterExtensions(new String[] { "*.pdf", "*" });
 		dialog.setFilterNames(new String[] {
-				Messages.getString("common.PDFExtension_Description"),  //
-				Messages.getString("common.AllExtension_Description") }); //
+				Messages.getString("common.PDFExtension_Description"),
+				Messages.getString("common.AllExtension_Description") });
 		String fileName = dialog.open();
 		File file = null;
 		if (fileName != null) {
@@ -207,7 +207,7 @@ public class DataSourceSelectComposite extends StateComposite {
 			public void drop(DropTargetEvent event) {
 				if (fileTransfer.isSupportedType(event.currentDataType)) {
 					if (event.data == null) {
-						log.error("Dropped file name was null"); //
+						log.error("Dropped file name was null");
 						return;
 					}
 					String[] files = (String[]) event.data;
@@ -215,7 +215,7 @@ public class DataSourceSelectComposite extends StateComposite {
 						// Only taking first file ...
 						File file = new File(files[0]);
 						if (!file.exists()) {
-							log.error(String.format(Messages.getString("error.FileNotExist"), files[0])); //
+							log.error(String.format(Messages.getString("error.FileNotExist"), files[0]));
 							return;
 						}
 						DataSourceSelectComposite.this.setSelected(file);
@@ -264,7 +264,7 @@ public class DataSourceSelectComposite extends StateComposite {
 		FontData[] fD = this.lbl_drag.getFont().getFontData();
 		fD[0].setHeight(Constants.TEXT_SIZE_BIG);
 		this.lbl_drag.setFont(new Font(Display.getCurrent(), fD[0]));
-		this.lbl_drag.setText(Messages.getString("dataSourceSelection.DropLabel")); //
+		this.lbl_drag.setText(Messages.getString("dataSourceSelection.DropLabel"));
 		this.lbl_drag.setAlignment(SWT.CENTER);
 
 
@@ -278,11 +278,11 @@ public class DataSourceSelectComposite extends StateComposite {
 		fD2[0].setHeight(Constants.TEXT_SIZE_NORMAL);
 		this.lbl_drag2.setFont(new Font(Display.getCurrent(), fD2[0]));
 		this.lbl_drag2.setText(Messages
-				.getString("dataSourceSelection.DropLabel2")); //
+				.getString("dataSourceSelection.DropLabel2"));
 		this.lbl_drag2.setAlignment(SWT.CENTER);
 
 		this.btn_open = new Button(this.drop_area, SWT.NATIVE | SWT.RESIZE);
-		this.btn_open.setText(Messages.getString("dataSourceSelection.browse")); //
+		this.btn_open.setText(Messages.getString("dataSourceSelection.browse"));
 
 		FontData[] fD_open = this.btn_open.getFont().getFontData();
 		fD_open[0].setHeight(Constants.TEXT_SIZE_BUTTON);
@@ -357,8 +357,8 @@ public class DataSourceSelectComposite extends StateComposite {
 	 */
 	@Override
 	public void reloadResources() {
-		this.lbl_drag.setText(Messages.getString("dataSourceSelection.DropLabel")); //
-		this.btn_open.setText(Messages.getString("dataSourceSelection.browse")); //
-		this.lbl_drag2.setText(Messages.getString("dataSourceSelection.DropLabel2")); //
+		this.lbl_drag.setText(Messages.getString("dataSourceSelection.DropLabel"));
+		this.btn_open.setText(Messages.getString("dataSourceSelection.browse"));
+		this.lbl_drag2.setText(Messages.getString("dataSourceSelection.DropLabel2"));
 	}
 }
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 197d2bcc..19fbed98 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
@@ -80,15 +80,15 @@ public class MobileBKUEnterNumberComposite extends StateComposite {
 				MobileBKUEnterNumberComposite.this.btn_ok.setEnabled(false);

 

 			} catch(InvalidPasswordException ex) {

-				log.error("Validating input for Mobile BKU failed!", ex); //

+				log.error("Validating input for Mobile BKU failed!", ex);

 				MobileBKUEnterNumberComposite.this

 				.setErrorMessage(ex.getMessage());

 				MobileBKUEnterNumberComposite.this.txt_password.setFocus();

 			}

 			catch (Exception ex) {

-				log.error("Validating input for Mobile BKU failed!", ex); //

+				log.error("Validating input for Mobile BKU failed!", ex);

 				MobileBKUEnterNumberComposite.this

-						.setErrorMessage(Messages.getString("error.InvalidPhoneNumber")); //

+						.setErrorMessage(Messages.getString("error.InvalidPhoneNumber"));

 				MobileBKUEnterNumberComposite.this.txt_number.setFocus();

 				return;

 			}

@@ -144,7 +144,7 @@ public class MobileBKUEnterNumberComposite extends StateComposite {
 		if (this.errorMessage != null) {

 			this.lbl_error.setText(this.errorMessage);

 		} else {

-			this.lbl_error.setText(""); //

+			this.lbl_error.setText("");

 		}

 	}

 

@@ -192,7 +192,7 @@ public class MobileBKUEnterNumberComposite extends StateComposite {
 

 		this.lbl_number = new Label(containerComposite, SWT.NATIVE);

 		this.lbl_number.setAlignment(SWT.RIGHT);

-		this.lbl_number.setText(Messages.getString("mobileBKU.number")); //

+		this.lbl_number.setText(Messages.getString("mobileBKU.number"));

 		FormData fd_lbl_number = new FormData();

 		fd_lbl_number.bottom = new FormAttachment(50, -10);

 		fd_lbl_number.right = new FormAttachment(50, -10);

@@ -223,14 +223,14 @@ public class MobileBKUEnterNumberComposite extends StateComposite {
 

 		this.lbl_password = new Label(containerComposite, SWT.NATIVE);

 		this.lbl_password.setAlignment(SWT.RIGHT);

-		this.lbl_password.setText(Messages.getString("mobileBKU.password")); //

+		this.lbl_password.setText(Messages.getString("mobileBKU.password"));

 		FormData fd_lbl_password = new FormData();

 		fd_lbl_password.top = new FormAttachment(50, 10);

 		fd_lbl_password.right = new FormAttachment(50, -10);

 		this.lbl_password.setLayoutData(fd_lbl_password);

 

 		this.btn_ok = new Button(containerComposite, SWT.NATIVE);

-		this.btn_ok.setText(Messages.getString("common.Ok")); //

+		this.btn_ok.setText(Messages.getString("common.Ok"));

 		FormData fd_btn_ok = new FormData();

 		fd_btn_ok.bottom = new FormAttachment(100, -20);

 		fd_btn_ok.right = new FormAttachment(100, -20);

@@ -238,7 +238,7 @@ public class MobileBKUEnterNumberComposite extends StateComposite {
 		this.btn_ok.addSelectionListener(this.okListener);

 

 		this.btn_cancel = new Button(containerComposite, SWT.NATIVE);

-		this.btn_cancel.setText(Messages.getString("common.Cancel")); //

+		this.btn_cancel.setText(Messages.getString("common.Cancel"));

 		FormData fd_btn_cancel = new FormData();

 		fd_btn_cancel.bottom = new FormAttachment(100, -20);

 		fd_btn_cancel.right = new FormAttachment(this.btn_ok, -10);

@@ -295,7 +295,7 @@ public class MobileBKUEnterNumberComposite extends StateComposite {
 			this.txt_number.setText(this.mobileNumber);

 			this.txt_password.setFocus();

 		} else {

-			this.txt_number.setText(""); //

+			this.txt_number.setText("");

 		}

 	}

 

@@ -318,7 +318,7 @@ public class MobileBKUEnterNumberComposite extends StateComposite {
 		if (this.mobilePassword != null) {

 			this.txt_password.setText(this.mobilePassword);

 		} else {

-			this.txt_password.setText(""); //

+			this.txt_password.setText("");

 		}

 	}

 

@@ -327,9 +327,9 @@ public class MobileBKUEnterNumberComposite extends StateComposite {
 	 */

 	@Override

 	public void reloadResources() {

-		this.lbl_number.setText(Messages.getString("mobileBKU.number")); //

-		this.lbl_password.setText(Messages.getString("mobileBKU.password")); //

-		this.btn_ok.setText(Messages.getString("common.Ok")); //

+		this.lbl_number.setText(Messages.getString("mobileBKU.number"));

+		this.lbl_password.setText(Messages.getString("mobileBKU.password"));

+		this.btn_ok.setText(Messages.getString("common.Ok"));

 	}

 

 }

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 1e754e9a..55711bb1 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
@@ -74,19 +74,19 @@ public class MobileBKUEnterTANComposite extends StateComposite {
 

 			if (tan.isEmpty()) {

 				MobileBKUEnterTANComposite.this.setMessage(Messages

-						.getString("error.NoTan")); //

+						.getString("error.NoTan"));

 				return;

 			}

 

 			if (MobileBKUEnterTANComposite.this.refVal.startsWith(tan)) {

 				MobileBKUEnterTANComposite.this.setMessage(Messages

-						.getString("error.EnteredReferenceValue")); //

+						.getString("error.EnteredReferenceValue"));

 				return;

 			}

 

 			if (tan.length() > 6) {

 				MobileBKUEnterTANComposite.this.setMessage(Messages

-						.getString("error.TanTooLong")); //

+						.getString("error.TanTooLong"));

 				return;

 			}

 

@@ -175,8 +175,8 @@ public class MobileBKUEnterTANComposite extends StateComposite {
 	 * @param tries

 	 */

 	public void setTries(int tries) {

-		this.lblTries.setText(tries == 1 ? Messages.getString("tanEnter.try") : //

-				String.format(Messages.getString("tanEnter.tries"), tries)); //

+		this.lblTries.setText(tries == 1 ? Messages.getString("tanEnter.try") :

+				String.format(Messages.getString("tanEnter.tries"), tries));

 	}

 

 	/**

@@ -185,10 +185,10 @@ public class MobileBKUEnterTANComposite extends StateComposite {
 	 */

 	public void setErrorMessage(String errorMessage) {

 		if (errorMessage == null)

-			this.lblTries.setText(""); //

+			this.lblTries.setText("");

 		else

 			this.lblTries.setText(

-					Messages.getString("error.Title") + ": " + errorMessage); // //

+					Messages.getString("error.Title") + ": " + errorMessage);

 	}

 

 

@@ -243,7 +243,7 @@ public class MobileBKUEnterTANComposite extends StateComposite {
 		if (this.refVal != null) {

 			this.lblRefVal.setText(this.refVal);

 		} else {

-			this.lblRefVal.setText(""); //

+			this.lblRefVal.setText("");

 		}

 

 	}

@@ -263,7 +263,7 @@ public class MobileBKUEnterTANComposite extends StateComposite {
 		this.tan = tan;

 

 		if (this.tan == null) {

-			this.txt_tan.setText(""); //

+			this.txt_tan.setText("");

 		} else {

 			this.txt_tan.setText(this.tan);

 		}

@@ -284,17 +284,17 @@ public class MobileBKUEnterTANComposite extends StateComposite {
 			try {

 				String signatureData = MobileBKUEnterTANComposite.this

 						.getSignatureData();

-				if (signatureData != null && !signatureData.equals("")) { //

-					log.debug("Trying to open " + signatureData); //

+				if (signatureData != null && !signatureData.equals("")) {

+					log.debug("Trying to open " + signatureData);

 					if (Desktop.isDesktopSupported()) {

 						Desktop.getDesktop().browse(new URI(signatureData));

 					} else {

-						log.info("SWT Desktop is not supported on this platform"); //

+						log.info("SWT Desktop is not supported on this platform");

 						Program.launch(signatureData);

 					}

 				}

 			} catch (Exception ex) {

-				log.error("OpenSelectionListener: ", ex); //

+				log.error("OpenSelectionListener: ", ex);

 			}

 		}

 	}

@@ -341,7 +341,7 @@ public class MobileBKUEnterTANComposite extends StateComposite {
 		fd_lblRefValLabel.bottom = new FormAttachment(50, -10);

 		this.lblRefValLabel.setLayoutData(fd_lblRefValLabel);

 		this.lblRefValLabel.setText(Messages

-				.getString("tanEnter.ReferenceValue")); //

+				.getString("tanEnter.ReferenceValue"));

 

 		Label lbl_image = new Label(containerComposite, SWT.NATIVE);

 

@@ -364,7 +364,7 @@ public class MobileBKUEnterTANComposite extends StateComposite {
 		// fd_lblRefVal.top = new FormAttachment(30, -15);

 		fd_lblRefVal.bottom = new FormAttachment(50, -10);

 		this.lblRefVal.setLayoutData(fd_lblRefVal);

-		this.lblRefVal.setText(""); //

+		this.lblRefVal.setText("");

 

 		this.lblTan = new Label(containerComposite, SWT.NATIVE);

 		this.lblTan.setAlignment(SWT.RIGHT);

@@ -374,7 +374,7 @@ public class MobileBKUEnterTANComposite extends StateComposite {
 		fd_lblTan.top = new FormAttachment(50, 10);

 		// fd_lblTan.bottom = new FormAttachment(50, 15);

 		this.lblTan.setLayoutData(fd_lblTan);

-		this.lblTan.setText(Messages.getString("tanEnter.TAN")); //

+		this.lblTan.setText(Messages.getString("tanEnter.TAN"));

 

 		this.txt_tan = new Text(containerComposite, SWT.BORDER | SWT.NATIVE);

 		FormData fd_text = new FormData();

@@ -402,12 +402,12 @@ public class MobileBKUEnterTANComposite extends StateComposite {
 			public void modifyText(ModifyEvent e) {

 

 				String text = MobileBKUEnterTANComposite.this.txt_tan.getText();

-				//log.debug("Current TAN: " + text); //

+				//log.debug("Current TAN: " + text);

 				if (text.length() > 3

 						&& MobileBKUEnterTANComposite.this.getRefVal()

 								.startsWith(text.trim())) {

 					MobileBKUEnterTANComposite.this.setMessage(Messages

-							.getString("error.EnteredReferenceValue")); //

+							.getString("error.EnteredReferenceValue"));

 				}

 			}

 		});

@@ -420,8 +420,8 @@ public class MobileBKUEnterTANComposite extends StateComposite {
 		lnk_sig_data.setEnabled(true);

 		lnk_sig_data.setLayoutData(fd_lnk_data);

 		lnk_sig_data.addSelectionListener(new ShowSignatureDataListener());

-		lnk_sig_data.setText(Messages.getString("mobileBKU.show")); //

-		lnk_sig_data.setToolTipText(Messages.getString("mobileBKU.show_tooltip")); //

+		lnk_sig_data.setText(Messages.getString("mobileBKU.show"));

+		lnk_sig_data.setToolTipText(Messages.getString("mobileBKU.show_tooltip"));

 

 		this.btn_ok = new Button(containerComposite, SWT.NATIVE);

 		this.btn_cancel = new Button(containerComposite, SWT.NATIVE);

@@ -441,7 +441,7 @@ public class MobileBKUEnterTANComposite extends StateComposite {
 		fd_btn_ok.bottom = new FormAttachment(100, -20);

 

 		this.btn_ok.setLayoutData(fd_btn_ok);

-		this.btn_ok.setText(Messages.getString("common.Ok")); //

+		this.btn_ok.setText(Messages.getString("common.Ok"));

 		this.btn_ok.addSelectionListener(new OkSelectionListener());

 

 		FormData fd_btn_cancel = new FormData();

@@ -451,7 +451,7 @@ public class MobileBKUEnterTANComposite extends StateComposite {
 		fd_btn_cancel.bottom = new FormAttachment(100, -20);

 

 		this.btn_cancel.setLayoutData(fd_btn_cancel);

-		this.btn_cancel.setText(Messages.getString("common.Cancel")); //

+		this.btn_cancel.setText(Messages.getString("common.Cancel"));

 		this.btn_cancel.addSelectionListener(new CancelSelectionListener());

 	}

 

@@ -478,7 +478,7 @@ public class MobileBKUEnterTANComposite extends StateComposite {
 	@Override

 	public void reloadResources() {

 		this.lblRefValLabel.setText(Messages

-				.getString("tanEnter.ReferenceValue")); //

-		this.lblTan.setText(Messages.getString("tanEnter.TAN")); //

+				.getString("tanEnter.ReferenceValue"));

+		this.lblTan.setText(Messages.getString("tanEnter.TAN"));

 	}

 }

diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/MobileBKUFingerprintComposite.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/MobileBKUFingerprintComposite.java
index 02c0b9b3..35963786 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/MobileBKUFingerprintComposite.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/MobileBKUFingerprintComposite.java
@@ -151,10 +151,10 @@ public class MobileBKUFingerprintComposite extends StateComposite {
 	 */

 	public void setErrorMessage(String errorMessage) {

 		if (errorMessage == null)

-			this.lblError.setText(""); //

+			this.lblError.setText("");

 		else

 			this.lblError.setText(

-					Messages.getString("error.Title") + ": " + errorMessage); // //

+					Messages.getString("error.Title") + ": " + errorMessage);

 	}

 

 	/**

@@ -198,7 +198,7 @@ public class MobileBKUFingerprintComposite extends StateComposite {
 		if (this.refVal != null) {

 			this.lblRefVal.setText(this.refVal);

 		} else {

-			this.lblRefVal.setText(""); //

+			this.lblRefVal.setText("");

 		}

 

 	}

@@ -219,17 +219,17 @@ public class MobileBKUFingerprintComposite extends StateComposite {
 			try {

 				String signatureData = MobileBKUFingerprintComposite.this

 						.getSignatureData();

-				if (signatureData != null && !signatureData.equals("")) { //

-					log.debug("Trying to open " + signatureData); //

+				if (signatureData != null && !signatureData.equals("")) {

+					log.debug("Trying to open " + signatureData);

 					if (Desktop.isDesktopSupported()) {

 						Desktop.getDesktop().browse(new URI(signatureData));

 					} else {

-						log.info("SWT Desktop is not supported on this platform"); //

+						log.info("SWT Desktop is not supported on this platform");

 						Program.launch(signatureData);

 					}

 				}

 			} catch (Exception ex) {

-				log.error("OpenSelectionListener: ", ex); //

+				log.error("OpenSelectionListener: ", ex);

 			}

 		}

 	}

@@ -297,7 +297,7 @@ public class MobileBKUFingerprintComposite extends StateComposite {
 		fd_lblRefVal.top = new FormAttachment(30, -10);

 		//fd_lblRefVal.bottom = new FormAttachment(50, -10);

 		this.lblRefVal.setLayoutData(fd_lblRefVal);

-		this.lblRefVal.setText("test"); //

+		this.lblRefVal.setText("test");

 

 		this.lblFPLabel = new Label(containerComposite, SWT.NATIVE);

 		this.lblFPLabel.setAlignment(SWT.LEFT);

@@ -371,11 +371,11 @@ public class MobileBKUFingerprintComposite extends StateComposite {
 	@Override

 	public void reloadResources() {

 		this.lblRefValLabel.setText(Messages

-				.getString("tanEnter.ReferenceValue")); //

-		this.lblFPLabel.setText(Messages.getString("tanEnter.FP")); //

-		this.lnk_sig_data.setText(Messages.getString("mobileBKU.show")); //

-		this.lnk_sig_data.setToolTipText(Messages.getString("mobileBKU.show_tooltip")); //

-		this.btn_cancel.setText(Messages.getString("common.Cancel")); //

-		this.btn_sms.setText(Messages.getString("tanEnter.SMS")); //

+				.getString("tanEnter.ReferenceValue"));

+		this.lblFPLabel.setText(Messages.getString("tanEnter.FP"));

+		this.lnk_sig_data.setText(Messages.getString("mobileBKU.show"));

+		this.lnk_sig_data.setToolTipText(Messages.getString("mobileBKU.show_tooltip"));

+		this.btn_cancel.setText(Messages.getString("common.Cancel"));

+		this.btn_sms.setText(Messages.getString("tanEnter.SMS"));

 	}

 }

diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/MobileBKUQRComposite.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/MobileBKUQRComposite.java
index 303415a1..58059153 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/MobileBKUQRComposite.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/MobileBKUQRComposite.java
@@ -155,10 +155,10 @@ public class MobileBKUQRComposite extends StateComposite {
 	 */

 	public void setErrorMessage(String errorMessage) {

 		if (errorMessage == null)

-			this.lblError.setText(""); //

+			this.lblError.setText("");

 		else

 			this.lblError.setText(

-					Messages.getString("error.Title") + ": " + errorMessage); // //

+					Messages.getString("error.Title") + ": " + errorMessage);

 	}

 

 	/**

@@ -202,7 +202,7 @@ public class MobileBKUQRComposite extends StateComposite {
 		if (this.refVal != null) {

 			this.lblRefVal.setText(this.refVal);

 		} else {

-			this.lblRefVal.setText(""); //

+			this.lblRefVal.setText("");

 		}

 

 	}

@@ -213,7 +213,7 @@ public class MobileBKUQRComposite extends StateComposite {
 	 */

 	public void setQR(InputStream qrcode) {

 		if (qrcode == null) {

-			setErrorMessage(Messages.getString("error.FailedToLoadQRCode")); //

+			setErrorMessage(Messages.getString("error.FailedToLoadQRCode"));

 			return;

 		}

 		Image qr = new Image(Display.getCurrent(), qrcode);

@@ -235,17 +235,17 @@ public class MobileBKUQRComposite extends StateComposite {
 			try {

 				String signatureData = MobileBKUQRComposite.this

 						.getSignatureData();

-				if (signatureData != null && !signatureData.equals("")) { //

-					log.debug("Trying to open " + signatureData); //

+				if (signatureData != null && !signatureData.equals("")) {

+					log.debug("Trying to open " + signatureData);

 					if (Desktop.isDesktopSupported()) {

 						Desktop.getDesktop().browse(new URI(signatureData));

 					} else {

-						log.info("SWT Desktop is not supported on this platform"); //

+						log.info("SWT Desktop is not supported on this platform");

 						Program.launch(signatureData);

 					}

 				}

 			} catch (Exception ex) {

-				log.error("OpenSelectionListener: ", ex); //

+				log.error("OpenSelectionListener: ", ex);

 			}

 		}

 	}

@@ -313,7 +313,7 @@ public class MobileBKUQRComposite extends StateComposite {
 		fd_lblRefVal.top = new FormAttachment(30, -10);

 		//fd_lblRefVal.bottom = new FormAttachment(50, -10);

 		this.lblRefVal.setLayoutData(fd_lblRefVal);

-		this.lblRefVal.setText(""); //

+		this.lblRefVal.setText("");

 

 		this.lblQRLabel = new Label(containerComposite, SWT.NATIVE);

 		this.lblQRLabel.setAlignment(SWT.RIGHT);

@@ -395,11 +395,11 @@ public class MobileBKUQRComposite extends StateComposite {
 	@Override

 	public void reloadResources() {

 		this.lblRefValLabel.setText(Messages

-				.getString("tanEnter.ReferenceValue")); //

-		this.lblQRLabel.setText(Messages.getString("tanEnter.QR")); //

-		this.lnk_sig_data.setText(Messages.getString("mobileBKU.show")); //

-		this.lnk_sig_data.setToolTipText(Messages.getString("mobileBKU.show_tooltip")); //

-		this.btn_cancel.setText(Messages.getString("common.Cancel")); //

-		this.btn_sms.setText(Messages.getString("tanEnter.SMS")); //

+				.getString("tanEnter.ReferenceValue"));

+		this.lblQRLabel.setText(Messages.getString("tanEnter.QR"));

+		this.lnk_sig_data.setText(Messages.getString("mobileBKU.show"));

+		this.lnk_sig_data.setToolTipText(Messages.getString("mobileBKU.show_tooltip"));

+		this.btn_cancel.setText(Messages.getString("common.Cancel"));

+		this.btn_sms.setText(Messages.getString("tanEnter.SMS"));

 	}

 }

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 a9315b4c..429d427a 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
@@ -254,17 +254,17 @@ public class OutputComposite extends StateComposite {
 
 			FileDialog save = new FileDialog(this.getShell(),
 					SWT.SAVE | SWT.NATIVE);
-			save.setFilterExtensions(new String[] { "*.pdf", "*" }); // //
+			save.setFilterExtensions(new String[] { "*.pdf", "*" });
 			save.setFilterNames(new String[] {
-					Messages.getString("common.PDFExtension_Description"), //
-					Messages.getString("common.AllExtension_Description")}); //
+					Messages.getString("common.PDFExtension_Description"),
+					Messages.getString("common.AllExtension_Description")});
 			save.setFilterPath(inputFolder.getAbsolutePath());
 			save.setFileName(proposedName);
 
 			outputFileName = save.open();
 			inputFolder = null;
 		}
-		log.debug("Trying to save to '" + outputFileName + "'"); // //
+		log.debug("Trying to save to '" + outputFileName + "'");
 
 		this.outputFile = saveResultAsFile(inputFolder, outputFileName);
 		this.saveFailed = (this.outputFile == null);
@@ -293,8 +293,8 @@ public class OutputComposite extends StateComposite {
 			targetFile = new File(inputFolder, target);
 
 		if (targetFile.exists()) {
-			Dialog dialog = new Dialog(getShell(), Messages.getString("common.warning"), //
-					String.format(Messages.getString("output.file_ask_overwrite"), targetFile.getName()), //
+			Dialog dialog = new Dialog(getShell(), Messages.getString("common.warning"),
+					String.format(Messages.getString("output.file_ask_overwrite"), targetFile.getName()),
 					BUTTONS.OK_CANCEL, ICON.QUESTION);
 			if (dialog.open() == SWT.CANCEL)
 			{
@@ -313,18 +313,18 @@ public class OutputComposite extends StateComposite {
 						source.getByteArray().length);
 				outstream.close();
 			} catch (FileNotFoundException e) {
-				log.warn("Failed to open output file", e); //
+				log.warn("Failed to open output file", e);
 				ErrorDialog dialog = new ErrorDialog(getShell(),
-						String.format(Messages.getString("output.save_failed"), //
+						String.format(Messages.getString("output.save_failed"),
 								targetFile.getName(), e.getLocalizedMessage()),
 						BUTTONS.RETRY_CANCEL);
 				if (dialog.open() == SWT.CANCEL)
 					return null;
 				retry = true;
 			} catch (IOException e) {
-				log.error("I/O Error", e); //
+				log.error("I/O Error", e);
 				ErrorDialog dialog = new ErrorDialog(getShell(),
-						String.format(Messages.getString("output.save_failed"), //
+						String.format(Messages.getString("output.save_failed"),
 								targetFile.getName(), e.getLocalizedMessage()),
 						BUTTONS.RETRY_CANCEL);
 				if (dialog.open() == SWT.CANCEL)
@@ -335,8 +335,8 @@ public class OutputComposite extends StateComposite {
 
 		if (!targetFile.exists())
 		{
-			log.error("Tried to save file " + targetFile.getName() + //
-					", but it doesn't exist"); //
+			log.error("Tried to save file " + targetFile.getName() +
+					", but it doesn't exist");
 			return null;
 		}
 		return targetFile;
@@ -369,7 +369,7 @@ public class OutputComposite extends StateComposite {
 			try {
 				OutputComposite.this.saveDocument();
 			} catch (Exception ex) {
-				log.error("SaveSelectionListener: ", ex); //
+				log.error("SaveSelectionListener: ", ex);
 			}
 		}
 	}
@@ -396,7 +396,7 @@ public class OutputComposite extends StateComposite {
 				// Normalize filename
 				File f = new File(FilenameUtils.normalize(
 						OutputComposite.this.outputFile.getAbsolutePath()));
-				log.debug("Trying to open " + f.toString()); //
+				log.debug("Trying to open " + f.toString());
 				// work around for the case of Linux and Java version 8
 				if (isSpecialCase()) {
 					reReloadResources(f.toString());
@@ -405,13 +405,13 @@ public class OutputComposite extends StateComposite {
 				else if (Desktop.isDesktopSupported()) {
 					Desktop.getDesktop().open(f);
 				} else {
-					log.info("AWT Desktop is not supported on this platform"); //
+					log.info("AWT Desktop is not supported on this platform");
 					Program.launch(f.getAbsolutePath());
 				}
 			} catch (IOException ex) {
-				log.error("OpenSelectionListener: ", ex); //
+				log.error("OpenSelectionListener: ", ex);
 				ErrorDialog error = new ErrorDialog(getShell(),
-						String.format(Messages.getString("error.FailedToOpenDocument"), //
+						String.format(Messages.getString("error.FailedToOpenDocument"),
 								ex.getLocalizedMessage()), BUTTONS.RETRY_CANCEL);
 				if (error.open() == SWT.RETRY)
 					widgetSelected(e);
@@ -443,18 +443,18 @@ public class OutputComposite extends StateComposite {
 
 		boolean isSCase = false;
 		try {
-			String os = System.getProperty("os.name").toLowerCase(); //
-			if (os.contains("linux")) { //
-				String version = System.getProperty("java.version"); //
-				if (version.contains(".")) { //
-					String[] parts = version.split("\\."); //
+			String os = System.getProperty("os.name").toLowerCase();
+			if (os.contains("linux")) {
+				String version = System.getProperty("java.version");
+				if (version.contains(".")) {
+					String[] parts = version.split("\\.");
 					isSCase = Integer.valueOf(parts[0]) <= 8 ? true : false;
 				} else {
 					isSCase = Integer.valueOf(version) <= 8 ? true : false;
 				}
 			}
 		} catch (Exception e) {
-			log.debug("Error: " + e.getMessage()); //
+			log.debug("Error: " + e.getMessage());
 			isSCase = false;
 		}
 		return isSCase;
@@ -467,31 +467,31 @@ public class OutputComposite extends StateComposite {
 	@Override
 	public void reloadResources() {
 		this.lbl_success_message.setText(Messages
-				.getString("output.success_message")); //
+				.getString("output.success_message"));
 		if (this.outputFile == null) {
 			this.lnk_saved_file.setText(Messages
-					.getString("output.link_save_message")); //
+					.getString("output.link_save_message"));
 		} else {
 			this.lnk_saved_file.setText(Messages
-					.getString("output.link_open_message")); //
+					.getString("output.link_open_message"));
 		}
-		this.btn_save.setText(Messages.getString("common.Save")); //
+		this.btn_save.setText(Messages.getString("common.Save"));
 	}
 
 	/**
 	 * @param str
 	 */
 	public void reReloadResources(String str) {
-		this.lbl_success_message.setText(Messages.getString("output.success_message")); //
+		this.lbl_success_message.setText(Messages.getString("output.success_message"));
 		if (this.outputFile == null) {
 			this.lnk_saved_file.setText(Messages
-					.getString("output.link_save_message")); //
+					.getString("output.link_save_message"));
 		} else {
-			String str2 = "File location: " + str; //
+			String str2 = "File location: " + str;
 			this.lbl_success_message.setText(str2);
-			this.lnk_saved_file.setText(""); //
+			this.lnk_saved_file.setText("");
 		}
-		this.btn_save.setText(Messages.getString("common.Save")); //
+		this.btn_save.setText(Messages.getString("common.Save"));
 	}
 
 
diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/PositioningComposite.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/PositioningComposite.java
index 4e6af9ba..88577f7f 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/PositioningComposite.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/PositioningComposite.java
@@ -91,7 +91,7 @@ public class PositioningComposite extends StateComposite {
 		this.bottomBar.setLayout(new FormLayout());
 
 		this.btnSign = new Button(this.bottomBar, SWT.PUSH);
-		this.btnSign.setText(Messages.getString("positioning.sign")); //
+		this.btnSign.setText(Messages.getString("positioning.sign"));
 		FormData fd_btnSign = new FormData();
 		fd_btnSign.right = new FormAttachment(100);
 		fd_btnSign.top = new FormAttachment(0);
@@ -105,7 +105,7 @@ public class PositioningComposite extends StateComposite {
 		});
 
 		this.btnNewPage = new Button(this.bottomBar, SWT.TOGGLE);
-		this.btnNewPage.setText(Messages.getString("positioning.newPage")); //
+		this.btnNewPage.setText(Messages.getString("positioning.newPage"));
 		FormData fd_btnNewPage = new FormData();
 		fd_btnNewPage.right = new FormAttachment(this.btnSign);
 		fd_btnNewPage.top = new FormAttachment(0);
@@ -326,19 +326,19 @@ public class PositioningComposite extends StateComposite {
 			int numPages = this.numPages;
 			if ((previousPage > numPages) && (currentPage <= numPages)) {
 				// Was on new page
-				this.btnNewPage.setText(Messages.getString("positioning.newPage")); //
+				this.btnNewPage.setText(Messages.getString("positioning.newPage"));
 				this.btnNewPage.setSelection(false);
 				this.bottomBar.layout();
 				this.scrollbar.setMaximum(numPages + 1);
 			} else if ((previousPage <= numPages) && (currentPage > numPages)) {
 				// Go to new page
-				this.btnNewPage.setText(Messages.getString("positioning.removeNewPage")); //
+				this.btnNewPage.setText(Messages.getString("positioning.removeNewPage"));
 				this.btnNewPage.setSelection(true);
 				this.bottomBar.layout();
 				this.scrollbar.setMaximum(numPages + 2);
 			}
 			this.scrollbar.setSelection(currentPage);
-			this.lblPage.setText(String.format(Messages.getString("positioning.page"), currentPage, numPages)); //
+			this.lblPage.setText(String.format(Messages.getString("positioning.page"), currentPage, numPages));
 		});
 		EventQueue.invokeLater(() -> {
 			PositioningComposite.this.viewer.showPage(page);
@@ -422,11 +422,11 @@ public class PositioningComposite extends StateComposite {
 	@Override
 	public void reloadResources() {
 		if (this.currentPage <= this.numPages)
-			this.btnNewPage.setText(Messages.getString("positioning.newPage")); //
+			this.btnNewPage.setText(Messages.getString("positioning.newPage"));
 		else
-			this.btnNewPage.setText(Messages.getString("positioning.removeNewPage")); //
-		this.btnSign.setText(Messages.getString("positioning.sign")); //
-		this.lblPage.setText(String.format(Messages.getString("positioning.page"), //
+			this.btnNewPage.setText(Messages.getString("positioning.removeNewPage"));
+		this.btnSign.setText(Messages.getString("positioning.sign"));
+		this.lblPage.setText(String.format(Messages.getString("positioning.page"),
 				this.currentPage, this.numPages));
 	}
 }
diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/SignaturePanel.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/SignaturePanel.java
index 408bfa5e..ec2b1a65 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/SignaturePanel.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/SignaturePanel.java
@@ -290,7 +290,7 @@ public class SignaturePanel extends JPanel {
 			try {

 				this.currentXform = this.currentXform.createInverse();

 			} catch (NoninvertibleTransformException nte) {

-				log.error("Error inverting page transform!", nte); //

+				log.error("Error inverting page transform!", nte);

 			}

 

 			if (this.sigPagePos == null)

@@ -319,7 +319,7 @@ public class SignaturePanel extends JPanel {
 		g.fillRect(0, 0, getWidth(), getHeight());

 		if (this.currentImage == null) {

 			g.setColor(Color.black);

-			g.drawString(Messages.getString("error.SignaturePanel.NoPage"), getWidth() / 2 - 30, //

+			g.drawString(Messages.getString("error.SignaturePanel.NoPage"), getWidth() / 2 - 30,

 					getHeight() / 2);

 			if (this.currentPage != null) {

 				showPage(this.currentPage);

@@ -366,7 +366,7 @@ public class SignaturePanel extends JPanel {
 						g_phs.drawImage(placeholder, 0, 0, null);

 

 						// Draw grey "Signature" overlay

-						String overlay = Messages.getString("positioning.signature"); //

+						String overlay = Messages.getString("positioning.signature");

 						// Voodoo to get overlay font scale

 						float scale = (((float) this.sigScreenWidth) / this.sigPlaceholder.getWidth(null)) * 150;

 						g_phs.setFont(getFont().deriveFont(scale));

@@ -399,7 +399,7 @@ public class SignaturePanel extends JPanel {
 					showPage(this.currentPage);

 				}

 				g.setColor(Color.black);

-				g.drawString(Messages.getString("error.SignaturePanel.NoRender"), getWidth() / 2 - 30, //

+				g.drawString(Messages.getString("error.SignaturePanel.NoRender"), getWidth() / 2 - 30,

 						getHeight() / 2);

 			}

 		}

diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/WaitingComposite.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/WaitingComposite.java
index 1bfb33c3..b17b5ec3 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/WaitingComposite.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/WaitingComposite.java
@@ -50,7 +50,7 @@ public class WaitingComposite extends StateComposite {
 		fd_lbl_description.right = new FormAttachment(100, -10);
 		this.lbl_description.setLayoutData(fd_lbl_description);
 		this.lbl_description.setAlignment(SWT.CENTER);
-		this.lbl_description.setText(Messages.getString("waiting.message")); //
+		this.lbl_description.setText(Messages.getString("waiting.message"));
 
 		ProgressBar progressBar = new ProgressBar(this, SWT.HORIZONTAL | SWT.INDETERMINATE);
 		FormData fd_progressBar = new FormData();
@@ -79,6 +79,6 @@ public class WaitingComposite extends StateComposite {
 	 */
 	@Override
 	public void reloadResources() {
-		this.lbl_description.setText(Messages.getString("waiting.message")); //
+		this.lbl_description.setText(Messages.getString("waiting.message"));
 	}
 }
diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/WaitingForAppComposite.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/WaitingForAppComposite.java
index ca865df9..23451f22 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/WaitingForAppComposite.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/WaitingForAppComposite.java
@@ -72,7 +72,7 @@ public class WaitingForAppComposite extends StateComposite {
 		fd_lbl_description.right = new FormAttachment(100, -10);

 		this.lbl_description.setLayoutData(fd_lbl_description);

 		this.lbl_description.setAlignment(SWT.CENTER);

-		this.lbl_description.setText(Messages.getString("waiting_for_app.message")); //

+		this.lbl_description.setText(Messages.getString("waiting_for_app.message"));

 

 		ProgressBar progressBar = new ProgressBar(this, SWT.HORIZONTAL | SWT.INDETERMINATE);

 		FormData fd_progressBar = new FormData();

@@ -89,7 +89,7 @@ public class WaitingForAppComposite extends StateComposite {
 		fd_btnSMS.top = new FormAttachment(progressBar, 24);

 		fd_btnSMS.right = new FormAttachment(progressBar, 0, SWT.RIGHT);

 		this.btn_sms.setLayoutData(fd_btnSMS);

-		this.btn_sms.setText(Messages.getString("SMS tan")); //

+		this.btn_sms.setText(Messages.getString("SMS tan"));

 

 		this.btn_cancel = new Button(this, SWT.NONE);

 		this.btn_cancel.addSelectionListener(new CancelSelectionListener());

@@ -97,7 +97,7 @@ public class WaitingForAppComposite extends StateComposite {
 		fd_btnCancel.top = new FormAttachment(btn_sms, 0, SWT.TOP);

 		fd_btnCancel.right = new FormAttachment(btn_sms, -6);

 		this.btn_cancel.setLayoutData(fd_btnCancel);

-		this.btn_cancel.setText(Messages.getString("WaitingForAppComposite.btnCancel.text")); //

+		this.btn_cancel.setText(Messages.getString("WaitingForAppComposite.btnCancel.text"));

 

 		reloadResources();

 

@@ -162,10 +162,10 @@ public class WaitingForAppComposite extends StateComposite {
 	 */

 	@Override

 	public void reloadResources() {

-		this.lbl_description.setText(Messages.getString("waiting_for_app.message")); //

-		this.btn_sms.setText(Messages.getString("tanEnter.SMS")); //

-		this.btn_cancel.setText(Messages.getString("common.Cancel")); //

-		this.btn_sms.setText(Messages.getString("tanEnter.SMS")); //

+		this.lbl_description.setText(Messages.getString("waiting_for_app.message"));

+		this.btn_sms.setText(Messages.getString("tanEnter.SMS"));

+		this.btn_cancel.setText(Messages.getString("common.Cancel"));

+		this.btn_sms.setText(Messages.getString("tanEnter.SMS"));

 	}

 

 	/**

diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/configuration/AboutComposite.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/configuration/AboutComposite.java
index 2779727f..713fa3a8 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/configuration/AboutComposite.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/configuration/AboutComposite.java
@@ -127,7 +127,7 @@ public class AboutComposite extends ConfigurationCompositeBase {
 	 */
 	@Override
 	public void reloadResources() {
-		this.lnkAbout.setText(Messages.getString("config.AboutText")); //
+		this.lnkAbout.setText(Messages.getString("config.AboutText"));
 		this.lblDataProtection.setText(Messages.getString("config.DataProtection"));
 		this.lnkDataProtection.setText(Messages.getString("config.DataProtectionStatement"));
 		this.btnOpenLogDirectory.setText(Messages.getString("config.ShowLogDirectory"));
diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/configuration/AdvancedConfigurationComposite.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/configuration/AdvancedConfigurationComposite.java
index 6f8561e3..6212c5ca 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/configuration/AdvancedConfigurationComposite.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/configuration/AdvancedConfigurationComposite.java
@@ -301,10 +301,10 @@ public class AdvancedConfigurationComposite extends ConfigurationCompositeBase {
 				dlg.setFilterPath(AdvancedConfigurationComposite.this.txtOutputFolder.getText());
 
 				// Change the title bar text
-				dlg.setText(Messages.getString("advanced_config.OutputFolder.Dialog_Title")); //
+				dlg.setText(Messages.getString("advanced_config.OutputFolder.Dialog_Title"));
 
 				// Customizable message displayed in the dialog
-				dlg.setMessage(Messages.getString("advanced_config.OutputFolder.Dialog")); //
+				dlg.setMessage(Messages.getString("advanced_config.OutputFolder.Dialog"));
 
 				// Calling open() will open and run the dialog.
 				// It will return the selected directory, or
@@ -398,7 +398,7 @@ public class AdvancedConfigurationComposite extends ConfigurationCompositeBase {
 		StateComposite.anchor(txtProxyHost).right(100,-42).top(0).left(0,5).set();
 		StateComposite.setFontHeight(txtProxyHost, Constants.TEXT_SIZE_NORMAL);
 
-		this.proxyHostErrorMarker = new ErrorMarker(compProxyHostContainer, SWT.NONE, ""); //
+		this.proxyHostErrorMarker = new ErrorMarker(compProxyHostContainer, SWT.NONE, "");
 		StateComposite.anchor(proxyHostErrorMarker).left(100,-32).right(100).top(0).bottom(0,32).set();
 		this.proxyHostErrorMarker.setVisible(false);
 
@@ -433,7 +433,7 @@ public class AdvancedConfigurationComposite extends ConfigurationCompositeBase {
 			}
 		});
 
-		this.txtProxyPortErrorMarker = new ErrorMarker(compProxyPortContainer, SWT.NONE, ""); //
+		this.txtProxyPortErrorMarker = new ErrorMarker(compProxyPortContainer, SWT.NONE, "");
 		StateComposite.anchor(txtProxyPortErrorMarker).left(100,-32).right(100).top(0).bottom(0,32).set();
 		this.txtProxyPortErrorMarker.setVisible(false);
 
@@ -449,7 +449,7 @@ public class AdvancedConfigurationComposite extends ConfigurationCompositeBase {
 
 	private void performPostFixChanged(String postfix) {
 
-		log.debug("Save file postfix changed to : {}", postfix); //
+		log.debug("Save file postfix changed to : {}", postfix);
 		this.configurationContainer.setSaveFilePostFix(postfix);
 		AdvancedConfigurationComposite.this.txtSaveFilePostFix.setText(postfix);
 	}
@@ -466,25 +466,25 @@ public class AdvancedConfigurationComposite extends ConfigurationCompositeBase {
 	}
 
 	void performOutputFolderChanged(String foldername) {
-		log.debug("Selected Output folder: {}", foldername); //
+		log.debug("Selected Output folder: {}", foldername);
 		this.configurationContainer.setOutputFolder(foldername);
 		AdvancedConfigurationComposite.this.txtOutputFolder.setText(foldername);
 	}
 
 	int getBKUElementIndex(BKUs bku) {
-		String lookup = "BKU." + bku.toString(); //
+		String lookup = "BKU." + bku.toString();
 		String bkuName = Messages.getString(lookup);
 
 		int i = this.bkuStrings.indexOf(bkuName);
 		if (i == -1) {
-			log.warn("NO BKU match for {}", bkuName); //
+			log.warn("NO BKU match for {}", bkuName);
 			return 0;
 		}
 		return i;
 	}
 
 	void performBKUSelectionChanged(BKUs selected) {
-		log.debug("Selected BKU: {}", selected); //
+		log.debug("Selected BKU: {}", selected);
 		this.configurationContainer.setDefaultBKU(selected);
 		this.cmbBKUAuswahl.select(this.getBKUElementIndex(selected));
 	}
@@ -494,8 +494,8 @@ public class AdvancedConfigurationComposite extends ConfigurationCompositeBase {
 			BKUs bkuvalue = resolveBKU(selected);
 			this.performBKUSelectionChanged(bkuvalue);
 		} catch (Exception ex) {
-			log.error("Failed to parse BKU value: {} {}", selected, ex); //
-			ErrorDialog dialog = new ErrorDialog(getShell(), Messages.getString("error.InvalidBKU"), BUTTONS.OK); //
+			log.error("Failed to parse BKU value: {} {}", selected, ex);
+			ErrorDialog dialog = new ErrorDialog(getShell(), Messages.getString("error.InvalidBKU"), BUTTONS.OK);
 			dialog.open();
 		}
 	}
@@ -504,7 +504,7 @@ public class AdvancedConfigurationComposite extends ConfigurationCompositeBase {
 		int blen = BKUs.values().length;
 
 		for (int i = 0; i < blen; i++) {
-			String lookup = "BKU." + BKUs.values()[i].toString(); //
+			String lookup = "BKU." + BKUs.values()[i].toString();
 			if (Messages.getString(lookup).equals(localizedBKU)) {
 				return BKUs.values()[i];
 			}
@@ -516,23 +516,23 @@ public class AdvancedConfigurationComposite extends ConfigurationCompositeBase {
 	int getLocaleElementIndex(Locale locale) {
 		for (int i = 0; i < Constants.SUPPORTED_LOCALES.length; i++) {
 			if (Constants.SUPPORTED_LOCALES[i].equals(locale)) {
-				log.debug("Locale: {} IDX: {}", locale, i); // //
+				log.debug("Locale: {} IDX: {}", locale, i);
 				return i;
 			}
 		}
 
-		log.warn("NO Locale match for {}", locale); //
+		log.warn("NO Locale match for {}", locale);
 		return 0;
 	}
 
 	void performLocaleSelectionChanged(Locale selected) {
-		log.debug("Selected Locale: {}", selected); //
+		log.debug("Selected Locale: {}", selected);
 		this.configurationContainer.setLocale(selected);
 		this.cmbLocaleAuswahl.select(this.getLocaleElementIndex(selected));
 	}
 
 	void performPositionSelection(boolean automatic) {
-		log.debug("Selected Position: {}", automatic); //
+		log.debug("Selected Position: {}", automatic);
 		SignaturePosition pos = automatic ? new SignaturePosition() : null;
 		this.configurationContainer.setDefaultSignaturePosition(pos);
 		this.btnAutomatischePositionierung.setSelection(automatic);
@@ -596,7 +596,7 @@ public class AdvancedConfigurationComposite extends ConfigurationCompositeBase {
 		} catch (Exception ex) {
 			this.proxyHostErrorMarker.setVisible(true);
 			this.proxyHostErrorMarker.setToolTipText(ex.getMessage());
-			log.error("processProxyHost: ", ex); //
+			log.error("processProxyHost: ", ex);
 		}
 	}
 
@@ -615,7 +615,7 @@ public class AdvancedConfigurationComposite extends ConfigurationCompositeBase {
 		} catch (Exception ex) {
 			this.txtProxyPortErrorMarker.setVisible(true);
 			this.txtProxyPortErrorMarker.setToolTipText(ex.getMessage());
-			log.error("processProxyPort: ", ex); //
+			log.error("processProxyPort: ", ex);
 		}
 	}
 
@@ -677,7 +677,7 @@ public class AdvancedConfigurationComposite extends ConfigurationCompositeBase {
 		try {
 			this.configurationContainer.setProxyPort(provider.getProxyPortPersistent());
 		} catch (InvalidPortException e) {
-			log.error("Failed to set proxy port!", e); //
+			log.error("Failed to set proxy port!", e);
 		}
 		this.configurationContainer.setProxyUser(provider.getProxyUserPersistent());
 		this.configurationContainer.setProxyPass(provider.getProxyPassPersistent());
@@ -779,8 +779,8 @@ public class AdvancedConfigurationComposite extends ConfigurationCompositeBase {
 		if (hostOld != null && !hostOld.isEmpty() && (hostNew == null || hostNew.isEmpty())) {
 			// Proxy has been removed, let's clear the system properties
 			// Otherwise, the proxy settings wouldn't get removed
-			System.clearProperty("http.proxyHost"); //
-			System.clearProperty("https.proxyHost"); //
+			System.clearProperty("http.proxyHost");
+			System.clearProperty("https.proxyHost");
 		}
 		store.setProxyHost(hostNew);
 
@@ -788,8 +788,8 @@ public class AdvancedConfigurationComposite extends ConfigurationCompositeBase {
 		int portNew = this.configurationContainer.getProxyPort();
 		if (portOld != -1 && portNew == -1) {
 			// cf. above
-			System.clearProperty("http.proxyPort"); //
-			System.clearProperty("https.proxyPort"); //
+			System.clearProperty("http.proxyPort");
+			System.clearProperty("https.proxyPort");
 		}
 		store.setProxyPort(portNew);
 
@@ -797,8 +797,8 @@ public class AdvancedConfigurationComposite extends ConfigurationCompositeBase {
 		String userNew = this.configurationContainer.getProxyUser();
 		if (userOld != null && !userOld.isEmpty() && (userNew == null || userNew.isEmpty())) {
 			// cf. above
-			System.clearProperty("http.proxyUser"); //
-			System.clearProperty("https.proxyUser"); //
+			System.clearProperty("http.proxyUser");
+			System.clearProperty("https.proxyUser");
 		}
 		store.setProxyUser(userNew);
 
@@ -806,8 +806,8 @@ public class AdvancedConfigurationComposite extends ConfigurationCompositeBase {
 		String passNew = this.configurationContainer.getProxyPass();
 		if (passOld != null && passNew == null) {
 			// cf. above
-			System.clearProperty("http.proxyPassword"); //
-			System.clearProperty("https.proxyPassword"); //
+			System.clearProperty("http.proxyPassword");
+			System.clearProperty("https.proxyPassword");
 		}
 		store.setProxyPass(passNew);
 	}
@@ -856,57 +856,57 @@ public class AdvancedConfigurationComposite extends ConfigurationCompositeBase {
 	 */
 	@Override
 	public void reloadResources() {
-		this.grpSignatur.setText(Messages.getString("advanced_config.Signature_Title")); //
-		this.btnAutomatischePositionierung.setText(Messages.getString("advanced_config.AutoPosition")); //
-		this.btnAutomatischePositionierung.setToolTipText(Messages.getString("advanced_config.AutoPosition_ToolTip")); //
-		this.grpPlaceholder.setText(Messages.getString("advanced_config.Placeholder_Title")); //
-		this.btnPlatzhalterVerwenden.setText(Messages.getString("advanced_config.UseMarker")); //
-		this.btnPlatzhalterVerwenden.setToolTipText(Messages.getString("advanced_config.UseMarker_ToolTip")); //
-		this.btnSignatureFieldsUsage.setText(Messages.getString("advanced_config.UseSignatureFields")); //
-		this.btnSignatureFieldsUsage.setToolTipText(Messages.getString("advanced_config.UseSignatureFields_ToolTip")); //
+		this.grpSignatur.setText(Messages.getString("advanced_config.Signature_Title"));
+		this.btnAutomatischePositionierung.setText(Messages.getString("advanced_config.AutoPosition"));
+		this.btnAutomatischePositionierung.setToolTipText(Messages.getString("advanced_config.AutoPosition_ToolTip"));
+		this.grpPlaceholder.setText(Messages.getString("advanced_config.Placeholder_Title"));
+		this.btnPlatzhalterVerwenden.setText(Messages.getString("advanced_config.UseMarker"));
+		this.btnPlatzhalterVerwenden.setToolTipText(Messages.getString("advanced_config.UseMarker_ToolTip"));
+		this.btnSignatureFieldsUsage.setText(Messages.getString("advanced_config.UseSignatureFields"));
+		this.btnSignatureFieldsUsage.setToolTipText(Messages.getString("advanced_config.UseSignatureFields_ToolTip"));
 		this.btnEnablePlaceholderUsage.setText(Messages.getString("advanced_config.Placeholder_Enabled"));
-		this.btnPdfACompat.setText(Messages.getString("advanced_config.PdfACompat")); //
-		this.btnPdfACompat.setToolTipText(Messages.getString("advanced_config.PdfACompat_ToolTip")); //
-		this.lblTransparenz.setText(Messages.getString("advanced_config.SigPHTransparency")); //
-		this.lblTransparenzLinks.setText(Messages.getString("advanced_config.SigPHTransparencyMin")); //
-		this.lblTransparenzRechts.setText(Messages.getString("advanced_config.SigPHTransparencyMax")); //
-		this.sclTransparenz.setToolTipText(Messages.getString("advanced_config.SigPHTransparencyTooltip")); //
-
-		this.grpBkuAuswahl.setText(Messages.getString("advanced_config.BKUSelection_Title")); //
-		this.cmbBKUAuswahl.setToolTipText(Messages.getString("advanced_config.BKUSelection_ToolTip")); //
-		this.btnKeystoreEnabled.setText(Messages.getString("advanced_config.KeystoreEnabled")); //
-		this.btnKeystoreEnabled.setToolTipText(Messages.getString("advanced_config.KeystoreEnabled_ToolTip")); //
-
-		this.grpSpeicherort.setText(Messages.getString("advanced_config.OutputFolder_Title")); //
-		this.lblDefaultOutputFolder.setText(Messages.getString("advanced_config.OutputFolder")); //
-		this.txtOutputFolder.setToolTipText(Messages.getString("advanced_config.OutputFolder_ToolTip")); //
-		this.btnBrowse.setText(Messages.getString("common.browse")); //
-
-		this.grpLocaleAuswahl.setText(Messages.getString("advanced_config.LocaleSelection_Title")); //
-		this.cmbLocaleAuswahl.setToolTipText(Messages.getString("advanced_config.LocaleSelection_ToolTip")); //
-
-		this.grpUpdateCheck.setText(Messages.getString("advanced_config.UpdateCheck_Title")); //
-		this.btnUpdateCheck.setText(Messages.getString("advanced_config.UpdateCheck")); //
-		this.btnUpdateCheck.setToolTipText(Messages.getString("advanced_config.UpdateCheck_ToolTip")); //
-
-		this.grpProxy.setText(Messages.getString("advanced_config.Proxy_Title")); //
-		this.lblProxyHost.setText(Messages.getString("advanced_config.ProxyHost")); //
-		this.txtProxyHost.setToolTipText(Messages.getString("advanced_config.ProxyHost_ToolTip")); //
-		this.txtProxyHost.setMessage(Messages.getString("advanced_config.ProxyHost_Template")); //
-		this.lblProxyPort.setText(Messages.getString("advanced_config.ProxyPort")); //
-		this.txtProxyPort.setToolTipText(Messages.getString("advanced_config.ProxyPort_ToolTip")); //
-		this.txtProxyPort.setMessage(Messages.getString("advanced_config.ProxyPort_Template")); //
+		this.btnPdfACompat.setText(Messages.getString("advanced_config.PdfACompat"));
+		this.btnPdfACompat.setToolTipText(Messages.getString("advanced_config.PdfACompat_ToolTip"));
+		this.lblTransparenz.setText(Messages.getString("advanced_config.SigPHTransparency"));
+		this.lblTransparenzLinks.setText(Messages.getString("advanced_config.SigPHTransparencyMin"));
+		this.lblTransparenzRechts.setText(Messages.getString("advanced_config.SigPHTransparencyMax"));
+		this.sclTransparenz.setToolTipText(Messages.getString("advanced_config.SigPHTransparencyTooltip"));
+
+		this.grpBkuAuswahl.setText(Messages.getString("advanced_config.BKUSelection_Title"));
+		this.cmbBKUAuswahl.setToolTipText(Messages.getString("advanced_config.BKUSelection_ToolTip"));
+		this.btnKeystoreEnabled.setText(Messages.getString("advanced_config.KeystoreEnabled"));
+		this.btnKeystoreEnabled.setToolTipText(Messages.getString("advanced_config.KeystoreEnabled_ToolTip"));
+
+		this.grpSpeicherort.setText(Messages.getString("advanced_config.OutputFolder_Title"));
+		this.lblDefaultOutputFolder.setText(Messages.getString("advanced_config.OutputFolder"));
+		this.txtOutputFolder.setToolTipText(Messages.getString("advanced_config.OutputFolder_ToolTip"));
+		this.btnBrowse.setText(Messages.getString("common.browse"));
+
+		this.grpLocaleAuswahl.setText(Messages.getString("advanced_config.LocaleSelection_Title"));
+		this.cmbLocaleAuswahl.setToolTipText(Messages.getString("advanced_config.LocaleSelection_ToolTip"));
+
+		this.grpUpdateCheck.setText(Messages.getString("advanced_config.UpdateCheck_Title"));
+		this.btnUpdateCheck.setText(Messages.getString("advanced_config.UpdateCheck"));
+		this.btnUpdateCheck.setToolTipText(Messages.getString("advanced_config.UpdateCheck_ToolTip"));
+
+		this.grpProxy.setText(Messages.getString("advanced_config.Proxy_Title"));
+		this.lblProxyHost.setText(Messages.getString("advanced_config.ProxyHost"));
+		this.txtProxyHost.setToolTipText(Messages.getString("advanced_config.ProxyHost_ToolTip"));
+		this.txtProxyHost.setMessage(Messages.getString("advanced_config.ProxyHost_Template"));
+		this.lblProxyPort.setText(Messages.getString("advanced_config.ProxyPort"));
+		this.txtProxyPort.setToolTipText(Messages.getString("advanced_config.ProxyPort_ToolTip"));
+		this.txtProxyPort.setMessage(Messages.getString("advanced_config.ProxyPort_Template"));
 		// this.lblProxyUser.setText(Messages.getString("advanced_config.ProxyUser"));
-		// //
+
 		// this.txtProxyUser.setToolTipText(Messages
-		// .getString("advanced_config.ProxyUser_ToolTip")); //
+		// .getString("advanced_config.ProxyUser_ToolTip"));
 		// this.txtProxyUser.setMessage(Messages
-		// .getString("advanced_config.ProxyUser_Template")); //
+		// .getString("advanced_config.ProxyUser_Template"));
 		// this.lblProxyPass.setText(Messages.getString("advanced_config.ProxyPass"));
-		// //
+
 		// this.txtProxyPass.setToolTipText(Messages
-		// .getString("advanced_config.ProxyPass_ToolTip")); //
+		// .getString("advanced_config.ProxyPass_ToolTip"));
 		// this.txtProxyPass.setMessage(Messages
-		// .getString("advanced_config.ProxyPass_Template")); //
+		// .getString("advanced_config.ProxyPass_Template"));
 	}
 }
diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/configuration/KeystoreConfigurationComposite.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/configuration/KeystoreConfigurationComposite.java
index 2400ac7e..a2284ee3 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/configuration/KeystoreConfigurationComposite.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/configuration/KeystoreConfigurationComposite.java
@@ -174,12 +174,12 @@ public class KeystoreConfigurationComposite extends ConfigurationCompositeBase {
 				FileDialog dialog = new FileDialog(
 						KeystoreConfigurationComposite.this.getShell(), SWT.OPEN);
 				dialog.setFilterExtensions(new String[] {
-						"*.p12;*.pkcs12;*.pfx;*.ks;*.jks", "*.p12;*.pkcs12;*.pfx;", "*.ks;*.jks*.", "*" }); // // // //
+						"*.p12;*.pkcs12;*.pfx;*.ks;*.jks", "*.p12;*.pkcs12;*.pfx;", "*.ks;*.jks*.", "*" });
 				dialog.setFilterNames(new String[] {
-						Messages.getString("common.KeystoreExtension_Description"), //
-						Messages.getString("common.PKCS12Extension_Description"), //
-						Messages.getString("common.KSExtension_Description"), //
-						Messages.getString("common.AllExtension_Description") }); //
+						Messages.getString("common.KeystoreExtension_Description"),
+						Messages.getString("common.PKCS12Extension_Description"),
+						Messages.getString("common.KSExtension_Description"),
+						Messages.getString("common.AllExtension_Description") });
 				String fileName = dialog.open();
 				File file = null;
 				if (fileName != null) {
@@ -217,24 +217,24 @@ public class KeystoreConfigurationComposite extends ConfigurationCompositeBase {
 				try {
 					loadKeystore();
 				} catch (KeyStoreException ex) {
-					log.error("Error loading keystore", ex); //
-					showErrorDialog(Messages.getString("error.KeyStore")); //
+					log.error("Error loading keystore", ex);
+					showErrorDialog(Messages.getString("error.KeyStore"));
 				} catch (FileNotFoundException ex) {
-					log.error("Error loading keystore", ex); //
+					log.error("Error loading keystore", ex);
 					showErrorDialog(String.format(Messages.getString(
-							"error.KeyStoreFileNotExist"), f.getName())); //
+							"error.KeyStoreFileNotExist"), f.getName()));
 				} catch (NoSuchAlgorithmException ex) {
-					log.error("Error loading keystore", ex); //
-					showErrorDialog(Messages.getString("error.KeyStore")); //
+					log.error("Error loading keystore", ex);
+					showErrorDialog(Messages.getString("error.KeyStore"));
 				} catch (CertificateException ex) {
-					log.error("Error loading keystore", ex); //
-					showErrorDialog(Messages.getString("error.KeyStore")); //
+					log.error("Error loading keystore", ex);
+					showErrorDialog(Messages.getString("error.KeyStore"));
 				} catch (IOException ex) {
-					log.error("Error loading keystore", ex); //
-					showErrorDialog(Messages.getString("error.KeyStore")); //
+					log.error("Error loading keystore", ex);
+					showErrorDialog(Messages.getString("error.KeyStore"));
 				} catch (NullPointerException ex) {
-					log.error("Error loading keystore - NPE?", ex); //
-					showErrorDialog(Messages.getString("error.KeyStore")); //
+					log.error("Error loading keystore - NPE?", ex);
+					showErrorDialog(Messages.getString("error.KeyStore"));
 				}
 			}
 		});
@@ -292,29 +292,29 @@ public class KeystoreConfigurationComposite extends ConfigurationCompositeBase {
 
 	private void initKeystoreTypes() {
 		this.keystoreTypes = new HashMap<String, String>();
-		this.keystoreTypes.put(Messages.getString("keystore_config.KeystoreType_PKCS12"), "PKCS12"); // //
-		this.keystoreTypes.put(Messages.getString("keystore_config.KeystoreType_JKS"), "JCEKS"); // //
+		this.keystoreTypes.put(Messages.getString("keystore_config.KeystoreType_PKCS12"), "PKCS12");
+		this.keystoreTypes.put(Messages.getString("keystore_config.KeystoreType_JKS"), "JCEKS");
 	}
 
 	/**
 	 * @param fileName
 	 */
 	protected void performKeystoreFileChanged(String fileName) {
-		log.debug("Selected keystore file: " + fileName); //
+		log.debug("Selected keystore file: " + fileName);
 		this.configurationContainer.setKeyStoreFile(fileName);
 		KeystoreConfigurationComposite.this.txtKeystoreFile.setText(fileName);
 		int i = fileName.lastIndexOf('.');
 		if (i > 0) {
 			String ext = fileName.substring(i+1);
 			if (
-					ext.equalsIgnoreCase("p12") || //
-					ext.equalsIgnoreCase("pkcs12") || //
-					ext.equalsIgnoreCase("pfx")) //
-				performKeystoreTypeChanged("PKCS12"); //
+					ext.equalsIgnoreCase("p12") ||
+					ext.equalsIgnoreCase("pkcs12") ||
+					ext.equalsIgnoreCase("pfx"))
+				performKeystoreTypeChanged("PKCS12");
 			else if (
-					ext.equalsIgnoreCase("ks") || //
-					ext.equalsIgnoreCase("jks")) //
-				performKeystoreTypeChanged("JCEKS"); //
+					ext.equalsIgnoreCase("ks") ||
+					ext.equalsIgnoreCase("jks"))
+				performKeystoreTypeChanged("JCEKS");
 		}
 	}
 
@@ -322,7 +322,7 @@ public class KeystoreConfigurationComposite extends ConfigurationCompositeBase {
 	 * @param type
 	 */
 	protected void performKeystoreTypeChanged(String type) {
-		log.debug("Selected keystore type: " + type); //
+		log.debug("Selected keystore type: " + type);
 		this.configurationContainer.setKeyStoreType(type);
 		for (int i = 0; i < this.cmbKeystoreType.getItemCount(); ++i) {
 			if (this.keystoreTypes.get(this.cmbKeystoreType.getItem(i)).equals(type)) {
@@ -336,7 +336,7 @@ public class KeystoreConfigurationComposite extends ConfigurationCompositeBase {
 	 * @param storepass
 	 */
 	protected void performKeystoreStorePassChanged(String storepass) {
-		log.debug("Changed keystore store password"); //
+		log.debug("Changed keystore store password");
 		this.configurationContainer.setKeyStoreStorePass(storepass);
 		this.txtKeystoreStorePass.setText(storepass);
 	}
@@ -345,7 +345,7 @@ public class KeystoreConfigurationComposite extends ConfigurationCompositeBase {
 	 * @param alias
 	 */
 	protected void performKeystoreAliasChanged(String alias) {
-		log.debug("Selected keystore alias: " + alias); //
+		log.debug("Selected keystore alias: " + alias);
 		this.configurationContainer.setKeyStoreAlias(alias);
 		this.cmbKeystoreAlias.setText(alias);
 	}
@@ -354,7 +354,7 @@ public class KeystoreConfigurationComposite extends ConfigurationCompositeBase {
 	 * @param keypass
 	 */
 	protected void performKeystoreKeyPassChanged(String keypass) {
-		log.debug("Changed keystore key password"); //
+		log.debug("Changed keystore key password");
 		this.configurationContainer.setKeyStoreKeyPass(keypass);
 		this.txtKeystoreKeyPass.setText(keypass);
 	}
@@ -412,7 +412,7 @@ public class KeystoreConfigurationComposite extends ConfigurationCompositeBase {
 			if (ksf.exists())
 				loadKeystore();
 		} catch (Exception e) {
-			log.error("Error loading keystore", e); //
+			log.error("Error loading keystore", e);
 		}
 		performKeystoreAliasChanged(config.getKeyStoreAlias());
 		performKeystoreKeyPassChanged(config.getKeyStoreKeyPass());
@@ -483,19 +483,19 @@ public class KeystoreConfigurationComposite extends ConfigurationCompositeBase {
 	 */
 	@Override
 	public void reloadResources() {
-		this.grpKeystore.setText(Messages.getString("keystore_config.Keystore_Title")); //
-		this.lblKeystoreFile.setText(Messages.getString("keystore_config.KeystoreFile")); //
-		this.btnBrowse.setText(Messages.getString("common.browse")); //
-		this.txtKeystoreFile.setToolTipText(Messages.getString("keystore_config.KeystoreFile_ToolTip")); //
-		this.lblKeystoreType.setText(Messages.getString("keystore_config.KeystoreType")); //
+		this.grpKeystore.setText(Messages.getString("keystore_config.Keystore_Title"));
+		this.lblKeystoreFile.setText(Messages.getString("keystore_config.KeystoreFile"));
+		this.btnBrowse.setText(Messages.getString("common.browse"));
+		this.txtKeystoreFile.setToolTipText(Messages.getString("keystore_config.KeystoreFile_ToolTip"));
+		this.lblKeystoreType.setText(Messages.getString("keystore_config.KeystoreType"));
 		initKeystoreTypes();
 		this.cmbKeystoreType.setItems(this.keystoreTypes.keySet().toArray(new String[0]));
-		this.lblKeystoreStorePass.setText(Messages.getString("keystore_config.KeystoreStorePass")); //
-		this.txtKeystoreStorePass.setToolTipText(Messages.getString("keystore_config.KeystoreStorePass_ToolTip")); //
-		this.btnLoad.setText(Messages.getString("keystore_config.Load")); //
-		this.btnLoad.setToolTipText(Messages.getString("keystore_config.Load_ToolTip")); //
-		this.lblKeystoreAlias.setText(Messages.getString("keystore_config.KeystoreAlias")); //
-		this.lblKeystoreKeyPass.setText(Messages.getString("keystore_config.KeystoreKeyPass")); //
-		this.txtKeystoreKeyPass.setToolTipText(Messages.getString("keystore_config.KeystoreKeyPass_ToolTip")); //
+		this.lblKeystoreStorePass.setText(Messages.getString("keystore_config.KeystoreStorePass"));
+		this.txtKeystoreStorePass.setToolTipText(Messages.getString("keystore_config.KeystoreStorePass_ToolTip"));
+		this.btnLoad.setText(Messages.getString("keystore_config.Load"));
+		this.btnLoad.setToolTipText(Messages.getString("keystore_config.Load_ToolTip"));
+		this.lblKeystoreAlias.setText(Messages.getString("keystore_config.KeystoreAlias"));
+		this.lblKeystoreKeyPass.setText(Messages.getString("keystore_config.KeystoreKeyPass"));
+		this.txtKeystoreKeyPass.setToolTipText(Messages.getString("keystore_config.KeystoreKeyPass_ToolTip"));
 	}
 }
diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/configuration/SimpleConfigurationComposite.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/configuration/SimpleConfigurationComposite.java
index edf7894f..bf74eaa8 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/configuration/SimpleConfigurationComposite.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/configuration/SimpleConfigurationComposite.java
@@ -407,13 +407,13 @@ public class SimpleConfigurationComposite extends ConfigurationCompositeBase {
 			FileDialog dialog = new FileDialog(
 					SimpleConfigurationComposite.this.getShell(), SWT.OPEN);
 			dialog.setFilterExtensions(new String[] {
-					"*.jpg;*.png;*.gif", "*.jpg", "*.png", "*.gif", "*" }); // // // // //
+					"*.jpg;*.png;*.gif", "*.jpg", "*.png", "*.gif", "*" });
 			dialog.setFilterNames(new String[] {
-					Messages.getString("common.ImageExtension_Description"), //
-					Messages.getString("common.JPGExtension_Description"), //
-					Messages.getString("common.PNGExtension_Description"), //
-					Messages.getString("common.GIFExtension_Description"), //
-					Messages.getString("common.AllExtension_Description") }); //
+					Messages.getString("common.ImageExtension_Description"),
+					Messages.getString("common.JPGExtension_Description"),
+					Messages.getString("common.PNGExtension_Description"),
+					Messages.getString("common.GIFExtension_Description"),
+					Messages.getString("common.AllExtension_Description") });
 			String fileName = dialog.open();
 			File file = null;
 			if (fileName != null) {
@@ -447,7 +447,7 @@ public class SimpleConfigurationComposite extends ConfigurationCompositeBase {
 			if (this.signer != null) {
 				SignatureParameter param = this.signer.getPDFSigner().newParameter();
 				if(this.configurationContainer.getSignatureNote() != null && !this.configurationContainer.getSignatureNote().isEmpty()) {
-					param.setProperty("SIG_NOTE", this.configurationContainer.getSignatureNote()); //
+					param.setProperty("SIG_NOTE", this.configurationContainer.getSignatureNote());
 				}
 
 				param.setSignatureLanguage(this.configurationContainer.getSignatureLocale().getLanguage());
@@ -477,7 +477,7 @@ public class SimpleConfigurationComposite extends ConfigurationCompositeBase {
 						ImageConverter.convertToSWT(CachedFileNameEmblem.fixImage(
 								ImageIO.read(imgFile), imgFile)));
 			} catch (IOException e) {
-				log.error("Error reading image", e); //
+				log.error("Error reading image", e);
 			}
 		} else {
 			this.logo = null;
@@ -491,10 +491,10 @@ public class SimpleConfigurationComposite extends ConfigurationCompositeBase {
 		try {
 			setEmblemFileInternal(filename, false);
 		} catch (Exception ex) {
-			log.error("processEmblemChanged: ", ex); //
+			log.error("processEmblemChanged: ", ex);
 			ErrorDialog dialog = new ErrorDialog(
 					getShell(),
-					Messages.getString("error.FailedToLoadEmblem"), BUTTONS.OK); //
+					Messages.getString("error.FailedToLoadEmblem"), BUTTONS.OK);
 			dialog.open();
 		}
 	}
@@ -506,8 +506,8 @@ public class SimpleConfigurationComposite extends ConfigurationCompositeBase {
 		} catch (Exception ex) {
 			this.txtMobileNumberErrorMarker.setVisible(true);
 			this.txtMobileNumberErrorMarker.setToolTipText(Messages
-					.getString("error.InvalidPhoneNumber")); //
-			log.error("processNumberChanged: ", ex); //
+					.getString("error.InvalidPhoneNumber"));
+			log.error("processNumberChanged: ", ex);
 			this.redraw();
 			this.doLayout();
 		}
@@ -516,17 +516,17 @@ public class SimpleConfigurationComposite extends ConfigurationCompositeBase {
 	int getLocaleElementIndex(Locale locale) {
 		for (int i = 0; i < Constants.SUPPORTED_LOCALES.length; i++) {
 			if (Constants.SUPPORTED_LOCALES[i].equals(locale)) {
-				log.debug("Locale: {} IDX: {}",locale, i); // //
+				log.debug("Locale: {} IDX: {}",locale, i);
 				return i;
 			}
 		}
 
-		log.warn("NO Locale match for {}", locale); //
+		log.warn("NO Locale match for {}", locale);
 		return 0;
 	}
 
 	void performSignatureLangSelectionChanged(Locale selected, Locale previous) {
-		log.debug("Selected Sign Locale: {}", selected); //
+		log.debug("Selected Sign Locale: {}", selected);
 		this.configurationContainer.setSignatureLocale(selected);
 		this.cmbSignatureLang.select(this.getLocaleElementIndex(selected));
 
@@ -537,7 +537,7 @@ public class SimpleConfigurationComposite extends ConfigurationCompositeBase {
 
 
     void preformProfileSelectionChanged(Profile newProfile) {
-		log.debug("Signature Profile {} was selected", newProfile.name()); //
+		log.debug("Signature Profile {} was selected", newProfile.name());
 		Profile oldProfile = this.configurationContainer.getSignatureProfile();
     	this.configurationContainer.setSignatureProfile(newProfile);
     	this.cmbSignatureProfiles.select(newProfile.ordinal());
@@ -589,7 +589,7 @@ public class SimpleConfigurationComposite extends ConfigurationCompositeBase {
 		this.configurationContainer.setMobileNumber(number);
 		number = this.configurationContainer.getMobileNumber();
 		if (number == null) {
-			this.txtMobileNumber.setText(""); //
+			this.txtMobileNumber.setText("");
 			return;
 		}
 		this.txtMobileNumber.setText(number);
@@ -623,7 +623,7 @@ public class SimpleConfigurationComposite extends ConfigurationCompositeBase {
 			this.configurationContainer.setEmblem(
 					provider.getDefaultEmblemPersistent());
 		} catch (InvalidEmblemFile e) {
-			log.error("Failed to set emblem!", e); //
+			log.error("Failed to set emblem!", e);
 		}
 
 		this.configurationContainer.setSignatureLocale(
@@ -653,10 +653,10 @@ public class SimpleConfigurationComposite extends ConfigurationCompositeBase {
 				setEmblemFileInternal(emblemFile, true);
 				this.btnClearImage.setSelection(true);
 			} catch (Exception e1) {
-				log.error("Failed to load emblem: ", e1); //
+				log.error("Failed to load emblem: ", e1);
 				ErrorDialog dialog = new ErrorDialog(
 						getShell(),
-						Messages.getString("error.FailedToLoadEmblem"), BUTTONS.OK); //
+						Messages.getString("error.FailedToLoadEmblem"), BUTTONS.OK);
 				dialog.open();
 			}
 		}