MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Revert "fix actions shortcuts"

Browse Source 
This reverts commit 1aca8dad2f.
This commit is contained in:
Alexey Pegov
2010-09-25 12:44:23 +04:00
parent f93ee8284a
commit 8234527ab9
1 changed files with 5 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/openapi/keymap/impl/KeymapImpl.java
+5 -16
View File
@@ -493,23 +493,7 @@ public class KeymapImpl implements Keymap, ExternalizableScheme {
return ids;
}
private void gatherShortcuts(final String actionId, final Set<Shortcut> to) {
KeymapManagerEx keymapManager = getKeymapManager();
if (keymapManager.getBoundActions().contains(actionId)) {
final String actionBinding = keymapManager.getActionBinding(actionId);
to.addAll(Arrays.asList(getShortcutsForAction(actionBinding)));
gatherShortcuts(actionBinding, to);
}
}
public Shortcut[] getShortcuts(String actionId) {
final Set<Shortcut> shortcuts = new HashSet<Shortcut>();
gatherShortcuts(actionId, shortcuts);
shortcuts.addAll(Arrays.asList(getShortcutsForAction(actionId)));
return shortcuts.toArray(new Shortcut[shortcuts.size()]);
}
private Shortcut[] getShortcutsForAction(String actionId) {
LinkedHashSet<Shortcut> shortcuts = myActionId2ListOfShortcuts.get(actionId);
if (shortcuts == null) {
@@ -517,6 +501,11 @@ public class KeymapImpl implements Keymap, ExternalizableScheme {
return getParentShortcuts(actionId);
}
else {
KeymapManagerEx keymapManager = getKeymapManager();
if (keymapManager.getBoundActions().contains(actionId)) {
return getShortcuts(keymapManager.getActionBinding(actionId));
}
return ourEmptyShortcutsArray;
}
}