Changeset 5018 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java

Timestamp:

2012-02-22T19:54:15+01:00 (14 years ago)

Author:

akks

Message:

fix "Shortcut redefinition" warnings after MapFrame reinitialization - see #7424 (core part)

File:

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

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

@@ -90 +90 @@
         instance = new LayerListDialog(mapFrame);
 
-        MultikeyActionsHandler.getInstance().addAction(instance.new ShowHideLayerAction(false));
-        MultikeyActionsHandler.getInstance().addAction(instance.new ActivateLayerAction());
-        JumpToMarkerActions.initialize();
     }
 
@@ -120 +117 @@
 
     ActivateLayerAction activateLayerAction;
-
+    ShowHideLayerAction showHideLayerAction;
+    
     //TODO This duplicates ShowHide actions functionality
     /** stores which layer index to toggle and executes the ShowHide action if the layer is present */
@@ -240 +238 @@
         activateLayerAction = new ActivateLayerAction();
         activateLayerAction.updateEnabledState();
+        MultikeyActionsHandler.getInstance().addAction(activateLayerAction);
         adaptTo(activateLayerAction, selectionModel);
+    
+        JumpToMarkerActions.initialize();
 
         // -- show hide action
-        ShowHideLayerAction showHideLayerAction = new ShowHideLayerAction();
+        showHideLayerAction = new ShowHideLayerAction();
+        MultikeyActionsHandler.getInstance().addAction(showHideLayerAction);
         adaptTo(showHideLayerAction, selectionModel);
 
@@ -345 +347 @@
             Main.unregisterActionShortcut(visibilityToggleActions[i], visibilityToggleShortcuts[i]);
         }
+        MultikeyActionsHandler.getInstance().removeAction(activateLayerAction);
+        MultikeyActionsHandler.getInstance().removeAction(showHideLayerAction);
+        JumpToMarkerActions.unregisterActions();
         super.destroy();
         instance = null;