diff options
author | javalizard <> | 2010-04-18 03:15:01 +0000 |
---|---|---|
committer | javalizard <> | 2010-04-18 03:15:01 +0000 |
commit | 5aff249d0b574f90f527b7af60604439f8fa3bef (patch) | |
tree | 283801d30bd4c847d9079e66391a03823050ad24 | |
parent | c8b27e28e32cd8a93c2203b2c391d0b8e8ecf86a (diff) |
ensured that the WebControls are calling their parent __construct methods
-rw-r--r-- | framework/Web/UI/WebControls/TBulletedList.php | 3 | ||||
-rw-r--r-- | framework/Web/UI/WebControls/TCustomValidator.php | 3 | ||||
-rw-r--r-- | framework/Web/UI/WebControls/TDataGrid.php | 9 | ||||
-rw-r--r-- | framework/Web/UI/WebControls/TDataList.php | 3 | ||||
-rw-r--r-- | framework/Web/UI/WebControls/TDataSourceControl.php | 4 | ||||
-rw-r--r-- | framework/Web/UI/WebControls/TDataSourceView.php | 4 | ||||
-rw-r--r-- | framework/Web/UI/WebControls/TDropDownListColumn.php | 3 | ||||
-rw-r--r-- | framework/Web/UI/WebControls/THtmlArea.php | 3 | ||||
-rw-r--r-- | framework/Web/UI/WebControls/TImageButton.php | 3 | ||||
-rw-r--r-- | framework/Web/UI/WebControls/TImageMap.php | 3 | ||||
-rw-r--r-- | framework/Web/UI/WebControls/TListItem.php | 4 | ||||
-rw-r--r-- | framework/Web/UI/WebControls/TPager.php | 4 | ||||
-rw-r--r-- | framework/Web/UI/WebControls/TRepeater.php | 3 | ||||
-rw-r--r-- | framework/Web/UI/WebControls/TStyle.php | 4 | ||||
-rw-r--r-- | framework/Web/UI/WebControls/TWizard.php | 33 | ||||
-rw-r--r-- | framework/Web/UI/WebControls/TXmlTransform.php | 3 |
16 files changed, 58 insertions, 31 deletions
diff --git a/framework/Web/UI/WebControls/TBulletedList.php b/framework/Web/UI/WebControls/TBulletedList.php index 5f4aa49c..2c8e3c97 100644 --- a/framework/Web/UI/WebControls/TBulletedList.php +++ b/framework/Web/UI/WebControls/TBulletedList.php @@ -4,7 +4,7 @@ *
* @author Qiang Xue <qiang.xue@gmail.com>
* @link http://www.pradosoft.com/
- * @copyright Copyright © 2005-2008 PradoSoft + * @copyright Copyright © 2005-2010 PradoSoft
* @license http://www.pradosoft.com/license/
* @version $Id$
* @package System.Web.UI.WebControls
@@ -431,6 +431,7 @@ class TBulletedListEventParameter extends TEventParameter */
public function __construct($index)
{
+ parent::__construct();
$this->_index=$index;
}
diff --git a/framework/Web/UI/WebControls/TCustomValidator.php b/framework/Web/UI/WebControls/TCustomValidator.php index 7fed2b84..f0e05370 100644 --- a/framework/Web/UI/WebControls/TCustomValidator.php +++ b/framework/Web/UI/WebControls/TCustomValidator.php @@ -4,7 +4,7 @@ *
* @author Qiang Xue <qiang.xue@gmail.com>
* @link http://www.pradosoft.com/
- * @copyright Copyright © 2005-2008 PradoSoft
+ * @copyright Copyright © 2005-2010 PradoSoft
* @license http://www.pradosoft.com/license/
* @version $Id$
* @package System.Web.UI.WebControls
@@ -180,6 +180,7 @@ class TServerValidateEventParameter extends TEventParameter */
public function __construct($value,$isValid)
{
+ parent::__construct();
$this->_value=$value;
$this->setIsValid($isValid);
}
diff --git a/framework/Web/UI/WebControls/TDataGrid.php b/framework/Web/UI/WebControls/TDataGrid.php index 9551b376..d2147c49 100644 --- a/framework/Web/UI/WebControls/TDataGrid.php +++ b/framework/Web/UI/WebControls/TDataGrid.php @@ -9,7 +9,7 @@ *
* @author Qiang Xue <qiang.xue@gmail.com>
* @link http://www.pradosoft.com/
- * @copyright Copyright © 2005-2008 PradoSoft + * @copyright Copyright © 2005-2010 PradoSoft
* @license http://www.pradosoft.com/license/
* @version $Id$
* @package System.Web.UI.WebControls
@@ -1645,6 +1645,7 @@ class TDataGridItemEventParameter extends TEventParameter */
public function __construct(TDataGridItem $item)
{
+ parent::__construct();
$this->_item=$item;
}
@@ -1683,6 +1684,7 @@ class TDataGridPagerEventParameter extends TEventParameter */
public function __construct(TDataGridPager $pager)
{
+ parent::__construct();
$this->_pager=$pager;
}
@@ -1784,6 +1786,7 @@ class TDataGridSortCommandEventParameter extends TEventParameter */
public function __construct($source,TDataGridCommandEventParameter $param)
{
+ parent::__construct();
$this->_source=$source;
$this->_sortExpression=$param->getCommandParameter();
}
@@ -1838,6 +1841,7 @@ class TDataGridPageChangedEventParameter extends TEventParameter */
public function __construct($source,$newPageIndex)
{
+ parent::__construct();
$this->_source=$source;
$this->_newIndex=$newPageIndex;
}
@@ -1902,6 +1906,7 @@ class TDataGridItem extends TTableRow implements INamingContainer */
public function __construct($itemIndex,$dataSourceIndex,$itemType)
{
+ parent::__construct();
$this->_itemIndex=$itemIndex;
$this->_dataSourceIndex=$dataSourceIndex;
$this->setItemType($itemType);
@@ -2021,6 +2026,7 @@ class TDataGridPager extends TPanel implements INamingContainer */
public function __construct($dataGrid)
{
+ parent::__construct();
$this->_dataGrid=$dataGrid;
}
@@ -2112,6 +2118,7 @@ class TDataGridColumnCollection extends TList */
public function __construct(TDataGrid $owner)
{
+ parent::__construct();
$this->_o=$owner;
}
diff --git a/framework/Web/UI/WebControls/TDataList.php b/framework/Web/UI/WebControls/TDataList.php index ca628b21..986d56e5 100644 --- a/framework/Web/UI/WebControls/TDataList.php +++ b/framework/Web/UI/WebControls/TDataList.php @@ -4,7 +4,7 @@ *
* @author Qiang Xue <qiang.xue@gmail.com>
* @link http://www.pradosoft.com/
- * @copyright Copyright © 2005-2008 PradoSoft + * @copyright Copyright © 2005-2010 PradoSoft
* @license http://www.pradosoft.com/license/
* @version $Id$
* @package System.Web.UI.WebControls
@@ -1517,6 +1517,7 @@ class TDataListItemEventParameter extends TEventParameter */
public function __construct($item)
{
+ parent::__construct();
$this->_item=$item;
}
diff --git a/framework/Web/UI/WebControls/TDataSourceControl.php b/framework/Web/UI/WebControls/TDataSourceControl.php index 1d0823ff..1deaa857 100644 --- a/framework/Web/UI/WebControls/TDataSourceControl.php +++ b/framework/Web/UI/WebControls/TDataSourceControl.php @@ -4,7 +4,7 @@ *
* @author Qiang Xue <qiang.xue@gmail.com>
* @link http://www.pradosoft.com/
- * @copyright Copyright © 2005-2008 PradoSoft + * @copyright Copyright © 2005-2010 PradoSoft
* @license http://www.pradosoft.com/license/
* @version $Id$
* @package System.Web.UI.WebControls
@@ -103,6 +103,8 @@ class TReadOnlyDataSource extends TDataSourceControl {
if(!is_array($dataSource) && !($dataSource instanceof IDataSource) && !($dataSource instanceof Traversable))
throw new TInvalidDataTypeException('readonlydatasource_datasource_invalid');
+
+ parent::__construct();
$this->_dataSource=$dataSource;
$this->_dataMember=$dataMember;
}
diff --git a/framework/Web/UI/WebControls/TDataSourceView.php b/framework/Web/UI/WebControls/TDataSourceView.php index 7297fd45..d631352d 100644 --- a/framework/Web/UI/WebControls/TDataSourceView.php +++ b/framework/Web/UI/WebControls/TDataSourceView.php @@ -4,7 +4,7 @@ *
* @author Qiang Xue <qiang.xue@gmail.com>
* @link http://www.pradosoft.com/
- * @copyright Copyright © 2005-2008 PradoSoft + * @copyright Copyright © 2005-2008 PradoSoft
* @license http://www.pradosoft.com/license/
* @version $Id$
* @package System.Web.UI.WebControls
@@ -87,6 +87,8 @@ abstract class TDataSourceView extends TComponent public function __construct(IDataSource $owner,$viewName)
{
+ parent::__construct();
+
$this->_owner=$owner;
$this->_name=$viewName;
}
diff --git a/framework/Web/UI/WebControls/TDropDownListColumn.php b/framework/Web/UI/WebControls/TDropDownListColumn.php index a225abac..c7bd5ef8 100644 --- a/framework/Web/UI/WebControls/TDropDownListColumn.php +++ b/framework/Web/UI/WebControls/TDropDownListColumn.php @@ -4,7 +4,7 @@ *
* @author Qiang Xue <qiang.xue@gmail.com>
* @link http://www.pradosoft.com/
- * @copyright Copyright © 2005-2008 PradoSoft + * @copyright Copyright © 2005-2010 PradoSoft
* @license http://www.pradosoft.com/license/
* @version $Id$
* @package System.Web.UI.WebControls
@@ -66,6 +66,7 @@ class TDropDownListColumn extends TDataGridColumn public function __construct()
{
+ parent::__construct();
$this->_listControl=new TDropDownList;
}
diff --git a/framework/Web/UI/WebControls/THtmlArea.php b/framework/Web/UI/WebControls/THtmlArea.php index 8d55c074..e2f33805 100644 --- a/framework/Web/UI/WebControls/THtmlArea.php +++ b/framework/Web/UI/WebControls/THtmlArea.php @@ -4,7 +4,7 @@ *
* @author Wei Zhuo <weizhuo[at]gmail[dot]com>
* @link http://www.pradosoft.com/
- * @copyright Copyright © 2005-2008 PradoSoft
+ * @copyright Copyright © 2005-2010 PradoSoft
* @license http://www.pradosoft.com/license/
* @version $Id$
* @package System.Web.UI
@@ -165,6 +165,7 @@ class THtmlArea extends TTextBox */
public function __construct()
{
+ parent::__construct();
$this->setWidth('470px');
$this->setHeight('250px');
}
diff --git a/framework/Web/UI/WebControls/TImageButton.php b/framework/Web/UI/WebControls/TImageButton.php index 3fa9845a..65cf972f 100644 --- a/framework/Web/UI/WebControls/TImageButton.php +++ b/framework/Web/UI/WebControls/TImageButton.php @@ -4,7 +4,7 @@ *
* @author Qiang Xue <qiang.xue@gmail.com>
* @link http://www.pradosoft.com/
- * @copyright Copyright © 2005-2008 PradoSoft + * @copyright Copyright © 2005-2010 PradoSoft
* @license http://www.pradosoft.com/license/
* @version $Id$
* @package System.Web.UI.WebControls
@@ -402,6 +402,7 @@ class TImageClickEventParameter extends TEventParameter */
public function __construct($x,$y)
{
+ parent::__construct();
$this->_x=$x;
$this->_y=$y;
}
diff --git a/framework/Web/UI/WebControls/TImageMap.php b/framework/Web/UI/WebControls/TImageMap.php index d0cd8a0a..89b77c71 100644 --- a/framework/Web/UI/WebControls/TImageMap.php +++ b/framework/Web/UI/WebControls/TImageMap.php @@ -4,7 +4,7 @@ *
* @author Qiang Xue <qiang.xue@gmail.com>
* @link http://www.pradosoft.com/
- * @copyright Copyright © 2005-2008 PradoSoft + * @copyright Copyright © 2005-2010 PradoSoft
* @license http://www.pradosoft.com/license/
* @version $Id$
* @package System.Web.UI.WebControls
@@ -244,6 +244,7 @@ class TImageMapEventParameter extends TEventParameter */
public function __construct($postBackValue)
{
+ parent::__construct();
$this->_postBackValue=$postBackValue;
}
diff --git a/framework/Web/UI/WebControls/TListItem.php b/framework/Web/UI/WebControls/TListItem.php index eb72d183..9ba24bec 100644 --- a/framework/Web/UI/WebControls/TListItem.php +++ b/framework/Web/UI/WebControls/TListItem.php @@ -4,7 +4,7 @@ *
* @author Qiang Xue <qiang.xue@gmail.com>
* @link http://www.pradosoft.com/
- * @copyright Copyright © 2005-2008 PradoSoft + * @copyright Copyright © 2005-20010 PradoSoft
* @license http://www.pradosoft.com/license/
* @version $Id$
* @package System.Web.UI.WebControls
@@ -57,6 +57,8 @@ class TListItem extends TComponent */
public function __construct($text='',$value='',$enabled=true,$selected=false)
{
+ parent::__construct();
+
$this->setText($text);
$this->setValue($value);
$this->setEnabled($enabled);
diff --git a/framework/Web/UI/WebControls/TPager.php b/framework/Web/UI/WebControls/TPager.php index 51ea2a11..a33b523a 100644 --- a/framework/Web/UI/WebControls/TPager.php +++ b/framework/Web/UI/WebControls/TPager.php @@ -4,7 +4,7 @@ *
* @author Qiang Xue <qiang.xue@gmail.com>
* @link http://www.pradosoft.com/
- * @copyright Copyright © 2005-2008 PradoSoft + * @copyright Copyright © 2005-2008 PradoSoft
* @license http://www.pradosoft.com/license/
* @version $Id$
* @package System.Web.UI.WebControls
@@ -726,6 +726,8 @@ class TPagerPageChangedEventParameter extends TEventParameter */
public function __construct($source,$newPageIndex)
{
+ parent::__construct();
+
$this->_source=$source;
$this->_newIndex=$newPageIndex;
}
diff --git a/framework/Web/UI/WebControls/TRepeater.php b/framework/Web/UI/WebControls/TRepeater.php index a6c9903d..fa4d7b7f 100644 --- a/framework/Web/UI/WebControls/TRepeater.php +++ b/framework/Web/UI/WebControls/TRepeater.php @@ -4,7 +4,7 @@ *
* @author Qiang Xue <qiang.xue@gmail.com>
* @link http://www.pradosoft.com/
- * @copyright Copyright © 2005-2008 PradoSoft + * @copyright Copyright © 2005-2010 PradoSoft
* @license http://www.pradosoft.com/license/
* @version $Id$
* @package System.Web.UI.WebControls
@@ -802,6 +802,7 @@ class TRepeaterItemEventParameter extends TEventParameter */
public function __construct($item)
{
+ parent::__construct();
$this->_item=$item;
}
diff --git a/framework/Web/UI/WebControls/TStyle.php b/framework/Web/UI/WebControls/TStyle.php index 1b94cc8e..b507c8e3 100644 --- a/framework/Web/UI/WebControls/TStyle.php +++ b/framework/Web/UI/WebControls/TStyle.php @@ -4,7 +4,7 @@ *
* @author Qiang Xue <qiang.xue@gmail.com>
* @link http://www.pradosoft.com/
- * @copyright Copyright © 2005-2008 PradoSoft
+ * @copyright Copyright © 2005-2010 PradoSoft
* @license http://www.pradosoft.com/license/
* @version $Id$
* @package System.Web.UI.WebControls
@@ -54,6 +54,8 @@ class TStyle extends TComponent */
public function __construct($style=null)
{
+ parent::__construct();
+
if($style!==null)
$this->copyFrom($style);
}
diff --git a/framework/Web/UI/WebControls/TWizard.php b/framework/Web/UI/WebControls/TWizard.php index 774096f7..428b4c80 100644 --- a/framework/Web/UI/WebControls/TWizard.php +++ b/framework/Web/UI/WebControls/TWizard.php @@ -4,7 +4,7 @@ *
* @author Qiang Xue <qiang.xue@gmail.com>
* @link http://www.pradosoft.com/
- * @copyright Copyright © 2005-2008 PradoSoft + * @copyright Copyright © 2005-2010 PradoSoft
* @license http://www.pradosoft.com/license/
* @version $Id$
* @package System.Web.UI.WebControls
@@ -1391,21 +1391,21 @@ class TWizard extends TWebControl implements INamingContainer else if(strcasecmp($command,self::CMD_MOVETO)===0)
{
if($this->_cancelNavigation) // may be set in onSideBarButtonClick
- $navParam->setCancelNavigation(true); - $requestedStep=$param->getCommandParameter(); - if (!is_numeric($requestedStep)) - { - $requestedIndex=-1; - foreach ($this->getWizardSteps() as $index=>$step) - if ($step->getId()===$requestedStep) - { - $requestedIndex=$index; - break; - } - if ($requestedIndex<0) - throw new TConfigurationException('wizard_step_invalid'); - } - else + $navParam->setCancelNavigation(true);
+ $requestedStep=$param->getCommandParameter();
+ if (!is_numeric($requestedStep))
+ {
+ $requestedIndex=-1;
+ foreach ($this->getWizardSteps() as $index=>$step)
+ if ($step->getId()===$requestedStep)
+ {
+ $requestedIndex=$index;
+ break;
+ }
+ if ($requestedIndex<0)
+ throw new TConfigurationException('wizard_step_invalid');
+ }
+ else
$requestedIndex=TPropertyValue::ensureInteger($requestedStep);
$navParam->setNextStepIndex($requestedIndex);
$handled=true;
@@ -1687,6 +1687,7 @@ class TWizardStepCollection extends TList */
public function __construct(TWizard $wizard)
{
+ parent::__construct();
$this->_wizard=$wizard;
}
diff --git a/framework/Web/UI/WebControls/TXmlTransform.php b/framework/Web/UI/WebControls/TXmlTransform.php index 991aed39..bb2c044f 100644 --- a/framework/Web/UI/WebControls/TXmlTransform.php +++ b/framework/Web/UI/WebControls/TXmlTransform.php @@ -5,7 +5,7 @@ * @author Knut Urdalen <knut.urdalen@gmail.com> * @author Qiang Xue <qiang.xue@gmail.com> * @link http://www.pradosoft.com - * @copyright Copyright © 2005-2008 PradoSoft + * @copyright Copyright © 2005-2010 PradoSoft * @license http://www.pradosoft.com/license/ * @package System.Web.UI.WebControls */ @@ -49,6 +49,7 @@ class TXmlTransform extends TControl { if(!class_exists('XSLTProcessor', false)) { throw new TConfigurationException('xmltransform_xslextension_required'); } + parent::__construct(); } /** |