Changeset 4695 in josm for trunk/src/org/openstreetmap/josm/io/OsmImporter.java

Timestamp:

2011-12-22T11:49:23+01:00 (12 years ago)

Author:

bastiK

Message:

session: GpxImporter refactoring

File:

• trunk/src/org/openstreetmap/josm/io/OsmImporter.java (modified) (3 diffs)

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

@@ -19 +19 @@
 import org.openstreetmap.josm.gui.progress.NullProgressMonitor;
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
+import org.openstreetmap.josm.gui.util.GuiHelper;
 
 public class OsmImporter extends FileImporter {
 
-    private OsmDataLayer layer;
-    private Runnable postLayerTask;
+    protected OsmDataLayer layer;
+    protected Runnable postLayerTask;
 
     public OsmImporter() {
@@ -47 +48 @@
         loadLayer(in, associatedFile, associatedFile == null ? OsmDataLayer.createNewName() : associatedFile.getName(), NullProgressMonitor.INSTANCE);
         // FIXME: remove UI stuff from IO subsystem
-        Runnable uiStuff = new Runnable() {
+        GuiHelper.runInEDT(new Runnable() {
             @Override
             public void run() {
@@ -54 +55 @@
                 layer.onPostLoadFromFile();
             }
-        };
-        if (SwingUtilities.isEventDispatchThread()) {
-            uiStuff.run();
-        } else {
-            SwingUtilities.invokeLater(uiStuff);
-        }
+        });
     }