Update of /var/cvs/src/org/mmbase/framework/basic
In directory james.mmbase.org:/tmp/cvs-serv3300/basic
Modified Files:
BasicFramework.java BasicUrlConverter.java
ChainedUrlConverter.java MMBaseUrlConverter.java State.java
UrlConverter.java
Log Message:
getActionUrl -> getProcessUrl. There is already a org.mmbase.security.Action,
which may lead to some confusion otherwise
See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/framework/basic
Index: BasicFramework.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/framework/basic/BasicFramework.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- BasicFramework.java 22 Feb 2008 13:03:29 -0000 1.9
+++ BasicFramework.java 22 Feb 2008 14:05:57 -0000 1.10
@@ -30,7 +30,7 @@
* configured with an XML 'framework.xml'.
*
* @author Michiel Meeuwissen
- * @version $Id: BasicFramework.java,v 1.9 2008/02/22 13:03:29 michiel Exp $
+ * @version $Id: BasicFramework.java,v 1.10 2008/02/22 14:05:57 michiel Exp $
* @since MMBase-1.9
*/
public class BasicFramework extends Framework {
@@ -67,7 +67,7 @@
}
- public String getActionUrl(String path, Map<String, Object> parameters,
+ public String getProcessUrl(String path, Map<String, Object> parameters,
Parameters frameworkParameters, boolean
escapeAmps) throws FrameworkException {
return urlConverter.getUrl(path, parameters, frameworkParameters,
escapeAmps);
}
Index: BasicUrlConverter.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/framework/basic/BasicUrlConverter.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- BasicUrlConverter.java 22 Feb 2008 13:03:29 -0000 1.6
+++ BasicUrlConverter.java 22 Feb 2008 14:05:57 -0000 1.7
@@ -25,7 +25,7 @@
*
*
* @author Michiel Meeuwissen
- * @version $Id: BasicUrlConverter.java,v 1.6 2008/02/22 13:03:29 michiel Exp $
+ * @version $Id: BasicUrlConverter.java,v 1.7 2008/02/22 14:05:57 michiel Exp $
* @since MMBase-1.9
*/
public final class BasicUrlConverter implements UrlConverter {
@@ -105,7 +105,7 @@
* BasicFramework. Actually BasicFramework should add them itself.
*/
public Parameter[] getParameterDefinition() {
- return new Parameter[] {Parameter.REQUEST, State.ACTION,
Framework.PROCESS};
+ return new Parameter[] {Parameter.REQUEST};
}
protected String getUrl(String path,
Map<String, Object> parameters,
@@ -123,10 +123,14 @@
map = new TreeMap<String, Object>(framework.prefix(state, map));
for (Object e : request.getParameterMap().entrySet()) {
Map.Entry<String, String[]> entry = (Map.Entry<String,
String[]>) e;
+
String k = entry.getKey();
// TODO: this is ad hoc (and incorrect if more than 9 blocks)
- if (k.startsWith("_" + state.getId())) continue; // for this
block, don't add that,
+ if (k.startsWith("_" + state.getId())) {
+ // for this block, don't add that,
// because
should be in parameters then
+ continue;
+ }
if (! map.containsKey(k)) {
map.put(k, entry.getValue()[0]);
}
@@ -157,7 +161,7 @@
Parameters frameworkParameters, boolean
escapeAmps) {
return getUrl(path, parameters, frameworkParameters, escapeAmps,
false);
}
- public String getActionUrl(String path,
+ public String getProcessUrl(String path,
Map<String, Object> parameters,
Parameters frameworkParameters, boolean
escapeAmps) {
return getUrl(path, parameters, frameworkParameters, escapeAmps, true);
Index: ChainedUrlConverter.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/framework/basic/ChainedUrlConverter.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- ChainedUrlConverter.java 22 Feb 2008 13:03:29 -0000 1.5
+++ ChainedUrlConverter.java 22 Feb 2008 14:05:57 -0000 1.6
@@ -25,7 +25,7 @@
* outcome of a converter can be added to the outcome of its preceder.
*
* @author André van Toly
- * @version $Id: ChainedUrlConverter.java,v 1.5 2008/02/22 13:03:29 michiel
Exp $
+ * @version $Id: ChainedUrlConverter.java,v 1.6 2008/02/22 14:05:57 michiel
Exp $
* @since MMBase-1.9
*/
public class ChainedUrlConverter implements UrlConverter {
@@ -66,7 +66,7 @@
String p = path;
for (UrlConverter uc : uclist) {
- String b = uc.getUrl(p.toString(), params, frameworkParameters,
escapeAmps);
+ String b = uc.getUrl(p, params, frameworkParameters, escapeAmps);
if (b != null) {
return b;
}
@@ -77,13 +77,13 @@
return p; // this seems incorrect (what if nothing is resolved by
one of the uc's? then params etc. are lost)
}
- public String getActionUrl(String path,
+ public String getProcessUrl(String path,
Map<String, Object> params,
Parameters frameworkParameters, boolean
escapeAmps) throws FrameworkException {
- String p = new String(path);
+ String p = path;
for (UrlConverter uc : uclist) {
- String b = uc.getActionUrl(p.toString(), params,
frameworkParameters, escapeAmps);
+ String b = uc.getProcessUrl(p, params, frameworkParameters,
escapeAmps);
if (b != null) {
return b;
}
Index: MMBaseUrlConverter.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/framework/basic/MMBaseUrlConverter.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- MMBaseUrlConverter.java 22 Feb 2008 13:03:29 -0000 1.3
+++ MMBaseUrlConverter.java 22 Feb 2008 14:05:57 -0000 1.4
@@ -20,7 +20,7 @@
*
*
* @author Michiel Meeuwissen
- * @version $Id: MMBaseUrlConverter.java,v 1.3 2008/02/22 13:03:29 michiel Exp
$
+ * @version $Id: MMBaseUrlConverter.java,v 1.4 2008/02/22 14:05:57 michiel Exp
$
* @since MMBase-1.9
*/
public class MMBaseUrlConverter implements UrlConverter {
@@ -203,7 +203,7 @@
Parameters frameworkParameters, boolean
escapeAmps) {
return getUrl(path, parameters, frameworkParameters, escapeAmps,
false);
}
- public String getActionUrl(String path,
+ public String getProcessUrl(String path,
Map<String, Object> parameters,
Parameters frameworkParameters, boolean
escapeAmps) {
return getUrl(path, parameters, frameworkParameters, escapeAmps, true);
Index: State.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/framework/basic/State.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- State.java 26 Dec 2007 17:07:19 -0000 1.3
+++ State.java 22 Feb 2008 14:05:57 -0000 1.4
@@ -25,17 +25,11 @@
*
*
* @author Michiel Meeuwissen
- * @version $Id: State.java,v 1.3 2007/12/26 17:07:19 michiel Exp $
+ * @version $Id: State.java,v 1.4 2008/02/22 14:05:57 michiel Exp $
* @since MMBase-1.9
*/
public class State {
- /**
- * A framework parameter which is required for frameworks which base them
selves around this class.
- */
- public static final Parameter<String> ACTION = new
Parameter<String>("action", String.class, null);
-
-
private static final Logger log = Logging.getLoggerInstance(State.class);
public final static String KEY = "org.mmbase.framework.state";
@@ -63,6 +57,7 @@
private final ServletRequest request;
private final State previousState;
private Object originalLocalizationContext = null;
+ private String action = null;
/**
* Use this constructor, if you want to explicitely create a new State
object. E.g. when
@@ -173,10 +168,12 @@
type = t;
}
+ public void setAction(String a) {
+ action = a;
+ }
+
protected boolean needsProcess() {
- String a = frameworkParameters.get(ACTION);
- log.debug("Action " + a);
- return id.equals(a);
+ return id.equals(action);
}
/**
Index: UrlConverter.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/framework/basic/UrlConverter.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- UrlConverter.java 22 Feb 2008 13:03:29 -0000 1.4
+++ UrlConverter.java 22 Feb 2008 14:05:57 -0000 1.5
@@ -23,7 +23,7 @@
* They will be chained one after another.
* @author Michiel Meeuwissen
- * @version $Id: UrlConverter.java,v 1.4 2008/02/22 13:03:29 michiel Exp $
+ * @version $Id: UrlConverter.java,v 1.5 2008/02/22 14:05:57 michiel Exp $
* @since MMBase-1.9
*/
public interface UrlConverter {
@@ -40,7 +40,7 @@
Parameters frameworkParameters,
boolean escapeAmps) throws FrameworkException;
- String getActionUrl(String path,
+ String getProcessUrl(String path,
Map<String, Object> parameters,
Parameters frameworkParameters,
boolean escapeAmps) throws FrameworkException;
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
