Changeset 5018 in josm

Timestamp:

Feb 22, 2012 7:54:15 PM (15 months ago)

Author:

akks

Message:

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

Location:

trunk/src/org/openstreetmap/josm

Files:

• gui/dialogs/FilterDialog.java (modified) (3 diffs)
• gui/dialogs/LayerListDialog.java (modified) (4 diffs)
• gui/layer/JumpToMarkerActions.java (modified) (1 diff)
• tools/MultikeyActionsHandler.java (modified) (3 diffs)

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

@@ -66 +66 @@
     private SideButton downButton;
 
+    private EnableFilterAction enableFilterAction;
+    private HidingFilterAction hidingFilterAction;
 
     public FilterDialog(){
@@ -72 +74 @@
                 KeyEvent.VK_F, Shortcut.ALT_SHIFT), 162);
         build();
-
-        MultikeyActionsHandler.getInstance().addAction(new EnableFilterAction());
-        MultikeyActionsHandler.getInstance().addAction(new HidingFilterAction());
+        enableFilterAction = new EnableFilterAction();
+        hidingFilterAction = new HidingFilterAction();
+        MultikeyActionsHandler.getInstance().addAction(enableFilterAction);
+        MultikeyActionsHandler.getInstance().addAction(hidingFilterAction);
     }
 
@@ -195 +198 @@
     }
 
+    @Override
+    public void destroy() {
+        MultikeyActionsHandler.getInstance().removeAction(enableFilterAction);
+        MultikeyActionsHandler.getInstance().removeAction(hidingFilterAction);
+        super.destroy();
+    }
+    
     static class StringRenderer extends DefaultTableCellRenderer {
         @Override

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;

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

@@ -23 +23 @@
     }
 
+    private static JumpToNextMarker jumpToNextMarkerAction;
+    private static JumpToPreviousMarker jumpToPreviousMarkerAction;
+            
     public static void initialize() {
-        MultikeyActionsHandler.getInstance().addAction(new JumpToNextMarker(null));
-        MultikeyActionsHandler.getInstance().addAction(new JumpToPreviousMarker(null));
+        jumpToNextMarkerAction = new JumpToNextMarker(null);
+        jumpToPreviousMarkerAction = new JumpToPreviousMarker(null);
+        MultikeyActionsHandler.getInstance().addAction(jumpToNextMarkerAction);
+        MultikeyActionsHandler.getInstance().addAction(jumpToPreviousMarkerAction);
+    }
+    
+    public static void unregisterActions() {
+        MultikeyActionsHandler.getInstance().removeAction(jumpToNextMarkerAction);
+        MultikeyActionsHandler.getInstance().removeAction(jumpToPreviousMarkerAction);
     }
 

trunk/src/org/openstreetmap/josm/tools/MultikeyActionsHandler.java

@@ -9 +9 @@
 import java.awt.event.ActionListener;
 import java.awt.event.KeyEvent;
+import java.util.HashMap;
+import java.util.Map;
 import java.util.Timer;
 import java.util.TimerTask;
@@ -31 +33 @@
     private static final String STATUS_BAR_ID = new String("multikeyShortcut");
 
+    private Map<MultikeyShortcutAction, MyAction> myActions = new HashMap<MultikeyShortcutAction,MyAction>();
+            
     private class MyKeyEventDispatcher implements KeyEventDispatcher {
         @Override
@@ -203 +207 @@
         if(action.getMultikeyShortcut() != null) {
             MyAction myAction = new MyAction(action);
+            myActions.put(action, myAction);
             Main.registerActionShortcut(myAction, myAction.shortcut);
         }
     }
+    
+    // unregister action and its shortcut completely
+    public void removeAction(MultikeyShortcutAction action) {
+        MyAction a = myActions.get(action);
+        if (a!=null) {
+            Main.unregisterActionShortcut(a, a.shortcut);
+            myActions.remove(a);
+        }
+    }
 }