Changeset 15929 in josm for trunk/src/org

Timestamp:

2020-02-25T20:38:55+01:00 (5 years ago)

Author:

Don-vip

Message:

fix #18638 - Initialize the cycle layer actions in LayerListDialog (patch by taylor.smock)

File:

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

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

@@ -55 +55 @@
 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;
@@ -142 +144 @@
     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 */
@@ -330 +335 @@
         InputMapUtils.addSpacebarAction(layerList, showHideLayerAction);
 
+        // Cycle layer actions
+        cycleLayerUpAction = new CycleLayerUpAction();
+        cycleLayerDownAction = new CycleLayerDownAction();
+
         createLayout(layerList, true, Arrays.asList(
                 new SideButton(moveUpAction, false),
@@ -389 +398 @@
         ExpertToggleAction.removeExpertModeChangeListener(visibilityWidthListener);
         layerManager.removeLayerChangeListener(visibilityWidthListener);
+        cycleLayerUpAction.destroy();
+        cycleLayerDownAction.destroy();
         super.destroy();
         instance = null;