generics and ITD inner class updates

diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/AjAttribute.java b/org.aspectj.matcher/src/org/aspectj/weaver/AjAttribute.java
index ab1aca1349074065254ca01736a566e3ef4fff06..a727825b0f0f48faf91fd103df5cbcd05df05aa4 100644 (file)
--- a/org.aspectj.matcher/src/org/aspectj/weaver/AjAttribute.java
+++ b/org.aspectj.matcher/src/org/aspectj/weaver/AjAttribute.java
@@ -94,6 +94,7 @@ public abstract class AjAttribute {
                        if (bytes == null) {
                                bytes = new byte[0];
                        }
+
                        VersionedDataInputStream s = new VersionedDataInputStream(new ByteArrayInputStream(bytes), dataDecompressor);
                        s.setVersion(v);
                        if (name.equals(Aspect.AttributeName)) {

diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/CustomMungerFactory.java b/org.aspectj.matcher/src/org/aspectj/weaver/CustomMungerFactory.java
index dcae584aab0580c2672891d973e766b3deffe832..91bcbdf6bd9248742f90677eedf69ecb9154b568 100644 (file)
--- a/org.aspectj.matcher/src/org/aspectj/weaver/CustomMungerFactory.java
+++ b/org.aspectj.matcher/src/org/aspectj/weaver/CustomMungerFactory.java
@@ -38,15 +38,15 @@ public interface CustomMungerFactory {
         * @param aspectType
         * @return a Collection<ShadowMunger> of custom shadow mungers for the given aspect
         */
-       public Collection/* ShadowMunger */createCustomShadowMungers(ResolvedType aspectType);
+       public Collection<ShadowMunger> createCustomShadowMungers(ResolvedType aspectType);
 
        /**
         * @param aspectType
         * @return a Collection&lt;ConcreteTypeMunger&gt; of custom type mungers for the given aspect
         */
-       public Collection/* ConcreteTypeMunger */createCustomTypeMungers(ResolvedType aspectType);
+       public Collection<ConcreteTypeMunger> createCustomTypeMungers(ResolvedType aspectType);
 
-       public Collection/* ShadowMunger */getAllCreatedCustomShadowMungers();
+       public Collection<ShadowMunger> getAllCreatedCustomShadowMungers();
 
-       public Collection/* ConcreteTypeMunger */getAllCreatedCustomTypeMungers();
+       public Collection<ConcreteTypeMunger> getAllCreatedCustomTypeMungers();
 }

diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/NewMemberClassTypeMunger.java b/org.aspectj.matcher/src/org/aspectj/weaver/NewMemberClassTypeMunger.java
index 732fced23ba91f828b074f19f29aba592099a8fd..e7576e96af524391f8dc4bcca4b0f14bbb758fb5 100644 (file)
--- a/org.aspectj.matcher/src/org/aspectj/weaver/NewMemberClassTypeMunger.java
+++ b/org.aspectj.matcher/src/org/aspectj/weaver/NewMemberClassTypeMunger.java
@@ -42,10 +42,10 @@ public class NewMemberClassTypeMunger extends ResolvedTypeMunger {
                writeOutTypeAliases(stream);
        }
 
-       public static ResolvedTypeMunger read(VersionedDataInputStream stream, ISourceContext context) throws IOException {
+       public static ResolvedTypeMunger readInnerClass(VersionedDataInputStream stream, ISourceContext context) throws IOException {
                /* int version = */stream.readInt();
-               String memberTypeName = stream.readUTF();
                UnresolvedType targetType = UnresolvedType.read(stream);
+               String memberTypeName = stream.readUTF();
                ISourceLocation sourceLocation = readSourceLocation(stream);
                List<String> typeVarAliases = readInTypeAliases(stream);
 
@@ -55,6 +55,10 @@ public class NewMemberClassTypeMunger extends ResolvedTypeMunger {
                return newInstance;
        }
 
+       public UnresolvedType getTargetType() {
+               return targetType;
+       }
+
        public UnresolvedType getDeclaringType() {
                return targetType;
        }

diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/ResolvedTypeMunger.java b/org.aspectj.matcher/src/org/aspectj/weaver/ResolvedTypeMunger.java
index 94503d5ea5a51a22ef69f9a76989ed5c3107e134..e08fe2f2eec6ca06e912958ff71451b0dbe3e366 100644 (file)
--- a/org.aspectj.matcher/src/org/aspectj/weaver/ResolvedTypeMunger.java
+++ b/org.aspectj.matcher/src/org/aspectj/weaver/ResolvedTypeMunger.java
@@ -161,7 +161,7 @@ public abstract class ResolvedTypeMunger {
                } else if (kind == MethodDelegate2) {
                        return MethodDelegateTypeMunger.readMethod(s, context, true);
                } else if (kind == InnerClass) {
-                       return NewMemberClassTypeMunger.read(s, context);
+                       return NewMemberClassTypeMunger.readInnerClass(s, context);
                } else {
                        throw new RuntimeException("unimplemented");
                }