Index: trunk/src/org/openstreetmap/josm/tools/InputMapUtils.java =================================================================== --- trunk/src/org/openstreetmap/josm/tools/InputMapUtils.java (revision 12519) +++ trunk/src/org/openstreetmap/josm/tools/InputMapUtils.java (revision 12520) @@ -35,8 +35,8 @@ public static void unassignCtrlShiftUpDown(JComponent cmp, int condition) { InputMap inputMap = SwingUtilities.getUIInputMap(cmp, condition); - inputMap.remove(KeyStroke.getKeyStroke(KeyEvent.VK_UP, InputEvent.CTRL_MASK | InputEvent.SHIFT_MASK)); - inputMap.remove(KeyStroke.getKeyStroke(KeyEvent.VK_DOWN, InputEvent.CTRL_MASK | InputEvent.SHIFT_MASK)); - inputMap.remove(KeyStroke.getKeyStroke(KeyEvent.VK_UP, InputEvent.ALT_MASK | InputEvent.SHIFT_MASK)); - inputMap.remove(KeyStroke.getKeyStroke(KeyEvent.VK_DOWN, InputEvent.ALT_MASK | InputEvent.SHIFT_MASK)); + inputMap.remove(KeyStroke.getKeyStroke(KeyEvent.VK_UP, InputEvent.CTRL_DOWN_MASK | InputEvent.SHIFT_DOWN_MASK)); + inputMap.remove(KeyStroke.getKeyStroke(KeyEvent.VK_DOWN, InputEvent.CTRL_DOWN_MASK | InputEvent.SHIFT_DOWN_MASK)); + inputMap.remove(KeyStroke.getKeyStroke(KeyEvent.VK_UP, InputEvent.ALT_DOWN_MASK | InputEvent.SHIFT_DOWN_MASK)); + inputMap.remove(KeyStroke.getKeyStroke(KeyEvent.VK_DOWN, InputEvent.ALT_DOWN_MASK | InputEvent.SHIFT_DOWN_MASK)); SwingUtilities.replaceUIInputMap(cmp, JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT, inputMap); } Index: trunk/src/org/openstreetmap/josm/tools/MultikeyActionsHandler.java =================================================================== --- trunk/src/org/openstreetmap/josm/tools/MultikeyActionsHandler.java (revision 12519) +++ trunk/src/org/openstreetmap/josm/tools/MultikeyActionsHandler.java (revision 12520) @@ -198,6 +198,5 @@ private static String formatMenuText(KeyStroke keyStroke, String index, String description) { - String shortcutText = KeyEvent.getKeyModifiersText(keyStroke.getModifiers()) + '+' - + KeyEvent.getKeyText(keyStroke.getKeyCode()) + ',' + index; + String shortcutText = Shortcut.getKeyText(keyStroke) + ',' + index; return "" + shortcutText + "    " + description; Index: trunk/src/org/openstreetmap/josm/tools/Shortcut.java =================================================================== --- trunk/src/org/openstreetmap/josm/tools/Shortcut.java (revision 12519) +++ trunk/src/org/openstreetmap/josm/tools/Shortcut.java (revision 12520) @@ -254,5 +254,14 @@ */ public String getKeyText() { - KeyStroke keyStroke = getKeyStroke(); + return getKeyText(getKeyStroke()); + } + + /** + * Returns a human readable text for the key stroke. + * @param keyStroke key stroke to convert to human readable text + * @return a human readable text for the key stroke + * @since 12520 + */ + public static String getKeyText(KeyStroke keyStroke) { if (keyStroke == null) return ""; String modifText = KeyEvent.getModifiersExText(keyStroke.getModifiers());