Update of /var/cvs/src/org/mmbase/framework/basic
In directory james.mmbase.org:/tmp/cvs-serv7818
Modified Files:
BasicFramework.java MMBaseUrlConverter.java
Log Message:
details
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.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- BasicFramework.java 26 Aug 2008 07:48:38 -0000 1.30
+++ BasicFramework.java 26 Aug 2008 19:45:21 -0000 1.31
@@ -34,7 +34,7 @@
* are configured is the order in which they are processed.
*
* @author Michiel Meeuwissen
- * @version $Id: BasicFramework.java,v 1.30 2008/08/26 07:48:38 michiel Exp $
+ * @version $Id: BasicFramework.java,v 1.31 2008/08/26 19:45:21 michiel Exp $
* @since MMBase-1.9
*/
public class BasicFramework extends Framework {
@@ -226,14 +226,20 @@
protected void setBlockParametersForRender(State state, Parameters
blockParameters) {
- for (Map.Entry<String, ?> entry : blockParameters.toMap().entrySet()) {
- if (entry.getValue() == null) {
- log.debug("Using " + entry + " and parameter " +
getPrefix(state) + entry.getKey());
- blockParameters.set(entry.getKey(),
state.getRequest().getParameter(getPrefix(state) + entry.getKey()));
+ ServletRequest request = state.getRequest();
+ String prefix = getPrefix(state);
+ blockParameters.setAutoCasting(true);
+ for (Map.Entry<String, String[]> entry : ((Map<String,
String[]>)request.getParameterMap()).entrySet()) {
+ String key = entry.getKey();
+ if (key.startsWith(prefix)) {
+ blockParameters.setIfDefined(key.substring(prefix.length()),
entry.getValue());
}
}
}
+ /**
+ * @todo
+ */
protected void setBlockParametersForProcess(State state, Parameters
blockParameters) {
ServletRequest request = state.getRequest();
for (Map.Entry<String, ?> entry : blockParameters.toMap().entrySet()) {
Index: MMBaseUrlConverter.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/framework/basic/MMBaseUrlConverter.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- MMBaseUrlConverter.java 14 Aug 2008 20:27:08 -0000 1.11
+++ MMBaseUrlConverter.java 26 Aug 2008 19:45:21 -0000 1.12
@@ -20,7 +20,7 @@
* was configured for this prefix).
*
* @author Michiel Meeuwissen
- * @version $Id: MMBaseUrlConverter.java,v 1.11 2008/08/14 20:27:08 michiel
Exp $
+ * @version $Id: MMBaseUrlConverter.java,v 1.12 2008/08/26 19:45:21 michiel
Exp $
* @since MMBase-1.9
*/
public class MMBaseUrlConverter implements UrlConverter {
@@ -178,6 +178,7 @@
if (! processUrl) {
Parameters blockParameters = block.createParameters();
+ blockParameters.setAutoCasting(true);
for (Map.Entry<String, Object> entry : parameters.entrySet()) {
blockParameters.set(entry.getKey(), entry.getValue());
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
