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 2a27c5d..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,40 +20,38 @@ import eu.svjatoslav.commons.string.WildCardMatcher;
 public class NavigationItem {
 
        private String matchingPattern;
+
        private final Map<Locale, String> localeToTitle = new HashMap<Locale, String>();
-       final ArrayList<NavigationItem> subElements = new ArrayList<NavigationItem>();
-       final private NavigationItem parent;
-       final private Navigation navigation;
+       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 Navigation navigation) {
+       public NavigationItem(final Navigation<NavigationItem> navigation) {
                this.navigation = navigation;
                parent = null;
                matchingPattern = null;
                linkUrl = null;
        }
 
-       private NavigationItem(final Navigation navigation,
-                       final NavigationItem parent, final String linkUrl,
+       public NavigationItem(final NavigationItem parent, final String linkUrl,
                        final String... titles) {
-               this.navigation = navigation;
+               navigation = parent.getNavigation();
                this.parent = parent;
                this.linkUrl = linkUrl;
                matchingPattern = linkUrl;
 
                initializeLocalizedTitles(titles);
+
+               parent.addNavigationItem(this);
        }
 
-       public NavigationItem addChild(final String linkUrl, final String... titles) {
-               final NavigationItem item = new NavigationItem(navigation, this,
-                               linkUrl, titles);
-               subElements.add(item);
-               return item;
+       public void addNavigationItem(final NavigationItem navigationItem) {
+               subElements.add(navigationItem);
        }
 
        protected String getCssPrefix() {
@@ -84,6 +82,10 @@ public class NavigationItem {
                return null;
        }
 
+       public Navigation<NavigationItem> getNavigation() {
+               return navigation;
+       }
+
        public List<NavigationItem> getSubElements() {
                return subElements;
        }
@@ -93,7 +95,7 @@ public class NavigationItem {
        }
 
        private void initializeLocalizedTitles(final String... titles) {
-               final List<Locale> locales = navigation.getLocaleConfiguration()
+               final List<Locale> locales = getNavigation().getLocaleConfiguration()
                                .getAllowedLocales();
                if (locales.size() != titles.length)
                        throw new RuntimeException("There should be exactly "
@@ -116,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 + "]";
+       }
+
 }