diff options
author | Tor Norbye <tnorbye@google.com> | 2014-09-04 20:44:00 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-09-04 20:44:01 +0000 |
commit | fb5a02906f644d044eb0286bf27d413ba0e05216 (patch) | |
tree | bca7d49005d81d10c70bc3f547df041c636b4300 /platform/platform-api/src/com/intellij/openapi/actionSystem/CommonShortcuts.java | |
parent | 9cde0e3c015174898df8b8f3672185941fad4786 (diff) | |
parent | d245f58efbfc26b13b9b9d5e52e6a83a0d76216c (diff) | |
download | idea-fb5a02906f644d044eb0286bf27d413ba0e05216.tar.gz |
Merge "Merge remote-tracking branch 'aosp/upstream-master' into merge"
Diffstat (limited to 'platform/platform-api/src/com/intellij/openapi/actionSystem/CommonShortcuts.java')
-rw-r--r-- | platform/platform-api/src/com/intellij/openapi/actionSystem/CommonShortcuts.java | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/platform/platform-api/src/com/intellij/openapi/actionSystem/CommonShortcuts.java b/platform/platform-api/src/com/intellij/openapi/actionSystem/CommonShortcuts.java index 994dd130c384..a1441565d90b 100644 --- a/platform/platform-api/src/com/intellij/openapi/actionSystem/CommonShortcuts.java +++ b/platform/platform-api/src/com/intellij/openapi/actionSystem/CommonShortcuts.java @@ -15,9 +15,11 @@ */ package com.intellij.openapi.actionSystem; +import com.intellij.openapi.application.Application; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.keymap.KeymapManager; import com.intellij.openapi.util.SystemInfo; +import org.jetbrains.annotations.NotNull; import javax.swing.*; import java.awt.event.InputEvent; @@ -148,9 +150,13 @@ public class CommonShortcuts { return shortcutsById(IdeActions.ACTION_DELETE); } + @NotNull private static CustomShortcutSet shortcutsById(String actionId) { - if (ApplicationManager.getApplication() == null) return new CustomShortcutSet(Shortcut.EMPTY_ARRAY); - - return new CustomShortcutSet(KeymapManager.getInstance().getActiveKeymap().getShortcuts(actionId)); + Application application = ApplicationManager.getApplication(); + KeymapManager keymapManager = application == null ? null : application.getComponent(KeymapManager.class); + if (keymapManager == null) { + return new CustomShortcutSet(Shortcut.EMPTY_ARRAY); + } + return new CustomShortcutSet(keymapManager.getActiveKeymap().getShortcuts(actionId)); } } |