removed unused imports (semantics-preserving)

diff --git a/weaver/src/org/aspectj/weaver/Checker.java b/weaver/src/org/aspectj/weaver/Checker.java
index b221d7127617eb9bdd65c2bbfb053990692e99b1..0e30723b4082f676819d63791be9fc481211054a 100644 (file)
--- a/weaver/src/org/aspectj/weaver/Checker.java
+++ b/weaver/src/org/aspectj/weaver/Checker.java
@@ -16,9 +16,6 @@ package org.aspectj.weaver;
 import java.util.*;
 
 import org.aspectj.bridge.*;
-import org.aspectj.lang.Signature;
-import org.aspectj.lang.JoinPoint.StaticPart;
-import org.aspectj.lang.reflect.SourceLocation;
 import org.aspectj.weaver.patterns.*;
 
 

diff --git a/weaver/src/org/aspectj/weaver/NameMangler.java b/weaver/src/org/aspectj/weaver/NameMangler.java
index 1b63b7ac2055ab007e6cf9318ff61e85170575ef..d620ecad804a1e309ce63d3da3f96e849d6657fd 100644 (file)
--- a/weaver/src/org/aspectj/weaver/NameMangler.java
+++ b/weaver/src/org/aspectj/weaver/NameMangler.java
@@ -14,8 +14,6 @@
 package org.aspectj.weaver;
 
 import java.lang.reflect.Modifier;
