projects
/
svjatoslav_commons.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Created dedicated locale configuration handler.
[svjatoslav_commons.git]
/
src
/
main
/
java
/
eu
/
svjatoslav
/
commons
/
network
/
navigation
/
Navigation.java
diff --git
a/src/main/java/eu/svjatoslav/commons/network/navigation/Navigation.java
b/src/main/java/eu/svjatoslav/commons/network/navigation/Navigation.java
index
8b049bb
..
5e605ab
100755
(executable)
--- a/
src/main/java/eu/svjatoslav/commons/network/navigation/Navigation.java
+++ b/
src/main/java/eu/svjatoslav/commons/network/navigation/Navigation.java
@@
-15,7
+15,7
@@
import java.net.URL;
import javax.servlet.http.HttpServletRequest;
import eu.svjatoslav.commons.network.Locale;
import javax.servlet.http.HttpServletRequest;
import eu.svjatoslav.commons.network.Locale;
-import eu.svjatoslav.commons.network.Locale
Helper
;
+import eu.svjatoslav.commons.network.Locale
Configuration
;
public class Navigation {
public class Navigation {
@@
-23,6
+23,12
@@
public class Navigation {
private NavigationItem defaultNavigationItem;
private NavigationItem defaultNavigationItem;
+ private final LocaleConfiguration localeConfiguration;
+
+ public Navigation(final LocaleConfiguration localeConfiguration) {
+ this.localeConfiguration = localeConfiguration;
+ }
+
public NavigationItem getDefaultNavigationItem() {
return defaultNavigationItem;
}
public NavigationItem getDefaultNavigationItem() {
return defaultNavigationItem;
}
@@
-34,6
+40,10
@@
public class Navigation {
return "";
}
return "";
}
+ public LocaleConfiguration getLocaleConfiguration() {
+ return localeConfiguration;
+ }
+
public NavigationItem getRootNavigationItem() {
return rootNavigationItem;
}
public NavigationItem getRootNavigationItem() {
return rootNavigationItem;
}
@@
-59,7
+69,8
@@
public class Navigation {
public String getTopMenu(final HttpServletRequest request) {
public String getTopMenu(final HttpServletRequest request) {
- final Locale currentLocale = LocaleHelper.detectLocale(request);
+ final Locale currentLocale = localeConfiguration
+ .detectCurrentLocale(request);
final NavigationItem selectedItem = getSelectedItem(request);
final StringBuffer result = new StringBuffer();
final NavigationItem selectedItem = getSelectedItem(request);
final StringBuffer result = new StringBuffer();