+ Signature block language configuration

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

6 files changed, 87 insertions, 0 deletions

diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/ConfigManipulator.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/ConfigManipulator.java
index c5f0b930..02633774 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/ConfigManipulator.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/ConfigManipulator.java
@@ -80,6 +80,11 @@ public interface ConfigManipulator {
 	public static final String LOCALE_CONFIG = "LOCALE"; //$NON-NLS-1$
 	
 	/**
+	 * The locale config parameter
+	 */
+	public static final String SIGN_LOCALE_CONFIG = "SIGNLOCALE"; //$NON-NLS-1$
+	
+	/**
 	 * The proxy host config parameter
 	 */
 	public static final String PROXY_HOST_CONFIG = "PROXY_HOST"; //$NON-NLS-1$
@@ -175,4 +180,10 @@ public interface ConfigManipulator {
 	 * @param locale the locale
 	 */
 	public void setLocale(Locale locale);
+	
+	/**
+	 * Sets the locale to be used!
+	 * @param locale the locale
+	 */
+	public void setSignLocale(Locale locale);
 }
diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/ConfigProvider.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/ConfigProvider.java
index f0b53cbf..af3e3b05 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/ConfigProvider.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/ConfigProvider.java
@@ -117,6 +117,12 @@ public interface ConfigProvider {
 	public Locale getConfigLocale();
 	
 	/**
+	 * Gets the configured locale
+	 * @return the configured locale
+	 */
+	public Locale getSignLocale();
+	
+	/**
 	 * Loads the current configuration to the current configuration file
 	 * @param configSource 
 	 * @throws IOException 
diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/ConfigProviderImpl.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/ConfigProviderImpl.java
index e0b8872b..ccfae554 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/ConfigProviderImpl.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/ConfigProviderImpl.java
@@ -67,6 +67,7 @@ public class ConfigProviderImpl implements ConfigProvider, ConfigManipulator {
 	private String defaultPassword = STRING_EMPTY;
 
 	private Locale locale = Locale.getDefault();
+	private Locale signLocale = Locale.getDefault();
 	
 	private String emblem = STRING_EMPTY;
 
@@ -371,6 +372,11 @@ public class ConfigProviderImpl implements ConfigProvider, ConfigManipulator {
 			props.setProperty(LOCALE_CONFIG, LocaleSerializer.getParsableString(configLocale));
 		}
 		
+		Locale signLocale = this.getSignLocale();
+		if(signLocale != null) {
+			props.setProperty(SIGN_LOCALE_CONFIG, LocaleSerializer.getParsableString(signLocale));
+		}
+		
 		SignaturePosition pos = this.getDefaultSignaturePosition();
 
 		if (pos == null) {
@@ -431,6 +437,13 @@ public class ConfigProviderImpl implements ConfigProvider, ConfigManipulator {
 		if(targetLocale != null) {
 			this.setLocale(targetLocale);
 		}
+		
+		String signlocalString = config.getProperty(ConfigManipulator.SIGN_LOCALE_CONFIG);
+		
+		Locale signtargetLocale = LocaleSerializer.parseFromString(signlocalString);
+		if(signtargetLocale != null) {
+			this.setSignLocale(signtargetLocale);
+		}
  		
 		String bku = config
 				.getProperty(ConfigManipulator.MOBILE_BKU_URL_CONFIG);
@@ -588,4 +601,24 @@ public class ConfigProviderImpl implements ConfigProvider, ConfigManipulator {
 		}
 	}
 
+	/* (non-Javadoc)
+	 * @see at.asit.pdfover.gui.workflow.ConfigManipulator#setSignLocale(java.util.Locale)
+	 */
+	@Override
+	public void setSignLocale(Locale locale) {
+		if(locale == null) {
+			this.signLocale = Locale.getDefault();
+		} else {
+			this.signLocale = locale;
+		}
+	}
+
+	/* (non-Javadoc)
+	 * @see at.asit.pdfover.gui.workflow.ConfigProvider#getSignLocale()
+	 */
+	@Override
+	public Locale getSignLocale() {
+		return this.signLocale;
+	}
+
 }
diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/ConfigurationContainer.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/ConfigurationContainer.java
index 9d4d2ccc..b9c80f6b 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/ConfigurationContainer.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/ConfigurationContainer.java
@@ -155,4 +155,16 @@ public interface ConfigurationContainer {
 	 * @return the locale
 	 */
 	public Locale getLocale();
+	
+	/**
+	 * Sets the locale
+	 * @param locale the locale
+	 */
+	public void setSignLocale(Locale locale);
+	
+	/**
+	 * Gets the locale
+	 * @return the locale
+	 */
+	public Locale getSignLocale();
 }
diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/ConfigurationContainerImpl.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/ConfigurationContainerImpl.java
index b5565963..1e8db610 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/ConfigurationContainerImpl.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/ConfigurationContainerImpl.java
@@ -75,6 +75,11 @@ public class ConfigurationContainerImpl implements ConfigurationContainer {
 	protected Locale locale = null;
 	
 	/**
+	 * Holds the locale
+	 */
+	protected Locale signLocale = null;
+	
+	/**
 	 * Holds the output folder
 	 */
 	protected String folder = null;
@@ -303,5 +308,23 @@ public class ConfigurationContainerImpl implements ConfigurationContainer {
 	public Locale getLocale() {
 		return this.locale;
 	}
+
+
+	/* (non-Javadoc)
+	 * @see at.asit.pdfover.gui.workflow.ConfigurationContainer#setSignLocale(java.util.Locale)
+	 */
+	@Override
+	public void setSignLocale(Locale locale) {
+		this.signLocale = locale;
+	}
+
+
+	/* (non-Javadoc)
+	 * @see at.asit.pdfover.gui.workflow.ConfigurationContainer#getSignLocale()
+	 */
+	@Override
+	public Locale getSignLocale() {
+		return this.signLocale;
+	}
 	
 }
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 4a097e8f..e3fac772 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
@@ -101,6 +101,8 @@ public class PrepareSigningState extends State {
 					this.state.signatureParameter.setProperty("SIG_NOTE", configuration.getSigantureNote()); //$NON-NLS-1$
 				}
 				
+				this.state.signatureParameter.setSignatureLanguage(configuration.getSignLocale().getLanguage());
+				
 				this.state.signingState = this.state.signer.prepare(this.state.signatureParameter);
 				
 			} catch (Exception e) {