Author: ssmaeklu
Date: 2007-08-16 13:17:14 +0200 (Thu, 16 Aug 2007)
New Revision: 5625

Modified:
   
trunk/view-control-spi/src/main/java/no/schibstedsok/searchportal/view/navigation/NavigationHelper.java
Log:
Avoid leading &

Modified: 
trunk/view-control-spi/src/main/java/no/schibstedsok/searchportal/view/navigation/NavigationHelper.java
===================================================================
--- 
trunk/view-control-spi/src/main/java/no/schibstedsok/searchportal/view/navigation/NavigationHelper.java
     2007-08-16 10:51:26 UTC (rev 5624)
+++ 
trunk/view-control-spi/src/main/java/no/schibstedsok/searchportal/view/navigation/NavigationHelper.java
     2007-08-16 11:17:14 UTC (rev 5625)
@@ -65,12 +65,12 @@
         final StringBuilder sb = new StringBuilder();
 
         if (!navEntry.isExcludeQuery()) {
-            
sb.append("&q=").append(datamodel.getQuery().getUtf8UrlEncoded());
+            addParameter(sb, "q", datamodel.getQuery().getUtf8UrlEncoded());
         }
         if (value != null && value.length() > 0) {
-            
sb.append("&").append(enc(navEntry.getField())).append('=').append(enc(value));
+            addParameter(sb, enc(navEntry.getField()), enc(value));
             if (navEntry.isRealNavigator() && navigatorName != null) {
-                
sb.append("&").append("nav_").append(enc(navEntry.getId())).append('=').append(enc(navigatorName));
+                addParameter(sb, "nav_" + enc(navEntry.getId()), 
enc(navigatorName));
             }
         }
         if (!navEntry.isOut()) {
@@ -86,7 +86,15 @@
         }
         return sb.toString();
     }
-    
+
+    private static void addParameter(final StringBuilder sb, final String 
parameter, final String value) {
+        if (sb.length() > 0) {
+            sb.append("&");
+        }
+
+        sb.append(parameter).append('=').append(value);
+    }
+
     public static NavigationConfig getConfig(final DataModel datamodel){
 
         return datamodel.getNavigation().getConfiguration();
@@ -167,7 +175,7 @@
             final String value) {
 
         if (!nav.getNavigation().getResetNavSet().contains(id)) {
-            sb.append("&").append(enc(id)).append('=').append(enc(value));
+            addParameter(sb, enc(id), enc(value));
             return true;
         }
         return false;

_______________________________________________
Kernel-commits mailing list
[email protected]
http://sesat.no/mailman/listinfo/kernel-commits

Reply via email to