X-Git-Url: http://www2.svjatoslav.eu/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Feu%2Fsvjatoslav%2Fcommons%2Fnetwork%2Fnavigation%2FNavigationItem.java;h=0152c26048acb267367412d3f23f4305191415db;hb=acde4973ab5eb9f8d7ec5ef2cba2d5f3dc6cdb1c;hp=14c8b0ab3f0fa2756f535346c001f0a416e673bc;hpb=aa03fa52face6f13f8da2e9b89e798671653a074;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 14c8b0a..0152c26 100755
--- a/src/main/java/eu/svjatoslav/commons/network/navigation/NavigationItem.java
+++ b/src/main/java/eu/svjatoslav/commons/network/navigation/NavigationItem.java
@@ -14,48 +14,43 @@ 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 {
 
 	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 String linkUrl;
 
+	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<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 +67,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,30 +81,27 @@ 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) {
+	public String getTitle(final String locale) {
 		return localeToTitle.get(locale);
 	}
 
 	private void initializeLocalizedTitles(final String... titles) {
-		final Locale[] locales = getLocaleOrder();
-		if (locales.length != titles.length)
+		final List<String> 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 +117,12 @@ public class NavigationItem {
 		return this;
 	}
 
+	@Override
+	public String toString() {
+		return "NavigationItem [matchingPattern=" + matchingPattern
+				+ ", localeToTitle=" + localeToTitle + ", subElements count="
+				+ subElements.size() + ", linkUrl=" + linkUrl + ", cssPrefix="
+				+ cssPrefix + "]";
+	}
+
 }