X-Git-Url: http://www2.svjatoslav.eu/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Feu%2Fsvjatoslav%2Fcommons%2Fnetwork%2Fnavigation%2FNavigation.java;h=8b049bbcd4d984286a3496b50cbdf6ba74e3d7a8;hb=aa03fa52face6f13f8da2e9b89e798671653a074;hp=ba6e730acf7c336de4c44d87aaa8d1f01606d671;hpb=b34ba4499cfbca09bc794a810e460bf1c86dcd34;p=svjatoslav_commons.git 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 ba6e730..8b049bb 100755 --- a/src/main/java/eu/svjatoslav/commons/network/navigation/Navigation.java +++ b/src/main/java/eu/svjatoslav/commons/network/navigation/Navigation.java @@ -1,7 +1,7 @@ /* * Svjatoslav Commons - shared library of common functionality. * Copyright ©2012-2014, Svjatoslav Agejenko, svjatoslav@svjatoslav.eu - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of version 3 of the GNU Lesser General Public License * or later as published by the Free Software Foundation. @@ -14,6 +14,9 @@ import java.net.URL; import javax.servlet.http.HttpServletRequest; +import eu.svjatoslav.commons.network.Locale; +import eu.svjatoslav.commons.network.LocaleHelper; + public class Navigation { private NavigationItem rootNavigationItem; @@ -24,6 +27,13 @@ public class Navigation { return defaultNavigationItem; } + private String getGetNotNullString(final String string) { + if (string != null) + return string; + + return ""; + } + public NavigationItem getRootNavigationItem() { return rootNavigationItem; } @@ -49,22 +59,29 @@ public class Navigation { public String getTopMenu(final HttpServletRequest request) { + final Locale currentLocale = LocaleHelper.detectLocale(request); + final NavigationItem selectedItem = getSelectedItem(request); final StringBuffer result = new StringBuffer(); - result.append("