Author: ssmaeklu
Date: 2008-01-23 14:30:06 +0100 (Wed, 23 Jan 2008)
New Revision: 6021

Modified:
   
trunk/generic.sesam/view-control/src/main/java/no/sesat/search/view/navigation/AbstractUrlGenerator.java
   
trunk/view-config-spi/src/main/java/no/sesat/search/view/navigation/NavigationConfig.java
Log:
UrlGenerators not wanting an absolute URL should now set prefix="RELATIVE" 

Modified: 
trunk/generic.sesam/view-control/src/main/java/no/sesat/search/view/navigation/AbstractUrlGenerator.java
===================================================================
--- 
trunk/generic.sesam/view-control/src/main/java/no/sesat/search/view/navigation/AbstractUrlGenerator.java
    2008-01-23 12:52:30 UTC (rev 6020)
+++ 
trunk/generic.sesam/view-control/src/main/java/no/sesat/search/view/navigation/AbstractUrlGenerator.java
    2008-01-23 13:30:06 UTC (rev 6021)
@@ -65,12 +65,15 @@
     }
 
     /**
-     * Returns the static URL prefix. (e.g. /search)
+     * Returns the static URL prefix. (e.g. /search). If the URL is configured 
to be relative, the empty string is
+     * returned.
      *
+     * @see 
no.sesat.search.view.navigation.NavigationConfig.Navigation#getPrefix() 
+     *
      * @return the url prefix.
      */
     protected String getPrefix() {
-        return navigation.getPrefix();
+        return "RELATIVE".equals(navigation.getPrefix()) ? "" : 
navigation.getPrefix();
     }
 
     /**

Modified: 
trunk/view-config-spi/src/main/java/no/sesat/search/view/navigation/NavigationConfig.java
===================================================================
--- 
trunk/view-config-spi/src/main/java/no/sesat/search/view/navigation/NavigationConfig.java
   2008-01-23 12:52:30 UTC (rev 6020)
+++ 
trunk/view-config-spi/src/main/java/no/sesat/search/view/navigation/NavigationConfig.java
   2008-01-23 13:30:06 UTC (rev 6021)
@@ -234,7 +234,8 @@
         }
 
         /**
-         * Returns the prefix to use when generating URLs. The default is 
<tt>"/search"</tt>.
+         * Returns the prefix to use when generating URLs. The default is 
<tt>"/search"</tt>. If no prefix is desired,
+         * set the prefix to RELATIVE.
          *
          * @return the URL prefix.
          */

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

Reply via email to