check matching navigation items recursively

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

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 1afd5c7..408372a 100755 (executable)
--- a/src/main/java/eu/svjatoslav/commons/network/navigation/Navigation.java
+++ b/src/main/java/eu/svjatoslav/commons/network/navigation/Navigation.java
@@ -25,9 +25,11 @@ public class Navigation {
                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();