From e4999b25052d1ad9400a0f9fd5289a49eea1bddc Mon Sep 17 00:00:00 2001 From: Fabio Bas Date: Sun, 25 Jan 2015 20:04:57 +0100 Subject: More namespace changes Changed version to 3.2.99; Attempt at fixing autoloading fixed enough namespaces to have some demos running --- framework/Web/UI/WebControls/TDataBoundControl.php | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'framework/Web/UI/WebControls/TDataBoundControl.php') diff --git a/framework/Web/UI/WebControls/TDataBoundControl.php b/framework/Web/UI/WebControls/TDataBoundControl.php index a694f47d..bf3778cf 100644 --- a/framework/Web/UI/WebControls/TDataBoundControl.php +++ b/framework/Web/UI/WebControls/TDataBoundControl.php @@ -10,10 +10,11 @@ */ namespace Prado\Web\UI\WebControls; - -Prado::using('System.Web.UI.WebControls.TDataSourceControl'); -Prado::using('System.Web.UI.WebControls.TDataSourceView'); -Prado::using('System.Collections.TPagedDataSource'); +use Prado\TPropertyValue; +use Prado\Exceptions\TInvalidDataValueException; +use Prado\Exceptions\TInvalidDataTypeException; +use Prado\Collections\TList; +use Prado\Collections\TMap; /** * TDataBoundControl class. @@ -43,7 +44,7 @@ Prado::using('System.Collections.TPagedDataSource'); * @package Prado\Web\UI\WebControls * @since 3.0 */ -abstract class TDataBoundControl extends TWebControl +abstract class TDataBoundControl extends \Prado\Web\UI\WebControls\TWebControl { private $_initialized=false; private $_dataSource=null; @@ -334,7 +335,7 @@ abstract class TDataBoundControl extends TWebControl else $data=null; - if($data instanceof Traversable) + if($data instanceof \Traversable) { if($this->getAllowPaging()) { @@ -486,7 +487,7 @@ abstract class TDataBoundControl extends TWebControl // read array from TDbDataReader since it's forward-only stream and can only be traversed once return $value->readAll(); } - else if(($value instanceof Traversable) || $value===null) + else if(($value instanceof \Traversable) || $value===null) return $value; else throw new TInvalidDataTypeException('databoundcontrol_datasource_invalid',get_class($this)); -- cgit v1.2.3