Changeset 8818 in josm for trunk

Timestamp:

2015-10-04T12:19:24+02:00 (9 years ago)

Author:

simon04

Message:

fix #11925, see #11897 - Re-enable merging of gpx, marker, geoimage layers

Regression of r8728.

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• dialogs/LayerListDialog.java (modified) (3 diffs)
• layer/GpxLayer.java (modified) (1 diff)
• layer/geoimage/GeoImageLayer.java (modified) (1 diff)
• layer/markerlayer/MarkerLayer.java (modified) (1 diff)

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

@@ -864 +864 @@
                     setEnabled(false);
                 } else  if (getModel().getSelectedLayers().size() > 1) {
-                    Layer firstLayer = getModel().getSelectedLayers().get(0);
-                    for (Layer l: getModel().getSelectedLayers()) {
-                        if (l != firstLayer && (!l.isMergable(firstLayer) || !firstLayer.isMergable(l))) {
-                            setEnabled(false);
-                            return;
-                        }
-                    }
-                    setEnabled(true);
+                    setEnabled(supportLayers(getModel().getSelectedLayers()));
                 } else {
                     Layer selectedLayer = getModel().getSelectedLayers().get(0);
@@ -887 +880 @@
         @Override
         public boolean supportLayers(List<Layer> layers) {
-            for (Layer l : layers) {
-                if (!(l instanceof OsmDataLayer)) {
-                    return false;
-                }
-            }
-            return true;
+            if (layers.size() < 1) {
+                return false;
+            } else {
+                final Layer firstLayer = layers.get(0);
+                final List<Layer> remainingLayers = layers.subList(1, layers.size());
+                return getModel().getPossibleMergeTargets(firstLayer).containsAll(remainingLayers);
+            }
         }
 
@@ -1504 +1498 @@
         public List<Layer> getPossibleMergeTargets(Layer source) {
             List<Layer> targets = new ArrayList<>();
-            if (source == null)
+            if (source == null || !Main.isDisplayingMapView()) {
                 return targets;
-            for (Layer target : getLayers()) {
+            }
+            for (Layer target : Main.map.mapView.getAllLayersAsList()) {
                 if (source == target) {
                     continue;

trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java

@@ -185 +185 @@
                 LayerListDialog.getInstance().createShowHideLayerAction(),
                 LayerListDialog.getInstance().createDeleteLayerAction(),
+                LayerListDialog.getInstance().createMergeLayerAction(this),
                 SeparatorLayerAction.INSTANCE,
                 new LayerSaveAction(this),

trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java

@@ -335 +335 @@
         entries.add(LayerListDialog.getInstance().createShowHideLayerAction());
         entries.add(LayerListDialog.getInstance().createDeleteLayerAction());
+        entries.add(LayerListDialog.getInstance().createMergeLayerAction(this));
         entries.add(new RenameLayerAction(null, this));
         entries.add(SeparatorLayerAction.INSTANCE);

trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java

@@ -253 +253 @@
         components.add(new ShowHideMarkerText(this));
         components.add(LayerListDialog.getInstance().createDeleteLayerAction());
+        components.add(LayerListDialog.getInstance().createMergeLayerAction(this));
         components.add(SeparatorLayerAction.INSTANCE);
         components.add(new CustomizeColor(this));