Changeset 2050 in josm for trunk

Timestamp:

2009-09-04T16:34:59+02:00 (15 years ago)

Author:

Gubaer

Message:

fixed #3390: Opening file -> false map position

Location:

trunk/src/org/openstreetmap/josm

Files:

• gui/PleaseWaitDialog.java (modified) (1 diff)
• io/OsmImporter.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java

@@ -85 +85 @@
         setSize(Main.pref.getInteger("progressdialog.size", 600), 120);
     }
-
-    @Override
-    public void setVisible(boolean visible) {
-        super.setVisible(visible);
-        if (visible) {
-            // make sure this dialog is always on top of the main JOSM window
-            // and all the other windows (relation editors, detached dialogs, etc.)
-            //
-            toFront();
-        }
-    }
 }

trunk/src/org/openstreetmap/josm/io/OsmImporter.java

@@ -10 +10 @@
 import java.io.IOException;
 import java.io.InputStream;
+
+import javax.swing.SwingUtilities;
 
 import org.openstreetmap.josm.Main;
@@ -47 +49 @@
         OsmReader osm = OsmReader.parseDataSetOsm(in, NullProgressMonitor.INSTANCE);
         DataSet dataSet = osm.getDs();
-        OsmDataLayer layer = new OsmDataLayer(dataSet, associatedFile.getName(), associatedFile);
-        Main.main.addLayer(layer);
-        layer.fireDataChange();
-        layer.onPostLoadFromFile();
+        final OsmDataLayer layer = new OsmDataLayer(dataSet, associatedFile.getName(), associatedFile);
+        // FIXME: remove UI stuff from IO subsystem
+        //
+        Runnable uiStuff = new Runnable() {
+            public void run() {
+                Main.main.addLayer(layer);
+                layer.fireDataChange();
+                layer.onPostLoadFromFile();
+            }
+        };
+        if (SwingUtilities.isEventDispatchThread()) {
+            uiStuff.run();
+        } else {
+            SwingUtilities.invokeLater(uiStuff);
+        }
     }
 }