summaryrefslogtreecommitdiff
path: root/framework/Exceptions
diff options
context:
space:
mode:
Diffstat (limited to 'framework/Exceptions')
-rw-r--r--framework/Exceptions/TErrorHandler.php4
-rw-r--r--framework/Exceptions/TException.php19
-rw-r--r--framework/Exceptions/messages/messages.txt7
3 files changed, 9 insertions, 21 deletions
diff --git a/framework/Exceptions/TErrorHandler.php b/framework/Exceptions/TErrorHandler.php
index 3c9d8514..ad5fe662 100644
--- a/framework/Exceptions/TErrorHandler.php
+++ b/framework/Exceptions/TErrorHandler.php
@@ -4,9 +4,8 @@
*
* @author Qiang Xue <qiang.xue@gmail.com>
* @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
* @license http://www.pradosoft.com/license/
- * @version $Id: TErrorHandler.php 3245 2013-01-07 20:23:32Z ctrlaltca $
* @package System.Exceptions
*/
@@ -45,7 +44,6 @@
* <module id="error" class="TErrorHandler" ErrorTemplatePath="System.Exceptions" />
*
* @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TErrorHandler.php 3245 2013-01-07 20:23:32Z ctrlaltca $
* @package System.Exceptions
* @since 3.0
*/
diff --git a/framework/Exceptions/TException.php b/framework/Exceptions/TException.php
index c4fe62b4..24dbdb0f 100644
--- a/framework/Exceptions/TException.php
+++ b/framework/Exceptions/TException.php
@@ -4,9 +4,8 @@
*
* @author Qiang Xue <qiang.xue@gmail.com>
* @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
* @license http://www.pradosoft.com/license/
- * @version $Id: TException.php 3245 2013-01-07 20:23:32Z ctrlaltca $
* @package System.Exceptions
*/
@@ -28,7 +27,6 @@
* "message.txt" will be used instead.
*
* @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TException.php 3245 2013-01-07 20:23:32Z ctrlaltca $
* @package System.Exceptions
* @since 3.0
*/
@@ -67,7 +65,7 @@ class TException extends Exception
$msgFile=$this->getErrorMessageFile();
// Cache messages
- if (!isset(self::$_messageCache[$msgFile]))
+ if (!isset(self::$_messageCache[$msgFile]))
{
if(($entries=@file($msgFile))!==false)
{
@@ -132,7 +130,6 @@ class TException extends Exception
* TSystemException is the base class for all framework-level exceptions.
*
* @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TException.php 3245 2013-01-07 20:23:32Z ctrlaltca $
* @package System.Exceptions
* @since 3.0
*/
@@ -146,7 +143,6 @@ class TSystemException extends TException
* TApplicationException is the base class for all user application-level exceptions.
*
* @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TException.php 3245 2013-01-07 20:23:32Z ctrlaltca $
* @package System.Exceptions
* @since 3.0
*/
@@ -160,7 +156,6 @@ class TApplicationException extends TException
* TInvalidOperationException represents an exception caused by invalid operations.
*
* @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TException.php 3245 2013-01-07 20:23:32Z ctrlaltca $
* @package System.Exceptions
* @since 3.0
*/
@@ -174,7 +169,6 @@ class TInvalidOperationException extends TSystemException
* TInvalidDataTypeException represents an exception caused by invalid data type.
*
* @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TException.php 3245 2013-01-07 20:23:32Z ctrlaltca $
* @package System.Exceptions
* @since 3.0
*/
@@ -188,7 +182,6 @@ class TInvalidDataTypeException extends TSystemException
* TInvalidDataValueException represents an exception caused by invalid data value.
*
* @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TException.php 3245 2013-01-07 20:23:32Z ctrlaltca $
* @package System.Exceptions
* @since 3.0
*/
@@ -203,7 +196,6 @@ class TInvalidDataValueException extends TSystemException
* such as error in an application configuration file or control template file.
*
* @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TException.php 3245 2013-01-07 20:23:32Z ctrlaltca $
* @package System.Exceptions
* @since 3.0
*/
@@ -217,7 +209,6 @@ class TConfigurationException extends TSystemException
* TTemplateException represents an exception caused by invalid template syntax.
*
* @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TException.php 3245 2013-01-07 20:23:32Z ctrlaltca $
* @package System.Exceptions
* @since 3.1
*/
@@ -282,7 +273,6 @@ class TTemplateException extends TConfigurationException
* TIOException represents an exception related with improper IO operations.
*
* @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TException.php 3245 2013-01-07 20:23:32Z ctrlaltca $
* @package System.Exceptions
* @since 3.0
*/
@@ -296,7 +286,6 @@ class TIOException extends TSystemException
* TDbException represents an exception related with DB operations.
*
* @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TException.php 3245 2013-01-07 20:23:32Z ctrlaltca $
* @package System.Exceptions
* @since 3.0
*/
@@ -310,7 +299,6 @@ class TDbException extends TSystemException
* TDbConnectionException represents an exception caused by DB connection failure.
*
* @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TException.php 3245 2013-01-07 20:23:32Z ctrlaltca $
* @package System.Exceptions
* @since 3.0
*/
@@ -324,7 +312,6 @@ class TDbConnectionException extends TDbException
* TNotSupportedException represents an exception caused by using an unsupported PRADO feature.
*
* @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TException.php 3245 2013-01-07 20:23:32Z ctrlaltca $
* @package System.Exceptions
* @since 3.0
*/
@@ -339,7 +326,6 @@ class TNotSupportedException extends TSystemException
* This exception is mainly thrown within a PHP error handler.
*
* @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TException.php 3245 2013-01-07 20:23:32Z ctrlaltca $
* @package System.Exceptions
* @since 3.0
*/
@@ -382,7 +368,6 @@ class TPhpErrorException extends TSystemException
* It is used by {@link TErrorHandler} to provide different error output to users.
*
* @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TException.php 3245 2013-01-07 20:23:32Z ctrlaltca $
* @package System.Exceptions
* @since 3.0
*/
diff --git a/framework/Exceptions/messages/messages.txt b/framework/Exceptions/messages/messages.txt
index bcfc7f97..8ea41292 100644
--- a/framework/Exceptions/messages/messages.txt
+++ b/framework/Exceptions/messages/messages.txt
@@ -500,4 +500,9 @@ tactivetablecell_control_outoftable = {0} '{1}' must be enclosed within a TTabl
tactivetablecell_control_notincollection = {0} '{1}' no member of the TTableCellCollection of the parent TTableRow control.
tactivetablerow_control_outoftable = {0} '{1}' must be enclosed within a TTable control.
-tactivetablerow_control_notincollection = {0} '{1}' no member of the TTableRowCollection of the parent TTable control. \ No newline at end of file
+tactivetablerow_control_notincollection = {0} '{1}' no member of the TTableRowCollection of the parent TTable control.
+
+juioptions_control_invalid = Control '{0}' must implement IJuiOptions.
+juioptions_option_invalid = '{1}' is not a valid option for control '{0}'.
+
+ratinglist_invalid_caption_id = '{0}' is not a valid caption control for TRatingList '{0}'. \ No newline at end of file