[Kernel-commits] r6537 - in branches/2.17: view-config-spi/src/main/java/no/sesat/search/view/navigation view-control-spi/src/main/java/no/sesat/search/view/navigation

[ssmiweve]

Author: ssmiweve
Date: 2008-04-22 20:07:54 +0200 (Tue, 22 Apr 2008)
New Revision: 6537

Modified:
   
branches/2.17/view-config-spi/src/main/java/no/sesat/search/view/navigation/OptionsNavigationConfig.java
   
branches/2.17/view-control-spi/src/main/java/no/sesat/search/view/navigation/OptionNavigationController.java
Log:
SEARCH-4105 - Move logic from get-method to constructor in NavigationManager


Modified: 
branches/2.17/view-config-spi/src/main/java/no/sesat/search/view/navigation/OptionsNavigationConfig.java
===================================================================
--- 
branches/2.17/view-config-spi/src/main/java/no/sesat/search/view/navigation/OptionsNavigationConfig.java
    2008-04-22 10:16:38 UTC (rev 6536)
+++ 
branches/2.17/view-config-spi/src/main/java/no/sesat/search/view/navigation/OptionsNavigationConfig.java
    2008-04-22 18:07:54 UTC (rev 6537)
@@ -34,6 +34,9 @@
 import java.util.Collections;
 import java.util.Collection;
 import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
+import no.sesat.search.view.config.SearchTab;
 
 /**
  *
@@ -117,6 +120,8 @@
         private String tab;
         private boolean useHitCount;
         private String commandName;
+        // just like NavigationConfig.Navigation.Nav we'll handle tab via 
staticParameters
+        private Map<String,String> staticParameters = new 
HashMap<String,String>();
 
         public Option(final Element e) {
             fillBeanProperty(this, null, "value", ParseType.String, e, null);
@@ -149,7 +154,7 @@
             return valueRef;
         }
 
-        public void setValueRef(String valueRef) {
+        public void setValueRef(final String valueRef) {
             this.valueRef = valueRef;
         }
 
@@ -157,7 +162,7 @@
             return defaultSelect;
         }
 
-        public void setDefaultSelect(boolean defaultSelect) {
+        public void setDefaultSelect(final boolean defaultSelect) {
             this.defaultSelect = defaultSelect;
         }
 
@@ -165,7 +170,7 @@
             return defaultSelectValueRef;
         }
 
-        public void setDefaultSelectValueRef(String defaultSelectValueRef) {
+        public void setDefaultSelectValueRef(final String 
defaultSelectValueRef) {
             this.defaultSelectValueRef = defaultSelectValueRef;
         }
 
@@ -173,15 +178,17 @@
             return tab;
         }
 
-        public void setTab(String tab) {
+        public void setTab(final String tab) {
             this.tab = tab;
+            // The tab property takes preference over any url parameters. 
intialse it here and use against urlGenerator.
+            staticParameters.put(SearchTab.PARAMETER_KEY, tab);
         }
 
         public boolean isUseHitCount() {
             return useHitCount;
         }
 
-        public void setUseHitCount(boolean useHitCount) {
+        public void setUseHitCount(final boolean useHitCount) {
             this.useHitCount = useHitCount;
         }
 
@@ -189,10 +196,14 @@
             return commandName;
         }
 
-        public void setCommandName(String commandName) {
+        public void setCommandName(final String commandName) {
             this.commandName = commandName;
         }
 
+        public Map<String, String> getStaticParameters() {
+            return Collections.unmodifiableMap(staticParameters);
+        }
+        
         @Override
         public String toString() {
             return "\nOption{" +

Modified: 
branches/2.17/view-control-spi/src/main/java/no/sesat/search/view/navigation/OptionNavigationController.java
===================================================================
--- 
branches/2.17/view-control-spi/src/main/java/no/sesat/search/view/navigation/OptionNavigationController.java
        2008-04-22 10:16:38 UTC (rev 6536)
+++ 
branches/2.17/view-control-spi/src/main/java/no/sesat/search/view/navigation/OptionNavigationController.java
        2008-04-22 18:07:54 UTC (rev 6537)
@@ -145,18 +145,9 @@
             }
             if (value != null) {
 
-                final Map<String,String> urlParameters;
-
-                if (option.getTab() != null) {
-                    urlParameters = new HashMap<String, String>(1);
-                    urlParameters.put(SearchTab.PARAMETER_KEY, 
option.getTab());
-                } else {
-                    urlParameters = Collections.<String, String> emptyMap();
-                }
-
                 final NavigationItem navigator = new BasicNavigationItem(
                         option.getDisplayName(),
-                        context.getUrlGenerator().getURL(value, 
config.getParent(), urlParameters),
+                        context.getUrlGenerator().getURL(value, 
config.getParent(), option.getStaticParameters()),
                         -1);
 
                 parentResult.addResult(navigator);

_______________________________________________
Kernel-commits mailing list
Kernel-commits@sesat.no
http://sesat.no/mailman/listinfo/kernel-commits