diff options
Diffstat (limited to 'platform/lang-impl/src/com/intellij/ide/impl')
-rw-r--r-- | platform/lang-impl/src/com/intellij/ide/impl/ProjectViewSelectInGroupTarget.java | 4 | ||||
-rw-r--r-- | platform/lang-impl/src/com/intellij/ide/impl/ProjectViewSelectInTarget.java | 18 |
2 files changed, 12 insertions, 10 deletions
diff --git a/platform/lang-impl/src/com/intellij/ide/impl/ProjectViewSelectInGroupTarget.java b/platform/lang-impl/src/com/intellij/ide/impl/ProjectViewSelectInGroupTarget.java index 8b96157234d8..a0fb4f5d389d 100644 --- a/platform/lang-impl/src/com/intellij/ide/impl/ProjectViewSelectInGroupTarget.java +++ b/platform/lang-impl/src/com/intellij/ide/impl/ProjectViewSelectInGroupTarget.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. @@ -37,7 +37,7 @@ import java.util.LinkedHashSet; public class ProjectViewSelectInGroupTarget implements CompositeSelectInTarget, DumbAware { @Override @NotNull - public Collection<SelectInTarget> getSubTargets(SelectInContext context) { + public Collection<SelectInTarget> getSubTargets(@NotNull SelectInContext context) { return ProjectView.getInstance(context.getProject()).getSelectInTargets(); } 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; |