spring cleaning in advance of 1.2 enhancements:

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

diff --git a/asm/src/org/aspectj/asm/AsmManager.java b/asm/src/org/aspectj/asm/AsmManager.java
index 089d506849a47d722a086ec62cbac7149296620f..e31f13f62cf020d6fc4b1826dab81840c463ea4c 100644 (file)
--- 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 2e2c08df36887cf57feb47a4200fbecd6b6a058c..775c3b57e60c7f887ef05008416d44f82e1f833f 100644 (file)
--- 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 96381934fd627b32af24447f01c88e6c5165a1c9..7741a64caaa47008db52c5bc194c146589daf1e8 100644 (file)
--- 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 f487ce661e58ad358c6f348452ecbb2438ff8a74..7fbd97c0ce9d5e0e97259659245281788000954a 100644 (file)
--- 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 f0cbd333a5ea217437c29deb24b2784200c7a5dc..13712361c0a395f2a4c27e6f2d7e150f62537d9b 100644 (file)
--- 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 9d52171258e6171d6f459cad212a4cd27fd52573..559abd35358bf6dc04d58e1c82c7c7e85b23913a 100644 (file)
--- 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 cb9b97b60f47c5d4d82279df29c9697f4f1c6847..68ee50e3f70246b0daf55da3456f26afd5b40612 100644 (file)
--- 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 86f9606f1e8a4fcd1699bb78f74f4e498fd4f144..ce05fd5c68296cd19c72497f24a59c4b9447783f 100644 (file)
--- 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) {

diff --git a/bridge/src/org/aspectj/bridge/Message.java b/bridge/src/org/aspectj/bridge/Message.java
index 69ceb02220cae0752e4d90b64fe87df51f372621..bcc38d23c822c3a19984293149acb270b9cbcbf1 100644 (file)
--- a/bridge/src/org/aspectj/bridge/Message.java
+++ b/bridge/src/org/aspectj/bridge/Message.java
@@ -14,13 +14,8 @@
 
 package org.aspectj.bridge;
 
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.lang.reflect.InvocationTargetException;
 import java.util.Arrays;
 import java.util.Collections;
-import java.util.Iterator;
 import java.util.List;