Update of /var/cvs/src/org/mmbase/framework/basic
In directory james.mmbase.org:/tmp/cvs-serv8051/basic
Modified Files:
BasicFramework.java State.java
Log Message:
various 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.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- BasicFramework.java 20 Aug 2008 17:07:59 -0000 1.27
+++ BasicFramework.java 25 Aug 2008 21:45:19 -0000 1.28
@@ -34,7 +34,7 @@
* are configured is the order in which they are processed.
*
* @author Michiel Meeuwissen
- * @version $Id: BasicFramework.java,v 1.27 2008/08/20 17:07:59 michiel Exp $
+ * @version $Id: BasicFramework.java,v 1.28 2008/08/25 21:45:19 michiel Exp $
* @since MMBase-1.9
*/
public class BasicFramework extends Framework {
@@ -284,6 +284,7 @@
setBlockParametersForRender(state, blockParameters);
actualRenderer.render(blockParameters, frameworkParameters, w,
windowState);
} catch (FrameworkException fe) {
+ log.debug(fe);
URI uri = renderer.getUri();
Renderer error = new ErrorRenderer(renderer.getType(),
renderer.getBlock(), (uri != null) ? uri.toString() : null, 500, fe);
error.render(blockParameters, frameworkParameters, w, windowState);
Index: State.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/framework/basic/State.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- State.java 6 Aug 2008 12:00:11 -0000 1.7
+++ State.java 25 Aug 2008 21:45:19 -0000 1.8
@@ -25,7 +25,7 @@
*
*
* @author Michiel Meeuwissen
- * @version $Id: State.java,v 1.7 2008/08/06 12:00:11 michiel Exp $
+ * @version $Id: State.java,v 1.8 2008/08/25 21:45:19 michiel Exp $
* @since MMBase-1.9
*/
public class State {
@@ -207,15 +207,19 @@
return renderer != null ? getRenderer(renderer) : null;
}
+ protected String getBlockRequestKey() {
+ return "__b" + getId();
+ }
+
/**
* Determines what should be rendered now.
*/
protected Renderer getRenderer(Renderer r) {
- String blockName = request.getParameter("__b" + getId());
+ String blockName = request.getParameter(getBlockRequestKey());
log.debug("found block " + blockName + " at parameters");
Block block = r.getBlock();
if (blockName == null) {
- //log.warn("No such block " + blockName, new Exception());
+ log.debug("No such block " + blockName, new Exception());
return r;
} else {
Block toBlock = block.getComponent().getBlock(blockName);
@@ -228,12 +232,11 @@
}
public void setBlock(Map<String, Object> map, Block toBlock) {
- map.put("__b" + getId(), toBlock.getName());
+ map.put(getBlockRequestKey(), toBlock.getName());
}
-
/**
* Puts this state in 'render' mode.
*/
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
