Changeset 18940 in josm for trunk/src/org/openstreetmap

Timestamp:

2024-01-16T08:06:33+01:00 (10 months ago)

Author:

GerdP

Message:

see #23415/r18939 ( MarkerLayerTest still failed)

• restore most of the old behaviour of destroy() and destroyInstance() as it was before r18937
• don't call destroy inside updateLayers() as this code is also used in unit tests
• check in layerRemoving() if dialog should be destroyed

Hope this now fixes all unit tests. Some of them fail on my machine because the expect to run in English while my machine is configured to German. Have to find out where this can be changed...

File:

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

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

@@ -147 +147 @@
         MapFrame map = MainApplication.getMap();
         synchronized (ImageViewerDialog.class) {
-            if (dialog != null) {
-                if (map != null && map.getToggleDialog(ImageViewerDialog.class) != null) {
-                    map.removeToggleDialog(dialog);
-                }
-                if (!dialog.isDestroyed()) {
-                    dialog.destroy();
-                }
+            if (dialog != null && map != null && map.getToggleDialog(ImageViewerDialog.class) != null) {
+                map.removeToggleDialog(dialog);
             }
         }
@@ -303 +298 @@
         if (geoImageLayers.isEmpty()) {
             this.layers.setVisible(false);
-            hideNotify();
-            if (hasInstance())
-                destroyInstance();
         } else {
             this.layers.setVisible(true);
@@ -430 +422 @@
     }
 
-    private boolean isDestroyed() {
-        return this.titleBar == null;
-    }
-
     /**
      * This literally exists to silence sonarlint complaints.
@@ -1128 +1116 @@
         }
         this.updateLayers(true);
+        if (!layers.isVisible()) {
+            hideNotify();
+            destroy();
+        }
     }