optimization 129298 - remove redundant (expensive) field - from Ron, doing what I...

diff --git a/weaver/src/org/aspectj/weaver/JoinPointSignature.java b/weaver/src/org/aspectj/weaver/JoinPointSignature.java
index 0b10f7541afbcce3fc08646bcd7e3311f9dd2741..b7bb04c3cac8d3120882cd4bb4208267b8635aea 100644 (file)
--- a/weaver/src/org/aspectj/weaver/JoinPointSignature.java
+++ b/weaver/src/org/aspectj/weaver/JoinPointSignature.java
@@ -267,10 +267,6 @@ public class JoinPointSignature implements ResolvedMember {
                return realMember.getSignature();
        }
 
-       public String getDeclaredSignature() {
-               return realMember.getDeclaredSignature();
-       }
-
        public int getArity() {
                return realMember.getArity();
        }

diff --git a/weaver/src/org/aspectj/weaver/Member.java b/weaver/src/org/aspectj/weaver/Member.java
index 76f3e06d3f067fd82924826b45454669f0c6a0e6..24f4224f3f601972f8eaaa65a77927620b94504e 100644 (file)
--- a/weaver/src/org/aspectj/weaver/Member.java
+++ b/weaver/src/org/aspectj/weaver/Member.java
@@ -80,9 +80,6 @@ public interface Member {
      */
     public Iterator getJoinPointSignatures(World world);
 
-       /** TODO ASC Should return the non-erased version of the signature... untested */
-       public String getDeclaredSignature();
-
        public int getArity();
 
        /**

diff --git a/weaver/src/org/aspectj/weaver/MemberImpl.java b/weaver/src/org/aspectj/weaver/MemberImpl.java
index 5f0c6ff55916df267424c4ac6284c041312078ba..039210378c35c794fe119e3d8d10b7c7437bba37 100644 (file)
--- a/weaver/src/org/aspectj/weaver/MemberImpl.java
+++ b/weaver/src/org/aspectj/weaver/MemberImpl.java
@@ -30,7 +30,6 @@ public class MemberImpl implements Comparable, AnnotatedElement,Member {
     protected String name;
     protected UnresolvedType[] parameterTypes;
     private final String signature;
-       private final String declaredSignature; // TODO asc Is this redundant? Is it needed for generics?
     private String paramSignature;
     
     /**
@@ -52,7 +51,6 @@ public class MemberImpl implements Comparable, AnnotatedElement,Member {
         this.modifiers = modifiers;
         this.name = name;
         this.signature = signature;
-               this.declaredSignature = signature;
         if (kind == FIELD) {
             this.returnType = UnresolvedType.forSignature(signature);
             this.parameterTypes = UnresolvedType.NONE;
@@ -83,10 +81,8 @@ public class MemberImpl implements Comparable, AnnotatedElement,Member {
         this.parameterTypes = parameterTypes;
         if (kind == FIELD) {
             this.signature         = returnType.getErasureSignature();
-                       this.declaredSignature = returnType.getSignature();
         } else {
             this.signature         = typesToSignature(returnType, parameterTypes,true);
-                       this.declaredSignature = typesToSignature(returnType,parameterTypes,false);
         }
     }
     
@@ -476,13 +472,6 @@ public class MemberImpl implements Comparable, AnnotatedElement,Member {
         */
     public String getSignature() { return signature; }
        
-       /* (non-Javadoc)
-        * @see org.aspectj.weaver.Member#getDeclaredSignature()
-        */
-       public String getDeclaredSignature() { return declaredSignature;}
-    /* (non-Javadoc)
-        * @see org.aspectj.weaver.Member#getArity()
-        */
     public int getArity() { return parameterTypes.length; }
   
     /* (non-Javadoc)