one more check to avoid cyclic initialization of KeymapManager

This commit is contained in:
Dmitry Jemerov
2009-09-08 20:19:47 +04:00
parent 9a9d874790
commit 5f86b287b7
@@ -59,22 +59,24 @@ public final class IdeMouseEventDispatcher{
// search in main keymap
KeymapManager keymapManager = KeymapManager.getInstance();
if (keymapManager != null) {
Keymap keymap = keymapManager.getActiveKeymap();
String[] actionIds=keymap.getActionIds(shortcut);
if (KeymapManagerImpl.ourKeymapManagerInitialized) {
KeymapManager keymapManager = KeymapManager.getInstance();
if (keymapManager != null) {
Keymap keymap = keymapManager.getActiveKeymap();
String[] actionIds=keymap.getActionIds(shortcut);
ActionManager actionManager = ActionManager.getInstance();
for (String actionId : actionIds) {
AnAction action = actionManager.getAction(actionId);
if (action == null) {
continue;
}
if (isModalContext && !action.isEnabledInModalContext()) {
continue;
}
if (!myActions.contains(action)) {
myActions.add(action);
ActionManager actionManager = ActionManager.getInstance();
for (String actionId : actionIds) {
AnAction action = actionManager.getAction(actionId);
if (action == null) {
continue;
}
if (isModalContext && !action.isEnabledInModalContext()) {
continue;
}
if (!myActions.contains(action)) {
myActions.add(action);
}
}
}
}