[Commits] r2326 - in core/trunk/geoext: examples lib/GeoExt/data lib/GeoExt/widgets lib/GeoExt/widgets/grid lib/GeoExt/widgets/tree tests/lib/GeoExt/data tests/lib/GeoExt/widgets tests/lib/GeoExt/widgets/tree
commits at geoext.org
commits at geoext.org
Fri Sep 10 15:19:11 CEST 2010
Author: ahocevar
Date: 2010-09-10 15:19:11 +0200 (Fri, 10 Sep 2010)
New Revision: 2326
Modified:
core/trunk/geoext/examples/layercontainer.js
core/trunk/geoext/examples/legendpanel.js
core/trunk/geoext/examples/wms-capabilities.js
core/trunk/geoext/lib/GeoExt/data/FeatureRecord.js
core/trunk/geoext/lib/GeoExt/data/FeatureStore.js
core/trunk/geoext/lib/GeoExt/data/LayerRecord.js
core/trunk/geoext/lib/GeoExt/data/LayerStore.js
core/trunk/geoext/lib/GeoExt/widgets/LayerLegend.js
core/trunk/geoext/lib/GeoExt/widgets/LayerOpacitySlider.js
core/trunk/geoext/lib/GeoExt/widgets/LegendPanel.js
core/trunk/geoext/lib/GeoExt/widgets/VectorLegend.js
core/trunk/geoext/lib/GeoExt/widgets/WMSLegend.js
core/trunk/geoext/lib/GeoExt/widgets/grid/FeatureSelectionModel.js
core/trunk/geoext/lib/GeoExt/widgets/tree/BaseLayerContainer.js
core/trunk/geoext/lib/GeoExt/widgets/tree/LayerLoader.js
core/trunk/geoext/lib/GeoExt/widgets/tree/LayerNode.js
core/trunk/geoext/lib/GeoExt/widgets/tree/LayerParamNode.js
core/trunk/geoext/lib/GeoExt/widgets/tree/OverlayLayerContainer.js
core/trunk/geoext/tests/lib/GeoExt/data/FeatureReader.html
core/trunk/geoext/tests/lib/GeoExt/data/FeatureRecord.html
core/trunk/geoext/tests/lib/GeoExt/data/FeatureStore.html
core/trunk/geoext/tests/lib/GeoExt/data/LayerReader.html
core/trunk/geoext/tests/lib/GeoExt/data/LayerRecord.html
core/trunk/geoext/tests/lib/GeoExt/data/LayerStore.html
core/trunk/geoext/tests/lib/GeoExt/data/WFSCapabilitiesReader.html
core/trunk/geoext/tests/lib/GeoExt/data/WMCReader.html
core/trunk/geoext/tests/lib/GeoExt/data/WMSCapabilitiesReader.html
core/trunk/geoext/tests/lib/GeoExt/widgets/LegendPanel.html
core/trunk/geoext/tests/lib/GeoExt/widgets/WMSLegend.html
core/trunk/geoext/tests/lib/GeoExt/widgets/tree/LayerContainer.html
Log:
added getter and setter methods for feature and layer. r=elemoine (closes #133)
Modified: core/trunk/geoext/examples/layercontainer.js
===================================================================
--- core/trunk/geoext/examples/layercontainer.js 2010-09-10 13:16:17 UTC (rev 2325)
+++ core/trunk/geoext/examples/layercontainer.js 2010-09-10 13:19:11 UTC (rev 2326)
@@ -46,8 +46,8 @@
var copy = record.copy();
// Ext 3.X does not allow circular references in objects passed
// to record.set
- copy.data["layer"] = record.get("layer");
- copy.get("layer").mergeNewParams({
+ copy.data["layer"] = record.getLayer();
+ copy.getLayer().mergeNewParams({
format: "image/png",
transparent: "true"
});
Modified: core/trunk/geoext/examples/legendpanel.js
===================================================================
--- core/trunk/geoext/examples/legendpanel.js 2010-09-10 13:16:17 UTC (rev 2325)
+++ core/trunk/geoext/examples/legendpanel.js 2010-09-10 13:19:11 UTC (rev 2326)
@@ -51,14 +51,14 @@
};
var moveLayer = function(idx) {
- var layer = layerRec0.get("layer");
+ var layer = layerRec0.getLayer();
var idx = mapPanel.map.layers.indexOf(layer) == 0 ?
mapPanel.map.layers.length : 0;
- mapPanel.map.setLayerIndex(layerRec0.get("layer"), idx);
+ mapPanel.map.setLayerIndex(layerRec0.getLayer(), idx);
};
var toggleVisibility = function() {
- var layer = layerRec1.get("layer");
+ var layer = layerRec1.getLayer();
layer.setVisibility(!layer.getVisibility());
};
@@ -85,8 +85,8 @@
// UrlLegend instead of WMSLegend to be used
var layerRec0 = mapPanel.layers.getAt(0);
layerRec0.set("legendURL", "http://demo.opengeo.org/geoserver/wms?FORMAT=image%2Fgif&TRANSPARENT=true&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetLegendGraphic&EXCEPTIONS=application%2Fvnd.ogc.se_xml&LAYER=topp%3Atasmania_state_boundaries");
-
- // store the layer that we will modify in toggleVis()
+
+ // store the layer that we will modify in toggleVis()
var layerRec1 = mapPanel.layers.getAt(1);
// stores another legendURL for the legendurl button action
Modified: core/trunk/geoext/examples/wms-capabilities.js
===================================================================
--- core/trunk/geoext/examples/wms-capabilities.js 2010-09-10 13:16:17 UTC (rev 2325)
+++ core/trunk/geoext/examples/wms-capabilities.js 2010-09-10 13:19:11 UTC (rev 2326)
@@ -44,7 +44,7 @@
function mapPreview(grid, index) {
var record = grid.getStore().getAt(index);
- var layer = record.get("layer").clone();
+ var layer = record.getLayer().clone();
var win = new Ext.Window({
title: "Preview: " + record.get("title"),
Modified: core/trunk/geoext/lib/GeoExt/data/FeatureRecord.js
===================================================================
--- core/trunk/geoext/lib/GeoExt/data/FeatureRecord.js 2010-09-10 13:16:17 UTC (rev 2325)
+++ core/trunk/geoext/lib/GeoExt/data/FeatureRecord.js 2010-09-10 13:19:11 UTC (rev 2326)
@@ -19,7 +19,6 @@
* A record that represents an ``OpenLayers.Feature.Vector``. This record
* will always have at least the following fields:
*
- * * feature ``OpenLayers.Feature.Vector``
* * state ``String``
* * fid ``String``
*
@@ -28,6 +27,36 @@
{name: "feature"}, {name: "state"}, {name: "fid"}
]);
+/** api: method[getFeature]
+ * :return: ``OpenLayers.Feature.Vector``
+ *
+ * Gets the feature for this record.
+ */
+GeoExt.data.FeatureRecord.prototype.getFeature = function() {
+ return this.get("feature");
+};
+
+/** api: method[setLayer]
+ * :param layer: ``OpenLayers.Feature.Vector``
+ *
+ * Sets the feature for this record.
+ */
+GeoExt.data.FeatureRecord.prototype.setFeature = function(feature) {
+ if (feature !== this.data.feature) {
+ this.dirty = true;
+ if (!this.modified) {
+ this.modified = {};
+ }
+ if (this.modified.feature === undefined) {
+ this.modified.feature = this.data.feature;
+ }
+ this.data.feature = feature;
+ if (!this.editing){
+ this.afterEdit();
+ }
+ }
+};
+
/** api: classmethod[create]
* :param o: ``Array`` Field definition as in ``Ext.data.Record.create``. Can
* be omitted if no additional fields are required.
Modified: core/trunk/geoext/lib/GeoExt/data/FeatureStore.js
===================================================================
--- core/trunk/geoext/lib/GeoExt/data/FeatureStore.js 2010-09-10 13:16:17 UTC (rev 2325)
+++ core/trunk/geoext/lib/GeoExt/data/FeatureStore.js 2010-09-10 13:19:11 UTC (rev 2326)
@@ -146,7 +146,7 @@
if(initDir & GeoExt.data.FeatureStore.STORE_TO_LAYER) {
var records = this.getRange();
for(var i=records.length - 1; i>=0; i--) {
- this.layer.addFeatures([records[i].get("feature")]);
+ this.layer.addFeatures([records[i].getFeature()]);
}
}
@@ -204,7 +204,7 @@
record = this.getById(feature.id);
} else {
var index = this.findBy(function(r) {
- return r.get("feature") === feature;
+ return r.getFeature() === feature;
});
if(index > -1) {
record = this.getAt(index);
@@ -303,13 +303,13 @@
for(i=0, len=records.length; i<len; i++) {
record = records[i];
if(this.addRecordFilter(record) !== false) {
- features.push(record.get("feature"));
+ features.push(record.getFeature());
}
}
} else {
features = new Array((len=records.length));
for(i=0; i<len; i++) {
- features[i] = records[i].get("feature");
+ features[i] = records[i].getFeature();
}
}
if(features.length > 0) {
@@ -374,10 +374,10 @@
*/
onRemove: function(store, record, index){
if(!this._removing) {
- var feature = record.get("feature");
+ var feature = record.getFeature();
if (this.layer.getFeatureById(feature.id) != null) {
this._removing = true;
- this.layer.removeFeatures([record.get("feature")]);
+ this.layer.removeFeatures([record.getFeature()]);
delete this._removing;
}
}
@@ -398,7 +398,7 @@
* In that case, it would be sufficient to check (key in feature.attributes).
*/
var defaultFields = new GeoExt.data.FeatureRecord().fields;
- var feature = record.get("feature");
+ var feature = record.getFeature();
if(record.fields) {
var cont = this.layer.events.triggerEvent(
"beforefeaturemodified", {feature: feature}
Modified: core/trunk/geoext/lib/GeoExt/data/LayerRecord.js
===================================================================
--- core/trunk/geoext/lib/GeoExt/data/LayerRecord.js 2010-09-10 13:16:17 UTC (rev 2325)
+++ core/trunk/geoext/lib/GeoExt/data/LayerRecord.js 2010-09-10 13:19:11 UTC (rev 2326)
@@ -19,7 +19,6 @@
* A record that represents an ``OpenLayers.Layer``. This record
* will always have at least the following fields:
*
- * * layer ``OpenLayers.Layer``
* * title ``String``
*/
GeoExt.data.LayerRecord = Ext.data.Record.create([
@@ -27,14 +26,44 @@
{name: "title", type: "string", mapping: "name"}
]);
+/** api: method[getLayer]
+ * :return: ``OpenLayers.Layer``
+ *
+ * Gets the layer for this record.
+ */
+GeoExt.data.LayerRecord.prototype.getLayer = function() {
+ return this.get("layer");
+};
+
+/** api: method[setLayer]
+ * :param layer: ``OpenLayers.Layer``
+ *
+ * Sets the layer for this record.
+ */
+GeoExt.data.LayerRecord.prototype.setLayer = function(layer) {
+ if (layer !== this.data.layer) {
+ this.dirty = true;
+ if(!this.modified) {
+ this.modified = {};
+ }
+ if(this.modified.layer === undefined) {
+ this.modified.layer = this.data.layer;
+ }
+ this.data.layer = layer;
+ if(!this.editing) {
+ this.afterEdit();
+ }
+ }
+};
+
/** api: method[clone]
* :param id: ``String`` (optional) A new Record id.
- * :return: ``GeoExt.data.LayerRecord`` A new layer record.
+ * :return: class:`GeoExt.data.LayerRecord` A new layer record.
*
* Creates a clone of this LayerRecord.
*/
GeoExt.data.LayerRecord.prototype.clone = function(id) {
- var layer = this.get("layer") && this.get("layer").clone();
+ var layer = this.getLayer() && this.getLayer().clone();
return new this.constructor(
Ext.applyIf({layer: layer}, this.data),
id || layer.id
Modified: core/trunk/geoext/lib/GeoExt/data/LayerStore.js
===================================================================
--- core/trunk/geoext/lib/GeoExt/data/LayerStore.js 2010-09-10 13:16:17 UTC (rev 2325)
+++ core/trunk/geoext/lib/GeoExt/data/LayerStore.js 2010-09-10 13:19:11 UTC (rev 2326)
@@ -137,7 +137,7 @@
if(initDir & GeoExt.data.LayerStore.STORE_TO_MAP) {
this.each(function(record) {
- this.map.addLayer(record.get("layer"));
+ this.map.addLayer(record.getLayer());
}, this);
}
if(initDir & GeoExt.data.LayerStore.MAP_TO_STORE) {
@@ -195,7 +195,7 @@
onChangeLayer: function(evt) {
var layer = evt.layer;
var recordIndex = this.findBy(function(rec, id) {
- return rec.get("layer") === layer;
+ return rec.getLayer() === layer;
});
if(recordIndex > -1) {
var record = this.getAt(recordIndex);
@@ -277,7 +277,7 @@
if (len > 0) {
var layers = new Array(len);
for (var j = 0; j < len; j++) {
- layers[j] = records[j].get("layer");
+ layers[j] = records[j].getLayer();
}
this._adding = true;
this.map.addLayers(layers);
@@ -311,7 +311,7 @@
this._adding = true;
var layer;
for(var i=records.length-1; i>=0; --i) {
- layer = records[i].get("layer");
+ layer = records[i].getLayer();
this.map.addLayer(layer);
if(index !== this.map.layers.length-1) {
this.map.setLayerIndex(layer, index);
@@ -330,7 +330,7 @@
*/
onRemove: function(store, record, index){
if(!this._removing) {
- var layer = record.get("layer");
+ var layer = record.getLayer();
if (this.map.getLayer(layer.id) != null) {
this._removing = true;
this.removeMapLayer(record);
@@ -349,7 +349,7 @@
onUpdate: function(store, record, operation) {
if(operation === Ext.data.Record.EDIT) {
if (record.modified && record.modified.title) {
- var layer = record.get("layer");
+ var layer = record.getLayer();
var title = record.get("title");
if(title !== layer.name) {
layer.setName(title);
@@ -364,7 +364,7 @@
* Removes a record's layer from the bound map.
*/
removeMapLayer: function(record){
- this.map.removeLayer(record.get("layer"));
+ this.map.removeLayer(record.getLayer());
},
/** private: method[onReplace]
@@ -388,7 +388,7 @@
*/
getByLayer: function(layer) {
var index = this.findBy(function(r) {
- return r.get("layer") === layer;
+ return r.getLayer() === layer;
});
if(index > -1) {
return this.getAt(index);
Modified: core/trunk/geoext/lib/GeoExt/widgets/LayerLegend.js
===================================================================
--- core/trunk/geoext/lib/GeoExt/widgets/LayerLegend.js 2010-09-10 13:16:17 UTC (rev 2325)
+++ core/trunk/geoext/lib/GeoExt/widgets/LayerLegend.js 2010-09-10 13:19:11 UTC (rev 2326)
@@ -81,7 +81,7 @@
*/
onStoreUpdate: function(store, record, operation) {
if(record === this.layerRecord) {
- var layer = record.get('layer');
+ var layer = record.getLayer();
this.setVisible(layer.getVisibility() &&
layer.calculateInRange() && layer.displayInLayerSwitcher &&
!record.get('hideInLegend'));
@@ -113,7 +113,7 @@
if (record && !record.get("hideTitle")) {
title = record.get("title") ||
record.get("name") ||
- record.get("layer").name || "";
+ record.getLayer().name || "";
}
}
return title;
Modified: core/trunk/geoext/lib/GeoExt/widgets/LayerOpacitySlider.js
===================================================================
--- core/trunk/geoext/lib/GeoExt/widgets/LayerOpacitySlider.js 2010-09-10 13:16:17 UTC (rev 2325)
+++ core/trunk/geoext/lib/GeoExt/widgets/LayerOpacitySlider.js 2010-09-10 13:19:11 UTC (rev 2326)
@@ -178,7 +178,7 @@
if (layer instanceof OpenLayers.Layer) {
return layer;
} else if (layer instanceof GeoExt.data.LayerRecord) {
- return layer.get('layer');
+ return layer.getLayer();
}
},
Modified: core/trunk/geoext/lib/GeoExt/widgets/LegendPanel.js
===================================================================
--- core/trunk/geoext/lib/GeoExt/widgets/LegendPanel.js 2010-09-10 13:16:17 UTC (rev 2325)
+++ core/trunk/geoext/lib/GeoExt/widgets/LegendPanel.js 2010-09-10 13:19:11 UTC (rev 2326)
@@ -54,7 +54,7 @@
* .. code-block:: javascript
*
* filter: function(record) {
- * return record.get("layer").isBaseLayer;
+ * return record.getLayer().isBaseLayer;
* }
*/
filter: function(record) {
@@ -105,7 +105,7 @@
var record, layer;
for(var i=count-1; i>=0; --i) {
record = store.getAt(i);
- layer = record.get("layer");
+ layer = record.getLayer();
var types = GeoExt.LayerLegend.getTypes(record);
if(layer.displayInLayerSwitcher && types.length > 0 &&
(store.getAt(i).get("hideInLegend") !== true)) {
@@ -165,7 +165,7 @@
*/
removeLegend: function(record) {
if (this.items) {
- var legend = this.getComponent(this.getIdForLayer(record.get('layer')));
+ var legend = this.getComponent(this.getIdForLayer(record.getLayer()));
if (legend) {
this.remove(legend, true);
this.doLayout();
@@ -199,7 +199,7 @@
*/
addLegend: function(record, index) {
if (this.filter(record) === true) {
- var layer = record.get("layer");
+ var layer = record.getLayer();
index = index || 0;
var legend;
var types = GeoExt.LayerLegend.getTypes(record,
Modified: core/trunk/geoext/lib/GeoExt/widgets/VectorLegend.js
===================================================================
--- core/trunk/geoext/lib/GeoExt/widgets/VectorLegend.js 2010-09-10 13:16:17 UTC (rev 2325)
+++ core/trunk/geoext/lib/GeoExt/widgets/VectorLegend.js 2010-09-10 13:19:11 UTC (rev 2326)
@@ -145,7 +145,7 @@
initComponent: function() {
GeoExt.VectorLegend.superclass.initComponent.call(this);
if (this.layerRecord) {
- this.layer = this.layerRecord.get("layer");
+ this.layer = this.layerRecord.getLayer();
if (this.layer.map) {
this.currentScaleDenominator = this.layer.map.getScale();
this.layer.map.events.on({
@@ -644,7 +644,7 @@
* Private override
*/
GeoExt.VectorLegend.supports = function(layerRecord) {
- return layerRecord.get("layer") instanceof OpenLayers.Layer.Vector;
+ return layerRecord.getLayer() instanceof OpenLayers.Layer.Vector;
};
/** api: legendtype = gx_vectorlegend */
Modified: core/trunk/geoext/lib/GeoExt/widgets/WMSLegend.js
===================================================================
--- core/trunk/geoext/lib/GeoExt/widgets/WMSLegend.js 2010-09-10 13:16:17 UTC (rev 2325)
+++ core/trunk/geoext/lib/GeoExt/widgets/WMSLegend.js 2010-09-10 13:19:11 UTC (rev 2326)
@@ -68,7 +68,7 @@
*/
initComponent: function() {
GeoExt.WMSLegend.superclass.initComponent.call(this);
- var layer = this.layerRecord.get("layer");
+ var layer = this.layerRecord.getLayer();
this.map = layer.map;
if (this.useScaleParameter === true) {
this.map.events.register("zoomend", this, this.update);
@@ -88,7 +88,7 @@
var rec = this.layerRecord;
var url;
var styles = rec && rec.get("styles");
- var layer = rec.get("layer");
+ var layer = rec.getLayer();
layerNames = layerNames || [layer.params.LAYERS].join(",").split(",");
var styleNames = layer.params.STYLES &&
@@ -139,7 +139,7 @@
* the per-sublayer box component.
*/
update: function() {
- var layer = this.layerRecord.get("layer");
+ var layer = this.layerRecord.getLayer();
// In some cases, this update function is called on a layer
// that has just been removed, see ticket #238.
// The following check bypass the update if map is not set.
@@ -191,7 +191,7 @@
*/
beforeDestroy: function() {
if (this.useScaleParameter === true) {
- var layer = this.layerRecord.get("layer")
+ var layer = this.layerRecord.getLayer()
this.map && this.map.events &&
this.map.events.unregister("zoomend", this, this.update);
}
@@ -205,7 +205,7 @@
* Private override
*/
GeoExt.WMSLegend.supports = function(layerRecord) {
- return layerRecord.get("layer") instanceof OpenLayers.Layer.WMS;
+ return layerRecord.getLayer() instanceof OpenLayers.Layer.WMS;
};
/** api: legendtype = gx_wmslegend */
Modified: core/trunk/geoext/lib/GeoExt/widgets/grid/FeatureSelectionModel.js
===================================================================
--- core/trunk/geoext/lib/GeoExt/widgets/grid/FeatureSelectionModel.js 2010-09-10 13:16:17 UTC (rev 2325)
+++ core/trunk/geoext/lib/GeoExt/widgets/grid/FeatureSelectionModel.js 2010-09-10 13:19:11 UTC (rev 2326)
@@ -231,7 +231,7 @@
if(!this._selecting) {
var store = this.grid.store;
var row = store.findBy(function(record, id) {
- return record.data.feature == evt.feature;
+ return record.getFeature() == evt.feature;
});
if(row != -1 && !this.isSelected(row)) {
this._selecting = true;
@@ -251,7 +251,7 @@
if(!this._selecting) {
var store = this.grid.store;
var row = store.findBy(function(record, id) {
- return record.data.feature == evt.feature;
+ return record.getFeature() == evt.feature;
});
if(row != -1 && this.isSelected(row)) {
this._selecting = true;
@@ -268,7 +268,7 @@
* :param record: ``Ext.data.Record`` The record.
*/
rowSelected: function(model, row, record) {
- var feature = record.data.feature;
+ var feature = record.getFeature();
if(!this._selecting && feature) {
var layers = this.getLayers();
for(var i = 0, len = layers.length; i < len; i++) {
@@ -288,7 +288,7 @@
* :param record: ``Ext.data.Record`` The record.
*/
rowDeselected: function(model, row, record) {
- var feature = record.data.feature;
+ var feature = record.getFeature();
if(!this._selecting && feature) {
var layers = this.getLayers();
for(var i = 0, len = layers.length; i < len; i++) {
Modified: core/trunk/geoext/lib/GeoExt/widgets/tree/BaseLayerContainer.js
===================================================================
--- core/trunk/geoext/lib/GeoExt/widgets/tree/BaseLayerContainer.js 2010-09-10 13:16:17 UTC (rev 2325)
+++ core/trunk/geoext/lib/GeoExt/widgets/tree/BaseLayerContainer.js 2010-09-10 13:19:11 UTC (rev 2326)
@@ -49,7 +49,7 @@
checkedGroup: 'baselayer'
}),
filter: function(record) {
- var layer = record.get("layer");
+ var layer = record.getLayer();
return layer.displayInLayerSwitcher === true &&
layer.isBaseLayer === true;
}
Modified: core/trunk/geoext/lib/GeoExt/widgets/tree/LayerLoader.js
===================================================================
--- core/trunk/geoext/lib/GeoExt/widgets/tree/LayerLoader.js 2010-09-10 13:16:17 UTC (rev 2325)
+++ core/trunk/geoext/lib/GeoExt/widgets/tree/LayerLoader.js 2010-09-10 13:19:11 UTC (rev 2326)
@@ -72,11 +72,11 @@
* .. code-block:: javascript
*
* filter: function(record) {
- * return record.get("layer").displayInLayerSwitcher == true
+ * return record.getLayer().displayInLayerSwitcher == true
* }
*/
filter: function(record) {
- return record.get("layer").displayInLayerSwitcher == true;
+ return record.getLayer().displayInLayerSwitcher == true;
},
/** api: config[uiProviders]
@@ -166,7 +166,7 @@
if (this.filter(layerRecord) === true) {
var child = this.createNode({
nodeType: 'gx_layer',
- layer: layerRecord.get("layer"),
+ layer: layerRecord.getLayer(),
layerStore: this.store
});
var sibling = node.item(index);
@@ -190,7 +190,7 @@
removeLayerNode: function(node, layerRecord) {
if (this.filter(layerRecord) === true) {
var child = node.findChildBy(function(node) {
- return node.layer == layerRecord.get("layer");
+ return node.layer == layerRecord.getLayer();
});
if(child) {
child.un("move", this.onChildMove, this);
@@ -225,7 +225,7 @@
// find index by neighboring node in the same container
var searchIndex = (index === 0) ? index + 1 : index - 1;
newRecordIndex = this.store.findBy(function(r) {
- return newParent.childNodes[searchIndex].layer === r.get("layer");
+ return newParent.childNodes[searchIndex].layer === r.getLayer();
});
index === 0 && newRecordIndex++;
} else if(oldParent.parentNode === newParent.parentNode){
@@ -236,7 +236,7 @@
} while (prev && !(prev instanceof GeoExt.tree.LayerContainer && prev.lastChild));
if(prev) {
newRecordIndex = this.store.findBy(function(r) {
- return prev.lastChild.layer === r.get("layer");
+ return prev.lastChild.layer === r.getLayer();
});
} else {
// find indext by first node of a container below
@@ -246,7 +246,7 @@
} while (next && !(next instanceof GeoExt.tree.LayerContainer && next.firstChild));
if(next) {
newRecordIndex = this.store.findBy(function(r) {
- return next.firstChild.layer === r.get("layer");
+ return next.firstChild.layer === r.getLayer();
});
}
newRecordIndex++;
Modified: core/trunk/geoext/lib/GeoExt/widgets/tree/LayerNode.js
===================================================================
--- core/trunk/geoext/lib/GeoExt/widgets/tree/LayerNode.js 2010-09-10 13:16:17 UTC (rev 2325)
+++ core/trunk/geoext/lib/GeoExt/widgets/tree/LayerNode.js 2010-09-10 13:19:11 UTC (rev 2326)
@@ -220,7 +220,7 @@
if(i != -1) {
// if we found the layer, we can assign it and everything
// will be fine
- layer = this.layerStore.getAt(i).get("layer");
+ layer = this.layerStore.getAt(i).getLayer();
}
}
if (!this.rendered || !layer) {
@@ -318,7 +318,7 @@
onStoreAdd: function(store, records, index) {
var l;
for(var i=0; i<records.length; ++i) {
- l = records[i].get("layer");
+ l = records[i].getLayer();
if(this.layer == l) {
this.getUI().show();
break;
@@ -340,7 +340,7 @@
* handler for remove events on the store
*/
onStoreRemove: function(store, record, index) {
- if(this.layer == record.get("layer")) {
+ if(this.layer == record.getLayer()) {
this.getUI().hide();
}
},
@@ -353,7 +353,7 @@
* Listener for the store's update event.
*/
onStoreUpdate: function(store, record, operation) {
- var layer = record.get("layer");
+ var layer = record.getLayer();
if(!this.fixedText && (this.layer == layer && this.text !== layer.name)) {
this.setText(layer.name);
}
Modified: core/trunk/geoext/lib/GeoExt/widgets/tree/LayerParamNode.js
===================================================================
--- core/trunk/geoext/lib/GeoExt/widgets/tree/LayerParamNode.js 2010-09-10 13:16:17 UTC (rev 2325)
+++ core/trunk/geoext/lib/GeoExt/widgets/tree/LayerParamNode.js 2010-09-10 13:19:11 UTC (rev 2326)
@@ -142,7 +142,7 @@
var i = store.findBy(function(o) {
return o.get("title") == layer;
});
- layer = i != -1 ? store.getAt(i).get("layer") : null;
+ layer = i != -1 ? store.getAt(i).getLayer() : null;
}
this.layer = layer;
}
Modified: core/trunk/geoext/lib/GeoExt/widgets/tree/OverlayLayerContainer.js
===================================================================
--- core/trunk/geoext/lib/GeoExt/widgets/tree/OverlayLayerContainer.js 2010-09-10 13:16:17 UTC (rev 2325)
+++ core/trunk/geoext/lib/GeoExt/widgets/tree/OverlayLayerContainer.js 2010-09-10 13:19:11 UTC (rev 2326)
@@ -41,7 +41,7 @@
});
config.loader = Ext.applyIf(config.loader || {}, {
filter: function(record){
- var layer = record.get("layer");
+ var layer = record.getLayer();
return layer.displayInLayerSwitcher === true &&
layer.isBaseLayer === false;
}
Modified: core/trunk/geoext/tests/lib/GeoExt/data/FeatureReader.html
===================================================================
--- core/trunk/geoext/tests/lib/GeoExt/data/FeatureReader.html 2010-09-10 13:16:17 UTC (rev 2325)
+++ core/trunk/geoext/tests/lib/GeoExt/data/FeatureReader.html 2010-09-10 13:19:11 UTC (rev 2326)
@@ -54,10 +54,10 @@
t.eq(records[0].get('c'), 'c_value', 'readRecords correctly set complex mapped feature properties in record');
t.eq(records[0].get('fid'), 1, 'readRecords correctly set feature fid in record');
t.eq(records[0].get('state'), OpenLayers.State.INSERT, 'readRecords correctly set feature state in record');
- t.ok(records[0].get('feature') == features[0], 'readRecords correctly set feature in record');
+ t.ok(records[0].getFeature() == features[0], 'readRecords correctly set feature in record');
t.eq(records[1].get('fid'), 2, 'readRecords correctly set feature fid in record (no properties case)');
t.eq(records[1].get('state'), OpenLayers.State.DELETE, 'readRecords correctly set feature state in record (no properties case)');
- t.ok(records[1].get('feature') == features[1], 'readRecords correctly set feature in record (no properties case)');
+ t.ok(records[1].getFeature() == features[1], 'readRecords correctly set feature in record (no properties case)');
// 1 test
reader.totalRecords = 20;
info = reader.readRecords(features);
Modified: core/trunk/geoext/tests/lib/GeoExt/data/FeatureRecord.html
===================================================================
--- core/trunk/geoext/tests/lib/GeoExt/data/FeatureRecord.html 2010-09-10 13:16:17 UTC (rev 2325)
+++ core/trunk/geoext/tests/lib/GeoExt/data/FeatureRecord.html 2010-09-10 13:19:11 UTC (rev 2326)
@@ -44,7 +44,7 @@
record = new c({feature: feature, state: feature.state, fid: feature.fid}, feature.id);
t.ok(record instanceof GeoExt.data.FeatureRecord, "create returns a constructor (FeatureRecord)");
t.ok(record instanceof c, "create returns a constructor (c)");
- t.eq(record.get("feature").id, feature.id, "feature stored correctly");
+ t.eq(record.getFeature().id, feature.id, "feature stored correctly");
t.eq(record.id, feature.id, "id set correctly");
record = new c({feature: feature, state: feature.name, fid: feature.fid, foo: "bar"}, feature.id);
t.eq(record.get("foo"), "bar", "foo data row set correctly");
Modified: core/trunk/geoext/tests/lib/GeoExt/data/FeatureStore.html
===================================================================
--- core/trunk/geoext/tests/lib/GeoExt/data/FeatureStore.html 2010-09-10 13:16:17 UTC (rev 2325)
+++ core/trunk/geoext/tests/lib/GeoExt/data/FeatureStore.html 2010-09-10 13:19:11 UTC (rev 2326)
@@ -174,12 +174,12 @@
// confirm that we can get a phantom record
record = store.getRecordFromFeature(features[0]);
- t.ok((record && record.get("feature")) === features[0],
+ t.ok((record && record.getFeature()) === features[0],
"phantom record retrieved");
// confirm that we can get a normal record
record = store.getRecordFromFeature(features[1]);
- t.ok((record && record.get("feature")) === features[1],
+ t.ok((record && record.getFeature()) === features[1],
"normal record retrieved");
layer.destroy();
Modified: core/trunk/geoext/tests/lib/GeoExt/data/LayerReader.html
===================================================================
--- core/trunk/geoext/tests/lib/GeoExt/data/LayerReader.html 2010-09-10 13:16:17 UTC (rev 2325)
+++ core/trunk/geoext/tests/lib/GeoExt/data/LayerReader.html 2010-09-10 13:19:11 UTC (rev 2326)
@@ -52,7 +52,7 @@
"readRecords returns records of expected type");
t.ok(data.records[0].id == layers[0].id,
"readRecords returns records with expected \"id\"");
- t.ok(data.records[0].get("layer") == layers[0],
+ t.ok(data.records[0].getLayer() == layers[0],
"readRecords returns records with expected \"layer\" field");
t.eq(data.records[0].get("title"), layers[0].name,
"readRecords returns records with expected \"title\" field");
Modified: core/trunk/geoext/tests/lib/GeoExt/data/LayerRecord.html
===================================================================
--- core/trunk/geoext/tests/lib/GeoExt/data/LayerRecord.html 2010-09-10 13:16:17 UTC (rev 2325)
+++ core/trunk/geoext/tests/lib/GeoExt/data/LayerRecord.html 2010-09-10 13:19:11 UTC (rev 2326)
@@ -38,7 +38,7 @@
record = new c({layer: layer, title: layer.name}, layer.id);
t.ok(record instanceof GeoExt.data.LayerRecord, "create returns a constructor (LayerRecord)");
t.ok(record instanceof c, "create returns a constructor (c)");
- t.eq(record.get("layer").id, layer.id, "layer stored correctly");
+ t.eq(record.getLayer().id, layer.id, "layer stored correctly");
t.eq(record.id, layer.id, "id set correctly");
record = new c({layer: layer, title: layer.name, foo: "bar"}, layer.id);
t.eq(record.get("foo"), "bar", "foo data row set correctly");
@@ -56,12 +56,12 @@
var clone = record.clone();
t.ok(clone.id !== record.id, "clone record does not have original id");
- t.ok(clone.id == clone.get("layer").id, "clone record id is same as its layer id");
+ t.ok(clone.id == clone.getLayer().id, "clone record id is same as its layer id");
record.set("title", "foo");
t.ok(clone.get("title") !== "foo", "setting a property on original doesn't modify clone");
- t.ok(clone.get("layer") !== layer, "clone does not have original layer");
+ t.ok(clone.getLayer() !== layer, "clone does not have original layer");
}
Modified: core/trunk/geoext/tests/lib/GeoExt/data/LayerStore.html
===================================================================
--- core/trunk/geoext/tests/lib/GeoExt/data/LayerStore.html 2010-09-10 13:16:17 UTC (rev 2325)
+++ core/trunk/geoext/tests/lib/GeoExt/data/LayerStore.html 2010-09-10 13:19:11 UTC (rev 2326)
@@ -101,13 +101,13 @@
t.eq(store.getCount(), 3, "three layers in store");
t.eq(map.layers.length, 3, "three layers on map");
- t.eq(store.getAt(0).get("layer").name, "a", "first layer correct in store");
+ t.eq(store.getAt(0).getLayer().name, "a", "first layer correct in store");
t.eq(map.layers[0].name, "a", "first layer correct on map");
- t.eq(store.getAt(1).get("layer").name, "b", "second layer correct in store");
+ t.eq(store.getAt(1).getLayer().name, "b", "second layer correct in store");
t.eq(map.layers[1].name, "b", "second layer correct on map");
- t.eq(store.getAt(2).get("layer").name, "c", "third layer correct in store");
+ t.eq(store.getAt(2).getLayer().name, "c", "third layer correct in store");
t.eq(map.layers[2].name, "c", "third layer correct on map");
map.destroy();
@@ -221,7 +221,7 @@
// create a copy of the record with the same layer
var copy = record.copy(); // record with same id will replace original
- copy.data.layer = record.get("layer"); // force records to have same layer
+ copy.setLayer(record.getLayer()); // force records to have same layer
store.add(copy);
t.eq(store.getCount(), 1, "store has a single record after adding copy");
t.eq(map.layers.length, 1, "map has a single layer after adding copy");
@@ -244,9 +244,9 @@
store.add(store.reader.readRecords([a, b, c]).records);
t.eq(store.getCount(), 3, "[a, b, c] three layers in store");
- t.eq(store.getAt(0).get("layer").name, "a", "[a, b, c] first layer correct in store");
- t.eq(store.getAt(1).get("layer").name, "b", "[a, b, c] second layer correct in store");
- t.eq(store.getAt(2).get("layer").name, "c", "[a, b, c] third layer correct in store");
+ t.eq(store.getAt(0).getLayer().name, "a", "[a, b, c] first layer correct in store");
+ t.eq(store.getAt(1).getLayer().name, "b", "[a, b, c] second layer correct in store");
+ t.eq(store.getAt(2).getLayer().name, "c", "[a, b, c] third layer correct in store");
t.eq(map.layers.length, 3, "[a, b, c] three layers on map");
t.eq(map.layers[0].name, "a", "[a, b, c] first layer correct on map");
t.eq(map.layers[1].name, "b", "[a, b, c] second layer correct on map");
@@ -256,9 +256,9 @@
map.setLayerIndex(a, 1);
t.eq(store.getCount(), 3, "[b, a, c] three layers in store");
- t.eq(store.getAt(0).get("layer").name, "b", "[b, c, a] first layer correct in store");
- t.eq(store.getAt(1).get("layer").name, "a", "[b, c, a] second layer correct in store");
- t.eq(store.getAt(2).get("layer").name, "c", "[b, c, a] third layer correct in store");
+ t.eq(store.getAt(0).getLayer().name, "b", "[b, c, a] first layer correct in store");
+ t.eq(store.getAt(1).getLayer().name, "a", "[b, c, a] second layer correct in store");
+ t.eq(store.getAt(2).getLayer().name, "c", "[b, c, a] third layer correct in store");
t.eq(map.layers.length, 3, "[a, b, c] three layers on map");
t.eq(map.layers[0].name, "b", "[b, c, a] first layer correct on map");
t.eq(map.layers[1].name, "a", "[b, c, a] second layer correct on map");
@@ -268,9 +268,9 @@
map.setLayerIndex(c, 0);
t.eq(store.getCount(), 3, "[c, b, a] three layers in store");
- t.eq(store.getAt(0).get("layer").name, "c", "[c, b, a] first layer correct in store");
- t.eq(store.getAt(1).get("layer").name, "b", "[c, b, a] second layer correct in store");
- t.eq(store.getAt(2).get("layer").name, "a", "[c, b, a] third layer correct in store");
+ t.eq(store.getAt(0).getLayer().name, "c", "[c, b, a] first layer correct in store");
+ t.eq(store.getAt(1).getLayer().name, "b", "[c, b, a] second layer correct in store");
+ t.eq(store.getAt(2).getLayer().name, "a", "[c, b, a] third layer correct in store");
t.eq(map.layers.length, 3, "[c, b, a] three layers on map");
t.eq(map.layers[0].name, "c", "[c, b, a] first layer correct on map");
t.eq(map.layers[1].name, "b", "[c, b, a] second layer correct on map");
@@ -300,10 +300,10 @@
store.insert(1, store.reader.readRecords([d]).records);
t.eq(store.getCount(), 4, "[a, d, b, c] four layers in store");
- t.eq(store.getAt(0).get("layer").name, "a", "[a, d, b, c] first layer correct in store");
- t.eq(store.getAt(1).get("layer").name, "d", "[a, d, b, c] second layer correct in store");
- t.eq(store.getAt(2).get("layer").name, "b", "[a, d, b, c] third layer correct in store");
- t.eq(store.getAt(3).get("layer").name, "c", "[a, d, b, c] fourth layer correct in store");
+ t.eq(store.getAt(0).getLayer().name, "a", "[a, d, b, c] first layer correct in store");
+ t.eq(store.getAt(1).getLayer().name, "d", "[a, d, b, c] second layer correct in store");
+ t.eq(store.getAt(2).getLayer().name, "b", "[a, d, b, c] third layer correct in store");
+ t.eq(store.getAt(3).getLayer().name, "c", "[a, d, b, c] fourth layer correct in store");
t.eq(map.layers.length, 4, "[a, d, b, c] four layers on map");
t.eq(map.layers[0].name, "a", "[a, d, b, c] first layer correct on map");
t.eq(map.layers[1].name, "d", "[a, d, b, c] second layer correct on map");
@@ -347,7 +347,7 @@
});
var record = store.getByLayer(layers[1]);
- t.ok(record.get("layer") === layers[1], "correct layer record returned");
+ t.ok(record.getLayer() === layers[1], "correct layer record returned");
record = store.getByLayer(new OpenLayers.Layer("other layer"));
t.eq(record, undefined, "getByLayer returns undefined if layer is not in store");
@@ -388,7 +388,7 @@
t.eq(event.type, "add", "[" + batch + "] 'add' event");
t.eq(event.args[1].length, 1, "[" + batch + "] correct number of records");
record = event.args[1][0];
- t.ok(record.get("layer") === d, "[" + batch + "] correct layer on record");
+ t.ok(record.getLayer() === d, "[" + batch + "] correct layer on record");
// confirm that we get a "remove" on map.removeLayer
events = [];
@@ -397,7 +397,7 @@
t.eq(events.length, 1, "[" + batch + "] one event");
event = events[0];
t.eq(event.type, "remove", "[" + batch + "] 'remove' event");
- t.ok(event.args[1].get("layer") === d, "[" + batch + "] correct layer on record");
+ t.ok(event.args[1].getLayer() === d, "[" + batch + "] correct layer on record");
// confirm that we get an "add" and "remove" on map.setLayerIndex
events = [];
@@ -406,12 +406,12 @@
t.eq(events.length, 2, "[" + batch + "] two events");
event = events[0];
t.eq(event.type, "remove", "[" + batch + "] 'remove' event first");
- t.ok(event.args[1].get("layer") === b, "[" + batch + "] correct layer on record");
+ t.ok(event.args[1].getLayer() === b, "[" + batch + "] correct layer on record");
event = events[1];
t.eq(event.type, "add", "[" + batch + "] 'add' event second");
t.eq(event.args[1].length, 1, "[" + batch + "] correct number of records");
record = event.args[1][0];
- t.ok(record.get("layer") === b, "[" + batch + "] correct layer on record");
+ t.ok(record.getLayer() === b, "[" + batch + "] correct layer on record");
// confirm that we get an "update" on layer.setName
events = [];
@@ -420,7 +420,7 @@
t.eq(events.length, 1, "[" + batch + "] one event");
event = events[0];
t.eq(event.type, "update", "[" + batch + "] 'update' event");
- t.ok(event.args[1].get("layer") === c, "[" + batch + "] correct layer on record");
+ t.ok(event.args[1].getLayer() === c, "[" + batch + "] correct layer on record");
t.eq(event.args[2], Ext.data.Record.EDIT, "[" + batch + "] correct operation");
// confirm that we get an "update" on layer.setVisibility
@@ -430,7 +430,7 @@
t.eq(events.length, 1, "[" + batch + "] one event");
event = events[0];
t.eq(event.type, "update", "[" + batch + "] 'update' event");
- t.ok(event.args[1].get("layer") === a, "[" + batch + "] correct layer on record");
+ t.ok(event.args[1].getLayer() === a, "[" + batch + "] correct layer on record");
t.eq(event.args[2], Ext.data.Record.EDIT, "[" + batch + "] correct operation");
Modified: core/trunk/geoext/tests/lib/GeoExt/data/WFSCapabilitiesReader.html
===================================================================
--- core/trunk/geoext/tests/lib/GeoExt/data/WFSCapabilitiesReader.html 2010-09-10 13:16:17 UTC (rev 2325)
+++ core/trunk/geoext/tests/lib/GeoExt/data/WFSCapabilitiesReader.html 2010-09-10 13:19:11 UTC (rev 2326)
@@ -55,7 +55,7 @@
);
//3 tests -- Testing the layer field (and its default protocol)
- var layer = record.get("layer");
+ var layer = record.getLayer();
t.eq(layer.CLASS_NAME, "OpenLayers.Layer.Vector", "[0] layer field is of type OpenLayers.Layer.Vector");
t.eq(layer.protocol.CLASS_NAME, "OpenLayers.Protocol.WFS.v1_0_0", "[0] protocol is of type OpenLayers.Protocol.WFS.v1_0_0");
t.eq(layer.protocol.url, "http://someserver.com:8080/geoserver/wfs?", "[0] protocol has correct URL");
Modified: core/trunk/geoext/tests/lib/GeoExt/data/WMCReader.html
===================================================================
--- core/trunk/geoext/tests/lib/GeoExt/data/WMCReader.html 2010-09-10 13:16:17 UTC (rev 2325)
+++ core/trunk/geoext/tests/lib/GeoExt/data/WMCReader.html 2010-09-10 13:19:11 UTC (rev 2326)
@@ -70,7 +70,7 @@
t.eq(record.get("styles")[0].title, "1 px blue line", "correct title for styles record field");
//4 tests -- Testing the layer field
- var layer = record.get("layer");
+ var layer = record.getLayer();
t.eq(layer.CLASS_NAME, "OpenLayers.Layer.WMS", "layer record field is of type OpenLayers.Layer.WMS");
t.eq(layer.url, "../geoserver/wms?SERVICE=WMS&", "layer record field has correct URL");
t.eq(layer.params.LAYERS, "geob:communes_geofla","layer record field has correct LAYERS parameter");
Modified: core/trunk/geoext/tests/lib/GeoExt/data/WMSCapabilitiesReader.html
===================================================================
--- core/trunk/geoext/tests/lib/GeoExt/data/WMSCapabilitiesReader.html 2010-09-10 13:16:17 UTC (rev 2325)
+++ core/trunk/geoext/tests/lib/GeoExt/data/WMSCapabilitiesReader.html 2010-09-10 13:19:11 UTC (rev 2326)
@@ -63,7 +63,7 @@
//1 test -- testing value of record id
record = records.records[2];
- t.ok(record.id == record.get("layer").id, "[2] correct record id");
+ t.ok(record.id == record.getLayer().id, "[2] correct record id");
//22 tests -- testing the fields of a record
record = records.records[2];
@@ -116,7 +116,7 @@
//7 tests -- Testing the layer field
record = records.records[2];
- layer = record.get("layer");
+ layer = record.getLayer();
t.eq(layer.CLASS_NAME, "OpenLayers.Layer.WMS", "[2] layer field is of type OpenLayers.Layer.WMS");
t.eq(layer.url, "http://publicus.opengeo.org:80/geoserver/wms?SERVICE=WMS&", "[2] layer field has correct URL");
t.eq(layer.params.LAYERS, "tiger:tiger_roads","[2] layer field has correct LAYERS parameter");
@@ -127,7 +127,7 @@
// 3 tests -- attribution markup
record = records.records[2];
- layer = record.get("layer");
+ layer = record.getLayer();
var attribution = layer.attribution;
t.ok(attribution.indexOf("http://foo/logo.png") !== -1, "attribution markup has a logo");
t.ok(attribution.indexOf("Foo Authority") !== -1, "attribution markup has a title");
@@ -136,12 +136,12 @@
// 2 tests - transparent param
var transparent;
record = records.records[2];
- layer = record.get("layer");
+ layer = record.getLayer();
transparent = layer.params.TRANSPARENT;
t.eq(transparent, false,
"TRANSPARENT param is false if opacity set to 1");
record = records.records[1];
- layer = record.get("layer");
+ layer = record.getLayer();
transparent = layer.params.TRANSPARENT;
t.eq(transparent, true,
"TRANSPARENT param is true if no opacity set");
Modified: core/trunk/geoext/tests/lib/GeoExt/widgets/LegendPanel.html
===================================================================
--- core/trunk/geoext/tests/lib/GeoExt/widgets/LegendPanel.html 2010-09-10 13:16:17 UTC (rev 2325)
+++ core/trunk/geoext/tests/lib/GeoExt/widgets/LegendPanel.html 2010-09-10 13:19:11 UTC (rev 2326)
@@ -68,7 +68,7 @@
lp.render();
mapPanel.map.layers[0].setVisibility(false);
- var id = lp.getIdForLayer(mapPanel.layers.getAt(0).get('layer'));
+ var id = lp.getIdForLayer(mapPanel.layers.getAt(0).getLayer());
t.eq(lp.getComponent(id).hidden, true, "Layer has been hidden in legend");
mapPanel.map.layers[0].setVisibility(true);
@@ -86,7 +86,7 @@
lp.render();
mapPanel.layers.getAt(0).set("hideInLegend", true);
- var id = lp.getIdForLayer(mapPanel.layers.getAt(0).get('layer'));
+ var id = lp.getIdForLayer(mapPanel.layers.getAt(0).getLayer());
t.eq(lp.getComponent(id).hidden, true, "Layer has been hidden in legend");
lp.destroy();
@@ -242,7 +242,7 @@
});
var lp = new GeoExt.LegendPanel({
- filter: function(record) { return !record.get("layer").isBaseLayer; },
+ filter: function(record) { return !record.getLayer().isBaseLayer; },
renderTo: 'legendpanel'});
lp.render();
@@ -295,8 +295,8 @@
renderTo: 'legendpanel'});
lp.render();
- var id0 = lp.getIdForLayer(mapPanel.layers.getAt(0).get('layer'));
- var id1 = lp.getIdForLayer(mapPanel.layers.getAt(1).get('layer'));
+ var id0 = lp.getIdForLayer(mapPanel.layers.getAt(0).getLayer());
+ var id1 = lp.getIdForLayer(mapPanel.layers.getAt(1).getLayer());
t.eq(lp.getComponent(id0).hidden, false, "Base layer is visible");
t.eq(lp.getComponent(id1).hidden, true, "Layer has been hidden in legend because it is not in scale");
Modified: core/trunk/geoext/tests/lib/GeoExt/widgets/WMSLegend.html
===================================================================
--- core/trunk/geoext/tests/lib/GeoExt/widgets/WMSLegend.html 2010-09-10 13:16:17 UTC (rev 2325)
+++ core/trunk/geoext/tests/lib/GeoExt/widgets/WMSLegend.html 2010-09-10 13:19:11 UTC (rev 2326)
@@ -165,7 +165,7 @@
// test
// #1
- layerRecord.get("layer").mergeNewParams({
+ layerRecord.getLayer().mergeNewParams({
layers: "b"
});
l.update();
@@ -175,7 +175,7 @@
"update adds new components");
// #2
- layerRecord.get("layer").mergeNewParams({
+ layerRecord.getLayer().mergeNewParams({
layers: "b,c",
foo: "bar"
});
@@ -190,7 +190,7 @@
"update sets correct URL in new component");
// #3
- layerRecord.get("layer").mergeNewParams({
+ layerRecord.getLayer().mergeNewParams({
layers: "c",
styles: "style1"
});
@@ -212,7 +212,7 @@
"update uses the legend href from the styles field");
// #5
- layerRecord.get("layer").mergeNewParams({
+ layerRecord.getLayer().mergeNewParams({
layers: "c",
styles: null,
sld: "http://url-to-sld.org/"
Modified: core/trunk/geoext/tests/lib/GeoExt/widgets/tree/LayerContainer.html
===================================================================
--- core/trunk/geoext/tests/lib/GeoExt/widgets/tree/LayerContainer.html 2010-09-10 13:16:17 UTC (rev 2325)
+++ core/trunk/geoext/tests/lib/GeoExt/widgets/tree/LayerContainer.html 2010-09-10 13:19:11 UTC (rev 2326)
@@ -157,9 +157,9 @@
// change the group when moving to a new container
if (oldParent !== newParent) {
var index = store.findBy(function(r){
- return r.get("layer") === node.layer;
+ return r.getLayer() === node.layer;
});
- var layer = store.getAt(index).get("layer");
+ var layer = store.getAt(index).getLayer();
layer.displayInLayerSwitcher = !layer.displayInLayerSwitcher;
}
},
@@ -171,7 +171,7 @@
loader: {
store: store,
filter: function(record) {
- return !record.get("layer").displayInLayerSwitcher
+ return !record.getLayer().displayInLayerSwitcher
}
},
expanded: true
@@ -181,7 +181,7 @@
loader: {
store: store,
filter: function(record) {
- return record.get("layer").displayInLayerSwitcher
+ return record.getLayer().displayInLayerSwitcher
}
},
expanded: true
More information about the Commits
mailing list