Happy 2014!

(cherry picked from commit 7915cde127eba2a5143fd45c6b32e81ad91bdfae)

Conflicts:
	framework/Data/Common/Mssql/TMssqlMetaData.php
	framework/Data/Common/Mysql/TMysqlMetaData.php
	framework/Data/Common/Oracle/TOracleMetaData.php
	framework/Data/Common/Pgsql/TPgsqlMetaData.php
	framework/Data/Common/Sqlite/TSqliteMetaData.php
	framework/Data/Common/TDbMetaData.php
	framework/Web/UI/ActiveControls/TCallbackClientScript.php
	framework/Web/UI/JuiControls/TJuiAutoComplete.php
	framework/Web/UI/JuiControls/TJuiControlAdapter.php
	framework/Web/UI/JuiControls/TJuiDraggable.php
	framework/Web/UI/JuiControls/TJuiDroppable.php
	framework/Web/UI/JuiControls/TJuiResizable.php
	framework/Web/UI/JuiControls/TJuiSelectable.php
	framework/Web/UI/JuiControls/TJuiSortable.php
	framework/Wsat/TWsatARGenerator.php
	framework/Wsat/TWsatService.php
	framework/Wsat/pages/TWsatGenerateAR.php
	framework/Wsat/pages/TWsatHome.php
	framework/Wsat/pages/TWsatLogin.php
	framework/Wsat/pages/TWsatScaffolding.php

9 files changed, 17 insertions, 17 deletions

diff --git a/framework/I18N/TChoiceFormat.php b/framework/I18N/TChoiceFormat.php
index ad9a4500..ab19b27b 100644
--- a/framework/I18N/TChoiceFormat.php
+++ b/framework/I18N/TChoiceFormat.php
@@ -4,7 +4,7 @@
  *
  * @author Wei Zhuo <weizhuo[at]gmail[dot]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: TChoiceFormat.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.I18N
@@ -65,7 +65,7 @@ Prado::using('System.I18N.TTranslate');
  *   # <tt>&amp;</tt> -- conditional AND.
  *   # <tt>&amp;&amp;</tt> -- condition AND with short circuit.
  *   # <tt>|</tt> -- conditional OR.
- *   # <tt>||</tt> -- conditional OR with short circuit. 
+ *   # <tt>||</tt> -- conditional OR with short circuit.
  *   # <tt>!</tt> -- negation.
  *
  * Additional round brackets can also be used to perform grouping.
diff --git a/framework/I18N/TDateFormat.php b/framework/I18N/TDateFormat.php
index 544e4973..fa6d27cf 100644
--- a/framework/I18N/TDateFormat.php
+++ b/framework/I18N/TDateFormat.php
@@ -4,7 +4,7 @@
  *
  * @author Wei Zhuo <weizhuo[at]gmail[dot]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: TDateFormat.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.I18N
@@ -165,7 +165,7 @@ class TDateFormat extends TI18NControl implements IDataRenderer
 	{
 		$this->setViewState('Value',$value,'');
 	}
