misc cleanup

53 files changed, 61 insertions, 145 deletions

diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/bku/LocalBKUConnector.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/bku/LocalBKUConnector.java
index 2fcd9938..7967fe0e 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/bku/LocalBKUConnector.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/bku/LocalBKUConnector.java
@@ -45,8 +45,7 @@ public class LocalBKUConnector implements BkuSlConnector {
 	/**

 	 * SLF4J Logger instance

 	 **/

-	private static final Logger log = LoggerFactory

-			.getLogger(LocalBKUConnector.class);

+	private static final Logger log = LoggerFactory.getLogger(LocalBKUConnector.class);

 

 	/**

 	 * HTTP Response server HEADER

diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/bku/MobileBKUConnector.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/bku/MobileBKUConnector.java
index 3d0a199a..d7d98172 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/bku/MobileBKUConnector.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/bku/MobileBKUConnector.java
@@ -37,8 +37,7 @@ public class MobileBKUConnector implements BkuSlConnector {
 	/**

 	 * SLF4J Logger instance

 	 **/

-	private static final Logger log = LoggerFactory

-			.getLogger(MobileBKUConnector.class);

+	private static final Logger log = LoggerFactory.getLogger(MobileBKUConnector.class);

 

 	private MobileBKUState state;

 

diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/bku/mobile/ATrustHandler.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/bku/mobile/ATrustHandler.java
index c9bda35f..d6febeaa 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/bku/mobile/ATrustHandler.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/bku/mobile/ATrustHandler.java
@@ -21,14 +21,12 @@ import java.io.BufferedInputStream;
 import java.io.IOException;

 import java.io.InputStream;

 import java.net.URI;

-import java.net.URLConnection;

 

 import org.apache.commons.httpclient.HttpClient;

 import org.apache.commons.httpclient.HttpStatus;

 import org.apache.commons.httpclient.methods.GetMethod;

 import org.apache.commons.httpclient.methods.PostMethod;

 import org.apache.commons.io.IOUtils;

-import org.apache.commons.lang3.StringEscapeUtils;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.program.Program;

 import org.eclipse.swt.widgets.Display;

@@ -48,7 +46,6 @@ import at.asit.pdfover.gui.exceptions.ATrustConnectionException;
 import at.asit.pdfover.commons.Messages;

 import at.asit.pdfover.gui.workflow.states.MobileBKUState;

 import at.asit.pdfover.signator.SLResponse;

-import at.asit.pdfover.signator.SignatureException;

 

 /**

  * A-Trust mobile BKU handler

@@ -70,8 +67,7 @@ public class ATrustHandler extends MobileBKUHandler {
 	/**

 	 * SLF4J Logger instance

 	 **/

-	static final Logger log = LoggerFactory

-			.getLogger(ATrustHandler.class);

+	static final Logger log = LoggerFactory.getLogger(ATrustHandler.class);

 

 	private static boolean expiryNoticeDisplayed = false;

 

@@ -166,11 +162,6 @@ public class ATrustHandler extends MobileBKUHandler {
 

 		if (responseData.contains("ExpiresInfo.aspx?sid=")) {

 			// Certificate expiration interstitial - skip

-			String notice = Messages.getString("mobileBKU.notice") + " " +

-					StringEscapeUtils.unescapeHtml4(MobileBKUHelper.extractContentFromTagWithParam(responseData, "span", "id", "Label2"))

-					.replaceAll("\\<.*?\\>", "");

-			log.info(notice);

-

 			if (!expiryNoticeDisplayed) {

 				Display.getDefault().syncExec(()->  {

 					Dialog d = new Dialog(ATrustHandler.this.shell, Messages.getString("common.info"), Messages.getString("mobileBKU.certExpiresSoon"), BUTTONS.YES_NO, ICON.WARNING);

@@ -502,11 +493,8 @@ public class ATrustHandler extends MobileBKUHandler {
 	public boolean handlePolling() throws ATrustConnectionException {

 

 		ATrustStatus status = getStatus();

-		URLConnection urlconnection = null;

 		String isReady = null;

 		Status serverStatus = null;

-		int waits = 0;

-		final String ERROR = "Error: Server is not responding";

 		HttpClient client;

 		try {

 			do {

@@ -521,7 +509,7 @@ public class ATrustHandler extends MobileBKUHandler {
 				get.addRequestHeader("Referer", uri);

 

 

-				int returnValue = client.executeMethod(get);

+				client.executeMethod(get);

 				InputStream in = new BufferedInputStream(get.getResponseBodyAsStream());

 

 				isReady = IOUtils.toString(in, "utf-8");

@@ -556,19 +544,13 @@ public class ATrustHandler extends MobileBKUHandler {
 		private final boolean wait;

 

 		public Status(String status) {

-			 JsonElement jelement = new JsonParser().parse(status.toLowerCase());

+			 JsonElement jelement = JsonParser.parseString(status.toLowerCase());

 			 JsonObject  jobject = jelement.getAsJsonObject();

 			 this.fin = jobject.get("fin").getAsBoolean();

 			 this.error = jobject.get("error").getAsBoolean();

 			 this.wait = jobject.get("wait").getAsBoolean();

 		}

 

-		public Status(boolean error) {

-			this.error = error;

-			this.fin = false;

-			this.wait = false;

-		}

-

 		public boolean isFin() {

 			return fin;

 		}

diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/bku/mobile/ATrustStatus.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/bku/mobile/ATrustStatus.java
index 5bc0c745..b61b3a8b 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/bku/mobile/ATrustStatus.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/bku/mobile/ATrustStatus.java
@@ -29,8 +29,7 @@ public class ATrustStatus extends MobileBKUStatus {
 	 * SLF4J Logger instance

 	 **/

 	@SuppressWarnings("unused")

-	private static final Logger log = LoggerFactory

-			.getLogger(ATrustStatus.class);

+	private static final Logger log = LoggerFactory.getLogger(ATrustStatus.class);

 

 	/** Maximum number of TAN tries */

 	public static final int MOBILE_MAX_TAN_TRIES = 3;

diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/bku/mobile/IAIKHandler.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/bku/mobile/IAIKHandler.java
index ac47a3b7..bf5c865f 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/bku/mobile/IAIKHandler.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/bku/mobile/IAIKHandler.java
@@ -44,8 +44,7 @@ public class IAIKHandler extends MobileBKUHandler {
 	/**

 	 * SLF4J Logger instance

 	 **/

-	private static final Logger log = LoggerFactory

-			.getLogger(IAIKHandler.class);

+	private static final Logger log = LoggerFactory.getLogger(IAIKHandler.class);

 

 	Shell shell;

 

diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/bku/mobile/MobileBKUHandler.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/bku/mobile/MobileBKUHandler.java
index 696f75fe..90e4ff46 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/bku/mobile/MobileBKUHandler.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/bku/mobile/MobileBKUHandler.java
@@ -48,8 +48,7 @@ public abstract class MobileBKUHandler {
 	/**

 	 * SLF4J Logger instance

 	 **/

-	static final Logger log = LoggerFactory

-			.getLogger(MobileBKUHandler.class);

+	static final Logger log = LoggerFactory.getLogger(MobileBKUHandler.class);

 

 	public final MobileBKUState state;

 

diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/bku/mobile/MobileBKUHelper.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/bku/mobile/MobileBKUHelper.java
index c397fa72..f6de0789 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/bku/mobile/MobileBKUHelper.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/bku/mobile/MobileBKUHelper.java
@@ -40,8 +40,7 @@ public class MobileBKUHelper {
 	/**
 	 * SLF4J Logger instance
 	 **/
-	private static final Logger log = LoggerFactory
-			.getLogger(MobileBKUHelper.class);
+	private static final Logger log = LoggerFactory.getLogger(MobileBKUHelper.class);
 
 	/**
 	 * Regular expression for mobile phone numbers: this allows the entry of
diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/bku/mobile/SimpleXMLTrustManager.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/bku/mobile/SimpleXMLTrustManager.java
index f529d658..ca57dc87 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/bku/mobile/SimpleXMLTrustManager.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/bku/mobile/SimpleXMLTrustManager.java
@@ -41,8 +41,7 @@ public class SimpleXMLTrustManager implements X509TrustManager {
 	/**
 	 * SLF4J Logger instance
 	 **/
-	private static final Logger log = LoggerFactory
-			.getLogger(SimpleXMLTrustManager.class);
+	private static final Logger log = LoggerFactory.getLogger(SimpleXMLTrustManager.class);
 
 	/*
 	 * The default X509TrustManager returned by SunX509. We'll delegate
diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/bku/mobile/TrustedSocketFactory.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/bku/mobile/TrustedSocketFactory.java
index 6f306cdd..3dae25c9 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/bku/mobile/TrustedSocketFactory.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/bku/mobile/TrustedSocketFactory.java
@@ -45,8 +45,7 @@ public class TrustedSocketFactory implements SecureProtocolSocketFactory {
 	/**
 	 * SLF4J Logger instance
 	 **/
-	private static final Logger log = LoggerFactory
-			.getLogger(TrustedSocketFactory.class);
+	private static final Logger log = LoggerFactory.getLogger(TrustedSocketFactory.class);
 
 	private static final String ENABLED_CS[] = {
 		"TLS_RSA_WITH_AES_128_CBC_SHA",
diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/cliarguments/ArgumentHandler.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/cliarguments/ArgumentHandler.java
index 22fb3409..108ccb47 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/cliarguments/ArgumentHandler.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/cliarguments/ArgumentHandler.java
@@ -34,8 +34,7 @@ public class ArgumentHandler {
 	/**
 	 * SLF4J Logger instance
 	 **/
-	private static final Logger log = LoggerFactory
-			.getLogger(ArgumentHandler.class);
+	private static final Logger log = LoggerFactory.getLogger(ArgumentHandler.class);
 
 	private Map<String, Argument> cliArguments = new LinkedHashMap<String, Argument>();
 
diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/cliarguments/ConfigFileArgument.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/cliarguments/ConfigFileArgument.java
index 78e7b21d..725a28f9 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/cliarguments/ConfigFileArgument.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/cliarguments/ConfigFileArgument.java
@@ -29,8 +29,7 @@ public class ConfigFileArgument extends Argument {
 	/**
 	 * SLF4J Logger instance
 	 **/
-	private static final Logger log = LoggerFactory
-			.getLogger(ConfigFileArgument.class);
+	private static final Logger log = LoggerFactory.getLogger(ConfigFileArgument.class);
 
 	/**
 	 * Constructor
diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/cliarguments/EmblemArgument.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/cliarguments/EmblemArgument.java
index 4acfe73e..fe88d37e 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/cliarguments/EmblemArgument.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/cliarguments/EmblemArgument.java
@@ -39,8 +39,7 @@ public class EmblemArgument extends Argument {
 	/**
 	 * SLF4J Logger instance
 	 **/
-	private static final Logger log = LoggerFactory
-			.getLogger(EmblemArgument.class);
+	private static final Logger log = LoggerFactory.getLogger(EmblemArgument.class);
 
 	/* (non-Javadoc)
 	 * @see at.asit.pdfover.gui.cliarguments.CLIArgument#handleArgument(java.lang.String[], int, at.asit.pdfover.gui.workflow.StateMachine, at.asit.pdfover.gui.cliarguments.ArgumentHandler)
diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/cliarguments/InputDocumentArgument.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/cliarguments/InputDocumentArgument.java
index 7644de76..b636b825 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/cliarguments/InputDocumentArgument.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/cliarguments/InputDocumentArgument.java
@@ -39,8 +39,7 @@ public class InputDocumentArgument extends Argument {
 	/**
 	 * SLF4J Logger instance
 	 **/
-	private static final Logger log = LoggerFactory
-			.getLogger(InputDocumentArgument.class);
+	private static final Logger log = LoggerFactory.getLogger(InputDocumentArgument.class);
 
 	/* (non-Javadoc)
 	 * @see at.asit.pdfovewr.gui.cliarguments.CLIArgument#handleArgument(java.lang.String[], int, at.asit.pdfover.gui.workflow.StateMachine, at.asit.pdfover.gui.cliarguments.ArgumentHandler)
diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/cliarguments/InvisibleProfile.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/cliarguments/InvisibleProfile.java
index 380f8e0e..0da8aa40 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/cliarguments/InvisibleProfile.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/cliarguments/InvisibleProfile.java
@@ -38,8 +38,7 @@ public class InvisibleProfile extends Argument {
 	/**
 	 * SLF4J Logger instance
 	 **/
-	private static final Logger log = LoggerFactory
-			.getLogger(InvisibleProfile.class);
+	private static final Logger log = LoggerFactory.getLogger(InvisibleProfile.class);
 
 	/* (non-Javadoc)
 	 * @see at.asit.pdfovewr.gui.cliarguments.CLIArgument#handleArgument(java.lang.String[], int, at.asit.pdfover.gui.workflow.StateMachine, at.asit.pdfover.gui.cliarguments.ArgumentHandler)
diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/cliarguments/KeystoreAliasArgument.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/cliarguments/KeystoreAliasArgument.java
index eb07536b..1ef7531e 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/cliarguments/KeystoreAliasArgument.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/cliarguments/KeystoreAliasArgument.java
@@ -36,8 +36,7 @@ public class KeystoreAliasArgument extends Argument {
 	/**
 	 * SLF4J Logger instance
 	 **/
-	private static final Logger log = LoggerFactory
-			.getLogger(KeystoreAliasArgument.class);
+	private static final Logger log = LoggerFactory.getLogger(KeystoreAliasArgument.class);
 
 	/* (non-Javadoc)
 	 * @see at.asit.pdfover.gui.cliarguments.CLIArgument#handleArgument(java.lang.String[], int, at.asit.pdfover.gui.workflow.StateMachine, at.asit.pdfover.gui.cliarguments.ArgumentHandler)
diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/cliarguments/KeystoreFileArgument.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/cliarguments/KeystoreFileArgument.java
index 2b7929fb..adc40dae 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/cliarguments/KeystoreFileArgument.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/cliarguments/KeystoreFileArgument.java
@@ -39,8 +39,7 @@ public class KeystoreFileArgument extends Argument {
 	/**
 	 * SLF4J Logger instance
 	 **/
-	private static final Logger log = LoggerFactory
-			.getLogger(KeystoreFileArgument.class);
+	private static final Logger log = LoggerFactory.getLogger(KeystoreFileArgument.class);
 
 	/* (non-Javadoc)
 	 * @see at.asit.pdfover.gui.cliarguments.CLIArgument#handleArgument(java.lang.String[], int, at.asit.pdfover.gui.workflow.StateMachine, at.asit.pdfover.gui.cliarguments.ArgumentHandler)
diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/cliarguments/KeystoreKeyPassArgument.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/cliarguments/KeystoreKeyPassArgument.java
index 54a3529b..f41bbeaa 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/cliarguments/KeystoreKeyPassArgument.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/cliarguments/KeystoreKeyPassArgument.java
@@ -36,8 +36,7 @@ public class KeystoreKeyPassArgument extends Argument {
 	/**
 	 * SLF4J Logger instance
 	 **/
-	private static final Logger log = LoggerFactory
-			.getLogger(KeystoreKeyPassArgument.class);
+	private static final Logger log = LoggerFactory.getLogger(KeystoreKeyPassArgument.class);
 
 	/* (non-Javadoc)
 	 * @see at.asit.pdfover.gui.cliarguments.CLIArgument#handleArgument(java.lang.String[], int, at.asit.pdfover.gui.workflow.StateMachine, at.asit.pdfover.gui.cliarguments.ArgumentHandler)
diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/cliarguments/KeystoreStorePassArgument.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/cliarguments/KeystoreStorePassArgument.java
index 440b8a3f..3c759743 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/cliarguments/KeystoreStorePassArgument.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/cliarguments/KeystoreStorePassArgument.java
@@ -36,8 +36,7 @@ public class KeystoreStorePassArgument extends Argument {
 	/**
 	 * SLF4J Logger instance
 	 **/
-	private static final Logger log = LoggerFactory
-			.getLogger(KeystoreStorePassArgument.class);
+	private static final Logger log = LoggerFactory.getLogger(KeystoreStorePassArgument.class);
 
 	/* (non-Javadoc)
 	 * @see at.asit.pdfover.gui.cliarguments.CLIArgument#handleArgument(java.lang.String[], int, at.asit.pdfover.gui.workflow.StateMachine, at.asit.pdfover.gui.cliarguments.ArgumentHandler)
diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/cliarguments/KeystoreTypeArgument.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/cliarguments/KeystoreTypeArgument.java
index 1e2f4918..fa29ba5d 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/cliarguments/KeystoreTypeArgument.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/cliarguments/KeystoreTypeArgument.java
@@ -36,8 +36,7 @@ public class KeystoreTypeArgument extends Argument {
 	/**
 	 * SLF4J Logger instance
 	 **/
-	private static final Logger log = LoggerFactory
-			.getLogger(KeystoreTypeArgument.class);
+	private static final Logger log = LoggerFactory.getLogger(KeystoreTypeArgument.class);
 
 	/* (non-Javadoc)
 	 * @see at.asit.pdfover.gui.cliarguments.CLIArgument#handleArgument(java.lang.String[], int, at.asit.pdfover.gui.workflow.StateMachine, at.asit.pdfover.gui.cliarguments.ArgumentHandler)
diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/cliarguments/OutputFolderArgument.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/cliarguments/OutputFolderArgument.java
index e81502a0..047bf79c 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/cliarguments/OutputFolderArgument.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/cliarguments/OutputFolderArgument.java
@@ -36,8 +36,7 @@ public class OutputFolderArgument extends Argument {
 	/**
 	 * SLF4J Logger instance
 	 **/
-	private static final Logger log = LoggerFactory
-			.getLogger(OutputFolderArgument.class);
+	private static final Logger log = LoggerFactory.getLogger(OutputFolderArgument.class);
 
 	/* (non-Javadoc)
 	 * @see at.asit.pdfover.gui.cliarguments.CLIArgument#handleArgument(java.lang.String[], int, at.asit.pdfover.gui.workflow.StateMachine, at.asit.pdfover.gui.cliarguments.ArgumentHandler)
diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/cliarguments/PasswordArgument.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/cliarguments/PasswordArgument.java
index bf5619b0..aef07e1f 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/cliarguments/PasswordArgument.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/cliarguments/PasswordArgument.java
@@ -37,8 +37,7 @@ public class PasswordArgument extends Argument {
 	/**
 	 * SLF4J Logger instance
 	 **/
-	private static final Logger log = LoggerFactory
-			.getLogger(PasswordArgument.class);
+	private static final Logger log = LoggerFactory.getLogger(PasswordArgument.class);
 
 	/* (non-Javadoc)
 	 * @see at.asit.pdfover.gui.cliarguments.CLIArgument#handleArgument(java.lang.String[], int, at.asit.pdfover.gui.workflow.StateMachine, at.asit.pdfover.gui.cliarguments.ArgumentHandler)
diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/cliarguments/PhoneNumberArgument.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/cliarguments/PhoneNumberArgument.java
index 9a7a130e..a4eff37a 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/cliarguments/PhoneNumberArgument.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/cliarguments/PhoneNumberArgument.java
@@ -38,8 +38,7 @@ public class PhoneNumberArgument extends Argument {
 	/**
 	 * SLF4J Logger instance
 	 **/
-	private static final Logger log = LoggerFactory
-			.getLogger(PhoneNumberArgument.class);
+	private static final Logger log = LoggerFactory.getLogger(PhoneNumberArgument.class);
 
 
 	/* (non-Javadoc)
diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/cliarguments/ProxyHostArgument.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/cliarguments/ProxyHostArgument.java
index c42d26a7..a77872e5 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/cliarguments/ProxyHostArgument.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/cliarguments/ProxyHostArgument.java
@@ -36,8 +36,7 @@ public class ProxyHostArgument extends Argument {
 	/**
 	 * SLF4J Logger instance
 	 **/
-	private static final Logger log = LoggerFactory
-			.getLogger(ProxyHostArgument.class);
+	private static final Logger log = LoggerFactory.getLogger(ProxyHostArgument.class);
 
 	/* (non-Javadoc)
 	 * @see at.asit.pdfover.gui.cliarguments.CLIArgument#handleArgument(java.lang.String[], int, at.asit.pdfover.gui.workflow.StateMachine, at.asit.pdfover.gui.cliarguments.ArgumentHandler)
diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/cliarguments/ProxyPassArgument.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/cliarguments/ProxyPassArgument.java
index 514715ee..f9c4e533 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/cliarguments/ProxyPassArgument.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/cliarguments/ProxyPassArgument.java
@@ -36,8 +36,7 @@ public class ProxyPassArgument extends Argument {
 	/**
 	 * SLF4J Logger instance
 	 **/
-	private static final Logger log = LoggerFactory
-			.getLogger(ProxyPassArgument.class);
+	private static final Logger log = LoggerFactory.getLogger(ProxyPassArgument.class);
 
 	/* (non-Javadoc)
 	 * @see at.asit.pdfover.gui.cliarguments.CLIArgument#handleArgument(java.lang.String[], int, at.asit.pdfover.gui.workflow.StateMachine, at.asit.pdfover.gui.cliarguments.ArgumentHandler)
diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/cliarguments/ProxyPortArgument.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/cliarguments/ProxyPortArgument.java
index 1aefb76b..ff9e84df 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/cliarguments/ProxyPortArgument.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/cliarguments/ProxyPortArgument.java
@@ -37,8 +37,7 @@ public class ProxyPortArgument extends Argument {
 	/**
 	 * SLF4J Logger instance
 	 **/
-	private static final Logger log = LoggerFactory
-			.getLogger(ProxyPortArgument.class);
+	private static final Logger log = LoggerFactory.getLogger(ProxyPortArgument.class);
 
 	/* (non-Javadoc)
 	 * @see at.asit.pdfover.gui.cliarguments.CLIArgument#handleArgument(java.lang.String[], int, at.asit.pdfover.gui.workflow.StateMachine, at.asit.pdfover.gui.cliarguments.ArgumentHandler)
diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/cliarguments/ProxyUserArgument.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/cliarguments/ProxyUserArgument.java
index 5e704c63..82944f9b 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/cliarguments/ProxyUserArgument.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/cliarguments/ProxyUserArgument.java
@@ -36,8 +36,7 @@ public class ProxyUserArgument extends Argument {
 	/**
 	 * SLF4J Logger instance
 	 **/
-	private static final Logger log = LoggerFactory
-			.getLogger(ProxyUserArgument.class);
+	private static final Logger log = LoggerFactory.getLogger(ProxyUserArgument.class);
 
 	/* (non-Javadoc)
 	 * @see at.asit.pdfover.gui.cliarguments.CLIArgument#handleArgument(java.lang.String[], int, at.asit.pdfover.gui.workflow.StateMachine, at.asit.pdfover.gui.cliarguments.ArgumentHandler)
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 0f9fa724..f7253486 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
@@ -100,8 +100,7 @@ public class BKUSelectionComposite extends StateComposite {
 	/**
 	 * SLF4J Logger instance
 	 **/
-	static final Logger log = LoggerFactory
-			.getLogger(BKUSelectionComposite.class);
+	static final Logger log = LoggerFactory.getLogger(BKUSelectionComposite.class);
 
 	private BKUs selected = BKUs.NONE;
 
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 3f89338a..62b3b090 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
@@ -92,8 +92,7 @@ public class DataSourceSelectComposite extends StateComposite {
 	/**
 	 * SLF4J Logger instance
 	 **/
-	static final Logger log = LoggerFactory
-			.getLogger(DataSourceSelectComposite.class);
+	static final Logger log = LoggerFactory.getLogger(DataSourceSelectComposite.class);
 
 	/**
 	 * Set this value through the setter method!!
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 e761bdbc..6568addb 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
@@ -44,8 +44,7 @@ public class MobileBKUEnterNumberComposite extends StateComposite {
 	/**

 	 * SLF4J Logger instance

 	 **/

-	static final Logger log = LoggerFactory

-			.getLogger(MobileBKUEnterNumberComposite.class);

+	static final Logger log = LoggerFactory.getLogger(MobileBKUEnterNumberComposite.class);

 

 	/**

 	 *

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 55711bb1..ac5044ae 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
@@ -117,8 +117,7 @@ public class MobileBKUEnterTANComposite extends StateComposite {
 	/**

 	 * SLF4J Logger instance

 	 **/

-	static final Logger log = LoggerFactory

-			.getLogger(MobileBKUEnterTANComposite.class);

+	static final Logger log = LoggerFactory.getLogger(MobileBKUEnterTANComposite.class);

 

 	Text txt_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 35963786..40630b49 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
@@ -87,8 +87,7 @@ public class MobileBKUFingerprintComposite extends StateComposite {
 	/**

 	 * SLF4J Logger instance

 	 **/

-	static final Logger log = LoggerFactory

-			.getLogger(MobileBKUFingerprintComposite.class);

+	static final Logger log = LoggerFactory.getLogger(MobileBKUFingerprintComposite.class);

 

 	boolean userCancel = false;

 	boolean userSMS = false;

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 58059153..00820e46 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
@@ -89,8 +89,7 @@ public class MobileBKUQRComposite extends StateComposite {
 	/**

 	 * SLF4J Logger instance

 	 **/

-	static final Logger log = LoggerFactory

-			.getLogger(MobileBKUQRComposite.class);

+	static final Logger log = LoggerFactory.getLogger(MobileBKUQRComposite.class);

 

 	private Label lblQR;

 

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 3db26635..d9263d72 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
@@ -33,8 +33,6 @@ import org.eclipse.swt.awt.SWT_AWT;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.FormAttachment;
-import org.eclipse.swt.layout.FormData;
 import org.eclipse.swt.layout.FormLayout;
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
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 008a2d2c..34837b2d 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
@@ -68,8 +68,6 @@ public class SignaturePanel extends JPanel {
 	int offX = 0;

 	/** The vertical offset of the image from the top of the panel */

 	int offY = 0;

-	/** The size of the image */

-	private Dimension prevSize = null;

 	/** The position of the signature, in page space */

 	Point2D sigPagePos = null;

 	/** The position of the signature, in screen space */

@@ -324,8 +322,6 @@ public class SignaturePanel extends JPanel {
 			}

 			else

 				updateSigPos((int) this.sigScreenPos.getX(), (int) this.sigScreenPos.getY());

-

-			this.prevSize = actualRenderSize;

 		}

 	}

 

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 37d11691..74d3d62b 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
@@ -17,10 +17,8 @@ package at.asit.pdfover.gui.composites.configuration;
 
 // Imports
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.IOException;
-import java.security.Key;
 import java.security.KeyStore;
 import java.security.KeyStoreException;
 import java.security.NoSuchAlgorithmException;
@@ -76,8 +74,7 @@ public class KeystoreConfigurationComposite extends ConfigurationCompositeBase {
 	/**
 	 * SLF4J Logger instance
 	 **/
-	static final Logger log = LoggerFactory
-			.getLogger(KeystoreConfigurationComposite.class);
+	static final Logger log = LoggerFactory.getLogger(KeystoreConfigurationComposite.class);
 
 	private Group grpKeystore;
 	private Label lblKeystoreFile;
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 e4237026..2de930bf 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
@@ -77,8 +77,7 @@ public class SimpleConfigurationComposite extends ConfigurationCompositeBase {
 	/**
 	 * SLF4J Logger instance
 	 **/
-	static final Logger log = LoggerFactory
-			.getLogger(SimpleConfigurationComposite.class);
+	static final Logger log = LoggerFactory.getLogger(SimpleConfigurationComposite.class);
 
 	private Group grpHandySignatur;
 	private Label lblMobileNumber;
diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/controls/ErrorMarker.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/controls/ErrorMarker.java
index ba2949d8..bd99b887 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/controls/ErrorMarker.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/controls/ErrorMarker.java
@@ -39,8 +39,7 @@ public class ErrorMarker extends Label {
 	 * SLF4J Logger instance
 	 **/
 	@SuppressWarnings("unused")
-	private static final Logger log = LoggerFactory
-			.getLogger(ErrorMarker.class);
+	private static final Logger log = LoggerFactory.getLogger(ErrorMarker.class);
 
 	Image errorImg;
 
diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/controls/MainBarEndButton.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/controls/MainBarEndButton.java
index fa4c40c2..1e80aa36 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/controls/MainBarEndButton.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/controls/MainBarEndButton.java
@@ -39,8 +39,7 @@ public class MainBarEndButton extends MainBarButton {
 	 * SLF4J Logger instance
 	 **/
 	@SuppressWarnings("unused")
-	private static final Logger log = LoggerFactory
-			.getLogger(MainBarEndButton.class);
+	private static final Logger log = LoggerFactory.getLogger(MainBarEndButton.class);
 
 	/*
 	 * (non-Javadoc)
diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/controls/MainBarMiddleButton.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/controls/MainBarMiddleButton.java
index 63cc50a2..452f0a45 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/controls/MainBarMiddleButton.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/controls/MainBarMiddleButton.java
@@ -39,8 +39,7 @@ public class MainBarMiddleButton extends MainBarButton {
 	 * SLF4J Logger instance
 	 **/
 	@SuppressWarnings("unused")
-	private static final Logger log = LoggerFactory
-			.getLogger(MainBarMiddleButton.class);
+	private static final Logger log = LoggerFactory.getLogger(MainBarMiddleButton.class);
 
 	/* (non-Javadoc)
 	 * @see at.asit.pdfover.gui.controls.MainBarButton#paintButton(org.eclipse.swt.events.PaintEvent)
diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/controls/MainBarRectangleButton.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/controls/MainBarRectangleButton.java
index 9e35d3d6..22a73b15 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/controls/MainBarRectangleButton.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/controls/MainBarRectangleButton.java
@@ -33,8 +33,7 @@ public class MainBarRectangleButton extends MainBarButton {
 	 * SLF4J Logger instance
 	 **/
 	@SuppressWarnings("unused")
-	private static final Logger log = LoggerFactory
-			.getLogger(MainBarRectangleButton.class);
+	private static final Logger log = LoggerFactory.getLogger(MainBarRectangleButton.class);
 
 	private Image enabledImg = null;
 	private Image disabledImg = null;
diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/controls/MainBarStartButton.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/controls/MainBarStartButton.java
index 265bccf6..ef03fdcb 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/controls/MainBarStartButton.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/controls/MainBarStartButton.java
@@ -39,8 +39,7 @@ public class MainBarStartButton extends MainBarButton {
 	 * SLF4J Logger instance
 	 **/
 	@SuppressWarnings("unused")
-	private static final Logger log = LoggerFactory
-			.getLogger(MainBarStartButton.class);
+	private static final Logger log = LoggerFactory.getLogger(MainBarStartButton.class);
 
 	@Override
 	protected void paintBackground(PaintEvent e) {
diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/utils/SignaturePlaceholderCache.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/utils/SignaturePlaceholderCache.java
index 7e743a93..2d9a190b 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/utils/SignaturePlaceholderCache.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/utils/SignaturePlaceholderCache.java
@@ -45,8 +45,7 @@ public class SignaturePlaceholderCache {
 	/**
 	 * SLF4J Logger instance
 	 **/
-	private static final Logger log = LoggerFactory
-			.getLogger(SignaturePlaceholderCache.class);
+	private static final Logger log = LoggerFactory.getLogger(SignaturePlaceholderCache.class);
 
 	private static void saveImage(BufferedImage image, String fileDir, String fileName, String fileExt) throws IOException {
 		File file = new File(fileDir, fileName + "." + fileExt);
diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/ConfigurationUIState.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/ConfigurationUIState.java
index e371a321..9e7f2d42 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/ConfigurationUIState.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/ConfigurationUIState.java
@@ -34,8 +34,7 @@ public class ConfigurationUIState extends State {
 	 * SLF4J Logger instance
 	 **/
 	@SuppressWarnings("unused")
-	private static final Logger log = LoggerFactory
-			.getLogger(ConfigurationUIState.class);
+	private static final Logger log = LoggerFactory.getLogger(ConfigurationUIState.class);
 
 
 
diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/OpenState.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/OpenState.java
index 9946f847..f76c5137 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/OpenState.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/OpenState.java
@@ -65,8 +65,7 @@ public class OpenState extends State {
 	/**
 	 * SLF4J Logger instance
 	 **/
-	private static final Logger log = LoggerFactory
-			.getLogger(OpenState.class);
+	private static final Logger log = LoggerFactory.getLogger(OpenState.class);
 	private static final String advancedConfig = Constants.CONFIG_DIRECTORY + File.separator + "/cfg/advancedconfig.properties";
 
 	private DataSourceSelectComposite selectionComposite = null;
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 aff0fe61..3383b11b 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
@@ -18,9 +18,6 @@ package at.asit.pdfover.gui.workflow.states;
 //Imports
 import java.io.File;
 import java.io.IOException;
-import java.io.RandomAccessFile;
-import java.nio.ByteBuffer;
-import java.nio.channels.FileChannel;
 
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.encryption.InvalidPasswordException;
@@ -58,8 +55,7 @@ public class PositioningState extends State {
 	/**
 	 * SLF4J Logger instance
 	 **/
-	private static final Logger log = LoggerFactory
-			.getLogger(PositioningState.class);
+	private static final Logger log = LoggerFactory.getLogger(PositioningState.class);
 
 	private PositioningComposite positionComposite = null;
 
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 c07f7282..3eef7504 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
@@ -168,8 +168,7 @@ public class PrepareSigningState extends State {
 	/**
 	 * SLF4J Logger instance
 	 **/
-	static final Logger log = LoggerFactory
-			.getLogger(PrepareSigningState.class);
+	static final Logger log = LoggerFactory.getLogger(PrepareSigningState.class);
 
 	SignatureParameter signatureParameter;
 
diff --git a/pdf-over-signator/src/main/java/at/asit/pdfover/signator/CachedFileNameEmblem.java b/pdf-over-signator/src/main/java/at/asit/pdfover/signator/CachedFileNameEmblem.java
index bfb56531..236fb905 100644
--- a/pdf-over-signator/src/main/java/at/asit/pdfover/signator/CachedFileNameEmblem.java
+++ b/pdf-over-signator/src/main/java/at/asit/pdfover/signator/CachedFileNameEmblem.java
@@ -51,8 +51,7 @@ public class CachedFileNameEmblem implements Emblem {
 	/**
 	 * SLF4J Logger instance
 	 **/
-	private static final Logger log = LoggerFactory
-			.getLogger(CachedFileNameEmblem.class);
+	private static final Logger log = LoggerFactory.getLogger(CachedFileNameEmblem.class);
 
 	private final String fileDir = System.getProperty("user.home") + File.separator + ".pdf-over";
 	private final String imgFileName = ".emblem";
diff --git a/pdf-over-signator/src/main/java/at/asit/pdfover/signator/FileNameEmblem.java b/pdf-over-signator/src/main/java/at/asit/pdfover/signator/FileNameEmblem.java
index f080fd5d..fa134ce7 100644
--- a/pdf-over-signator/src/main/java/at/asit/pdfover/signator/FileNameEmblem.java
+++ b/pdf-over-signator/src/main/java/at/asit/pdfover/signator/FileNameEmblem.java
@@ -27,8 +27,7 @@ public class FileNameEmblem implements Emblem {
 	 * SLF4J Logger instance
 	 **/
 	@SuppressWarnings("unused")
-	private static final Logger log = LoggerFactory
-			.getLogger(FileNameEmblem.class);
+	private static final Logger log = LoggerFactory.getLogger(FileNameEmblem.class);
 
 	private String fileName = null;
 
diff --git a/pdf-over-signator/src/main/java/at/asit/pdfover/signator/PDFFileDocumentSource.java b/pdf-over-signator/src/main/java/at/asit/pdfover/signator/PDFFileDocumentSource.java
index b85a65f2..ea9fe5fb 100644
--- a/pdf-over-signator/src/main/java/at/asit/pdfover/signator/PDFFileDocumentSource.java
+++ b/pdf-over-signator/src/main/java/at/asit/pdfover/signator/PDFFileDocumentSource.java
@@ -31,8 +31,7 @@ public class PDFFileDocumentSource implements DocumentSource {
 	/**
 	 * SLF4J Logger instance
 	 **/
-	private static final Logger log = LoggerFactory
-			.getLogger(PDFFileDocumentSource.class);
+	private static final Logger log = LoggerFactory.getLogger(PDFFileDocumentSource.class);
 
 	private File file;
 
diff --git a/pdf-over-signator/src/main/java/at/asit/pdfover/signator/SLResponse.java b/pdf-over-signator/src/main/java/at/asit/pdfover/signator/SLResponse.java
index 1b7abf1c..78c140b5 100644
--- a/pdf-over-signator/src/main/java/at/asit/pdfover/signator/SLResponse.java
+++ b/pdf-over-signator/src/main/java/at/asit/pdfover/signator/SLResponse.java
@@ -78,7 +78,7 @@ public class SLResponse {
 	 * Get the Security Layer response text
 	 * @return the Security Layer response text
 	 */
-	public String getSLRespone() {
+	public String getSLResponse() {
 		return this.response;
 	}
 }
diff --git a/pdf-over-signer/src/main/java/at/asit/pdfover/signer/pdfas/PdfAs4BKUSLConnector.java b/pdf-over-signer/src/main/java/at/asit/pdfover/signer/pdfas/PdfAs4BKUSLConnector.java
index 124bf43d..a78e33c6 100644
--- a/pdf-over-signer/src/main/java/at/asit/pdfover/signer/pdfas/PdfAs4BKUSLConnector.java
+++ b/pdf-over-signer/src/main/java/at/asit/pdfover/signer/pdfas/PdfAs4BKUSLConnector.java
@@ -46,8 +46,7 @@ public class PdfAs4BKUSLConnector extends BaseSLConnector {
 	/**
 	 * SLF4J Logger instance
 	 **/
-	private static final Logger log = LoggerFactory
-			.getLogger(PdfAs4BKUSLConnector.class);
+	private static final Logger log = LoggerFactory.getLogger(PdfAs4BKUSLConnector.class);
 
 	private BkuSlConnector connector;
 
@@ -70,13 +69,11 @@ public class PdfAs4BKUSLConnector extends BaseSLConnector {
 		JAXBElement<?> element = null;
 		try {
 			String slRequestString = SLMarschaller.marshalToString(this.of.createInfoboxReadRequest(request));
-			//log.trace(slRequestString);
 
 			PdfAs4SLRequest slRequest = new PdfAs4SLRequest(slRequestString, null);
-			String slResponse = this.connector.handleSLRequest(slRequest).getSLRespone();
+			String slResponse = this.connector.handleSLRequest(slRequest).getSLResponse();
 
-			element = (JAXBElement<?>) SLMarschaller
-					.unmarshalFromString(slResponse);
+			element = (JAXBElement<?>) SLMarschaller.unmarshalFromString(slResponse);
 		} catch (JAXBException e) {
 			throw new PDFIOException("error.pdf.io.03", e);
 		} catch (PdfAs4SLRequestException e) {
@@ -90,14 +87,10 @@ public class PdfAs4BKUSLConnector extends BaseSLConnector {
 		}
 
 		if (element.getValue() instanceof InfoboxReadResponseType) {
-			InfoboxReadResponseType infoboxReadResponseType = (InfoboxReadResponseType) element
-					.getValue();
-			return infoboxReadResponseType;
+			return (InfoboxReadResponseType) element.getValue();
 		} else if (element.getValue() instanceof ErrorResponseType) {
-			ErrorResponseType errorResponseType = (ErrorResponseType) element
-					.getValue();
-			throw new SLPdfAsException(errorResponseType.getErrorCode(),
-					errorResponseType.getInfo());
+			ErrorResponseType errorResponseType = (ErrorResponseType)element.getValue();
+			throw new SLPdfAsException(errorResponseType.getErrorCode(), errorResponseType.getInfo());
 		}
 		throw new PdfAsException("error.pdf.io.03");
 	}
@@ -118,7 +111,7 @@ public class PdfAs4BKUSLConnector extends BaseSLConnector {
 				signatureData = PDFUtils.blackOutSignature(signatureData, pack.getByteRange());
 
 			PdfAs4SLRequest slRequest = new PdfAs4SLRequest(slRequestString, signatureData);
-			String slResponse = this.connector.handleSLRequest(slRequest).getSLRespone();
+			String slResponse = this.connector.handleSLRequest(slRequest).getSLResponse();
 
 			element = (JAXBElement<?>) SLMarschaller
 					.unmarshalFromString(slResponse);
diff --git a/pdf-over-signer/src/main/java/at/asit/pdfover/signer/pdfas/PdfAs4Helper.java b/pdf-over-signer/src/main/java/at/asit/pdfover/signer/pdfas/PdfAs4Helper.java
index e0b8ff46..a41f2378 100644
--- a/pdf-over-signer/src/main/java/at/asit/pdfover/signer/pdfas/PdfAs4Helper.java
+++ b/pdf-over-signer/src/main/java/at/asit/pdfover/signer/pdfas/PdfAs4Helper.java
@@ -33,8 +33,7 @@ public class PdfAs4Helper {
 	 * SLF4J Logger instance
 	 **/
 	@SuppressWarnings("unused")
-	private static final Logger log = LoggerFactory
-			.getLogger(PdfAs4Helper.class);
+	private static final Logger log = LoggerFactory.getLogger(PdfAs4Helper.class);
 
 	/**
 	 * PDF-AS Object
diff --git a/pdf-over-signer/src/main/java/at/asit/pdfover/signer/pdfas/PdfAs4SignatureParameter.java b/pdf-over-signer/src/main/java/at/asit/pdfover/signer/pdfas/PdfAs4SignatureParameter.java
index 032416cd..b54064ab 100644
--- a/pdf-over-signer/src/main/java/at/asit/pdfover/signer/pdfas/PdfAs4SignatureParameter.java
+++ b/pdf-over-signer/src/main/java/at/asit/pdfover/signer/pdfas/PdfAs4SignatureParameter.java
@@ -76,8 +76,7 @@ public class PdfAs4SignatureParameter extends SignatureParameter {
     /**
      * SLF4J Logger instance
      **/
-    static final Logger log = LoggerFactory
-            .getLogger(PdfAs4SignatureParameter.class);
+    static final Logger log = LoggerFactory.getLogger(PdfAs4SignatureParameter.class);
     private String profile = Profile.getDefaultProfile();
 
     /* (non-Javadoc)
@@ -210,8 +209,8 @@ public class PdfAs4SignatureParameter extends SignatureParameter {
         return profileId;
     }
 
-    private String getLangProfilePart(String lang) {
-        return (lang != null && lang.equals("en")) ? PROFILE_ID_LANG_EN : PROFILE_ID_LANG_DE;
+    private static String getLangProfilePart(String lang) {
+        return ("en".equals(lang)) ? PROFILE_ID_LANG_EN : PROFILE_ID_LANG_DE;
     }
 
     @Override