From: aclement <aclement>
Date: Thu, 7 Aug 2008 18:19:37 +0000 (+0000)
Subject: 242797
X-Git-Tag: V162DEV_M1~148
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=f587232bf51d20d4d9b86b14e433205305141b5c;p=aspectj.git

242797
---

diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/InterTypeMemberFinder.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/InterTypeMemberFinder.java
index 352260318..da1d66f0d 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/InterTypeMemberFinder.java
+++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/InterTypeMemberFinder.java
@@ -248,7 +248,7 @@ public class InterTypeMemberFinder implements IMemberFinder {
 	// find all of my methods, including ITDs
 	// PLUS: any public ITDs made on interfaces that I implement
 	public MethodBinding[] methods(SourceTypeBinding sourceTypeBinding) {
-		MethodBinding[] orig = sourceTypeBinding.methods();
+		MethodBinding[] orig = sourceTypeBinding.methodsBase();
 //		if (interTypeMethods.isEmpty()) return orig;
 		
 		List ret = new ArrayList(Arrays.asList(orig));
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/InterTypeMethodBinding.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/InterTypeMethodBinding.java
index 0205134ff..7206f7ad2 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/InterTypeMethodBinding.java
+++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/InterTypeMethodBinding.java
@@ -68,13 +68,7 @@ public class InterTypeMethodBinding extends MethodBinding {
 		// 1st set:
 		// If the typevariable is one declared on the source method, then we know we are the declaring element
 		for (int i = 0; i < typeVariables.length; i++) {
-			TypeVariableBinding tv = typeVariables[i];
-			String name = new String(tv.sourceName);
-			TypeVariableBinding[] tv2 = sourceMethod.binding.typeVariables;
-			for (int j = 0; j < tv2.length; j++) {
-				TypeVariableBinding typeVariable = tv2[j];
-				if (new String(tv2[j].sourceName).equals(name)) typeVariables[i].declaringElement = this;
-			}
+			typeVariables[i].declaringElement = this;
 		}
 		for (int i = 0; i < typeVariables.length; i++) {
 			if (typeVariables[i].declaringElement==null) throw new RuntimeException("Declaring element not set");