-	
+
 	/**
 	 * Get the default text value for this control.
 	 * @return string default text value
@@ -174,7 +174,7 @@ class TDateFormat extends TI18NControl implements IDataRenderer
 	{
 		return $this->getViewState('DefaultText','');
 	}
-	
+
 	/**
 	 * Set the default text value for this control.
 	 * @param string default text value
@@ -222,7 +222,7 @@ class TDateFormat extends TI18NControl implements IDataRenderer
 		$defaultText = $this->getDefaultText();
 		if(empty($value) && !empty($defaultText))
 			return $this->getDefaultText();
-		
+
 		$app = $this->getApplication()->getGlobalization();
 
 		//initialized the default class wide formatter
diff --git a/framework/I18N/TGlobalization.php b/framework/I18N/TGlobalization.php
index 6638af22..16cd68a9 100644
--- a/framework/I18N/TGlobalization.php
+++ b/framework/I18N/TGlobalization.php
@@ -4,7 +4,7 @@
  *
  * @author Wei Zhuo<weizhuo[at]gmail[dot]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: TGlobalization.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.I18N
diff --git a/framework/I18N/TGlobalizationAutoDetect.php b/framework/I18N/TGlobalizationAutoDetect.php
index ad786401..a79a128d 100644
--- a/framework/I18N/TGlobalizationAutoDetect.php
+++ b/framework/I18N/TGlobalizationAutoDetect.php
@@ -4,7 +4,7 @@
  *
  * @author Wei Zhuo<weizhuo[at]gmail[dot]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 $Revision: 1.66 $  $Date: ${DATE} ${TIME} $
  * @package System.I18N
@@ -32,7 +32,7 @@ class TGlobalizationAutoDetect extends TGlobalization
 		parent::init($xml);
 
 		//set the culture according to browser language settings
-		$http = new HTTPNegotiator();		
+		$http = new HTTPNegotiator();
 		$languages = $http->getLanguages();
 		if(count($languages) > 0)
 		{
diff --git a/framework/I18N/TI18NControl.php b/framework/I18N/TI18NControl.php
index 97a7268a..a1fb59e4 100644
--- a/framework/I18N/TI18NControl.php
+++ b/framework/I18N/TI18NControl.php
@@ -4,7 +4,7 @@
  *
  * @author Wei Zhuo <weizhuo[at]gmail[dot]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: TI18NControl.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.I18N
diff --git a/framework/I18N/TNumberFormat.php b/framework/I18N/TNumberFormat.php
index 27c124f7..bb3c1784 100644
--- a/framework/I18N/TNumberFormat.php
+++ b/framework/I18N/TNumberFormat.php
@@ -4,7 +4,7 @@
  *
  * @author Wei Zhuo <weizhuo[at]gmail[dot]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: TNumberFormat.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.I18N
@@ -116,7 +116,7 @@ class TNumberFormat extends TI18NControl implements IDataRenderer
 	{
 		return $this->getViewState('DefaultText','');
 	}
-	
+
 	/**
 	 * Set the default text value for this control.
 	 * @param string default text value
diff --git a/framework/I18N/TTranslate.php b/framework/I18N/TTranslate.php
index 3382f925..0f8de2ee 100644
--- a/framework/I18N/TTranslate.php
+++ b/framework/I18N/TTranslate.php
@@ -4,7 +4,7 @@
  *
  * @author Wei Zhuo <weizhuo[at]gmail[dot]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: TTranslate.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.I18N
@@ -243,7 +243,7 @@ class TTranslate extends TI18NControl
 			$catalogue = $config['catalogue'];
 		if (empty($catalogue)) $catalogue='messages';
 		Translation::init($catalogue);
-			
+
 		$key = $this->getKey();
 		if(!empty($key)) $text = $key;
 
diff --git a/framework/I18N/TTranslateParameter.php b/framework/I18N/TTranslateParameter.php
index b461a36a..2a1dfd77 100644
--- a/framework/I18N/TTranslateParameter.php
+++ b/framework/I18N/TTranslateParameter.php
@@ -4,7 +4,7 @@
  *
  * @author Wei Zhuo <weizhuo[at]gmail[dot]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: TTranslateParameter.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.I18N
diff --git a/framework/I18N/Translation.php b/framework/I18N/Translation.php
index 5219e132..8ded0903 100644
--- a/framework/I18N/Translation.php
+++ b/framework/I18N/Translation.php
@@ -4,7 +4,7 @@
  *
  * @author Wei Zhuo <weizhuo[at]gmail[dot]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: Translation.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.I18N
@@ -40,7 +40,7 @@ class Translation extends TComponent
 	public static function init($catalogue='messages')
 	{
 		static $saveEventHandlerAttached=false;
-		
+
 		//initialized the default class wide formatter
 		if(!isset(self::$formatters[$catalogue]))
 		{