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

Timestamp:

2015-09-23T20:44:12+02:00 (9 years ago)

Author:

simon04

Message:

fix #11891 - Unable to merge more than two data layers - regression of r8728

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java

@@ -805 +805 @@
      * The action to merge the currently selected layer into another layer.
      */
-    public final class MergeAction extends AbstractAction implements IEnabledStateUpdating {
+    public final class MergeAction extends AbstractAction implements IEnabledStateUpdating, LayerAction, Layer.MultiLayerAction {
         private transient Layer layer;
+        private transient List<Layer> layers;
 
         /**
@@ -814 +815 @@
          */
         public MergeAction(Layer layer) {
-            this();
+            this(layer, null);
             CheckParameterUtil.ensureParameterNotNull(layer, "layer");
+        }
+
+        /**
+         * Constructs a new {@code MergeAction}.
+         * @param layers the layer list
+         * @throws IllegalArgumentException if {@code layers} is null
+         */
+        public MergeAction(List<Layer> layers) {
+            this(null, layers);
+            CheckParameterUtil.ensureParameterNotNull(layers, "layers");
+        }
+
+        /**
+         * Constructs a new {@code MergeAction}.
+         */
+        private MergeAction(Layer layer, List<Layer> layers) {
             this.layer = layer;
-            putValue(NAME, tr("Merge"));
-            updateEnabledState();
-        }
-
-        /**
-         * Constructs a new {@code MergeAction}.
-         */
-        public MergeAction() {
+            this.layers = layers;
             putValue(NAME, tr("Merge"));
             putValue(SMALL_ICON, ImageProvider.get("dialogs", "mergedown"));
@@ -836 +846 @@
             if (layer != null) {
                 Main.main.menu.merge.merge(layer);
+            } else if (layers != null) {
+                Main.main.menu.merge.merge(layers);
             } else {
                 if (getModel().getSelectedLayers().size() == 1) {
@@ -846 +858 @@
         }
 
-        protected boolean isActiveLayer(Layer layer) {
-            if (!Main.isDisplayingMapView()) return false;
-            return Main.map.mapView.getActiveLayer() == layer;
-        }
-
         @Override
         public void updateEnabledState() {
-            if (layer == null) {
+            if (layer == null && layers == null) {
                 if (getModel().getSelectedLayers().isEmpty()) {
                     setEnabled(false);
@@ -870 +877 @@
                     setEnabled(!targets.isEmpty());
                 }
-            } else {
+            } else if (layer != null) {
                 List<Layer> targets = getModel().getPossibleMergeTargets(layer);
                 setEnabled(!targets.isEmpty());
-            }
+            } else {
+                setEnabled(supportLayers(layers));
+            }
+        }
+
+        @Override
+        public boolean supportLayers(List<Layer> layers) {
+            for (Layer l : layers) {
+                if (!(l instanceof OsmDataLayer)) {
+                    return false;
+                }
+            }
+            return true;
+        }
+
+        @Override
+        public Component createMenuComponent() {
+            return new JMenuItem(this);
+        }
+
+        @Override
+        public MergeAction getMultiLayerAction(List<Layer> layers) {
+            return new MergeAction(layers);
         }
     }