further generics simplifications

[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 14c8b0a..57a7649 100755 (executable)
--- a/src/main/java/eu/svjatoslav/commons/network/navigation/NavigationItem.java
+++ b/src/main/java/eu/svjatoslav/commons/network/navigation/NavigationItem.java
@@ -20,42 +20,38 @@ import eu.svjatoslav.commons.string.WildCardMatcher;
 public class NavigationItem {
 
        private String matchingPattern;
+
        private final Map<Locale, String> localeToTitle = new HashMap<Locale, String>();
-       ArrayList<NavigationItem> subElements = new ArrayList<NavigationItem>();
-       private Locale[] localeOrder;
-       private NavigationItem parent;
+       private final ArrayList<NavigationItem> subElements = new ArrayList<NavigationItem>();
+       private final NavigationItem parent;
+       private final Navigation<NavigationItem> navigation;
        private final String linkUrl;
-
        /**
         * CSS prefix is inherited to child menu items.
         */
        private String cssPrefix;
 
-       public NavigationItem(final Locale... localeOrder) {
-               if (localeOrder.length == 0)
-                       this.localeOrder = new Locale[] { Locale.ENG };
-               else
-                       this.localeOrder = localeOrder;
-
+       public NavigationItem(final Navigation<NavigationItem> navigation) {
+               this.navigation = navigation;
+               parent = null;
                matchingPattern = null;
                linkUrl = null;
        }
 
        public NavigationItem(final NavigationItem parent, final String linkUrl,
                        final String... titles) {
+               navigation = parent.getNavigation();
                this.parent = parent;
                this.linkUrl = linkUrl;
                matchingPattern = linkUrl;
 
                initializeLocalizedTitles(titles);
-       }
 
-       public NavigationItem addChild(final String linkUrl, final String... titles) {
-
-               final NavigationItem item = new NavigationItem(this, linkUrl, titles);
-               subElements.add(item);
+               parent.addNavigationItem(this);
+       }
 
-               return item;
+       public void addNavigationItem(final NavigationItem navigationItem) {
+               subElements.add(navigationItem);
        }
 
        protected String getCssPrefix() {
@@ -72,13 +68,6 @@ public class NavigationItem {
                return linkUrl;
        }
 
-       public Locale[] getLocaleOrder() {
-               if (localeOrder != null)
-                       return localeOrder;
-
-               return parent.getLocaleOrder();
-       }
-
        NavigationItem getMatchingNavigationItem(final String requestPath) {
                if (matchesUrl(requestPath))
                        return this;
@@ -93,16 +82,12 @@ public class NavigationItem {
                return null;
        }
 
-       public List<NavigationItem> getSubElements() {
-               return subElements;
+       public Navigation<NavigationItem> getNavigation() {
+               return navigation;
        }
 
-       public String getTitle() {
-               if (localeToTitle.size() != 1)
-                       throw new RuntimeException(
-                                       "NavigationItem.getTitle() was called without locale parameter, but there there are multiple titles in diffirent locales available.");
-
-               return localeToTitle.values().iterator().next();
+       public List<NavigationItem> getSubElements() {
+               return subElements;
        }
 
        public String getTitle(final Locale locale) {
@@ -110,13 +95,14 @@ public class NavigationItem {
        }
 
        private void initializeLocalizedTitles(final String... titles) {
-               final Locale[] locales = getLocaleOrder();
-               if (locales.length != titles.length)
+               final List<Locale> locales = getNavigation().getLocaleConfiguration()
+                               .getAllowedLocales();
+               if (locales.size() != titles.length)
                        throw new RuntimeException("There should be exactly "
-                                       + locales.length + " title(s).");
+                                       + locales.size() + " title(s).");
 
                for (int i = 0; i < titles.length; i++)
-                       localeToTitle.put(locales[i], titles[i]);
+                       localeToTitle.put(locales.get(i), titles[i]);
        }
 
        public boolean matchesUrl(final String url) {
@@ -132,4 +118,12 @@ public class NavigationItem {
                return this;
        }
 
+       @Override
+       public String toString() {
+               return "NavigationItem [matchingPattern=" + matchingPattern
+                               + ", localeToTitle=" + localeToTitle + ", subElements count="
+                               + subElements.size() + ", linkUrl=" + linkUrl + ", cssPrefix="
+                               + cssPrefix + "]";
+       }
+
 }