Update of /var/cvs/src/org/mmbase/framework
In directory james.mmbase.org:/tmp/cvs-serv18301
Modified Files:
AbstractRenderer.java CachedRenderer.java
ConnectionRenderer.java EditwizardRenderer.java
IFrameRenderer.java Renderer.java WrappedRenderer.java
Added Files:
DocumentationRenderer.java
Log Message:
Added a DocumentationRenderer, and changed some details to make that simpler
See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/framework
DocumentationRenderer.java is new
Index: AbstractRenderer.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/framework/AbstractRenderer.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- AbstractRenderer.java 4 Sep 2008 21:20:01 -0000 1.17
+++ AbstractRenderer.java 13 Jan 2009 08:24:21 -0000 1.18
@@ -21,7 +21,7 @@
* Abstract renderer implementation which implements getType and getBlock.
*
* @author Michiel Meeuwissen
- * @version $Id: AbstractRenderer.java,v 1.17 2008/09/04 21:20:01 michiel Exp $
+ * @version $Id: AbstractRenderer.java,v 1.18 2009/01/13 08:24:21 michiel Exp $
* @since MMBase-1.9
*/
abstract public class AbstractRenderer implements Renderer {
@@ -51,6 +51,9 @@
public java.net.URI getUri() {
return null;
}
+ public java.net.URI getUri(Parameters blockParameters, RenderHints hints) {
+ return getUri();
+ }
/**
* This utility method, which of course must be used in conjuction with
{...@link #decorateOutro}
Index: CachedRenderer.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/framework/CachedRenderer.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- CachedRenderer.java 12 Jan 2009 22:12:04 -0000 1.3
+++ CachedRenderer.java 13 Jan 2009 08:24:21 -0000 1.4
@@ -52,7 +52,7 @@
]]></pre>
*
* @author Michiel Meeuwissen
- * @version $Id: CachedRenderer.java,v 1.3 2009/01/12 22:12:04 michiel Exp $
+ * @version $Id: CachedRenderer.java,v 1.4 2009/01/13 08:24:21 michiel Exp $
* @since MMBase-1.9.1
*/
@@ -146,7 +146,7 @@
}
} else {
// user last modified
- URI uri = getWraps().getUri();
+ URI uri = getWraps().getUri(blockParameters, hints);
if (uri == null) throw new FrameworkException("" + getWraps()
+ " did not return an URI, and cannot be cached using getLastModified");
URLConnection connection = uri.toURL().openConnection();
connection.setConnectTimeout(timeout);
Index: ConnectionRenderer.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/framework/ConnectionRenderer.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- ConnectionRenderer.java 12 Jan 2009 21:12:10 -0000 1.10
+++ ConnectionRenderer.java 13 Jan 2009 08:24:21 -0000 1.11
@@ -47,7 +47,7 @@
*
*
* @author Michiel Meeuwissen
- * @version $Id: ConnectionRenderer.java,v 1.10 2009/01/12 21:12:10 michiel
Exp $
+ * @version $Id: ConnectionRenderer.java,v 1.11 2009/01/13 08:24:21 michiel
Exp $
* @since MMBase-1.9
*/
public class ConnectionRenderer extends AbstractRenderer {
@@ -95,7 +95,7 @@
if (decorate) {
decorateIntro(hints, w, null);
}
- HttpURLConnection connection = (HttpURLConnection)
url.openConnection();
+ HttpURLConnection connection = (HttpURLConnection)
getUri(blockParameters, hints).toURL().openConnection();
connection.setConnectTimeout(timeOut);
connection.setReadTimeout(timeOut);
int responseCode = connection.getResponseCode();
@@ -154,16 +154,15 @@
}
- public String toString() {
- return url.toString();
+ @Override public String toString() {
+ return getUri(new Parameters(getParameters()), new RenderHints(this,
WindowState.NORMAL, null, null)).toString();
}
- public java.net.URI getUri() {
+ @Override public URI getUri(Parameters blockParameter, RenderHints hints) {
try {
return url.toURI();
} catch (URISyntaxException use) {
- log.warn(use);
- return null;
+ throw new RuntimeException(use.getMessage(), use);
}
}
}
Index: EditwizardRenderer.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/framework/EditwizardRenderer.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- EditwizardRenderer.java 12 Jan 2009 21:25:49 -0000 1.17
+++ EditwizardRenderer.java 13 Jan 2009 08:24:21 -0000 1.18
@@ -36,7 +36,7 @@
]]></pre>
*
* @author Michiel Meeuwissen
- * @version $Id: EditwizardRenderer.java,v 1.17 2009/01/12 21:25:49 michiel
Exp $
+ * @version $Id: EditwizardRenderer.java,v 1.18 2009/01/13 08:24:21 michiel
Exp $
* @since MMBase-1.9
*/
public class EditwizardRenderer extends IFrameRenderer {
@@ -55,6 +55,10 @@
wizard = w;
}
+ public Parameter[] getParameters() {
+ return new Parameter[] {new Parameter.Wrapper(super.getParameters()),
Parameter.LOCALE};
+ }
+
/**
*/
@Override public String getIFrameUrl(Parameters blockParameters) {
Index: IFrameRenderer.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/framework/IFrameRenderer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- IFrameRenderer.java 12 Jan 2009 21:25:49 -0000 1.2
+++ IFrameRenderer.java 13 Jan 2009 08:24:21 -0000 1.3
@@ -23,7 +23,7 @@
* It supports generic properties, which are set as parameters on the iframe
url.
*
* @author Michiel Meeuwissen
- * @version $Id: IFrameRenderer.java,v 1.2 2009/01/12 21:25:49 michiel Exp $
+ * @version $Id: IFrameRenderer.java,v 1.3 2009/01/13 08:24:21 michiel Exp $
* @since MMBase-1.9.1
*/
public class IFrameRenderer extends AbstractRenderer {
@@ -55,7 +55,7 @@
}
public Parameter[] getParameters() {
- return new Parameter[] {Parameter.RESPONSE, Parameter.REQUEST,
Parameter.LOCALE};
+ return new Parameter[] {Parameter.RESPONSE, Parameter.REQUEST};
}
/**
Index: Renderer.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/framework/Renderer.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- Renderer.java 28 Aug 2008 11:43:56 -0000 1.23
+++ Renderer.java 13 Jan 2009 08:24:21 -0000 1.24
@@ -21,7 +21,7 @@
* A Renderer is stateless.
*
* @author Michiel Meeuwissen
- * @version $Id: Renderer.java,v 1.23 2008/08/28 11:43:56 michiel Exp $
+ * @version $Id: Renderer.java,v 1.24 2009/01/13 08:24:21 michiel Exp $
* @since MMBase-1.9
*/
public interface Renderer {
@@ -54,6 +54,7 @@
public Block getBlock() { return block ; };
public String toString() { return "EMPTY Renderer"; }
public URI getUri() { try {return new URI("mmbase:/renderer/"
+ Type.this + "/empty");} catch (Exception e) { return null;} }
+ public URI getUri(Parameters blockParameters, RenderHints
hints) { return getUri(); }
public boolean equals(Object o) {
if (o instanceof Renderer) {
Renderer r = (Renderer) o;
@@ -92,6 +93,11 @@
/**
* An URI which may identify the implementation of this Renderer.
*/
-
URI getUri();
+
+ /**
+ * Ann URL which may identify a specific rendition
+ * @since MMBase-1.9.1
+ */
+ URI getUri(Parameters blockParameters, RenderHints hints);
}
Index: WrappedRenderer.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/framework/WrappedRenderer.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- WrappedRenderer.java 12 Jan 2009 22:12:04 -0000 1.3
+++ WrappedRenderer.java 13 Jan 2009 08:24:21 -0000 1.4
@@ -20,7 +20,7 @@
* parameter 'wraps' which you can point to another block.
*
* @author Michiel Meeuwissen
- * @version $Id: WrappedRenderer.java,v 1.3 2009/01/12 22:12:04 michiel Exp $
+ * @version $Id: WrappedRenderer.java,v 1.4 2009/01/13 08:24:21 michiel Exp $
* @since MMBase-1.9.1
*/
public abstract class WrappedRenderer extends AbstractRenderer {
@@ -46,18 +46,18 @@
}
@Override public Parameter[] getParameters() {
- return wrapped.getParameters();
+ return getWraps().getParameters();
}
@Override public void render(Parameters blockParameters, Writer w,
RenderHints hints) throws FrameworkException {
- wrapped.render(blockParameters, w, hints);
+ getWraps().render(blockParameters, w, hints);
}
@Override public String toString() {
- return "wrapped " + wrapped;
+ return "wrapped " + getWraps();
}
- @Override public java.net.URI getUri() {
- return wrapped.getUri();
+ @Override public java.net.URI getUri(Parameters blockParameters,
RenderHints hints) {
+ return getWraps().getUri(blockParameters, hints);
}
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
