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

when searching for some method in hierarchy, should also search in interfaces (correctly fix IDEA-101410)

Browse Source
This commit is contained in:
Eugene Zhuravlev
2013-02-19 22:39:17 +01:00
parent 9c1b0aa596
commit c2797bef41
1 changed files with 28 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/compiler/instrumentation-util/src/com/intellij/compiler/instrumentation/InstrumentationClassFinder.java
+28 -7
View File
@@ -250,15 +250,36 @@ public class InstrumentationClassFinder {
return null;
}
public PseudoMethod findMethodInHierarchy(String name, String descriptor) throws IOException, ClassNotFoundException {
PseudoMethod method = findMethod(name, descriptor);
if (method == null) {
PseudoClass superClass = getSuperClass();
if (superClass != null) {
method = superClass.findMethodInHierarchy(name, descriptor);
public PseudoMethod findMethodInHierarchy(final String name, final String descriptor) throws IOException, ClassNotFoundException {
// first find in superclasses
for (PseudoClass c = this; c != null; c = c.getSuperClass()) {
final PseudoMethod method = c.findMethod(name, descriptor);
if (method != null) {
return method;
}
}
return method;
// second, check interfaces
for (PseudoClass iface : getInterfaces()) {
final PseudoMethod method = findInterfaceMethodRecursively(iface, name, descriptor);
if (method != null) {
return method;
}
}
return null;
}
private static PseudoMethod findInterfaceMethodRecursively(PseudoClass fromIface, final String name, final String descriptor) throws IOException, ClassNotFoundException {
PseudoMethod method = fromIface.findMethod(name, descriptor);
if (method != null) {
return method;
}
for (PseudoClass superIface : fromIface.getInterfaces()) {
method = findInterfaceMethodRecursively(superIface, name, descriptor);
if (method != null) {
return method;
}
}
return null;
}
public InstrumentationClassFinder getFinder() {