From 1faffff59afb75bd5a279c76dde72b73c0266466 Mon Sep 17 00:00:00 2001 From: Olesya Smirnova Date: Fri, 4 Mar 2005 17:13:34 +0300 Subject: [PATCH] http://www.jetbrains.net/jira/browse/IDEADEV-513 fixed --- .../impl/java/JavaFileTreeElement.java | 5 ++--- .../impl/java/PsiMethodTreeElement.java | 15 ++++++++++++--- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/source/com/intellij/ide/structureView/impl/java/JavaFileTreeElement.java b/source/com/intellij/ide/structureView/impl/java/JavaFileTreeElement.java index e07245b132af..1b14403e89dd 100644 --- a/source/com/intellij/ide/structureView/impl/java/JavaFileTreeElement.java +++ b/source/com/intellij/ide/structureView/impl/java/JavaFileTreeElement.java @@ -3,10 +3,9 @@ package com.intellij.ide.structureView.impl.java; import com.intellij.ide.structureView.StructureViewTreeElement; import com.intellij.ide.structureView.impl.common.PsiTreeElementBase; import com.intellij.navigation.ItemPresentation; +import com.intellij.openapi.editor.colors.TextAttributesKey; import com.intellij.psi.PsiClass; import com.intellij.psi.PsiJavaFile; -import com.intellij.openapi.editor.colors.TextAttributesKey; -import com.intellij.codeInsight.CodeInsightColors; import java.util.ArrayList; @@ -34,4 +33,4 @@ public class JavaFileTreeElement extends PsiTreeElementBase impleme public TextAttributesKey getTextAttributesKey() { return null; } -} +} \ No newline at end of file diff --git a/source/com/intellij/ide/structureView/impl/java/PsiMethodTreeElement.java b/source/com/intellij/ide/structureView/impl/java/PsiMethodTreeElement.java index 9160da3287e5..5ccfaaa8a863 100644 --- a/source/com/intellij/ide/structureView/impl/java/PsiMethodTreeElement.java +++ b/source/com/intellij/ide/structureView/impl/java/PsiMethodTreeElement.java @@ -2,17 +2,26 @@ package com.intellij.ide.structureView.impl.java; import com.intellij.ide.structureView.StructureViewTreeElement; import com.intellij.navigation.ItemPresentation; -import com.intellij.psi.PsiMethod; -import com.intellij.psi.PsiSubstitutor; +import com.intellij.psi.*; import com.intellij.psi.util.PsiFormatUtil; +import java.util.ArrayList; + public class PsiMethodTreeElement extends JavaClassTreeElementBase { public PsiMethodTreeElement(PsiMethod method, boolean isInherited) { super(isInherited,method); } public StructureViewTreeElement[] getChildrenBase() { - return new StructureViewTreeElement[0]; + final ArrayList result = new ArrayList(); + getElement().accept(new PsiRecursiveElementVisitor(){ + public void visitClass(PsiClass aClass) { + if (!(aClass instanceof PsiAnonymousClass)) { + result.add(new JavaClassTreeElement(aClass, isInherited())); + } + } + }); + return result.toArray(new StructureViewTreeElement[result.size()]); } public ItemPresentation getPresentation() {