[OpenLayers-Commits] r7371 - in sandbox/topp/geoext: lib/OpenLayers lib/OpenLayers/Layer tools

[commits at openlayers.org]

Author: tschaub
Date: 2008-06-17 14:32:48 -0400 (Tue, 17 Jun 2008)
New Revision: 7371

Modified:
   sandbox/topp/geoext/lib/OpenLayers/Ajax.js
   sandbox/topp/geoext/lib/OpenLayers/Layer/WFS.js
   sandbox/topp/geoext/tools/mergejs.py
Log:
merge r7344:HEAD from trunk

Modified: sandbox/topp/geoext/lib/OpenLayers/Ajax.js
===================================================================
--- sandbox/topp/geoext/lib/OpenLayers/Ajax.js	2008-06-16 23:25:03 UTC (rev 7370)
+++ sandbox/topp/geoext/lib/OpenLayers/Ajax.js	2008-06-17 18:32:48 UTC (rev 7371)
@@ -2,6 +2,9 @@
  * license.  See http://svn.openlayers.org/trunk/openlayers/license.txt for the
  * full text of the license. */
 
+/**
+ * @requires OpenLayers/Request/XMLHttpRequest.js
+ */
 
 OpenLayers.ProxyHost = "";
 //OpenLayers.ProxyHost = "examples/proxy.cgi?url=";

Modified: sandbox/topp/geoext/lib/OpenLayers/Layer/WFS.js
===================================================================
--- sandbox/topp/geoext/lib/OpenLayers/Layer/WFS.js	2008-06-16 23:25:03 UTC (rev 7370)
+++ sandbox/topp/geoext/lib/OpenLayers/Layer/WFS.js	2008-06-17 18:32:48 UTC (rev 7371)
@@ -4,6 +4,7 @@
 
 
 /**
+ * @requires OpenLayers/Tile/WFS.js
  * @requires OpenLayers/Layer/Vector.js
  * @requires OpenLayers/Layer/Markers.js
  */

Modified: sandbox/topp/geoext/tools/mergejs.py
===================================================================
--- sandbox/topp/geoext/tools/mergejs.py	2008-06-16 23:25:03 UTC (rev 7370)
+++ sandbox/topp/geoext/tools/mergejs.py	2008-06-17 18:32:48 UTC (rev 7371)
@@ -13,14 +13,6 @@
 #
 #    // @requires Geo/DataSource.js
 #
-#  or (ideally) within a class comment definition
-#
-#     /**
-#      * @class
-#      *
-#      * @requires OpenLayers/Layer.js
-#      */
-#
 # This script should be executed like so:
 #
 #     mergejs.py <output.js> <directory> [...]