Changeset 10432 in josm for trunk/src/org/openstreetmap/josm/io

Timestamp:

2016-06-20T00:06:54+02:00 (9 years ago)

Author:

Don-vip

Message:

fix #13001 - Add MainPanel + some new methods (patch by michael2402, modified) - gsoc-core

File:

• trunk/src/org/openstreetmap/josm/io/NoteImporter.java (modified) (2 diffs)

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

@@ -14 +14 @@
 import org.openstreetmap.josm.gui.layer.NoteLayer;
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
-import org.openstreetmap.josm.gui.util.GuiHelper;
 import org.xml.sax.SAXException;
 
@@ -38 +37 @@
         try (InputStream is = Compression.getUncompressedFileInputStream(file)) {
             final NoteLayer layer = loadLayer(is, file, file.getName(), progressMonitor);
-            if (Main.map == null || !Main.getLayerManager().containsLayer(layer)) {
-                GuiHelper.runInEDT(new Runnable() {
-                    @Override
-                    public void run() {
-                        Main.main.addLayer(layer);
-                    }
-                });
+            if (!Main.getLayerManager().containsLayer(layer)) {
+                Main.getLayerManager().addLayer(layer);
             }
         } catch (SAXException e) {