Changeset 18837 in josm for trunk

Timestamp:

2023-09-20T21:24:36+02:00 (17 months ago)

Author:

taylor.smock

Message:

Fix #23057: An invisible layer should not become active when removing a layer

Location:

trunk

Files:

• src/org/openstreetmap/josm/gui/dialogs/layer/DeleteLayerAction.java (modified) (3 diffs)
• test/unit/org/openstreetmap/josm/actions/DeleteLayerActionTest.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/gui/dialogs/layer/DeleteLayerActionTest.java (added)

trunk/src/org/openstreetmap/josm/gui/dialogs/layer/DeleteLayerAction.java

@@ -6 +6 @@
 import java.awt.Component;
 import java.awt.event.ActionEvent;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import javax.swing.AbstractAction;
@@ -46 +48 @@
         if (!SaveLayersDialog.saveUnsavedModifications(selectedLayers, SaveLayersDialog.Reason.DELETE))
             return;
+        final Map<Integer, Layer> layerMap = model.selectedIndices().filter(i -> model.getLayer(i) != null)
+                .collect(HashMap::new, (map, value) -> map.put(value, model.getLayer(value)), HashMap::putAll);
         for (Layer l: selectedLayers) {
             if (model.getLayerManager().containsLayer(l)) {
@@ -51 +55 @@
                 // this is why we need to check if every layer is still in the list of selected layers.
                 model.getLayerManager().removeLayer(l);
+            }
+        }
+        // Set the next active layer to the next visible layer
+        if (layerMap.size() == 1) {
+            final int selected = Math.min(layerMap.keySet().iterator().next(), model.getRowCount() - 1);
+            int currentLayerIndex = selected;
+            Layer layer = model.getLayer(currentLayerIndex);
+            // If the user has the last layer selected, we need to wrap around.
+            boolean reversed = false;
+            while (layer != null && !layer.isVisible() && currentLayerIndex < model.getRowCount() && currentLayerIndex >= 0) {
+                if (reversed) {
+                    currentLayerIndex--;
+                } else {
+                    currentLayerIndex++;
+                }
+                if (currentLayerIndex == model.getRowCount()) {
+                    reversed = true;
+                    currentLayerIndex = selected;
+                }
+                layer = model.getLayer(currentLayerIndex);
+            }
+            if (layer != null) {
+                model.getLayerManager().setActiveLayer(layer);
+                // Reset the selection
+                model.getSelectionModel().setSelectionInterval(selected, selected);
             }
         }

trunk/test/unit/org/openstreetmap/josm/actions/DeleteLayerActionTest.java

@@ -5 +5 @@
 import static org.junit.jupiter.api.Assertions.assertNull;
 
-import org.junit.jupiter.api.extension.RegisterExtension;
 import org.junit.jupiter.api.Test;
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
-import org.openstreetmap.josm.testutils.JOSMTestRules;
-
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import org.openstreetmap.josm.testutils.annotations.Main;
+import org.openstreetmap.josm.testutils.annotations.Projection;
 
 /**
  * Unit tests for class {@link DeleteLayerAction}.
  */
+@Main
+@Projection
 final class DeleteLayerActionTest {
-
-    /**
-     * Setup test.
-     */
-    @RegisterExtension
-    @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
-    public static JOSMTestRules test = new JOSMTestRules().main().projection();
-
     /**
      * Unit test of {@link DeleteLayerAction#actionPerformed}