Changeset 2720 in josm for trunk/src/org/openstreetmap/josm/gui/layer/geoimage

Timestamp:

2009-12-31T14:52:54+01:00 (14 years ago)

Author:

bastiK

Message:

fixed #4100 (no Main.map available when loading an image using open without previously loading data)

File:

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

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

@@ -237 +237 @@
                 layer.hook_up_mouse_events(); // Main.map.mapView should exist
                 // now. Can add mouse listener
+                Main.map.mapView.addPropertyChangeListener(layer);
+                if (!addedToggleDialog) {
+                    Main.map.addToggleDialog(ImageViewerDialog.getInstance());
+                    addedToggleDialog = true;
+                }
 
                 if (! cancelled && layer.data.size() > 0) {
@@ -262 +267 @@
         Loader loader = new Loader(files, gpxLayer);
         Main.worker.execute(loader);
-        if (!addedToggleDialog) {
-            Main.map.addToggleDialog(ImageViewerDialog.getInstance());
-            addedToggleDialog = true;
-        }
     }
 
@@ -275 +276 @@
         this.data = data;
         this.gpxLayer = gpxLayer;
-        Main.map.mapView.addPropertyChangeListener(this);
     }