summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormcentner <mcentner@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>2010-07-15 09:46:21 +0000
committermcentner <mcentner@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>2010-07-15 09:46:21 +0000
commit5f27b755cb5ad3ee178102f07b1bca0dd9e8e0d6 (patch)
tree193d0a1f81e27772eecfecb2d2e671ef8a04f540
parentf75a0d8169fb4d684efdaebe7aceeb217bbe9462 (diff)
downloadmocca-5f27b755cb5ad3ee178102f07b1bca0dd9e8e0d6.tar.gz
mocca-5f27b755cb5ad3ee178102f07b1bca0dd9e8e0d6.tar.bz2
mocca-5f27b755cb5ad3ee178102f07b1bca0dd9e8e0d6.zip
Fixed issue with Accept-Language / locale handling.
git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@776 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
-rw-r--r--BKUOnline/src/main/java/at/gv/egiz/bku/online/webapp/MoccaParameterBean.java2
-rw-r--r--bkucommon/src/main/java/at/gv/egiz/bku/binding/AbstractBindingProcessor.java5
-rw-r--r--bkucommon/src/main/java/at/gv/egiz/bku/binding/BindingProcessor.java7
3 files changed, 13 insertions, 1 deletions
diff --git a/BKUOnline/src/main/java/at/gv/egiz/bku/online/webapp/MoccaParameterBean.java b/BKUOnline/src/main/java/at/gv/egiz/bku/online/webapp/MoccaParameterBean.java
index 0d2f847e..41e08b89 100644
--- a/BKUOnline/src/main/java/at/gv/egiz/bku/online/webapp/MoccaParameterBean.java
+++ b/BKUOnline/src/main/java/at/gv/egiz/bku/online/webapp/MoccaParameterBean.java
@@ -172,7 +172,7 @@ public class MoccaParameterBean {
+ "='{}' is not a valid locale definition.", locale);
}
}
- return null;
+ return bindingProcessor.getLocale();
}
public Integer getInteger(String parameterName) {
diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/binding/AbstractBindingProcessor.java b/bkucommon/src/main/java/at/gv/egiz/bku/binding/AbstractBindingProcessor.java
index 5201e817..904629a9 100644
--- a/bkucommon/src/main/java/at/gv/egiz/bku/binding/AbstractBindingProcessor.java
+++ b/bkucommon/src/main/java/at/gv/egiz/bku/binding/AbstractBindingProcessor.java
@@ -61,6 +61,11 @@ public abstract class AbstractBindingProcessor implements BindingProcessor {
}
@Override
+ public Locale getLocale() {
+ return locale;
+ }
+
+ @Override
public void init(String id, STAL stal, SLCommandInvoker commandInvoker) {
if (id == null) {
throw new NullPointerException("Id must not be null.");
diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/binding/BindingProcessor.java b/bkucommon/src/main/java/at/gv/egiz/bku/binding/BindingProcessor.java
index 148fe296..e8a7a7b1 100644
--- a/bkucommon/src/main/java/at/gv/egiz/bku/binding/BindingProcessor.java
+++ b/bkucommon/src/main/java/at/gv/egiz/bku/binding/BindingProcessor.java
@@ -53,6 +53,13 @@ public interface BindingProcessor extends Runnable {
* must not be null.
*/
public void setLocale(Locale locale);
+
+ /**
+ * Returns the locale used for user interaction.
+ *
+ * @return the locale used for user interaction
+ */
+ public Locale getLocale();
/**
* Instructs this BindingProcessor to consume the request