Author: ssmaeklu
Date: 2007-08-16 11:14:21 +0200 (Thu, 16 Aug 2007)
New Revision: 5620
Modified:
trunk/view-config-spi/src/main/java/no/schibstedsok/searchportal/view/navigation/NavigationConfig.java
Log:
A navigation now replaces navigations from the parent site if they have the
same id
Modified:
trunk/view-config-spi/src/main/java/no/schibstedsok/searchportal/view/navigation/NavigationConfig.java
===================================================================
---
trunk/view-config-spi/src/main/java/no/schibstedsok/searchportal/view/navigation/NavigationConfig.java
2007-08-16 09:12:26 UTC (rev 5619)
+++
trunk/view-config-spi/src/main/java/no/schibstedsok/searchportal/view/navigation/NavigationConfig.java
2007-08-16 09:14:21 UTC (rev 5620)
@@ -14,6 +14,7 @@
import java.util.List;
import java.util.Map;
import java.util.Set;
+import java.util.Iterator;
import java.lang.annotation.Documented;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
@@ -63,10 +64,20 @@
}
public void addNavigation(final Navigation navigation) {
- navigationList.add(navigation);
+
if (navigation.getId() != null) {
+ if (navigationMap.containsKey(navigation.getId())) {
+ for (Iterator<Navigation> iterator =
navigationList.iterator(); iterator.hasNext();) {
+ final Navigation n = iterator.next();
+ if (navigation.getId().equals(n.getId())) {
+ iterator.remove();
+ }
+ }
+ }
+
navigationMap.put(navigation.getId(), navigation);
}
+ navigationList.add(navigation);
}
private static List<Element> getDirectChildren(final Element element,
final String elementName) {
_______________________________________________
Kernel-commits mailing list
[email protected]
http://sesat.no/mailman/listinfo/kernel-commits
