X-Git-Url: http://www2.svjatoslav.eu/gitweb/?p=svjatoslav_commons.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Feu%2Fsvjatoslav%2Fcommons%2Fnetwork%2Fnavigation%2FNavigationItem.java;h=2a27c5d4ac26238dbede7f5879549ba14fc6ef47;hp=14c8b0ab3f0fa2756f535346c001f0a416e673bc;hb=869bf9eeef97f5364d46b76f64c94cec67846c28;hpb=aa03fa52face6f13f8da2e9b89e798671653a074

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..2a27c5d 100755
--- a/src/main/java/eu/svjatoslav/commons/network/navigation/NavigationItem.java
+++ b/src/main/java/eu/svjatoslav/commons/network/navigation/NavigationItem.java
@@ -21,9 +21,9 @@ 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;
+	final ArrayList<NavigationItem> subElements = new ArrayList<NavigationItem>();
+	final private NavigationItem parent;
+	final private Navigation navigation;
 	private final String linkUrl;
 
 	/**
@@ -31,18 +31,17 @@ public class NavigationItem {
 	 */
 	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 navigation) {
+		this.navigation = navigation;
+		parent = null;
 		matchingPattern = null;
 		linkUrl = null;
 	}
 
-	public NavigationItem(final NavigationItem parent, final String linkUrl,
+	private NavigationItem(final Navigation navigation,
+			final NavigationItem parent, final String linkUrl,
 			final String... titles) {
+		this.navigation = navigation;
 		this.parent = parent;
 		this.linkUrl = linkUrl;
 		matchingPattern = linkUrl;
@@ -51,10 +50,9 @@ public class NavigationItem {
 	}
 
 	public NavigationItem addChild(final String linkUrl, final String... titles) {
-
-		final NavigationItem item = new NavigationItem(this, linkUrl, titles);
+		final NavigationItem item = new NavigationItem(navigation, this,
+				linkUrl, titles);
 		subElements.add(item);
-
 		return item;
 	}
 
@@ -72,13 +70,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;
@@ -97,26 +88,19 @@ public class NavigationItem {
 		return subElements;
 	}
 
-	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 String getTitle(final Locale locale) {
 		return localeToTitle.get(locale);
 	}
 
 	private void initializeLocalizedTitles(final String... titles) {
-		final Locale[] locales = getLocaleOrder();
-		if (locales.length != titles.length)
+		final List<Locale> locales = navigation.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) {