@@ -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)) { |
@@ -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<ConcreteTypeMunger> 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(); | |||
} |
@@ -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; | |||
} |
@@ -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"); | |||
} |