Index: trunk/src/org/openstreetmap/josm/Main.java
===================================================================
--- trunk/src/org/openstreetmap/josm/Main.java	(revision 5001)
+++ trunk/src/org/openstreetmap/josm/Main.java	(revision 5002)
@@ -382,8 +382,5 @@
 
     public static void registerActionShortcut(Action action, Shortcut shortcut) {
-        registerActionShortcut(action, shortcut.getKeyStroke());
-    }
-
-    public static void registerActionShortcut(Action action, KeyStroke keyStroke) {
+        KeyStroke keyStroke = shortcut.getKeyStroke();
         if (keyStroke == null)
             return;
@@ -411,5 +408,4 @@
         contentPanePrivate.getActionMap().remove(action);
     }
-
 
     ///////////////////////////////////////////////////////////////////////////
Index: trunk/src/org/openstreetmap/josm/command/PseudoCommand.java
===================================================================
--- trunk/src/org/openstreetmap/josm/command/PseudoCommand.java	(revision 5001)
+++ trunk/src/org/openstreetmap/josm/command/PseudoCommand.java	(revision 5002)
@@ -15,29 +15,7 @@
 abstract public class PseudoCommand {
     /**
-     * Provide a description that can be presented in a list or tree view.
-     * @deprecated This abstract method is deprecated.
-     * On 2012-03-01, this abstract method will be removed.
-     * At the same moment, the methods {@link #getDescrpitionText()} and {@link #getDescrpitionIcon()}
-     * will be made abstract.
-     * For a smooth transition, replace {@link #getDescription()} by implementations of
-     * {@link #getDescrpitionText()} and {@link #getDescrpitionIcon()} as early as possible.
-     * {@link #getDescription()} is no longer abstract and can therefore be removed.
-     */
-    @Deprecated
-    public Object getDescription() {
-        return null;
-    }
-
-    /**
      * Provides a description text representing this command.
      */
-    public String getDescriptionText() {
-        Object o = getDescription();
-        if (o instanceof JLabel) {
-            return ((JLabel) o).getText();
-        } else {
-            return o.toString();
-        }
-    }
+    abstract public String getDescriptionText();
 
     /**
@@ -45,10 +23,5 @@
      */
     public Icon getDescriptionIcon() {
-        Object o = getDescription();
-        if (o instanceof JLabel) {
-            return ((JLabel) o).getIcon();
-        } else {
-            return null;
-        }
+        return null;
     }
 
Index: trunk/src/org/openstreetmap/josm/tools/Shortcut.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/Shortcut.java	(revision 5001)
+++ trunk/src/org/openstreetmap/josm/tools/Shortcut.java	(revision 5002)
@@ -290,22 +290,4 @@
                                  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,35 +306,4 @@
         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,20 +344,4 @@
 
     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,5 +351,5 @@
         }
         return modifier;
-    }*/
+    }
 
     // shutdown handling