spring cleaning in advance of 1.2 enhancements:

removed unused imports, local variables, and private methods
(still there, just commented out).

6 files changed, 7 insertions, 7 deletions

diff --git a/weaver/src/org/aspectj/weaver/AjcMemberMaker.java b/weaver/src/org/aspectj/weaver/AjcMemberMaker.java
index 52d6d6144..f19776f05 100644
--- a/weaver/src/org/aspectj/weaver/AjcMemberMaker.java
+++ b/weaver/src/org/aspectj/weaver/AjcMemberMaker.java
@@ -15,7 +15,7 @@ package org.aspectj.weaver;
 
 import java.lang.reflect.Modifier;
 
-import org.aspectj.weaver.ResolvedTypeX.Name;
+//import org.aspectj.weaver.ResolvedTypeX.Name;
 
 
 public class AjcMemberMaker {
diff --git a/weaver/src/org/aspectj/weaver/ConcreteTypeMunger.java b/weaver/src/org/aspectj/weaver/ConcreteTypeMunger.java
index d268f2fba..0ce029a55 100644
--- a/weaver/src/org/aspectj/weaver/ConcreteTypeMunger.java
+++ b/weaver/src/org/aspectj/weaver/ConcreteTypeMunger.java
@@ -73,7 +73,7 @@ public abstract class ConcreteTypeMunger implements PartialOrder.PartialComparab
 	}
 
 	public int fallbackCompareTo(Object other) {
-		ConcreteTypeMunger o = (ConcreteTypeMunger) other;
+//		ConcreteTypeMunger o = (ConcreteTypeMunger) other;
 		return 0;
 	}
 
diff --git a/weaver/src/org/aspectj/weaver/bcel/BcelShadow.java b/weaver/src/org/aspectj/weaver/bcel/BcelShadow.java
index 0ffdfc6be..081d9f634 100644
--- a/weaver/src/org/aspectj/weaver/bcel/BcelShadow.java
+++ b/weaver/src/org/aspectj/weaver/bcel/BcelShadow.java
@@ -1539,7 +1539,7 @@ public class BcelShadow extends Shadow {
         InstructionList closureInstantiation =
             makeClosureInstantiation(constructorSig, closureHolder);
 
-        LazyMethodGen constructor = 
+        /*LazyMethodGen constructor = */ 
             makeClosureClassAndReturnConstructor(
             	closureClassName,
                 callbackMethod, 
diff --git a/weaver/src/org/aspectj/weaver/bcel/BcelTypeMunger.java b/weaver/src/org/aspectj/weaver/bcel/BcelTypeMunger.java
index 36ad5acb1..c3fdb2f6a 100644
--- a/weaver/src/org/aspectj/weaver/bcel/BcelTypeMunger.java
+++ b/weaver/src/org/aspectj/weaver/bcel/BcelTypeMunger.java
@@ -571,7 +571,7 @@ public class BcelTypeMunger extends ConcreteTypeMunger {
 	}	
 	
 	private boolean mungeNewField(BcelClassWeaver weaver, NewFieldTypeMunger munger) {
-		ResolvedMember initMethod = munger.getInitMethod(aspectType);
+		/*ResolvedMember initMethod = */munger.getInitMethod(aspectType);
 		
 		LazyClassGen gen = weaver.getLazyClassGen();
 		ResolvedMember field = munger.getSignature();
diff --git a/weaver/src/org/aspectj/weaver/bcel/BcelWeaver.java b/weaver/src/org/aspectj/weaver/bcel/BcelWeaver.java
index 0d8dff563..3d7611d73 100644
--- a/weaver/src/org/aspectj/weaver/bcel/BcelWeaver.java
+++ b/weaver/src/org/aspectj/weaver/bcel/BcelWeaver.java
@@ -468,7 +468,7 @@ public class BcelWeaver implements IWeaver {
 			return null;
 		}
 		
-		JavaClass javaClass = classType.getJavaClass();
+//		JavaClass javaClass = classType.getJavaClass();
 		List shadowMungers = fastMatch(shadowMungerList, classType.getResolvedTypeX());
 		List typeMungers = classType.getResolvedTypeX().getInterTypeMungers();
         
diff --git a/weaver/src/org/aspectj/weaver/bcel/LazyClassGen.java b/weaver/src/org/aspectj/weaver/bcel/LazyClassGen.java
index 7c409238b..6a37aee39 100644
--- a/weaver/src/org/aspectj/weaver/bcel/LazyClassGen.java
+++ b/weaver/src/org/aspectj/weaver/bcel/LazyClassGen.java
@@ -529,8 +529,8 @@ public final class LazyClassGen {
     	new ObjectType("org.aspectj.lang.JoinPoint$StaticPart");
     private static final ObjectType sigType = 
     	new ObjectType("org.aspectj.lang.Signature");
-    private static final ObjectType slType = 
-    	new ObjectType("org.aspectj.lang.reflect.SourceLocation");
+//    private static final ObjectType slType = 
+//    	new ObjectType("org.aspectj.lang.reflect.SourceLocation");
     private static final ObjectType factoryType = 
     	new ObjectType("org.aspectj.runtime.reflect.Factory");
     private static final ObjectType classType =