Changeset 13289 in josm for trunk/src

Timestamp:

2018-01-07T02:34:47+01:00 (7 years ago)

Author:

Don-vip

Message:

fix #15709 - revert r13264 to restore proper lazy initialization of ImageViewerDialog (patch by cmuelle8)

Location:

trunk/src/org/openstreetmap/josm/gui/layer/geoimage

Files:

• GeoImageLayer.java (modified) (1 diff)
• ImageViewerDialog.java (modified) (2 diffs)

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

@@ -1000 +1000 @@
         MapFrame map = MainApplication.getMap();
         if (map.getToggleDialog(ImageViewerDialog.class) == null) {
+            ImageViewerDialog.createInstance();
             map.addToggleDialog(ImageViewerDialog.getInstance());
         }

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

@@ -59 +59 @@
     private boolean collapseButtonClicked;
 
+    static void createInstance() {
+        if (dialog != null)
+            throw new IllegalStateException("ImageViewerDialog instance was already created");
+        dialog = new ImageViewerDialog();
+    }
+
     /**
      * Replies the unique instance of this dialog
@@ -65 +71 @@
     public static ImageViewerDialog getInstance() {
         if (dialog == null)
-            dialog = new ImageViewerDialog();
+            throw new AssertionError("a new instance needs to be created first");
         return dialog;
     }