Lines 48-53
Link Here
|
48 |
import java.util.Collection; |
48 |
import java.util.Collection; |
49 |
import javax.lang.model.element.Element; |
49 |
import javax.lang.model.element.Element; |
50 |
import javax.lang.model.element.ElementKind; |
50 |
import javax.lang.model.element.ElementKind; |
|
|
51 |
import static javax.lang.model.element.ElementKind.METHOD; |
51 |
import javax.lang.model.element.Modifier; |
52 |
import javax.lang.model.element.Modifier; |
52 |
import javax.lang.model.element.PackageElement; |
53 |
import javax.lang.model.element.PackageElement; |
53 |
import javax.lang.model.element.TypeElement; |
54 |
import javax.lang.model.element.TypeElement; |
Lines 70-75
Link Here
|
70 |
public class ElementDescription { |
71 |
public class ElementDescription { |
71 |
|
72 |
|
72 |
private static final String PKG_COLOR = Utilities.getHTMLColor(192, 192, 192); |
73 |
private static final String PKG_COLOR = Utilities.getHTMLColor(192, 192, 192); |
|
|
74 |
private final ElementKind imageKind; |
73 |
|
75 |
|
74 |
private ClasspathInfo originalCPInfo; |
76 |
private ClasspathInfo originalCPInfo; |
75 |
|
77 |
|
Lines 82-87
Link Here
|
82 |
public ElementDescription(CompilationInfo info, Element element, boolean overriddenFlag) { |
84 |
public ElementDescription(CompilationInfo info, Element element, boolean overriddenFlag) { |
83 |
this.originalCPInfo = info.getClasspathInfo(); |
85 |
this.originalCPInfo = info.getClasspathInfo(); |
84 |
this.handle = ElementHandle.create(element); |
86 |
this.handle = ElementHandle.create(element); |
|
|
87 |
if (METHOD.equals(element.getKind()) && null != element.getEnclosingElement()) { |
88 |
//when showing the implementors/overriders of a method, show the type icon (not the method icon) |
89 |
this.imageKind = element.getEnclosingElement().getKind(); |
90 |
} else { |
91 |
this.imageKind = this.handle.getKind(); |
92 |
} |
85 |
this.outtermostElement = ElementHandle.create(SourceUtils.getOutermostEnclosingTypeElement(element)); |
93 |
this.outtermostElement = ElementHandle.create(SourceUtils.getOutermostEnclosingTypeElement(element)); |
86 |
this.modifiers = element.getModifiers(); |
94 |
this.modifiers = element.getModifiers(); |
87 |
this.displayName = overriddenFlag ? computeDisplayNameIsOverridden(element) : computeDisplayNameOverrides(element); |
95 |
this.displayName = overriddenFlag ? computeDisplayNameIsOverridden(element) : computeDisplayNameOverrides(element); |
Lines 190-196
Link Here
|
190 |
badge = ImageUtilities.loadImage("org/netbeans/modules/java/editor/resources/overrides-badge.png"); |
198 |
badge = ImageUtilities.loadImage("org/netbeans/modules/java/editor/resources/overrides-badge.png"); |
191 |
} |
199 |
} |
192 |
|
200 |
|
193 |
Image icon = ImageUtilities.icon2Image(ElementIcons.getElementIcon(handle.getKind(), modifiers)); |
201 |
Image icon = ImageUtilities.icon2Image(ElementIcons.getElementIcon(imageKind, modifiers)); |
194 |
|
202 |
|
195 |
return ImageUtilities.image2Icon(ImageUtilities.mergeImages(icon, badge, 16, 0)); |
203 |
return ImageUtilities.image2Icon(ImageUtilities.mergeImages(icon, badge, 16, 0)); |
196 |
} |
204 |
} |