projects
/
svjatoslav_commons.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Created dedicated locale configuration handler.
[svjatoslav_commons.git]
/
src
/
main
/
java
/
eu
/
svjatoslav
/
commons
/
network
/
navigation
/
NavigationItem.java
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
..
2a27c5d
100755
(executable)
--- 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>();
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;
/**
private final String linkUrl;
/**
@@
-31,18
+31,17
@@
public class NavigationItem {
*/
private String cssPrefix;
*/
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;
}
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) {
final String... titles) {
+ this.navigation = navigation;
this.parent = parent;
this.linkUrl = linkUrl;
matchingPattern = linkUrl;
this.parent = parent;
this.linkUrl = linkUrl;
matchingPattern = linkUrl;
@@
-51,10
+50,9
@@
public class NavigationItem {
}
public NavigationItem addChild(final String linkUrl, final String... titles) {
}
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);
subElements.add(item);
-
return item;
}
return item;
}
@@
-72,13
+70,6
@@
public class NavigationItem {
return linkUrl;
}
return linkUrl;
}
- public Locale[] getLocaleOrder() {
- if (localeOrder != null)
- return localeOrder;
-
- return parent.getLocaleOrder();
- }
-
NavigationItem getMatchingNavigationItem(final String requestPath) {
if (matchesUrl(requestPath))
return this;
NavigationItem getMatchingNavigationItem(final String requestPath) {
if (matchesUrl(requestPath))
return this;
@@
-97,25
+88,19
@@
public class NavigationItem {
return subElements;
}
return subElements;
}
- public String getTitle() {
- if (localeToTitle.size() != 1)
- throw new RuntimeException("there shall be exactly one title");
-
- return localeToTitle.values().iterator().next();
- }
-
public String getTitle(final Locale locale) {
return localeToTitle.get(locale);
}
private void initializeLocalizedTitles(final String... titles) {
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 "
throw new RuntimeException("There should be exactly "
- + locales.
length
+ " title(s).");
+ + locales.
size()
+ " title(s).");
for (int i = 0; i < titles.length; i++)
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) {
}
public boolean matchesUrl(final String url) {