Changeset 18943 in josm for trunk/src/org

Timestamp:

2024-01-19T09:17:04+01:00 (9 months ago)

Author:

GerdP

Message:

fix #23417: Load images from Wikimedia Commons can cause crash report

• disable the action when last layer was closed

This requires special action in layerRemoving(), so default listeners in JosmAction are no longer needed

File:

• trunk/src/org/openstreetmap/josm/gui/layer/geoimage/WikimediaCommonsLoader.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/layer/geoimage/WikimediaCommonsLoader.java

@@ -16 +16 @@
 import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.PleaseWaitRunnable;
+import org.openstreetmap.josm.gui.layer.LayerManager.LayerAddEvent;
+import org.openstreetmap.josm.gui.layer.LayerManager.LayerChangeListener;
+import org.openstreetmap.josm.gui.layer.LayerManager.LayerOrderChangeEvent;
+import org.openstreetmap.josm.gui.layer.LayerManager.LayerRemoveEvent;
 import org.openstreetmap.josm.io.OsmTransferException;
 import org.openstreetmap.josm.tools.Logging;
@@ -66 +70 @@
      * @since 18021
      */
-    public static class WikimediaCommonsLoadImagesAction extends JosmAction {
+    public static class WikimediaCommonsLoadImagesAction extends JosmAction implements LayerChangeListener {
         /**
          * Constructs a new {@code WikimediaCommonsLoadImagesAction}
          */
         public WikimediaCommonsLoadImagesAction() {
-            super(tr("Load images from Wikimedia Commons"), "wikimedia_commons", null, null, false);
+            super(tr("Load images from Wikimedia Commons"), "wikimedia_commons", null, null, false, false);
+            MainApplication.getLayerManager().addLayerChangeListener(this);
+            initEnabledState();
         }
 
@@ -84 +90 @@
             setEnabled(MainApplication.isDisplayingMapView());
         }
+
+        @Override
+        public void layerAdded(LayerAddEvent e) {
+            updateEnabledState();
+        }
+
+        @Override
+        public void layerRemoving(LayerRemoveEvent e) {
+            if (e.isLastLayer())
+                setEnabled(false);
+        }
+
+        @Override
+        public void layerOrderChanged(LayerOrderChangeEvent e) {
+            // not used
+        }
+
+        @Override
+        public void destroy() {
+            MainApplication.getLayerManager().removeLayerChangeListener(this);
+            super.destroy();
+        }
     }
 }