resolving unused-imports warnings

14 files changed, 13 insertions, 37 deletions

diff --git a/runtime/src/org/aspectj/lang/reflect/FieldSignature.java b/runtime/src/org/aspectj/lang/reflect/FieldSignature.java
index 0983509c5..d2973543a 100644
--- a/runtime/src/org/aspectj/lang/reflect/FieldSignature.java
+++ b/runtime/src/org/aspectj/lang/reflect/FieldSignature.java
@@ -14,8 +14,6 @@
 
 package org.aspectj.lang.reflect;
 
-import org.aspectj.lang.Signature;
-
 public interface FieldSignature extends MemberSignature {
     public Class getFieldType();
 }
diff --git a/runtime/src/org/aspectj/runtime/internal/CFlowStack.java b/runtime/src/org/aspectj/runtime/internal/CFlowStack.java
index d3b18c710..d6a4541a4 100644
--- a/runtime/src/org/aspectj/runtime/internal/CFlowStack.java
+++ b/runtime/src/org/aspectj/runtime/internal/CFlowStack.java
@@ -19,7 +19,6 @@ import org.aspectj.runtime.CFlow;
 
 import java.util.Stack;
 import java.util.Hashtable;
-import java.util.Vector;
 import java.util.Enumeration;
 
 public class CFlowStack {
diff --git a/runtime/src/org/aspectj/runtime/internal/PerObjectMap.java b/runtime/src/org/aspectj/runtime/internal/PerObjectMap.java
index 5a4b5b765..4b6caaf9b 100644
--- a/runtime/src/org/aspectj/runtime/internal/PerObjectMap.java
+++ b/runtime/src/org/aspectj/runtime/internal/PerObjectMap.java
@@ -14,11 +14,7 @@
 
 package org.aspectj.runtime.internal;
 
-import org.aspectj.runtime.CFlow;
-
-
-// REQUIRES JAVA 2!!!!!!!!!!!!!!!!
-import java.util.WeakHashMap;
+import java.util.WeakHashMap;  // XXX REQUIRES JAVA 2!!!!!!!!!!!!!!!!
 
 public class PerObjectMap {
     private WeakHashMap map = new WeakHashMap();
diff --git a/runtime/src/org/aspectj/runtime/reflect/AdviceSignatureImpl.java b/runtime/src/org/aspectj/runtime/reflect/AdviceSignatureImpl.java
index 7ea1ceff1..647fb6528 100644
--- a/runtime/src/org/aspectj/runtime/reflect/AdviceSignatureImpl.java
+++ b/runtime/src/org/aspectj/runtime/reflect/AdviceSignatureImpl.java
@@ -14,10 +14,7 @@
 
 package org.aspectj.runtime.reflect;
 
-import org.aspectj.lang.*;
-import org.aspectj.lang.reflect.*;
-
-import java.lang.reflect.Modifier;
+import org.aspectj.lang.reflect.AdviceSignature;
 
 class AdviceSignatureImpl extends CodeSignatureImpl implements AdviceSignature {
     Class returnType;
diff --git a/runtime/src/org/aspectj/runtime/reflect/CatchClauseSignatureImpl.java b/runtime/src/org/aspectj/runtime/reflect/CatchClauseSignatureImpl.java
index 638b7fea9..a0ca7dbdb 100644
--- a/runtime/src/org/aspectj/runtime/reflect/CatchClauseSignatureImpl.java
+++ b/runtime/src/org/aspectj/runtime/reflect/CatchClauseSignatureImpl.java
@@ -14,8 +14,7 @@
 
 package org.aspectj.runtime.reflect;
 
-import org.aspectj.lang.*;
-import org.aspectj.lang.reflect.*;
+import org.aspectj.lang.reflect.CatchClauseSignature;
 
 class CatchClauseSignatureImpl extends SignatureImpl implements CatchClauseSignature {
     Class parameterType;
diff --git a/runtime/src/org/aspectj/runtime/reflect/CodeSignatureImpl.java b/runtime/src/org/aspectj/runtime/reflect/CodeSignatureImpl.java
index 1045152d4..ac97bb83a 100644
--- a/runtime/src/org/aspectj/runtime/reflect/CodeSignatureImpl.java
+++ b/runtime/src/org/aspectj/runtime/reflect/CodeSignatureImpl.java
@@ -14,8 +14,7 @@
 
 package org.aspectj.runtime.reflect;
 
-import org.aspectj.lang.*;
-import org.aspectj.lang.reflect.*;
+import org.aspectj.lang.reflect.CodeSignature;
 
 abstract class CodeSignatureImpl extends MemberSignatureImpl implements CodeSignature {
     Class[] parameterTypes;
diff --git a/runtime/src/org/aspectj/runtime/reflect/ConstructorSignatureImpl.java b/runtime/src/org/aspectj/runtime/reflect/ConstructorSignatureImpl.java
index 49b0827f9..a81d25831 100644
--- a/runtime/src/org/aspectj/runtime/reflect/ConstructorSignatureImpl.java
+++ b/runtime/src/org/aspectj/runtime/reflect/ConstructorSignatureImpl.java
@@ -14,8 +14,7 @@
 
 package org.aspectj.runtime.reflect;
 
-import org.aspectj.lang.reflect.*;
-import org.aspectj.lang.*;
+import org.aspectj.lang.reflect.ConstructorSignature;
 
 class ConstructorSignatureImpl extends CodeSignatureImpl implements ConstructorSignature {
     ConstructorSignatureImpl(int modifiers, Class declaringType, 
diff --git a/runtime/src/org/aspectj/runtime/reflect/FieldSignatureImpl.java b/runtime/src/org/aspectj/runtime/reflect/FieldSignatureImpl.java
index 5ab058edd..4fbc7d2c8 100644
--- a/runtime/src/org/aspectj/runtime/reflect/FieldSignatureImpl.java
+++ b/runtime/src/org/aspectj/runtime/reflect/FieldSignatureImpl.java
@@ -14,10 +14,7 @@
 
 package org.aspectj.runtime.reflect;
  
-import org.aspectj.lang.reflect.*;
-import org.aspectj.lang.*;
-
-import java.lang.reflect.Modifier;
+import org.aspectj.lang.reflect.FieldSignature;
 
 public class FieldSignatureImpl extends MemberSignatureImpl implements FieldSignature {
     Class fieldType;
diff --git a/runtime/src/org/aspectj/runtime/reflect/InitializerSignatureImpl.java b/runtime/src/org/aspectj/runtime/reflect/InitializerSignatureImpl.java
index f7065d673..f2e7d5b01 100644
--- a/runtime/src/org/aspectj/runtime/reflect/InitializerSignatureImpl.java
+++ b/runtime/src/org/aspectj/runtime/reflect/InitializerSignatureImpl.java
@@ -14,8 +14,7 @@
 
 package org.aspectj.runtime.reflect;
 
-import org.aspectj.lang.reflect.*;
-import org.aspectj.lang.*;
+import org.aspectj.lang.reflect.InitializerSignature;
 
 import java.lang.reflect.Modifier;
 
diff --git a/runtime/src/org/aspectj/runtime/reflect/MemberSignatureImpl.java b/runtime/src/org/aspectj/runtime/reflect/MemberSignatureImpl.java
index 3097a1abf..66c535a5c 100644
--- a/runtime/src/org/aspectj/runtime/reflect/MemberSignatureImpl.java
+++ b/runtime/src/org/aspectj/runtime/reflect/MemberSignatureImpl.java
@@ -14,8 +14,7 @@
 
 package org.aspectj.runtime.reflect;
 
-import org.aspectj.lang.*;
-import org.aspectj.lang.reflect.*;
+import org.aspectj.lang.reflect.MemberSignature;
 
 abstract class MemberSignatureImpl extends SignatureImpl implements MemberSignature {
     MemberSignatureImpl(int modifiers, String name, Class declaringType) {   
diff --git a/runtime/src/org/aspectj/runtime/reflect/MethodSignatureImpl.java b/runtime/src/org/aspectj/runtime/reflect/MethodSignatureImpl.java
index 4318dc9ca..b2652cc79 100644
--- a/runtime/src/org/aspectj/runtime/reflect/MethodSignatureImpl.java
+++ b/runtime/src/org/aspectj/runtime/reflect/MethodSignatureImpl.java
@@ -14,9 +14,7 @@
 
 package org.aspectj.runtime.reflect;
 
-import org.aspectj.lang.*;
-import org.aspectj.lang.reflect.*;
-import java.lang.reflect.Modifier;
+import org.aspectj.lang.reflect.MethodSignature;
 
 class MethodSignatureImpl extends CodeSignatureImpl implements MethodSignature {
     Class returnType;
diff --git a/runtime/src/org/aspectj/runtime/reflect/SignatureImpl.java b/runtime/src/org/aspectj/runtime/reflect/SignatureImpl.java
index ec46bbbab..d5426eeaa 100644
--- a/runtime/src/org/aspectj/runtime/reflect/SignatureImpl.java
+++ b/runtime/src/org/aspectj/runtime/reflect/SignatureImpl.java
@@ -14,10 +14,10 @@
 
 package org.aspectj.runtime.reflect;
 
-import org.aspectj.lang.*;
-import org.aspectj.lang.reflect.*;
+import org.aspectj.lang.Signature;
 
-import java.util.*;
+import java.util.Hashtable;
+import java.util.StringTokenizer;
 
 abstract class SignatureImpl implements Signature {
     int modifiers = -1;
diff --git a/runtime/src/org/aspectj/runtime/reflect/SourceLocationImpl.java b/runtime/src/org/aspectj/runtime/reflect/SourceLocationImpl.java
index 6a04283b3..d69bec612 100644
--- a/runtime/src/org/aspectj/runtime/reflect/SourceLocationImpl.java
+++ b/runtime/src/org/aspectj/runtime/reflect/SourceLocationImpl.java
@@ -14,8 +14,7 @@
 
 package org.aspectj.runtime.reflect;
 
-import org.aspectj.lang.*;
-import org.aspectj.lang.reflect.*;
+import org.aspectj.lang.reflect.SourceLocation;
 
 class SourceLocationImpl implements SourceLocation {
     Class withinType;
diff --git a/runtime/src/org/aspectj/runtime/reflect/StringMaker.java b/runtime/src/org/aspectj/runtime/reflect/StringMaker.java
index bc46f992c..a63ae9d6b 100644
--- a/runtime/src/org/aspectj/runtime/reflect/StringMaker.java
+++ b/runtime/src/org/aspectj/runtime/reflect/StringMaker.java
@@ -14,9 +14,6 @@
 
 package org.aspectj.runtime.reflect;
 
-import org.aspectj.lang.*;
-import org.aspectj.lang.reflect.*;
-
 import java.lang.reflect.Modifier;
 
 class StringMaker {