spring cleaning in advance of 1.2 enhancements:

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

8 files changed, 12 insertions, 12 deletions

diff --git a/asm/src/org/aspectj/asm/AsmManager.java b/asm/src/org/aspectj/asm/AsmManager.java
index 089d50684..e31f13f62 100644
--- a/asm/src/org/aspectj/asm/AsmManager.java
+++ b/asm/src/org/aspectj/asm/AsmManager.java
@@ -35,7 +35,7 @@ public class AsmManager {
 
     protected AsmManager() {
     	hierarchy = new AspectJElementHierarchy();
-    	List relationships = new ArrayList();
+//    	List relationships = new ArrayList();
 		mapper = new RelationshipMap(hierarchy);
     }
 
diff --git a/asm/src/org/aspectj/asm/HierarchyWalker.java b/asm/src/org/aspectj/asm/HierarchyWalker.java
index 2e2c08df3..775c3b57e 100644
--- a/asm/src/org/aspectj/asm/HierarchyWalker.java
+++ b/asm/src/org/aspectj/asm/HierarchyWalker.java
@@ -13,8 +13,8 @@
 
 package org.aspectj.asm;
 
-import org.aspectj.asm.internal.*;
-import org.aspectj.asm.internal.*;
+//import org.aspectj.asm.internal.*;
+//import org.aspectj.asm.internal.*;
 
 /**
  * @author Mik Kersten
diff --git a/asm/src/org/aspectj/asm/IHierarchyListener.java b/asm/src/org/aspectj/asm/IHierarchyListener.java
index 96381934f..7741a64ca 100644
--- a/asm/src/org/aspectj/asm/IHierarchyListener.java
+++ b/asm/src/org/aspectj/asm/IHierarchyListener.java
@@ -15,7 +15,7 @@ package org.aspectj.asm;
 
 import java.util.EventListener;
 
-import org.aspectj.asm.internal.*;
+//import org.aspectj.asm.internal.*;
 
 /**
  * Compiler listeners get notified of structure model update events.
diff --git a/asm/src/org/aspectj/asm/IRelationshipMap.java b/asm/src/org/aspectj/asm/IRelationshipMap.java
index f487ce661..7fbd97c0c 100644
--- a/asm/src/org/aspectj/asm/IRelationshipMap.java
+++ b/asm/src/org/aspectj/asm/IRelationshipMap.java
@@ -15,7 +15,7 @@ package org.aspectj.asm;
 import java.io.Serializable;
 import java.util.List;
 
-import org.aspectj.asm.IRelationship.Kind;
+//import org.aspectj.asm.IRelationship.Kind;
 
 /**
  * Maps from a program element handles to a list of relationships between that element
diff --git a/asm/src/org/aspectj/asm/internal/AspectJElementHierarchy.java b/asm/src/org/aspectj/asm/internal/AspectJElementHierarchy.java
index f0cbd333a..13712361c 100644
--- a/asm/src/org/aspectj/asm/internal/AspectJElementHierarchy.java
+++ b/asm/src/org/aspectj/asm/internal/AspectJElementHierarchy.java
@@ -296,7 +296,7 @@ public class AspectJElementHierarchy implements IHierarchy {
 		StringTokenizer st = new StringTokenizer(handle, ProgramElement.ID_DELIM);
 		String file = st.nextToken();
 		int line = new Integer(st.nextToken()).intValue();
-		int col = new Integer(st.nextToken()).intValue();
+//		int col = new Integer(st.nextToken()).intValue();
 		// TODO: use column number when available
 		ret = findElementForSourceLine(file, line);
 		if (ret != null) { 
diff --git a/asm/src/org/aspectj/asm/internal/ProgramElement.java b/asm/src/org/aspectj/asm/internal/ProgramElement.java
index 9d5217125..559abd353 100644
--- a/asm/src/org/aspectj/asm/internal/ProgramElement.java
+++ b/asm/src/org/aspectj/asm/internal/ProgramElement.java
@@ -48,7 +48,7 @@ public class ProgramElement implements IProgramElement {
     
 	private String bytecodeName;
 	private String bytecodeSignature;
-	private String fullSignature;
+//	private String fullSignature;
 	private String returnType;
 	
 	private List parameterNames = null;
@@ -248,9 +248,9 @@ public class ProgramElement implements IProgramElement {
 	private static int AccVolatile = 0x0040;
 	private static int AccTransient = 0x0080;
 	private static int AccNative = 0x0100;
-	private static int AccInterface = 0x0200;
+//	private static int AccInterface = 0x0200;
 	private static int AccAbstract = 0x0400;
-	private static int AccStrictfp = 0x0800;
+//	private static int AccStrictfp = 0x0800;
 	
 	
 	public String getBytecodeName() {
diff --git a/asm/src/org/aspectj/asm/internal/Relationship.java b/asm/src/org/aspectj/asm/internal/Relationship.java
index cb9b97b60..68ee50e3f 100644
--- a/asm/src/org/aspectj/asm/internal/Relationship.java
+++ b/asm/src/org/aspectj/asm/internal/Relationship.java
@@ -15,9 +15,9 @@ package org.aspectj.asm.internal;
 
 import java.util.List;
 
-import org.aspectj.asm.*;
+//import org.aspectj.asm.*;
 import org.aspectj.asm.IRelationship;
-import org.aspectj.asm.IRelationship.Kind;
+//import org.aspectj.asm.IRelationship.Kind;
 
 
 /**
diff --git a/asm/src/org/aspectj/asm/internal/RelationshipMap.java b/asm/src/org/aspectj/asm/internal/RelationshipMap.java
index 86f9606f1..ce05fd5c6 100644
--- a/asm/src/org/aspectj/asm/internal/RelationshipMap.java
+++ b/asm/src/org/aspectj/asm/internal/RelationshipMap.java
@@ -82,7 +82,7 @@ public class RelationshipMap extends HashMap implements IRelationshipMap {
 	}
 
 	public void removeAll(String source) {
-		List list = (List)super.remove(source);	
+		super.remove(source);	
 	}
 	
 	public void put(String source, IRelationship relationship) {