Changeset 5382 in josm for trunk

Timestamp:

2012-07-30T15:21:06+02:00 (12 years ago)

Author:

Don-vip

Message:

Small code cleanup/refactorization in shortcut unregistration

Location:

trunk/src/org/openstreetmap/josm

Files:

• Main.java (modified) (2 diffs)
• actions/mapmode/DrawAction.java (modified) (2 diffs)
• gui/MapView.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/Main.java

@@ -442 +442 @@
     }
 
-    public static void unregisterActionShortcut(Shortcut shortcut) {
+    public static void unregisterShortcut(Shortcut shortcut) {
         contentPanePrivate.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).remove(shortcut.getKeyStroke());
     }
@@ -451 +451 @@
 
     public static void unregisterActionShortcut(Action action, Shortcut shortcut) {
-        contentPanePrivate.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).remove(shortcut.getKeyStroke());
+        unregisterShortcut(shortcut);
         contentPanePrivate.getActionMap().remove(action);
     }

trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java

@@ -224 +224 @@
         Main.map.mapView.removeTemporaryLayer(this);
         DataSet.removeSelectionListener(this);
-        Main.unregisterActionShortcut(backspaceShortcut);
+        Main.unregisterShortcut(backspaceShortcut);
         snapHelper.unsetFixedMode();
         snapCheckboxMenuItem.getAction().setEnabled(false);
@@ -1411 +1411 @@
 
                 if (active) {
-                    double de, dn, l, phi;
+                    double phi;
                     e0 = p0.east();
                     n0 = p0.north();

trunk/src/org/openstreetmap/josm/gui/MapView.java

@@ -736 +736 @@
                 Main.registerActionShortcut(mode, mode.getShortcut());
             } else {
-                Main.unregisterActionShortcut(mode.getShortcut());
+                Main.unregisterShortcut(mode.getShortcut());
             }
         }