X-Git-Url: http://www2.svjatoslav.eu/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Feu%2Fsvjatoslav%2Fcommons%2Fnetwork%2Fnavigation%2FNavigation.java;h=3a2877f4b9182f66b2b19fc4a5e9a2f96a7adef6;hb=e49d583cb64523c584cd848c8a421140c5193514;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..3a2877f 100755 --- a/src/main/java/eu/svjatoslav/commons/network/navigation/Navigation.java +++ b/src/main/java/eu/svjatoslav/commons/network/navigation/Navigation.java @@ -1,8 +1,19 @@ +/* + * 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. + */ + 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; @@ -13,18 +24,28 @@ public class Navigation { return defaultNavigationItem; } + private String getGetNotNullString(final String string) { + if (string != null) + return string; + + return ""; + } + public NavigationItem getRootNavigationItem() { 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 +54,29 @@ 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("