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/lang-impl/src/com/intellij/ide/impl/ProjectViewSelectInTarget.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/lang-impl/src/com/intellij/ide/impl/ProjectViewSelectInTarget.java')
-rw-r--r-- | platform/lang-impl/src/com/intellij/ide/impl/ProjectViewSelectInTarget.java | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/platform/lang-impl/src/com/intellij/ide/impl/ProjectViewSelectInTarget.java b/platform/lang-impl/src/com/intellij/ide/impl/ProjectViewSelectInTarget.java index 8902939c1de5..b510dc98bf1f 100644 --- a/platform/lang-impl/src/com/intellij/ide/impl/ProjectViewSelectInTarget.java +++ b/platform/lang-impl/src/com/intellij/ide/impl/ProjectViewSelectInTarget.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2014 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -55,12 +55,13 @@ public abstract class ProjectViewSelectInTarget extends SelectInTargetPsiWrapper select(myProject, selector, getMinorViewId(), mySubId, virtualFile, requestFocus); } + @NotNull public static ActionCallback select(@NotNull Project project, - final Object toSelect, - @Nullable final String viewId, - @Nullable final String subviewId, - final VirtualFile virtualFile, - final boolean requestFocus) { + final Object toSelect, + @Nullable final String viewId, + @Nullable final String subviewId, + final VirtualFile virtualFile, + final boolean requestFocus) { final ActionCallback result = new ActionCallback(); @@ -86,7 +87,8 @@ public abstract class ProjectViewSelectInTarget extends SelectInTargetPsiWrapper if (requestFocus) { projectViewToolWindow.activate(runnable, false); - } else { + } + else { projectViewToolWindow.show(runnable); } @@ -96,7 +98,7 @@ public abstract class ProjectViewSelectInTarget extends SelectInTargetPsiWrapper @Override @NotNull - public Collection<SelectInTarget> getSubTargets(SelectInContext context) { + public Collection<SelectInTarget> getSubTargets(@NotNull SelectInContext context) { List<SelectInTarget> result = new ArrayList<SelectInTarget>(); AbstractProjectViewPane pane = ProjectView.getInstance(myProject).getProjectViewPaneById(getMinorViewId()); int index = 0; |