X-Git-Url: http://www2.svjatoslav.eu/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Feu%2Fsvjatoslav%2Fcommons%2Fnetwork%2Fnavigation%2FNavigation.java;h=408372a21e89e97e9cc4407fd697aa5647f04619;hb=a2b2acd6d8c6a73c0897a2002a313266b1b74872;hp=3a07bbd0f0e546d1df58309c48884b44e9d62065;hpb=353dd52db19c34c96af42cb1b3fd01055d66d4cc;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 3a07bbd..408372a 100755
--- 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,14 +19,17 @@ 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();
 
-			for (final NavigationItem item : rootNavigationItem.subElements)
-				if (item.matchesUrl(requestPath))
-					return item;
+			final NavigationItem match = rootNavigationItem
+					.getMatchingNavigationItem(requestPath);
+
+			if (match != null)
+				return match;
 		} catch (final MalformedURLException e) {
 			System.out.println("Cannot handle URL: " + requestUrl);
 			e.printStackTrace();
@@ -33,23 +38,24 @@ 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\">");
 
-		for (final NavigationItem item : rootNavigationItem.getSubElements()) {
+		for (final NavigationItem item : getRootNavigationItem()
+				.getSubElements()) {
 
 			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(item.getTitle());
+			result.append("<div>" + item.getTitle() + "</div>");
 			result.append("</a>");
 		}