From 5f27b755cb5ad3ee178102f07b1bca0dd9e8e0d6 Mon Sep 17 00:00:00 2001 From: mcentner Date: Thu, 15 Jul 2010 09:46:21 +0000 Subject: Fixed issue with Accept-Language / locale handling. git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@776 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4 --- .../main/java/at/gv/egiz/bku/online/webapp/MoccaParameterBean.java | 2 +- .../main/java/at/gv/egiz/bku/binding/AbstractBindingProcessor.java | 5 +++++ .../src/main/java/at/gv/egiz/bku/binding/BindingProcessor.java | 7 +++++++ 3 files changed, 13 insertions(+), 1 deletion(-) 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 @@ -60,6 +60,11 @@ public abstract class AbstractBindingProcessor implements BindingProcessor { this.locale = locale; } + @Override + public Locale getLocale() { + return locale; + } + @Override public void init(String id, STAL stal, SLCommandInvoker commandInvoker) { if (id == 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 -- cgit v1.2.3