summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--weaver/src/org/aspectj/weaver/NewFieldTypeMunger.java7
-rw-r--r--weaver/src/org/aspectj/weaver/NewMethodTypeMunger.java7
-rw-r--r--weaver/src/org/aspectj/weaver/ResolvedTypeMunger.java8
3 files changed, 4 insertions, 18 deletions
diff --git a/weaver/src/org/aspectj/weaver/NewFieldTypeMunger.java b/weaver/src/org/aspectj/weaver/NewFieldTypeMunger.java
index 4dd103115..3d8ba73e9 100644
--- a/weaver/src/org/aspectj/weaver/NewFieldTypeMunger.java
+++ b/weaver/src/org/aspectj/weaver/NewFieldTypeMunger.java
@@ -15,16 +15,14 @@ package org.aspectj.weaver;
import java.io.DataOutputStream;
import java.io.IOException;
-import java.util.List;
import java.util.Set;
public class NewFieldTypeMunger extends ResolvedTypeMunger {
- public NewFieldTypeMunger(ResolvedMember signature, Set superMethodsCalled, List phantomTypeVariableToRealIndex) {
+ public NewFieldTypeMunger(ResolvedMember signature, Set superMethodsCalled) {
super(Field, signature);
signature.setAnnotatedElsewhere(true);
this.setSuperMethodsCalled(superMethodsCalled);
- this.typeVariableToGenericTypeVariableIndex = phantomTypeVariableToRealIndex;
}
public ResolvedMember getInitMethod(UnresolvedType aspectType) {
@@ -40,8 +38,7 @@ public class NewFieldTypeMunger extends ResolvedTypeMunger {
public static ResolvedTypeMunger readField(VersionedDataInputStream s, ISourceContext context) throws IOException {
ResolvedTypeMunger munger = new NewFieldTypeMunger(
- ResolvedMemberImpl.readResolvedMember(s, context),
- readSuperMethodsCalled(s),null);
+ ResolvedMemberImpl.readResolvedMember(s, context),readSuperMethodsCalled(s));
if (ResolvedTypeMunger.persistSourceLocation) munger.setSourceLocation(readSourceLocation(s));
return munger;
}
diff --git a/weaver/src/org/aspectj/weaver/NewMethodTypeMunger.java b/weaver/src/org/aspectj/weaver/NewMethodTypeMunger.java
index 961cec9c1..98dd96be1 100644
--- a/weaver/src/org/aspectj/weaver/NewMethodTypeMunger.java
+++ b/weaver/src/org/aspectj/weaver/NewMethodTypeMunger.java
@@ -20,11 +20,9 @@ import java.util.Set;
public class NewMethodTypeMunger extends ResolvedTypeMunger {
public NewMethodTypeMunger(
ResolvedMember signature,
- Set superMethodsCalled)
- {
+ Set superMethodsCalled) {
super(Method, signature);
this.setSuperMethodsCalled(superMethodsCalled);
-
}
public ResolvedMember getInterMethodBody(UnresolvedType aspectType) {
@@ -44,8 +42,7 @@ public class NewMethodTypeMunger extends ResolvedTypeMunger {
public static ResolvedTypeMunger readMethod(VersionedDataInputStream s, ISourceContext context) throws IOException {
ResolvedTypeMunger munger = new NewMethodTypeMunger(
- ResolvedMemberImpl.readResolvedMember(s, context),
- readSuperMethodsCalled(s));
+ ResolvedMemberImpl.readResolvedMember(s, context),readSuperMethodsCalled(s));
if (ResolvedTypeMunger.persistSourceLocation) munger.setSourceLocation(readSourceLocation(s));
return munger;
}
diff --git a/weaver/src/org/aspectj/weaver/ResolvedTypeMunger.java b/weaver/src/org/aspectj/weaver/ResolvedTypeMunger.java
index d548d1bc0..f921ad69a 100644
--- a/weaver/src/org/aspectj/weaver/ResolvedTypeMunger.java
+++ b/weaver/src/org/aspectj/weaver/ResolvedTypeMunger.java
@@ -283,12 +283,4 @@ public abstract class ResolvedTypeMunger {
}
}
- public int getGenericTypeVariableIndexFor(String name) {
- return typeVariableToGenericTypeVariableIndex.indexOf(name);
- }
-
- public boolean hasGenericTypeVariableMap() {
- return typeVariableToGenericTypeVariableIndex!=null && typeVariableToGenericTypeVariableIndex.size()!=0;
- }
-
}