Changeset 1157 in josm
- Timestamp:
- 2008-12-22T16:31:49+01:00 (16 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/tools/Shortcut.java
r1102 r1157 328 328 // this is used to register a shortcut that was read from the preferences 329 329 private static void registerShortcut(Shortcut sc) { 330 registerShortcut(sc.getShortText(), sc.getLongText(), sc.getRequestedKey(), sc.getRequestedGroup(), sc.getAssignedModifier(), sc); 330 // put a user configured shortcut in as-is -- unless there's a conflict 331 if(sc.getAssignedUser() && findShortcut(sc.getAssignedKey(), 332 sc.getAssignedModifier()) == null) 333 shortcuts.put(sc.getShortText(), sc); 334 else 335 registerShortcut(sc.getShortText(), sc.getLongText(), sc.getRequestedKey(), 336 sc.getRequestedGroup(), sc.getAssignedModifier(), sc); 331 337 } 332 338 … … 394 400 defaultModifier = modifier; 395 401 } 396 else if (defaultModifier == null) { // garbage in, no shortcu rt out402 else if (defaultModifier == null) { // garbage in, no shortcut out 397 403 defaultModifier = groups.get(GROUP_NONE + GROUPS_DEFAULT); 398 404 } … … 428 434 potentialShortcut = new Shortcut(shortText, longText, requestedKey, requestedGroup, requestedKey, defaultModifier, true, false); 429 435 } 436 430 437 shortcuts.put(shortText, potentialShortcut); 431 438 return potentialShortcut;
Note:
See TracChangeset
for help on using the changeset viewer.