Changeset 1180 in josm for trunk/src/org/openstreetmap/josm/actions/JosmAction.java

Timestamp:

2008-12-25T18:58:04+01:00 (15 years ago)

Author:

stoecker

Message:

fixed bug #1871, removed all deprecations

File:

• trunk/src/org/openstreetmap/josm/actions/JosmAction.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/actions/JosmAction.java

@@ -25 +25 @@
 abstract public class JosmAction extends AbstractAction implements Destroyable {
 
-    @Deprecated
-    public KeyStroke shortcut;
     protected Shortcut sc;
 
@@ -36 +34 @@
         }
         return sc;
-    }
-
-    @Deprecated
-    public JosmAction(String name, String iconName, String tooltip, int shortcut, int modifier, boolean register) {
-        super(name, iconName == null ? null : ImageProvider.get(iconName));
-        setHelpId();
-        if (shortcut != 0) {
-            int group = Shortcut.GROUP_LAYER; //GROUP_NONE;
-            if (((modifier & InputEvent.CTRL_MASK) != 0) || ((modifier & InputEvent.CTRL_DOWN_MASK) != 0)) {
-                group = Shortcut.GROUP_MENU;
-            } else if (modifier == 0) {
-                group = Shortcut.GROUP_EDIT;
-            }
-            sc = Shortcut.registerShortcut("auto:"+name, name, shortcut, group);
-            this.shortcut = sc.getKeyStroke();
-            Main.contentPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(sc.getKeyStroke(), name);
-            Main.contentPane.getActionMap().put(name, this);
-        }
-        putValue(SHORT_DESCRIPTION, Main.platform.makeTooltip(tooltip, sc));
-        putValue("toolbar", iconName);
-    if (register)
-        Main.toolbar.register(this);
     }
 
@@ -80 +56 @@
         sc = shortcut;
         if (sc != null) {
-            this.shortcut = sc.getKeyStroke();
             Main.contentPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(sc.getKeyStroke(), name);
             Main.contentPane.getActionMap().put(name, this);
@@ -91 +66 @@
 
     public void destroy() {
-        if (shortcut != null) {
+        if (sc != null) {
             Main.contentPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).remove(sc.getKeyStroke());
             Main.contentPane.getActionMap().remove(sc.getKeyStroke());