slowly merging in optimizations

weaver/src/org/aspectj/weaver/bcel/BcelTypeMunger.java

@@ -1135,7 +1135,7 @@ public class BcelTypeMunger extends ConcreteTypeMunger {
 		if (!alreadyDone) {
 			// Use the iterator form of 'getMethods()' so we do as little work
 			// as necessary
-			for (Iterator iter = onType.getSuperclass().getMethods(); iter.hasNext() && !quitRightNow;) {
+			for (Iterator iter = onType.getSuperclass().getMethods(true, true); iter.hasNext() && !quitRightNow;) {
 				ResolvedMember aMethod = (ResolvedMember) iter.next();
 				if (aMethod.getName().equals(localMethodName) && aMethod.getParameterSignature().equals(localParameterSig)) {
 					// check the return types, if they are different we need a

weaver/src/org/aspectj/weaver/bcel/BcelWorld.java

@@ -551,7 +551,7 @@ public class BcelWorld extends World implements Repository {
 		if (ii.opcode == Constants.INVOKESTATIC) {
 			ResolvedType appearsDeclaredBy = resolve(declaring);
 			// look for the method there
-			for (Iterator<ResolvedMember> iterator = appearsDeclaredBy.getMethods(); iterator.hasNext();) {
+			for (Iterator<ResolvedMember> iterator = appearsDeclaredBy.getMethods(true, true); iterator.hasNext();) {
 				ResolvedMember method = iterator.next();
 				if (method.isStatic()) {
 					if (name.equals(method.getName()) && signature.equals(method.getSignature())) {