X-Git-Url: http://www2.svjatoslav.eu/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Feu%2Fsvjatoslav%2Fcommons%2Fnetwork%2Fnavigation%2FNavigationItem.java;h=661ed3f96c575fc57837c83b738ff66f8c254074;hb=b7ff4e43cfb83aabfd5cde8ac37e5115938b2c51;hp=d95ba4f7edf4242ae380907fb8cc5ba9538a46f7;hpb=f40003a9a809dc463492098357fac433154d1503;p=svjatoslav_commons.git

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 d95ba4f..661ed3f 100755
--- a/src/main/java/eu/svjatoslav/commons/network/navigation/NavigationItem.java
+++ b/src/main/java/eu/svjatoslav/commons/network/navigation/NavigationItem.java
@@ -14,33 +14,35 @@ 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<NI extends NavigationItem> {
+public class 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 final Navigation<NI> navigation;
+	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<? extends NavigationItem> navigation;
 	private final String linkUrl;
 	/**
 	 * CSS prefix is inherited to child menu items.
 	 */
 	private String cssPrefix;
 
-	public NavigationItem(final Navigation<NI> 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 NI parent, final String linkUrl,
-			final String... titles) {
-		this.navigation = parent.getNavigation();
+	public NavigationItem(final NavigationItem parent, final String linkUrl, final String... titles) {
+
+		navigation = parent.getNavigation();
 		this.parent = parent;
 		this.linkUrl = linkUrl;
 		matchingPattern = linkUrl;
@@ -50,7 +52,7 @@ public class NavigationItem<NI extends NavigationItem> {
 		parent.addNavigationItem(this);
 	}
 
-	public void addNavigationItem(final NI navigationItem) {
+	public void addNavigationItem(final NavigationItem navigationItem) {
 		subElements.add(navigationItem);
 	}
 
@@ -68,13 +70,12 @@ public class NavigationItem<NI extends NavigationItem> {
 		return linkUrl;
 	}
 
-	NI getMatchingNavigationItem(final String requestPath) {
+	NavigationItem getMatchingNavigationItem(final String requestPath) {
 		if (matchesUrl(requestPath))
-			return (NI) this;
+			return this;
 
-		for (final NI childNavigationItem : subElements) {
-			final NI match = (NI) childNavigationItem
-					.getMatchingNavigationItem(requestPath);
+		for (final NavigationItem childNavigationItem : subElements) {
+			final NavigationItem match = childNavigationItem.getMatchingNavigationItem(requestPath);
 
 			if (match != null)
 				return match;
@@ -82,24 +83,22 @@ public class NavigationItem<NI extends NavigationItem> {
 		return null;
 	}
 
-	public Navigation<NI> getNavigation() {
+	public Navigation<? extends NavigationItem> getNavigation() {
 		return navigation;
 	}
 
-	public List<NI> getSubElements() {
+	public List<NavigationItem> getSubElements() {
 		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<NI extends 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
+				+ "]";
 	}
 
 }