This is the beginning of a significant refactoring needed to cleanly support generics. We need to be much crisper about when we have an unresolved type (plain old TypeX) and when we have a resolved type. This refactoring renames TypeX to UnresolvedType and ResolvedTypeX to ResolvedType. In addition, it moves a number of methods that were defined on TypeX but which can only be answered by resolved types down onto ResolvedType. At the moment, ResolvedType still extends UnresolvedType - but a ResolvedType is *not* a UnresolvedType and this inheritance of convenience will be broken down the line so that ResolvedType does not extend UnresolvedType. Full signature information can only be known for ResolvedTypes.

1 files changed, 5 insertions, 5 deletions

diff --git a/loadtime/src/org/aspectj/weaver/loadtime/ClassLoaderWeavingAdaptor.java b/loadtime/src/org/aspectj/weaver/loadtime/ClassLoaderWeavingAdaptor.java
index 8c90b978b..9414819b4 100644
--- a/loadtime/src/org/aspectj/weaver/loadtime/ClassLoaderWeavingAdaptor.java
+++ b/loadtime/src/org/aspectj/weaver/loadtime/ClassLoaderWeavingAdaptor.java
@@ -16,8 +16,8 @@ import org.aspectj.bridge.IMessage;
 import org.aspectj.bridge.ISourceLocation;
 import org.aspectj.bridge.Message;
 import org.aspectj.weaver.ICrossReferenceHandler;
-import org.aspectj.weaver.ResolvedTypeX;
-import org.aspectj.weaver.TypeX;
+import org.aspectj.weaver.ResolvedType;
+import org.aspectj.weaver.UnresolvedType;
 import org.aspectj.weaver.World;
 import org.aspectj.weaver.bcel.BcelWeaver;
 import org.aspectj.weaver.bcel.BcelWorld;
@@ -245,7 +245,7 @@ public class ClassLoaderWeavingAdaptor extends WeavingAdaptor {
             return true;
         }
         //TODO AV - optimize for className.startWith only
-        ResolvedTypeX classInfo = weaver.getWorld().getCoreType(TypeX.forName(className));
+        ResolvedType classInfo = weaver.getWorld().getCoreType(UnresolvedType.forName(className));
         //exclude
         for (Iterator iterator = m_excludeTypePattern.iterator(); iterator.hasNext();) {
             TypePattern typePattern = (TypePattern) iterator.next();
@@ -270,7 +270,7 @@ public class ClassLoaderWeavingAdaptor extends WeavingAdaptor {
             return true;
         }
         //TODO AV - optimize for className.startWith only
-        ResolvedTypeX classInfo = weaver.getWorld().getCoreType(TypeX.forName(aspectClassName));
+        ResolvedType classInfo = weaver.getWorld().getCoreType(UnresolvedType.forName(aspectClassName));
         //exclude
         for (Iterator iterator = m_aspectExcludeTypePattern.iterator(); iterator.hasNext();) {
             TypePattern typePattern = (TypePattern) iterator.next();
@@ -288,7 +288,7 @@ public class ClassLoaderWeavingAdaptor extends WeavingAdaptor {
             return false;
         }
         //TODO AV - optimize for className.startWith only
-        ResolvedTypeX classInfo = weaver.getWorld().getCoreType(TypeX.forName(className));
+        ResolvedType classInfo = weaver.getWorld().getCoreType(UnresolvedType.forName(className));
         //dump
         for (Iterator iterator = m_dumpTypePattern.iterator(); iterator.hasNext();) {
             TypePattern typePattern = (TypePattern) iterator.next();