StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "fix searching of ancestors for removed methods"

Browse Source
This commit is contained in:
Vasu Nori
2010-05-03 13:24:00 -07:00
committed by Android (Google) Code Review
parent 5b59f6b08c 65dd8f4ced
commit 2d2e4884eb
1 changed files with 15 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
tools/apicheck/src/com/android/apicheck/ClassInfo.java
View File

@@ -86,41 +86,35 @@ public class ClassInfo {
return mIsFinal;
}
// Find a superclass implementation of the given method. Looking at our superclass
// instead of at 'this' is unusual, but it fits the point-of-call demands well.
public MethodInfo overriddenMethod(MethodInfo candidate) {
if (mSuperClass == null) {
// Find a superclass implementation of the given method.
public static MethodInfo overriddenMethod(MethodInfo candidate, ClassInfo newClassObj) {
if (newClassObj == null) {
return null;
}
// does our immediate superclass have it?
ClassInfo sup = mSuperClass;
for (MethodInfo mi : sup.mMethods.values()) {
for (MethodInfo mi : newClassObj.mMethods.values()) {
if (mi.matches(candidate)) {
// found it
return mi;
}
}
// no, so recurse
if (sup.mSuperClass != null) {
return mSuperClass.overriddenMethod(candidate);
}
// no parent, so we just don't have it
return null;
// not found here. recursively search ancestors
return ClassInfo.overriddenMethod(candidate, newClassObj.mSuperClass);
}
// Find a superinterface declaration of the given method.
public MethodInfo interfaceMethod(MethodInfo candidate) {
for (ClassInfo interfaceInfo : mInterfaces) {
public static MethodInfo interfaceMethod(MethodInfo candidate, ClassInfo newClassObj) {
if (newClassObj == null) {
return null;
}
for (ClassInfo interfaceInfo : newClassObj.mInterfaces) {
for (MethodInfo mi : interfaceInfo.mMethods.values()) {
if (mi.matches(candidate)) {
return mi;
}
}
}
return (mSuperClass != null) ? mSuperClass.interfaceMethod(candidate) : null;
return ClassInfo.interfaceMethod(candidate, newClassObj.mSuperClass);
}
public boolean isConsistent(ClassInfo cl) {
@@ -159,9 +153,9 @@ public class ClassInfo {
* Check our ancestry to see if there's an inherited version that still
* fulfills the API requirement.
*/
MethodInfo mi = mInfo.containingClass().overriddenMethod(mInfo);
MethodInfo mi = ClassInfo.overriddenMethod(mInfo, cl);
if (mi == null) {
mi = mInfo.containingClass().interfaceMethod(mInfo);
mi = ClassInfo.interfaceMethod(mInfo, cl);
}
if (mi == null) {
Errors.error(Errors.REMOVED_METHOD, mInfo.position(),
@@ -175,7 +169,7 @@ public class ClassInfo {
/* Similarly to the above, do not fail if this "new" method is
* really an override of an existing superclass method.
*/
MethodInfo mi = mInfo.containingClass().overriddenMethod(mInfo);
MethodInfo mi = ClassInfo.overriddenMethod(mInfo, cl);
if (mi == null) {
Errors.error(Errors.ADDED_METHOD, mInfo.position(),
"Added public method " + mInfo.qualifiedName());