Changeset 1808 in josm for trunk/src/org/openstreetmap/josm/gui/MapView.java

Timestamp:

2009-07-19T10:31:27+02:00 (15 years ago)

Author:

Gubaer

Message:

improved enabling/disabling of menu entries and action buttons depending on current state of JOSM (number of open layers, type of active layer, etc.)

File:

• trunk/src/org/openstreetmap/josm/gui/MapView.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/MapView.java

@@ -210 +210 @@
      */
     public void removeLayer(Layer layer) {
+        if (layer == activeLayer) {
+            if (layer instanceof OsmDataLayer) {
+                Main.ds = null;
+            }
+            activeLayer = null;
+        }
         if (layers.remove(layer)) {
             for (Layer.LayerChangeListener l : Layer.listeners) {
                 l.layerRemoved(layer);
-            }
-        }
-        if (layer == activeLayer) {
-            if (layer instanceof OsmDataLayer) {
-                Main.ds = null;
             }
         }
@@ -419 +420 @@
         // workaround for #1461 (zoom to download bounding box instead of all data)
         // In case we already have an existing data layer ...
-        Collection<DataSource> dataSources = Main.main.createOrGetEditLayer().data.dataSources;
+        OsmDataLayer layer= getEditLayer();
+        if (layer == null)
+            return false;
+        Collection<DataSource> dataSources = layer.data.dataSources;
         // ... with bounding box[es] of data loaded from OSM or a file...
         BoundingXYVisitor bbox = new BoundingXYVisitor();