Update of /var/cvs/src/org/mmbase/framework
In directory james.mmbase.org:/tmp/cvs-serv26256
Modified Files:
AbstractProcessor.java AbstractRenderer.java
ChainedRenderer.java ConnectionRenderer.java
DeniedRenderer.java EditwizardRenderer.java ErrorRenderer.java
JspProcessor.java JspRenderer.java Processor.java
Renderer.java ResourceRenderer.java StringRenderer.java
Log Message:
It does not make sense that for rendering a block you need the parameters of
the framework. Actually, none of the renderer implemetnations indeed _used_ the
framework parameters. Dropped the argument from the interfaces render method,
hence makeing the API simpler and better understandable
See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/framework
Index: AbstractProcessor.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/framework/AbstractProcessor.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- AbstractProcessor.java 20 Feb 2008 17:44:07 -0000 1.7
+++ AbstractProcessor.java 26 Aug 2008 07:48:38 -0000 1.8
@@ -15,7 +15,7 @@
* Abstract view implementation which implements getType and the specific
parameters.
*
* @author Michiel Meeuwissen
- * @version $Id: AbstractProcessor.java,v 1.7 2008/02/20 17:44:07 michiel Exp $
+ * @version $Id: AbstractProcessor.java,v 1.8 2008/08/26 07:48:38 michiel Exp $
* @since MMBase-1.9
*/
abstract public class AbstractProcessor implements Processor {
@@ -28,7 +28,7 @@
return new Processor() {
public Block getBlock() { return b; }
public Parameter[] getParameters() { return
Parameter.emptyArray(); }
- public void process(Parameters blockParameters, Parameters
frameworkParameters) { }
+ public void process(Parameters blockParameters) { }
public String toString() { return "EMPTY Processor"; }
public URI getUri() { try {return new
URI("mmbase:/processor/empty");} catch (Exception e) { return null;} }
};
Index: AbstractRenderer.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/framework/AbstractRenderer.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- AbstractRenderer.java 26 Aug 2008 06:45:36 -0000 1.14
+++ AbstractRenderer.java 26 Aug 2008 07:48:38 -0000 1.15
@@ -21,7 +21,7 @@
* Abstract renderer implementation which implements getType and getBlock.
*
* @author Michiel Meeuwissen
- * @version $Id: AbstractRenderer.java,v 1.14 2008/08/26 06:45:36 michiel Exp $
+ * @version $Id: AbstractRenderer.java,v 1.15 2008/08/26 07:48:38 michiel Exp $
* @since MMBase-1.9
*/
abstract public class AbstractRenderer implements Renderer {
@@ -72,6 +72,6 @@
public Parameter[] getParameters() {
return new Parameter[] {};
}
- public abstract void render(Parameters blockParameters, Parameters
frameworkParameters, Writer w, RenderHints hints) throws FrameworkException;
+ public abstract void render(Parameters blockParameters, Writer w,
RenderHints hints) throws FrameworkException;
}
Index: ChainedRenderer.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/framework/ChainedRenderer.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- ChainedRenderer.java 26 Aug 2008 06:45:36 -0000 1.6
+++ ChainedRenderer.java 26 Aug 2008 07:48:38 -0000 1.7
@@ -19,7 +19,7 @@
* block.
*
* @author Michiel Meeuwissen
- * @version $Id: ChainedRenderer.java,v 1.6 2008/08/26 06:45:36 michiel Exp $
+ * @version $Id: ChainedRenderer.java,v 1.7 2008/08/26 07:48:38 michiel Exp $
* @since MMBase-1.9
*/
@@ -46,9 +46,9 @@
@Override
- public void render(Parameters blockParameters, Parameters
frameworkParameters, Writer w, RenderHints hints) throws FrameworkException {
+ public void render(Parameters blockParameters, Writer w, RenderHints
hints) throws FrameworkException {
for (Renderer renderer : chain) {
- renderer.render(blockParameters, frameworkParameters, w, hints);
+ renderer.render(blockParameters, w, hints);
}
}
Index: ConnectionRenderer.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/framework/ConnectionRenderer.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- ConnectionRenderer.java 26 Aug 2008 06:45:36 -0000 1.8
+++ ConnectionRenderer.java 26 Aug 2008 07:48:38 -0000 1.9
@@ -45,7 +45,7 @@
*
*
* @author Michiel Meeuwissen
- * @version $Id: ConnectionRenderer.java,v 1.8 2008/08/26 06:45:36 michiel Exp
$
+ * @version $Id: ConnectionRenderer.java,v 1.9 2008/08/26 07:48:38 michiel Exp
$
* @since MMBase-1.9
*/
public class ConnectionRenderer extends AbstractRenderer {
@@ -82,8 +82,7 @@
@Override
- public void render(Parameters blockParameters, Parameters
frameworkParameters,
- Writer w, RenderHints hints) throws FrameworkException {
+ public void render(Parameters blockParameters, Writer w, RenderHints
hints) throws FrameworkException {
if (w == null) throw new NullPointerException();
Index: DeniedRenderer.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/framework/DeniedRenderer.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- DeniedRenderer.java 26 Aug 2008 06:45:36 -0000 1.7
+++ DeniedRenderer.java 26 Aug 2008 07:48:38 -0000 1.8
@@ -28,7 +28,7 @@
*
* @author Michiel Meeuwissen
* @author André van Toly
- * @version $Id: DeniedRenderer.java,v 1.7 2008/08/26 06:45:36 michiel Exp $
+ * @version $Id: DeniedRenderer.java,v 1.8 2008/08/26 07:48:38 michiel Exp $
* @since MMBase-1.9
*/
@@ -40,17 +40,18 @@
super(t, parent);
}
+ @Override
public Parameter[] getParameters() {
- return new Parameter[] {Parameter.RESPONSE, Parameter.REQUEST,
Parameter.LOCALE};
+ return new Parameter[] {Parameter.RESPONSE, Parameter.REQUEST};
}
- public void render(Parameters blockParameters, Parameters
frameworkParameters, Writer w, RenderHints hints) throws FrameworkException {
+ @Override
+ public void render(Parameters blockParameters, Writer w, RenderHints
hints) throws FrameworkException {
switch(getType()) {
case BODY:
try {
HttpServletRequest request =
blockParameters.get(Parameter.REQUEST);
HttpServletResponse response =
blockParameters.get(Parameter.RESPONSE);
- Locale locale = blockParameters.get(Parameter.LOCALE);
GenericResponseWrapper respw = new
GenericResponseWrapper(response);
String url = JspRenderer.JSP_ROOT + "core/401.jspx";
Index: EditwizardRenderer.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/framework/EditwizardRenderer.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- EditwizardRenderer.java 26 Aug 2008 06:45:36 -0000 1.14
+++ EditwizardRenderer.java 26 Aug 2008 07:48:38 -0000 1.15
@@ -22,7 +22,7 @@
* @todo Needs to produce a div, not an url.
*
* @author Michiel Meeuwissen
- * @version $Id: EditwizardRenderer.java,v 1.14 2008/08/26 06:45:36 michiel
Exp $
+ * @version $Id: EditwizardRenderer.java,v 1.15 2008/08/26 07:48:38 michiel
Exp $
* @since MMBase-1.9
*/
public class EditwizardRenderer extends AbstractRenderer {
@@ -48,7 +48,7 @@
/**
*/
- public void render(Parameters blockParameters, Parameters
frameworkParameters, Writer w, RenderHints hints) throws FrameworkException {
+ public void render(Parameters blockParameters, Writer w, RenderHints
hints) throws FrameworkException {
try {
HttpServletRequest request =
blockParameters.get(Parameter.REQUEST);
HttpServletResponse response =
blockParameters.get(Parameter.RESPONSE);
Index: ErrorRenderer.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/framework/ErrorRenderer.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- ErrorRenderer.java 26 Aug 2008 06:45:36 -0000 1.14
+++ ErrorRenderer.java 26 Aug 2008 07:48:38 -0000 1.15
@@ -28,7 +28,7 @@
* share code.
*
* @author Michiel Meeuwissen
- * @version $Id: ErrorRenderer.java,v 1.14 2008/08/26 06:45:36 michiel Exp $
+ * @version $Id: ErrorRenderer.java,v 1.15 2008/08/26 07:48:38 michiel Exp $
* @since MMBase-1.9
*/
@@ -57,8 +57,8 @@
@Override
- public void render(Parameters blockParameters, Parameters
frameworkParameters, Writer w, RenderHints hints) throws FrameworkException {
- log.debug("Error rendering " + blockParameters + " " +
frameworkParameters);
+ public void render(Parameters blockParameters, Writer w, RenderHints
hints) throws FrameworkException {
+ log.debug("Error rendering " + blockParameters);
switch(getType()) {
case BODY:
try {
Index: JspProcessor.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/framework/JspProcessor.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- JspProcessor.java 16 Nov 2007 16:06:30 -0000 1.14
+++ JspProcessor.java 26 Aug 2008 07:48:38 -0000 1.15
@@ -23,7 +23,7 @@
* A Processor implementation based on a jsp.
*
* @author Michiel Meeuwissen
- * @version $Id: JspProcessor.java,v 1.14 2007/11/16 16:06:30 michiel Exp $
+ * @version $Id: JspProcessor.java,v 1.15 2008/08/26 07:48:38 michiel Exp $
* @since MMBase-1.9
*/
public class JspProcessor extends AbstractProcessor {
@@ -46,7 +46,7 @@
- public void process(Parameters blockParameters, Parameters
frameworkParameters) throws FrameworkException {
+ public void process(Parameters blockParameters) throws FrameworkException {
try {
HttpServletResponse response =
blockParameters.get(Parameter.RESPONSE);
GenericResponseWrapper respw = new
GenericResponseWrapper(response);
@@ -56,7 +56,6 @@
String url = getPath();
if (log.isDebugEnabled()) {
log.debug("Block parameters : [" + blockParameters + "]");
- log.debug("Framework parameters : [" + frameworkParameters +
"]");
log.debug("Framework returned url: [" + url + "]");
}
RequestDispatcher requestDispatcher =
request.getRequestDispatcher(url);
Index: JspRenderer.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/framework/JspRenderer.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- JspRenderer.java 26 Aug 2008 06:45:36 -0000 1.28
+++ JspRenderer.java 26 Aug 2008 07:48:38 -0000 1.29
@@ -23,7 +23,7 @@
* A Renderer implementation based on a jsp.
*
* @author Michiel Meeuwissen
- * @version $Id: JspRenderer.java,v 1.28 2008/08/26 06:45:36 michiel Exp $
+ * @version $Id: JspRenderer.java,v 1.29 2008/08/26 07:48:38 michiel Exp $
* @since MMBase-1.9
*/
public class JspRenderer extends AbstractRenderer {
@@ -52,7 +52,7 @@
public String mesg = null;
}
@Override
- public void render(Parameters blockParameters, Parameters
frameworkParameters, Writer w, RenderHints hints) throws FrameworkException {
+ public void render(Parameters blockParameters, Writer w, RenderHints
hints) throws FrameworkException {
try {
HttpServletResponse response =
blockParameters.get(Parameter.RESPONSE);
HttpServletRequest request =
blockParameters.get(Parameter.REQUEST);
@@ -85,10 +85,10 @@
log.debug("Status " + status.code);
if (status.code == 401) {
DeniedRenderer denied = new DeniedRenderer(getType(),
getBlock());
- denied.render(blockParameters, frameworkParameters, w, hints);
+ denied.render(blockParameters, w, hints);
} else if (status.code != 200) {
ErrorRenderer error = new ErrorRenderer(getType(), getBlock(),
url, status.code, status.mesg);
- error.render(blockParameters, frameworkParameters, w, hints);
+ error.render(blockParameters, w, hints);
} else {
w.write(respw.toString());
}
Index: Processor.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/framework/Processor.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- Processor.java 25 Jan 2008 09:32:23 -0000 1.10
+++ Processor.java 26 Aug 2008 07:48:38 -0000 1.11
@@ -19,7 +19,7 @@
* rendered, but at most one of them has its Processor executed.
*
* @author Michiel Meeuwissen
- * @version $Id: Processor.java,v 1.10 2008/01/25 09:32:23 michiel Exp $
+ * @version $Id: Processor.java,v 1.11 2008/08/26 07:48:38 michiel Exp $
* @since MMBase-1.9
*/
public interface Processor {
@@ -40,7 +40,7 @@
* Process. In case of e.g. a JSPProcessor, the parameters must also
contain
* the Http Servlet response and request, besided specific parameters for
this component.
*/
- void process(Parameters blockParameters, Parameters frameworkParameters)
throws FrameworkException;
+ void process(Parameters blockParameters) throws FrameworkException;
/**
* An URI which may identify the implementation of this Renderer.
Index: Renderer.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/framework/Renderer.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- Renderer.java 26 Aug 2008 06:45:36 -0000 1.21
+++ Renderer.java 26 Aug 2008 07:48:38 -0000 1.22
@@ -21,7 +21,7 @@
* A Renderer is stateless.
*
* @author Michiel Meeuwissen
- * @version $Id: Renderer.java,v 1.21 2008/08/26 06:45:36 michiel Exp $
+ * @version $Id: Renderer.java,v 1.22 2008/08/26 07:48:38 michiel Exp $
* @since MMBase-1.9
*/
public interface Renderer {
@@ -47,7 +47,7 @@
public Renderer getEmpty(final Block block) {
return new Renderer() {
public Type getType() { return Type.this; }
- public void render(Parameters parameters, Parameters
urlparameters, Writer w, RenderHints hints) { };
+ public void render(Parameters parameters, Writer w,
RenderHints hints) { };
public Parameter[] getParameters() { return
Parameter.emptyArray(); };
public Block getBlock() { return block ; };
public String toString() { return "EMPTY Renderer"; }
@@ -84,7 +84,7 @@
* Renders to a writer. In case of e.g. a JSPView, the parameters must
also contain
* the Http Servlet response and request, besided specific parameters for
this component.
*/
- void render(Parameters blockParameters, Parameters frameworkParameters,
Writer w, RenderHints hints) throws FrameworkException;
+ void render(Parameters blockParameters, Writer w, RenderHints hints)
throws FrameworkException;
/**
Index: ResourceRenderer.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/framework/ResourceRenderer.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- ResourceRenderer.java 26 Aug 2008 06:45:36 -0000 1.7
+++ ResourceRenderer.java 26 Aug 2008 07:48:38 -0000 1.8
@@ -29,7 +29,7 @@
*
* @author Michiel Meeuwissen
- * @version $Id: ResourceRenderer.java,v 1.7 2008/08/26 06:45:36 michiel Exp $
+ * @version $Id: ResourceRenderer.java,v 1.8 2008/08/26 07:48:38 michiel Exp $
* @since MMBase-1.9
*/
public class ResourceRenderer extends AbstractRenderer {
@@ -61,7 +61,7 @@
}
@Override
- public void render(Parameters blockParameters, Parameters
frameworkParameters,
+ public void render(Parameters blockParameters,
Writer w, RenderHints hints) throws FrameworkException {
Index: StringRenderer.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/framework/StringRenderer.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- StringRenderer.java 26 Aug 2008 06:45:36 -0000 1.12
+++ StringRenderer.java 26 Aug 2008 07:48:38 -0000 1.13
@@ -22,7 +22,7 @@
* file. Based on [EMAIL PROTECTED] PatternNodeFunctionProvider} so several
parameters can be present.
*
* @author Michiel Meeuwissen
- * @version $Id: StringRenderer.java,v 1.12 2008/08/26 06:45:36 michiel Exp $
+ * @version $Id: StringRenderer.java,v 1.13 2008/08/26 07:48:38 michiel Exp $
* @since MMBase-1.9
*/
public class StringRenderer extends AbstractRenderer {
@@ -48,7 +48,7 @@
return new Parameter[] {Parameter.REQUEST};
}
- public void render(Parameters blockParameters, Parameters
frameworkParameters, Writer w, RenderHints hints) throws FrameworkException {
+ public void render(Parameters blockParameters, Writer w, RenderHints
hints) throws FrameworkException {
log.debug("Rendering " + string);
try {
HttpServletRequest request =
blockParameters.get(Parameter.REQUEST);
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
