Changeset 4265 in josm for trunk/src/org/openstreetmap/josm/actions

Timestamp:

2011-07-27T07:16:41+02:00 (13 years ago)

Author:

jttt

Message:

Make merge layers work when more than one layer is selected

File:

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

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

@@ -2 +2 @@
 package org.openstreetmap.josm.actions;
 
+import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
 import static org.openstreetmap.josm.tools.I18n.tr;
-import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
 
 import java.awt.event.ActionEvent;
@@ -20 +20 @@
                 .registerShortcut("system:merge", tr("Edit: {0}", tr("Merge")), KeyEvent.VK_M, Shortcut.GROUP_MENU),
                 false /* register */
-        );
+                );
         putValue("help", ht("/Action/MergeLayer"));
         putValue("toolbar", "action/mergelayer");
         Main.toolbar.register(this);
+    }
+
+    public void merge(List<Layer> sourceLayers) {
+        Layer targetLayer = askTargetLayer(sourceLayers);
+        if (targetLayer == null)
+            return;
+        for (Layer l: sourceLayers) {
+            if (l != targetLayer) {
+                targetLayer.mergeFrom(l);
+                Main.map.mapView.removeLayer(l);
+            }
+        }
+        Main.map.mapView.setActiveLayer(targetLayer);
     }