Changeset 35770 in osm for applications/editors/josm/plugins

Timestamp:

2021-05-25T15:47:55+02:00 (4 years ago)

Author:

holgermappt

Message:

Use try/catch instead of flag (which does not work as intended), see #josm20893

File:

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

applications/editors/josm/plugins/photoadjust/src/org/openstreetmap/josm/plugins/photoadjust/PhotoPropertyEditor.java

@@ -42 +42 @@
 import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.ImageProvider;
+import org.openstreetmap.josm.tools.Logging;
 
 /**
@@ -67 +68 @@
      */
     private static class PropertyEditorAction extends JosmAction implements LayerChangeListener, ImageDataUpdateListener {
-        boolean imgDataUpdLstReg = false;
 
         public PropertyEditorAction() {
@@ -137 +137 @@
             if (layer instanceof GeoImageLayer) {
                 ((GeoImageLayer) layer).getImageData().addImageDataUpdateListener(this);
-                imgDataUpdLstReg = true;
             }
         }
@@ -149 +148 @@
                 // e.g. if the plugin was added while the geo image layer
                 // existed and then the layer is removed.
-                if (imgDataUpdLstReg) {
+                try {
                     ((GeoImageLayer) layer).getImageData().removeImageDataUpdateListener(this);
-                    imgDataUpdLstReg = false;
+                } catch (IllegalArgumentException ignore) {
+                    Logging.trace(ignore);
                 }
             }