Update of /var/cvs/src/org/mmbase/framework/basic
In directory james.mmbase.org:/tmp/cvs-serv24887/basic
Modified Files:
BasicFramework.java State.java
Log Message:
ConnectionRenderer needing a REQUEST parameter was IMHO an indication that
something was wrong in the desing. Refactered a bit so that it is not needing
it any more. Renderers are now rendered with a 'RenderHints' object (which
wraps the previous WindowState argument)
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.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- BasicFramework.java 25 Aug 2008 21:45:19 -0000 1.28
+++ BasicFramework.java 26 Aug 2008 06:45:36 -0000 1.29
@@ -34,7 +34,7 @@
* are configured is the order in which they are processed.
*
* @author Michiel Meeuwissen
- * @version $Id: BasicFramework.java,v 1.28 2008/08/25 21:45:19 michiel Exp $
+ * @version $Id: BasicFramework.java,v 1.29 2008/08/26 06:45:36 michiel Exp $
* @since MMBase-1.9
*/
public class BasicFramework extends Framework {
@@ -250,7 +250,7 @@
* to do that (perhaps we could say, that the render method must process,
if that is necessary,
* and not yet done).
*/
- public void render(Renderer renderer, Parameters blockParameters,
Parameters frameworkParameters, Writer w, Renderer.WindowState windowState)
throws FrameworkException {
+ public void render(Renderer renderer, Parameters blockParameters,
Parameters frameworkParameters, Writer w, WindowState windowState) throws
FrameworkException {
ServletRequest request = frameworkParameters.get(Parameter.REQUEST);
if (request == null) throw new IllegalArgumentException("No request
object given");
@@ -282,12 +282,14 @@
state.render(actualRenderer);
setBlockParametersForRender(state, blockParameters);
- actualRenderer.render(blockParameters, frameworkParameters, w,
windowState);
+ RenderHints hints = new RenderHints(actualRenderer, windowState,
state.getId(), getComponentClass());
+ actualRenderer.render(blockParameters, frameworkParameters, w,
hints);
} 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);
+ RenderHints hints = new RenderHints(error, windowState,
state.getId(), getComponentClass());
+ error.render(blockParameters, frameworkParameters, w, hints);
} finally {
state.endBlock();
}
Index: State.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/framework/basic/State.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- State.java 25 Aug 2008 21:45:19 -0000 1.8
+++ State.java 26 Aug 2008 06:45:36 -0000 1.9
@@ -25,7 +25,7 @@
*
*
* @author Michiel Meeuwissen
- * @version $Id: State.java,v 1.8 2008/08/25 21:45:19 michiel Exp $
+ * @version $Id: State.java,v 1.9 2008/08/26 06:45:36 michiel Exp $
* @since MMBase-1.9
*/
public class State {
@@ -82,8 +82,8 @@
* The current window state of rendering. As yet unimplemented.
* @todo
*/
- public Renderer.WindowState getWindowState() {
- return Renderer.WindowState.NORMAL;
+ public WindowState getWindowState() {
+ return WindowState.NORMAL;
}
/**
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
