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 eef52fb..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
@@ -17,12 +17,12 @@ public class NavigationItem {
        private NavigationItem parent;
        private final String linkUrl;
 
-       public NavigationItem() {
-               this(Locale.ENG);
-       }
-
        public NavigationItem(final Locale... localeOrder) {
-               this.localeOrder = localeOrder;
+               if (localeOrder.length == 0)
+                       this.localeOrder = new Locale[] { Locale.ENG };
+               else
+                       this.localeOrder = localeOrder;
+
                matchingPattern = null;
                linkUrl = null;
        }
@@ -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;
        }
@@ -82,7 +96,6 @@ public class NavigationItem {
 
        public boolean matchesUrl(final String url) {
                return WildCardMatcher.match(url, matchingPattern);
-
        }
 
        public NavigationItem setPattern(final String pattern) {