X-Git-Url: http://www2.svjatoslav.eu/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Feu%2Fsvjatoslav%2Fcommons%2Fnetwork%2Fnavigation%2FNavigationItem.java;h=57a7649df57ab33458ab99125d3efa922f7eae02;hb=2212fc002e4e8602550372a3115c2c1469be0729;hp=22ba6b046b558268711be58816e40f868cbfeec9;hpb=e49d583cb64523c584cd848c8a421140c5193514;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 22ba6b0..57a7649 100755
--- a/src/main/java/eu/svjatoslav/commons/network/navigation/NavigationItem.java
+++ b/src/main/java/eu/svjatoslav/commons/network/navigation/NavigationItem.java
@@ -20,42 +20,38 @@ 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 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 +68,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,15 +82,12 @@ 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("there shall be exactly one title");
-
-		return localeToTitle.values().iterator().next();
+	public List<NavigationItem> getSubElements() {
+		return subElements;
 	}
 
 	public String getTitle(final Locale locale) {
@@ -109,13 +95,14 @@ public class NavigationItem {
 	}
 
 	private void initializeLocalizedTitles(final String... titles) {
-		final Locale[] locales = getLocaleOrder();
-		if (locales.length != titles.length)
+		final List<Locale> 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) {
@@ -131,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 + "]";
+	}
+
 }