Update of /var/cvs/src/org/mmbase/framework/basic
In directory james.mmbase.org:/tmp/cvs-serv18450
Modified Files:
BasicFramework.java MMBaseUrlConverter.java
Log Message:
renamed the 'ACTION' parameter to avoid conflicts with blocks with an 'action'
parameter on their process (like the 'x' editors do e.g.)
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.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- BasicFramework.java 8 Aug 2008 14:41:38 -0000 1.25
+++ BasicFramework.java 14 Aug 2008 20:27:08 -0000 1.26
@@ -34,7 +34,7 @@
* are configured is the order in which they are processed.
*
* @author Michiel Meeuwissen
- * @version $Id: BasicFramework.java,v 1.25 2008/08/08 14:41:38 michiel Exp $
+ * @version $Id: BasicFramework.java,v 1.26 2008/08/14 20:27:08 michiel Exp $
* @since MMBase-1.9
*/
public class BasicFramework extends Framework {
@@ -50,7 +50,7 @@
}
- public static final Parameter<String> ACTION = new
Parameter<String>("action", String.class);
+ public static final Parameter<String> ACTION = new
Parameter<String>("_action", String.class);
protected final ChainedUrlConverter urlConverter = new
ChainedUrlConverter();
protected final UrlConverter fallbackConverter = new
BasicUrlConverter(this);
Index: MMBaseUrlConverter.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/framework/basic/MMBaseUrlConverter.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- MMBaseUrlConverter.java 10 Jul 2008 15:33:39 -0000 1.10
+++ MMBaseUrlConverter.java 14 Aug 2008 20:27:08 -0000 1.11
@@ -20,7 +20,7 @@
* was configured for this prefix).
*
* @author Michiel Meeuwissen
- * @version $Id: MMBaseUrlConverter.java,v 1.10 2008/07/10 15:33:39 michiel
Exp $
+ * @version $Id: MMBaseUrlConverter.java,v 1.11 2008/08/14 20:27:08 michiel
Exp $
* @since MMBase-1.9
*/
public class MMBaseUrlConverter implements UrlConverter {
@@ -154,9 +154,9 @@
if (processUrl) {
// get current components ids
if (state.isRendering()) {
- map.put("action", state.getId());
+ map.put(BasicFramework.ACTION.getName(), state.getId());
} else {
- map.put("action", state.getUpcomingId());
+ map.put(BasicFramework.ACTION.getName(),
state.getUpcomingId());
}
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
