From f76aed5c3d32ca52666e71e8eeff67de5adf77f8 Mon Sep 17 00:00:00 2001 From: "Gregory.Shrago" Date: Fri, 3 Jun 2016 08:57:48 +0300 Subject: [PATCH] NPE fix --- .../ide/structureView/impl/java/JavaFileTreeElement.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/java/java-structure-view/src/com/intellij/ide/structureView/impl/java/JavaFileTreeElement.java b/java/java-structure-view/src/com/intellij/ide/structureView/impl/java/JavaFileTreeElement.java index 590f1024bc14..8a10757043e3 100644 --- a/java/java-structure-view/src/com/intellij/ide/structureView/impl/java/JavaFileTreeElement.java +++ b/java/java-structure-view/src/com/intellij/ide/structureView/impl/java/JavaFileTreeElement.java @@ -24,6 +24,7 @@ import org.jetbrains.annotations.NotNull; import java.util.ArrayList; import java.util.Collection; +import java.util.Collections; import java.util.HashSet; public class JavaFileTreeElement extends PsiTreeElementBase implements ItemPresentation { @@ -33,13 +34,16 @@ public class JavaFileTreeElement extends PsiTreeElementBase imple @Override public String getPresentableText() { - return getElement().getName(); + PsiClassOwner element = getElement(); + return element == null ? "" : element.getName(); } @Override @NotNull public Collection getChildrenBase() { - PsiClass[] classes = getElement().getClasses(); + PsiClassOwner element = getElement(); + if (element == null) return Collections.emptyList(); + PsiClass[] classes = element.getClasses(); ArrayList result = new ArrayList(); for (PsiClass aClass : classes) { result.add(new JavaClassTreeElement(aClass, false, new HashSet()));