Some refactoring to try and come up with better type names!

4 files changed, 11 insertions, 8 deletions

diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/AspectDeclaration.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/AspectDeclaration.java
index 681096b24..dce72fdc8 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/AspectDeclaration.java
+++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/AspectDeclaration.java
@@ -51,6 +51,7 @@ import org.aspectj.org.eclipse.jdt.internal.compiler.lookup.TypeBinding;
 import org.aspectj.weaver.AjAttribute;
 import org.aspectj.weaver.AjcMemberMaker;
 import org.aspectj.weaver.NameMangler;
+import org.aspectj.weaver.ReferenceType;
 import org.aspectj.weaver.ResolvedMember;
 import org.aspectj.weaver.ResolvedTypeX;
 import org.aspectj.weaver.Shadow;
@@ -82,7 +83,7 @@ public class AspectDeclaration extends TypeDeclaration {
 	
 	public EclipseSourceType concreteName;
 	
-	public ResolvedTypeX.Name typeX;
+	public ReferenceType typeX;
 	
 	public EclipseFactory factory;  //??? should use this consistently
 
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/AjLookupEnvironment.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/AjLookupEnvironment.java
index 9629edf4f..9578f68fc 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/AjLookupEnvironment.java
+++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/AjLookupEnvironment.java
@@ -51,6 +51,7 @@ import org.aspectj.org.eclipse.jdt.internal.compiler.lookup.TypeBinding;
 import org.aspectj.org.eclipse.jdt.internal.compiler.problem.ProblemReporter;
 import org.aspectj.weaver.AsmRelationshipProvider;
 import org.aspectj.weaver.ConcreteTypeMunger;
+import org.aspectj.weaver.ReferenceType;
 import org.aspectj.weaver.ResolvedTypeMunger;
 import org.aspectj.weaver.ResolvedTypeX;
 import org.aspectj.weaver.TypeX;
@@ -286,7 +287,7 @@ public class AjLookupEnvironment extends LookupEnvironment {
         }
 
 		if (hasPointcuts || dec instanceof AspectDeclaration) {
-        	ResolvedTypeX.Name name = (ResolvedTypeX.Name)factory.fromEclipse(sourceType);
+        	ReferenceType name = (ReferenceType)factory.fromEclipse(sourceType);
         	EclipseSourceType eclipseSourceType = (EclipseSourceType)name.getDelegate();
         	eclipseSourceType.checkPointcutDeclarations();
 		}
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 6380392fa..d88b9729d 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
@@ -30,6 +30,7 @@ import org.aspectj.bridge.IMessage.Kind;
 import org.aspectj.weaver.ConcreteTypeMunger;
 import org.aspectj.weaver.IHasPosition;
 import org.aspectj.weaver.Member;
+import org.aspectj.weaver.ReferenceType;
 import org.aspectj.weaver.ResolvedMember;
 import org.aspectj.weaver.ResolvedTypeX;
 import org.aspectj.weaver.Shadow;
@@ -463,7 +464,7 @@ public class EclipseFactory {
 	
 	public void addSourceTypeBinding(SourceTypeBinding binding) {
 		TypeDeclaration decl = binding.scope.referenceContext;
-		ResolvedTypeX.Name name = getWorld().lookupOrCreateName(TypeX.forName(getName(binding)));
+		ReferenceType name = getWorld().lookupOrCreateName(TypeX.forName(getName(binding)));
 		EclipseSourceType t = new EclipseSourceType(name, this, binding, decl);
 		name.setDelegate(t);
 		if (decl instanceof AspectDeclaration) {
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseSourceType.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseSourceType.java
index 88b552b59..9f4ba9574 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseSourceType.java
+++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseSourceType.java
@@ -37,7 +37,7 @@ import org.aspectj.org.eclipse.jdt.internal.compiler.lookup.*;
  * 
  * @author Jim Hugunin
  */
-public class EclipseSourceType extends ResolvedTypeX.ConcreteName {
+public class EclipseSourceType extends AbstractReferenceTypeDelegate {
 	private static final char[] pointcutSig = "Lorg/aspectj/lang/annotation/Pointcut;".toCharArray();
     private static final char[] aspectSig = "Lorg/aspectj/lang/annotation/Aspect;".toCharArray();
 	protected ResolvedPointcutDefinition[] declaredPointcuts = null;
@@ -58,7 +58,7 @@ public class EclipseSourceType extends ResolvedTypeX.ConcreteName {
 		return factory;
 	}
 
-	public EclipseSourceType(ResolvedTypeX.Name resolvedTypeX, EclipseFactory factory,
+	public EclipseSourceType(ReferenceType resolvedTypeX, EclipseFactory factory,
 								SourceTypeBinding binding, TypeDeclaration declaration)
 	{
 		super(resolvedTypeX, true);
@@ -435,15 +435,15 @@ public class EclipseSourceType extends ResolvedTypeX.ConcreteName {
     }
 
 
-	protected Collection getDeclares() {
+	public Collection getDeclares() {
 		return declares;
 	}
 
-	protected Collection getPrivilegedAccesses() {
+	public Collection getPrivilegedAccesses() {
 		return Collections.EMPTY_LIST;
 	}
 
-	protected Collection getTypeMungers() {
+	public Collection getTypeMungers() {
 		return typeMungers;
 	}