Ticket #17465: josm_fix_map_mode_readonly_layer_v1.patch

plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java

@@ -98 +98 @@
 
     @Override
     public void enterMode() {
+        if (!isEnabled())
+            return;
         super.enterMode();
         lineWasSaved = false;
         settings = new FDSettings();
@@ -140 +142 @@
 
     @Override
     public boolean layerIsSupported(Layer l) {
-        return l instanceof OsmDataLayer;
+        return isEditableDataLayer(l);
     }
 
     @Override

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

@@ -139 +139 @@
 
     @Override
     public void enterMode() {
+        if (!isEnabled())
+            return;
         super.enterMode();
 
         MapFrame map = MainApplication.getMap();
-        if (getLayerManager().getEditDataSet() == null) {
-            map.selectSelectTool(false);
-            return;
-        }
         selectedColor = new NamedColorProperty(marktr("selected"), selectedColor).get();
         map.mapView.addMouseListener(this);
         map.mapView.addMouseMotionListener(this);
@@ -449 +447 @@
 
     @Override
     public boolean layerIsSupported(Layer l) {
-        return l instanceof OsmDataLayer;
+        return isEditableDataLayer(l);
     }
 
+    @Override
+    protected void updateEnabledState() {
+        setEnabled(getLayerManager().getEditLayer() != null);
+    }
+
     public final void updateSnap(Collection<? extends OsmPrimitive> newSelection) {
         building.clearAngleSnap();
         // update snap only if selection isn't too big

plugins/splinex/src/org/openstreetmap/josm/plugins/Splinex/DrawSplineAction.java

@@ -395 +395 @@
 
     @Override
     public boolean layerIsSupported(Layer l) {
-        return l instanceof OsmDataLayer;
+        return isEditableDataLayer(l);
     }
 
     @Override