[MMBASE CVS] src/org/mmbase/framework Block.java Framework.java

[Michiel Meeuwissen]

Update of /var/cvs/src/org/mmbase/framework
In directory james.mmbase.org:/tmp/cvs-serv826

Modified Files:
        Block.java Framework.java 
Log Message:
Chaned return type to String of getUrl methods and introduced 'getActionUrl'


See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/framework


Index: Block.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/framework/Block.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- Block.java  22 Feb 2008 09:06:27 -0000      1.31
+++ Block.java  22 Feb 2008 13:03:29 -0000      1.32
@@ -21,7 +21,7 @@
  *
  * @author Johannes Verelst
  * @author Michiel Meeuwissen
- * @version $Id: Block.java,v 1.31 2008/02/22 09:06:27 michiel Exp $
+ * @version $Id: Block.java,v 1.32 2008/02/22 13:03:29 michiel Exp $
  * @since MMBase-1.9
  */
 public class Block {
@@ -61,11 +61,14 @@
     public String getName() {
         return name;
     }
+
+    /**
+     * A localized title for this block.
+     */
     public LocalizedString getTitle() {
         return title;
     }
 
-
     /**
      * Mimetype for this block. E.g. "text/html".
      */


Index: Framework.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/framework/Framework.java,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -b -r1.43 -r1.44
--- Framework.java      25 Jan 2008 10:13:01 -0000      1.43
+++ Framework.java      22 Feb 2008 13:03:29 -0000      1.44
@@ -27,7 +27,7 @@
  *
  * @author Johannes Verelst
  * @author Pierre van Rooden
- * @version $Id: Framework.java,v 1.43 2008/01/25 10:13:01 michiel Exp $
+ * @version $Id: Framework.java,v 1.44 2008/02/22 13:03:29 michiel Exp $
  * @since MMBase-1.9
  */
 public abstract class Framework {
@@ -228,11 +228,14 @@
      * @param escapeAmps <code>true</code> if parameters should be added with 
an escaped &amp; (&amp;amp;).
      *                   You should escape &amp; when a URL is exposed (i.e. 
in HTML), but not if the url is
      *                   for some reason called directly.
-     * @param process    If following the URL must lead to a process 
rendering. IOW, this URL is
-     *                   for form actions.
      * @return An URL relative to the root of this web application (i.e. 
withouth a context path),
      */
-    public abstract StringBuilder getUrl(String path,
+    public abstract String getUrl(String path,
+                                  Map<String, Object> parameters,
+                                  Parameters frameworkParameters,
+                                  boolean escapeAmps) throws 
FrameworkException;
+
+    public abstract String getActionUrl(String path,
                          Map<String, Object> parameters,
                          Parameters frameworkParameters,
                          boolean escapeAmps) throws FrameworkException;
@@ -252,7 +255,7 @@
      * @return A valid interal URL, or <code>null</code> if nothing framework 
specific could be
      *         determined (this would make it possible to 'chain' frameworks).
      */
-    public abstract StringBuilder getInternalUrl(String path,
+    public abstract String getInternalUrl(String path,
                                                  Map<String, Object> params,
                                                  Parameters 
frameworkParameters) throws FrameworkException;
 
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs