pruned some dead code

2 files changed, 10 insertions, 17 deletions

diff --git a/weaver/src/org/aspectj/weaver/bcel/BcelClassWeaver.java b/weaver/src/org/aspectj/weaver/bcel/BcelClassWeaver.java
index 39b57ad7c..53f8e38be 100644
--- a/weaver/src/org/aspectj/weaver/bcel/BcelClassWeaver.java
+++ b/weaver/src/org/aspectj/weaver/bcel/BcelClassWeaver.java
@@ -52,7 +52,6 @@ import org.aspectj.apache.bcel.generic.Type;
 import org.aspectj.bridge.IMessage;
 import org.aspectj.bridge.ISourceLocation;
 import org.aspectj.bridge.WeaveMessage;
-import org.aspectj.util.FuzzyBoolean;
 import org.aspectj.util.PartialOrder;
 import org.aspectj.weaver.AjAttribute;
 import org.aspectj.weaver.AjcMemberMaker;
@@ -75,9 +74,7 @@ import org.aspectj.weaver.UnresolvedType;
 import org.aspectj.weaver.WeaverMessages;
 import org.aspectj.weaver.WeaverMetrics;
 import org.aspectj.weaver.WeaverStateInfo;
-import org.aspectj.weaver.Shadow.Kind;
 import org.aspectj.weaver.patterns.DeclareAnnotation;
-import org.aspectj.weaver.patterns.FastMatchInfo;
 
 class BcelClassWeaver implements IClassWeaver {
     
@@ -166,7 +163,6 @@ class BcelClassWeaver implements IClassWeaver {
     	
     	perKindShadowMungers = new List[Shadow.MAX_SHADOW_KIND + 1];
     	for (int i = 0; i < perKindShadowMungers.length; i++) {
-			ArrayList mungers = new ArrayList(0);
 			perKindShadowMungers[i] = new ArrayList(0);
     	}
     	for (Iterator iter = shadowMungers.iterator(); iter.hasNext();) {
@@ -197,15 +193,15 @@ class BcelClassWeaver implements IClassWeaver {
     	return perKindShadowMungers[kind.getKey()] != null;
     }
     
-   	private void fastMatchShadowMungers(List shadowMungers, ArrayList mungers, Kind kind) {
-		FastMatchInfo info = new FastMatchInfo(clazz.getType(), kind);
-		for (Iterator i = shadowMungers.iterator(); i.hasNext();) {
-			ShadowMunger munger = (ShadowMunger) i.next();
-			FuzzyBoolean fb = munger.getPointcut().fastMatch(info);
-			WeaverMetrics.recordFastMatchResult(fb);// Could pass: munger.getPointcut().toString()
-			if (fb.maybeTrue()) mungers.add(munger);
-		}
-	}
+//   	private void fastMatchShadowMungers(List shadowMungers, ArrayList mungers, Kind kind) {
+//		FastMatchInfo info = new FastMatchInfo(clazz.getType(), kind);
+//		for (Iterator i = shadowMungers.iterator(); i.hasNext();) {
+//			ShadowMunger munger = (ShadowMunger) i.next();
+//			FuzzyBoolean fb = munger.getPointcut().fastMatch(info);
+//			WeaverMetrics.recordFastMatchResult(fb);// Could pass: munger.getPointcut().toString()
+//			if (fb.maybeTrue()) mungers.add(munger);
+//		}
+//	}
 
 
 	private void initializeSuperInitializerMap(ResolvedType child) {
@@ -1563,7 +1559,7 @@ class BcelClassWeaver implements IClassWeaver {
 			// sets of synthetics aren't join points in 1.1
 			return;
 		} else {
-			match(BcelShadow.makeFieldGet(world, mg, ih, enclosingShadow), shadowAccumulator);
+			match(BcelShadow.makeFieldGet(world, resolvedField, mg, ih, enclosingShadow), shadowAccumulator);
 		}
 	}
 	
diff --git a/weaver/src/org/aspectj/weaver/bcel/BcelObjectType.java b/weaver/src/org/aspectj/weaver/bcel/BcelObjectType.java
index 75dbd13e3..57ff77e70 100644
--- a/weaver/src/org/aspectj/weaver/bcel/BcelObjectType.java
+++ b/weaver/src/org/aspectj/weaver/bcel/BcelObjectType.java
@@ -26,7 +26,6 @@ import org.aspectj.apache.bcel.classfile.Field;
 import org.aspectj.apache.bcel.classfile.JavaClass;
 import org.aspectj.apache.bcel.classfile.Method;
 import org.aspectj.apache.bcel.classfile.Signature;
-import org.aspectj.apache.bcel.classfile.Signature.ClassTypeSignature;
 import org.aspectj.apache.bcel.classfile.annotation.Annotation;
 import org.aspectj.apache.bcel.classfile.annotation.ElementNameValuePair;
 import org.aspectj.apache.bcel.classfile.annotation.ElementValue;
@@ -43,8 +42,6 @@ import org.aspectj.weaver.ResolvedType;
 import org.aspectj.weaver.TypeVariable;
 import org.aspectj.weaver.UnresolvedType;
 import org.aspectj.weaver.WeaverStateInfo;
-import org.aspectj.weaver.AjcMemberMaker;
-import org.aspectj.weaver.World;
 import org.aspectj.weaver.patterns.PerClause;