Completed: Improve ajc memory usage

expose generic sig for structural comparison

diff --git a/weaver/src/org/aspectj/weaver/ReferenceType.java b/weaver/src/org/aspectj/weaver/ReferenceType.java
index aa0c303e6a0ce253cf3d30c9cf7d831205865667..9c6b529c798d7102734ee3558989623d47ed87e5 100644 (file)
--- a/weaver/src/org/aspectj/weaver/ReferenceType.java
+++ b/weaver/src/org/aspectj/weaver/ReferenceType.java
@@ -134,6 +134,11 @@ public class ReferenceType extends ResolvedType {
        return !isParameterizedType() && !isRawType() && delegate.isGeneric();
     }
 
+    public String getGenericSignature() {
+       String sig = delegate.getDeclaredGenericSignature();
+       return (sig == null) ? "" : sig;
+    }
+    
     public AnnotationX[] getAnnotations() {
        return delegate.getAnnotations();
     }

diff --git a/weaver/src/org/aspectj/weaver/ResolvedType.java b/weaver/src/org/aspectj/weaver/ResolvedType.java
index 0e78007f05dc76416e93bb248db10c4bf82465e8..798c00e20e3e5c26492b93954497451afa90de69 100644 (file)
--- a/weaver/src/org/aspectj/weaver/ResolvedType.java
+++ b/weaver/src/org/aspectj/weaver/ResolvedType.java
@@ -1831,6 +1831,15 @@ public abstract class ResolvedType extends UnresolvedType implements AnnotatedEl
                return null;
        }
        
+       /**
+        * overriden by ReferenceType to return the gsig for a generic type
+        * @return
+        */
+       public String getGenericSignature() {
+               return "";
+       }
+       
+       
        public ResolvedType parameterizedWith(UnresolvedType[] typeParameters) {
                if (!(isGenericType() || isParameterizedType())) return this;
                return TypeFactory.createParameterizedType(this.getGenericType(), typeParameters, getWorld());