MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

IDEA-59915

Browse Source
This commit is contained in:
Alexey Kudravtsev
2010-11-15 12:43:19 +03:00
parent eb3d45c769
commit 9376476d1c
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/codeInsight/navigation/NavigationUtil.java
+6 -4
View File
@@ -34,6 +34,7 @@ import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiFile;
import com.intellij.psi.search.PsiElementProcessor;
import com.intellij.ui.components.JBList;
import org.jetbrains.annotations.NotNull;
import javax.swing.*;
@@ -49,7 +50,7 @@ public final class NavigationUtil {
return getPsiElementPopup(elements, new DefaultPsiElementCellRenderer(), title);
}
public static JBPopup getPsiElementPopup(final PsiElement[] elements, final PsiElementListCellRenderer renderer, final String title) {
public static JBPopup getPsiElementPopup(final PsiElement[] elements, final PsiElementListCellRenderer<PsiElement> renderer, final String title) {
return getPsiElementPopup(elements, renderer, title, new PsiElementProcessor<PsiElement>() {
public boolean execute(final PsiElement element) {
Navigatable descriptor = EditSourceUtil.getDescriptor(element);
@@ -87,15 +88,16 @@ public final class NavigationUtil {
return builder.setItemChoosenCallback(runnable).createPopup();
}
public static void activateFileWithPsiElement(PsiElement elt) {
public static void activateFileWithPsiElement(@NotNull PsiElement elt) {
if (!activatePsiElementIfOpen(elt)) {
((NavigationItem)elt).navigate(true);
}
}
private static boolean activatePsiElementIfOpen(PsiElement elt) {
private static boolean activatePsiElementIfOpen(@NotNull PsiElement elt) {
if (!elt.isValid()) return false;
elt = elt.getNavigationElement();
if (elt == null) return false;
final PsiFile file = elt.getContainingFile();
if (file == null || !file.isValid()) return false;