Update of /var/cvs/src/org/mmbase/framework
In directory james.mmbase.org:/tmp/cvs-serv9942

Modified Files:
        CachedRenderer.java WrappedRenderer.java 
Log Message:
changed propertyname wraps -> wrapsBlock, so that it is also possible to wrap 
something entirely different


See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/framework


Index: CachedRenderer.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/framework/CachedRenderer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- CachedRenderer.java 12 Jan 2009 21:12:10 -0000      1.2
+++ CachedRenderer.java 12 Jan 2009 22:12:04 -0000      1.3
@@ -44,7 +44,7 @@
          mimetype="text/html">
     <body>
       <class name="org.mmbase.framework.CachedRenderer">
-        <param name="wraps">statistics_uncached</param>
+        <param name="wrapsBlock">statistics_uncached</param>
         <param name="includeRenderTime">xml-comments</param>
       </class>
     </body>
@@ -52,7 +52,7 @@
 ]]></pre>
  *
  * @author Michiel Meeuwissen
- * @version $Id: CachedRenderer.java,v 1.2 2009/01/12 21:12:10 michiel Exp $
+ * @version $Id: CachedRenderer.java,v 1.3 2009/01/12 22:12:04 michiel Exp $
  * @since MMBase-1.9.1
 
  */


Index: WrappedRenderer.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/framework/WrappedRenderer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- WrappedRenderer.java        12 Jan 2009 21:12:10 -0000      1.2
+++ WrappedRenderer.java        12 Jan 2009 22:12:04 -0000      1.3
@@ -10,6 +10,7 @@
 package org.mmbase.framework;
 
 import org.mmbase.util.functions.*;
+import java.io.Writer;
 
 import org.mmbase.util.logging.Logger;
 import org.mmbase.util.logging.Logging;
@@ -19,7 +20,7 @@
  * parameter 'wraps' which you can point to another block.
  *
  * @author Michiel Meeuwissen
- * @version $Id: WrappedRenderer.java,v 1.2 2009/01/12 21:12:10 michiel Exp $
+ * @version $Id: WrappedRenderer.java,v 1.3 2009/01/12 22:12:04 michiel Exp $
  * @since MMBase-1.9.1
  */
 public abstract class WrappedRenderer extends AbstractRenderer {
@@ -32,8 +33,12 @@
         super(t, parent);
     }
 
-    public void setWraps(String c) {
-        wrapped = getBlock().getComponent().getBlock(c).getRenderer(getType());
+    public void setWrapsBlock(String c) {
+        setWraps(getBlock().getComponent().getBlock(c).getRenderer(getType()));
+    }
+
+    public void setWraps(Renderer r) {
+        wrapped = r;
     }
 
     public Renderer getWraps() {
@@ -44,7 +49,9 @@
         return wrapped.getParameters();
     }
 
-
+    @Override public void render(Parameters blockParameters, Writer w, 
RenderHints hints) throws FrameworkException {
+        wrapped.render(blockParameters, w, hints);
+    }
 
     @Override public String toString() {
         return "wrapped " + wrapped;
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs

Reply via email to