Changeset 35997 in osm for applications/editors

Timestamp:

2022-07-05T21:36:58+02:00 (3 years ago)

Author:

taylor.smock

Message:

Fix #17465: IAE: Listener buildings_tools.DrawBuildingAction was not registered before or already removed.

This occurs when a user attempts to enter the mapmode when the edit dataset is
null. We fix the problem by (a) updating the layerIsSupported method to use
isEditableDataLayer (introduced in r13434) and (b) removing a check that used
to ensure that if a user entered the mapmode when there was no editable layer,
we immediately exit from the mapmode and enter into the select mode. As all
calls to enterMode should be guarded by layerIsSupported (on layer change),
this is safe now that we are checking if the layer is editable.

File:

• applications/editors/josm/plugins/buildings_tools/src/org/openstreetmap/josm/plugins/buildings_tools/DrawBuildingAction.java (modified) (4 diffs)

applications/editors/josm/plugins/buildings_tools/src/org/openstreetmap/josm/plugins/buildings_tools/DrawBuildingAction.java

@@ -17 +17 @@
 import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.gui.layer.MapViewPaintable;
-import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.gui.util.KeyPressReleaseListener;
 import org.openstreetmap.josm.gui.util.ModifierExListener;
@@ -30 +29 @@
 import java.awt.Color;
 import java.awt.Cursor;
-import java.awt.EventQueue;
 import java.awt.Graphics2D;
 import java.awt.Point;
@@ -132 +130 @@
 
         MapFrame map = MainApplication.getMap();
-        if (getLayerManager().getEditDataSet() == null) {
-            map.selectSelectTool(false);
-            return;
-        }
         selectedColor = new NamedColorProperty(marktr("selected"), selectedColor).get();
         map.mapView.addMouseListener(this);
@@ -440 +434 @@
     @Override
     public boolean layerIsSupported(Layer l) {
-        return l instanceof OsmDataLayer;
+        return isEditableDataLayer(l);
     }