slightly more type-safe and extending friendly navigation

[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 1bdf378..6ef5e68 100755 (executable)
--- a/src/main/java/eu/svjatoslav/commons/network/navigation/Navigation.java
+++ b/src/main/java/eu/svjatoslav/commons/network/navigation/Navigation.java
@@ -11,17 +11,18 @@ package eu.svjatoslav.commons.network.navigation;
 
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.util.List;
 
 import javax.servlet.http.HttpServletRequest;
 
 import eu.svjatoslav.commons.network.Locale;
 import eu.svjatoslav.commons.network.LocaleConfiguration;
 
-public class Navigation {
+public class Navigation<NI extends NavigationItem> {
 
-       private NavigationItem rootNavigationItem;
+       private NI rootNavigationItem;
 
-       private NavigationItem defaultNavigationItem;
+       private NI defaultNavigationItem;
 
        protected final LocaleConfiguration localeConfiguration;
 
@@ -29,7 +30,7 @@ public class Navigation {
                this.localeConfiguration = localeConfiguration;
        }
 
-       public NavigationItem getDefaultNavigationItem() {
+       public NI getDefaultNavigationItem() {
                return defaultNavigationItem;
        }
 
@@ -44,17 +45,17 @@ public class Navigation {
                return localeConfiguration;
        }
 
-       public NavigationItem getRootNavigationItem() {
+       public NI getRootNavigationItem() {
                return rootNavigationItem;
        }
 
-       public NavigationItem getSelectedItem(final HttpServletRequest request) {
+       public NI getSelectedItem(final HttpServletRequest request) {
                final String requestUrl = request.getRequestURL().toString();
 
                try {
                        final String requestPath = new URL(requestUrl).getPath();
 
-                       final NavigationItem match = rootNavigationItem
+                       final NI match = (NI) rootNavigationItem
                                        .getMatchingNavigationItem(requestPath);
 
                        if (match != null)
@@ -72,14 +73,14 @@ public class Navigation {
                final Locale currentLocale = localeConfiguration
                                .detectCurrentLocale(request);
 
-               final NavigationItem selectedItem = getSelectedItem(request);
+               final NI selectedItem = getSelectedItem(request);
                final StringBuffer result = new StringBuffer();
 
                result.append("<div class=\""
                                + getGetNotNullString(rootNavigationItem.getCssPrefix())
                                + "navigationMenu\">");
 
-               for (final NavigationItem item : getRootNavigationItem()
+               for (final NI item : (List<NI>) getRootNavigationItem()
                                .getSubElements()) {
 
                        if (item == selectedItem)
@@ -101,14 +102,12 @@ public class Navigation {
                return result.toString();
        }
 
-       public NavigationItem setDefaultNavigationItem(
-                       final NavigationItem defaultNavigationItem) {
+       public NI setDefaultNavigationItem(final NI defaultNavigationItem) {
                this.defaultNavigationItem = defaultNavigationItem;
                return defaultNavigationItem;
        }
 
-       public NavigationItem setRootNavigationItem(
-                       final NavigationItem rootNavigationItem) {
+       public NI setRootNavigationItem(final NI rootNavigationItem) {
                this.rootNavigationItem = rootNavigationItem;
                return rootNavigationItem;
        }