changed Member to be an interface with impl MemberImpl. changed ResolvedMember to be an interface with impl ResolvedMemberImpl

8 files changed, 17 insertions, 14 deletions

diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/IfMethodDeclaration.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/IfMethodDeclaration.java
index b0f406cf9..17c74be76 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/IfMethodDeclaration.java
+++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/IfMethodDeclaration.java
@@ -15,7 +15,7 @@ package org.aspectj.ajdt.internal.compiler.ast;
 
 import org.aspectj.ajdt.internal.compiler.lookup.EclipseFactory;
 import org.aspectj.weaver.Member;
-import org.aspectj.weaver.ResolvedMember;
+import org.aspectj.weaver.ResolvedMemberImpl;
 import org.aspectj.weaver.ResolvedType;
 import org.aspectj.weaver.patterns.IfPointcut;
 import org.aspectj.org.eclipse.jdt.internal.compiler.ClassFile;
@@ -50,7 +50,7 @@ public class IfMethodDeclaration extends AjMethodDeclaration {
 			
 			//XXX this is where we should remove unavailable args if we're in a cflow
 			EclipseFactory factory = EclipseFactory.fromScopeLookupEnvironment(scope);
-			ifPointcut.testMethod = new ResolvedMember(
+			ifPointcut.testMethod = new ResolvedMemberImpl(
 				Member.METHOD,
 				factory.fromBinding(binding.declaringClass),
 				this.modifiers, ResolvedType.BOOLEAN,  
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/IfPseudoToken.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/IfPseudoToken.java
index 14f708b51..580594949 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/IfPseudoToken.java
+++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/IfPseudoToken.java
@@ -16,7 +16,7 @@ package org.aspectj.ajdt.internal.compiler.ast;
 import java.lang.reflect.Modifier;
 
 import org.aspectj.weaver.Member;
-import org.aspectj.weaver.ResolvedMember;
+import org.aspectj.weaver.ResolvedMemberImpl;
 import org.aspectj.weaver.UnresolvedType;
 import org.aspectj.weaver.patterns.IfPointcut;
 import org.aspectj.weaver.patterns.Pointcut;
@@ -71,7 +71,7 @@ public class IfPseudoToken extends PseudoToken {
 		} else if (expr instanceof TrueLiteral) {
 			return IfPointcut.makeIfTruePointcut(Pointcut.SYMBOLIC);
 		} else {
-		  pointcut = new IfPointcut(new ResolvedMember(Member.METHOD, UnresolvedType.OBJECT, 0, "if_", "()V"), 0);
+		  pointcut = new IfPointcut(new ResolvedMemberImpl(Member.METHOD, UnresolvedType.OBJECT, 0, "if_", "()V"), 0);
 		}
 		return pointcut;
 		
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/InterTypeConstructorDeclaration.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/InterTypeConstructorDeclaration.java
index 82dd5cdc3..d524dcfbd 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/InterTypeConstructorDeclaration.java
+++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/InterTypeConstructorDeclaration.java
@@ -221,7 +221,7 @@ public class InterTypeConstructorDeclaration extends InterTypeDeclaration {
 		ResolvedMember bindingAsMember = world.makeResolvedMember(binding);
 		
 		ResolvedMember signature =
-			new ResolvedMember(Member.CONSTRUCTOR, declaringTypeX, declaredModifiers, 
+			new ResolvedMemberImpl(Member.CONSTRUCTOR, declaringTypeX, declaredModifiers, 
 					ResolvedType.VOID, "<init>", bindingAsMember.getParameterTypes(),
 					world.fromEclipse(binding.thrownExceptions));			
 		ResolvedMember syntheticInterMember =
@@ -253,7 +253,7 @@ public class InterTypeConstructorDeclaration extends InterTypeDeclaration {
 				world.makeResolvedMember(explicitConstructor));
 		} else {
 			((NewConstructorTypeMunger)munger).setExplicitConstructor(
-				new ResolvedMember(Member.CONSTRUCTOR, 
+				new ResolvedMemberImpl(Member.CONSTRUCTOR, 
 					world.fromBinding(onTypeBinding.superclass()),
 					0, ResolvedType.VOID, "<init>", UnresolvedType.NONE));
 		}
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/InterTypeFieldDeclaration.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/InterTypeFieldDeclaration.java
index 7b33c9ab1..464f8f177 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/InterTypeFieldDeclaration.java
+++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/InterTypeFieldDeclaration.java
@@ -174,7 +174,7 @@ public class InterTypeFieldDeclaration extends InterTypeDeclaration {
 			declaringType = declaringType.getGenericType();
 		}
 		ResolvedMember sig = 
-			new ResolvedMember(Member.FIELD, declaringType,
+			new ResolvedMemberImpl(Member.FIELD, declaringType,
 					declaredModifiers, world.fromBinding(binding.returnType),
 					new String(declaredSelector), UnresolvedType.NONE);
 		
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/InterTypeMethodDeclaration.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/InterTypeMethodDeclaration.java
index e868d796b..f20476fdd 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/InterTypeMethodDeclaration.java
+++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/InterTypeMethodDeclaration.java
@@ -23,6 +23,7 @@ import org.aspectj.weaver.Member;
 import org.aspectj.weaver.NameMangler;
 import org.aspectj.weaver.NewMethodTypeMunger;
 import org.aspectj.weaver.ResolvedMember;
+import org.aspectj.weaver.ResolvedMemberImpl;
 import org.aspectj.weaver.ResolvedType;
 import org.aspectj.weaver.Shadow;
 import org.aspectj.weaver.UnresolvedType;
@@ -124,7 +125,7 @@ public class InterTypeMethodDeclaration extends InterTypeDeclaration {
 		if (isTargetAnnotation(classScope,"method")) return null; // Error message output in isTargetAnnotation
 		if (isTargetEnum(classScope,"method")) return null; // Error message output in isTargetEnum
 		
-		ResolvedMember sig = new ResolvedMember(Member.METHOD, world.fromBinding(onTypeBinding),
+		ResolvedMemberImpl sig = new ResolvedMemberImpl(Member.METHOD, world.fromBinding(onTypeBinding),
 			declaredModifiers, world.fromBinding(binding.returnType), new String(declaredSelector),
 			world.fromBindings(binding.parameters),
 			world.fromEclipse(binding.thrownExceptions));
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseFactory.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseFactory.java
index 4ebc962e3..b853c14a0 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseFactory.java
+++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseFactory.java
@@ -33,6 +33,7 @@ import org.aspectj.weaver.IHasPosition;
 import org.aspectj.weaver.Member;
 import org.aspectj.weaver.ReferenceType;
 import org.aspectj.weaver.ResolvedMember;
+import org.aspectj.weaver.ResolvedMemberImpl;
 import org.aspectj.weaver.ResolvedType;
 import org.aspectj.weaver.Shadow;
 import org.aspectj.weaver.TypeFactory;
@@ -373,7 +374,7 @@ public class EclipseFactory {
 		// AMC these next two lines shouldn't be needed once we sort out generic types properly in the world map
 		ResolvedType realDeclaringType = world.resolve(fromBinding(declaringType));
 		if (realDeclaringType.isRawType()) realDeclaringType = realDeclaringType.getGenericType();
-		ResolvedMember ret =  new ResolvedMember(
+		ResolvedMember ret =  new ResolvedMemberImpl(
 			binding.isConstructor() ? Member.CONSTRUCTOR : Member.METHOD,
 			realDeclaringType,
 			binding.modifiers,
@@ -392,7 +393,7 @@ public class EclipseFactory {
 		// AMC these next two lines shouldn't be needed once we sort out generic types properly in the world map
 		ResolvedType realDeclaringType = world.resolve(fromBinding(receiverType));
 		if (realDeclaringType.isRawType()) realDeclaringType = realDeclaringType.getGenericType();
-		return new ResolvedMember(
+		return new ResolvedMemberImpl(
 			Member.FIELD,
 			realDeclaringType,
 			binding.modifiers,
@@ -671,7 +672,7 @@ public class EclipseFactory {
 	}
 	
 	public ResolvedMember fromBinding(MethodBinding binding) {
-		return new ResolvedMember(Member.METHOD,fromBinding(binding.declaringClass),binding.modifiers,
+		return new ResolvedMemberImpl(Member.METHOD,fromBinding(binding.declaringClass),binding.modifiers,
 				           fromBinding(binding.returnType),CharOperation.charToString(binding.selector),fromBindings(binding.parameters));
 	}
 
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseShadow.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseShadow.java
index f610a8007..4bb3a5829 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseShadow.java
+++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseShadow.java
@@ -65,7 +65,7 @@ public class EclipseShadow extends Shadow {
 
 	public Member getEnclosingCodeSignature() {
 		if (context instanceof TypeDeclaration) {
-			return new Member(Member.STATIC_INITIALIZATION, getEnclosingType(), 0, 
+			return new MemberImpl(Member.STATIC_INITIALIZATION, getEnclosingType(), 0, 
 						ResolvedType.VOID, "<clinit>", UnresolvedType.NONE);
 		} else if (context instanceof AbstractMethodDeclaration) {
 			return world.makeResolvedMember(((AbstractMethodDeclaration)context).binding);
@@ -170,7 +170,7 @@ public class EclipseShadow extends Shadow {
 					world.makeResolvedMember(e.binding), astNode, context);
 		} else if (astNode instanceof TypeDeclaration) {
 			return new EclipseShadow(world, Shadow.StaticInitialization,
-							new Member(Member.STATIC_INITIALIZATION, 
+							new MemberImpl(Member.STATIC_INITIALIZATION, 
 								world.fromBinding(((TypeDeclaration)astNode).binding), 0, 
 								ResolvedType.VOID, "<clinit>", UnresolvedType.NONE),
 							astNode, context);
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/PrivilegedHandler.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/PrivilegedHandler.java
index 084d63153..d997cdec7 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/PrivilegedHandler.java
+++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/PrivilegedHandler.java
@@ -25,6 +25,7 @@ import org.aspectj.weaver.AjcMemberMaker;
 import org.aspectj.weaver.Lint;
 import org.aspectj.weaver.Member;
 import org.aspectj.weaver.ResolvedMember;
+import org.aspectj.weaver.ResolvedMemberImpl;
 import org.aspectj.weaver.ResolvedType;
 import org.aspectj.weaver.UnresolvedType;
 import org.aspectj.weaver.World;
@@ -77,7 +78,7 @@ public class PrivilegedHandler implements IPrivilegedHandler {
 	
 	public void notePrivilegedTypeAccess(ReferenceBinding type, ASTNode location) {
 		ResolvedMember key =
-			new ResolvedMember(Member.STATIC_INITIALIZATION,
+			new ResolvedMemberImpl(Member.STATIC_INITIALIZATION,
 				inAspect.factory.fromEclipse(type), 0, ResolvedType.VOID, "", UnresolvedType.NONE);
 		
 		checkWeaveAccess(key.getDeclaringType(), location);