fixed last blocking error related to the build script. it completes successfully now

14 files changed, 176 insertions, 86 deletions

diff --git a/framework/Collections/TPriorityList.php b/framework/Collections/TPriorityList.php
index c1c635b5..632314b3 100644
--- a/framework/Collections/TPriorityList.php
+++ b/framework/Collections/TPriorityList.php
@@ -214,7 +214,7 @@ class TPriorityList extends TList
 	 * {@link offsetGet} calls this method.

 	 * @param integer the index of the item to get

 	 * @return mixed the element at the offset

-	 * @error TInvalidDataValueException Issued when the index is invalid

+	 * @throws TInvalidDataValueException Issued when the index is invalid

 	 */

 	public function itemAt($index)

 	{

diff --git a/framework/Data/SqlMap/Configuration/TResultProperty.php b/framework/Data/SqlMap/Configuration/TResultProperty.php
index 24401812..d4c849bf 100644
--- a/framework/Data/SqlMap/Configuration/TResultProperty.php
+++ b/framework/Data/SqlMap/Configuration/TResultProperty.php
@@ -139,7 +139,7 @@ class TResultProperty extends TComponent
 	}

 

 	/**

-	 * @parma string ID of another <resultMap> used to fill the property.

+	 * @param string ID of another <resultMap> used to fill the property.

 	 */

 	public function setResultMapping($value)

 	{

diff --git a/framework/Testing/Data/Schema/mssql/TMssqlCommandBuilder.php b/framework/Testing/Data/Schema/mssql/TMssqlCommandBuilder.php
index 17a6f6ab..54190f33 100755
--- a/framework/Testing/Data/Schema/mssql/TMssqlCommandBuilder.php
+++ b/framework/Testing/Data/Schema/mssql/TMssqlCommandBuilder.php
@@ -176,6 +176,7 @@ class TMssqlCommandBuilder extends TDbCommandBuilder
 	 * <li>
 	 * No clauses should follow the ORDER BY clause, e.g. no COMPUTE or FOR clauses.
 	 * </li>
+	 * </ul>
 	 *
 	 * @param string SQL query string.
 	 * @param integer maximum number of rows, -1 to ignore limit.
diff --git a/framework/Testing/Data/TDbConnection.php b/framework/Testing/Data/TDbConnection.php
index 5da0e26e..54061239 100755
--- a/framework/Testing/Data/TDbConnection.php
+++ b/framework/Testing/Data/TDbConnection.php
@@ -438,7 +438,7 @@ class TDbConnection extends TComponent
 	 *
 	 * Prado 3.1 compatibility method.
 	 *
-	 * @see {@link quoteValue}
+	 * @see quoteValue
 	 *
 	 * @param string $str
 	 * @return string
diff --git a/framework/Util/TRpcClient.php b/framework/Util/TRpcClient.php
index 73ff25ed..dbda931e 100644
--- a/framework/Util/TRpcClient.php
+++ b/framework/Util/TRpcClient.php
@@ -7,6 +7,7 @@
  * @license http://www.pradosoft.com/license/
  * @version $Id: TRpcClient.php 137 2010-03-27 22:13:36Z rrogge $
  * @since 3.2
+ * @package System.Util
  */
 
 /**
@@ -280,7 +281,7 @@ class TJsonRpcClient extends TRpcClient
 	 * @param string url of the rpc server
 	 * @param boolean whether the requests are considered to be notifications (completely ignoring the response) (default: false)
 	 */
-	public static function create($serverUrl, $isNotification = false)
+	public static function create($type, $serverUrl, $isNotification = false)
 	{
 		return new self($serverUrl, $isNotification);
 	}
@@ -351,7 +352,7 @@ class TXmlRpcClient extends TRpcClient
 	 * @param string url of the rpc server
 	 * @param boolean whether the requests are considered to be notifications (completely ignoring the response) (default: false)
 	 */
-	public static function create($serverUrl, $isNotification = false)
+	public static function create($type, $serverUrl, $isNotification = false)
 	{
 		return new self($serverUrl, $isNotification);
 	}
diff --git a/framework/Web/Services/TRpcService.php b/framework/Web/Services/TRpcService.php
index 3ea5d743..afde9bb1 100644
--- a/framework/Web/Services/TRpcService.php
+++ b/framework/Web/Services/TRpcService.php
@@ -7,6 +7,7 @@
  * @license http://www.pradosoft.com/license/
  * @version $Id$
  * @since 3.2
+ * @package System.Web.Services
  */
 
 /**
@@ -25,12 +26,12 @@
 class TRpcService extends TService
 {
 	/**
-	 * @const string base api provider class which every API must extend
+	 * const string base api provider class which every API must extend
 	 */
 	const BASE_API_PROVIDER = 'TRpcApiProvider';
 
 	/**
-	 * @const string base RPC server implementation
+	 * const string base RPC server implementation
 	 */
 	const BASE_RPC_SERVER = 'TRpcServer';
 
@@ -127,7 +128,7 @@ class TRpcService extends TService
 			throw new THttpException(405, 'Invalid request method "'.$_method.'"!'); // TODO Exception muss "Allow POST" Header setzen
 
 		if(($_mimeType = $_request->getContentType()) === null)
-			throw new THttpException(406, 'Content-Type is missing!'); // TODO Exception muss gültige Content-Type werte zurück geben
+			throw new THttpException(406, 'Content-Type is missing!'); // TODO Exception muss gültige Content-Type werte zurück geben
 
 		if(!in_array($_mimeType, array_keys($this->protocolHandlers)))
 			throw new THttpException(406, 'Unsupported Content-Type!'); // TODO see previous
diff --git a/framework/Web/UI/ActiveControls/TActiveDataGrid.php b/framework/Web/UI/ActiveControls/TActiveDataGrid.php
index 156a55a0..358bd414 100644
--- a/framework/Web/UI/ActiveControls/TActiveDataGrid.php
+++ b/framework/Web/UI/ActiveControls/TActiveDataGrid.php
@@ -180,7 +180,7 @@ class TActiveDataGrid extends TDataGrid implements IActiveControl, ISurroundable
  *
  * @author LANDWEHR Computer und Software GmbH <programmierung@landwehr-software.de>
  * @package System.Web.UI.ActiveControls
- * @since 3.1.4
+ * @since 3.2
  */
 class TActiveBoundColumn extends TBoundColumn {
 	protected function initializeHeaderCell($cell,$columnIndex) {
@@ -259,7 +259,7 @@ class TActiveBoundColumn extends TBoundColumn {
  *
  * @author LANDWEHR Computer und Software GmbH <programmierung@landwehr-software.de>
  * @package System.Web.UI.ActiveControls
- * @since 3.1.4
+ * @since 3.2
  */
 class TActiveEditCommandColumn extends TEditCommandColumn {
 	protected function createButton($commandName,$text,$causesValidation,$validationGroup) {
@@ -301,7 +301,7 @@ class TActiveEditCommandColumn extends TEditCommandColumn {
  *
  * @author LANDWEHR Computer und Software GmbH <programmierung@landwehr-software.de>
  * @package System.Web.UI.ActiveControls
- * @since 3.1.4
+ * @since 3.2
  */
 class TActiveButtonColumn extends TButtonColumn {
 	public function initializeCell($cell,$columnIndex,$itemType) {
@@ -348,7 +348,7 @@ class TActiveButtonColumn extends TButtonColumn {
  *
  * @author LANDWEHR Computer und Software GmbH <programmierung@landwehr-software.de>
  * @package System.Web.UI.ActiveControls
- * @since 3.1.4
+ * @since 3.2
  */
 class TActiveTemplateColumn extends TTemplateColumn {
 	protected function initializeHeaderCell($cell,$columnIndex) {
@@ -405,6 +405,20 @@ class TActiveTemplateColumn extends TTemplateColumn {
 	}
 }
 
+/**
+ * TActiveHyperLinkColumn class
+ *
+ * TActiveHyperLinkColumn contains a hyperlink for each item in the column.
+ *
+ * This is the active counterpart to the {@link THyperLinkColumn} control. For that purpose,
+ * if sorting is allowed, the header links/buttons are replaced by active controls.
+ *
+ * Please refer to the original documentation of the {@link THyperLinkColumn} for usage.
+ *
+ * @author LANDWEHR Computer und Software GmbH <programmierung@landwehr-software.de>
+ * @package System.Web.UI.ActiveControls
+ * @since 3.2
+ */
 class TActiveHyperLinkColumn extends THyperLinkColumn
 {
 
@@ -471,9 +485,23 @@ class TActiveHyperLinkColumn extends THyperLinkColumn
 	}
 }
 
+/**
+ * TActiveCheckBoxColumn class
+ *
+ * TActiveCheckBoxColumn represents a checkbox column that is bound to a field in a data source.
+ *
+ * This is the active counterpart to the {@link TCheckBoxColumn} control. For that purpose,
+ * if sorting is allowed, the header links/buttons are replaced by active controls.
+ *
+ * Please refer to the original documentation of the {@link TCheckBoxColumn} for usage.
+ *
+ * @author LANDWEHR Computer und Software GmbH <programmierung@landwehr-software.de>
+ * @package System.Web.UI.ActiveControls
+ * @since 3.2
+ */
 class TActiveCheckBoxColumn extends TCheckBoxColumn
 {
-		/**
+	/**
 	 * Initializes the specified cell to its initial values.
 	 * This method overrides the parent implementation.
 	 * It creates a checkbox inside the cell.
@@ -563,6 +591,20 @@ class TActiveCheckBoxColumn extends TCheckBoxColumn
 	}
 }
 
+/**
+ * TActiveDropDownListColumn class
+ *
+ * TActiveDropDownListColumn represents a column that is bound to a field in a data source.
+ *
+ * This is the active counterpart to the {@link TDropDownListColumn} control. For that purpose,
+ * if sorting is allowed, the header links/buttons are replaced by active controls.
+ *
+ * Please refer to the original documentation of the {@link TDropDownListColumn} for usage.
+ *
+ * @author LANDWEHR Computer und Software GmbH <programmierung@landwehr-software.de>
+ * @package System.Web.UI.ActiveControls
+ * @since 3.2
+ */
 class TActiveDropDownListColumn extends TDropDownListColumn
 {
 	protected function initializeHeaderCell($cell,$columnIndex)
diff --git a/framework/Web/UI/ActiveControls/TActiveDataList.php b/framework/Web/UI/ActiveControls/TActiveDataList.php
index f0b0e9cb..dbf70067 100644
--- a/framework/Web/UI/ActiveControls/TActiveDataList.php
+++ b/framework/Web/UI/ActiveControls/TActiveDataList.php
@@ -1,5 +1,15 @@
 <?php
 /**
+ * TActiveDataList class file
+ * 
+ * @author Marcos Aurelio Nobre <marconobre@gmail.com>
+ * @copyright Copyright &copy; 2008, PradoSoft
+ * @license http://www.pradosoft.com/license
+ * @package System.Web.UI.ActiveControls
+ * @version $Id: TActiveDataList.php 2706 2009-09-24 14:42:30Z rojaro $
+ */
+
+/**
  * TActiveDataList class
  *
  * TActiveDataList represents a data bound and updatable grid control which is the
diff --git a/framework/Web/UI/ActiveControls/TActiveRepeater.php b/framework/Web/UI/ActiveControls/TActiveRepeater.php
index 941b6322..ccfda4aa 100644
--- a/framework/Web/UI/ActiveControls/TActiveRepeater.php
+++ b/framework/Web/UI/ActiveControls/TActiveRepeater.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * TActiveRepeater class file
+ *
+ * @author LANDWEHR Computer und Software GmbH <programmierung@landwehr-software.de>
+ * @package System.Web.UI.ActiveControls
+ * @since 3.2
+ * @version $Id: TActiveRepeater.php 2707 2009-09-29 10:33:30Z Christophe.Boulain $
+ */
 
 /**
  * TActiveRepeater class
diff --git a/framework/Web/UI/ActiveControls/TDraggable.php b/framework/Web/UI/ActiveControls/TDraggable.php
index 84db0c82..773babca 100755
--- a/framework/Web/UI/ActiveControls/TDraggable.php
+++ b/framework/Web/UI/ActiveControls/TDraggable.php
@@ -7,7 +7,6 @@
  * @license http://www.pradosoft.com/license
  * @package System.Web.UI.ActiveControls
  * @version $Id$
- * @package System.Web.UI.ActiveControls
  */
 
 /**
@@ -28,7 +27,6 @@
  * @license http://www.pradosoft.com/license
  * @package System.Web.UI.ActiveControls
  * @version $Id$
- * @package System.Web.UI.ActiveControls
  */
 class TDraggable extends TPanel 
 {
@@ -199,6 +197,13 @@ class TDraggable extends TPanel
 	
 }
 
+/**
+ * @author Christophe BOULAIN (Christophe.Boulain@gmail.com)
+ * @copyright Copyright &copy; 2008, PradoSoft
+ * @license http://www.pradosoft.com/license
+ * @package System.Web.UI.ActiveControls
+ * @version $Id$
+ */
 class TDraggableConstraint extends TEnumerable
 {
 	const None='None';
@@ -206,6 +211,13 @@ class TDraggableConstraint extends TEnumerable
 	const Vertical='Vertical';
 }
 
+/**
+ * @author Christophe BOULAIN (Christophe.Boulain@gmail.com)
+ * @copyright Copyright &copy; 2008, PradoSoft
+ * @license http://www.pradosoft.com/license
+ * @package System.Web.UI.ActiveControls
+ * @version $Id$
+ */
 class TDraggableGhostingOptions extends TEnumerable
 {
 	const None='None';
@@ -213,6 +225,13 @@ class TDraggableGhostingOptions extends TEnumerable
 	const SuperGhosting='SuperGhosting';
 }
 
+/**
+ * @author Christophe BOULAIN (Christophe.Boulain@gmail.com)
+ * @copyright Copyright &copy; 2008, PradoSoft
+ * @license http://www.pradosoft.com/license
+ * @package System.Web.UI.ActiveControls
+ * @version $Id$
+ */
 class TDraggableRevertOptions extends TEnumerable
 {
 	const None='None';
diff --git a/framework/Web/UI/ActiveControls/TDropContainer.php b/framework/Web/UI/ActiveControls/TDropContainer.php
index b9981033..5271cde6 100755
--- a/framework/Web/UI/ActiveControls/TDropContainer.php
+++ b/framework/Web/UI/ActiveControls/TDropContainer.php
@@ -31,7 +31,7 @@ Prado::using('System.Web.UI.ActiveControls.TActivePanel');
  * 
  * Events:
  * 
- * <b>{@link OnDrop OnDrop} : raised when a TDraggable control is dropped. The dropped control id is encapsulated in the event parameter,
+ * <b>{@link OnDrop OnDrop}</b> : raised when a TDraggable control is dropped. The dropped control id is encapsulated in the event parameter,
  * as well as mouse coordinates and key modifiers status
  *
  * 
diff --git a/framework/Web/UI/ActiveControls/TValueTriggeredCallback.php b/framework/Web/UI/ActiveControls/TValueTriggeredCallback.php
index 305afd70..4f7c8332 100644
--- a/framework/Web/UI/ActiveControls/TValueTriggeredCallback.php
+++ b/framework/Web/UI/ActiveControls/TValueTriggeredCallback.php
@@ -4,12 +4,14 @@
  *

  * @author Wei Zhuo <weizhuo[at]gamil[dot]com>

  * @link http://www.pradosoft.com/

- * @copyright Copyright &copy; 2005-2008 PradoSoft
+ * @copyright Copyright &copy; 2005-2008 PradoSoft

  * @license http://www.pradosoft.com/license/

  * @version $Id$

  * @package System.Web.UI.ActiveControls

  */

 

+Prado::using('System.Web.UI.ActiveControls.TTriggeredCallback');

+

 /**

  * TValueTriggeredCallback Class

  *

diff --git a/framework/Web/UI/WebControls/TTextHighlighter.php b/framework/Web/UI/WebControls/TTextHighlighter.php
index 890deb05..8218587c 100644
--- a/framework/Web/UI/WebControls/TTextHighlighter.php
+++ b/framework/Web/UI/WebControls/TTextHighlighter.php
@@ -4,16 +4,16 @@
  *

  * @author Wei Zhuo<weizhuo[at]gmail[dot]com>

  * @link http://www.pradosoft.com/

- * @copyright Copyright &copy; 2005-2008 PradoSoft
+ * @copyright Copyright &copy; 2005-2008 PradoSoft

  * @license http://www.pradosoft.com/license/

  * @version $Id$

  * @package System.Web.UI.WebControls

  */

 

 Prado::using('System.3rdParty.TextHighlighter.Text.Highlighter',false);

-Prado::using('System.3rdParty.TextHighlighter.Text.Highlighter.Renderer.Html',false);
-Prado::using('System.Web.UI.WebControls.TTextProcessor');
-
+Prado::using('System.3rdParty.TextHighlighter.Text.Highlighter.Renderer.Html',false);

+Prado::using('System.Web.UI.WebControls.TTextProcessor');

+

 

 /**

  * TTextHighlighter class.

@@ -37,8 +37,8 @@ Prado::using('System.Web.UI.WebControls.TTextProcessor');
  */

 class TTextHighlighter extends TTextProcessor

 {

-	private static $_lineNumberStyle=array(TTextHighlighterLineNumberStyle::Li => HL_NUMBERS_LI, TTextHighlighterLineNumberStyle::Table => HL_NUMBERS_TABLE);
-
+	private static $_lineNumberStyle=array(TTextHighlighterLineNumberStyle::Li => HL_NUMBERS_LI, TTextHighlighterLineNumberStyle::Table => HL_NUMBERS_TABLE);

+

 	/**

 	 * @return string tag name of the panel

 	 */

@@ -99,39 +99,39 @@ class TTextHighlighter extends TTextProcessor
 	{

 		$this->setViewState('CopyCode', TPropertyValue::ensureBoolean($value), false);

 	}

-
-	/**
-	 * @return TTextHighlighterLineNumberStyle style of row number, Table by default
-	 */
-	public function getLineNumberStyle()
-	{
-		return $this->getViewState('LineNumberStyle', TTextHighlighterLineNumberStyle::Table);
+

+	/**

+	 * @return TTextHighlighterLineNumberStyle style of row number, Table by default

+	 */

+	public function getLineNumberStyle()

+	{

+		return $this->getViewState('LineNumberStyle', TTextHighlighterLineNumberStyle::Table);

+	}

+

+	/**

+	 * @param TTextHighlighterLineNumberStyle style of row number

+	 */

+	public function setLineNumberStyle($value)

+	{

+		$this->setViewState('LineNumberStyle', TPropertyValue::ensureEnum($value,'TTextHighlighterLineNumberStyle'));

+	}

+

+	/**

+	 * @return integer tab size. Defaults to 4.

+	 */

+	public function getTabSize()

+	{

+		return $this->getViewState('TabSize', 4);

+	}

+

+	/**

+	 * @param integer tab size

+	 */

+	public function setTabSize($value)

+	{

+		$this->setViewState('TabSize', TPropertyValue::ensureInteger($value));

 	}

-
-	/**
-	 * @param TTextHighlighterLineNumberStyle style of row number
-	 */
-	public function setLineNumberStyle($value)
-	{
-		$this->setViewState('LineNumberStyle', TPropertyValue::ensureEnum($value,'TTextHighlighterLineNumberStyle'));
-	}
-
-	/**
-	 * @return integer tab size. Defaults to 4.
-	 */
-	public function getTabSize()
-	{
-		return $this->getViewState('TabSize', 4);
-	}
-
-	/**
-	 * @param integer tab size
-	 */
-	public function setTabSize($value)
-	{
-		$this->setViewState('TabSize', TPropertyValue::ensureInteger($value));
-	}
-
+

 	/**

 	 * Registers css style for the highlighted result.

 	 * This method overrides parent implementation.

@@ -143,18 +143,18 @@ class TTextHighlighter extends TTextProcessor
 		$this->registerStyleSheet();

 		$this->getPage()->getClientScript()->registerPradoScript('prado');

 	}

-
-	/**
-	 * Registers the stylesheet for presentation.
-	 */
-	protected function registerStyleSheet()
-	{
-		$cs=$this->getPage()->getClientScript();
-		$cssFile=Prado::getPathOfNamespace('System.3rdParty.TextHighlighter.highlight','.css');
-		$cssKey='prado:TTextHighlighter:'.$cssFile;
-		if(!$cs->isStyleSheetFileRegistered($cssKey))
-			$cs->registerStyleSheetFile($cssKey, $this->publishFilePath($cssFile));
-	}
+

+	/**

+	 * Registers the stylesheet for presentation.

+	 */

+	protected function registerStyleSheet()

+	{

+		$cs=$this->getPage()->getClientScript();

+		$cssFile=Prado::getPathOfNamespace('System.3rdParty.TextHighlighter.highlight','.css');

+		$cssKey='prado:TTextHighlighter:'.$cssFile;

+		if(!$cs->isStyleSheetFileRegistered($cssKey))

+			$cs->registerStyleSheetFile($cssKey, $this->publishFilePath($cssFile));

+	}

 

 	/**

 	 * Processes a text string.

@@ -163,18 +163,18 @@ class TTextHighlighter extends TTextProcessor
 	 * @return string the processed text result

 	 */

 	public function processText($text)

-	{
-		try
-		{
-			$highlighter=Text_Highlighter::factory($this->getLanguage());
-		}
-		catch(Exception $e)
-		{
-			$highlighter=false;
-		}
-		if($highlighter===false)
-			return ('<pre>'.htmlentities(trim($text)).'</pre>');
-
+	{

+		try

+		{

+			$highlighter=Text_Highlighter::factory($this->getLanguage());

+		}

+		catch(Exception $e)

+		{

+			$highlighter=false;

+		}

+		if($highlighter===false)

+			return ('<pre>'.htmlentities(trim($text)).'</pre>');

+

 		$options["use_language"]=true;

 		$options["tabsize"] = $this->getTabSize();

 		if ($this->getShowLineNumbers())

@@ -191,10 +191,16 @@ class TTextHighlighter extends TTextProcessor
 		$id = $this->getClientID();

 		return TJavaScript::renderScriptBlock("new Prado.WebUI.TTextHighlighter('{$id}');");

 	}

-}
-
-class TTextHighlighterLineNumberStyle extends TEnumerable
-{
-	const Li='Li';
-	const Table='Table';
+}

+

+/**

+ * @author Wei Zhuo<weizhuo[at]gmail[dot]com>

+ * @version $Id$

+ * @package System.Web.UI.WebControls

+ * @since 3.0

+ */

+class TTextHighlighterLineNumberStyle extends TEnumerable

+{

+	const Li='Li';

+	const Table='Table';

 }

diff --git a/framework/Web/UI/WebControls/TWebControl.php b/framework/Web/UI/WebControls/TWebControl.php
index de9e4868..f8950ac3 100644
--- a/framework/Web/UI/WebControls/TWebControl.php
+++ b/framework/Web/UI/WebControls/TWebControl.php
@@ -400,7 +400,7 @@ class TWebControl extends TControl implements IStyleable
 	
 
 	/**
-	 * @difficulty if your subclass overrides the onPreRender method be sure to call 
+	 * If your subclass overrides the onPreRender method be sure to call 
 	 * this method through parent::onPreRender($param); so your sub-class can be decorated,
 	 * among other things.
 	 * @param TEventParameter event parameter to be passed to the event handlers