merge from 3.0 branch till 1397.

7 files changed, 22 insertions, 22 deletions

diff --git a/framework/Collections/TAttributeCollection.php b/framework/Collections/TAttributeCollection.php
index abeb3c53..a65a4a89 100644
--- a/framework/Collections/TAttributeCollection.php
+++ b/framework/Collections/TAttributeCollection.php
@@ -6,7 +6,7 @@
  * @link http://www.pradosoft.com/

  * @copyright Copyright © 2005 PradoSoft

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

- * @version $Revision: $  $Date: $

+ * @version $Id$

  * @package System.Collections

  */

 

@@ -38,7 +38,7 @@ Prado::using('System.Collections.TMap');
  * in the collection storage.

  *

  * @author Qiang Xue <qiang.xue@gmail.com>

- * @version $Revision: $  $Date: $

+ * @version $Id$

  * @package System.Collections

  * @since 3.0

  */

diff --git a/framework/Collections/TDummyDataSource.php b/framework/Collections/TDummyDataSource.php
index d7fee4a9..1bb839c5 100644
--- a/framework/Collections/TDummyDataSource.php
+++ b/framework/Collections/TDummyDataSource.php
@@ -6,7 +6,7 @@
  * @link http://www.pradosoft.com/

  * @copyright Copyright &copy; 2005 PradoSoft

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

- * @version $Revision: $  $Date: $

+ * @version $Id$

  * @package System.Collections

  */

 

@@ -22,7 +22,7 @@
  * </code>

  *

  * @author Qiang Xue <qiang.xue@gmail.com>

- * @version $Revision: $  $Date: $

+ * @version $Id$

  * @package System.Collections

  * @since 3.0

  */

@@ -76,7 +76,7 @@ class TDummyDataSource extends TComponent implements IteratorAggregate, Countabl
  * for traversing its dummy items.

  *

  * @author Qiang Xue <qiang.xue@gmail.com>

- * @version $Revision: $  $Date: $

+ * @version $Id$

  * @package System.Collections

  * @since 3.0

  */

diff --git a/framework/Collections/TList.php b/framework/Collections/TList.php
index 1104ec47..f22d6e7b 100644
--- a/framework/Collections/TList.php
+++ b/framework/Collections/TList.php
@@ -6,7 +6,7 @@
  * @link http://www.pradosoft.com/

  * @copyright Copyright &copy; 2005 PradoSoft

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

- * @version $Revision: $  $Date: $

+ * @version $Id$

  * @package System.Collections

  */

 

@@ -32,7 +32,7 @@
  * operation, override {@link insertAt()}, and {@link removeAt()}.

  *

  * @author Qiang Xue <qiang.xue@gmail.com>

- * @version $Revision: $  $Date: $

+ * @version $Id$

  * @package System.Collections

  * @since 3.0

  */

@@ -348,7 +348,7 @@ class TList extends TComponent implements IteratorAggregate,ArrayAccess,Countabl
  * for traversing the items in the list.

  *

  * @author Qiang Xue <qiang.xue@gmail.com>

- * @version $Revision: $  $Date: $

+ * @version $Id$

  * @package System.Collections

  * @since 3.0

  */

diff --git a/framework/Collections/TMap.php b/framework/Collections/TMap.php
index ef393866..ca9834d5 100644
--- a/framework/Collections/TMap.php
+++ b/framework/Collections/TMap.php
@@ -6,7 +6,7 @@
  * @link http://www.pradosoft.com/

  * @copyright Copyright &copy; 2005 PradoSoft

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

- * @version $Revision: $  $Date: $

+ * @version $Id$

  * @package System.Collections

  */

 

@@ -28,7 +28,7 @@
  * </code>

  *

  * @author Qiang Xue <qiang.xue@gmail.com>

- * @version $Revision: $  $Date: $

+ * @version $Id$

  * @package System.Collections

  * @since 3.0

  */

@@ -273,7 +273,7 @@ class TMap extends TComponent implements IteratorAggregate,ArrayAccess,Countable
  * for traversing the items in the map.

  *

  * @author Qiang Xue <qiang.xue@gmail.com>

- * @version $Revision: $  $Date: $

