[Commits] r2772 - in sandbox/gxm/geoext/gxm: lib lib/GXM/data lib/GXM/data/models tests tests/lib tests/lib/data tests/lib/data/models

[commits at geoext.org]

Author: marcjansen
Date: 2011-07-23 23:56:08 +0200 (Sat, 23 Jul 2011)
New Revision: 2772

Added:
   sandbox/gxm/geoext/gxm/lib/GXM/data/models/
   sandbox/gxm/geoext/gxm/tests/lib/data/models/
Removed:
   sandbox/gxm/geoext/gxm/lib/GXM/data/model/
   sandbox/gxm/geoext/gxm/tests/lib/data/model/
Modified:
   sandbox/gxm/geoext/gxm/lib/GXM.loader.js
   sandbox/gxm/geoext/gxm/lib/GXM/data/LayerStore.js
   sandbox/gxm/geoext/gxm/lib/GXM/data/models/Layer.js
   sandbox/gxm/geoext/gxm/tests/lib/LayerList.test.html
   sandbox/gxm/geoext/gxm/tests/lib/MapPanel.test.html
   sandbox/gxm/geoext/gxm/tests/lib/data/models/Layer.test.html
   sandbox/gxm/geoext/gxm/tests/list-tests.html
Log:
renamed folder "model" to "models" for consistency with Sencha Touch

Modified: sandbox/gxm/geoext/gxm/lib/GXM/data/LayerStore.js
===================================================================
--- sandbox/gxm/geoext/gxm/lib/GXM/data/LayerStore.js	2011-07-23 21:54:52 UTC (rev 2771)
+++ sandbox/gxm/geoext/gxm/lib/GXM/data/LayerStore.js	2011-07-23 21:56:08 UTC (rev 2772)
@@ -11,7 +11,7 @@
 Ext.ns("GXM.data");
 
 /**
- * @requires GXM/data/model/Layer.js
+ * @requires GXM/data/models/Layer.js
  * @requires GXM/data/LayerReader.js
  * 
  */
@@ -20,7 +20,7 @@
     constructor: function(config) {
         var conf = config || {};
         
-        conf.model = conf.model || 'gxm_Layer';
+        conf.model = conf.model || 'gxm_layer';
         
         conf.proxy = conf.proxy || {
             type: 'memory',

Copied: sandbox/gxm/geoext/gxm/lib/GXM/data/models (from rev 2770, sandbox/gxm/geoext/gxm/lib/GXM/data/model)

Modified: sandbox/gxm/geoext/gxm/lib/GXM/data/models/Layer.js
===================================================================
--- sandbox/gxm/geoext/gxm/lib/GXM/data/model/Layer.js	2011-07-22 15:01:03 UTC (rev 2770)
+++ sandbox/gxm/geoext/gxm/lib/GXM/data/models/Layer.js	2011-07-23 21:56:08 UTC (rev 2772)
@@ -24,7 +24,7 @@
 Ext.preg("gxm_layermodel", GXM.data.LayerModelPlugin);
 
 
-Ext.regModel('gxm_Layer', {
+Ext.regModel('gxm_layer', {
     plugins:[{ptype:'gxm_layermodel'}],
     fields: [
         {

Modified: sandbox/gxm/geoext/gxm/lib/GXM.loader.js
===================================================================
--- sandbox/gxm/geoext/gxm/lib/GXM.loader.js	2011-07-23 21:54:52 UTC (rev 2771)
+++ sandbox/gxm/geoext/gxm/lib/GXM.loader.js	2011-07-23 21:56:08 UTC (rev 2772)
@@ -65,7 +65,7 @@
             "widgets/MapPanel.js",
             "widgets/Button.js",
             "widgets/SegmentedButton.js",
-            "data/model/Layer.js",
+            "data/models/Layer.js",
             "data/LayerReader.js",
             "data/LayerStore.js",
             "widgets/LayerList.js"

Modified: sandbox/gxm/geoext/gxm/tests/lib/LayerList.test.html
===================================================================
--- sandbox/gxm/geoext/gxm/tests/lib/LayerList.test.html	2011-07-23 21:54:52 UTC (rev 2771)
+++ sandbox/gxm/geoext/gxm/tests/lib/LayerList.test.html	2011-07-23 21:56:08 UTC (rev 2772)
@@ -97,7 +97,7 @@
                 t.ok(layerpanel.getStore() instanceof GXM.data.LayerStore, 'Layerpanel is a GXM.LayerStore');
                 
                 // Does the store have the correct model?
-                t.eq(layerpanel.getStore().model.modelName, 'gxm_Layer', 'Layerpanel.store works on the gxm_Layer model');
+                t.eq(layerpanel.getStore().model.modelName, 'gxm_layer', 'Layerpanel.store works on the gxm_layer model');
                 
                 // compairing the count
                 t.eq(layerpanel.getStore().getCount(), mappanel.map.layers.length, 'store count and map.layers.length are the same');

Modified: sandbox/gxm/geoext/gxm/tests/lib/MapPanel.test.html
===================================================================
--- sandbox/gxm/geoext/gxm/tests/lib/MapPanel.test.html	2011-07-23 21:54:52 UTC (rev 2771)
+++ sandbox/gxm/geoext/gxm/tests/lib/MapPanel.test.html	2011-07-23 21:56:08 UTC (rev 2772)
@@ -341,8 +341,8 @@
         t.ok(mappanel.layers instanceof GXM.data.LayerStore, "Mappanel (" + mappanel.desc + "): layers property is instance of GXM.data.LayerStore.");
         if (isStoreInstance){
             // check the modelname:
-            t.eq(mappanel.layers.model.modelName, 'gxm_Layer', 
-                '...the store has the right modelName "gxm_Layer" bound.');
+            t.eq(mappanel.layers.model.modelName, 'gxm_layer', 
+                '...the store has the right modelName "gxm_layer" bound.');
             // check the field "layer"
             var firstRec = mappanel.layers.first();
             // is it an OpenLayers Layer?

Copied: sandbox/gxm/geoext/gxm/tests/lib/data/models (from rev 2770, sandbox/gxm/geoext/gxm/tests/lib/data/model)

Modified: sandbox/gxm/geoext/gxm/tests/lib/data/models/Layer.test.html
===================================================================
--- sandbox/gxm/geoext/gxm/tests/lib/data/model/Layer.test.html	2011-07-22 15:01:03 UTC (rev 2770)
+++ sandbox/gxm/geoext/gxm/tests/lib/data/models/Layer.test.html	2011-07-23 21:56:08 UTC (rev 2772)
@@ -53,7 +53,7 @@
 }
 
 function test_definition(t) {
-    var modelName = 'gxm_Layer',
+    var modelName = 'gxm_layer',
         record = null;
     
     t.plan(2);

Modified: sandbox/gxm/geoext/gxm/tests/list-tests.html
===================================================================
--- sandbox/gxm/geoext/gxm/tests/list-tests.html	2011-07-23 21:54:52 UTC (rev 2771)
+++ sandbox/gxm/geoext/gxm/tests/list-tests.html	2011-07-23 21:56:08 UTC (rev 2772)
@@ -6,5 +6,5 @@
   <li>lib/LayerList.test.html</li>
   <li>lib/data/LayerReader.test.html</li>
   <li>lib/data/LayerStore.test.html</li>
-  <li>lib/data/model/Layer.test.html</li>
+  <li>lib/data/models/Layer.test.html</li>
 </ul>