X-Git-Url: http://www2.svjatoslav.eu/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Feu%2Fsvjatoslav%2Fcommons%2Fnetwork%2Fnavigation%2FNavigationItem.java;h=a9ad856d2904f036c9a1411d34215b96c10b837a;hb=a2b2acd6d8c6a73c0897a2002a313266b1b74872;hp=4e58e44188e88518b2176958bf9bc88eb5132472;hpb=a4f12f310bcce98e7ee70fe57249c141ffba0023;p=svjatoslav_commons.git

diff --git a/src/main/java/eu/svjatoslav/commons/network/navigation/NavigationItem.java b/src/main/java/eu/svjatoslav/commons/network/navigation/NavigationItem.java
index 4e58e44..a9ad856 100755
--- a/src/main/java/eu/svjatoslav/commons/network/navigation/NavigationItem.java
+++ b/src/main/java/eu/svjatoslav/commons/network/navigation/NavigationItem.java
@@ -10,7 +10,7 @@ import eu.svjatoslav.commons.string.WildCardMatcher;
 
 public class NavigationItem {
 
-	private final String matchingWildcard;
+	private String matchingPattern;
 	private final Map<Locale, String> localeToTitle = new HashMap<Locale, String>();
 	ArrayList<NavigationItem> subElements = new ArrayList<NavigationItem>();
 	private Locale[] localeOrder;
@@ -18,12 +18,12 @@ public class NavigationItem {
 	private final String linkUrl;
 
 	public NavigationItem() {
-		this(new Locale[] { Locale.ENG });
+		this(Locale.ENG);
 	}
 
 	public NavigationItem(final Locale... localeOrder) {
 		this.localeOrder = localeOrder;
-		matchingWildcard = null;
+		matchingPattern = null;
 		linkUrl = null;
 	}
 
@@ -31,7 +31,7 @@ public class NavigationItem {
 			final String... titles) {
 		this.parent = parent;
 		this.linkUrl = linkUrl;
-		matchingWildcard = linkUrl;
+		matchingPattern = linkUrl;
 
 		initializeLocalizedTitles(titles);
 	}
@@ -55,6 +55,20 @@ public class NavigationItem {
 		return parent.getLocaleOrder();
 	}
 
+	NavigationItem getMatchingNavigationItem(final String requestPath) {
+		if (matchesUrl(requestPath))
+			return this;
+
+		for (final NavigationItem childNavigationItem : subElements) {
+			final NavigationItem match = childNavigationItem
+					.getMatchingNavigationItem(requestPath);
+
+			if (match != null)
+				return match;
+		}
+		return null;
+	}
+
 	public List<NavigationItem> getSubElements() {
 		return subElements;
 	}
@@ -81,8 +95,12 @@ public class NavigationItem {
 	}
 
 	public boolean matchesUrl(final String url) {
-		return WildCardMatcher.match(url, matchingWildcard);
+		return WildCardMatcher.match(url, matchingPattern);
+	}
 
+	public NavigationItem setPattern(final String pattern) {
+		matchingPattern = pattern;
+		return this;
 	}
 
 }