From c35cef6f16411ed61a020632e93401858b7d0c0f Mon Sep 17 00:00:00 2001 From: ehilsdal Date: Thu, 13 Nov 2003 23:59:28 +0000 Subject: [PATCH] removed unused imports (semantics-preserving) --- weaver/src/org/aspectj/weaver/Checker.java | 3 --- weaver/src/org/aspectj/weaver/NameMangler.java | 2 -- .../org/aspectj/weaver/NewParentTypeMunger.java | 2 -- weaver/src/org/aspectj/weaver/ResolvedTypeX.java | 1 - weaver/src/org/aspectj/weaver/Shadow.java | 1 - .../src/org/aspectj/weaver/WeaverStateInfo.java | 1 - weaver/src/org/aspectj/weaver/World.java | 15 +++++++++++---- .../org/aspectj/weaver/bcel/BcelClassWeaver.java | 1 - .../org/aspectj/weaver/bcel/BcelObjectType.java | 2 -- .../src/org/aspectj/weaver/bcel/BcelShadow.java | 2 -- .../org/aspectj/weaver/bcel/LazyClassGen.java | 5 +---- .../org/aspectj/weaver/patterns/Pointcut.java | 1 - .../aspectj/weaver/patterns/WithinPointcut.java | 1 - weaver/testsrc/fluffy/Aspect.java | 2 -- .../testsrc/org/aspectj/weaver/TestShadow.java | 3 +-- .../aspectj/weaver/bcel/ArgsWeaveTestCase.java | 16 +++++++++++----- .../weaver/bcel/HierarchyDependsTestCase.java | 4 ---- .../org/aspectj/weaver/bcel/MegaZipTestCase.java | 15 ++++++++++----- .../aspectj/weaver/bcel/TjpWeaveTestCase.java | 10 ++++++---- .../weaver/patterns/ConcretizationTestCase.java | 7 +------ .../patterns/NamePatternParserTestCase.java | 2 -- .../weaver/patterns/NamePatternTestCase.java | 8 +++++--- .../aspectj/weaver/patterns/ParserTestCase.java | 9 ++++----- 23 files changed, 50 insertions(+), 63 deletions(-) diff --git a/weaver/src/org/aspectj/weaver/Checker.java b/weaver/src/org/aspectj/weaver/Checker.java index b221d7127..0e30723b4 100644 --- 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 1b63b7ac2..d620ecad8 100644 --- 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 05f66ac63..fb0fcdc28 100644 --- 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 d4526ec9d..7307dce25 100644 --- 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 029a16d69..c79b4b87b 100644 --- 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 20b5347c1..a2e78ed01 100644 --- 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 804332090..37406d20e 100644 --- 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 866502e99..b9ab8bb6a 100644 --- 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 81d8f1b8c..a055f92a4 100644 --- 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 00b2d2678..3112984d8 100644 --- 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 0c30e8411..3efa28317 100644 --- 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 91fe52860..0e1e2ba91 100644 --- 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 9775f705e..7881050fe 100644 --- 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 7cb35bfa4..401ce9ba8 100644 --- 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 534eca0a5..b4ed5ea61 100644 --- 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 a2fda9432..f8566c068 100644 --- 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 73fa3f78f..6bf632ca3 100644 --- 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 6e3f6269e..c790b4dc7 100644 --- 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 29b57f064..620f79e08 100644 --- 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 cc6315d45..8bf41f750 100644 --- 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 f23fc6872..b43526586 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 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 11e7c57a2..2239d0be8 100644 --- 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 a9ce95ff5..46475c3a6 100644 --- 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 -- 2.39.5