Changeset 4684 in josm for trunk/src/org/openstreetmap/josm/actions/MergeLayerAction.java

Timestamp:

2011-12-21T12:58:59+01:00 (12 years ago)

Author:

Don-vip

Message:

see #7159 - Layer merging performance

File:

• trunk/src/org/openstreetmap/josm/actions/MergeLayerAction.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/actions/MergeLayerAction.java

@@ -39 +39 @@
     }
 
-    public void merge(Layer sourceLayer) {
+    public void merge(final Layer sourceLayer) {
         if (sourceLayer == null)
             return;
@@ -47 +47 @@
             return;
         }
-        Layer targetLayer = askTargetLayer(targetLayers);
+        final Layer targetLayer = askTargetLayer(targetLayers);
         if (targetLayer == null)
             return;
-        targetLayer.mergeFrom(sourceLayer);
-        Main.map.mapView.removeLayer(sourceLayer);
-        Main.map.mapView.setActiveLayer(targetLayer);
+        Main.worker.submit(new Runnable() {
+            @Override
+            public void run() {
+                targetLayer.mergeFrom(sourceLayer);
+                Main.map.mapView.removeLayer(sourceLayer);
+                Main.map.mapView.setActiveLayer(targetLayer);
+            }
+        });
     }