Changeset 1169 in josm for trunk/src/org/openstreetmap/josm/tools/Shortcut.java
- Timestamp:
- 2008-12-23T15:07:05+01:00 (16 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/tools/Shortcut.java
r1157 r1169 139 139 */ 140 140 public KeyStroke getKeyStroke() { 141 if (assignedModifier != -1) 142 return KeyStroke.getKeyStroke(assignedKey, assignedModifier); 141 if (assignedModifier != -1) 142 return KeyStroke.getKeyStroke(assignedKey, assignedModifier); 143 143 return null; 144 144 } … … 351 351 System.err.println("CONFLICT WITH SYSTEM KEY "+shortText); 352 352 return null; 353 } 353 } 354 354 potentialShortcut = new Shortcut(shortText, longText, key, GROUP_RESERVED, key, modifier, true, false); 355 355 shortcuts.put(shortText, potentialShortcut); … … 441 441 // a lengthy warning message 442 442 private static void displayWarning(Shortcut conflictsWith, Shortcut potentialShortcut, String shortText, String longText) { 443 JOptionPane.showMessageDialog(Main.parent, 443 JOptionPane.showMessageDialog(Main.parent, 444 444 tr("Setting the keyboard shortcut ''{0}'' for the action ''{1}'' ({2}) failed\n"+ 445 445 "because the shortcut is already taken by the action ''{3}'' ({4}).\n\n",
Note:
See TracChangeset
for help on using the changeset viewer.