Update of /var/cvs/applications/mynews/src/org/mmbase/mynews
In directory james.mmbase.org:/tmp/cvs-serv903
Modified Files:
MyNewsUrlConverter.java
Log Message:
Chaned return type to String of getUrl methods and introduced 'getActionUrl'
See also:
http://cvs.mmbase.org/viewcvs/applications/mynews/src/org/mmbase/mynews
Index: MyNewsUrlConverter.java
===================================================================
RCS file:
/var/cvs/applications/mynews/src/org/mmbase/mynews/MyNewsUrlConverter.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- MyNewsUrlConverter.java 22 Feb 2008 10:46:18 -0000 1.14
+++ MyNewsUrlConverter.java 22 Feb 2008 13:03:50 -0000 1.15
@@ -33,7 +33,7 @@
*
*
* @author Michiel Meeuwissen
- * @version $Id: MyNewsUrlConverter.java,v 1.14 2008/02/22 10:46:18 michiel
Exp $
+ * @version $Id: MyNewsUrlConverter.java,v 1.15 2008/02/22 13:03:50 michiel
Exp $
* @since MMBase-1.9
*/
public class MyNewsUrlConverter implements UrlConverter {
@@ -64,9 +64,9 @@
return new Parameter[] {};
}
- public StringBuilder getUrl(String path,
+ protected String getUrl(String path,
Map<String, Object> parameters,
- Parameters frameworkParameters, boolean
escapeAmps) {
+ Parameters frameworkParameters, boolean
escapeAmps, boolean action) {
if (log.isDebugEnabled()) {
log.debug("" + path + parameters + frameworkParameters);
}
@@ -107,7 +107,7 @@
b.append(n);
}
}
- return b;
+ return b.toString();
} else {
log.debug("No mynews block found");
return null;
@@ -115,7 +115,18 @@
}
}
- public StringBuilder getInternalUrl(String page, Map<String, Object>
params, Parameters frameworkParameters) throws FrameworkException {
+ public String getUrl(String path,
+ Map<String, Object> parameters,
+ Parameters frameworkParameters, boolean
escapeAmps) {
+ return getUrl(path, parameters, frameworkParameters, escapeAmps,
false);
+ }
+ public String getActionUrl(String path,
+ Map<String, Object> parameters,
+ Parameters frameworkParameters, boolean escapeAmps) {
+ return getUrl(path, parameters, frameworkParameters, escapeAmps, true);
+ }
+
+ public String getInternalUrl(String page, Map<String, Object> params,
Parameters frameworkParameters) throws FrameworkException {
HttpServletRequest request =
frameworkParameters.get(Parameter.REQUEST);
if (page == null) throw new IllegalArgumentException();
if (page.startsWith(directory)) {
@@ -131,7 +142,7 @@
assert path[1].equals(directory.substring(1));
if (path.length == 2) {
// magazine mode.
- return result;
+ return result.toString();
} else {
// article mode
String id = path[path.length - 1];
@@ -181,7 +192,7 @@
n = id;
}
result.append("?block=article&n=" + n);
- return result;
+ return result.toString();
}
} else {
log.debug("path length " + path.length);
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
