diff options
| author | Tor Norbye <tnorbye@google.com> | 2014-08-21 00:31:02 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-08-16 04:55:08 +0000 |
| commit | 9cde0e3c015174898df8b8f3672185941fad4786 (patch) | |
| tree | 80a55c7b59c38377216daaada4e8bc47b69ceb9a /platform/platform-impl/src/com/intellij/ide/customize/IdSet.java | |
| parent | 3b37877a2561bf9fbe072253a18688807d523505 (diff) | |
| parent | d76e3920c56d37c942092b7dca20fcaded81c0a5 (diff) | |
| download | idea-9cde0e3c015174898df8b8f3672185941fad4786.tar.gz | |
Merge "Merge remote-tracking branch 'aosp/upstream-master' into merge"
Diffstat (limited to 'platform/platform-impl/src/com/intellij/ide/customize/IdSet.java')
| -rw-r--r-- | platform/platform-impl/src/com/intellij/ide/customize/IdSet.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/platform/platform-impl/src/com/intellij/ide/customize/IdSet.java b/platform/platform-impl/src/com/intellij/ide/customize/IdSet.java index 47f8863b9ceb..fb406d21359a 100644 --- a/platform/platform-impl/src/com/intellij/ide/customize/IdSet.java +++ b/platform/platform-impl/src/com/intellij/ide/customize/IdSet.java @@ -28,7 +28,7 @@ class IdSet { String myTitle; String[] myIds; - IdSet(String description) { + IdSet(final PluginGroups pluginGroups, String description) { int i = description.indexOf(":"); if (i > 0) { myTitle = description.substring(0, i); @@ -38,7 +38,7 @@ class IdSet { myIds = ContainerUtil.filter(myIds, new Condition<String>() { @Override public boolean value(String id) { - return PluginGroups.getInstance().findPlugin(id) != null; + return pluginGroups.findPlugin(id) != null; } }).toArray(new String[]{}); @@ -47,7 +47,7 @@ class IdSet { } if (myTitle == null && myIds.length>0) { //noinspection ConstantConditions - myTitle = PluginGroups.getInstance().findPlugin(myIds[0]).getName(); + myTitle = pluginGroups.findPlugin(myIds[0]).getName(); } if (myTitle != null) { for (String skipWord : BLACK_LIST) { |