simplification of NavigationItem

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 76a7d07..d95ba4f 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,21 +17,21 @@ import java.util.Map;
 import eu.svjatoslav.commons.network.Locale;
 import eu.svjatoslav.commons.string.WildCardMatcher;
 
 import eu.svjatoslav.commons.network.Locale;
 import eu.svjatoslav.commons.string.WildCardMatcher;
 

-public class NavigationItem<NI extends NavigationItem, N extends Navigation> {
+public class NavigationItem<NI extends NavigationItem> {

 
        private String matchingPattern;
 
        private final Map<Locale, String> localeToTitle = new HashMap<Locale, String>();
        private final ArrayList<NI> subElements = new ArrayList<NI>();
        private final NI parent;
 
        private String matchingPattern;
 
        private final Map<Locale, String> localeToTitle = new HashMap<Locale, String>();
        private final ArrayList<NI> subElements = new ArrayList<NI>();
        private final NI parent;

-       private final N navigation;
+       private final Navigation<NI> navigation;

        private final String linkUrl;
        /**
         * CSS prefix is inherited to child menu items.
         */
        private String cssPrefix;
 
        private final String linkUrl;
        /**
         * CSS prefix is inherited to child menu items.
         */
        private String cssPrefix;
 

-       public NavigationItem(final N navigation) {
+       public NavigationItem(final Navigation<NI> navigation) {

                this.navigation = navigation;
                parent = null;
                matchingPattern = null;
                this.navigation = navigation;
                parent = null;
                matchingPattern = null;


@@ -40,7 +40,7 @@ public class NavigationItem<NI extends NavigationItem, N extends Navigation> {
 
        public NavigationItem(final NI parent, final String linkUrl,
                        final String... titles) {
 
        public NavigationItem(final NI parent, final String linkUrl,
                        final String... titles) {

-               this.navigation = (N) parent.getNavigation();
+               this.navigation = parent.getNavigation();

                this.parent = parent;
                this.linkUrl = linkUrl;
                matchingPattern = linkUrl;
                this.parent = parent;
                this.linkUrl = linkUrl;
                matchingPattern = linkUrl;


@@ -82,7 +82,7 @@ public class NavigationItem<NI extends NavigationItem, N extends Navigation> {
                return null;
        }
 
                return null;
        }
 

-       public N getNavigation() {
+       public Navigation<NI> getNavigation() {

                return navigation;
        }
 
                return navigation;
        }