- Added experimental phing build file.

[software/bife/bife-all.git] / src / BIFE / Generic.php

diff --git a/src/BIFE/Generic.php b/src/BIFE/Generic.php
index a9baaf4bee69c53822aa6aaf93d5c6089fd53471..c98bc49d09ac6e2bba2fabbbd7fa2869088aeeb0 100644 (file)
--- a/src/BIFE/Generic.php
+++ b/src/BIFE/Generic.php
@@ -26,7 +26,6 @@
 // $Id$
 //
 
 // $Id$
 //
 

-

 // +X2C includes
 require_once 'BIFE/Container.php';
 // ~X2C
 // +X2C includes
 require_once 'BIFE/Container.php';
 // ~X2C


@@ -43,16 +42,10 @@ class BIFE_Generic extends BIFE_Container {
      * Attribute list.
      *
      * @var    array $attrs
      * Attribute list.
      *
      * @var    array $attrs

-     * @access public
+     * @access protected

      */
     var $attrs;
 
      */
     var $attrs;
 

-    /**
-     * @var    string $contents
-     * @access public
-     */
-    var $contents;
-

     // ~X2C
 
     // +X2C Operation 10
     // ~X2C
 
     // +X2C Operation 10


@@ -66,23 +59,43 @@ class BIFE_Generic extends BIFE_Container {
      */
     function BIFE_Generic($attrs) // ~X2C
     {
      */
     function BIFE_Generic($attrs) // ~X2C
     {

-        $this->attrs    = $attrs;
-        $this->contents = '';
+        $this->__construct($attrs);
+    }
+    // -X2C
+
+    // +X2C Operation 51
+    /**
+     * Constructor.
+     *
+     * @param  array $attrs Attributes.
+     *
+     * @return void
+     * @access public
+     */
+    function __construct($attrs) // ~X2C
+    {
+        parent::__construct();
+        $this->attrs = $attrs;

     }
     // -X2C
 
     // +X2C Operation 11
     /**
     }
     // -X2C
 
     // +X2C Operation 11
     /**

-     * Add contents to the widget.
+     * Add contents to the container.

      *
      *

-     * @param  string $contents Contents to add.
+     * @param  mixed &$contents Contents to add.

      *
      * @return void
      * @access public
      */
      *
      * @return void
      * @access public
      */

-    function addContents($contents) // ~X2C
+    function addContents(&$contents) // ~X2C

     {
     {

-        $this->contents .= trim($contents);
+        if (is_string($contents)) {
+            $contents = trim($contents);
+        }
+        if ($contents) {
+            parent::addContents($contents);
+        }

     }
     // -X2C
 
     }
     // -X2C
 


@@ -92,18 +105,19 @@ class BIFE_Generic extends BIFE_Container {
      *
      * @param  HTML_Template_Sigma &$template Template to use to render the widget.
      *
      *
      * @param  HTML_Template_Sigma &$template Template to use to render the widget.
      *

-     * @return void
+     * @return string

      * @access public
      */
     function render(&$template) // ~X2C
     {
      * @access public
      */
     function render(&$template) // ~X2C
     {

+        $contents = parent::render($template);

         $template->loadTemplateFile(get_class($this).'.html');
         $template->setVariable($this->attrs);
         $template->loadTemplateFile(get_class($this).'.html');
         $template->setVariable($this->attrs);

-        $template->setVariable('CONTENTS', $this->contents);
+        $template->setVariable('CONTENTS', $contents);

         return $template->get();
     }
     // -X2C
 
 } // -X2C Class :Generic
 
         return $template->get();
     }
     // -X2C
 
 } // -X2C Class :Generic
 

-?>
+?>
\ No newline at end of file