Changeset 6336 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java

Timestamp:

2013-10-27T05:35:41+01:00 (11 years ago)

Author:

Don-vip

Message:

code cleanup / robustness in edit layer handling

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java

@@ -168 +168 @@
         MapView.addEditLayerChangeListener(actSearch);
         // editLayerChanged also gets the selection history of the level
-        model.editLayerChanged(null, Main.map.mapView.getEditLayer());
-        if (Main.map.mapView.getEditLayer() != null) {
-            model.setJOSMSelection(Main.map.mapView.getEditLayer().data.getAllSelected());
+        OsmDataLayer editLayer = Main.main.getEditLayer();
+        model.editLayerChanged(null, editLayer);
+        if (editLayer != null) {
+            model.setJOSMSelection(editLayer.data.getAllSelected());
         }
         actSearch.updateEnabledState();
@@ -285 +286 @@
 
         public void updateEnabledState() {
-            setEnabled(Main.main != null && Main.main.getEditLayer() != null);
+            setEnabled(Main.main != null && !Main.main.hasEditLayer());
         }
 
@@ -310 +311 @@
             Collection<OsmPrimitive> sel = model.getSelected();
             if (sel.isEmpty())return;
-            if (Main.map == null || Main.map.mapView == null || Main.map.mapView.getEditLayer() == null) return;
-            Main.map.mapView.getEditLayer().data.setSelected(sel);
+            OsmDataLayer editLayer = Main.main.getEditLayer();
+            if (editLayer == null) return;
+            editLayer.data.setSelected(sel);
         }