Changeset 8819 in josm for trunk/src/org/openstreetmap

Timestamp:

2015-10-04T12:28:59+02:00 (9 years ago)

Author:

simon04

Message:

see #11897 - MergeLayerAction: merge active layer instead of edit layer

This allows merging of gpx/marker/geoimage layers using [CTRL]+[M].

File:

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

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

@@ -95 +95 @@
     @Override
     public void actionPerformed(ActionEvent e) {
-        Layer sourceLayer = Main.main.getEditLayer();
-        if (sourceLayer == null)
-            return;
-        merge(sourceLayer);
+        merge(getSourceLayer());
     }
 
@@ -106 +103 @@
             @Override
             public void run() {
-                if (getEditLayer() == null) {
+                final Layer sourceLayer = getSourceLayer();
+                if (sourceLayer == null) {
                     setEnabled(false);
-                    return;
+                } else {
+                    final List<Layer> possibleMergeTargets = LayerListDialog.getInstance().getModel().getPossibleMergeTargets(sourceLayer);
+                    setEnabled(!possibleMergeTargets.isEmpty());
                 }
-                setEnabled(!LayerListDialog.getInstance().getModel().getPossibleMergeTargets(getEditLayer()).isEmpty());
             }
         });
+    }
+
+    protected Layer getSourceLayer() {
+        return Main.map != null ? Main.main.getActiveLayer() : null;
     }