Ticket #18638: 18638.3.patch

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

@@ -54 +54 @@
 import org.openstreetmap.josm.gui.MapView;
 import org.openstreetmap.josm.gui.SideButton;
 import org.openstreetmap.josm.gui.dialogs.layer.ActivateLayerAction;
+import org.openstreetmap.josm.gui.dialogs.layer.CycleLayerDownAction;
+import org.openstreetmap.josm.gui.dialogs.layer.CycleLayerUpAction;
 import org.openstreetmap.josm.gui.dialogs.layer.DeleteLayerAction;
 import org.openstreetmap.josm.gui.dialogs.layer.DuplicateAction;
 import org.openstreetmap.josm.gui.dialogs.layer.LayerListTransferHandler;
@@ -141 +143 @@
     private final ActivateLayerAction activateLayerAction;
     private final ShowHideLayerAction showHideLayerAction;
 
+    private final CycleLayerUpAction cycleLayerUpAction;
+    private final CycleLayerDownAction cycleLayerDownAction;
+
     //TODO This duplicates ShowHide actions functionality
     /** stores which layer index to toggle and executes the ShowHide action if the layer is present */
     private final class ToggleLayerIndexVisibility extends AbstractAction {
@@ -329 +334 @@
         // Show/Activate layer on Enter key press
         InputMapUtils.addSpacebarAction(layerList, showHideLayerAction);
 
+        // Cycle layer actions
+        cycleLayerUpAction = new CycleLayerUpAction();
+        cycleLayerDownAction = new CycleLayerDownAction();
+
         createLayout(layerList, true, Arrays.asList(
                 new SideButton(moveUpAction, false),
                 new SideButton(moveDownAction, false),
@@ -388 +397 @@
         DISPLAY_NUMBERS.removeListener(visibilityWidthListener);
         ExpertToggleAction.removeExpertModeChangeListener(visibilityWidthListener);
         layerManager.removeLayerChangeListener(visibilityWidthListener);
+        cycleLayerUpAction.destroy();
+        cycleLayerDownAction.destroy();
         super.destroy();
         instance = null;
     }