From 39dd5b21bc2c5b93b52d001789aba61f749360a7 Mon Sep 17 00:00:00 2001
From: "ctrlaltca@gmail.com" <>
Date: Sat, 28 Jan 2012 17:49:48 +0000
Subject: some fixes related to build scripts, now the "dist" task completes
successfully
---
build.xml | 10 ++-
.../Exceptions/TActiveRecordException.php | 14 +++-
.../Web/UI/ActiveControls/TActiveFileUpload.php | 8 +++
framework/Web/UI/WebControls/TAccordion.php | 84 ++++++++++++++--------
framework/prado.php | 10 ++-
5 files changed, 86 insertions(+), 40 deletions(-)
diff --git a/build.xml b/build.xml
index 027d4d8d..a91a4c36 100644
--- a/build.xml
+++ b/build.xml
@@ -354,8 +354,6 @@ var_dump($sqlmap->queryForList('products-with-price', 50));
-
-
Building API manuals...
@@ -393,11 +391,11 @@ var_dump($sqlmap->queryForList('products-with-price', 50));
Moving doc files to build...
-
+
-
+
@@ -426,11 +424,11 @@ var_dump($sqlmap->queryForList('products-with-price', 50));
Moving HTML docs to Web folder...
-
+
-
+
diff --git a/framework/Data/ActiveRecord/Exceptions/TActiveRecordException.php b/framework/Data/ActiveRecord/Exceptions/TActiveRecordException.php
index 51718334..327a11b1 100644
--- a/framework/Data/ActiveRecord/Exceptions/TActiveRecordException.php
+++ b/framework/Data/ActiveRecord/Exceptions/TActiveRecordException.php
@@ -1,10 +1,10 @@
-
* @link http://www.pradosoft.com/
- * @copyright Copyright © 2005-2011 PradoSoft
+ * @copyright Copyright © 2005-2011 PradoSoft
* @license http://www.pradosoft.com/license/
* @version $Id$
* @package System.Data.ActiveRecord
@@ -34,8 +34,16 @@ class TActiveRecordException extends TDbException
}
}
+/**
+ * TActiveRecordConfigurationException class.
+ *
+ * @author Wei Zhuo
+ * @version $Id$
+ * @package System.Data.ActiveRecord
+ * @since 3.1
+ */
class TActiveRecordConfigurationException extends TActiveRecordException
{
}
-
+
diff --git a/framework/Web/UI/ActiveControls/TActiveFileUpload.php b/framework/Web/UI/ActiveControls/TActiveFileUpload.php
index 8cc1fe9a..0ceb82fc 100755
--- a/framework/Web/UI/ActiveControls/TActiveFileUpload.php
+++ b/framework/Web/UI/ActiveControls/TActiveFileUpload.php
@@ -441,6 +441,14 @@ EOS;
}
}
+/**
+ * TActiveFileUploadCallbackParams is an internal class used by {@link TActiveFileUpload}.
+ *
+ * @author Bradley Booms
+ * @author Christophe Boulain
+ * @version $Id$
+ * @package System.Web.UI.ActiveControls
+ */
class TActiveFileUploadCallbackParams
{
public $localName;
diff --git a/framework/Web/UI/WebControls/TAccordion.php b/framework/Web/UI/WebControls/TAccordion.php
index 29427195..60494617 100644
--- a/framework/Web/UI/WebControls/TAccordion.php
+++ b/framework/Web/UI/WebControls/TAccordion.php
@@ -90,8 +90,8 @@ class TAccordion extends TWebControl implements IPostBackDataHandler
/**
* Returns the index of the active accordion view.
- * Note, this property may not return the correct index.
- * To ensure the correctness, call {@link getActiveView()} first.
+ * Note, this property may not return the correct index.
+ * To ensure the correctness, call {@link getActiveView()} first.
* @return integer the zero-based index of the active accordion view. If -1, it means no active accordion view. Default is 0 (the first view is active).
*/
public function getActiveViewIndex()
@@ -108,24 +108,24 @@ class TAccordion extends TWebControl implements IPostBackDataHandler
$this->setViewState('ActiveViewIndex',TPropertyValue::ensureInteger($value),0);
}
- /**
+ /**
* Returns the ID of the active accordion view.
- * Note, this property may not return the correct ID.
- * To ensure the correctness, call {@link getActiveView()} first.
+ * Note, this property may not return the correct ID.
+ * To ensure the correctness, call {@link getActiveView()} first.
* @return string The ID of the active accordion view. Defaults to '', meaning not set.
- */
- public function getActiveViewID()
- {
+ */
+ public function getActiveViewID()
+ {
return $this->getViewState('ActiveViewID','');
- }
+ }
- /**
+ /**
* @param string The ID of the active accordion view.
- */
- public function setActiveViewID($value)
- {
+ */
+ public function setActiveViewID($value)
+ {
$this->setViewState('ActiveViewID',$value,'');
- }
+ }
/**
* Returns the currently active view.
@@ -251,21 +251,21 @@ class TAccordion extends TWebControl implements IPostBackDataHandler
return $style;
}
- /**
+ /**
* @return string CSS class for view headers. Defaults to 'accordion-header'.
- */
+ */
public function getHeaderCssClass()
- {
+ {
return $this->getHeaderStyle()->getCssClass();
- }
+ }
- /**
+ /**
* @param string CSS class for view headers.
- */
+ */
public function setHeaderCssClass($value)
- {
+ {
$this->getHeaderStyle()->setCssClass($value);
- }
+ }
/**
* @return TStyle the style for all the inactive header div
@@ -281,21 +281,21 @@ class TAccordion extends TWebControl implements IPostBackDataHandler
return $style;
}
- /**
+ /**
* @return string Extra CSS class for the active header. Defaults to 'accordion-header-active'.
- */
+ */
public function getActiveHeaderCssClass()
- {
+ {
return $this->getActiveHeaderStyle()->getCssClass();
- }
+ }
- /**
+ /**
* @param string Extra CSS class for the active header. Will be added to the normal header specified by HeaderCssClass.
- */
+ */
public function setActiveHeaderCssClass($value)
- {
+ {
$this->getActiveHeaderStyle()->setCssClass($value);
- }
+ }
/**
* @return TStyle the style for the active header div
@@ -536,6 +536,20 @@ class TAccordion extends TWebControl implements IPostBackDataHandler
}
+/**
+ * Class TAccordionView.
+ *
+ * TAccordionView represents a single view in a {@link TAccordion}.
+ *
+ * TAccordionView is represented inside the {@link TAccordion} with an header label whose text is defined by
+ * the {@link setCaption Caption} property; optionally the label can be an hyperlink: use the
+ * {@link setNavigateUrl NavigateUrl} property to define the destination url.
+ *
+ * @author Gabor Berczi, DevWorx Hungary
+ * @version $Id: TAccordion.php 2915 2011-05-15 16:26:11Z ctrlaltca@gmail.com $
+ * @package System.Web.UI.WebControls
+ * @since 3.2
+ */
class TAccordionView extends TWebControl
{
private $_active=false;
@@ -685,6 +699,16 @@ class TAccordionView extends TWebControl
}
}
+/**
+ * Class TAccordionViewCollection.
+ *
+ * TAccordionViewCollection is a collection of {@link TAccordionView} to be used inside a {@link TAccordion}.
+ *
+ * @author Gabor Berczi, DevWorx Hungary
+ * @version $Id: TAccordion.php 2915 2011-05-15 16:26:11Z ctrlaltca@gmail.com $
+ * @package System.Web.UI.WebControls
+ * @since 3.2
+ */
class TAccordionViewCollection extends TControlCollection
{
/**
diff --git a/framework/prado.php b/framework/prado.php
index 38c9e308..f3dc2bed 100644
--- a/framework/prado.php
+++ b/framework/prado.php
@@ -12,7 +12,7 @@
*
* @author Qiang Xue
* @link http://www.pradosoft.com/
- * @copyright Copyright © 2005-2011 PradoSoft
+ * @copyright Copyright © 2005-2011 PradoSoft
* @license http://www.pradosoft.com/license/
* @version $Id$
* @package System
@@ -28,6 +28,14 @@ require_once(dirname(__FILE__).'/PradoBase.php');
*/
if(!class_exists('Prado',false))
{
+ /**
+ * Prado class.
+ *
+ * @author Qiang Xue
+ * @version $Id$
+ * @package System
+ * @since 3.0
+ */
class Prado extends PradoBase
{
}
--
cgit v1.2.3