diff options
author | Tor Norbye <tnorbye@google.com> | 2014-08-20 17:28:18 -0700 |
---|---|---|
committer | Tor Norbye <tnorbye@google.com> | 2014-08-20 17:28:18 -0700 |
commit | d76e3920c56d37c942092b7dca20fcaded81c0a5 (patch) | |
tree | 80a55c7b59c38377216daaada4e8bc47b69ceb9a /platform/platform-api/src/com/intellij/openapi/actionSystem/AbbreviationManager.java | |
parent | 3b37877a2561bf9fbe072253a18688807d523505 (diff) | |
parent | 1aa2e09bdbd413eacb677e9fa4b50630530d0656 (diff) | |
download | idea-d76e3920c56d37c942092b7dca20fcaded81c0a5.tar.gz |
Merge remote-tracking branch 'aosp/upstream-master' into merge
Conflicts:
.idea/modules.xml
platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdatesXmlLoader.java
Change-Id: Id899dae9a1e1c79272f8a70e14a7dcef4f760d7f
Diffstat (limited to 'platform/platform-api/src/com/intellij/openapi/actionSystem/AbbreviationManager.java')
-rw-r--r-- | platform/platform-api/src/com/intellij/openapi/actionSystem/AbbreviationManager.java | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/platform/platform-api/src/com/intellij/openapi/actionSystem/AbbreviationManager.java b/platform/platform-api/src/com/intellij/openapi/actionSystem/AbbreviationManager.java index 78db7cf0ed5c..1e03a3482ad4 100644 --- a/platform/platform-api/src/com/intellij/openapi/actionSystem/AbbreviationManager.java +++ b/platform/platform-api/src/com/intellij/openapi/actionSystem/AbbreviationManager.java @@ -15,7 +15,7 @@ */ package com.intellij.openapi.actionSystem; -import com.intellij.openapi.application.ApplicationManager; +import com.intellij.openapi.components.ServiceManager; import java.util.List; import java.util.Set; @@ -26,11 +26,16 @@ import java.util.Set; */ public abstract class AbbreviationManager { public static AbbreviationManager getInstance() { - return ApplicationManager.getApplication().getComponent(AbbreviationManager.class); + return ServiceManager.getService(AbbreviationManager.class); } + public abstract Set<String> getAbbreviations(); + public abstract Set<String> getAbbreviations(String actionId); + public abstract List<String> findActions(String abbreviation); + public abstract void register(String abbreviation, String actionId); + public abstract void remove(String abbreviation, String actionId); } |