resolving unused-imports warnings

20 files changed, 1 insertions, 42 deletions

diff --git a/weaver/testsrc/org/aspectj/weaver/bcel/AfterWeaveTestCase.java b/weaver/testsrc/org/aspectj/weaver/bcel/AfterWeaveTestCase.java
index 5be7d5c3b..0a310c8f8 100644
--- a/weaver/testsrc/org/aspectj/weaver/bcel/AfterWeaveTestCase.java
+++ b/weaver/testsrc/org/aspectj/weaver/bcel/AfterWeaveTestCase.java
@@ -13,11 +13,8 @@
 
 package org.aspectj.weaver.bcel;
 
-import java.util.*;
 import java.io.*;
 
-import junit.framework.TestResult;
-
 public class AfterWeaveTestCase extends WeaveTestCase {
 	{
 		regenerate = false;
diff --git a/weaver/testsrc/org/aspectj/weaver/bcel/FieldSetTestCase.java b/weaver/testsrc/org/aspectj/weaver/bcel/FieldSetTestCase.java
index 997def307..3e1e9795b 100644
--- a/weaver/testsrc/org/aspectj/weaver/bcel/FieldSetTestCase.java
+++ b/weaver/testsrc/org/aspectj/weaver/bcel/FieldSetTestCase.java
@@ -14,7 +14,6 @@
 package org.aspectj.weaver.bcel;
 
 import java.io.IOException;
-import java.util.Collections;
 
 public class FieldSetTestCase extends WeaveTestCase {
     {
diff --git a/weaver/testsrc/org/aspectj/weaver/bcel/HierarchyDependsTestCase.java b/weaver/testsrc/org/aspectj/weaver/bcel/HierarchyDependsTestCase.java
index d5d689411..ddf55a736 100644
--- a/weaver/testsrc/org/aspectj/weaver/bcel/HierarchyDependsTestCase.java
+++ b/weaver/testsrc/org/aspectj/weaver/bcel/HierarchyDependsTestCase.java
@@ -16,7 +16,6 @@ package org.aspectj.weaver.bcel;
 import junit.framework.TestCase;
 
 import org.apache.bcel.classfile.JavaClass;
-import org.aspectj.weaver.TypeX;
 import org.aspectj.weaver.patterns.*;
 
 
diff --git a/weaver/testsrc/org/aspectj/weaver/bcel/IdWeaveTestCase.java b/weaver/testsrc/org/aspectj/weaver/bcel/IdWeaveTestCase.java
index b02f3b5d4..c17c49569 100644
--- a/weaver/testsrc/org/aspectj/weaver/bcel/IdWeaveTestCase.java
+++ b/weaver/testsrc/org/aspectj/weaver/bcel/IdWeaveTestCase.java
@@ -16,7 +16,6 @@ package org.aspectj.weaver.bcel;
 import java.io.IOException;
 import java.util.*;
 
-import org.apache.bcel.util.ClassPath;
 import org.aspectj.weaver.*;
 import org.aspectj.weaver.patterns.Pointcut;
 
diff --git a/weaver/testsrc/org/aspectj/weaver/bcel/MoveInstructionsWeaveTestCase.java b/weaver/testsrc/org/aspectj/weaver/bcel/MoveInstructionsWeaveTestCase.java
index 00efedf01..2569b1ac7 100644
--- a/weaver/testsrc/org/aspectj/weaver/bcel/MoveInstructionsWeaveTestCase.java
+++ b/weaver/testsrc/org/aspectj/weaver/bcel/MoveInstructionsWeaveTestCase.java
@@ -13,13 +13,8 @@
 
 package org.aspectj.weaver.bcel;
 
-import java.util.*;
 import java.io.*;
 
-import junit.framework.TestResult;
-
-import org.apache.bcel.generic.*;
-import org.apache.bcel.generic.InstructionList;
 import org.aspectj.weaver.*;
 
 public class MoveInstructionsWeaveTestCase extends WeaveTestCase {
diff --git a/weaver/testsrc/org/aspectj/weaver/bcel/NonstaticWeaveTestCase.java b/weaver/testsrc/org/aspectj/weaver/bcel/NonstaticWeaveTestCase.java
index c2a15bb02..c98c8e687 100644
--- a/weaver/testsrc/org/aspectj/weaver/bcel/NonstaticWeaveTestCase.java
+++ b/weaver/testsrc/org/aspectj/weaver/bcel/NonstaticWeaveTestCase.java
@@ -14,8 +14,6 @@
 package org.aspectj.weaver.bcel;
 
 import java.io.IOException;
-import java.util.*;
-import java.util.List;
 
 import org.aspectj.weaver.*;
 import org.aspectj.weaver.ShadowMunger;
diff --git a/weaver/testsrc/org/aspectj/weaver/bcel/TjpWeaveTestCase.java b/weaver/testsrc/org/aspectj/weaver/bcel/TjpWeaveTestCase.java
index 3175047be..29b57f064 100644
--- a/weaver/testsrc/org/aspectj/weaver/bcel/TjpWeaveTestCase.java
+++ b/weaver/testsrc/org/aspectj/weaver/bcel/TjpWeaveTestCase.java
@@ -16,8 +16,6 @@ package org.aspectj.weaver.bcel;
 import java.util.*;
 import java.io.*;
 
-import org.apache.bcel.Constants;
-import org.apache.bcel.generic.*;
 import org.aspectj.weaver.bcel.*;
 import org.aspectj.weaver.*;
 
diff --git a/weaver/testsrc/org/aspectj/weaver/bcel/UtilityTestCase.java b/weaver/testsrc/org/aspectj/weaver/bcel/UtilityTestCase.java
index 092f1e463..0550c3b6a 100644
--- a/weaver/testsrc/org/aspectj/weaver/bcel/UtilityTestCase.java
+++ b/weaver/testsrc/org/aspectj/weaver/bcel/UtilityTestCase.java
@@ -16,8 +16,6 @@ import java.io.*;
 
 import junit.framework.TestCase;
 
-import org.apache.bcel.util.ClassPath;
-
 public class UtilityTestCase extends TestCase {
 
     public UtilityTestCase(String name) {
diff --git a/weaver/testsrc/org/aspectj/weaver/bcel/WeaveOrderTestCase.java b/weaver/testsrc/org/aspectj/weaver/bcel/WeaveOrderTestCase.java
index da9818622..1b7f1285f 100644
--- a/weaver/testsrc/org/aspectj/weaver/bcel/WeaveOrderTestCase.java
+++ b/weaver/testsrc/org/aspectj/weaver/bcel/WeaveOrderTestCase.java
@@ -13,13 +13,7 @@
 
 package org.aspectj.weaver.bcel;
 
-import java.util.*;
-import java.io.*;
-
-import org.apache.bcel.Constants;
-import org.apache.bcel.generic.*;
 import org.aspectj.weaver.patterns.*;
-import org.aspectj.weaver.patterns.DeclarePrecedence;
 import org.aspectj.weaver.*;
 
 /**.
diff --git a/weaver/testsrc/org/aspectj/weaver/bcel/WeaveTestCase.java b/weaver/testsrc/org/aspectj/weaver/bcel/WeaveTestCase.java
index 28686bad2..e0cc600fe 100644
--- a/weaver/testsrc/org/aspectj/weaver/bcel/WeaveTestCase.java
+++ b/weaver/testsrc/org/aspectj/weaver/bcel/WeaveTestCase.java
@@ -14,8 +14,6 @@
 package org.aspectj.weaver.bcel;
 import java.io.*;
 import java.util.*;
-import java.util.zip.*;
-import java.util.zip.ZipFile;
 
 import junit.framework.*;
 
diff --git a/weaver/testsrc/org/aspectj/weaver/bcel/WorldTestCase.java b/weaver/testsrc/org/aspectj/weaver/bcel/WorldTestCase.java
index ec41aad86..cf78e88ca 100644
--- a/weaver/testsrc/org/aspectj/weaver/bcel/WorldTestCase.java
+++ b/weaver/testsrc/org/aspectj/weaver/bcel/WorldTestCase.java
@@ -15,7 +15,6 @@ package org.aspectj.weaver.bcel;
 
 import java.lang.reflect.Modifier;
 
-import org.apache.bcel.util.ClassPath;
 import org.aspectj.weaver.*;
 
 /**
diff --git a/weaver/testsrc/org/aspectj/weaver/patterns/AndOrNotTestCase.java b/weaver/testsrc/org/aspectj/weaver/patterns/AndOrNotTestCase.java
index f86f4b590..26d8e1207 100644
--- a/weaver/testsrc/org/aspectj/weaver/patterns/AndOrNotTestCase.java
+++ b/weaver/testsrc/org/aspectj/weaver/patterns/AndOrNotTestCase.java
@@ -14,10 +14,8 @@
 package org.aspectj.weaver.patterns;
 
 import java.io.*;
-import java.lang.reflect.*;
 
 import org.aspectj.weaver.bcel.*;
-import org.aspectj.util.FuzzyBoolean;
 
 import junit.framework.TestCase;
 import org.aspectj.weaver.*;
diff --git a/weaver/testsrc/org/aspectj/weaver/patterns/BindingTestCase.java b/weaver/testsrc/org/aspectj/weaver/patterns/BindingTestCase.java
index 5444b115c..e75479275 100644
--- a/weaver/testsrc/org/aspectj/weaver/patterns/BindingTestCase.java
+++ b/weaver/testsrc/org/aspectj/weaver/patterns/BindingTestCase.java
@@ -13,10 +13,7 @@
 
 package org.aspectj.weaver.patterns;
 
-import java.util.*;
-
 import org.aspectj.weaver.bcel.*;
-import org.aspectj.weaver.bcel.BcelShadow;
 
 import junit.framework.TestCase;
 
diff --git a/weaver/testsrc/org/aspectj/weaver/patterns/ConcretizationTestCase.java b/weaver/testsrc/org/aspectj/weaver/patterns/ConcretizationTestCase.java
index 69cab35f1..1d8c36167 100644
--- a/weaver/testsrc/org/aspectj/weaver/patterns/ConcretizationTestCase.java
+++ b/weaver/testsrc/org/aspectj/weaver/patterns/ConcretizationTestCase.java
@@ -14,7 +14,6 @@
 package org.aspectj.weaver.patterns;
 
 import java.io.*;
-import java.lang.reflect.Modifier;
 import java.util.*;
 
 import org.aspectj.testing.util.TestUtil;
diff --git a/weaver/testsrc/org/aspectj/weaver/patterns/ModifiersPatternTestCase.java b/weaver/testsrc/org/aspectj/weaver/patterns/ModifiersPatternTestCase.java
index 714e96fbd..9a1026032 100644
--- a/weaver/testsrc/org/aspectj/weaver/patterns/ModifiersPatternTestCase.java
+++ b/weaver/testsrc/org/aspectj/weaver/patterns/ModifiersPatternTestCase.java
@@ -17,7 +17,6 @@ import java.io.*;
 import java.lang.reflect.*;
 
 import org.aspectj.weaver.bcel.*;
-import org.aspectj.util.FuzzyBoolean;
 
 import junit.framework.TestCase;
 import org.aspectj.weaver.*;
diff --git a/weaver/testsrc/org/aspectj/weaver/patterns/NamePatternParserTestCase.java b/weaver/testsrc/org/aspectj/weaver/patterns/NamePatternParserTestCase.java
index 83695fb3b..f23fc6872 100644
--- a/weaver/testsrc/org/aspectj/weaver/patterns/NamePatternParserTestCase.java
+++ b/weaver/testsrc/org/aspectj/weaver/patterns/NamePatternParserTestCase.java
@@ -13,8 +13,6 @@
 
 package org.aspectj.weaver.patterns;
 
-import java.io.*;
-
 import org.aspectj.weaver.patterns.*;
 
 import junit.framework.TestCase;
diff --git a/weaver/testsrc/org/aspectj/weaver/patterns/ParserTestCase.java b/weaver/testsrc/org/aspectj/weaver/patterns/ParserTestCase.java
index 129b8fba8..a9ce95ff5 100644
--- a/weaver/testsrc/org/aspectj/weaver/patterns/ParserTestCase.java
+++ b/weaver/testsrc/org/aspectj/weaver/patterns/ParserTestCase.java
@@ -13,8 +13,6 @@
 
 package org.aspectj.weaver.patterns;
 
-import java.util.*;
-
 import org.aspectj.weaver.bcel.*;
 import org.aspectj.weaver.bcel.*;
 import org.aspectj.weaver.bcel.BcelShadow;
@@ -57,7 +55,7 @@ public class ParserTestCase extends TestCase {
 		
 		try {
 			new PatternParser("initialization(void foo())").parsePointcut();
-			this.fail("should have been a parse error");
+			fail("should have been a parse error");
 		} catch (ParserException pe) {
 			// good
 		}
diff --git a/weaver/testsrc/org/aspectj/weaver/patterns/ThisOrTargetTestCase.java b/weaver/testsrc/org/aspectj/weaver/patterns/ThisOrTargetTestCase.java
index d55e57e1d..d33d42daa 100644
--- a/weaver/testsrc/org/aspectj/weaver/patterns/ThisOrTargetTestCase.java
+++ b/weaver/testsrc/org/aspectj/weaver/patterns/ThisOrTargetTestCase.java
@@ -14,10 +14,8 @@
 package org.aspectj.weaver.patterns;
 
 import java.io.*;
-import java.lang.reflect.*;
 
 import org.aspectj.weaver.bcel.*;
-import org.aspectj.util.FuzzyBoolean;
 
 import junit.framework.TestCase;
 import org.aspectj.weaver.*;
diff --git a/weaver/testsrc/org/aspectj/weaver/patterns/TypePatternTestCase.java b/weaver/testsrc/org/aspectj/weaver/patterns/TypePatternTestCase.java
index 54ea33b9b..6d7ee2185 100644
--- a/weaver/testsrc/org/aspectj/weaver/patterns/TypePatternTestCase.java
+++ b/weaver/testsrc/org/aspectj/weaver/patterns/TypePatternTestCase.java
@@ -14,7 +14,6 @@
 package org.aspectj.weaver.patterns;
 
 import java.io.*;
-import java.util.*;
 
 import org.aspectj.weaver.bcel.*;
 import org.aspectj.bridge.AbortException;
diff --git a/weaver/testsrc/org/aspectj/weaver/patterns/WithinTestCase.java b/weaver/testsrc/org/aspectj/weaver/patterns/WithinTestCase.java
index 24c1c587b..d400288fc 100644
--- a/weaver/testsrc/org/aspectj/weaver/patterns/WithinTestCase.java
+++ b/weaver/testsrc/org/aspectj/weaver/patterns/WithinTestCase.java
@@ -18,7 +18,6 @@ import java.io.*;
 import junit.framework.TestCase;
 
 import org.aspectj.weaver.*;
-import org.aspectj.weaver.bcel.*;
 import org.aspectj.weaver.bcel.BcelWorld;
 import org.aspectj.util.FuzzyBoolean;