+ * @version $Id$

  * @package System.Collections

  * @since 3.0

  */

diff --git a/framework/Collections/TPagedDataSource.php b/framework/Collections/TPagedDataSource.php
index a2bce9e3..8f6690e7 100644
--- a/framework/Collections/TPagedDataSource.php
+++ b/framework/Collections/TPagedDataSource.php
@@ -6,7 +6,7 @@
  * @link http://www.pradosoft.com/

  * @copyright Copyright &copy; 2005 PradoSoft

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

- * @version $Revision: $  $Date: $

+ * @version $Id$

  * @package System.Collections

  */

 

@@ -24,7 +24,7 @@
  * within the specified page will be returned and traversed.

  *

  * @author Qiang Xue <qiang.xue@gmail.com>

- * @version $Revision: $  $Date: $

+ * @version $Id$

  * @package System.Collections

  * @since 3.0

  */

@@ -277,7 +277,7 @@ class TPagedDataSource extends TComponent implements IteratorAggregate,Countable
  * to return a new iterator for traversing the items in a {@link TList} object.

  *

  * @author Qiang Xue <qiang.xue@gmail.com>

- * @version $Revision: $  $Date: $

+ * @version $Id$

  * @package System.Collections

  * @since 3.0

  */

@@ -363,7 +363,7 @@ class TPagedListIterator implements Iterator
  * to return a new iterator for traversing the items in a {@link TMap} object.

  *

  * @author Qiang Xue <qiang.xue@gmail.com>

- * @version $Revision: $  $Date: $

+ * @version $Id$

  * @package System.Collections

  * @since 3.0

  */

diff --git a/framework/Collections/TPagedList.php b/framework/Collections/TPagedList.php
index 9637f499..e31dfe80 100644
--- a/framework/Collections/TPagedList.php
+++ b/framework/Collections/TPagedList.php
@@ -6,7 +6,7 @@
  * @link http://www.pradosoft.com/

  * @copyright Copyright &copy; 2005 PradoSoft

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

- * @version $Revision: $  $Date: $

+ * @version $Id$

  * @package System.Collections

  */

 

@@ -51,7 +51,7 @@
  *

  *

  * @author Qiang Xue <qiang.xue@gmail.com>

- * @version $Revision: $  $Date: $

+ * @version $Id$

  * @package System.Collections

  * @since 3.0

  */

@@ -372,7 +372,7 @@ class TPagedList extends TList
  * To obtain the page index before it was changed, use {@link getOldPageIndex OldPageIndex}.

  *

  * @author Qiang Xue <qiang.xue@gmail.com>

- * @version $Revision: $  $Date: $

+ * @version $Id$

  * @package System.Collections

  * @since 3.0

  */

@@ -410,7 +410,7 @@ class TPagedListPageChangedEventParameter extends TEventParameter
  * Newly fetched data should be saved in {@link setData Data} property.

  *

  * @author Qiang Xue <qiang.xue@gmail.com>

- * @version $Revision: $  $Date: $

+ * @version $Id$

  * @package System.Collections

  * @since 3.0

  */

diff --git a/framework/Collections/TStack.php b/framework/Collections/TStack.php
index f1118d90..66f69f6c 100644
--- a/framework/Collections/TStack.php
+++ b/framework/Collections/TStack.php
@@ -6,7 +6,7 @@
  * @link http://www.pradosoft.com/

  * @copyright Copyright &copy; 2005 PradoSoft

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

- * @version $Revision: $  $Date: $

+ * @version $Id$

  * @package System.Collections

  */

 

@@ -27,7 +27,7 @@
  * </code>

  *

  * @author Qiang Xue <qiang.xue@gmail.com>

- * @version $Revision: $  $Date: $

+ * @version $Id$

  * @package System.Collections

  * @since 3.0

  */

@@ -181,7 +181,7 @@ class TStack extends TComponent implements IteratorAggregate,Countable
  * for traversing the items in the list.

  *

  * @author Qiang Xue <qiang.xue@gmail.com>

- * @version $Revision: $  $Date: $

+ * @version $Id$

  * @package System.Collections

  * @since 3.0

  */