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

NPE fix

Browse Source
This commit is contained in:
Gregory.Shrago
2016-06-03 08:57:48 +03:00
parent 7d0ffda637
commit f76aed5c3d
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-structure-view/src/com/intellij/ide/structureView/impl/java/JavaFileTreeElement.java
+6 -2
View File
@@ -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<PsiClassOwner> implements ItemPresentation {
@@ -33,13 +34,16 @@ public class JavaFileTreeElement extends PsiTreeElementBase<PsiClassOwner> imple
@Override
public String getPresentableText() {
return getElement().getName();
PsiClassOwner element = getElement();
return element == null ? "" : element.getName();
}
@Override
@NotNull
public Collection<StructureViewTreeElement> getChildrenBase() {
PsiClass[] classes = getElement().getClasses();
PsiClassOwner element = getElement();
if (element == null) return Collections.emptyList();
PsiClass[] classes = element.getClasses();
ArrayList<StructureViewTreeElement> result = new ArrayList<StructureViewTreeElement>();
for (PsiClass aClass : classes) {
result.add(new JavaClassTreeElement(aClass, false, new HashSet<PsiClass>()));