[Piwik-svn] r516 - in trunk: . modules/DataTable modules/DataTable/Renderer

[svnmaster at piwik.org]

Author: matt
Date: 2008-06-08 22:06:43 +0200 (Sun, 08 Jun 2008)
New Revision: 516

Modified:
   trunk/TODO
   trunk/modules/DataTable/Renderer.php
   trunk/modules/DataTable/Renderer/Json.php
   trunk/modules/DataTable/Renderer/Php.php
   trunk/modules/DataTable/Renderer/Xml.php
Log:
- renaming spree

Modified: trunk/TODO
===================================================================
--- trunk/TODO	2008-06-08 20:03:21 UTC (rev 515)
+++ trunk/TODO	2008-06-08 20:06:43 UTC (rev 516)
@@ -1,5 +1,5 @@
 UPDATE README  (license, etc.)
-rename Details > MetaData
+
 ECLIPSE WINDOWS LINE BREAKS
 rename $renderExpanded name
 test that fresh archive doesn't show expanding when not requested

Modified: trunk/modules/DataTable/Renderer/Json.php
===================================================================
--- trunk/modules/DataTable/Renderer/Json.php	2008-06-08 20:03:21 UTC (rev 515)
+++ trunk/modules/DataTable/Renderer/Json.php	2008-06-08 20:06:43 UTC (rev 516)
@@ -19,9 +19,9 @@
  */
 class Piwik_DataTable_Renderer_Json extends Piwik_DataTable_Renderer
 {
-	function __construct($table = null, $renderExpanded = null)
+	function __construct($table = null, $renderSubTables = null)
 	{
-		parent::__construct($table, $renderExpanded);
+		parent::__construct($table, $renderSubTables);
 	}
 	
 	function render()
@@ -31,7 +31,7 @@
 
 	protected function renderTable($table)
 	{
-		$renderer = new Piwik_DataTable_Renderer_Php($table, $this->renderExpanded, $serialize = false);
+		$renderer = new Piwik_DataTable_Renderer_Php($table, $this->renderSubTables, $serialize = false);
 		$array = $renderer->flatRender();
 		
 		if(!is_array($array))

Modified: trunk/modules/DataTable/Renderer/Php.php
===================================================================
--- trunk/modules/DataTable/Renderer/Php.php	2008-06-08 20:03:21 UTC (rev 515)
+++ trunk/modules/DataTable/Renderer/Php.php	2008-06-08 20:06:43 UTC (rev 516)
@@ -24,9 +24,9 @@
 {
 	protected $serialize;
 	
-	public function __construct($table = null, $renderExpanded = null, $serialize = true)
+	public function __construct($table = null, $renderSubTables = null, $serialize = true)
 	{
-		parent::__construct($table, $renderExpanded);
+		parent::__construct($table, $renderSubTables);
 		$this->setSerialize($serialize);
 	}
 	
@@ -176,7 +176,7 @@
 				'idsubdatatable' => $row->getIdSubDataTable(),
 				);
 			
-			if($this->renderExpanded
+			if($this->renderSubTables
 				&& $row->getIdSubDataTable() !== null)
 			{
 				try{

Modified: trunk/modules/DataTable/Renderer/Xml.php
===================================================================
--- trunk/modules/DataTable/Renderer/Xml.php	2008-06-08 20:03:21 UTC (rev 515)
+++ trunk/modules/DataTable/Renderer/Xml.php	2008-06-08 20:06:43 UTC (rev 516)
@@ -22,9 +22,9 @@
  */
 class Piwik_DataTable_Renderer_Xml extends Piwik_DataTable_Renderer
 {
-	function __construct($table = null, $renderExpanded = null)
+	function __construct($table = null, $renderSubTables = null)
 	{
-		parent::__construct($table, $renderExpanded);
+		parent::__construct($table, $renderSubTables);
 	}
 	
 	function render()
@@ -34,7 +34,7 @@
 	
 	protected function getArrayFromDataTable($table)
 	{
-		$renderer = new Piwik_DataTable_Renderer_Php($table, $this->renderExpanded, $serialize = false);
+		$renderer = new Piwik_DataTable_Renderer_Php($table, $this->renderSubTables, $serialize = false);
 		return $renderer->flatRender();
 	}
 	

Modified: trunk/modules/DataTable/Renderer.php
===================================================================
--- trunk/modules/DataTable/Renderer.php	2008-06-08 20:03:21 UTC (rev 515)
+++ trunk/modules/DataTable/Renderer.php	2008-06-08 20:06:43 UTC (rev 516)
@@ -22,7 +22,7 @@
 abstract class Piwik_DataTable_Renderer
 {
 	protected $table;
-	protected $renderExpanded;
+	protected $renderSubTables;
 	
 	/**
 	 * Builds the renderer.
@@ -30,19 +30,19 @@
 	 *
 	 * @param Piwik_DataTable|Piwik_DataTable_Simple|Piwik_DataTable_Array $table to be rendered
 	 */
-	function __construct($table = null, $renderExpanded = null)
+	function __construct($table = null, $renderSubTables = null)
 	{
 		if(!is_null($table))
 		{
 			$this->setTable($table);
 		}
-		if(is_null($renderExpanded))
+		if(is_null($renderSubTables))
 		{
-			$this->renderExpanded = (bool)Piwik_Common::getRequestVar('expanded', false);
+			$this->renderSubTables = (bool)Piwik_Common::getRequestVar('expanded', false);
 		}
 		else
 		{
-			$this->renderExpanded = $renderExpanded; 
+			$this->renderSubTables = $renderSubTables; 
 		}
 	}