r571 - in trunk/src: filter renderer

Author: david
Date: 2006-06-10 14:59:42 +0000 (Sat, 10 Jun 2006)
New Revision: 571

Modified:
   trunk/src/filter/AgaviExecutionFilter.class.php
   trunk/src/renderer/AgaviRenderer.class.php
Log:
renderers are passed the view via initialize() now, context is retrieved from 
the view. templates don't have to be changed this way. and renderers actually 
get initialized now prior to use ;)

Modified: trunk/src/filter/AgaviExecutionFilter.class.php
===================================================================
--- trunk/src/filter/AgaviExecutionFilter.class.php     2006-06-10 14:58:15 UTC 
(rev 570)
+++ trunk/src/filter/AgaviExecutionFilter.class.php     2006-06-10 14:59:42 UTC 
(rev 571)
@@ -156,11 +156,10 @@
                                while(true) {
                                        $oti= $controller->getOutputTypeInfo();
                                        $renderer = new $oti['renderer']();
+                                       $renderer->initialize($viewInstance);
                                        if(isset($oti['extension'])) {
                                                
$renderer->setExtension($oti['extension']);
                                        }
-                                       $renderer->setView($viewInstance);
-
                                        try {
                                                // run the pre-render check to 
see if the template is there
                                                $renderer->preRenderCheck();

Modified: trunk/src/renderer/AgaviRenderer.class.php
===================================================================
--- trunk/src/renderer/AgaviRenderer.class.php  2006-06-10 14:58:15 UTC (rev 
570)
+++ trunk/src/renderer/AgaviRenderer.class.php  2006-06-10 14:59:42 UTC (rev 
571)
@@ -55,9 +55,10 @@
         * @author     David Zuelke <dz@xxxxxxxxxxxxxx>
         * @since      0.11.0
         */
-       public function initialize(AgaviContext $context, $parameters = array())
+       public function initialize(AgaviView $view, $parameters = array())
        {
-               $this->context = $context;
+               $this->viewInstance = $view;
+               $this->context = $view->getContext();
        }
 
        /**
@@ -113,19 +114,6 @@
        }
        
        /**
-        * Set the View instance that belongs to this Renderer instance.
-        *
-        * @param      AgaviView An AgaviView instance
-        *
-        * @author     David Zuelke <dz@xxxxxxxxxxxxxx>
-        * @since      0.11.0
-        */
-       public function setView(AgaviView $viewInstance)
-       {
-               $this->viewInstance = $viewInstance;
-       }
-       
-       /**
         * Loop through all template slots and fill them in with the results of
         * presentation data.
         *