refactored navigation logic to be more fool-proof

[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 42720c9..1afd5c7 100755 (executable)
--- a/src/main/java/eu/svjatoslav/commons/network/navigation/Navigation.java
+++ b/src/main/java/eu/svjatoslav/commons/network/navigation/Navigation.java
@@ -3,6 +3,8 @@ package eu.svjatoslav.commons.network.navigation;
 import java.net.MalformedURLException;
 import java.net.URL;
 
+import javax.servlet.http.HttpServletRequest;
+
 public class Navigation {
 
        private NavigationItem rootNavigationItem;
@@ -17,7 +19,8 @@ public class Navigation {
                return rootNavigationItem;
        }
 
-       public NavigationItem getSelectedItem(final String requestUrl) {
+       public NavigationItem getSelectedItem(final HttpServletRequest request) {
+               final String requestUrl = request.getRequestURL().toString();
 
                try {
                        final String requestPath = new URL(requestUrl).getPath();
@@ -33,9 +36,9 @@ public class Navigation {
                return getDefaultNavigationItem();
        }
 
-       public String getTopMenu(final String requestUrl) {
+       public String getTopMenu(final HttpServletRequest request) {
 
-               final NavigationItem selectedItem = getSelectedItem(requestUrl);
+               final NavigationItem selectedItem = getSelectedItem(request);
                final StringBuffer result = new StringBuffer();
 
                result.append("<div class=\"navigationMenu\">");
@@ -45,10 +48,10 @@ public class Navigation {
 
                        if (item == selectedItem)
                                result.append("<a class=\"menuItemSelected\" href=\""
-                                               + item.getLink() + "\">");
+                                               + item.getLinkUrl() + "\">");
                        else
-                               result.append("<a class=\"menuItem\" href=\"" + item.getLink()
-                                               + "\">");
+                               result.append("<a class=\"menuItem\" href=\""
+                                               + item.getLinkUrl() + "\">");
 
                        result.append("<div>" + item.getTitle() + "</div>");
                        result.append("</a>");