added toGenericString

diff --git a/weaver/src/org/aspectj/weaver/JoinPointSignature.java b/weaver/src/org/aspectj/weaver/JoinPointSignature.java
index 9fefcdf239ac4ac825f4db68a65ca9593693e7f0..ecfde649ea076ec4974f4b9ebdb8237050c48756 100644 (file)
--- a/weaver/src/org/aspectj/weaver/JoinPointSignature.java
+++ b/weaver/src/org/aspectj/weaver/JoinPointSignature.java
@@ -351,6 +351,10 @@ public class JoinPointSignature implements ResolvedMember {
        }
        return buf.toString();
     }
+   
+   public String toGenericString() {
+          return realMember.toGenericString();
+   }
 
    public void resetName(String newName) {
           realMember.resetName(newName);

diff --git a/weaver/src/org/aspectj/weaver/MemberImpl.java b/weaver/src/org/aspectj/weaver/MemberImpl.java
index 96a4478b2d67ca61cde0b67ae46447e512420856..c1eae3b629ff26a61263c10e23ef331000e828f8 100644 (file)
--- a/weaver/src/org/aspectj/weaver/MemberImpl.java
+++ b/weaver/src/org/aspectj/weaver/MemberImpl.java
@@ -424,6 +424,7 @@ public class MemberImpl implements Comparable, AnnotatedElement,Member {
        return buf.toString();
     }
     
+    
     /* (non-Javadoc)
         * @see org.aspectj.weaver.Member#toLongString()
         */

diff --git a/weaver/src/org/aspectj/weaver/ResolvedMember.java b/weaver/src/org/aspectj/weaver/ResolvedMember.java
index 17b1e293093d959344c51f1a2415d843083608da..fd6e5b020566aaba53de04d32ab59c1d3d48c871 100644 (file)
--- a/weaver/src/org/aspectj/weaver/ResolvedMember.java
+++ b/weaver/src/org/aspectj/weaver/ResolvedMember.java
@@ -91,6 +91,9 @@ public interface ResolvedMember extends Member, AnnotatedElement, TypeVariableDe
        public void setAnnotatedElsewhere(boolean b);
 
        public boolean isAnnotatedElsewhere();
+       
+       // like toString but include generic signature info
+       public String toGenericString();
 
        /**
         * Get the UnresolvedType for the return type, taking generic signature into account

diff --git a/weaver/src/org/aspectj/weaver/ResolvedMemberImpl.java b/weaver/src/org/aspectj/weaver/ResolvedMemberImpl.java
index 91cee14a63245c579fbea29600fce61ba12e29f1..52107663811c16775affb10ad6fd493f9c3e90a8 100644 (file)
--- a/weaver/src/org/aspectj/weaver/ResolvedMemberImpl.java
+++ b/weaver/src/org/aspectj/weaver/ResolvedMemberImpl.java
@@ -701,5 +701,27 @@ public class ResolvedMemberImpl extends MemberImpl implements IHasPosition, Anno
                        toBuffer.append(aType.getSignature());
                }
        }
+       
+   public String toGenericString() {
+       StringBuffer buf = new StringBuffer();
+       buf.append(getGenericReturnType().getSimpleName());
+       buf.append(' ');
+               buf.append(declaringType.getName());
+        buf.append('.');
+               buf.append(name);
+       if (kind != FIELD) {
+               buf.append("(");
+               UnresolvedType[] params = getGenericParameterTypes();
+            if (params.length != 0) {
+                buf.append(params[0].getSimpleName());
+                       for (int i=1, len = params.length; i < len; i++) {
+                    buf.append(", ");
+                           buf.append(params[i].getSimpleName());
+                       }
+            }
+               buf.append(")");
+       }
+       return buf.toString();          
+    }
 }