Configuration and Main Bar Buttons

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

10 files changed, 113 insertions, 165 deletions

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 4b468ad8..52dfb5c9 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
@@ -19,6 +19,9 @@ package at.asit.pdfover.gui.workflow.states;
 import org.eclipse.swt.SWT;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+
+import at.asit.pdfover.gui.MainWindowBehavior;
+import at.asit.pdfover.gui.MainWindow.Buttons;
 import at.asit.pdfover.gui.composites.ConfigurationComposite;
 import at.asit.pdfover.gui.workflow.StateMachine;
 import at.asit.pdfover.gui.workflow.Status;
@@ -30,6 +33,7 @@ public class ConfigurationUIState extends State {
 	/**
 	 * SLF4J Logger instance
 	 **/
+	@SuppressWarnings("unused")
 	private static final Logger log = LoggerFactory
 			.getLogger(ConfigurationUIState.class);
 
@@ -41,6 +45,7 @@ public class ConfigurationUIState extends State {
 			this.configurationComposite =
 					this.stateMachine.getGUIProvider().createComposite(ConfigurationComposite.class, SWT.RESIZE, this);
 			this.configurationComposite.setConfigManipulator(this.stateMachine.getConfigManipulator());
+			this.configurationComposite.setConfigProvider(this.stateMachine.getConfigProvider());
 		}
 
 		return this.configurationComposite;
@@ -88,6 +93,8 @@ public class ConfigurationUIState extends State {
 	@Override
 	public void updateMainWindowBehavior() {
 		// Leave the state as it is
+		MainWindowBehavior behavior = this.stateMachine.getStatus().getBehavior();
+		behavior.setMainBarVisible(false);
 	}
 
 }
diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/MobileBKUState.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/MobileBKUState.java
index 234cd215..f39deada 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/MobileBKUState.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/MobileBKUState.java
@@ -41,7 +41,7 @@ public class MobileBKUState extends State {
 	 */
 	public MobileBKUState(StateMachine stateMachine) {
 		super(stateMachine);
-		this.status = new MobileBKUStatus();
+		this.status = new MobileBKUStatus(this.stateMachine.getConfigProvider());
 	}
 
 	/**
diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/OutputState.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/OutputState.java
index 50aee387..2ebc3f39 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/OutputState.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/OutputState.java
@@ -16,6 +16,10 @@
 package at.asit.pdfover.gui.workflow.states;
 
 //Imports
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+
 import org.eclipse.swt.SWT;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -23,8 +27,10 @@ import org.slf4j.LoggerFactory;
 import at.asit.pdfover.gui.MainWindow.Buttons;
 import at.asit.pdfover.gui.MainWindowBehavior;
 import at.asit.pdfover.gui.composites.OutputComposite;
+import at.asit.pdfover.gui.controls.ErrorDialog;
 import at.asit.pdfover.gui.workflow.StateMachine;
 import at.asit.pdfover.gui.workflow.Status;
+import at.asit.pdfover.signator.DocumentSource;
 
 /**
  * Procduces the output of the signature process. (save file, open file)
@@ -42,48 +48,74 @@ public class OutputState extends State {
 	 * SFL4J Logger instance
 	 **/
 	@SuppressWarnings("unused")
-	private static final Logger log = LoggerFactory.getLogger(OutputState.class);
-	
+	private static final Logger log = LoggerFactory
+			.getLogger(OutputState.class);
+
 	private OutputComposite outputComposite = null;
 
 	private OutputComposite getSelectionComposite() {
 		if (this.outputComposite == null) {
-			this.outputComposite =
-					this.stateMachine.getGUIProvider().createComposite(OutputComposite.class, SWT.RESIZE, this);
+			this.outputComposite = this.stateMachine.getGUIProvider()
+					.createComposite(OutputComposite.class, SWT.RESIZE, this);
 		}
 
 		return this.outputComposite;
 	}
-	
+
+	private boolean saved = false;
+
 	@Override
 	public void run() {
 		// TODO Preform output operations ... end workflow
-		
+
 		Status status = this.stateMachine.getStatus();
-		
-		if(status.getSignResult() != null)
-		{
+
+		if (status.getSignResult() != null) {
 			OutputComposite outputComposite = this.getSelectionComposite();
-			outputComposite.setSignedDocument(status.getSignResult().getSignedDocument());
+			outputComposite.setSignedDocument(status.getSignResult()
+					.getSignedDocument());
 			this.stateMachine.getGUIProvider().display(outputComposite);
-			
-			/*DocumentSource signedDocument = status.getSignResult().getSignedDocument();			
-			
-			FileOutputStream output;
-			try {
-				output = new FileOutputStream(new File("/tmp/test.pdf"));
-				output.write(signedDocument.getByteArray(), 0, signedDocument.getByteArray().length);
-				output.close();
-			} catch (IOException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
-			}*/
+
+			if (!this.saved) {
+				this.saved = true;
+				String outputFolder = this.stateMachine.getConfigProvider()
+						.getDefaultOutputFolder();
+				String fileName = status.getDocument().getName();
+				if (outputFolder != null && !outputFolder.trim().equals("")) { //$NON-NLS-1$
+					DocumentSource signedDocument = status.getSignResult().getSignedDocument();
+					FileOutputStream output;
+					try {
+						output = new FileOutputStream(new File(outputFolder + "/" + fileName + "_signed.pdf")); //$NON-NLS-1$ //$NON-NLS-2$
+						output.write(signedDocument.getByteArray(), 0,
+								signedDocument.getByteArray().length);
+						output.close();
+					} catch (IOException e) {
+						log.error("Failed to save signed document to configured output folder.", e); //$NON-NLS-1$
+						ErrorDialog dialog = new ErrorDialog(outputComposite.getShell(), SWT.NONE, "Failed to save signed document to configured output folder.", e);
+						dialog.open();
+					}
+				}
+			}
+
+			/*
+			 * DocumentSource signedDocument =
+			 * status.getSignResult().getSignedDocument();
+			 * 
+			 * FileOutputStream output; try { output = new FileOutputStream(new
+			 * File("/tmp/test.pdf"));
+			 * output.write(signedDocument.getByteArray(), 0,
+			 * signedDocument.getByteArray().length); output.close(); } catch
+			 * (IOException e) { // TODO Auto-generated catch block
+			 * e.printStackTrace(); }
+			 */
 		}
-		
-		//this.stateMachine.exit();
+
+		// this.stateMachine.exit();
 	}
 
-	/* (non-Javadoc)
+	/*
+	 * (non-Javadoc)
+	 * 
 	 * @see at.asit.pdfover.gui.workflow.states.State#cleanUp()
 	 */
 	@Override
@@ -92,12 +124,15 @@ public class OutputState extends State {
 			this.outputComposite.dispose();
 	}
 
-	/* (non-Javadoc)
+	/*
+	 * (non-Javadoc)
+	 * 
 	 * @see at.asit.pdfover.gui.workflow.states.State#setMainWindowBehavior()
 	 */
 	@Override
 	public void updateMainWindowBehavior() {
-		MainWindowBehavior behavior = this.stateMachine.getStatus().getBehavior();
+		MainWindowBehavior behavior = this.stateMachine.getStatus()
+				.getBehavior();
 		behavior.reset();
 		behavior.setEnabled(Buttons.CONFIG, true);
 		behavior.setEnabled(Buttons.OPEN, true);
@@ -110,7 +145,7 @@ public class OutputState extends State {
 	}
 
 	@Override
-	public String toString()  {
+	public String toString() {
 		return this.getClass().getName();
 	}
 }
diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/PrepareConfigurationState.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/PrepareConfigurationState.java
index b4b05318..a1de09d0 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/PrepareConfigurationState.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/PrepareConfigurationState.java
@@ -20,9 +20,6 @@ import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
-import java.util.Properties;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -35,9 +32,7 @@ import at.asit.pdfover.gui.cliarguments.PhoneNumberArgument;
 import at.asit.pdfover.gui.exceptions.InitializationException;
 import at.asit.pdfover.gui.workflow.ConfigManipulator;
 import at.asit.pdfover.gui.workflow.StateMachine;
-import at.asit.pdfover.signator.BKUs;
 import at.asit.pdfover.signator.Signator;
-import at.asit.pdfover.signator.SignaturePosition;
 
 /**
  * Starting state of workflow proccess
@@ -46,11 +41,7 @@ import at.asit.pdfover.signator.SignaturePosition;
  */
 public class PrepareConfigurationState extends State {
 
-	/**
-	 * Regex for parsing signature position
-	 */
-	public static final String SIGN_POS_REGEX = "(x=(\\d\\.?\\d?);y=(\\d\\.?\\d?);p=(\\d))|(auto)|(x=(\\d\\.?\\d?);y=(\\d\\.?\\d?))"; //$NON-NLS-1$
-
+	
 	/**
 	 * @param stateMachine
 	 */
@@ -81,10 +72,12 @@ public class PrepareConfigurationState extends State {
 	private void initializeFromConfigurationFile(String filename)
 			throws InitializationException {
 		try {
-			Properties config = new Properties();
 
 			try {
-				config.load(new FileInputStream(filename));
+				this.stateMachine.getConfigProvider().loadConfiguration(new FileInputStream(filename));
+				
+				log.info("Loaded config from file : " + filename); //$NON-NLS-1$
+				
 			} catch (FileNotFoundException ex) {
 				if (filename.equals(ConfigManipulator.DEFAULT_CONFIG_FILE)) {
 					// we only check for resource config file if it is the
@@ -92,7 +85,9 @@ public class PrepareConfigurationState extends State {
 					try {
 						InputStream is = this.getClass().getResourceAsStream(
 								"/" + filename); //$NON-NLS-1$
-						config.load(is);
+						this.stateMachine.getConfigProvider().loadConfiguration(is);
+						
+						log.info("Loaded config from resource : " + filename); //$NON-NLS-1$
 					} catch (Exception eex) {
 						throw ex;
 					}
@@ -100,112 +95,7 @@ public class PrepareConfigurationState extends State {
 					throw ex;
 				}
 			}
-
-			// Load ok ...
-			ConfigManipulator configManipulator = this.stateMachine
-					.getConfigManipulator();
-
-			// Set Emblem
-			configManipulator.setDefaultEmblem(config
-					.getProperty(ConfigManipulator.EMBLEM_CONFIG));
-
-			// Set Mobile Phone Number
-			configManipulator.setDefaultMobileNumber(config
-					.getProperty(ConfigManipulator.MOBILE_NUMBER_CONFIG));
-
-			// Set Proxy Host
-			configManipulator.setProxyHost(config
-					.getProperty(ConfigManipulator.PROXY_HOST_CONFIG));
-
-			// Set Proxy Port
-			String proxyPortString = config
-					.getProperty(ConfigManipulator.PROXY_PORT_CONFIG);
-
-			if (proxyPortString != null && !proxyPortString.trim().equals("")) { //$NON-NLS-1$
-				int port = Integer.parseInt(proxyPortString);
-
-				if (port > 0 && port <= 0xFFFF) {
-					configManipulator.setProxyPort(port);
-				} else {
-					log.warn("Proxy port is out of range!: " + port); //$NON-NLS-1$
-				}
-			}
-
-			// Set Default BKU
-			String bkuString = config.getProperty(ConfigManipulator.BKU_CONFIG);
-
-			BKUs defaultBKU = BKUs.NONE;
-
-			try {
-				defaultBKU = BKUs.valueOf(bkuString);
-			} catch (IllegalArgumentException ex) {
-				log.error("Invalid BKU config value " + bkuString + " using none!"); //$NON-NLS-1$ //$NON-NLS-2$
-				defaultBKU = BKUs.NONE;
-			} catch (NullPointerException ex) {
-				log.error("Invalid BKU config value " + bkuString + " using none!"); //$NON-NLS-1$ //$NON-NLS-2$
-				defaultBKU = BKUs.NONE;
-			}
-
-			configManipulator.setDefaultBKU(defaultBKU);
-
-			// Set Signature Position
-			String signaturePosition = config
-					.getProperty(ConfigManipulator.SIGNATURE_POSITION_CONFIG);
-
-			SignaturePosition position = null;
-
-			if (signaturePosition != null
-					&& !signaturePosition.trim().equals("")) { //$NON-NLS-1$
-
-				signaturePosition = signaturePosition.trim().toLowerCase();
-
-				Pattern pattern = Pattern.compile(SIGN_POS_REGEX);
-
-				Matcher matcher = pattern.matcher(signaturePosition);
-
-				if (matcher.matches()) {
-					if (matcher.groupCount() == 8) {
-						if (matcher.group(1) != null) {
-							// we have format: x=..;y=..;p=...
-							try {
-								// group 2 = x value
-								float x = Float.parseFloat(matcher.group(2));
-
-								// group 3 = y value
-								float y = Float.parseFloat(matcher.group(3));
-
-								// group 4 = p value
-								int p = Integer.parseInt(matcher.group(3));
-
-								position = new SignaturePosition(x, y, p);
-							} catch (NumberFormatException ex) {
-								log.error(
-										"Signature Position read from config failed: Not a valid number", ex); //$NON-NLS-1$
-							}
-						} else if (matcher.group(5) != null) {
-							// we have format auto
-							position = new SignaturePosition();
-						} else if (matcher.group(6) != null) {
-							// we have format x=...;y=...;
-							// group 7 = x value
-							float x = Float.parseFloat(matcher.group(7));
-
-							// group 8 = y value
-							float y = Float.parseFloat(matcher.group(8));
-
-							position = new SignaturePosition(x, y);
-						}
-					} else {
-						log.error("Signature Position read from config failed: wrong group Count!"); //$NON-NLS-1$
-					}
-				} else {
-					log.error("Signature Position read from config failed: not matching string"); //$NON-NLS-1$
-				}
-
-			}
-
-			configManipulator.setDefaultSignaturePosition(position);
-
+			
 		} catch (IOException ex) {
 			throw new InitializationException(
 					"Failed to read configuration from config file", ex); //$NON-NLS-1$
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 1b7ed600..88acc84b 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
@@ -23,9 +23,11 @@ import org.slf4j.LoggerFactory;
 import at.asit.pdfover.gui.MainWindow.Buttons;
 import at.asit.pdfover.gui.MainWindowBehavior;
 import at.asit.pdfover.gui.composites.WaitingComposite;
+import at.asit.pdfover.gui.workflow.ConfigProvider;
 import at.asit.pdfover.gui.workflow.StateMachine;
 import at.asit.pdfover.gui.workflow.Status;
 import at.asit.pdfover.signator.BKUs;
+import at.asit.pdfover.signator.FileNameEmlbem;
 import at.asit.pdfover.signator.PDFFileDocumentSource;
 import at.asit.pdfover.signator.SignatureParameter;
 import at.asit.pdfover.signator.Signer;
@@ -57,6 +59,11 @@ public class PrepareSigningState extends State {
 		@Override
 		public void run() {
 			try {
+				
+				Status status = this.state.stateMachine.getStatus();
+				
+				ConfigProvider configuration = this.state.stateMachine.getConfigProvider();
+				
 				if(this.state.signer == null) {
 					this.state.signer = this.state.stateMachine.getPDFSigner().getPDFSigner();
 				}
@@ -65,12 +72,15 @@ public class PrepareSigningState extends State {
 					this.state.signatureParameter = this.state.signer.newParameter();
 				}
 				
-				this.state.signatureParameter.setInputDocument(new PDFFileDocumentSource(this.state.stateMachine.getStatus().getDocument()));
-				this.state.signatureParameter.setSignatureDevice(this.state.stateMachine.getStatus().getBKU());
-				this.state.signatureParameter.setSignaturePosition(this.state.stateMachine.getStatus().getSignaturePosition());
+				this.state.signatureParameter.setInputDocument(new PDFFileDocumentSource(status.getDocument()));
+				this.state.signatureParameter.setSignatureDevice(status.getBKU());
+				this.state.signatureParameter.setSignaturePosition(status.getSignaturePosition());
 				
 				// TODO: Fill library specific signature Parameters ...
-				// TODO: setEmblem etc.
+				
+				if(configuration.getDefaultEmblem() != null && !configuration.getDefaultEmblem().equals("")) { //$NON-NLS-1$
+					this.state.signatureParameter.setEmblem(new FileNameEmlbem(configuration.getDefaultEmblem()));
+				}
 				
 				this.state.signingState = this.state.signer.prepare(this.state.signatureParameter);
 				
diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/mobilebku/ATrustHelper.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/mobilebku/ATrustHelper.java
index 1ea265ad..a1868462 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/mobilebku/ATrustHelper.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/mobilebku/ATrustHelper.java
@@ -22,7 +22,6 @@ import java.util.regex.Pattern;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import at.asit.pdfover.gui.composites.MobileBKUEnterNumberComposite;
 import at.asit.pdfover.gui.exceptions.InvalidNumberException;
 import at.asit.pdfover.gui.exceptions.InvalidPasswordException;
 import at.asit.pdfover.gui.exceptions.PasswordTooLongException;
diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/mobilebku/MobileBKUStatus.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/mobilebku/MobileBKUStatus.java
index 344eaf58..fe85d492 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/mobilebku/MobileBKUStatus.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/mobilebku/MobileBKUStatus.java
@@ -19,6 +19,8 @@ package at.asit.pdfover.gui.workflow.states.mobilebku;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import at.asit.pdfover.gui.workflow.ConfigProvider;
+
 /**
  * 
  */
@@ -26,16 +28,22 @@ public class MobileBKUStatus {
 	/**
 	 * SLF4J Logger instance
 	 **/
+	@SuppressWarnings("unused")
 	private static final Logger log = LoggerFactory
 			.getLogger(MobileBKUStatus.class);
 
+	/**
+	 * Maximum number of TAN tries!
+	 */
 	public static final int MOBILE_MAX_TAN_TRIES = 3;
 	
 	/**
 	 * Constructor
+	 * @param provider 
 	 */
-	public MobileBKUStatus() {
-		// TODO: Fill number and password with possible config values!
+	public MobileBKUStatus(ConfigProvider provider) {
+		this.setPhoneNumber(provider.getDefaultMobileNumber());
+		this.setMobilePassword(provider.getDefaultPassword());
 	}
 	
 	String viewstate;
@@ -122,7 +130,7 @@ public class MobileBKUStatus {
 	}
 
 	/**
-	 * @param credentialsFormAction the credentialsFormAction to set
+	 * @param baseURL 
 	 */
 	public void setBaseURL(String baseURL) {
 		this.baseURL = baseURL;
diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/mobilebku/PostCredentialsThread.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/mobilebku/PostCredentialsThread.java
index df18c231..bfb6f66a 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/mobilebku/PostCredentialsThread.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/mobilebku/PostCredentialsThread.java
@@ -68,7 +68,7 @@ public class PostCredentialsThread implements Runnable {
 			client.getParams().setParameter("http.useragent", //$NON-NLS-1$
 					LocalBKUState.PDF_OVER_USER_AGENT_STRING);
 			
-			PostMethod method = new PostMethod(status.getBaseURL() + "/identification.aspx?sid=" + status.getSessionID());
+			PostMethod method = new PostMethod(status.getBaseURL() + "/identification.aspx?sid=" + status.getSessionID()); //$NON-NLS-1$
 			
 			method.addParameter("__VIEWSTATE", status.getViewstate()); //$NON-NLS-1$
 			method.addParameter("__EVENTVALIDATION", status.getEventvalidation()); //$NON-NLS-1$
diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/mobilebku/PostSLRequestThread.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/mobilebku/PostSLRequestThread.java
index f8f7eac2..bd2f5b53 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/mobilebku/PostSLRequestThread.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/mobilebku/PostSLRequestThread.java
@@ -70,10 +70,9 @@ public class PostSLRequestThread implements Runnable {
 			client.getParams().setParameter("http.useragent", //$NON-NLS-1$
 					LocalBKUState.PDF_OVER_USER_AGENT_STRING);
 
-			// TODO: move URL to config!!
-			
-			//String url = "https://www.a-trust.at/mobile/https-security-layer-request/default.aspx";
-			String url = "https://test1.a-trust.at/https-security-layer-request/default.aspx";
+			// TODO: move URL to config?		
+			String url = "https://www.a-trust.at/mobile/https-security-layer-request/default.aspx"; //$NON-NLS-1$
+			//String url = "https://test1.a-trust.at/https-security-layer-request/default.aspx";
 			
 			PostMethod method = new PostMethod(url);
 
diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/mobilebku/TrustedSocketFactory.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/mobilebku/TrustedSocketFactory.java
index 5e9d8159..91aa6caa 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/mobilebku/TrustedSocketFactory.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/mobilebku/TrustedSocketFactory.java
@@ -46,7 +46,7 @@ public class TrustedSocketFactory implements ProtocolSocketFactory {
 	private static final Logger log = LoggerFactory
 			.getLogger(TrustedSocketFactory.class);
 
-	private SSLSocketFactory getFactory() throws NoSuchAlgorithmException,
+	private static SSLSocketFactory getFactory() throws NoSuchAlgorithmException,
 			KeyManagementException, Exception {
 		SSLContext sslContext = SSLContext.getInstance("TLS"); //$NON-NLS-1$
 		sslContext.init(null, new TrustManager[] { new ASITTrustManager() },
@@ -71,7 +71,7 @@ public class TrustedSocketFactory implements ProtocolSocketFactory {
 
 			return sslSocket;
 		} catch (Exception ex) {
-			log.error("TrustedSocketFactory: ", ex);
+			log.error("TrustedSocketFactory: ", ex); //$NON-NLS-1$
 			if (ex instanceof IOException) {
 				throw (IOException) ex;
 			} else if (ex instanceof UnknownHostException) {
@@ -99,7 +99,7 @@ public class TrustedSocketFactory implements ProtocolSocketFactory {
 
 			return sslSocket;
 		} catch (Exception ex) {
-			log.error("TrustedSocketFactory: ", ex);
+			log.error("TrustedSocketFactory: ", ex); //$NON-NLS-1$
 			if (ex instanceof IOException) {
 				throw (IOException) ex;
 			} else if (ex instanceof UnknownHostException) {
@@ -144,7 +144,7 @@ public class TrustedSocketFactory implements ProtocolSocketFactory {
 			}
 			return socket;
 		} catch (Exception ex) {
-			log.error("TrustedSocketFactory: ", ex);
+			log.error("TrustedSocketFactory: ", ex); //$NON-NLS-1$
 			if (ex instanceof IOException) {
 				throw (IOException) ex;
 			} else if (ex instanceof UnknownHostException) {