improved 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 57a7649..661ed3f 100755 (executable)
--- a/src/main/java/eu/svjatoslav/commons/network/navigation/NavigationItem.java
+++ b/src/main/java/eu/svjatoslav/commons/network/navigation/NavigationItem.java
@@ -14,32 +14,34 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import eu.svjatoslav.commons.network.Locale;
 import eu.svjatoslav.commons.string.WildCardMatcher;
 
 public class NavigationItem {
 
        private String matchingPattern;
 
-       private final Map<Locale, String> localeToTitle = new HashMap<Locale, String>();
+       private final Map<String, String> localeToTitle = new HashMap<String, String>();
        private final ArrayList<NavigationItem> subElements = new ArrayList<NavigationItem>();
        private final NavigationItem parent;
-       private final Navigation<NavigationItem> navigation;
+       private final Navigation<? extends NavigationItem> navigation;
        private final String linkUrl;
        /**
         * CSS prefix is inherited to child menu items.
         */
        private String cssPrefix;
 
-       public NavigationItem(final Navigation<NavigationItem> navigation) {
+       /**
+        * Used to build root navigation item.
+        */
+       public NavigationItem(final Navigation<? extends NavigationItem> navigation) {
                this.navigation = navigation;
                parent = null;
                matchingPattern = null;
                linkUrl = null;
        }
 
-       public NavigationItem(final NavigationItem parent, final String linkUrl,
-                       final String... titles) {
+       public NavigationItem(final NavigationItem parent, final String linkUrl, final String... titles) {
+
                navigation = parent.getNavigation();
                this.parent = parent;
                this.linkUrl = linkUrl;
@@ -73,8 +75,7 @@ public class NavigationItem {
                        return this;
 
                for (final NavigationItem childNavigationItem : subElements) {
-                       final NavigationItem match = childNavigationItem
-                                       .getMatchingNavigationItem(requestPath);
+                       final NavigationItem match = childNavigationItem.getMatchingNavigationItem(requestPath);
 
                        if (match != null)
                                return match;
@@ -82,7 +83,7 @@ public class NavigationItem {
                return null;
        }
 
-       public Navigation<NavigationItem> getNavigation() {
+       public Navigation<? extends NavigationItem> getNavigation() {
                return navigation;
        }
 
@@ -90,16 +91,14 @@ public class NavigationItem {
                return subElements;
        }
 
-       public String getTitle(final Locale locale) {
+       public String getTitle(final String locale) {
                return localeToTitle.get(locale);
        }
 
        private void initializeLocalizedTitles(final String... titles) {
-               final List<Locale> locales = getNavigation().getLocaleConfiguration()
-                               .getAllowedLocales();
+               final List<String> locales = getNavigation().getLocaleConfiguration().getAllowedLocales();
                if (locales.size() != titles.length)
-                       throw new RuntimeException("There should be exactly "
-                                       + locales.size() + " title(s).");
+                       throw new RuntimeException("There should be exactly " + locales.size() + " title(s).");
 
                for (int i = 0; i < titles.length; i++)
                        localeToTitle.put(locales.get(i), titles[i]);
@@ -120,10 +119,9 @@ public class NavigationItem {
 
        @Override
        public String toString() {
-               return "NavigationItem [matchingPattern=" + matchingPattern
-                               + ", localeToTitle=" + localeToTitle + ", subElements count="
-                               + subElements.size() + ", linkUrl=" + linkUrl + ", cssPrefix="
-                               + cssPrefix + "]";
+               return "NavigationItem [matchingPattern=" + matchingPattern + ", localeToTitle=" + localeToTitle
+                               + ", subElements count=" + subElements.size() + ", linkUrl=" + linkUrl + ", cssPrefix=" + cssPrefix
+                               + "]";
        }
 
 }