296533: generics info in generated accessor names

diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/ReferenceType.java b/org.aspectj.matcher/src/org/aspectj/weaver/ReferenceType.java
index 3fe97a4b68dd9b99e319cec94bb85287cf41f454..4ee0d68a046e6d6959ff335955c75a542d5e2b05 100644 (file)
--- a/org.aspectj.matcher/src/org/aspectj/weaver/ReferenceType.java
+++ b/org.aspectj.matcher/src/org/aspectj/weaver/ReferenceType.java
@@ -208,6 +208,11 @@ public class ReferenceType extends ResolvedType {
                }
        }
 
+       @Override
+       public String getNameAsIdentifier() {
+               return getRawName().replace('.', '_');
+       }
+
        @Override
        public AnnotationAJ getAnnotationOfType(UnresolvedType ofType) {
                AnnotationAJ[] axs = delegate.getAnnotations();
@@ -635,7 +640,7 @@ public class ReferenceType extends ResolvedType {
                } else if (isRawType()) {
                        UnresolvedType[] paramTypes = getTypesForMemberParameterization();
                        interfaces = new ResolvedType[delegateInterfaces.length];
-                       for (int i = 0,max=interfaces.length; i < max; i++) {
+                       for (int i = 0, max = interfaces.length; i < max; i++) {
                                interfaces[i] = delegateInterfaces[i];
                                if (interfaces[i].isGenericType()) {
                                        // a generic supertype of a raw type is replaced by its raw