fixed default locale selection for web navigation

[svjatoslav_commons.git] / src / main / java / eu / svjatoslav / commons / network / navigation / NavigationItem.java

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 c66e22a..6ab67e2 100755 (executable)
--- 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;
@@ -23,7 +23,7 @@ public class NavigationItem {
                else
                        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;
        }
 
 }