From 821c9d0506662933cdd0732ec4a801aa1035b563 Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Tue, 31 Jan 2012 19:08:46 +0100 Subject: [PATCH 1/1] EA-33172 - NPE: JavaHierarchyUtil.getPackageName --- .../ide/hierarchy/call/CallHierarchyNodeDescriptor.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/java/java-impl/src/com/intellij/ide/hierarchy/call/CallHierarchyNodeDescriptor.java b/java/java-impl/src/com/intellij/ide/hierarchy/call/CallHierarchyNodeDescriptor.java index 9afe7593f0a6..6a65678a8d3a 100644 --- a/java/java-impl/src/com/intellij/ide/hierarchy/call/CallHierarchyNodeDescriptor.java +++ b/java/java-impl/src/com/intellij/ide/hierarchy/call/CallHierarchyNodeDescriptor.java @@ -156,8 +156,13 @@ public final class CallHierarchyNodeDescriptor extends HierarchyNodeDescriptor i myHighlightedText.getEnding().addText(IdeBundle.message("node.call.hierarchy.N.usages", myUsageCount), HierarchyNodeDescriptor.getUsageCountPrefixAttributes()); } if (!(JspPsiUtil.isInJspFile(enclosingElement) && enclosingElement instanceof PsiFile)) { - final String packageName = JavaHierarchyUtil.getPackageName(enclosingElement instanceof PsiMethod ? ((PsiMethod)enclosingElement).getContainingClass() : (PsiClass)enclosingElement); - myHighlightedText.getEnding().addText(" (" + packageName + ")", HierarchyNodeDescriptor.getPackageNameAttributes()); + final PsiClass containingClass = enclosingElement instanceof PsiMethod + ? ((PsiMethod)enclosingElement).getContainingClass() + : (PsiClass)enclosingElement; + if (containingClass != null) { + final String packageName = JavaHierarchyUtil.getPackageName(containingClass); + myHighlightedText.getEnding().addText(" (" + packageName + ")", HierarchyNodeDescriptor.getPackageNameAttributes()); + } } myName = myHighlightedText.getText(); -- 2.32.0