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

Timestamp:

2017-12-30T18:38:36+01:00 (7 years ago)

Author:

Don-vip

Message:

see #15709 - proper singleton for ImageryViewerDialog

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

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

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

@@ -60 +60 @@
     private boolean collapseButtonClicked;
 
-    static void newInstance() {
-        dialog = new ImageViewerDialog();
-    }
-
     /**
      * Replies the unique instance of this dialog
@@ -70 +66 @@
     public static ImageViewerDialog getInstance() {
         if (dialog == null)
-            throw new AssertionError("a new instance needs to be created first");
+            dialog = new ImageViewerDialog();
         return dialog;
     }