Changeset 2969 in josm for trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java

Timestamp:

12.02.2010 20:01:55 (2 years ago)

Author:

bastiK

Message:

fixed #4502 - Photomapping pannel open just one time;
make tiger highlight color a little transparent (see #2381)

File:

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

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

@@ -44 +44 @@
     private boolean centerView = false;
 
-    // Only one instance of that class
-    static private ImageViewerDialog INSTANCE = null;
+    // Only one instance of that class is present at one time
+    private static ImageViewerDialog dialog;
 
     private boolean collapseButtonClicked = false;
 
+    static void newInstance() {
+        dialog = new ImageViewerDialog();
+    }
+
     public static ImageViewerDialog getInstance() {
-        if (INSTANCE == null) {
-            INSTANCE = new ImageViewerDialog();
-        }
-        return INSTANCE;
+        if (dialog == null) {
+            throw new AssertionError(); // a new instance needs to be created first
+        }
+        return dialog;
     }
 
@@ -63 +67 @@
         super(tr("Geotagged Images"), "geoimage", tr("Display geotagged images"), Shortcut.registerShortcut("tools:geotagged", tr("Tool: {0}", tr("Display geotagged images")), KeyEvent.VK_Y, Shortcut.GROUP_EDIT), 200);
 
-        if (INSTANCE != null) {
-            throw new IllegalStateException("Image viewer dialog should not be instanciated twice !");
-        }
-
         /* Don't show a detached dialog right from the start. */
         if (isShowing && !isDocked) {
             setIsShowing(false);
         }
-
-        INSTANCE = this;
 
         JPanel content = new JPanel();
@@ -254 +252 @@
             //    osd.append(tr("\nImage gps time: {0}", Long.toString(entry.getGpsTime().getTime())));
             //}
-            
+
             imgDisplay.setOsdText(osd.toString());
         } else {