diff options
author | ctrlaltca@gmail.com <> | 2011-06-20 10:48:45 +0000 |
---|---|---|
committer | ctrlaltca@gmail.com <> | 2011-06-20 10:48:45 +0000 |
commit | 656c339879a071f2f875831281ed833b876e4361 (patch) | |
tree | b6f11d3ad8cb1f61b10b4e3b9fcb0a7d4d30f9e1 /framework/Web/UI/WebControls | |
parent | 0956370d34e2eefd0b5e556a6aaca6297ce1e3ce (diff) |
removed useless calls to empty contructor; reverted some additional undocumented changes; upported the "cgi workaround" to trunk/; large (fake) changeset are due to mixed cr/crlf used previously
Diffstat (limited to 'framework/Web/UI/WebControls')
-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, 31 insertions, 58 deletions
diff --git a/framework/Web/UI/WebControls/TBulletedList.php b/framework/Web/UI/WebControls/TBulletedList.php index 2c8e3c97..5f4aa49c 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-2010 PradoSoft
+ * @copyright Copyright © 2005-2008 PradoSoft * @license http://www.pradosoft.com/license/
* @version $Id$
* @package System.Web.UI.WebControls
@@ -431,7 +431,6 @@ 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 f0e05370..7fed2b84 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-2010 PradoSoft
+ * @copyright Copyright © 2005-2008 PradoSoft
* @license http://www.pradosoft.com/license/
* @version $Id$
* @package System.Web.UI.WebControls
@@ -180,7 +180,6 @@ 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 4c7fca97..b4916342 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-2010 PradoSoft
+ * @copyright Copyright © 2005-2008 PradoSoft * @license http://www.pradosoft.com/license/
* @version $Id$
* @package System.Web.UI.WebControls
@@ -1689,7 +1689,6 @@ class TDataGridItemEventParameter extends TEventParameter */
public function __construct(TDataGridItem $item)
{
- parent::__construct();
$this->_item=$item;
}
@@ -1728,7 +1727,6 @@ class TDataGridPagerEventParameter extends TEventParameter */
public function __construct(TDataGridPager $pager)
{
- parent::__construct();
$this->_pager=$pager;
}
@@ -1830,7 +1828,6 @@ class TDataGridSortCommandEventParameter extends TEventParameter */
public function __construct($source,TDataGridCommandEventParameter $param)
{
- parent::__construct();
$this->_source=$source;
$this->_sortExpression=$param->getCommandParameter();
}
@@ -1885,7 +1882,6 @@ class TDataGridPageChangedEventParameter extends TEventParameter */
public function __construct($source,$newPageIndex)
{
- parent::__construct();
$this->_source=$source;
$this->_newIndex=$newPageIndex;
}
@@ -1950,7 +1946,6 @@ class TDataGridItem extends TTableRow implements INamingContainer */
public function __construct($itemIndex,$dataSourceIndex,$itemType)
{
- parent::__construct();
$this->_itemIndex=$itemIndex;
$this->_dataSourceIndex=$dataSourceIndex;
$this->setItemType($itemType);
@@ -2070,7 +2065,6 @@ class TDataGridPager extends TPanel implements INamingContainer */
public function __construct($dataGrid)
{
- parent::__construct();
$this->_dataGrid=$dataGrid;
}
@@ -2162,7 +2156,6 @@ 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 0bbfc9ac..1349d6a6 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-2010 PradoSoft
+ * @copyright Copyright © 2005-2008 PradoSoft * @license http://www.pradosoft.com/license/
* @version $Id$
* @package System.Web.UI.WebControls
@@ -1517,7 +1517,6 @@ 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 1deaa857..1d0823ff 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-2010 PradoSoft
+ * @copyright Copyright © 2005-2008 PradoSoft * @license http://www.pradosoft.com/license/
* @version $Id$
* @package System.Web.UI.WebControls
@@ -103,8 +103,6 @@ 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 d631352d..7297fd45 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,8 +87,6 @@ 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 c7bd5ef8..a225abac 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-2010 PradoSoft
+ * @copyright Copyright © 2005-2008 PradoSoft * @license http://www.pradosoft.com/license/
* @version $Id$
* @package System.Web.UI.WebControls
@@ -66,7 +66,6 @@ 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 ba31b713..0352319b 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-2010 PradoSoft
+ * @copyright Copyright © 2005-2008 PradoSoft
* @license http://www.pradosoft.com/license/
* @version $Id$
* @package System.Web.UI.WebControls
@@ -221,7 +221,6 @@ 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 65cf972f..3fa9845a 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-2010 PradoSoft
+ * @copyright Copyright © 2005-2008 PradoSoft * @license http://www.pradosoft.com/license/
* @version $Id$
* @package System.Web.UI.WebControls
@@ -402,7 +402,6 @@ 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 89b77c71..d0cd8a0a 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-2010 PradoSoft
+ * @copyright Copyright © 2005-2008 PradoSoft * @license http://www.pradosoft.com/license/
* @version $Id$
* @package System.Web.UI.WebControls
@@ -244,7 +244,6 @@ 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 9ba24bec..eb72d183 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-20010 PradoSoft
+ * @copyright Copyright © 2005-2008 PradoSoft * @license http://www.pradosoft.com/license/
* @version $Id$
* @package System.Web.UI.WebControls
@@ -57,8 +57,6 @@ 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 a33b523a..51ea2a11 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,8 +726,6 @@ 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 fa4d7b7f..a6c9903d 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-2010 PradoSoft
+ * @copyright Copyright © 2005-2008 PradoSoft * @license http://www.pradosoft.com/license/
* @version $Id$
* @package System.Web.UI.WebControls
@@ -802,7 +802,6 @@ 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 b507c8e3..1b94cc8e 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-2010 PradoSoft
+ * @copyright Copyright © 2005-2008 PradoSoft
* @license http://www.pradosoft.com/license/
* @version $Id$
* @package System.Web.UI.WebControls
@@ -54,8 +54,6 @@ 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 4252a159..a9268b2b 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-2010 PradoSoft
+ * @copyright Copyright © 2005-2008 PradoSoft * @license http://www.pradosoft.com/license/
* @version $Id$
* @package System.Web.UI.WebControls
@@ -1397,21 +1397,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;
@@ -1693,7 +1693,6 @@ 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 d00ab974..c1a372e1 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-2010 PradoSoft + * @copyright Copyright © 2005-2008 PradoSoft * @license http://www.pradosoft.com/license/ * @package System.Web.UI.WebControls */ @@ -49,7 +49,6 @@ class TXmlTransform extends TControl { if(!class_exists('XSLTProcessor', false)) { throw new TConfigurationException('xmltransform_xslextension_required'); } - parent::__construct(); } /** |