Changeset 5002 in josm for trunk/src/org/openstreetmap/josm/tools/Shortcut.java

Timestamp:

2012-02-19T19:43:23+01:00 (12 years ago)

Author:

stoecker

Message:

remove deprecations, all plugins are updated and release, external plugins should break, so they get updated

File:

• trunk/src/org/openstreetmap/josm/tools/Shortcut.java (modified) (4 diffs)

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

@@ -290 +290 @@
                                  KeyEvent.VK_F9, KeyEvent.VK_F10, KeyEvent.VK_F11, KeyEvent.VK_F12};
 
-    /* old */
-    @Deprecated public static final int GROUP_NONE = 0;
-    @Deprecated public static final int GROUP_HOTKEY = 1;
-    @Deprecated public static final int GROUP_MENU = 2;
-    @Deprecated public static final int GROUP_EDIT = 3;
-    @Deprecated public static final int GROUP_LAYER = 4;
-    @Deprecated public static final int GROUP_DIRECT = 5;
-    @Deprecated public static final int GROUP_MNEMONIC = 6;
-    @Deprecated public static final int GROUP_DIRECT2 = 7;
-    @Deprecated public static final int GROUP_DIRECT3 = 8;
-    @Deprecated public static final int GROUPS_DEFAULT = 0;
-    @Deprecated public static final int GROUPS_ALT1 = 100;
-    @Deprecated public static final int GROUPS_ALT2 = 200;
-    @Deprecated public static final int SHIFT_DEFAULT = 1;
-    @Deprecated public static Shortcut registerShortcut(String shortText, String longText, int requestedKey, int requestedGroup, int modifier) {
-        return registerShortcut(shortText, longText, requestedKey, requestedGroup, new Integer(modifier));
-    }
-
     // bootstrap
     private static boolean initdone = false;
@@ -324 +306 @@
         groups.put(ALT_CTRL_SHIFT, KeyEvent.ALT_DOWN_MASK|KeyEvent.CTRL_DOWN_MASK|KeyEvent.SHIFT_DOWN_MASK);
 
-        /* old */
-        groups.put(GROUPS_DEFAULT+GROUP_NONE,    -1);
-        groups.put(GROUPS_DEFAULT+GROUP_HOTKEY,  KeyEvent.CTRL_DOWN_MASK);
-        groups.put(GROUPS_DEFAULT+GROUP_MENU,    KeyEvent.CTRL_DOWN_MASK);
-        groups.put(GROUPS_DEFAULT+GROUP_EDIT,    0);
-        groups.put(GROUPS_DEFAULT+GROUP_LAYER,   KeyEvent.ALT_DOWN_MASK);
-        groups.put(GROUPS_DEFAULT+GROUP_DIRECT,  0);
-        groups.put(GROUPS_DEFAULT+GROUP_MNEMONIC,KeyEvent.ALT_DOWN_MASK);
-        groups.put(GROUPS_DEFAULT+GROUP_DIRECT2, KeyEvent.ALT_DOWN_MASK);
-        groups.put(GROUPS_DEFAULT+GROUP_DIRECT3, KeyEvent.CTRL_DOWN_MASK | KeyEvent.SHIFT_DOWN_MASK);
-
-        groups.put(GROUPS_ALT1+GROUP_NONE,       -1);
-        groups.put(GROUPS_ALT1+GROUP_HOTKEY,     KeyEvent.CTRL_DOWN_MASK | KeyEvent.SHIFT_DOWN_MASK);
-        groups.put(GROUPS_ALT1+GROUP_MENU,       KeyEvent.CTRL_DOWN_MASK | KeyEvent.SHIFT_DOWN_MASK);
-        groups.put(GROUPS_ALT1+GROUP_EDIT,       KeyEvent.SHIFT_DOWN_MASK);
-        groups.put(GROUPS_ALT1+GROUP_LAYER,      KeyEvent.ALT_DOWN_MASK  | KeyEvent.SHIFT_DOWN_MASK);
-        groups.put(GROUPS_ALT1+GROUP_DIRECT,     KeyEvent.SHIFT_DOWN_MASK);
-        groups.put(GROUPS_ALT1+GROUP_MNEMONIC,   KeyEvent.ALT_DOWN_MASK);
-        groups.put(GROUPS_ALT1+GROUP_DIRECT2,    KeyEvent.ALT_DOWN_MASK  | KeyEvent.SHIFT_DOWN_MASK);
-        groups.put(GROUPS_ALT1+GROUP_DIRECT3,    KeyEvent.ALT_DOWN_MASK  | KeyEvent.CTRL_DOWN_MASK | KeyEvent.SHIFT_DOWN_MASK);
-
-        groups.put(GROUPS_ALT2+GROUP_NONE,       -1);
-        groups.put(GROUPS_ALT2+GROUP_HOTKEY,     KeyEvent.CTRL_DOWN_MASK | KeyEvent.ALT_DOWN_MASK);
-        groups.put(GROUPS_ALT2+GROUP_MENU,       KeyEvent.CTRL_DOWN_MASK | KeyEvent.ALT_DOWN_MASK);
-        groups.put(GROUPS_ALT2+GROUP_EDIT,       KeyEvent.ALT_DOWN_MASK  | KeyEvent.SHIFT_DOWN_MASK);
-        groups.put(GROUPS_ALT2+GROUP_LAYER,      KeyEvent.SHIFT_DOWN_MASK);
-        groups.put(GROUPS_ALT2+GROUP_DIRECT,     KeyEvent.CTRL_DOWN_MASK);
-        groups.put(GROUPS_ALT2+GROUP_MNEMONIC,   KeyEvent.ALT_DOWN_MASK);
-        groups.put(GROUPS_ALT2+GROUP_DIRECT2,    KeyEvent.ALT_DOWN_MASK  | KeyEvent.CTRL_DOWN_MASK);
-        groups.put(GROUPS_ALT2+GROUP_DIRECT3,    KeyEvent.META_DOWN_MASK | KeyEvent.CTRL_DOWN_MASK);
-
         // (1) System reserved shortcuts
         Main.platform.initSystemShortcuts();
@@ -393 +344 @@
 
     private static int findModifier(int group, Integer modifier) {
-        Integer defaultModifier = getGroupModifier(group);
-        if(modifier != null) {
-            if(modifier == SHIFT_DEFAULT) {
-                defaultModifier |= KeyEvent.SHIFT_DOWN_MASK;
-            } else {
-                defaultModifier = modifier;
-            }
-        }
-        else if (defaultModifier == null) { // garbage in, no shortcut out
-            defaultModifier = getGroupModifier(NONE);
-        }
-        return defaultModifier;
-    }
-
-/*  NEW function: 
-    private static int findModifier(int group, Integer modifier) {
         if(modifier == null) {
             modifier = getGroupModifier(group);
@@ -416 +351 @@
         }
         return modifier;
-    }*/
+    }
 
     // shutdown handling