[Commits] r161 - in sandbox/opengeo/drake/trunk: apps/drake core/lib core/lib/GeoExt/data

[tcoulter at www.geoext.org]

Author: tcoulter
Date: 2009-02-12 21:10:45 +0100 (Thu, 12 Feb 2009)
New Revision: 161

Added:
   sandbox/opengeo/drake/trunk/core/lib/GeoExt/data/WMSCapabilitiesReader.js
Removed:
   sandbox/opengeo/drake/trunk/core/lib/GeoExt/data/CapabilitiesReader.js
Modified:
   sandbox/opengeo/drake/trunk/apps/drake/AddLayerWindow.js
   sandbox/opengeo/drake/trunk/core/lib/GeoExt.js
Log:
Changed to WMSCapabilitiesReader; this is to make room for the *WFS* capabilities reader.

Modified: sandbox/opengeo/drake/trunk/apps/drake/AddLayerWindow.js
===================================================================
--- sandbox/opengeo/drake/trunk/apps/drake/AddLayerWindow.js	2009-02-12 19:36:05 UTC (rev 160)
+++ sandbox/opengeo/drake/trunk/apps/drake/AddLayerWindow.js	2009-02-12 20:10:45 UTC (rev 161)
@@ -17,7 +17,7 @@
         this.catalogGrid = new Ext.grid.GridPanel({
             store: new Ext.data.GroupingStore({
                 url: this.url,
-                reader: new GeoExt.data.CapabilitiesReader(),
+                reader: new GeoExt.data.WMSCapabilitiesReader(),
                 sortInfo: {field: 'prefix'},
                 groupField: 'prefix'
             }),        

Deleted: sandbox/opengeo/drake/trunk/core/lib/GeoExt/data/CapabilitiesReader.js
===================================================================
--- sandbox/opengeo/drake/trunk/core/lib/GeoExt/data/CapabilitiesReader.js	2009-02-12 19:36:05 UTC (rev 160)
+++ sandbox/opengeo/drake/trunk/core/lib/GeoExt/data/CapabilitiesReader.js	2009-02-12 20:10:45 UTC (rev 161)
@@ -1,34 +0,0 @@
-Ext.namespace("GeoExt.data");
-
-GeoExt.data.CapabilitiesReader = function(opts){
-    GeoExt.data.CapabilitiesReader.superclass.constructor.apply(this, arguments);
-    this.recordType = this.recordType || Ext.data.Record.create([
-        {name: 'name', type: 'string'},
-        {name: 'abstract', type: 'string'},
-        {name: 'title', type: 'string'},
-        {name: 'prefix', type: 'string', defaultValue: ""},
-        {name: 'llbbox', type: 'auto'}
-    ]);
-};
-
-Ext.extend(GeoExt.data.CapabilitiesReader, Ext.data.DataReader, {
-    read: function (response) {
-        
-        var fmt = new OpenLayers.Format.WMSCapabilities();
-        var caps = fmt.read(response.responseXML);
-        var records = [];
-        
-        for (var i = 0; i < caps.capability.layers.length; i++){
-            var l = caps.capability.layers[i];
-            if (l.name){
-                records.push(new this.recordType(l));
-            }
-        }
-        
-        return {
-            totalRecords: records.length,
-            success: true,
-            records: records
-        };
-    }
-});

Copied: sandbox/opengeo/drake/trunk/core/lib/GeoExt/data/WMSCapabilitiesReader.js (from rev 146, sandbox/opengeo/drake/trunk/core/lib/GeoExt/data/CapabilitiesReader.js)
===================================================================
--- sandbox/opengeo/drake/trunk/core/lib/GeoExt/data/WMSCapabilitiesReader.js	                        (rev 0)
+++ sandbox/opengeo/drake/trunk/core/lib/GeoExt/data/WMSCapabilitiesReader.js	2009-02-12 20:10:45 UTC (rev 161)
@@ -0,0 +1,34 @@
+Ext.namespace("GeoExt.data");
+
+GeoExt.data.WMSCapabilitiesReader = function(opts){
+    GeoExt.data.WMSCapabilitiesReader.superclass.constructor.apply(this, arguments);
+    this.recordType = this.recordType || Ext.data.Record.create([
+        {name: 'name', type: 'string'},
+        {name: 'abstract', type: 'string'},
+        {name: 'title', type: 'string'},
+        {name: 'prefix', type: 'string', defaultValue: ""},
+        {name: 'llbbox', type: 'auto'}
+    ]);
+};
+
+Ext.extend(GeoExt.data.WMSCapabilitiesReader, Ext.data.DataReader, {
+    read: function (response) {
+        
+        var fmt = new OpenLayers.Format.WMSCapabilities();
+        var caps = fmt.read(response.responseXML);
+        var records = [];
+        
+        for (var i = 0; i < caps.capability.layers.length; i++){
+            var l = caps.capability.layers[i];
+            if (l.name){
+                records.push(new this.recordType(l));
+            }
+        }
+        
+        return {
+            totalRecords: records.length,
+            success: true,
+            records: records
+        };
+    }
+});


Property changes on: sandbox/opengeo/drake/trunk/core/lib/GeoExt/data/WMSCapabilitiesReader.js
___________________________________________________________________
Name: svn:mergeinfo
   + 

Modified: sandbox/opengeo/drake/trunk/core/lib/GeoExt.js
===================================================================
--- sandbox/opengeo/drake/trunk/core/lib/GeoExt.js	2009-02-12 19:36:05 UTC (rev 160)
+++ sandbox/opengeo/drake/trunk/core/lib/GeoExt.js	2009-02-12 20:10:45 UTC (rev 161)
@@ -80,7 +80,7 @@
         var jsfiles = new Array(
             "GeoExt/request/ErrorWindow.js",
             "GeoExt/request/RequestManager.js",
-            "GeoExt/data/CapabilitiesReader.js",
+            "GeoExt/data/WMSCapabilitiesReader.js",
             "GeoExt/data/FeatureReader.js",
             "GeoExt/data/FeatureStoreMediator.js",
             "GeoExt/data/LayerStoreMediator.js",