resolving unused-imports warnings

diff --git a/weaver/testsrc/org/aspectj/weaver/bcel/AfterWeaveTestCase.java b/weaver/testsrc/org/aspectj/weaver/bcel/AfterWeaveTestCase.java
index 5be7d5c3b58498a5285b9eccc6f14201bf737a68..0a310c8f8dfd4a3d2fd6c05bffdfce3c1738cd36 100644 (file)
--- 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 997def3079ba0388fe14cf4f7fa9867e2e21fa48..3e1e9795be773611241a20815f69ad0c4a15acb2 100644 (file)
--- 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 d5d6894111896e8c5363870e11519d067b42b911..ddf55a73680a8665c348e3439833b14e1dc8b3bc 100644 (file)
--- 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 b02f3b5d4763c847a1d3496b4b13c2905fa41c27..c17c4956982e8e0398baa999c79ae06fe33a939d 100644 (file)
--- 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 00efedf0112ad29fd66f3b39977ea018182d8f14..2569b1ac7851efa2d1b95dd13c8a0e52632fa62b 100644 (file)
--- 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 c2a15bb0224d6de6c42a74eb83a603b9b9a20935..c98c8e687a16e30a89b97912f75efd63ff9aecb0 100644 (file)
--- 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 3175047be03a95137f1171e46225025ae6bb4072..29b57f06433db0a106038cad02b168667650ec49 100644 (file)
--- 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 092f1e463914bda8d5e32f9d1a82c120f66c4695..0550c3b6aa57e98c71ade963573db6d827523a95 100644 (file)
--- 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 da9818622f08ff15279b3752512e32b4f587d0b2..1b7f1285fb726f5ce8c7a82c8be37e72c77eeccc 100644 (file)
--- 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 28686bad288d4e91df21afbe3251ac22e761e5b5..e0cc600fec922ff1f90e6a1042614e5ba4a921bf 100644 (file)
--- 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 ec41aad86f295b8f344830244a83361aa3ef6e25..cf78e88ca1e22bdda34827210449bec314224ec9 100644 (file)
--- 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 f86f4b5906b682175bc9d131a6b4be07185b5007..26d8e120788aab71a95e444fbd494bae015cd829 100644 (file)
--- 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 5444b115c09118f8b9a64a66c3aee925e14efa73..e754792758c1a73ed90d03414c4d539cc8d44465 100644 (file)
--- 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 69cab35f130f83d6c60968600fa0b76509912cca..1d8c3616712da639ddb386d3adb605b4d3b084e4 100644 (file)
--- 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 714e96fbd19fc11925f18d834a5b0cbce11eb6d2..9a1026032f74340f598560a692136233f8b32e13 100644 (file)
--- 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 83695fb3bcabdbf155d29b8d8009a26c2641ad9d..f23fc68721572e8bef6c4c7ca89b176456b262cf 100644 (file)
--- 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 129b8fba883ed74ffaf5c128119d5cf21682a925..a9ce95ff5677cb8eb20ab227c20a4febcb297c96 100644 (file)
--- 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 d55e57e1d042ad93da1992bdbd65813c7424efe5..d33d42daac8ae66ba0fabc6ac1b036a3d46d90e1 100644 (file)
--- 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 54ea33b9b6a9453ddba4859e833498d61f2f755d..6d7ee2185b45977fa9690b70a79a232ba8818c77 100644 (file)
--- 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 24c1c587b9995e7d4deb06c95cd837289a1468b6..d400288fc3e7852ee12c5b6e99d466033a97e93d 100644 (file)
--- 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;