-
-import org.aspectj.weaver.bcel.BcelObjectType;
 import org.aspectj.weaver.bcel.LazyClassGen;
 
 public class NameMangler {

diff --git a/weaver/src/org/aspectj/weaver/NewParentTypeMunger.java b/weaver/src/org/aspectj/weaver/NewParentTypeMunger.java
index 05f66ac631b8ef555813bda003e28b339e242db1..fb0fcdc28126de85db8d1a172acfea3afabd7a2d 100644 (file)
--- a/weaver/src/org/aspectj/weaver/NewParentTypeMunger.java
+++ b/weaver/src/org/aspectj/weaver/NewParentTypeMunger.java
@@ -13,10 +13,8 @@
 
 package org.aspectj.weaver;
 
-import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
-import java.util.Set;
 
 public class NewParentTypeMunger extends ResolvedTypeMunger {
        ResolvedTypeX newParent;

diff --git a/weaver/src/org/aspectj/weaver/ResolvedTypeX.java b/weaver/src/org/aspectj/weaver/ResolvedTypeX.java
index d4526ec9dd56efe8f6645e87801085b5b26618be..7307dce25ed57e68b3fb33b1dac79473b80a9834 100644 (file)
--- a/weaver/src/org/aspectj/weaver/ResolvedTypeX.java
+++ b/weaver/src/org/aspectj/weaver/ResolvedTypeX.java
@@ -24,7 +24,6 @@ import java.util.List;
 import org.aspectj.bridge.IMessage;
 import org.aspectj.bridge.ISourceLocation;
 import org.aspectj.bridge.MessageUtil;
-import org.aspectj.weaver.bcel.BcelObjectType;
 import org.aspectj.weaver.patterns.Declare;
 import org.aspectj.weaver.patterns.PerClause;
 

diff --git a/weaver/src/org/aspectj/weaver/Shadow.java b/weaver/src/org/aspectj/weaver/Shadow.java
index 029a16d692141572622b7574b7e91f03788d1bb0..c79b4b87bc7a567176af98fb8a716a666409a8a2 100644 (file)
--- a/weaver/src/org/aspectj/weaver/Shadow.java
+++ b/weaver/src/org/aspectj/weaver/Shadow.java
@@ -21,7 +21,6 @@ import java.util.List;
 
 import org.aspectj.bridge.*;
 import org.aspectj.bridge.MessageUtil;
-import org.aspectj.bridge.SourceLocation;
 import org.aspectj.lang.JoinPoint;
 import org.aspectj.util.PartialOrder;
 import org.aspectj.util.TypeSafeEnum;

diff --git a/weaver/src/org/aspectj/weaver/WeaverStateInfo.java b/weaver/src/org/aspectj/weaver/WeaverStateInfo.java
index 20b5347c1562b92d9bd8246b54b193d34a38445f..a2e78ed014f5a30d159d5ac5221ecdc96341c6eb 100644 (file)
--- a/weaver/src/org/aspectj/weaver/WeaverStateInfo.java
+++ b/weaver/src/org/aspectj/weaver/WeaverStateInfo.java
@@ -22,7 +22,6 @@ import java.util.Iterator;
 import java.util.List;
 
 import org.aspectj.bridge.IMessage;
-import org.aspectj.util.TypeSafeEnum;
 import org.aspectj.weaver.bcel.BcelTypeMunger;
 
 public class WeaverStateInfo {

diff --git a/weaver/src/org/aspectj/weaver/World.java b/weaver/src/org/aspectj/weaver/World.java
index 8043320906a54a938667a979aea3ecba929f2b1b..37406d20e6416e4b7e438749ca56c8a55bb1402d 100644 (file)
--- a/weaver/src/org/aspectj/weaver/World.java
+++ b/weaver/src/org/aspectj/weaver/World.java
@@ -13,13 +13,20 @@
 
 package org.aspectj.weaver;
 
-import java.util.*;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
 
 import org.aspectj.asm.IHierarchy;
-import org.aspectj.asm.internal.AspectJElementHierarchy;
-import org.aspectj.bridge.*;
+import org.aspectj.bridge.IMessageHandler;
+import org.aspectj.bridge.ISourceLocation;
+import org.aspectj.bridge.Message;
+import org.aspectj.bridge.MessageUtil;
 import org.aspectj.bridge.IMessage.Kind;
-import org.aspectj.weaver.patterns.*;
+import org.aspectj.weaver.patterns.DeclarePrecedence;
+import org.aspectj.weaver.patterns.Pointcut;
 
 public abstract class World {
        protected IMessageHandler messageHandler = IMessageHandler.SYSTEM_ERR;

diff --git a/weaver/src/org/aspectj/weaver/bcel/BcelClassWeaver.java b/weaver/src/org/aspectj/weaver/bcel/BcelClassWeaver.java
index 866502e99c2d96d882fe200149525a9667cd032d..b9ab8bb6a212d1e88ebb5bfcad0d07455afdeca9 100644 (file)
--- a/weaver/src/org/aspectj/weaver/bcel/BcelClassWeaver.java
+++ b/weaver/src/org/aspectj/weaver/bcel/BcelClassWeaver.java
@@ -61,7 +61,6 @@ import org.aspectj.weaver.ResolvedMember;
 import org.aspectj.weaver.ResolvedTypeX;
 import org.aspectj.weaver.Shadow;
 import org.aspectj.weaver.ShadowMunger;
-import org.aspectj.weaver.WeaverStateInfo;
 
 class BcelClassWeaver implements IClassWeaver {
     

diff --git a/weaver/src/org/aspectj/weaver/bcel/BcelObjectType.java b/weaver/src/org/aspectj/weaver/bcel/BcelObjectType.java
index 81d8f1b8ce161904b8a6cd3a781c47228c87a340..a055f92a4bcc8983c9468f342ce2702f4d8e801f 100644 (file)
--- a/weaver/src/org/aspectj/weaver/bcel/BcelObjectType.java
+++ b/weaver/src/org/aspectj/weaver/bcel/BcelObjectType.java
@@ -25,7 +25,6 @@ import org.apache.bcel.classfile.Field;
 import org.apache.bcel.classfile.JavaClass;
 import org.apache.bcel.classfile.Method;
 import org.aspectj.bridge.ISourceLocation;
-import org.aspectj.weaver.*;
 import org.aspectj.weaver.AjAttribute;
 import org.aspectj.weaver.BCException;
 import org.aspectj.weaver.ResolvedMember;
@@ -33,7 +32,6 @@ import org.aspectj.weaver.ResolvedPointcutDefinition;
 import org.aspectj.weaver.ResolvedTypeX;
 import org.aspectj.weaver.TypeX;
 import org.aspectj.weaver.WeaverStateInfo;
-import org.aspectj.weaver.World;
 import org.aspectj.weaver.patterns.PerClause;
 
 // ??? exposed for testing

diff --git a/weaver/src/org/aspectj/weaver/bcel/BcelShadow.java b/weaver/src/org/aspectj/weaver/bcel/BcelShadow.java
index 00b2d2678a6032b8b210cbb15e3ecc7cdff729ce..3112984d83c656091d86a22bc158dcdea69adf14 100644 (file)
--- a/weaver/src/org/aspectj/weaver/bcel/BcelShadow.java
+++ b/weaver/src/org/aspectj/weaver/bcel/BcelShadow.java
@@ -13,7 +13,6 @@
 
 package org.aspectj.weaver.bcel;
 
-import java.io.File;
 import java.lang.reflect.Modifier;
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -43,7 +42,6 @@ import org.apache.bcel.generic.SWAP;
 import org.apache.bcel.generic.TargetLostException;
 import org.apache.bcel.generic.Type;
 import org.aspectj.bridge.ISourceLocation;
-import org.aspectj.bridge.SourceLocation;
 import org.aspectj.weaver.AdviceKind;
 import org.aspectj.weaver.AjcMemberMaker;
 import org.aspectj.weaver.BCException;

diff --git a/weaver/src/org/aspectj/weaver/bcel/LazyClassGen.java b/weaver/src/org/aspectj/weaver/bcel/LazyClassGen.java
index 0c30e841102fdf04bbf7d3b6215d6fa8f6810a44..3efa2831762e5f917eb725f5b9215b3b0a83ff2f 100644 (file)
--- a/weaver/src/org/aspectj/weaver/bcel/LazyClassGen.java
+++ b/weaver/src/org/aspectj/weaver/bcel/LazyClassGen.java
@@ -19,7 +19,6 @@ import java.io.IOException;
 import java.io.PrintStream;
 import java.lang.reflect.Modifier;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.HashMap;
@@ -28,11 +27,9 @@ import java.util.List;
 import java.util.Map;
 
 import org.apache.bcel.Constants;
-import org.apache.bcel.classfile.Attribute;
 import org.apache.bcel.classfile.Field;
 import org.apache.bcel.classfile.JavaClass;
 import org.apache.bcel.classfile.Method;
-import org.apache.bcel.classfile.Unknown;
 import org.apache.bcel.generic.ClassGen;
 import org.apache.bcel.generic.ConstantPoolGen;
 import org.apache.bcel.generic.FieldGen;
@@ -44,11 +41,11 @@ import org.apache.bcel.generic.PUSH;
 import org.apache.bcel.generic.RETURN;
 import org.apache.bcel.generic.Type;
 import org.aspectj.util.CollectionUtil;
-import org.aspectj.weaver.*;
 import org.aspectj.weaver.AjAttribute;
 import org.aspectj.weaver.BCException;
 import org.aspectj.weaver.Member;
 import org.aspectj.weaver.NameMangler;
+import org.aspectj.weaver.ResolvedTypeX;
 import org.aspectj.weaver.TypeX;
 import org.aspectj.weaver.WeaverStateInfo;
 

diff --git a/weaver/src/org/aspectj/weaver/patterns/Pointcut.java b/weaver/src/org/aspectj/weaver/patterns/Pointcut.java
index 91fe52860fbab248bb9e0cd3b006b8b429eae133..0e1e2ba9150bcebdf50612cc5c0252b015aa30fb 100644 (file)
--- a/weaver/src/org/aspectj/weaver/patterns/Pointcut.java
+++ b/weaver/src/org/aspectj/weaver/patterns/Pointcut.java
@@ -17,7 +17,6 @@ import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
 
-import org.apache.bcel.classfile.JavaClass;
 import org.aspectj.util.FuzzyBoolean;
 import org.aspectj.util.TypeSafeEnum;
 import org.aspectj.weaver.BCException;

diff --git a/weaver/src/org/aspectj/weaver/patterns/WithinPointcut.java b/weaver/src/org/aspectj/weaver/patterns/WithinPointcut.java
index 9775f705e1dc978daa083ada2cf3b562bfeb8261..7881050fe31c34b6a4c6e2b8a70ed733de30c0f8 100644 (file)
--- a/weaver/src/org/aspectj/weaver/patterns/WithinPointcut.java
+++ b/weaver/src/org/aspectj/weaver/patterns/WithinPointcut.java
@@ -22,7 +22,6 @@ import org.aspectj.weaver.ISourceContext;
 import org.aspectj.weaver.IntMap;
 import org.aspectj.weaver.ResolvedTypeX;
 import org.aspectj.weaver.Shadow;
-import org.aspectj.weaver.TypeX;
 import org.aspectj.weaver.ast.Literal;
 import org.aspectj.weaver.ast.Test;
 

diff --git a/weaver/testsrc/fluffy/Aspect.java b/weaver/testsrc/fluffy/Aspect.java
index 7cb35bfa496daa11d77b3f3d4609669a4b8889b4..401ce9ba816c4b7800ba7f6fdfd673ba304357d8 100644 (file)
--- a/weaver/testsrc/fluffy/Aspect.java
+++ b/weaver/testsrc/fluffy/Aspect.java
@@ -1,6 +1,4 @@
 package fluffy;
-import java.util.*;
-
 import org.aspectj.runtime.internal.AroundClosure;
 
 public class Aspect {

diff --git a/weaver/testsrc/org/aspectj/weaver/TestShadow.java b/weaver/testsrc/org/aspectj/weaver/TestShadow.java
index 534eca0a51451ecce422aecae9d2540c5f79fc61..b4ed5ea61000deed22af843c9491646a00a3c5d5 100644 (file)
--- a/weaver/testsrc/org/aspectj/weaver/TestShadow.java
+++ b/weaver/testsrc/org/aspectj/weaver/TestShadow.java
@@ -13,9 +13,8 @@
 
 package org.aspectj.weaver;
 
-import org.aspectj.weaver.ast.Var;
 import org.aspectj.bridge.ISourceLocation;
-import org.aspectj.bridge.SourceLocation;
+import org.aspectj.weaver.ast.Var;
 
 public class TestShadow extends Shadow {
 

diff --git a/weaver/testsrc/org/aspectj/weaver/bcel/ArgsWeaveTestCase.java b/weaver/testsrc/org/aspectj/weaver/bcel/ArgsWeaveTestCase.java
index a2fda94326cfe7dd2431256ab75f645818893bbb..f8566c0681abcd348ecc216f3bef10c756322b3c 100644 (file)
--- a/weaver/testsrc/org/aspectj/weaver/bcel/ArgsWeaveTestCase.java
+++ b/weaver/testsrc/org/aspectj/weaver/bcel/ArgsWeaveTestCase.java
@@ -13,13 +13,19 @@
 
 package org.aspectj.weaver.bcel;
 
-import java.util.*;
-import java.io.*;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
 
 import org.apache.bcel.Constants;
-import org.apache.bcel.generic.*;
-import org.aspectj.weaver.bcel.*;
-import org.aspectj.weaver.*;
+import org.apache.bcel.generic.InstructionFactory;
+import org.apache.bcel.generic.InstructionHandle;
+import org.apache.bcel.generic.InstructionList;
+import org.apache.bcel.generic.Type;
+import org.aspectj.weaver.AdviceKind;
+import org.aspectj.weaver.Member;
+import org.aspectj.weaver.Shadow;
+import org.aspectj.weaver.TypeX;
 
 /**.
  */

diff --git a/weaver/testsrc/org/aspectj/weaver/bcel/HierarchyDependsTestCase.java b/weaver/testsrc/org/aspectj/weaver/bcel/HierarchyDependsTestCase.java
index 73fa3f78f9eb5acffcc62be2bb637c96de353c9b..6bf632ca33771bf86cb9d903641fac056c167ce0 100644 (file)
--- a/weaver/testsrc/org/aspectj/weaver/bcel/HierarchyDependsTestCase.java
+++ b/weaver/testsrc/org/aspectj/weaver/bcel/HierarchyDependsTestCase.java
@@ -15,10 +15,6 @@ package org.aspectj.weaver.bcel;
 
 import junit.framework.TestCase;
 
-import org.apache.bcel.classfile.JavaClass;
-import org.aspectj.weaver.ResolvedTypeX;
-import org.aspectj.weaver.patterns.*;
-
 
 public class HierarchyDependsTestCase extends TestCase {
 

diff --git a/weaver/testsrc/org/aspectj/weaver/bcel/MegaZipTestCase.java b/weaver/testsrc/org/aspectj/weaver/bcel/MegaZipTestCase.java
index 6e3f6269ea4a99dc9b36375d7525ed55a7a1f9b4..c790b4dc7c28311973f836182dd6cc67152e1d97 100644 (file)
--- a/weaver/testsrc/org/aspectj/weaver/bcel/MegaZipTestCase.java
+++ b/weaver/testsrc/org/aspectj/weaver/bcel/MegaZipTestCase.java
@@ -13,12 +13,17 @@
 
 package org.aspectj.weaver.bcel;
 
-import java.io.*;
+import java.io.File;
+import java.io.IOException;
 import java.lang.reflect.Modifier;
-import java.util.*;
-
-import org.aspectj.util.FileUtil;
-import org.aspectj.weaver.*;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.aspectj.weaver.AdviceKind;
+import org.aspectj.weaver.BcweaverTests;
+import org.aspectj.weaver.Member;
+import org.aspectj.weaver.Shadow;
+import org.aspectj.weaver.TypeX;
 
 public class MegaZipTestCase extends WeaveTestCase {
 

diff --git a/weaver/testsrc/org/aspectj/weaver/bcel/TjpWeaveTestCase.java b/weaver/testsrc/org/aspectj/weaver/bcel/TjpWeaveTestCase.java
index 29b57f06433db0a106038cad02b168667650ec49..620f79e08f3e4843abdf66a400ad19b68520743c 100644 (file)
--- a/weaver/testsrc/org/aspectj/weaver/bcel/TjpWeaveTestCase.java
+++ b/weaver/testsrc/org/aspectj/weaver/bcel/TjpWeaveTestCase.java
@@ -13,11 +13,13 @@
 
 package org.aspectj.weaver.bcel;
 
-import java.util.*;
-import java.io.*;
+import java.io.IOException;
+import java.util.Arrays;
 
-import org.aspectj.weaver.bcel.*;
-import org.aspectj.weaver.*;
+import org.aspectj.weaver.Advice;
+import org.aspectj.weaver.AdviceKind;
+import org.aspectj.weaver.Member;
+import org.aspectj.weaver.TypeX;
 
 public class TjpWeaveTestCase extends WeaveTestCase {
        {

diff --git a/weaver/testsrc/org/aspectj/weaver/patterns/ConcretizationTestCase.java b/weaver/testsrc/org/aspectj/weaver/patterns/ConcretizationTestCase.java
index cc6315d4598b4ea1f7ce73ad3fc62c834f2a9d43..8bf41f7502b469521957ba01f0b3708c84dccd3d 100644 (file)
--- a/weaver/testsrc/org/aspectj/weaver/patterns/ConcretizationTestCase.java
+++ b/weaver/testsrc/org/aspectj/weaver/patterns/ConcretizationTestCase.java
@@ -13,12 +13,7 @@
 
 package org.aspectj.weaver.patterns;
 
-import java.io.*;
-import java.util.*;
-
-import org.aspectj.testing.util.TestUtil;
-import org.aspectj.weaver.*;
-import org.aspectj.weaver.bcel.*;
+import org.aspectj.weaver.TypeX;
 import org.aspectj.weaver.bcel.WeaveTestCase;
 
 public class ConcretizationTestCase extends WeaveTestCase {

diff --git a/weaver/testsrc/org/aspectj/weaver/patterns/NamePatternParserTestCase.java b/weaver/testsrc/org/aspectj/weaver/patterns/NamePatternParserTestCase.java
index f23fc68721572e8bef6c4c7ca89b176456b262cf..b4352658678f6cfc274919116fe3d414205027ee 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 org.aspectj.weaver.patterns.*;
-
 import junit.framework.TestCase;
 
 /**

diff --git a/weaver/testsrc/org/aspectj/weaver/patterns/NamePatternTestCase.java b/weaver/testsrc/org/aspectj/weaver/patterns/NamePatternTestCase.java
index 11e7c57a2d9deb3563cbbe314e0bab824d0064f2..2239d0be841312fd865be4adea16cbf13d8f0d8f 100644 (file)
--- a/weaver/testsrc/org/aspectj/weaver/patterns/NamePatternTestCase.java
+++ b/weaver/testsrc/org/aspectj/weaver/patterns/NamePatternTestCase.java
@@ -13,9 +13,11 @@
 
 package org.aspectj.weaver.patterns;
 
-import java.io.*;
-
-import org.aspectj.weaver.patterns.*;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
 
 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 a9ce95ff5677cb8eb20ab227c20a4febcb297c96..46475c3a6cae096126ca50e1edbf54ebb99f9c8c 100644 (file)
--- a/weaver/testsrc/org/aspectj/weaver/patterns/ParserTestCase.java
+++ b/weaver/testsrc/org/aspectj/weaver/patterns/ParserTestCase.java
@@ -13,12 +13,11 @@
 
 package org.aspectj.weaver.patterns;
 
-import org.aspectj.weaver.bcel.*;
-import org.aspectj.weaver.bcel.*;
-import org.aspectj.weaver.bcel.BcelShadow;
-
 import junit.framework.TestCase;
-import org.aspectj.weaver.*;
+
+import org.aspectj.weaver.World;
+import org.aspectj.weaver.bcel.BcelShadow;
+import org.aspectj.weaver.bcel.BcelWorld;
 
 /**
  * @author hugunin