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
339db68
..
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
@@
-14,16
+14,36
@@
import java.net.URL;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletRequest;
+import eu.svjatoslav.commons.network.Locale;
+import eu.svjatoslav.commons.network.LocaleConfiguration;
+
public class Navigation {
private NavigationItem rootNavigationItem;
private NavigationItem defaultNavigationItem;
public class Navigation {
private NavigationItem rootNavigationItem;
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;
}
+ private String getGetNotNullString(final String string) {
+ if (string != null)
+ return string;
+
+ return "";
+ }
+
+ public LocaleConfiguration getLocaleConfiguration() {
+ return localeConfiguration;
+ }
+
public NavigationItem getRootNavigationItem() {
return rootNavigationItem;
}
public NavigationItem getRootNavigationItem() {
return rootNavigationItem;
}
@@
-49,22
+69,30
@@
public class Navigation {
public String getTopMenu(final HttpServletRequest request) {
public String getTopMenu(final HttpServletRequest 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();
- result.append("<div class=\"navigationMenu\">");
+ result.append("<div class=\""
+ + getGetNotNullString(rootNavigationItem.getCssPrefix())
+ + "navigationMenu\">");
for (final NavigationItem item : getRootNavigationItem()
.getSubElements()) {
if (item == selectedItem)
for (final NavigationItem item : getRootNavigationItem()
.getSubElements()) {
if (item == selectedItem)
- result.append("<a class=\"menuItemSelected\" href=\""
- + item.getLinkUrl() + "\">");
+ result.append("<a class=\""
+ + getGetNotNullString(item.getCssPrefix())
+ + "menuItemSelected\" href=\"" + item.getLinkUrl()
+ + "\">");
else
else
- result.append("<a class=\"menuItem\" href=\""
- + item.getLinkUrl() + "\">");
+ result.append("<a class=\""
+ + getGetNotNullString(item.getCssPrefix())
+ + "menuItem\" href=\"" + item.getLinkUrl() + "\">");
- result.append("<div>" + item.getTitle() + "</div>");
+ result.append("<div>" + item.getTitle(
currentLocale
) + "</div>");
result.append("</a>");
}
result.append("</a>");
}