diff options
237 files changed, 2061 insertions, 976 deletions
diff --git a/bridge/src/org/aspectj/bridge/CountingMessageHandler.java b/bridge/src/org/aspectj/bridge/CountingMessageHandler.java index 103461ca7..cbf5bd0ce 100644 --- a/bridge/src/org/aspectj/bridge/CountingMessageHandler.java +++ b/bridge/src/org/aspectj/bridge/CountingMessageHandler.java @@ -13,12 +13,12 @@ package org.aspectj.bridge; -import org.aspectj.util.LangUtil; - import java.util.Enumeration; import java.util.Hashtable; import java.util.Iterator; +import org.aspectj.util.LangUtil; + /** * Wrap an IMessageHandler to count messages handled. * Messages being ignored by the delegate IMessageHandler are not counted. diff --git a/bridge/src/org/aspectj/bridge/MessageUtil.java b/bridge/src/org/aspectj/bridge/MessageUtil.java index 0dda25d65..ddb93b476 100644 --- a/bridge/src/org/aspectj/bridge/MessageUtil.java +++ b/bridge/src/org/aspectj/bridge/MessageUtil.java @@ -13,10 +13,6 @@ package org.aspectj.bridge; -import org.aspectj.bridge.IMessage.Kind; -import org.aspectj.util.LangUtil; -import org.aspectj.util.LineReader; - import java.io.File; import java.io.OutputStream; import java.io.PrintStream; @@ -27,6 +23,10 @@ import java.util.Collections; import java.util.Iterator; import java.util.List; +import org.aspectj.bridge.IMessage.Kind; +import org.aspectj.util.LangUtil; +import org.aspectj.util.LineReader; + /** * Convenience API's for constructing, printing, and sending messages. */ diff --git a/bridge/src/org/aspectj/bridge/SourceLocation.java b/bridge/src/org/aspectj/bridge/SourceLocation.java index 9c8ebab3b..0c28d20d2 100644 --- a/bridge/src/org/aspectj/bridge/SourceLocation.java +++ b/bridge/src/org/aspectj/bridge/SourceLocation.java @@ -14,10 +14,10 @@ package org.aspectj.bridge; -import org.aspectj.util.LangUtil; - import java.io.File; +import org.aspectj.util.LangUtil; + /** * Immutable source location. * This guarantees that the source file is not null diff --git a/bridge/testsrc/BridgeModuleTests.java b/bridge/testsrc/BridgeModuleTests.java index db563fd49..e0049f863 100644 --- a/bridge/testsrc/BridgeModuleTests.java +++ b/bridge/testsrc/BridgeModuleTests.java @@ -14,8 +14,9 @@ // default package -import junit.framework.*; import junit.framework.Test; +import junit.framework.TestCase; +import junit.framework.TestSuite; public class BridgeModuleTests extends TestCase { diff --git a/bridge/testsrc/org/aspectj/bridge/BridgeTests.java b/bridge/testsrc/org/aspectj/bridge/BridgeTests.java index 2ab9b9ac1..eb06558cd 100644 --- a/bridge/testsrc/org/aspectj/bridge/BridgeTests.java +++ b/bridge/testsrc/org/aspectj/bridge/BridgeTests.java @@ -14,7 +14,9 @@ package org.aspectj.bridge; -import junit.framework.*; +import junit.framework.Test; +import junit.framework.TestCase; +import junit.framework.TestSuite; public class BridgeTests extends TestCase { diff --git a/bridge/testsrc/org/aspectj/bridge/CountingMessageHandlerTest.java b/bridge/testsrc/org/aspectj/bridge/CountingMessageHandlerTest.java index 423501e13..fdb8307ac 100644 --- a/bridge/testsrc/org/aspectj/bridge/CountingMessageHandlerTest.java +++ b/bridge/testsrc/org/aspectj/bridge/CountingMessageHandlerTest.java @@ -14,14 +14,6 @@ package org.aspectj.bridge; -import java.io.File; -import java.util.Arrays; -import java.util.BitSet; -import java.util.Comparator; -import java.util.List; -import java.util.ListIterator; - -import junit.framework.AssertionFailedError; import junit.framework.TestCase; import junit.textui.TestRunner; diff --git a/build/src/$installer$/org/aspectj/Main.java b/build/src/$installer$/org/aspectj/Main.java index f6f5e733e..ec2b12280 100644 --- a/build/src/$installer$/org/aspectj/Main.java +++ b/build/src/$installer$/org/aspectj/Main.java @@ -15,15 +15,52 @@ package $installer$.org.aspectj; -import javax.swing.*; -import javax.swing.border.*; -import java.awt.*; -import java.awt.event.*; -import java.io.*; -import java.net.URL; -import java.util.zip.*; -import java.util.*; +import java.awt.BorderLayout; +import java.awt.Component; +import java.awt.Dimension; +import java.awt.FlowLayout; +import java.awt.Font; +import java.awt.GridBagConstraints; +import java.awt.GridBagLayout; +import java.awt.Toolkit; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.io.BufferedOutputStream; +import java.io.BufferedReader; +import java.io.BufferedWriter; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.FileWriter; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.OutputStream; +import java.io.PrintStream; import java.lang.reflect.InvocationTargetException; +import java.net.URL; +import java.util.Map; +import java.util.Properties; +import java.util.zip.ZipEntry; +import java.util.zip.ZipInputStream; + +import javax.swing.BorderFactory; +import javax.swing.BoxLayout; +import javax.swing.Icon; +import javax.swing.JButton; +import javax.swing.JEditorPane; +import javax.swing.JFileChooser; +import javax.swing.JFrame; +import javax.swing.JLabel; +import javax.swing.JOptionPane; +import javax.swing.JPanel; +import javax.swing.JProgressBar; +import javax.swing.JTextArea; +import javax.swing.JTextField; +import javax.swing.SwingUtilities; +import javax.swing.border.Border; +import javax.swing.border.CompoundBorder; +import javax.swing.border.EmptyBorder; /** * Invoke the Installer gui. diff --git a/build/src/org/aspectj/internal/tools/ant/taskdefs/AJInstaller.java b/build/src/org/aspectj/internal/tools/ant/taskdefs/AJInstaller.java index 614e60f44..bdeb456c6 100644 --- a/build/src/org/aspectj/internal/tools/ant/taskdefs/AJInstaller.java +++ b/build/src/org/aspectj/internal/tools/ant/taskdefs/AJInstaller.java @@ -14,13 +14,30 @@ //XXX INCLUDES CODE FROM ANT -- UNDER APACHE LICENSE package org.aspectj.internal.tools.ant.taskdefs; -import org.apache.tools.ant.types.*; -import java.io.*; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.StringBufferInputStream; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; +import java.util.zip.CRC32; +import java.util.zip.ZipEntry; import java.util.zip.ZipOutputStream; -import java.util.*; -import java.util.zip.*; -import org.apache.tools.ant.taskdefs.*; -import org.apache.tools.ant.*; + +import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.DirectoryScanner; +import org.apache.tools.ant.Project; +import org.apache.tools.ant.taskdefs.Copy; +import org.apache.tools.ant.taskdefs.Delete; +import org.apache.tools.ant.taskdefs.Expand; +import org.apache.tools.ant.taskdefs.MatchingTask; +import org.apache.tools.ant.types.FileSet; +import org.apache.tools.ant.types.PatternSet; public class AJInstaller extends MatchingTask { static final String INCLUDE_CLASSES = "$installer$/org/aspectj/*.class"; diff --git a/build/src/org/aspectj/internal/tools/ant/taskdefs/AJPush.java b/build/src/org/aspectj/internal/tools/ant/taskdefs/AJPush.java index fe6e12b45..48f0d6083 100644 --- a/build/src/org/aspectj/internal/tools/ant/taskdefs/AJPush.java +++ b/build/src/org/aspectj/internal/tools/ant/taskdefs/AJPush.java @@ -13,8 +13,6 @@ package org.aspectj.internal.tools.ant.taskdefs; -import org.apache.tools.ant.taskdefs.Mkdir; - import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; @@ -22,6 +20,8 @@ import java.io.IOException; import java.text.DecimalFormat; import java.util.Properties; +import org.apache.tools.ant.taskdefs.Mkdir; + public class AJPush extends ConditionalTask { private File src; diff --git a/build/src/org/aspectj/internal/tools/ant/taskdefs/AntBuilder.java b/build/src/org/aspectj/internal/tools/ant/taskdefs/AntBuilder.java index 613e71341..0cfd097b7 100644 --- a/build/src/org/aspectj/internal/tools/ant/taskdefs/AntBuilder.java +++ b/build/src/org/aspectj/internal/tools/ant/taskdefs/AntBuilder.java @@ -11,6 +11,14 @@ * ******************************************************************/ package org.aspectj.internal.tools.ant.taskdefs; +import java.io.File; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Hashtable; +import java.util.Iterator; +import java.util.List; + import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; import org.apache.tools.ant.Target; @@ -29,14 +37,6 @@ import org.aspectj.internal.tools.build.Modules; import org.aspectj.internal.tools.build.ProductModule; import org.aspectj.internal.tools.build.Util; -import java.io.File; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.Hashtable; -import java.util.Iterator; -import java.util.List; - /** * Implement Builder in Ant. */ diff --git a/build/src/org/aspectj/internal/tools/ant/taskdefs/BuildModule.java b/build/src/org/aspectj/internal/tools/ant/taskdefs/BuildModule.java index 9e29b8138..81aa5f63c 100644 --- a/build/src/org/aspectj/internal/tools/ant/taskdefs/BuildModule.java +++ b/build/src/org/aspectj/internal/tools/ant/taskdefs/BuildModule.java @@ -14,6 +14,8 @@ package org.aspectj.internal.tools.ant.taskdefs; +import java.io.File; + import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Location; import org.apache.tools.ant.Task; @@ -21,8 +23,6 @@ import org.apache.tools.ant.types.Path; import org.aspectj.internal.tools.build.BuildSpec; import org.aspectj.internal.tools.build.Builder; -import java.io.File; - /** * Ant interface to build a product or module, including any required modules. * @see Builder diff --git a/build/src/org/aspectj/internal/tools/ant/taskdefs/Checklics.java b/build/src/org/aspectj/internal/tools/ant/taskdefs/Checklics.java index d79c9774f..01b818e97 100644 --- a/build/src/org/aspectj/internal/tools/ant/taskdefs/Checklics.java +++ b/build/src/org/aspectj/internal/tools/ant/taskdefs/Checklics.java @@ -12,11 +12,24 @@ package org.aspectj.internal.tools.ant.taskdefs; -import org.apache.tools.ant.*; -import org.apache.tools.ant.types.*; -import org.apache.tools.ant.taskdefs.*; -import java.io.*; -import java.util.*; +import java.io.BufferedReader; +import java.io.File; +import java.io.FileReader; +import java.io.FileWriter; +import java.io.IOException; +import java.io.PrintStream; +import java.io.PrintWriter; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.List; + +import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.Project; +import org.apache.tools.ant.taskdefs.MatchingTask; +import org.apache.tools.ant.types.Path; +import org.apache.tools.ant.types.Reference; /** * Check that included .java files contain license and copyright strings diff --git a/build/src/org/aspectj/internal/tools/ant/taskdefs/ConditionalTask.java b/build/src/org/aspectj/internal/tools/ant/taskdefs/ConditionalTask.java index 8b5184121..4d3d8ad31 100644 --- a/build/src/org/aspectj/internal/tools/ant/taskdefs/ConditionalTask.java +++ b/build/src/org/aspectj/internal/tools/ant/taskdefs/ConditionalTask.java @@ -13,8 +13,13 @@ package org.aspectj.internal.tools.ant.taskdefs; -import org.apache.tools.ant.*; -import java.util.*; +import java.util.Iterator; +import java.util.List; +import java.util.StringTokenizer; +import java.util.Vector; + +import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.Task; public abstract class ConditionalTask extends Task { diff --git a/build/src/org/aspectj/internal/tools/ant/taskdefs/CopyAndInlineStylesheet.java b/build/src/org/aspectj/internal/tools/ant/taskdefs/CopyAndInlineStylesheet.java index bafe5da2b..624ed44c1 100644 --- a/build/src/org/aspectj/internal/tools/ant/taskdefs/CopyAndInlineStylesheet.java +++ b/build/src/org/aspectj/internal/tools/ant/taskdefs/CopyAndInlineStylesheet.java @@ -13,9 +13,16 @@ package org.aspectj.internal.tools.ant.taskdefs; -import org.apache.tools.ant.*; -import org.apache.tools.ant.taskdefs.*; -import java.io.*; +import java.io.BufferedReader; +import java.io.File; +import java.io.FileOutputStream; +import java.io.FileReader; +import java.io.IOException; +import java.io.PrintStream; + +import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.Task; +import org.apache.tools.ant.taskdefs.Mkdir; public class CopyAndInlineStylesheet extends Task { diff --git a/build/src/org/aspectj/internal/tools/ant/taskdefs/StripNonBodyHtml.java b/build/src/org/aspectj/internal/tools/ant/taskdefs/StripNonBodyHtml.java index 0a019707c..70b18c086 100644 --- a/build/src/org/aspectj/internal/tools/ant/taskdefs/StripNonBodyHtml.java +++ b/build/src/org/aspectj/internal/tools/ant/taskdefs/StripNonBodyHtml.java @@ -13,9 +13,18 @@ package org.aspectj.internal.tools.ant.taskdefs; -import org.apache.tools.ant.*; -import org.apache.tools.ant.taskdefs.*; -import java.io.*; +import java.io.BufferedInputStream; +import java.io.BufferedOutputStream; +import java.io.ByteArrayOutputStream; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; + +import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.DirectoryScanner; +import org.apache.tools.ant.taskdefs.MatchingTask; /** * Task to convert html source files into files with only body content. diff --git a/build/src/org/aspectj/internal/tools/ant/taskdefs/TestBuildModule.java b/build/src/org/aspectj/internal/tools/ant/taskdefs/TestBuildModule.java index 374f71d79..04e1bb54a 100644 --- a/build/src/org/aspectj/internal/tools/ant/taskdefs/TestBuildModule.java +++ b/build/src/org/aspectj/internal/tools/ant/taskdefs/TestBuildModule.java @@ -14,14 +14,14 @@ package org.aspectj.internal.tools.ant.taskdefs; +import java.io.File; +import java.util.Arrays; + import org.apache.tools.ant.Project; -import org.aspectj.internal.tools.build.*; import org.aspectj.internal.tools.build.BuildSpec; +import org.aspectj.internal.tools.build.Builder; import org.aspectj.internal.tools.build.Util; -import java.io.File; -import java.util.Arrays; - public class TestBuildModule { private static boolean REBUILD = false; private static final String SYNTAX = "java {classname} <[product|module]dir>"; diff --git a/build/src/org/aspectj/internal/tools/ant/taskdefs/VersionUptodate.java b/build/src/org/aspectj/internal/tools/ant/taskdefs/VersionUptodate.java index 61042c54b..ff1d9f4d1 100644 --- a/build/src/org/aspectj/internal/tools/ant/taskdefs/VersionUptodate.java +++ b/build/src/org/aspectj/internal/tools/ant/taskdefs/VersionUptodate.java @@ -12,15 +12,15 @@ package org.aspectj.internal.tools.ant.taskdefs; -import org.apache.tools.ant.BuildException; -import org.apache.tools.ant.Task; - import java.io.BufferedReader; import java.io.File; import java.io.FileReader; import java.io.FileWriter; import java.io.IOException; +import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.Task; + /** * Check if version source file has the specified build version, * and ensure a tag file reflects whether it does or not. diff --git a/build/src/org/aspectj/internal/tools/build/Builder.java b/build/src/org/aspectj/internal/tools/build/Builder.java index 7eddfcfdf..14aa22d0f 100644 --- a/build/src/org/aspectj/internal/tools/build/Builder.java +++ b/build/src/org/aspectj/internal/tools/build/Builder.java @@ -13,8 +13,6 @@ package org.aspectj.internal.tools.build; -import org.apache.tools.ant.BuildException; - import java.io.File; import java.io.FileFilter; import java.util.ArrayList; @@ -23,6 +21,8 @@ import java.util.Iterator; import java.util.List; import java.util.ListIterator; +import org.apache.tools.ant.BuildException; + /** * Template class to build (eclipse) modules (and, weakly, products), * including any required modules. diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/ajc/AjdtCommand.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/ajc/AjdtCommand.java index c0a3e31e1..9f733f6bb 100644 --- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/ajc/AjdtCommand.java +++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/ajc/AjdtCommand.java @@ -15,14 +15,15 @@ package org.aspectj.ajdt.ajc; import org.aspectj.ajdt.internal.core.builder.AjBuildConfig; import org.aspectj.ajdt.internal.core.builder.AjBuildManager; -import org.aspectj.bridge.*; -import org.aspectj.util.LangUtil; +import org.aspectj.bridge.AbortException; +import org.aspectj.bridge.CountingMessageHandler; +import org.aspectj.bridge.ICommand; +import org.aspectj.bridge.IMessage; +import org.aspectj.bridge.IMessageHandler; +import org.aspectj.bridge.Message; +import org.aspectj.bridge.MessageUtil; import org.eclipse.jdt.internal.core.builder.MissingSourceFileException; -import java.util.Hashtable; -import java.util.Iterator; -import java.util.List; - /** * ICommand adapter for the AspectJ eclipse-based compiler. */ diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/ajc/BuildArgParser.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/ajc/BuildArgParser.java index e448d7dd2..9fd107443 100644 --- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/ajc/BuildArgParser.java +++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/ajc/BuildArgParser.java @@ -14,22 +14,27 @@ package org.aspectj.ajdt.ajc; -import java.io.*; -import java.util.*; -import org.aspectj.ajdt.internal.core.builder.*; -import org.aspectj.weaver.bcel.*; -import org.apache.bcel.util.ClassPath; -import org.aspectj.bridge.*; -import org.aspectj.bridge.IMessage.Kind; -import org.aspectj.util.*; -import org.eclipse.jdt.core.JavaCore; -import org.eclipse.jdt.core.compiler.*; -import org.eclipse.jdt.internal.compiler.*; -import org.eclipse.jdt.internal.compiler.batch.*; -import org.eclipse.jdt.internal.compiler.problem.*; -import org.eclipse.jdt.internal.core.util.*; +import java.io.File; +import java.io.FileFilter; +import java.io.IOException; +import java.io.PrintWriter; +import java.io.StringWriter; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.List; +import java.util.ResourceBundle; +import java.util.StringTokenizer; + +import org.aspectj.ajdt.internal.core.builder.AjBuildConfig; import org.aspectj.ajdt.internal.core.builder.AjCompilerOptions; +import org.aspectj.bridge.IMessageHandler; +import org.aspectj.bridge.MessageUtil; import org.aspectj.util.ConfigParser; +import org.aspectj.util.FileUtil; +import org.aspectj.util.LangUtil; import org.eclipse.jdt.core.compiler.InvalidInputException; import org.eclipse.jdt.internal.compiler.impl.CompilerOptions; diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/AjCompiler.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/AjCompiler.java index 18e0272ce..daa6ef576 100644 --- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/AjCompiler.java +++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/AjCompiler.java @@ -17,8 +17,10 @@ import java.util.Map; import org.aspectj.ajdt.internal.compiler.lookup.EclipseWorld; import org.aspectj.bridge.IMessage; -import org.eclipse.jdt.internal.compiler.*; import org.eclipse.jdt.internal.compiler.Compiler; +import org.eclipse.jdt.internal.compiler.ICompilerRequestor; +import org.eclipse.jdt.internal.compiler.IErrorHandlingPolicy; +import org.eclipse.jdt.internal.compiler.IProblemFactory; import org.eclipse.jdt.internal.compiler.ast.CompilationUnitDeclaration; import org.eclipse.jdt.internal.compiler.env.INameEnvironment; diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/AccessForInlineVisitor.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/AccessForInlineVisitor.java index 537fbb527..ca891e962 100644 --- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/AccessForInlineVisitor.java +++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/AccessForInlineVisitor.java @@ -13,13 +13,29 @@ package org.aspectj.ajdt.internal.compiler.ast; -import java.util.*; - -import org.aspectj.ajdt.internal.compiler.lookup.*; -import org.aspectj.weaver.*; -import org.eclipse.jdt.internal.compiler.*; -import org.eclipse.jdt.internal.compiler.ast.*; -import org.eclipse.jdt.internal.compiler.lookup.*; +import org.aspectj.ajdt.internal.compiler.lookup.EclipseWorld; +import org.aspectj.ajdt.internal.compiler.lookup.InlineAccessFieldBinding; +import org.aspectj.ajdt.internal.compiler.lookup.InterTypeFieldBinding; +import org.aspectj.ajdt.internal.compiler.lookup.InterTypeMethodBinding; +import org.aspectj.ajdt.internal.compiler.lookup.PrivilegedFieldBinding; +import org.aspectj.ajdt.internal.compiler.lookup.PrivilegedHandler; +import org.aspectj.weaver.AjcMemberMaker; +import org.aspectj.weaver.ResolvedMember; +import org.eclipse.jdt.internal.compiler.AbstractSyntaxTreeVisitorAdapter; +import org.eclipse.jdt.internal.compiler.ast.AllocationExpression; +import org.eclipse.jdt.internal.compiler.ast.FieldReference; +import org.eclipse.jdt.internal.compiler.ast.MessageSend; +import org.eclipse.jdt.internal.compiler.ast.QualifiedNameReference; +import org.eclipse.jdt.internal.compiler.ast.QualifiedTypeReference; +import org.eclipse.jdt.internal.compiler.ast.SingleNameReference; +import org.eclipse.jdt.internal.compiler.ast.SingleTypeReference; +import org.eclipse.jdt.internal.compiler.ast.ThisReference; +import org.eclipse.jdt.internal.compiler.lookup.ArrayBinding; +import org.eclipse.jdt.internal.compiler.lookup.BlockScope; +import org.eclipse.jdt.internal.compiler.lookup.FieldBinding; +import org.eclipse.jdt.internal.compiler.lookup.MethodBinding; +import org.eclipse.jdt.internal.compiler.lookup.ReferenceBinding; +import org.eclipse.jdt.internal.compiler.lookup.TypeBinding; /** * Walks the body of around advice diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/AdviceDeclaration.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/AdviceDeclaration.java index fed43961a..8e3503b84 100644 --- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/AdviceDeclaration.java +++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/AdviceDeclaration.java @@ -13,20 +13,30 @@ package org.aspectj.ajdt.internal.compiler.ast; -import java.io.*; -import java.lang.reflect.*; -import java.util.*; +import java.lang.reflect.Modifier; +import java.util.ArrayList; +import java.util.List; -import org.aspectj.ajdt.internal.compiler.lookup.*; import org.aspectj.ajdt.internal.compiler.lookup.AjTypeConstants; -import org.aspectj.weaver.*; -//import org.aspectj.weaver.bcel.*; -import org.eclipse.jdt.internal.compiler.*; +import org.aspectj.ajdt.internal.compiler.lookup.EclipseWorld; +import org.aspectj.ajdt.internal.compiler.lookup.PrivilegedHandler; +import org.aspectj.weaver.Advice; +import org.aspectj.weaver.AdviceKind; +import org.aspectj.weaver.AjAttribute; +import org.aspectj.weaver.NameMangler; +import org.aspectj.weaver.ResolvedMember; +import org.aspectj.weaver.TypeX; +import org.eclipse.jdt.internal.compiler.ClassFile; import org.eclipse.jdt.internal.compiler.CompilationResult; -import org.eclipse.jdt.internal.compiler.ast.*; +import org.eclipse.jdt.internal.compiler.ast.Argument; +import org.eclipse.jdt.internal.compiler.ast.MethodDeclaration; +import org.eclipse.jdt.internal.compiler.ast.TypeDeclaration; +import org.eclipse.jdt.internal.compiler.ast.TypeReference; import org.eclipse.jdt.internal.compiler.codegen.CodeStream; -import org.eclipse.jdt.internal.compiler.lookup.*; -import org.eclipse.jdt.internal.compiler.parser.Parser; +import org.eclipse.jdt.internal.compiler.lookup.ClassScope; +import org.eclipse.jdt.internal.compiler.lookup.MethodBinding; +import org.eclipse.jdt.internal.compiler.lookup.ReferenceBinding; +import org.eclipse.jdt.internal.compiler.lookup.TypeBinding; import org.eclipse.jdt.internal.core.util.CharArrayOps; /** diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/AspectDeclaration.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/AspectDeclaration.java index 2ea980df5..7b8295af5 100644 --- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/AspectDeclaration.java +++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/AspectDeclaration.java @@ -13,16 +13,45 @@ package org.aspectj.ajdt.internal.compiler.ast; -import java.lang.reflect.*; -import java.util.*; - -import org.aspectj.ajdt.internal.compiler.lookup.*; -import org.aspectj.weaver.*; -import org.aspectj.weaver.patterns.*; -import org.eclipse.jdt.internal.compiler.*; -import org.eclipse.jdt.internal.compiler.ast.*; -import org.eclipse.jdt.internal.compiler.codegen.*; -import org.eclipse.jdt.internal.compiler.lookup.*; +import java.lang.reflect.Modifier; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Map; + +import org.aspectj.ajdt.internal.compiler.lookup.EclipseScope; +import org.aspectj.ajdt.internal.compiler.lookup.EclipseSourceType; +import org.aspectj.ajdt.internal.compiler.lookup.EclipseWorld; +import org.aspectj.ajdt.internal.compiler.lookup.HelperInterfaceBinding; +import org.aspectj.ajdt.internal.compiler.lookup.InlineAccessFieldBinding; +import org.aspectj.ajdt.internal.compiler.lookup.PrivilegedHandler; +import org.aspectj.weaver.AjAttribute; +import org.aspectj.weaver.AjcMemberMaker; +import org.aspectj.weaver.CrosscuttingMembers; +import org.aspectj.weaver.ResolvedMember; +import org.aspectj.weaver.ResolvedTypeX; +import org.aspectj.weaver.TypeX; +import org.aspectj.weaver.patterns.FormalBinding; +import org.aspectj.weaver.patterns.PerClause; +import org.aspectj.weaver.patterns.PerFromSuper; +import org.aspectj.weaver.patterns.PerSingleton; +import org.aspectj.weaver.patterns.TypePattern; +import org.eclipse.jdt.internal.compiler.ClassFile; +import org.eclipse.jdt.internal.compiler.CompilationResult; +import org.eclipse.jdt.internal.compiler.ast.Clinit; +import org.eclipse.jdt.internal.compiler.ast.MemberTypeDeclaration; +import org.eclipse.jdt.internal.compiler.codegen.CodeStream; +import org.eclipse.jdt.internal.compiler.codegen.Label; +import org.eclipse.jdt.internal.compiler.lookup.BaseTypes; +import org.eclipse.jdt.internal.compiler.lookup.BinaryTypeBinding; +import org.eclipse.jdt.internal.compiler.lookup.Binding; +import org.eclipse.jdt.internal.compiler.lookup.ClassScope; +import org.eclipse.jdt.internal.compiler.lookup.FieldBinding; +import org.eclipse.jdt.internal.compiler.lookup.InvocationSite; +import org.eclipse.jdt.internal.compiler.lookup.MethodBinding; +import org.eclipse.jdt.internal.compiler.lookup.ReferenceBinding; +import org.eclipse.jdt.internal.compiler.lookup.Scope; +import org.eclipse.jdt.internal.compiler.lookup.SourceTypeBinding; +import org.eclipse.jdt.internal.compiler.lookup.TypeBinding; // making all aspects member types avoids a nasty hierarchy pain diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/AstUtil.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/AstUtil.java index 1ea039fc8..34ae32555 100644 --- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/AstUtil.java +++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/AstUtil.java @@ -14,20 +14,37 @@ package org.aspectj.ajdt.internal.compiler.ast; import java.lang.reflect.Modifier; -import java.util.*; +import java.util.ArrayList; import java.util.List; -import org.aspectj.weaver.*; -import org.aspectj.weaver.AjAttribute.AjSynthetic; -import org.aspectj.weaver.ast.ASTNode; +import org.aspectj.weaver.AjAttribute; import org.aspectj.weaver.patterns.WildTypePattern; -import org.eclipse.jdt.internal.compiler.ClassFile; -import org.eclipse.jdt.internal.compiler.ast.*; +import org.eclipse.jdt.internal.compiler.ast.AbstractMethodDeclaration; +import org.eclipse.jdt.internal.compiler.ast.Argument; +import org.eclipse.jdt.internal.compiler.ast.AstNode; +import org.eclipse.jdt.internal.compiler.ast.Expression; +import org.eclipse.jdt.internal.compiler.ast.MethodDeclaration; +import org.eclipse.jdt.internal.compiler.ast.NameReference; +import org.eclipse.jdt.internal.compiler.ast.QualifiedNameReference; +import org.eclipse.jdt.internal.compiler.ast.QualifiedTypeReference; import org.eclipse.jdt.internal.compiler.ast.ReturnStatement; +import org.eclipse.jdt.internal.compiler.ast.SingleNameReference; +import org.eclipse.jdt.internal.compiler.ast.Statement; +import org.eclipse.jdt.internal.compiler.ast.TypeDeclaration; +import org.eclipse.jdt.internal.compiler.ast.TypeReference; import org.eclipse.jdt.internal.compiler.codegen.CodeStream; import org.eclipse.jdt.internal.compiler.env.IConstants; import org.eclipse.jdt.internal.compiler.impl.Constant; -import org.eclipse.jdt.internal.compiler.lookup.*; +import org.eclipse.jdt.internal.compiler.lookup.BaseTypes; +import org.eclipse.jdt.internal.compiler.lookup.BindingIds; +import org.eclipse.jdt.internal.compiler.lookup.CompilationUnitScope; +import org.eclipse.jdt.internal.compiler.lookup.LocalVariableBinding; +import org.eclipse.jdt.internal.compiler.lookup.MethodBinding; +import org.eclipse.jdt.internal.compiler.lookup.ReferenceBinding; +import org.eclipse.jdt.internal.compiler.lookup.Scope; +import org.eclipse.jdt.internal.compiler.lookup.SourceTypeBinding; +import org.eclipse.jdt.internal.compiler.lookup.TypeBinding; +import org.eclipse.jdt.internal.compiler.lookup.TypeIds; import org.eclipse.jdt.internal.compiler.util.CharOperation; public class AstUtil { diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/DeclareDeclaration.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/DeclareDeclaration.java index 389672f9e..1a048928d 100644 --- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/DeclareDeclaration.java +++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/DeclareDeclaration.java @@ -13,16 +13,16 @@ package org.aspectj.ajdt.internal.compiler.ast; -import org.aspectj.ajdt.internal.compiler.lookup.*; import org.aspectj.ajdt.internal.compiler.lookup.EclipseScope; -import org.aspectj.weaver.*; import org.aspectj.weaver.AjAttribute; -import org.aspectj.weaver.patterns.*; +import org.aspectj.weaver.CrosscuttingMembers; import org.aspectj.weaver.patterns.Declare; -import org.eclipse.jdt.internal.compiler.*; +import org.aspectj.weaver.patterns.FormalBinding; +import org.eclipse.jdt.internal.compiler.ClassFile; import org.eclipse.jdt.internal.compiler.CompilationResult; -import org.eclipse.jdt.internal.compiler.ast.*; -import org.eclipse.jdt.internal.compiler.lookup.*; +import org.eclipse.jdt.internal.compiler.ast.CompilationUnitDeclaration; +import org.eclipse.jdt.internal.compiler.ast.MethodDeclaration; +import org.eclipse.jdt.internal.compiler.ast.TypeReference; import org.eclipse.jdt.internal.compiler.lookup.ClassScope; import org.eclipse.jdt.internal.compiler.parser.Parser; diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/IfMethodDeclaration.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/IfMethodDeclaration.java index 434a05625..dacdbb463 100644 --- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/IfMethodDeclaration.java +++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/IfMethodDeclaration.java @@ -14,13 +14,15 @@ package org.aspectj.ajdt.internal.compiler.ast; import org.aspectj.ajdt.internal.compiler.lookup.EclipseWorld; -import org.aspectj.weaver.*; +import org.aspectj.weaver.Member; +import org.aspectj.weaver.ResolvedMember; +import org.aspectj.weaver.ResolvedTypeX; import org.aspectj.weaver.patterns.IfPointcut; -import org.eclipse.jdt.internal.compiler.*; +import org.eclipse.jdt.internal.compiler.ClassFile; import org.eclipse.jdt.internal.compiler.CompilationResult; -import org.eclipse.jdt.internal.compiler.ast.*; -import org.eclipse.jdt.internal.compiler.lookup.*; -import org.eclipse.jdt.internal.compiler.lookup.SourceTypeBinding; +import org.eclipse.jdt.internal.compiler.ast.CompilationUnitDeclaration; +import org.eclipse.jdt.internal.compiler.ast.MethodDeclaration; +import org.eclipse.jdt.internal.compiler.lookup.ClassScope; import org.eclipse.jdt.internal.compiler.parser.Parser; public class IfMethodDeclaration extends MethodDeclaration { diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/IfPseudoToken.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/IfPseudoToken.java index ca95ba129..71f4b41a4 100644 --- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/IfPseudoToken.java +++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/IfPseudoToken.java @@ -15,14 +15,20 @@ package org.aspectj.ajdt.internal.compiler.ast; import java.lang.reflect.Modifier; -import org.aspectj.ajdt.internal.compiler.lookup.EclipseWorld; -import org.aspectj.weaver.*; +import org.aspectj.weaver.Member; import org.aspectj.weaver.ResolvedMember; -import org.aspectj.weaver.patterns.*; +import org.aspectj.weaver.TypeX; +import org.aspectj.weaver.patterns.IfPointcut; +import org.aspectj.weaver.patterns.Pointcut; import org.eclipse.jdt.internal.compiler.CompilationResult; -import org.eclipse.jdt.internal.compiler.ast.*; +import org.eclipse.jdt.internal.compiler.ast.Argument; +import org.eclipse.jdt.internal.compiler.ast.Expression; +import org.eclipse.jdt.internal.compiler.ast.MethodDeclaration; +import org.eclipse.jdt.internal.compiler.ast.ReturnStatement; +import org.eclipse.jdt.internal.compiler.ast.Statement; +import org.eclipse.jdt.internal.compiler.ast.TypeDeclaration; import org.eclipse.jdt.internal.compiler.lookup.TypeBinding; -import org.eclipse.jdt.internal.compiler.parser.*; +import org.eclipse.jdt.internal.compiler.parser.Parser; /** diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/InterTypeConstructorDeclaration.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/InterTypeConstructorDeclaration.java index 5abe2ce07..cb059de9b 100644 --- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/InterTypeConstructorDeclaration.java +++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/InterTypeConstructorDeclaration.java @@ -13,11 +13,38 @@ package org.aspectj.ajdt.internal.compiler.ast; -import org.aspectj.ajdt.internal.compiler.lookup.*; -import org.aspectj.weaver.*; -import org.eclipse.jdt.internal.compiler.*; -import org.eclipse.jdt.internal.compiler.ast.*; -import org.eclipse.jdt.internal.compiler.lookup.*; +import org.aspectj.ajdt.internal.compiler.lookup.EclipseTypeMunger; +import org.aspectj.ajdt.internal.compiler.lookup.EclipseWorld; +import org.aspectj.ajdt.internal.compiler.lookup.InterTypeScope; +import org.aspectj.weaver.AjAttribute; +import org.aspectj.weaver.AjcMemberMaker; +import org.aspectj.weaver.CrosscuttingMembers; +import org.aspectj.weaver.Member; +import org.aspectj.weaver.NameMangler; +import org.aspectj.weaver.NewConstructorTypeMunger; +import org.aspectj.weaver.ResolvedMember; +import org.aspectj.weaver.ResolvedTypeX; +import org.aspectj.weaver.Shadow; +import org.aspectj.weaver.TypeX; +import org.eclipse.jdt.internal.compiler.ClassFile; +import org.eclipse.jdt.internal.compiler.CompilationResult; +import org.eclipse.jdt.internal.compiler.ast.ArrayAllocationExpression; +import org.eclipse.jdt.internal.compiler.ast.ArrayInitializer; +import org.eclipse.jdt.internal.compiler.ast.CastExpression; +import org.eclipse.jdt.internal.compiler.ast.CompilationUnitDeclaration; +import org.eclipse.jdt.internal.compiler.ast.ExplicitConstructorCall; +import org.eclipse.jdt.internal.compiler.ast.Expression; +import org.eclipse.jdt.internal.compiler.ast.MethodDeclaration; +import org.eclipse.jdt.internal.compiler.ast.NullLiteral; +import org.eclipse.jdt.internal.compiler.ast.ReturnStatement; +import org.eclipse.jdt.internal.compiler.ast.Statement; +import org.eclipse.jdt.internal.compiler.ast.TypeReference; +import org.eclipse.jdt.internal.compiler.lookup.ArrayBinding; +import org.eclipse.jdt.internal.compiler.lookup.ClassScope; +import org.eclipse.jdt.internal.compiler.lookup.LocalVariableBinding; +import org.eclipse.jdt.internal.compiler.lookup.MethodBinding; +import org.eclipse.jdt.internal.compiler.lookup.MethodScope; +import org.eclipse.jdt.internal.compiler.lookup.ProblemMethodBinding; import org.eclipse.jdt.internal.compiler.parser.Parser; diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/InterTypeDeclaration.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/InterTypeDeclaration.java index 80ca2ddd6..0a2398484 100644 --- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/InterTypeDeclaration.java +++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/InterTypeDeclaration.java @@ -14,15 +14,23 @@ package org.aspectj.ajdt.internal.compiler.ast; import java.lang.reflect.Modifier; -import java.util.*; +import java.util.ArrayList; +import java.util.List; -import org.aspectj.ajdt.internal.compiler.lookup.*; +import org.aspectj.ajdt.internal.compiler.lookup.InterTypeScope; import org.aspectj.ajdt.internal.core.builder.EclipseSourceContext; -import org.aspectj.weaver.*; -import org.eclipse.jdt.internal.compiler.*; +import org.aspectj.weaver.AjAttribute; +import org.aspectj.weaver.CrosscuttingMembers; +import org.aspectj.weaver.ResolvedMember; +import org.aspectj.weaver.ResolvedTypeMunger; +import org.aspectj.weaver.Shadow; +import org.eclipse.jdt.internal.compiler.ClassFile; import org.eclipse.jdt.internal.compiler.CompilationResult; -import org.eclipse.jdt.internal.compiler.ast.*; -import org.eclipse.jdt.internal.compiler.lookup.*; +import org.eclipse.jdt.internal.compiler.ast.MethodDeclaration; +import org.eclipse.jdt.internal.compiler.ast.TypeReference; +import org.eclipse.jdt.internal.compiler.lookup.ClassScope; +import org.eclipse.jdt.internal.compiler.lookup.ProblemReferenceBinding; +import org.eclipse.jdt.internal.compiler.lookup.ReferenceBinding; import org.eclipse.jdt.internal.compiler.util.CharOperation; public abstract class InterTypeDeclaration extends MethodDeclaration { diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/InterTypeFieldDeclaration.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/InterTypeFieldDeclaration.java index 4fbb3cdd5..d4e5f8fbb 100644 --- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/InterTypeFieldDeclaration.java +++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/InterTypeFieldDeclaration.java @@ -15,13 +15,35 @@ package org.aspectj.ajdt.internal.compiler.ast; import java.lang.reflect.Modifier; -import org.aspectj.ajdt.internal.compiler.lookup.*; -import org.aspectj.weaver.*; -import org.eclipse.jdt.internal.compiler.*; -import org.eclipse.jdt.internal.compiler.ast.*; +import org.aspectj.ajdt.internal.compiler.lookup.EclipseTypeMunger; +import org.aspectj.ajdt.internal.compiler.lookup.EclipseWorld; +import org.aspectj.weaver.AjAttribute; +import org.aspectj.weaver.AjcMemberMaker; +import org.aspectj.weaver.CrosscuttingMembers; +import org.aspectj.weaver.Member; +import org.aspectj.weaver.NewFieldTypeMunger; +import org.aspectj.weaver.ResolvedMember; +import org.aspectj.weaver.ResolvedTypeX; +import org.aspectj.weaver.Shadow; +import org.aspectj.weaver.TypeX; +import org.eclipse.jdt.internal.compiler.ClassFile; +import org.eclipse.jdt.internal.compiler.CompilationResult; +import org.eclipse.jdt.internal.compiler.ast.Argument; +import org.eclipse.jdt.internal.compiler.ast.ArrayAllocationExpression; +import org.eclipse.jdt.internal.compiler.ast.ArrayInitializer; +import org.eclipse.jdt.internal.compiler.ast.Assignment; +import org.eclipse.jdt.internal.compiler.ast.CompilationUnitDeclaration; +import org.eclipse.jdt.internal.compiler.ast.Expression; +import org.eclipse.jdt.internal.compiler.ast.Reference; +import org.eclipse.jdt.internal.compiler.ast.ReturnStatement; +import org.eclipse.jdt.internal.compiler.ast.Statement; +import org.eclipse.jdt.internal.compiler.ast.TypeReference; import org.eclipse.jdt.internal.compiler.codegen.CodeStream; -import org.eclipse.jdt.internal.compiler.impl.Constant; -import org.eclipse.jdt.internal.compiler.lookup.*; +import org.eclipse.jdt.internal.compiler.lookup.ArrayBinding; +import org.eclipse.jdt.internal.compiler.lookup.ClassScope; +import org.eclipse.jdt.internal.compiler.lookup.FieldBinding; +import org.eclipse.jdt.internal.compiler.lookup.MethodBinding; +import org.eclipse.jdt.internal.compiler.lookup.TypeBinding; import org.eclipse.jdt.internal.compiler.parser.Parser; /** diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/InterTypeMethodDeclaration.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/InterTypeMethodDeclaration.java index f76ee99ca..e5cbcf21b 100644 --- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/InterTypeMethodDeclaration.java +++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/InterTypeMethodDeclaration.java @@ -15,14 +15,27 @@ package org.aspectj.ajdt.internal.compiler.ast; import java.lang.reflect.Modifier; -import org.aspectj.ajdt.internal.compiler.lookup.*; -import org.aspectj.weaver.*; -import org.aspectj.weaver.Shadow.Kind; -import org.eclipse.jdt.internal.compiler.*; -import org.eclipse.jdt.internal.compiler.ast.*; +import org.aspectj.ajdt.internal.compiler.lookup.EclipseTypeMunger; +import org.aspectj.ajdt.internal.compiler.lookup.EclipseWorld; +import org.aspectj.weaver.AjAttribute; +import org.aspectj.weaver.AjcMemberMaker; +import org.aspectj.weaver.CrosscuttingMembers; +import org.aspectj.weaver.Member; +import org.aspectj.weaver.NewMethodTypeMunger; +import org.aspectj.weaver.ResolvedMember; +import org.aspectj.weaver.ResolvedTypeX; +import org.aspectj.weaver.Shadow; +import org.aspectj.weaver.TypeX; +import org.eclipse.jdt.internal.compiler.ClassFile; +import org.eclipse.jdt.internal.compiler.CompilationResult; +import org.eclipse.jdt.internal.compiler.ast.CompilationUnitDeclaration; +import org.eclipse.jdt.internal.compiler.ast.TypeReference; import org.eclipse.jdt.internal.compiler.codegen.CodeStream; -import org.eclipse.jdt.internal.compiler.flow.*; -import org.eclipse.jdt.internal.compiler.lookup.*; +import org.eclipse.jdt.internal.compiler.flow.FlowContext; +import org.eclipse.jdt.internal.compiler.flow.FlowInfo; +import org.eclipse.jdt.internal.compiler.lookup.ClassScope; +import org.eclipse.jdt.internal.compiler.lookup.MethodBinding; +import org.eclipse.jdt.internal.compiler.lookup.TypeBinding; import org.eclipse.jdt.internal.compiler.parser.Parser; diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/KnownFieldReference.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/KnownFieldReference.java index d1d736b54..17fbf776c 100644 --- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/KnownFieldReference.java +++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/KnownFieldReference.java @@ -13,10 +13,11 @@ package org.aspectj.ajdt.internal.compiler.ast; -import org.eclipse.jdt.internal.compiler.ast.*; -import org.eclipse.jdt.internal.compiler.ast.FieldReference; +import org.eclipse.jdt.internal.compiler.ast.QualifiedNameReference; import org.eclipse.jdt.internal.compiler.impl.Constant; -import org.eclipse.jdt.internal.compiler.lookup.*; +import org.eclipse.jdt.internal.compiler.lookup.BlockScope; +import org.eclipse.jdt.internal.compiler.lookup.FieldBinding; +import org.eclipse.jdt.internal.compiler.lookup.TypeBinding; public class KnownFieldReference extends QualifiedNameReference { diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/KnownMessageSend.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/KnownMessageSend.java index 9b89aa222..317f92aec 100644 --- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/KnownMessageSend.java +++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/KnownMessageSend.java @@ -13,13 +13,12 @@ package org.aspectj.ajdt.internal.compiler.ast; -import java.util.Arrays; - -import org.eclipse.jdt.internal.compiler.ast.*; +import org.eclipse.jdt.internal.compiler.ast.Expression; import org.eclipse.jdt.internal.compiler.ast.MessageSend; import org.eclipse.jdt.internal.compiler.codegen.CodeStream; -import org.eclipse.jdt.internal.compiler.lookup.*; +import org.eclipse.jdt.internal.compiler.lookup.BlockScope; import org.eclipse.jdt.internal.compiler.lookup.MethodBinding; +import org.eclipse.jdt.internal.compiler.lookup.TypeBinding; public class KnownMessageSend extends MessageSend { diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/MakeDeclsPublicVisitor.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/MakeDeclsPublicVisitor.java index 5e9463932..bd661a6de 100644 --- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/MakeDeclsPublicVisitor.java +++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/MakeDeclsPublicVisitor.java @@ -13,15 +13,15 @@ package org.aspectj.ajdt.internal.compiler.ast; -import java.util.Arrays; - -import org.aspectj.ajdt.internal.compiler.lookup.*; -import org.aspectj.ajdt.internal.compiler.lookup.PrivilegedHandler; -import org.aspectj.weaver.*; -import org.aspectj.weaver.ShadowMunger; import org.eclipse.jdt.internal.compiler.AbstractSyntaxTreeVisitorAdapter; -import org.eclipse.jdt.internal.compiler.ast.*; -import org.eclipse.jdt.internal.compiler.lookup.*; +import org.eclipse.jdt.internal.compiler.ast.AnonymousLocalTypeDeclaration; +import org.eclipse.jdt.internal.compiler.ast.ConstructorDeclaration; +import org.eclipse.jdt.internal.compiler.ast.FieldDeclaration; +import org.eclipse.jdt.internal.compiler.ast.LocalTypeDeclaration; +import org.eclipse.jdt.internal.compiler.ast.MethodDeclaration; +import org.eclipse.jdt.internal.compiler.lookup.BlockScope; +import org.eclipse.jdt.internal.compiler.lookup.ClassScope; +import org.eclipse.jdt.internal.compiler.lookup.MethodScope; /** * Takes a method that already has the three extra parameters diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/PointcutDeclaration.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/PointcutDeclaration.java index e776093aa..c93c4e703 100644 --- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/PointcutDeclaration.java +++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/PointcutDeclaration.java @@ -13,17 +13,18 @@ package org.aspectj.ajdt.internal.compiler.ast; -import java.io.*; -import java.io.IOException; - import org.aspectj.ajdt.internal.compiler.lookup.EclipseWorld; import org.aspectj.ajdt.internal.core.builder.EclipseSourceContext; -import org.aspectj.weaver.*; +import org.aspectj.weaver.AjAttribute; import org.aspectj.weaver.ResolvedPointcutDefinition; import org.aspectj.weaver.patterns.Pointcut; -import org.eclipse.jdt.internal.compiler.*; -import org.eclipse.jdt.internal.compiler.ast.*; -import org.eclipse.jdt.internal.compiler.lookup.*; +import org.eclipse.jdt.internal.compiler.ClassFile; +import org.eclipse.jdt.internal.compiler.CompilationResult; +import org.eclipse.jdt.internal.compiler.ast.Argument; +import org.eclipse.jdt.internal.compiler.ast.CompilationUnitDeclaration; +import org.eclipse.jdt.internal.compiler.ast.MethodDeclaration; +import org.eclipse.jdt.internal.compiler.ast.TypeDeclaration; +import org.eclipse.jdt.internal.compiler.ast.TypeReference; import org.eclipse.jdt.internal.compiler.lookup.ClassScope; import org.eclipse.jdt.internal.compiler.parser.Parser; import org.eclipse.jdt.internal.compiler.util.CharOperation; diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/PointcutDesignator.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/PointcutDesignator.java index 0744b00f0..65c362167 100644 --- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/PointcutDesignator.java +++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/PointcutDesignator.java @@ -13,16 +13,19 @@ package org.aspectj.ajdt.internal.compiler.ast; -import java.io.*; -import java.util.List; - -import org.aspectj.ajdt.internal.compiler.lookup.*; +import org.aspectj.ajdt.internal.compiler.lookup.EclipseScope; import org.aspectj.ajdt.internal.compiler.lookup.EclipseWorld; -import org.aspectj.weaver.*; -import org.aspectj.weaver.patterns.*; +import org.aspectj.weaver.TypeX; import org.aspectj.weaver.patterns.FormalBinding; -import org.eclipse.jdt.internal.compiler.ast.*; -import org.eclipse.jdt.internal.compiler.lookup.*; +import org.aspectj.weaver.patterns.Pointcut; +import org.eclipse.jdt.internal.compiler.ast.AbstractMethodDeclaration; +import org.eclipse.jdt.internal.compiler.ast.Argument; +import org.eclipse.jdt.internal.compiler.ast.AstNode; +import org.eclipse.jdt.internal.compiler.ast.MethodDeclaration; +import org.eclipse.jdt.internal.compiler.ast.TypeDeclaration; +import org.eclipse.jdt.internal.compiler.lookup.MethodBinding; +import org.eclipse.jdt.internal.compiler.lookup.SourceTypeBinding; +import org.eclipse.jdt.internal.compiler.lookup.TypeBinding; import org.eclipse.jdt.internal.compiler.parser.Parser; public class PointcutDesignator extends AstNode { diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/Proceed.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/Proceed.java index 056038ee2..9713d31a3 100644 --- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/Proceed.java +++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/Proceed.java @@ -14,11 +14,14 @@ package org.aspectj.ajdt.internal.compiler.ast; import org.aspectj.weaver.AdviceKind; -import org.eclipse.jdt.internal.compiler.ast.*; +import org.eclipse.jdt.internal.compiler.ast.Expression; import org.eclipse.jdt.internal.compiler.ast.MessageSend; import org.eclipse.jdt.internal.compiler.impl.ReferenceContext; -import org.eclipse.jdt.internal.compiler.lookup.*; -import org.eclipse.jdt.internal.compiler.lookup.MethodBinding; +import org.eclipse.jdt.internal.compiler.lookup.BlockScope; +import org.eclipse.jdt.internal.compiler.lookup.ClassScope; +import org.eclipse.jdt.internal.compiler.lookup.MethodScope; +import org.eclipse.jdt.internal.compiler.lookup.Scope; +import org.eclipse.jdt.internal.compiler.lookup.TypeBinding; public class Proceed extends MessageSend { diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/ProceedVisitor.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/ProceedVisitor.java index e731a85cf..397cb68c5 100644 --- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/ProceedVisitor.java +++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/ProceedVisitor.java @@ -13,13 +13,20 @@ package org.aspectj.ajdt.internal.compiler.ast; -import java.util.Arrays; - -import org.aspectj.weaver.*; -import org.aspectj.weaver.ShadowMunger; +import org.aspectj.weaver.Advice; import org.eclipse.jdt.internal.compiler.AbstractSyntaxTreeVisitorAdapter; -import org.eclipse.jdt.internal.compiler.ast.*; -import org.eclipse.jdt.internal.compiler.lookup.*; +import org.eclipse.jdt.internal.compiler.ast.AbstractMethodDeclaration; +import org.eclipse.jdt.internal.compiler.ast.Expression; +import org.eclipse.jdt.internal.compiler.ast.MessageSend; +import org.eclipse.jdt.internal.compiler.ast.NameReference; +import org.eclipse.jdt.internal.compiler.ast.SingleNameReference; +import org.eclipse.jdt.internal.compiler.lookup.Binding; +import org.eclipse.jdt.internal.compiler.lookup.BlockScope; +import org.eclipse.jdt.internal.compiler.lookup.ClassScope; +import org.eclipse.jdt.internal.compiler.lookup.LocalVariableBinding; +import org.eclipse.jdt.internal.compiler.lookup.MethodBinding; +import org.eclipse.jdt.internal.compiler.lookup.ReferenceBinding; +import org.eclipse.jdt.internal.compiler.lookup.TypeBinding; /** * Takes a method that already has the three extra parameters diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/PseudoToken.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/PseudoToken.java index d91746977..22aa8a395 100644 --- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/PseudoToken.java +++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/PseudoToken.java @@ -13,9 +13,11 @@ package org.aspectj.ajdt.internal.compiler.ast; -import org.aspectj.weaver.patterns.*; -import org.eclipse.jdt.internal.compiler.ast.*; +import org.aspectj.weaver.patterns.IToken; +import org.aspectj.weaver.patterns.Pointcut; import org.eclipse.jdt.internal.compiler.ast.AstNode; +import org.eclipse.jdt.internal.compiler.ast.MethodDeclaration; +import org.eclipse.jdt.internal.compiler.ast.TypeDeclaration; import org.eclipse.jdt.internal.compiler.parser.Parser; /** diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/PseudoTokens.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/PseudoTokens.java index 122385473..07ac6b9d9 100644 --- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/PseudoTokens.java +++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/PseudoTokens.java @@ -13,18 +13,21 @@ package org.aspectj.ajdt.internal.compiler.ast; -import java.io.*; -import java.util.*; - - -import org.aspectj.weaver.*; -import org.aspectj.weaver.patterns.*; -import org.eclipse.jdt.internal.compiler.*; -import org.eclipse.jdt.internal.compiler.ast.*; +import org.aspectj.weaver.IHasPosition; +import org.aspectj.weaver.ISourceContext; +import org.aspectj.weaver.patterns.BasicTokenSource; +import org.aspectj.weaver.patterns.Declare; +import org.aspectj.weaver.patterns.IToken; +import org.aspectj.weaver.patterns.ParserException; +import org.aspectj.weaver.patterns.PatternParser; +import org.aspectj.weaver.patterns.PerClause; +import org.aspectj.weaver.patterns.PerSingleton; +import org.aspectj.weaver.patterns.Pointcut; +import org.aspectj.weaver.patterns.TypePattern; import org.eclipse.jdt.internal.compiler.ast.AstNode; -import org.eclipse.jdt.internal.compiler.lookup.*; +import org.eclipse.jdt.internal.compiler.ast.MethodDeclaration; +import org.eclipse.jdt.internal.compiler.ast.TypeDeclaration; import org.eclipse.jdt.internal.compiler.parser.Parser; -import org.eclipse.jdt.internal.compiler.problem.*; public class PseudoTokens extends AstNode { diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/SuperFixerVisitor.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/SuperFixerVisitor.java index 74d071b6c..09efa97df 100644 --- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/SuperFixerVisitor.java +++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/SuperFixerVisitor.java @@ -13,16 +13,22 @@ package org.aspectj.ajdt.internal.compiler.ast; -import java.util.*; -import java.util.Arrays; +import java.util.HashSet; +import java.util.Set; -import org.aspectj.ajdt.internal.compiler.lookup.*; import org.aspectj.ajdt.internal.compiler.lookup.EclipseWorld; -import org.aspectj.weaver.*; -import org.aspectj.weaver.ShadowMunger; +import org.aspectj.ajdt.internal.compiler.lookup.InterTypeMethodBinding; +import org.aspectj.weaver.NameMangler; +import org.aspectj.weaver.ResolvedMember; import org.eclipse.jdt.internal.compiler.AbstractSyntaxTreeVisitorAdapter; -import org.eclipse.jdt.internal.compiler.ast.*; -import org.eclipse.jdt.internal.compiler.lookup.*; +import org.eclipse.jdt.internal.compiler.ast.AbstractMethodDeclaration; +import org.eclipse.jdt.internal.compiler.ast.AstNode; +import org.eclipse.jdt.internal.compiler.ast.MessageSend; +import org.eclipse.jdt.internal.compiler.ast.ThisReference; +import org.eclipse.jdt.internal.compiler.lookup.BlockScope; +import org.eclipse.jdt.internal.compiler.lookup.MethodBinding; +import org.eclipse.jdt.internal.compiler.lookup.ProblemMethodBinding; +import org.eclipse.jdt.internal.compiler.lookup.ReferenceBinding; /** * Takes a method that already has the three extra parameters diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/ThisJoinPointVisitor.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/ThisJoinPointVisitor.java index a940ffbe4..bb40f71e2 100644 --- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/ThisJoinPointVisitor.java +++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/ThisJoinPointVisitor.java @@ -13,13 +13,20 @@ package org.aspectj.ajdt.internal.compiler.ast; -import java.util.Arrays; - -import org.aspectj.weaver.*; -import org.aspectj.weaver.ShadowMunger; +import org.aspectj.weaver.Advice; import org.eclipse.jdt.internal.compiler.AbstractSyntaxTreeVisitorAdapter; -import org.eclipse.jdt.internal.compiler.ast.*; -import org.eclipse.jdt.internal.compiler.lookup.*; +import org.eclipse.jdt.internal.compiler.ast.AbstractMethodDeclaration; +import org.eclipse.jdt.internal.compiler.ast.Expression; +import org.eclipse.jdt.internal.compiler.ast.MessageSend; +import org.eclipse.jdt.internal.compiler.ast.NameReference; +import org.eclipse.jdt.internal.compiler.ast.SingleNameReference; +import org.eclipse.jdt.internal.compiler.lookup.Binding; +import org.eclipse.jdt.internal.compiler.lookup.BlockScope; +import org.eclipse.jdt.internal.compiler.lookup.ClassScope; +import org.eclipse.jdt.internal.compiler.lookup.LocalVariableBinding; +import org.eclipse.jdt.internal.compiler.lookup.MethodBinding; +import org.eclipse.jdt.internal.compiler.lookup.ReferenceBinding; +import org.eclipse.jdt.internal.compiler.lookup.TypeBinding; /** * Takes a method that already has the three extra parameters diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/AjLookupEnvironment.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/AjLookupEnvironment.java index ae428f3f1..0f7d613d6 100644 --- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/AjLookupEnvironment.java +++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/AjLookupEnvironment.java @@ -13,17 +13,30 @@ package org.aspectj.ajdt.internal.compiler.lookup; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Iterator; +import java.util.List; -import org.aspectj.ajdt.internal.compiler.ast.*; +import org.aspectj.ajdt.internal.compiler.ast.AspectDeclaration; import org.aspectj.bridge.MessageUtil; -import org.aspectj.weaver.*; -import org.aspectj.weaver.patterns.*; -import org.eclipse.jdt.internal.compiler.ast.*; -import org.eclipse.jdt.internal.compiler.env.*; +import org.aspectj.weaver.ResolvedTypeX; +import org.aspectj.weaver.TypeX; +import org.aspectj.weaver.patterns.DeclareParents; +import org.aspectj.weaver.patterns.TypePattern; +import org.aspectj.weaver.patterns.TypePatternList; +import org.eclipse.jdt.internal.compiler.ast.TypeDeclaration; +import org.eclipse.jdt.internal.compiler.env.IBinaryType; import org.eclipse.jdt.internal.compiler.env.INameEnvironment; -import org.eclipse.jdt.internal.compiler.impl.*; -import org.eclipse.jdt.internal.compiler.lookup.*; +import org.eclipse.jdt.internal.compiler.impl.CompilerOptions; +import org.eclipse.jdt.internal.compiler.impl.ITypeRequestor; +import org.eclipse.jdt.internal.compiler.lookup.BinaryTypeBinding; +import org.eclipse.jdt.internal.compiler.lookup.ClassScope; +import org.eclipse.jdt.internal.compiler.lookup.CompilationUnitScope; +import org.eclipse.jdt.internal.compiler.lookup.LookupEnvironment; +import org.eclipse.jdt.internal.compiler.lookup.PackageBinding; +import org.eclipse.jdt.internal.compiler.lookup.ReferenceBinding; +import org.eclipse.jdt.internal.compiler.lookup.SourceTypeBinding; import org.eclipse.jdt.internal.compiler.problem.ProblemReporter; public class AjLookupEnvironment extends LookupEnvironment { diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/AjTypeConstants.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/AjTypeConstants.java index a93d026b7..1faee8d3b 100644 --- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/AjTypeConstants.java +++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/AjTypeConstants.java @@ -15,8 +15,10 @@ package org.aspectj.ajdt.internal.compiler.lookup; import org.eclipse.jdt.internal.compiler.ast.QualifiedTypeReference; import org.eclipse.jdt.internal.compiler.ast.TypeReference; -import org.eclipse.jdt.internal.compiler.lookup.*; +import org.eclipse.jdt.internal.compiler.lookup.MethodBinding; +import org.eclipse.jdt.internal.compiler.lookup.ReferenceBinding; import org.eclipse.jdt.internal.compiler.lookup.Scope; +import org.eclipse.jdt.internal.compiler.lookup.TypeBinding; public class AjTypeConstants { diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseAdvice.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseAdvice.java index fdc33ae29..e55174903 100644 --- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseAdvice.java +++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseAdvice.java @@ -13,8 +13,10 @@ package org.aspectj.ajdt.internal.compiler.lookup; -import org.aspectj.weaver.*; import org.aspectj.weaver.Advice; +import org.aspectj.weaver.AjAttribute; +import org.aspectj.weaver.Member; +import org.aspectj.weaver.Shadow; import org.aspectj.weaver.patterns.Pointcut; diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseBinaryType.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseBinaryType.java index a214f9de6..56cbecab3 100644 --- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseBinaryType.java +++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseBinaryType.java @@ -13,17 +13,11 @@ package org.aspectj.ajdt.internal.compiler.lookup; -import java.util.*; - -import org.aspectj.ajdt.internal.compiler.ast.*; -import org.aspectj.ajdt.internal.compiler.ast.PointcutDeclaration; -import org.aspectj.bridge.*; -import org.aspectj.bridge.MessageUtil; -import org.aspectj.weaver.*; -import org.aspectj.weaver.patterns.*; -import org.eclipse.jdt.internal.compiler.ast.*; -import org.eclipse.jdt.internal.compiler.ast.AbstractMethodDeclaration; -import org.eclipse.jdt.internal.compiler.lookup.*; +import org.aspectj.weaver.ResolvedMember; +import org.aspectj.weaver.ResolvedPointcutDefinition; +import org.aspectj.weaver.ResolvedTypeX; +import org.aspectj.weaver.TypeX; +import org.eclipse.jdt.internal.compiler.lookup.BinaryTypeBinding; public class EclipseBinaryType extends EclipseObjectType { private BinaryTypeBinding binding; diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseObjectType.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseObjectType.java index 9477a7268..635cb18e7 100644 --- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseObjectType.java +++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseObjectType.java @@ -13,16 +13,10 @@ package org.aspectj.ajdt.internal.compiler.lookup; -import java.util.*; - -import org.aspectj.ajdt.internal.compiler.ast.*; -import org.aspectj.ajdt.internal.compiler.ast.PointcutDeclaration; -import org.aspectj.bridge.*; -import org.aspectj.bridge.MessageUtil; -import org.aspectj.weaver.*; -import org.eclipse.jdt.internal.compiler.ast.*; -import org.eclipse.jdt.internal.compiler.ast.AbstractMethodDeclaration; -import org.eclipse.jdt.internal.compiler.lookup.*; +import org.aspectj.weaver.CrosscuttingMembers; +import org.aspectj.weaver.ResolvedMember; +import org.aspectj.weaver.ResolvedPointcutDefinition; +import org.aspectj.weaver.ResolvedTypeX; public abstract class EclipseObjectType extends ResolvedTypeX.Name { protected ResolvedPointcutDefinition[] declaredPointcuts = null; diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseScope.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseScope.java index 6a5639dce..d90f99781 100644 --- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseScope.java +++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseScope.java @@ -13,12 +13,25 @@ package org.aspectj.ajdt.internal.compiler.lookup; -import java.util.*; +import java.util.ArrayList; +import java.util.List; -import org.aspectj.bridge.*; -import org.aspectj.weaver.*; -import org.aspectj.weaver.patterns.*; -import org.eclipse.jdt.internal.compiler.lookup.*; +import org.aspectj.bridge.IMessage; +import org.aspectj.bridge.IMessageHandler; +import org.aspectj.bridge.ISourceLocation; +import org.aspectj.bridge.Message; +import org.aspectj.weaver.IHasPosition; +import org.aspectj.weaver.ResolvedTypeX; +import org.aspectj.weaver.TypeX; +import org.aspectj.weaver.World; +import org.aspectj.weaver.patterns.FormalBinding; +import org.aspectj.weaver.patterns.IScope; +import org.eclipse.jdt.internal.compiler.lookup.ClassScope; +import org.eclipse.jdt.internal.compiler.lookup.CompilationUnitScope; +import org.eclipse.jdt.internal.compiler.lookup.ImportBinding; +import org.eclipse.jdt.internal.compiler.lookup.ReferenceBinding; +import org.eclipse.jdt.internal.compiler.lookup.Scope; +import org.eclipse.jdt.internal.compiler.lookup.TypeBinding; import org.eclipse.jdt.internal.compiler.util.CharOperation; /** diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseShadow.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseShadow.java index 789c92272..8808443cf 100644 --- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseShadow.java +++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseShadow.java @@ -13,13 +13,24 @@ package org.aspectj.ajdt.internal.compiler.lookup; -import org.aspectj.ajdt.internal.compiler.ast.*; import org.aspectj.ajdt.internal.compiler.ast.AdviceDeclaration; +import org.aspectj.ajdt.internal.compiler.ast.InterTypeConstructorDeclaration; +import org.aspectj.ajdt.internal.compiler.ast.InterTypeDeclaration; +import org.aspectj.ajdt.internal.compiler.ast.InterTypeFieldDeclaration; +import org.aspectj.ajdt.internal.compiler.ast.InterTypeMethodDeclaration; import org.aspectj.bridge.SourceLocation; -import org.aspectj.weaver.*; +import org.aspectj.weaver.Member; +import org.aspectj.weaver.Shadow; +import org.aspectj.weaver.TypeX; +import org.aspectj.weaver.World; import org.aspectj.weaver.ast.Var; -import org.eclipse.jdt.internal.compiler.ast.*; +import org.eclipse.jdt.internal.compiler.ast.AbstractMethodDeclaration; +import org.eclipse.jdt.internal.compiler.ast.AllocationExpression; import org.eclipse.jdt.internal.compiler.ast.AstNode; +import org.eclipse.jdt.internal.compiler.ast.ConstructorDeclaration; +import org.eclipse.jdt.internal.compiler.ast.ExplicitConstructorCall; +import org.eclipse.jdt.internal.compiler.ast.MessageSend; +import org.eclipse.jdt.internal.compiler.ast.MethodDeclaration; import org.eclipse.jdt.internal.compiler.impl.ReferenceContext; /** diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseSourceType.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseSourceType.java index 5e17f93c5..e5aa34279 100644 --- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseSourceType.java +++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseSourceType.java @@ -13,16 +13,23 @@ package org.aspectj.ajdt.internal.compiler.lookup; -import java.util.*; +import java.util.ArrayList; +import java.util.List; -import org.aspectj.ajdt.internal.compiler.ast.*; +import org.aspectj.ajdt.internal.compiler.ast.AspectDeclaration; import org.aspectj.ajdt.internal.compiler.ast.PointcutDeclaration; -import org.aspectj.bridge.*; -import org.aspectj.bridge.MessageUtil; -import org.aspectj.weaver.*; -import org.eclipse.jdt.internal.compiler.ast.*; +import org.aspectj.bridge.IMessage; +import org.aspectj.bridge.ISourceLocation; +import org.aspectj.weaver.ResolvedMember; +import org.aspectj.weaver.ResolvedPointcutDefinition; +import org.aspectj.weaver.ResolvedTypeX; +import org.aspectj.weaver.TypeX; import org.eclipse.jdt.internal.compiler.ast.AbstractMethodDeclaration; -import org.eclipse.jdt.internal.compiler.lookup.*; +import org.eclipse.jdt.internal.compiler.ast.TypeDeclaration; +import org.eclipse.jdt.internal.compiler.lookup.CompilerModifiers; +import org.eclipse.jdt.internal.compiler.lookup.FieldBinding; +import org.eclipse.jdt.internal.compiler.lookup.MethodBinding; +import org.eclipse.jdt.internal.compiler.lookup.SourceTypeBinding; public class EclipseSourceType extends EclipseObjectType { private SourceTypeBinding binding; diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseTypeMunger.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseTypeMunger.java index 5f2d85d5d..a45ab703c 100644 --- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseTypeMunger.java +++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseTypeMunger.java @@ -15,13 +15,19 @@ package org.aspectj.ajdt.internal.compiler.lookup; import java.lang.reflect.Modifier; -import org.aspectj.bridge.*; import org.aspectj.bridge.ISourceLocation; -import org.aspectj.weaver.*; import org.aspectj.weaver.ConcreteTypeMunger; +import org.aspectj.weaver.NewConstructorTypeMunger; +import org.aspectj.weaver.NewFieldTypeMunger; +import org.aspectj.weaver.NewMethodTypeMunger; +import org.aspectj.weaver.ResolvedTypeMunger; +import org.aspectj.weaver.ResolvedTypeX; +import org.aspectj.weaver.TypeX; import org.eclipse.jdt.internal.compiler.ast.AbstractMethodDeclaration; -import org.eclipse.jdt.internal.compiler.lookup.*; -import org.eclipse.jdt.internal.compiler.lookup.ClassScope; +import org.eclipse.jdt.internal.compiler.lookup.FieldBinding; +import org.eclipse.jdt.internal.compiler.lookup.MethodBinding; +import org.eclipse.jdt.internal.compiler.lookup.ReferenceBinding; +import org.eclipse.jdt.internal.compiler.lookup.SourceTypeBinding; public class EclipseTypeMunger extends ConcreteTypeMunger { diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseWorld.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseWorld.java index 1815a4e7a..3894e8b0f 100644 --- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseWorld.java +++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseWorld.java @@ -13,18 +13,40 @@ package org.aspectj.ajdt.internal.compiler.lookup; -import java.util.*; +import java.util.Collection; +import java.util.HashMap; +import java.util.Map; import org.aspectj.ajdt.internal.compiler.ast.AstUtil; -import org.aspectj.ajdt.internal.core.builder.*; import org.aspectj.ajdt.internal.core.builder.AjBuildManager; +import org.aspectj.ajdt.internal.core.builder.AsmBuilder; import org.aspectj.bridge.IMessageHandler; -import org.aspectj.weaver.*; -import org.aspectj.weaver.patterns.*; -import org.eclipse.jdt.internal.compiler.ast.*; -import org.eclipse.jdt.internal.compiler.impl.*; +import org.aspectj.weaver.Advice; +import org.aspectj.weaver.AjAttribute; +import org.aspectj.weaver.ConcreteTypeMunger; +import org.aspectj.weaver.IHasPosition; +import org.aspectj.weaver.Member; +import org.aspectj.weaver.ResolvedMember; +import org.aspectj.weaver.ResolvedTypeMunger; +import org.aspectj.weaver.ResolvedTypeX; +import org.aspectj.weaver.Shadow; +import org.aspectj.weaver.TypeX; +import org.aspectj.weaver.World; +import org.aspectj.weaver.patterns.Pointcut; +import org.eclipse.jdt.internal.compiler.ast.AstNode; +import org.eclipse.jdt.internal.compiler.ast.CompilationUnitDeclaration; +import org.eclipse.jdt.internal.compiler.ast.EmptyStatement; import org.eclipse.jdt.internal.compiler.impl.Constant; -import org.eclipse.jdt.internal.compiler.lookup.*; +import org.eclipse.jdt.internal.compiler.impl.ReferenceContext; +import org.eclipse.jdt.internal.compiler.lookup.BaseTypes; +import org.eclipse.jdt.internal.compiler.lookup.BinaryTypeBinding; +import org.eclipse.jdt.internal.compiler.lookup.FieldBinding; +import org.eclipse.jdt.internal.compiler.lookup.LookupEnvironment; +import org.eclipse.jdt.internal.compiler.lookup.MethodBinding; +import org.eclipse.jdt.internal.compiler.lookup.ReferenceBinding; +import org.eclipse.jdt.internal.compiler.lookup.Scope; +import org.eclipse.jdt.internal.compiler.lookup.SourceTypeBinding; +import org.eclipse.jdt.internal.compiler.lookup.TypeBinding; import org.eclipse.jdt.internal.compiler.util.CharOperation; /** diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/HelperInterfaceBinding.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/HelperInterfaceBinding.java index 32f2a9ef7..12708fc8d 100644 --- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/HelperInterfaceBinding.java +++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/HelperInterfaceBinding.java @@ -13,12 +13,20 @@ package org.aspectj.ajdt.internal.compiler.lookup; -import java.util.*; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; -import org.aspectj.weaver.*; +import org.aspectj.weaver.ResolvedMember; import org.aspectj.weaver.TypeX; -import org.eclipse.jdt.internal.compiler.*; -import org.eclipse.jdt.internal.compiler.lookup.*; +import org.eclipse.jdt.internal.compiler.ClassFile; +import org.eclipse.jdt.internal.compiler.CompilationResult; +import org.eclipse.jdt.internal.compiler.lookup.ClassScope; +import org.eclipse.jdt.internal.compiler.lookup.FieldBinding; +import org.eclipse.jdt.internal.compiler.lookup.MethodBinding; +import org.eclipse.jdt.internal.compiler.lookup.PackageBinding; +import org.eclipse.jdt.internal.compiler.lookup.ReferenceBinding; +import org.eclipse.jdt.internal.compiler.lookup.SourceTypeBinding; public class HelperInterfaceBinding extends SourceTypeBinding { private TypeX typeX; diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/InlineAccessFieldBinding.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/InlineAccessFieldBinding.java index 389bfa8d0..61f37145a 100644 --- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/InlineAccessFieldBinding.java +++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/InlineAccessFieldBinding.java @@ -13,17 +13,14 @@ package org.aspectj.ajdt.internal.compiler.lookup; -import java.lang.reflect.Modifier; - -import org.aspectj.ajdt.internal.compiler.ast.*; -import org.aspectj.ajdt.internal.compiler.ast.AstUtil; -import org.aspectj.weaver.*; -import org.aspectj.weaver.NameMangler; -import org.eclipse.jdt.internal.compiler.ast.*; -import org.eclipse.jdt.internal.compiler.ast.FieldDeclaration; -import org.eclipse.jdt.internal.compiler.impl.Constant; -import org.eclipse.jdt.internal.compiler.lookup.*; -import org.eclipse.jdt.internal.compiler.util.CharOperation; +import org.aspectj.ajdt.internal.compiler.ast.AspectDeclaration; +import org.aspectj.weaver.AjcMemberMaker; +import org.eclipse.jdt.internal.compiler.ast.AstNode; +import org.eclipse.jdt.internal.compiler.lookup.FieldBinding; +import org.eclipse.jdt.internal.compiler.lookup.InvocationSite; +import org.eclipse.jdt.internal.compiler.lookup.Scope; +import org.eclipse.jdt.internal.compiler.lookup.SyntheticAccessMethodBinding; +import org.eclipse.jdt.internal.compiler.lookup.TypeBinding; /** diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/InterTypeFieldBinding.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/InterTypeFieldBinding.java index 7c1e455e6..b665f45b0 100644 --- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/InterTypeFieldBinding.java +++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/InterTypeFieldBinding.java @@ -13,16 +13,17 @@ package org.aspectj.ajdt.internal.compiler.lookup; -import java.lang.reflect.Modifier; - -import org.aspectj.ajdt.internal.compiler.ast.AstUtil; -import org.aspectj.weaver.*; -import org.aspectj.weaver.NameMangler; -import org.eclipse.jdt.internal.compiler.ast.*; -import org.eclipse.jdt.internal.compiler.ast.FieldDeclaration; -import org.eclipse.jdt.internal.compiler.impl.Constant; -import org.eclipse.jdt.internal.compiler.lookup.*; -import org.eclipse.jdt.internal.compiler.util.CharOperation; +import org.aspectj.weaver.AjcMemberMaker; +import org.aspectj.weaver.ResolvedMember; +import org.aspectj.weaver.TypeX; +import org.eclipse.jdt.internal.compiler.ast.AbstractMethodDeclaration; +import org.eclipse.jdt.internal.compiler.lookup.FieldBinding; +import org.eclipse.jdt.internal.compiler.lookup.InvocationSite; +import org.eclipse.jdt.internal.compiler.lookup.ReferenceBinding; +import org.eclipse.jdt.internal.compiler.lookup.Scope; +import org.eclipse.jdt.internal.compiler.lookup.SourceTypeBinding; +import org.eclipse.jdt.internal.compiler.lookup.SyntheticAccessMethodBinding; +import org.eclipse.jdt.internal.compiler.lookup.TypeBinding; public class InterTypeFieldBinding extends FieldBinding { public ReferenceBinding targetType; diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/InterTypeMemberFinder.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/InterTypeMemberFinder.java index e35c0996e..37be6e494 100644 --- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/InterTypeMemberFinder.java +++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/InterTypeMemberFinder.java @@ -13,12 +13,19 @@ package org.aspectj.ajdt.internal.compiler.lookup; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; -import org.aspectj.weaver.*; -import org.aspectj.weaver.ResolvedTypeX; -import org.eclipse.jdt.internal.compiler.ast.AbstractMethodDeclaration; -import org.eclipse.jdt.internal.compiler.lookup.*; +import org.eclipse.jdt.internal.compiler.lookup.FieldBinding; +import org.eclipse.jdt.internal.compiler.lookup.IMemberFinder; +import org.eclipse.jdt.internal.compiler.lookup.InvocationSite; +import org.eclipse.jdt.internal.compiler.lookup.MethodBinding; +import org.eclipse.jdt.internal.compiler.lookup.ProblemFieldBinding; +import org.eclipse.jdt.internal.compiler.lookup.ReferenceBinding; +import org.eclipse.jdt.internal.compiler.lookup.Scope; +import org.eclipse.jdt.internal.compiler.lookup.SourceTypeBinding; +import org.eclipse.jdt.internal.compiler.lookup.TypeBinding; import org.eclipse.jdt.internal.compiler.problem.ProblemReporter; import org.eclipse.jdt.internal.compiler.util.CharOperation; diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/InterTypeMethodBinding.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/InterTypeMethodBinding.java index fac054a2d..f4de471fc 100644 --- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/InterTypeMethodBinding.java +++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/InterTypeMethodBinding.java @@ -13,9 +13,17 @@ package org.aspectj.ajdt.internal.compiler.lookup; -import org.aspectj.weaver.*; +import org.aspectj.weaver.AjcMemberMaker; +import org.aspectj.weaver.Member; +import org.aspectj.weaver.ResolvedMember; +import org.aspectj.weaver.TypeX; import org.eclipse.jdt.internal.compiler.ast.AbstractMethodDeclaration; -import org.eclipse.jdt.internal.compiler.lookup.*; +import org.eclipse.jdt.internal.compiler.lookup.InvocationSite; +import org.eclipse.jdt.internal.compiler.lookup.MethodBinding; +import org.eclipse.jdt.internal.compiler.lookup.ReferenceBinding; +import org.eclipse.jdt.internal.compiler.lookup.Scope; +import org.eclipse.jdt.internal.compiler.lookup.SourceTypeBinding; +import org.eclipse.jdt.internal.compiler.lookup.TypeBinding; public class InterTypeMethodBinding extends MethodBinding { private ReferenceBinding targetType; diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/InterTypeScope.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/InterTypeScope.java index d9c94fe5a..bfdb999f6 100644 --- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/InterTypeScope.java +++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/InterTypeScope.java @@ -14,7 +14,10 @@ package org.aspectj.ajdt.internal.compiler.lookup; import org.eclipse.jdt.internal.compiler.ast.TypeDeclaration; -import org.eclipse.jdt.internal.compiler.lookup.*; +import org.eclipse.jdt.internal.compiler.lookup.ClassScope; +import org.eclipse.jdt.internal.compiler.lookup.ReferenceBinding; +import org.eclipse.jdt.internal.compiler.lookup.Scope; +import org.eclipse.jdt.internal.compiler.lookup.SourceTypeBinding; public class InterTypeScope extends ClassScope { ReferenceBinding onType; diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/PointcutBinding.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/PointcutBinding.java index c7e9ace14..c21b2545c 100644 --- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/PointcutBinding.java +++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/PointcutBinding.java @@ -13,7 +13,7 @@ package org.aspectj.ajdt.internal.compiler.lookup; -import org.eclipse.jdt.internal.compiler.lookup.*; +import org.eclipse.jdt.internal.compiler.lookup.Binding; /** */ diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/PrivilegedFieldBinding.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/PrivilegedFieldBinding.java index 0028827f1..67d2aaa36 100644 --- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/PrivilegedFieldBinding.java +++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/PrivilegedFieldBinding.java @@ -13,17 +13,14 @@ package org.aspectj.ajdt.internal.compiler.lookup; -import java.lang.reflect.Modifier; - -import org.aspectj.ajdt.internal.compiler.ast.*; -import org.aspectj.ajdt.internal.compiler.ast.AstUtil; -import org.aspectj.weaver.*; -import org.aspectj.weaver.NameMangler; -import org.eclipse.jdt.internal.compiler.ast.*; -import org.eclipse.jdt.internal.compiler.ast.FieldDeclaration; -import org.eclipse.jdt.internal.compiler.impl.Constant; -import org.eclipse.jdt.internal.compiler.lookup.*; -import org.eclipse.jdt.internal.compiler.util.CharOperation; +import org.aspectj.ajdt.internal.compiler.ast.AspectDeclaration; +import org.aspectj.weaver.AjcMemberMaker; +import org.eclipse.jdt.internal.compiler.ast.AstNode; +import org.eclipse.jdt.internal.compiler.lookup.FieldBinding; +import org.eclipse.jdt.internal.compiler.lookup.InvocationSite; +import org.eclipse.jdt.internal.compiler.lookup.Scope; +import org.eclipse.jdt.internal.compiler.lookup.SyntheticAccessMethodBinding; +import org.eclipse.jdt.internal.compiler.lookup.TypeBinding; public class PrivilegedFieldBinding extends FieldBinding { public SimpleSyntheticAccessMethodBinding reader; diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/PrivilegedHandler.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/PrivilegedHandler.java index f834773eb..04f674a0c 100644 --- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/PrivilegedHandler.java +++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/PrivilegedHandler.java @@ -13,13 +13,25 @@ package org.aspectj.ajdt.internal.compiler.lookup; -import java.util.*; +import java.util.Collection; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Map; import org.aspectj.ajdt.internal.compiler.ast.AspectDeclaration; import org.aspectj.bridge.ISourceLocation; -import org.aspectj.weaver.*; +import org.aspectj.weaver.AjcMemberMaker; +import org.aspectj.weaver.Lint; +import org.aspectj.weaver.Member; +import org.aspectj.weaver.ResolvedMember; +import org.aspectj.weaver.ResolvedTypeX; +import org.aspectj.weaver.TypeX; +import org.aspectj.weaver.World; import org.eclipse.jdt.internal.compiler.ast.AstNode; -import org.eclipse.jdt.internal.compiler.lookup.*; +import org.eclipse.jdt.internal.compiler.lookup.FieldBinding; +import org.eclipse.jdt.internal.compiler.lookup.IPrivilegedHandler; +import org.eclipse.jdt.internal.compiler.lookup.MethodBinding; +import org.eclipse.jdt.internal.compiler.lookup.ReferenceBinding; diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/SimpleSyntheticAccessMethodBinding.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/SimpleSyntheticAccessMethodBinding.java index 04cd29f39..b1f05c1c2 100644 --- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/SimpleSyntheticAccessMethodBinding.java +++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/SimpleSyntheticAccessMethodBinding.java @@ -13,7 +13,8 @@ package org.aspectj.ajdt.internal.compiler.lookup; -import org.eclipse.jdt.internal.compiler.lookup.*; +import org.eclipse.jdt.internal.compiler.lookup.MethodBinding; +import org.eclipse.jdt.internal.compiler.lookup.SyntheticAccessMethodBinding; public class SimpleSyntheticAccessMethodBinding extends SyntheticAccessMethodBinding { public SimpleSyntheticAccessMethodBinding(MethodBinding method) { diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/parser/AjParser.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/parser/AjParser.java index c4efc18a1..5deff00eb 100644 --- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/parser/AjParser.java +++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/parser/AjParser.java @@ -14,17 +14,38 @@ package org.aspectj.ajdt.internal.compiler.parser; import java.lang.reflect.Modifier; -import java.util.*; - -import org.aspectj.ajdt.internal.compiler.ast.*; +import java.util.Arrays; +import java.util.List; + +import org.aspectj.ajdt.internal.compiler.ast.AdviceDeclaration; +import org.aspectj.ajdt.internal.compiler.ast.AspectDeclaration; +import org.aspectj.ajdt.internal.compiler.ast.DeclareDeclaration; +import org.aspectj.ajdt.internal.compiler.ast.IfPseudoToken; +import org.aspectj.ajdt.internal.compiler.ast.InterTypeConstructorDeclaration; +import org.aspectj.ajdt.internal.compiler.ast.InterTypeFieldDeclaration; +import org.aspectj.ajdt.internal.compiler.ast.InterTypeMethodDeclaration; +import org.aspectj.ajdt.internal.compiler.ast.PointcutDeclaration; +import org.aspectj.ajdt.internal.compiler.ast.PointcutDesignator; +import org.aspectj.ajdt.internal.compiler.ast.Proceed; +import org.aspectj.ajdt.internal.compiler.ast.PseudoToken; +import org.aspectj.ajdt.internal.compiler.ast.PseudoTokens; import org.aspectj.ajdt.internal.core.builder.EclipseSourceContext; -import org.aspectj.weaver.*; import org.aspectj.weaver.AdviceKind; +import org.aspectj.weaver.ISourceContext; import org.aspectj.weaver.patterns.Declare; import org.eclipse.jdt.internal.compiler.CompilationResult; -import org.eclipse.jdt.internal.compiler.ast.*; -import org.eclipse.jdt.internal.compiler.parser.*; -import org.eclipse.jdt.internal.compiler.problem.*; +import org.eclipse.jdt.internal.compiler.ast.Argument; +import org.eclipse.jdt.internal.compiler.ast.AstNode; +import org.eclipse.jdt.internal.compiler.ast.ExplicitConstructorCall; +import org.eclipse.jdt.internal.compiler.ast.Expression; +import org.eclipse.jdt.internal.compiler.ast.Literal; +import org.eclipse.jdt.internal.compiler.ast.MessageSend; +import org.eclipse.jdt.internal.compiler.ast.OperatorExpression; +import org.eclipse.jdt.internal.compiler.ast.TypeReference; +import org.eclipse.jdt.internal.compiler.parser.Parser; +import org.eclipse.jdt.internal.compiler.parser.RecoveredType; +import org.eclipse.jdt.internal.compiler.problem.ProblemReporter; +import org.eclipse.jdt.internal.compiler.problem.ProblemSeverities; import org.eclipse.jdt.internal.compiler.util.CharOperation; import org.eclipse.jdt.internal.core.util.CharArrayOps; diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/parser/AjScanner.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/parser/AjScanner.java index 070b79b87..c36003a77 100644 --- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/parser/AjScanner.java +++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/parser/AjScanner.java @@ -15,7 +15,8 @@ package org.aspectj.ajdt.internal.compiler.parser; import org.aspectj.ajdt.compiler.IAjTerminalSymbols; -import org.eclipse.jdt.core.compiler.*; +import org.eclipse.jdt.core.compiler.IScanner; +import org.eclipse.jdt.core.compiler.InvalidInputException; import org.eclipse.jdt.internal.compiler.parser.Scanner; import org.eclipse.jdt.internal.compiler.util.CharOperation; diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/problem/AjProblemReporter.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/problem/AjProblemReporter.java index 47f3333b4..be2ccd2a5 100644 --- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/problem/AjProblemReporter.java +++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/problem/AjProblemReporter.java @@ -16,18 +16,23 @@ import java.lang.reflect.Modifier; import java.util.Iterator; -import org.aspectj.ajdt.internal.compiler.ast.*; +import org.aspectj.ajdt.internal.compiler.ast.PointcutDeclaration; import org.aspectj.ajdt.internal.compiler.ast.Proceed; import org.aspectj.ajdt.internal.compiler.lookup.EclipseWorld; import org.aspectj.util.FuzzyBoolean; -import org.aspectj.weaver.*; +import org.aspectj.weaver.ConcreteTypeMunger; +import org.aspectj.weaver.ResolvedMember; +import org.aspectj.weaver.ResolvedTypeX; import org.aspectj.weaver.Shadow; import org.aspectj.weaver.patterns.DeclareSoft; -import org.eclipse.jdt.internal.compiler.*; +import org.eclipse.jdt.internal.compiler.CompilationResult; +import org.eclipse.jdt.internal.compiler.IErrorHandlingPolicy; +import org.eclipse.jdt.internal.compiler.IProblemFactory; import org.eclipse.jdt.internal.compiler.ast.AstNode; -import org.eclipse.jdt.internal.compiler.impl.*; import org.eclipse.jdt.internal.compiler.impl.CompilerOptions; -import org.eclipse.jdt.internal.compiler.lookup.*; +import org.eclipse.jdt.internal.compiler.impl.ReferenceContext; +import org.eclipse.jdt.internal.compiler.lookup.MethodBinding; +import org.eclipse.jdt.internal.compiler.lookup.SourceTypeBinding; import org.eclipse.jdt.internal.compiler.lookup.TypeBinding; import org.eclipse.jdt.internal.compiler.problem.ProblemReporter; import org.eclipse.jdt.internal.compiler.util.CharOperation; diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjBuildConfig.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjBuildConfig.java index 8ef8f17d9..6b73b5136 100644 --- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjBuildConfig.java +++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjBuildConfig.java @@ -17,7 +17,11 @@ package org.aspectj.ajdt.internal.core.builder; import java.io.File; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; import org.eclipse.jdt.internal.compiler.impl.CompilerOptions; diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjBuildManager.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjBuildManager.java index fcde89c06..7176a1035 100644 --- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjBuildManager.java +++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjBuildManager.java @@ -13,31 +13,67 @@ package org.aspectj.ajdt.internal.core.builder; +import java.io.File; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Locale; +import java.util.Set; +import java.util.jar.Attributes; +import java.util.jar.JarFile; +import java.util.jar.Manifest; + import org.aspectj.ajdt.internal.compiler.AjCompiler; import org.aspectj.ajdt.internal.compiler.lookup.AjLookupEnvironment; import org.aspectj.ajdt.internal.compiler.lookup.EclipseWorld; import org.aspectj.ajdt.internal.compiler.parser.AjParser; import org.aspectj.ajdt.internal.compiler.problem.AjProblemReporter; -import org.aspectj.asm.*; -import org.aspectj.bridge.*; +import org.aspectj.asm.ProgramElementNode; +import org.aspectj.asm.StructureModel; +import org.aspectj.asm.StructureModelManager; +import org.aspectj.bridge.AbortException; +import org.aspectj.bridge.CountingMessageHandler; +import org.aspectj.bridge.IMessage; +import org.aspectj.bridge.IMessageHandler; +import org.aspectj.bridge.Message; +import org.aspectj.bridge.MessageUtil; +import org.aspectj.bridge.Version; import org.aspectj.util.LangUtil; -import org.aspectj.weaver.bcel.*; -import org.aspectj.workbench.resources.*; +import org.aspectj.weaver.bcel.BcelWeaver; +import org.aspectj.weaver.bcel.BcelWorld; +import org.aspectj.weaver.bcel.UnwovenClassFile; +import org.aspectj.workbench.resources.FilesystemFile; +import org.aspectj.workbench.resources.FilesystemFolder; +import org.aspectj.workbench.resources.SimpleProject; import org.eclipse.core.internal.events.ResourceDelta; -import org.eclipse.core.resources.*; +import org.eclipse.core.resources.IContainer; +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.IResource; +import org.eclipse.core.resources.IResourceDelta; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.Path; import org.eclipse.jdt.core.compiler.IProblem; -import org.eclipse.jdt.internal.compiler.*; +import org.eclipse.jdt.internal.compiler.CompilationResult; +import org.eclipse.jdt.internal.compiler.Compiler; +import org.eclipse.jdt.internal.compiler.DefaultErrorHandlingPolicies; import org.eclipse.jdt.internal.compiler.env.ICompilationUnit; import org.eclipse.jdt.internal.compiler.util.Util; -import org.eclipse.jdt.internal.core.builder.*; -import org.eclipse.jdt.internal.compiler.Compiler; - -import java.io.File; -import java.io.IOException; -import java.util.*; -import java.util.jar.*; +import org.eclipse.jdt.internal.core.builder.AbortIncrementalBuildException; +import org.eclipse.jdt.internal.core.builder.AbstractImageBuilder; +import org.eclipse.jdt.internal.core.builder.BatchImageBuilder; +import org.eclipse.jdt.internal.core.builder.BuildNotifier; +import org.eclipse.jdt.internal.core.builder.ClasspathLocation; +import org.eclipse.jdt.internal.core.builder.IncrementalImageBuilder; +import org.eclipse.jdt.internal.core.builder.JavaBuilder; +import org.eclipse.jdt.internal.core.builder.NameEnvironment; +import org.eclipse.jdt.internal.core.builder.ProblemFactory; +import org.eclipse.jdt.internal.core.builder.SimpleLookupTable; +import org.eclipse.jdt.internal.core.builder.SourceFile; +import org.eclipse.jdt.internal.core.builder.State; public class AjBuildManager { diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjCompilerOptions.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjCompilerOptions.java index b64cdd6b4..65769fe10 100644 --- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjCompilerOptions.java +++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjCompilerOptions.java @@ -13,7 +13,6 @@ package org.aspectj.ajdt.internal.core.builder; -import java.util.Map; /** * ??? should this go away? diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjNameEnvironment.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjNameEnvironment.java index 89832472a..836ae7ecb 100644 --- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjNameEnvironment.java +++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjNameEnvironment.java @@ -13,11 +13,14 @@ package org.aspectj.ajdt.internal.core.builder; -import java.util.*; - -import org.aspectj.ajdt.internal.compiler.ast.*; -import org.eclipse.jdt.core.*; -import org.eclipse.jdt.internal.core.builder.*; +import java.util.Collection; +import java.util.HashSet; +import java.util.Set; + +import org.aspectj.ajdt.internal.compiler.ast.AspectDeclaration; +import org.eclipse.jdt.core.IJavaProject; +import org.eclipse.jdt.internal.core.builder.ClasspathLocation; +import org.eclipse.jdt.internal.core.builder.NameEnvironment; public class AjNameEnvironment extends NameEnvironment { private Set aspectDeclarations = new HashSet(); diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/ClassFileCache.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/ClassFileCache.java index 92e5c2552..9c7e5646d 100644 --- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/ClassFileCache.java +++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/ClassFileCache.java @@ -14,12 +14,22 @@ package org.aspectj.ajdt.internal.core.builder; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; import org.aspectj.bridge.IMessageHandler; import org.aspectj.workbench.resources.AbstractContainer; -import org.eclipse.core.resources.*; -import org.eclipse.core.runtime.*; +import org.eclipse.core.resources.IContainer; +import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.IFolder; +import org.eclipse.core.resources.IResource; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IPath; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.Path; public class ClassFileCache extends AbstractContainer { diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/ClassFileCacheFolder.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/ClassFileCacheFolder.java index 08cf363f7..5817bd4ae 100644 --- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/ClassFileCacheFolder.java +++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/ClassFileCacheFolder.java @@ -14,8 +14,13 @@ package org.aspectj.ajdt.internal.core.builder; import org.aspectj.workbench.resources.AbstractFolder; -import org.eclipse.core.resources.*; -import org.eclipse.core.runtime.*; +import org.eclipse.core.resources.IContainer; +import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.IFolder; +import org.eclipse.core.resources.IResource; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IPath; +import org.eclipse.core.runtime.IProgressMonitor; public class ClassFileCacheFolder extends AbstractFolder { ClassFileCache parent; diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/ClasspathContainer.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/ClasspathContainer.java index 11c2e5533..da612da91 100644 --- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/ClasspathContainer.java +++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/ClasspathContainer.java @@ -13,17 +13,14 @@ package org.aspectj.ajdt.internal.core.builder; -import org.eclipse.jdt.internal.core.builder.*; -import org.aspectj.util.FileUtil; -import org.eclipse.core.resources.*; import org.eclipse.core.resources.IContainer; -import org.eclipse.core.runtime.*; +import org.eclipse.core.resources.IFile; import org.eclipse.core.runtime.IPath; +import org.eclipse.core.runtime.Path; import org.eclipse.jdt.internal.compiler.classfmt.ClassFileReader; import org.eclipse.jdt.internal.compiler.env.NameEnvironmentAnswer; import org.eclipse.jdt.internal.compiler.util.Util; - -import java.io.*; +import org.eclipse.jdt.internal.core.builder.ClasspathLocation; class ClasspathContainer extends ClasspathLocation { diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/CommandLineResourceDelta.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/CommandLineResourceDelta.java index 36f6611d9..d3181edf3 100644 --- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/CommandLineResourceDelta.java +++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/CommandLineResourceDelta.java @@ -13,11 +13,9 @@ package org.aspectj.ajdt.internal.core.builder; -import org.apache.bcel.generic.RETURN; -import org.aspectj.workbench.resources.FilesystemFile; -import org.eclipse.core.internal.events.*; +import org.eclipse.core.internal.events.ResourceDelta; import org.eclipse.core.internal.resources.ResourceInfo; -import org.eclipse.core.resources.*; +import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.IResourceDelta; import org.eclipse.core.runtime.IPath; diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/DeferredWriteFile.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/DeferredWriteFile.java index 98e0b7e41..aba11ea67 100644 --- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/DeferredWriteFile.java +++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/DeferredWriteFile.java @@ -13,12 +13,20 @@ package org.aspectj.ajdt.internal.core.builder; -import java.io.*; +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.io.InputStream; import org.aspectj.workbench.resources.AbstractFile; -import org.eclipse.core.resources.*; -import org.eclipse.core.runtime.*; -import org.eclipse.jdt.core.*; +import org.eclipse.core.resources.IContainer; +import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.IResource; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IPath; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.Path; +import org.eclipse.jdt.core.IJavaModelStatusConstants; +import org.eclipse.jdt.core.JavaModelException; import org.eclipse.jdt.internal.compiler.util.Util; public class DeferredWriteFile extends AbstractFile { diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/EclipseAdapterUtils.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/EclipseAdapterUtils.java index 35c42f4e8..39b6fbf2a 100644 --- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/EclipseAdapterUtils.java +++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/EclipseAdapterUtils.java @@ -13,6 +13,8 @@ package org.aspectj.ajdt.internal.core.builder; +import java.io.File; + import org.aspectj.bridge.IMessage; import org.aspectj.bridge.ISourceLocation; import org.aspectj.bridge.Message; @@ -22,8 +24,6 @@ import org.eclipse.jdt.core.compiler.IProblem; import org.eclipse.jdt.internal.compiler.env.ICompilationUnit; import org.eclipse.jdt.internal.compiler.util.Util; -import java.io.File; - /** * */ diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/EclipseMessageHandler.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/EclipseMessageHandler.java index 3c7f9523a..24e13f2ea 100644 --- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/EclipseMessageHandler.java +++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/EclipseMessageHandler.java @@ -13,13 +13,7 @@ package org.aspectj.ajdt.internal.core.builder; -import java.io.*; - -import org.aspectj.bridge.*; -import org.eclipse.jdt.core.compiler.*; -import org.eclipse.jdt.internal.compiler.env.*; -import org.eclipse.jdt.internal.compiler.problem.*; -import org.eclipse.jdt.internal.compiler.util.*; +import org.aspectj.bridge.IMessageHandler; /** @deprecated EclipseMessageAdapter */ public class EclipseMessageHandler { // implements IMessageHandler { diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/EclipseSourceContext.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/EclipseSourceContext.java index 6caf35594..f54ebc1a1 100644 --- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/EclipseSourceContext.java +++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/EclipseSourceContext.java @@ -15,7 +15,7 @@ package org.aspectj.ajdt.internal.core.builder; import org.aspectj.ajdt.internal.compiler.lookup.EclipseSourceLocation; import org.aspectj.bridge.ISourceLocation; -import org.aspectj.weaver.*; +import org.aspectj.weaver.IHasPosition; import org.aspectj.weaver.ISourceContext; import org.eclipse.jdt.internal.compiler.CompilationResult; diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/EclipseUnwovenClassFile.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/EclipseUnwovenClassFile.java index 7f87a8fa1..57cd45e98 100644 --- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/EclipseUnwovenClassFile.java +++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/EclipseUnwovenClassFile.java @@ -14,13 +14,13 @@ package org.aspectj.ajdt.internal.core.builder; import java.io.IOException; -import java.util.*; +import java.util.Iterator; import java.util.List; -import org.aspectj.weaver.bcel.UnwovenClassFile; import org.aspectj.bridge.IMessage; import org.aspectj.bridge.IMessageHandler; import org.aspectj.bridge.Message; +import org.aspectj.weaver.bcel.UnwovenClassFile; import org.eclipse.core.resources.IFile; import org.eclipse.core.runtime.CoreException; diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/EmacsStructureModelManager.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/EmacsStructureModelManager.java index 41f7cb9f7..4c19219aa 100644 --- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/EmacsStructureModelManager.java +++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/EmacsStructureModelManager.java @@ -14,10 +14,20 @@ package org.aspectj.ajdt.internal.core.builder; -import java.util.*; -import java.io.*; -//import org.aspectj.tools.ide.*; -import org.aspectj.asm.*; +import java.io.BufferedWriter; +import java.io.File; +import java.io.FileWriter; +import java.io.IOException; +import java.util.Iterator; +import java.util.Map; +import java.util.Set; + +import org.aspectj.asm.AdviceAssociation; +import org.aspectj.asm.IntroductionAssociation; +import org.aspectj.asm.LinkNode; +import org.aspectj.asm.ProgramElementNode; +import org.aspectj.asm.RelationNode; +import org.aspectj.asm.StructureModelManager; //import org.aspectj.ajde.compiler.AjdeCompiler; /** diff --git a/org.aspectj.ajdt.core/src/org/aspectj/tools/ajc/Main.java b/org.aspectj.ajdt.core/src/org/aspectj/tools/ajc/Main.java index 216bdf091..66dbf35c4 100644 --- a/org.aspectj.ajdt.core/src/org/aspectj/tools/ajc/Main.java +++ b/org.aspectj.ajdt.core/src/org/aspectj/tools/ajc/Main.java @@ -14,6 +14,12 @@ package org.aspectj.tools.ajc; +import java.io.File; +import java.io.IOException; +import java.io.PrintStream; +import java.util.Arrays; +import java.util.List; + import org.aspectj.bridge.AbortException; import org.aspectj.bridge.ICommand; import org.aspectj.bridge.IMessage; @@ -26,13 +32,6 @@ import org.aspectj.bridge.ReflectionFactory; import org.aspectj.bridge.Version; import org.aspectj.util.LangUtil; -import java.io.File; -import java.io.IOException; -import java.io.PrintStream; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - /** * Programmatic and command-line interface to AspectJ compiler. * The compiler is an ICommand obtained by reflection. diff --git a/org.aspectj.ajdt.core/src/org/aspectj/workbench/resources/AbstractContainer.java b/org.aspectj.ajdt.core/src/org/aspectj/workbench/resources/AbstractContainer.java index 499c158af..2956774a5 100644 --- a/org.aspectj.ajdt.core/src/org/aspectj/workbench/resources/AbstractContainer.java +++ b/org.aspectj.ajdt.core/src/org/aspectj/workbench/resources/AbstractContainer.java @@ -13,9 +13,14 @@ package org.aspectj.workbench.resources; -import org.eclipse.core.resources.*; import org.eclipse.core.resources.IContainer; -import org.eclipse.core.runtime.*; +import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.IFolder; +import org.eclipse.core.resources.IResource; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IPath; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.Path; public abstract class AbstractContainer extends AbstractResource implements IContainer { diff --git a/org.aspectj.ajdt.core/src/org/aspectj/workbench/resources/AbstractFile.java b/org.aspectj.ajdt.core/src/org/aspectj/workbench/resources/AbstractFile.java index f4d25fe19..d6aa18876 100644 --- a/org.aspectj.ajdt.core/src/org/aspectj/workbench/resources/AbstractFile.java +++ b/org.aspectj.ajdt.core/src/org/aspectj/workbench/resources/AbstractFile.java @@ -15,9 +15,11 @@ package org.aspectj.workbench.resources; import java.io.InputStream; -import org.eclipse.core.resources.*; import org.eclipse.core.resources.IFile; -import org.eclipse.core.runtime.*; +import org.eclipse.core.resources.IFileState; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IPath; +import org.eclipse.core.runtime.IProgressMonitor; public abstract class AbstractFile extends AbstractResource implements IFile { diff --git a/org.aspectj.ajdt.core/src/org/aspectj/workbench/resources/AbstractFolder.java b/org.aspectj.ajdt.core/src/org/aspectj/workbench/resources/AbstractFolder.java index adb04c750..5864a4669 100644 --- a/org.aspectj.ajdt.core/src/org/aspectj/workbench/resources/AbstractFolder.java +++ b/org.aspectj.ajdt.core/src/org/aspectj/workbench/resources/AbstractFolder.java @@ -13,9 +13,12 @@ package org.aspectj.workbench.resources; -import org.eclipse.core.resources.*; +import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IFolder; -import org.eclipse.core.runtime.*; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IPath; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.Path; public abstract class AbstractFolder extends AbstractContainer implements IFolder { diff --git a/org.aspectj.ajdt.core/src/org/aspectj/workbench/resources/AbstractResource.java b/org.aspectj.ajdt.core/src/org/aspectj/workbench/resources/AbstractResource.java index 560037a18..c621072b2 100644 --- a/org.aspectj.ajdt.core/src/org/aspectj/workbench/resources/AbstractResource.java +++ b/org.aspectj.ajdt.core/src/org/aspectj/workbench/resources/AbstractResource.java @@ -13,8 +13,17 @@ package org.aspectj.workbench.resources; -import org.eclipse.core.resources.*; -import org.eclipse.core.runtime.*; +import org.eclipse.core.resources.IContainer; +import org.eclipse.core.resources.IMarker; +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.IProjectDescription; +import org.eclipse.core.resources.IResource; +import org.eclipse.core.resources.IResourceVisitor; +import org.eclipse.core.resources.IWorkspace; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IPath; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.QualifiedName; public abstract class AbstractResource implements IResource { diff --git a/org.aspectj.ajdt.core/src/org/aspectj/workbench/resources/FilesystemFile.java b/org.aspectj.ajdt.core/src/org/aspectj/workbench/resources/FilesystemFile.java index 5f6fb98b8..17092a860 100644 --- a/org.aspectj.ajdt.core/src/org/aspectj/workbench/resources/FilesystemFile.java +++ b/org.aspectj.ajdt.core/src/org/aspectj/workbench/resources/FilesystemFile.java @@ -13,13 +13,19 @@ package org.aspectj.workbench.resources; -import java.io.*; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; -import org.aspectj.util.FileUtil; -import org.eclipse.core.internal.resources.*; -import org.eclipse.core.resources.*; +import org.eclipse.core.resources.IContainer; import org.eclipse.core.resources.IFile; -import org.eclipse.core.runtime.*; +import org.eclipse.core.resources.IResource; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IPath; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.Path; public class FilesystemFile extends AbstractFile implements IFile { diff --git a/org.aspectj.ajdt.core/src/org/aspectj/workbench/resources/FilesystemFolder.java b/org.aspectj.ajdt.core/src/org/aspectj/workbench/resources/FilesystemFolder.java index 96797cf5e..a21578b92 100644 --- a/org.aspectj.ajdt.core/src/org/aspectj/workbench/resources/FilesystemFolder.java +++ b/org.aspectj.ajdt.core/src/org/aspectj/workbench/resources/FilesystemFolder.java @@ -13,9 +13,14 @@ package org.aspectj.workbench.resources; -import org.apache.bcel.generic.RETURN; -import org.eclipse.core.resources.*; -import org.eclipse.core.runtime.*; +import org.eclipse.core.resources.IContainer; +import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.IFolder; +import org.eclipse.core.resources.IResource; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IPath; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.Path; /** * When lookup for parent or contained paths is done a new instance of a folder or file diff --git a/org.aspectj.ajdt.core/src/org/aspectj/workbench/resources/SimpleProject.java b/org.aspectj.ajdt.core/src/org/aspectj/workbench/resources/SimpleProject.java index 6584a612a..3dae542b7 100644 --- a/org.aspectj.ajdt.core/src/org/aspectj/workbench/resources/SimpleProject.java +++ b/org.aspectj.ajdt.core/src/org/aspectj/workbench/resources/SimpleProject.java @@ -13,11 +13,18 @@ package org.aspectj.workbench.resources; -import java.util.*; - -import org.eclipse.core.internal.resources.*; -import org.eclipse.core.resources.*; -import org.eclipse.core.runtime.*; +import java.util.Map; + +import org.eclipse.core.internal.resources.ProjectDescription; +import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.IFolder; +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.IProjectDescription; +import org.eclipse.core.resources.IProjectNature; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IPath; +import org.eclipse.core.runtime.IPluginDescriptor; +import org.eclipse.core.runtime.IProgressMonitor; public class SimpleProject extends FilesystemFolder implements IProject { IProjectDescription description; diff --git a/testing-util/TestUtilTest.launch b/testing-util/TestUtilTest.launch index 645c3ee88..0dbc3a232 100644 --- a/testing-util/TestUtilTest.launch +++ b/testing-util/TestUtilTest.launch @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <launchConfiguration type="org.eclipse.jdt.junit.launchconfig"> - <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.aspectj.testing.util.TestUtilTest"/> - <booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/> <booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/> + <booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/> + <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.aspectj.testing.util.TestUtilTest"/> <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="testing-util"/> <listAttribute key="org.eclipse.jdt.launching.CLASSPATH"> <listEntry value="<?xml version="1.0" encoding="UTF-8"?> @@ -14,7 +14,7 @@ "/> <listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry internalArchive="/lib/junit/junit.jar" path="3" - sourceAttachmentPath="/lib/junit/junit-src.jar" type="2"/> + sourceAttachmentPath="/lib/junit/junit-src.jar" sourceRootPath="" type="2"/> "/> <listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry path="3" projectName="util" type="1"/> @@ -32,7 +32,8 @@ <runtimeClasspathEntry internalArchive="/lib/bcel/bcel.jar" path="3" type="2"/> "/> </listAttribute> + <stringAttribute key="org.eclipse.debug.ui.target_debug_perspective" value="perspective_default"/> + <stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/> <stringAttribute key="org.eclipse.debug.ui.target_run_perspective" value="perspective_default"/> <stringAttribute key="org.eclipse.debug.core.source_locator_id" value="org.eclipse.jdt.debug.ui.javaSourceLocator"/> - <stringAttribute key="org.eclipse.debug.ui.target_debug_perspective" value="perspective_default"/> </launchConfiguration> diff --git a/testing/src/org/aspectj/internal/tools/ant/taskdefs/Ajctest.java b/testing/src/org/aspectj/internal/tools/ant/taskdefs/Ajctest.java index f9c2076e7..709bbc5c2 100644 --- a/testing/src/org/aspectj/internal/tools/ant/taskdefs/Ajctest.java +++ b/testing/src/org/aspectj/internal/tools/ant/taskdefs/Ajctest.java @@ -14,23 +14,70 @@ package org.aspectj.internal.tools.ant.taskdefs; -import java.beans.*; -import java.io.*; -import java.util.*; +import java.awt.BorderLayout; +import java.awt.Color; +import java.awt.Component; +import java.awt.Dimension; +import java.awt.FlowLayout; +import java.awt.Font; +import java.awt.GridBagConstraints; +import java.awt.GridBagLayout; +import java.awt.Insets; +import java.awt.LayoutManager; +import java.beans.PropertyChangeEvent; +import java.beans.PropertyChangeListener; +import java.beans.PropertyChangeSupport; +import java.io.File; +import java.io.FileWriter; +import java.io.IOException; +import java.io.OutputStream; +import java.io.PrintStream; +import java.io.PrintWriter; +import java.io.StringWriter; +import java.text.DateFormat; +import java.util.Collection; +import java.util.Date; +import java.util.HashMap; +import java.util.Iterator; import java.util.List; -import java.text.*; -import org.apache.tools.ant.*; -import org.apache.tools.ant.taskdefs.*; -import org.apache.tools.ant.types.*; +import java.util.Map; +import java.util.StringTokenizer; +import java.util.Vector; + +import javax.swing.BorderFactory; +import javax.swing.BoxLayout; +import javax.swing.JFrame; +import javax.swing.JLabel; +import javax.swing.JPanel; +import javax.swing.JScrollPane; +import javax.swing.JSplitPane; +import javax.swing.JTable; +import javax.swing.JTextArea; +import javax.swing.JTextField; +import javax.swing.ListSelectionModel; +import javax.swing.border.BevelBorder; +import javax.swing.event.ListSelectionEvent; +import javax.swing.table.DefaultTableModel; +import javax.swing.table.TableModel; +import javax.swing.text.StyleContext; + +import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.Location; +import org.apache.tools.ant.Project; +import org.apache.tools.ant.Target; +import org.apache.tools.ant.Task; +import org.apache.tools.ant.taskdefs.Delete; +import org.apache.tools.ant.taskdefs.ExecTask; +import org.apache.tools.ant.taskdefs.Java; +import org.apache.tools.ant.taskdefs.LogOutputStream; +import org.apache.tools.ant.taskdefs.Mkdir; +import org.apache.tools.ant.taskdefs.StreamPumper; +import org.apache.tools.ant.types.Commandline; +import org.apache.tools.ant.types.FileSet; +import org.apache.tools.ant.types.Path; +import org.apache.tools.ant.types.Reference; import org.aspectj.util.LangUtil; -import java.awt.*; -import javax.swing.*; -import javax.swing.border.*; -import javax.swing.event.*; -import javax.swing.table.*; -import javax.swing.text.*; - public class Ajctest extends Task implements PropertyChangeListener { private static Ajctest CURRENT_AJCTEST; diff --git a/testing/src/org/aspectj/internal/tools/ant/taskdefs/MainWrapper.java b/testing/src/org/aspectj/internal/tools/ant/taskdefs/MainWrapper.java index e066e1ac5..da93ac665 100644 --- a/testing/src/org/aspectj/internal/tools/ant/taskdefs/MainWrapper.java +++ b/testing/src/org/aspectj/internal/tools/ant/taskdefs/MainWrapper.java @@ -15,12 +15,13 @@ package org.aspectj.internal.tools.ant.taskdefs; -import org.aspectj.testing.util.LangUtil; // todo config management here - +import java.io.File; +import java.io.PrintStream; +import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.lang.reflect.Modifier; -import java.lang.reflect.InvocationTargetException; -import java.io.*; + +import org.aspectj.testing.util.LangUtil; /** * Wrapper to invoke class identified by setting VM argument. diff --git a/testing/src/org/aspectj/testing/harness/bridge/AbstractRunSpec.java b/testing/src/org/aspectj/testing/harness/bridge/AbstractRunSpec.java index 2501db2ab..3b6356bca 100644 --- a/testing/src/org/aspectj/testing/harness/bridge/AbstractRunSpec.java +++ b/testing/src/org/aspectj/testing/harness/bridge/AbstractRunSpec.java @@ -13,6 +13,14 @@ package org.aspectj.testing.harness.bridge; +import java.io.PrintStream; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.BitSet; +import java.util.Iterator; +import java.util.List; +import java.util.ListIterator; + import org.aspectj.bridge.IMessage; import org.aspectj.bridge.IMessageHandler; import org.aspectj.bridge.ISourceLocation; @@ -25,14 +33,6 @@ import org.aspectj.testing.xml.SoftMessage; import org.aspectj.testing.xml.XMLWriter; import org.aspectj.util.LangUtil; -import java.io.PrintStream; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.BitSet; -import java.util.Iterator; -import java.util.List; -import java.util.ListIterator; - /** * Base class for initialization of components expecting messages, * options, files/paths, and source locations (resolved files), diff --git a/testing/src/org/aspectj/testing/harness/bridge/AjcMessageHandler.java b/testing/src/org/aspectj/testing/harness/bridge/AjcMessageHandler.java index 943110df3..565bcdee8 100644 --- a/testing/src/org/aspectj/testing/harness/bridge/AjcMessageHandler.java +++ b/testing/src/org/aspectj/testing/harness/bridge/AjcMessageHandler.java @@ -13,6 +13,12 @@ package org.aspectj.testing.harness.bridge; +import java.util.Arrays; +import java.util.Collections; +import java.util.Comparator; +import java.util.Iterator; +import java.util.List; + import org.aspectj.bridge.IMessage; import org.aspectj.bridge.IMessageHandler; import org.aspectj.bridge.IMessageHolder; @@ -22,12 +28,6 @@ import org.aspectj.testing.util.BridgeUtil; import org.aspectj.testing.util.Diffs; import org.aspectj.util.LangUtil; -import java.util.Arrays; -import java.util.Collections; -import java.util.Comparator; -import java.util.Iterator; -import java.util.List; - /** * Adapter to pass messages through to handler, diff --git a/testing/src/org/aspectj/testing/harness/bridge/AjcTest.java b/testing/src/org/aspectj/testing/harness/bridge/AjcTest.java index 6592f3381..8f9afefe6 100644 --- a/testing/src/org/aspectj/testing/harness/bridge/AjcTest.java +++ b/testing/src/org/aspectj/testing/harness/bridge/AjcTest.java @@ -13,6 +13,12 @@ package org.aspectj.testing.harness.bridge; +import java.io.File; +import java.util.Arrays; +import java.util.Collections; +import java.util.Iterator; +import java.util.List; + import org.aspectj.bridge.IMessageHandler; import org.aspectj.bridge.ISourceLocation; import org.aspectj.testing.run.IRunIterator; @@ -21,12 +27,6 @@ import org.aspectj.testing.run.Runner; import org.aspectj.testing.xml.XMLWriter; import org.aspectj.util.LangUtil; -import java.io.File; -import java.util.Arrays; -import java.util.Collections; -import java.util.Iterator; -import java.util.List; - /** * An AjcTest has child subruns (compile, [inc-compile|run]*). */ diff --git a/testing/src/org/aspectj/testing/harness/bridge/DirChanges.java b/testing/src/org/aspectj/testing/harness/bridge/DirChanges.java index 4e577b1a4..873302d12 100644 --- a/testing/src/org/aspectj/testing/harness/bridge/DirChanges.java +++ b/testing/src/org/aspectj/testing/harness/bridge/DirChanges.java @@ -13,6 +13,11 @@ package org.aspectj.testing.harness.bridge; +import java.io.File; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; + import org.aspectj.bridge.IMessageHandler; import org.aspectj.bridge.MessageUtil; import org.aspectj.testing.util.TestUtil; @@ -21,11 +26,6 @@ import org.aspectj.testing.xml.XMLWriter; import org.aspectj.util.FileUtil; import org.aspectj.util.LangUtil; -import java.io.File; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; - /** * Calculate changes in a directory tree. * This implements two different specification styles: diff --git a/testing/src/org/aspectj/testing/harness/bridge/FlatSuiteReader.java b/testing/src/org/aspectj/testing/harness/bridge/FlatSuiteReader.java index dbf5dd259..96e15bdc9 100644 --- a/testing/src/org/aspectj/testing/harness/bridge/FlatSuiteReader.java +++ b/testing/src/org/aspectj/testing/harness/bridge/FlatSuiteReader.java @@ -13,6 +13,13 @@ package org.aspectj.testing.harness.bridge; +import java.io.File; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Iterator; +import java.util.List; + import org.aspectj.bridge.AbortException; import org.aspectj.bridge.IMessage; import org.aspectj.bridge.ISourceLocation; @@ -27,13 +34,6 @@ import org.aspectj.util.FileUtil; import org.aspectj.util.LangUtil; import org.aspectj.util.LineReader; -import java.io.File; -import java.io.IOException; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Iterator; -import java.util.List; - /** * SFileReader.Maker implementation to read tests * XXX supports iterative but not yet incremental compiles diff --git a/testing/src/org/aspectj/testing/harness/bridge/Globals.java b/testing/src/org/aspectj/testing/harness/bridge/Globals.java index 7c4f524a5..8f5871a65 100644 --- a/testing/src/org/aspectj/testing/harness/bridge/Globals.java +++ b/testing/src/org/aspectj/testing/harness/bridge/Globals.java @@ -14,11 +14,11 @@ package org.aspectj.testing.harness.bridge; +import java.io.File; + import org.aspectj.util.FileUtil; import org.aspectj.util.LangUtil; -import java.io.File; - /** */ public class Globals { diff --git a/testing/src/org/aspectj/testing/harness/bridge/IncCompilerRun.java b/testing/src/org/aspectj/testing/harness/bridge/IncCompilerRun.java index 4ee4cc183..6e8d626e7 100644 --- a/testing/src/org/aspectj/testing/harness/bridge/IncCompilerRun.java +++ b/testing/src/org/aspectj/testing/harness/bridge/IncCompilerRun.java @@ -13,6 +13,14 @@ package org.aspectj.testing.harness.bridge; +import java.io.File; +import java.io.FileFilter; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; + import org.aspectj.bridge.ICommand; import org.aspectj.bridge.IMessage; import org.aspectj.bridge.MessageUtil; @@ -24,14 +32,6 @@ import org.aspectj.testing.xml.XMLWriter; import org.aspectj.util.FileUtil; import org.aspectj.util.LangUtil; -import java.io.File; -import java.io.FileFilter; -import java.io.IOException; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; - /** * An incremental compiler run takes an existing compiler commmand * from the sandbox, updates the staging directory, and recompiles. diff --git a/testing/src/org/aspectj/testing/harness/bridge/JavaRun.java b/testing/src/org/aspectj/testing/harness/bridge/JavaRun.java index 030f5497f..aa891e32a 100644 --- a/testing/src/org/aspectj/testing/harness/bridge/JavaRun.java +++ b/testing/src/org/aspectj/testing/harness/bridge/JavaRun.java @@ -12,6 +12,13 @@ package org.aspectj.testing.harness.bridge; +import java.io.File; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.net.URL; +import java.util.Arrays; +import java.util.List; + import org.aspectj.bridge.IMessageHandler; import org.aspectj.bridge.MessageUtil; import org.aspectj.testing.Tester; @@ -24,13 +31,6 @@ import org.aspectj.testing.xml.XMLWriter; import org.aspectj.util.FileUtil; import org.aspectj.util.LangUtil; -import java.io.File; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; -import java.net.URL; -import java.util.Arrays; -import java.util.List; - /** * Run a class in this VM using reflection. */ diff --git a/testing/src/org/aspectj/testing/harness/bridge/RunSpecIterator.java b/testing/src/org/aspectj/testing/harness/bridge/RunSpecIterator.java index ebc4c14c6..3e1f536f5 100644 --- a/testing/src/org/aspectj/testing/harness/bridge/RunSpecIterator.java +++ b/testing/src/org/aspectj/testing/harness/bridge/RunSpecIterator.java @@ -13,6 +13,8 @@ package org.aspectj.testing.harness.bridge; +import java.util.ArrayList; + import org.aspectj.bridge.IMessage; import org.aspectj.bridge.IMessageHandler; import org.aspectj.bridge.Message; @@ -22,8 +24,6 @@ import org.aspectj.testing.run.Runner; import org.aspectj.testing.run.WrappedRunIterator; import org.aspectj.util.LangUtil; -import java.util.ArrayList; - /** * This wraps an AbstractRunSpec, which has children that diff --git a/testing/src/org/aspectj/testing/harness/bridge/Sandbox.java b/testing/src/org/aspectj/testing/harness/bridge/Sandbox.java index 198e6c775..2bfb8e63b 100644 --- a/testing/src/org/aspectj/testing/harness/bridge/Sandbox.java +++ b/testing/src/org/aspectj/testing/harness/bridge/Sandbox.java @@ -12,6 +12,9 @@ package org.aspectj.testing.harness.bridge; +import java.io.File; +import java.util.ArrayList; + import org.aspectj.bridge.ICommand; import org.aspectj.bridge.IMessage; import org.aspectj.bridge.IMessageHandler; @@ -19,9 +22,6 @@ import org.aspectj.testing.util.Diffs; import org.aspectj.util.FileUtil; import org.aspectj.util.LangUtil; -import java.io.File; -import java.util.ArrayList; - /** * A sandbox holds state shared by AjcTest sub-runs, * mostly directories relevant to testing. diff --git a/testing/src/org/aspectj/testing/harness/bridge/Validator.java b/testing/src/org/aspectj/testing/harness/bridge/Validator.java index 55c3962e8..a7a43db08 100644 --- a/testing/src/org/aspectj/testing/harness/bridge/Validator.java +++ b/testing/src/org/aspectj/testing/harness/bridge/Validator.java @@ -12,13 +12,6 @@ package org.aspectj.testing.harness.bridge; -import org.aspectj.bridge.AbortException; -import org.aspectj.bridge.IMessage; -import org.aspectj.bridge.IMessageHandler; -import org.aspectj.bridge.MessageUtil; -import org.aspectj.util.FileUtil; -import org.aspectj.util.LangUtil; - import java.io.File; import java.util.ArrayList; import java.util.Arrays; @@ -27,6 +20,13 @@ import java.util.Iterator; import java.util.ListIterator; import java.util.Stack; +import org.aspectj.bridge.AbortException; +import org.aspectj.bridge.IMessage; +import org.aspectj.bridge.IMessageHandler; +import org.aspectj.bridge.MessageUtil; +import org.aspectj.util.FileUtil; +import org.aspectj.util.LangUtil; + /** * Check input and implement defaults. * This handles failure messaging and collecting temp directories diff --git a/testing/src/org/aspectj/testing/run/RunIterator.java b/testing/src/org/aspectj/testing/run/RunIterator.java index 37e3187ed..eb444ba47 100644 --- a/testing/src/org/aspectj/testing/run/RunIterator.java +++ b/testing/src/org/aspectj/testing/run/RunIterator.java @@ -14,14 +14,14 @@ package org.aspectj.testing.run; -import org.aspectj.bridge.IMessageHandler; -import org.aspectj.bridge.MessageUtil; -import org.aspectj.util.LangUtil; - import java.util.Arrays; import java.util.List; import java.util.ListIterator; +import org.aspectj.bridge.IMessageHandler; +import org.aspectj.bridge.MessageUtil; +import org.aspectj.util.LangUtil; + /** * Adapt IRun or Run[] or List or ListIterator to RunIteratorI. */ diff --git a/testing/src/org/aspectj/testing/run/RunListener.java b/testing/src/org/aspectj/testing/run/RunListener.java index 523862991..bbfbf6c9f 100644 --- a/testing/src/org/aspectj/testing/run/RunListener.java +++ b/testing/src/org/aspectj/testing/run/RunListener.java @@ -14,12 +14,12 @@ package org.aspectj.testing.run; -import org.aspectj.bridge.AbortException; -import org.aspectj.bridge.MessageUtil; - import java.io.PrintWriter; import java.util.List; +import org.aspectj.bridge.AbortException; +import org.aspectj.bridge.MessageUtil; + /** * A generic RunListener for easier partial implementations. * It can take a RunI selector (called on completion) diff --git a/testing/src/org/aspectj/testing/run/RunStatus.java b/testing/src/org/aspectj/testing/run/RunStatus.java index 0a53080e1..be971f6b9 100644 --- a/testing/src/org/aspectj/testing/run/RunStatus.java +++ b/testing/src/org/aspectj/testing/run/RunStatus.java @@ -14,15 +14,15 @@ package org.aspectj.testing.run; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; + import org.aspectj.bridge.IMessage; import org.aspectj.bridge.IMessageHolder; import org.aspectj.bridge.MessageHandler; import org.aspectj.testing.util.BridgeUtil; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; - /** * Default implementation of {@link IRunStatus}. * @author isberg diff --git a/testing/src/org/aspectj/testing/run/Runner.java b/testing/src/org/aspectj/testing/run/Runner.java index 6cb9e75fa..2ea278e72 100644 --- a/testing/src/org/aspectj/testing/run/Runner.java +++ b/testing/src/org/aspectj/testing/run/Runner.java @@ -14,6 +14,9 @@ package org.aspectj.testing.run; +import java.util.Enumeration; +import java.util.Hashtable; + import org.aspectj.bridge.IMessage; import org.aspectj.bridge.IMessageHandler; import org.aspectj.bridge.IMessageHolder; @@ -22,9 +25,6 @@ import org.aspectj.bridge.MessageHandler; import org.aspectj.bridge.MessageUtil; import org.aspectj.util.LangUtil; -import java.util.Enumeration; -import java.util.Hashtable; - /** * Run IRun, setting status and invoking listeners * for simple and nested runs. diff --git a/testing/src/org/aspectj/testing/util/BridgeUtil.java b/testing/src/org/aspectj/testing/util/BridgeUtil.java index 8e4b60fca..963a7f551 100644 --- a/testing/src/org/aspectj/testing/util/BridgeUtil.java +++ b/testing/src/org/aspectj/testing/util/BridgeUtil.java @@ -13,6 +13,9 @@ package org.aspectj.testing.util; +import java.io.File; +import java.util.Comparator; + import org.aspectj.bridge.IMessage; import org.aspectj.bridge.ISourceLocation; import org.aspectj.bridge.Message; @@ -23,9 +26,6 @@ import org.aspectj.testing.run.RunValidator; import org.aspectj.util.FileUtil; import org.aspectj.util.LineReader; -import java.io.File; -import java.util.Comparator; - /** * */ diff --git a/testing/src/org/aspectj/testing/util/Diffs.java b/testing/src/org/aspectj/testing/util/Diffs.java index 1adf40924..7f77afc64 100644 --- a/testing/src/org/aspectj/testing/util/Diffs.java +++ b/testing/src/org/aspectj/testing/util/Diffs.java @@ -13,16 +13,16 @@ package org.aspectj.testing.util; -import org.aspectj.bridge.IMessage; -import org.aspectj.bridge.IMessageHandler; -import org.aspectj.bridge.MessageUtil; - import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; import java.util.Iterator; import java.util.List; +import org.aspectj.bridge.IMessage; +import org.aspectj.bridge.IMessageHandler; +import org.aspectj.bridge.MessageUtil; + /** result struct for expected/actual diffs for Collection */ public class Diffs { diff --git a/testing/src/org/aspectj/testing/util/LangUtil.java b/testing/src/org/aspectj/testing/util/LangUtil.java index 2cbd87038..6059dcca8 100644 --- a/testing/src/org/aspectj/testing/util/LangUtil.java +++ b/testing/src/org/aspectj/testing/util/LangUtil.java @@ -13,9 +13,6 @@ package org.aspectj.testing.util; -import org.aspectj.bridge.AbortException; -import org.aspectj.bridge.IMessage; - import java.io.File; import java.io.FileFilter; import java.io.IOException; @@ -36,6 +33,9 @@ import java.util.List; import java.util.Properties; import java.util.StringTokenizer; +import org.aspectj.bridge.AbortException; +import org.aspectj.bridge.IMessage; + /** * misc lang utilities diff --git a/testing/src/org/aspectj/testing/util/RunUtils.java b/testing/src/org/aspectj/testing/util/RunUtils.java index febfac442..cedc72c84 100644 --- a/testing/src/org/aspectj/testing/util/RunUtils.java +++ b/testing/src/org/aspectj/testing/util/RunUtils.java @@ -13,6 +13,9 @@ package org.aspectj.testing.util; +import java.io.PrintStream; +import java.util.Iterator; + import org.aspectj.bridge.IMessage; import org.aspectj.bridge.IMessageHandler; import org.aspectj.bridge.IMessageHolder; @@ -24,9 +27,6 @@ import org.aspectj.testing.run.IRunStatus; import org.aspectj.testing.run.RunValidator; import org.aspectj.util.LangUtil; -import java.io.PrintStream; -import java.util.Iterator; - /** * */ diff --git a/testing/src/org/aspectj/testing/util/SFileReader.java b/testing/src/org/aspectj/testing/util/SFileReader.java index f2b57e13d..2d2a9deef 100644 --- a/testing/src/org/aspectj/testing/util/SFileReader.java +++ b/testing/src/org/aspectj/testing/util/SFileReader.java @@ -13,16 +13,16 @@ package org.aspectj.testing.util; -import org.aspectj.bridge.AbortException; -import org.aspectj.bridge.IMessage; -import org.aspectj.util.LangUtil; -import org.aspectj.util.LineReader; - import java.io.File; import java.io.IOException; import java.io.PrintStream; import java.util.ArrayList; +import org.aspectj.bridge.AbortException; +import org.aspectj.bridge.IMessage; +import org.aspectj.util.LangUtil; +import org.aspectj.util.LineReader; + /** * This reads a structured (config) file, which may have diff --git a/testing/src/org/aspectj/testing/util/TestDiffs.java b/testing/src/org/aspectj/testing/util/TestDiffs.java index 2a847f039..f07ed9664 100644 --- a/testing/src/org/aspectj/testing/util/TestDiffs.java +++ b/testing/src/org/aspectj/testing/util/TestDiffs.java @@ -13,8 +13,6 @@ package org.aspectj.testing.util; -import org.aspectj.util.LangUtil; - import java.io.BufferedReader; import java.io.File; import java.io.FileReader; @@ -27,6 +25,8 @@ import java.util.Iterator; import java.util.List; import java.util.ListIterator; +import org.aspectj.util.LangUtil; + /** * Calculated differences between two test runs * based on their output files diff --git a/testing/src/org/aspectj/testing/xml/AjcSpecXmlReader.java b/testing/src/org/aspectj/testing/xml/AjcSpecXmlReader.java index 42d0a0e66..bf2ae782d 100644 --- a/testing/src/org/aspectj/testing/xml/AjcSpecXmlReader.java +++ b/testing/src/org/aspectj/testing/xml/AjcSpecXmlReader.java @@ -13,6 +13,13 @@ package org.aspectj.testing.xml; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.FileWriter; +import java.io.IOException; +import java.io.PrintWriter; + import org.apache.commons.digester.Digester; import org.aspectj.bridge.AbortException; import org.aspectj.bridge.IMessage; @@ -29,13 +36,6 @@ import org.aspectj.testing.util.RunUtils; import org.aspectj.util.LangUtil; import org.xml.sax.SAXException; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileOutputStream; -import java.io.FileWriter; -import java.io.IOException; -import java.io.PrintWriter; - /** * Read an ajc test specification in xml form. * Input files should comply with DOCTYPE diff --git a/testing/src/org/aspectj/testing/xml/MessageListXmlReader.java b/testing/src/org/aspectj/testing/xml/MessageListXmlReader.java index 62c32db3b..bd909ed3f 100644 --- a/testing/src/org/aspectj/testing/xml/MessageListXmlReader.java +++ b/testing/src/org/aspectj/testing/xml/MessageListXmlReader.java @@ -12,14 +12,6 @@ package org.aspectj.testing.xml; -import org.apache.commons.digester.Digester; -import org.aspectj.bridge.AbortException; -import org.aspectj.bridge.IMessage; -import org.aspectj.bridge.ISourceLocation; -import org.aspectj.bridge.MessageUtil; -import org.aspectj.util.LangUtil; -import org.xml.sax.SAXException; - import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; @@ -28,6 +20,14 @@ import java.io.PrintWriter; import java.util.ArrayList; import java.util.List; +import org.apache.commons.digester.Digester; +import org.aspectj.bridge.AbortException; +import org.aspectj.bridge.IMessage; +import org.aspectj.bridge.ISourceLocation; +import org.aspectj.bridge.MessageUtil; +import org.aspectj.util.LangUtil; +import org.xml.sax.SAXException; + /** * Read a list of messages in xml form. * Input files should comply with DOCTYPE diff --git a/testing/src/org/aspectj/testing/xml/SoftMessage.java b/testing/src/org/aspectj/testing/xml/SoftMessage.java index 30266023f..8d8d1722c 100644 --- a/testing/src/org/aspectj/testing/xml/SoftMessage.java +++ b/testing/src/org/aspectj/testing/xml/SoftMessage.java @@ -14,16 +14,16 @@ package org.aspectj.testing.xml; +import java.io.File; +import java.util.Iterator; +import java.util.List; + import org.aspectj.bridge.IMessage; import org.aspectj.bridge.ISourceLocation; import org.aspectj.bridge.MessageUtil; import org.aspectj.bridge.SourceLocation; import org.aspectj.util.LangUtil; -import java.io.File; -import java.util.Iterator; -import java.util.List; - /** * Implement messages. diff --git a/testing/src/org/aspectj/testing/xml/SoftSourceLocation.java b/testing/src/org/aspectj/testing/xml/SoftSourceLocation.java index c301c0dca..b380381a0 100644 --- a/testing/src/org/aspectj/testing/xml/SoftSourceLocation.java +++ b/testing/src/org/aspectj/testing/xml/SoftSourceLocation.java @@ -14,10 +14,10 @@ package org.aspectj.testing.xml; -import org.aspectj.bridge.ISourceLocation; - import java.io.File; +import org.aspectj.bridge.ISourceLocation; + /** * Immutable source location. * This guarantees that the source file is not null diff --git a/testing/src/org/aspectj/testing/xml/XMLWriter.java b/testing/src/org/aspectj/testing/xml/XMLWriter.java index 7d15339c2..fd7bbf19f 100644 --- a/testing/src/org/aspectj/testing/xml/XMLWriter.java +++ b/testing/src/org/aspectj/testing/xml/XMLWriter.java @@ -13,12 +13,12 @@ package org.aspectj.testing.xml; -import org.aspectj.util.LangUtil; - import java.io.PrintWriter; import java.util.List; import java.util.Stack; +import org.aspectj.util.LangUtil; + /** * Manage print stream to an XML document. * This tracks start/end elements and signals on error, diff --git a/testing/testsrc/TestingModuleTests.java b/testing/testsrc/TestingModuleTests.java index a07fd8617..37396e200 100644 --- a/testing/testsrc/TestingModuleTests.java +++ b/testing/testsrc/TestingModuleTests.java @@ -14,8 +14,9 @@ // default package -import junit.framework.*; import junit.framework.Test; +import junit.framework.TestCase; +import junit.framework.TestSuite; public class TestingModuleTests extends TestCase { diff --git a/testing/testsrc/org/aspectj/testing/harness/bridge/AbstractRunSpecTest.java b/testing/testsrc/org/aspectj/testing/harness/bridge/AbstractRunSpecTest.java index 0e5b8651f..0ed0010c2 100644 --- a/testing/testsrc/org/aspectj/testing/harness/bridge/AbstractRunSpecTest.java +++ b/testing/testsrc/org/aspectj/testing/harness/bridge/AbstractRunSpecTest.java @@ -13,14 +13,14 @@ package org.aspectj.testing.harness.bridge; -import org.aspectj.testing.run.IRunIterator; -import org.aspectj.testing.xml.XMLWriter; - import java.io.PrintWriter; import java.util.List; import junit.framework.TestCase; +import org.aspectj.testing.run.IRunIterator; +import org.aspectj.testing.xml.XMLWriter; + /** * */ diff --git a/testing/testsrc/org/aspectj/testing/harness/bridge/AjcSpecTest.java b/testing/testsrc/org/aspectj/testing/harness/bridge/AjcSpecTest.java index f3d231014..6424da62e 100644 --- a/testing/testsrc/org/aspectj/testing/harness/bridge/AjcSpecTest.java +++ b/testing/testsrc/org/aspectj/testing/harness/bridge/AjcSpecTest.java @@ -13,14 +13,6 @@ package org.aspectj.testing.harness.bridge; -import org.aspectj.bridge.IMessage; -import org.aspectj.bridge.IMessageHolder; -import org.aspectj.bridge.ISourceLocation; -import org.aspectj.bridge.MessageHandler; -import org.aspectj.bridge.MessageUtil; -import org.aspectj.testing.harness.bridge.AjcTest.Suite.Spec; -import org.aspectj.testing.xml.AjcSpecXmlReaderTest; - import java.util.ArrayList; import java.util.Arrays; import java.util.Iterator; @@ -30,6 +22,10 @@ import junit.framework.Assert; import junit.framework.AssertionFailedError; import junit.framework.TestCase; +import org.aspectj.bridge.IMessage; +import org.aspectj.bridge.ISourceLocation; +import org.aspectj.bridge.MessageUtil; + /** * Primarily used by others to test AjcTest */ diff --git a/testing/testsrc/org/aspectj/testing/harness/bridge/CompilerRunSpecTest.java b/testing/testsrc/org/aspectj/testing/harness/bridge/CompilerRunSpecTest.java index 9be6a3b3b..a876db105 100644 --- a/testing/testsrc/org/aspectj/testing/harness/bridge/CompilerRunSpecTest.java +++ b/testing/testsrc/org/aspectj/testing/harness/bridge/CompilerRunSpecTest.java @@ -13,11 +13,11 @@ package org.aspectj.testing.harness.bridge; +import junit.framework.TestCase; + import org.aspectj.bridge.MessageHandler; import org.aspectj.bridge.MessageUtil; -import junit.framework.TestCase; - /** * */ diff --git a/testing/testsrc/org/aspectj/testing/harness/bridge/DirChangesTest.java b/testing/testsrc/org/aspectj/testing/harness/bridge/DirChangesTest.java index a8c5ccd9c..5b35d559a 100644 --- a/testing/testsrc/org/aspectj/testing/harness/bridge/DirChangesTest.java +++ b/testing/testsrc/org/aspectj/testing/harness/bridge/DirChangesTest.java @@ -13,17 +13,19 @@ package org.aspectj.testing.harness.bridge; -import org.aspectj.bridge.*; -import org.aspectj.testing.run.IRunIterator; -import org.aspectj.testing.xml.XMLWriter; -import org.aspectj.util.LangUtil; - -import java.io.*; -import java.util.List; +import java.io.File; +import java.io.PrintWriter; +import java.io.StringWriter; import junit.framework.AssertionFailedError; import junit.framework.TestCase; +import org.aspectj.bridge.IMessage; +import org.aspectj.bridge.MessageHandler; +import org.aspectj.bridge.MessageUtil; +import org.aspectj.testing.xml.XMLWriter; +import org.aspectj.util.LangUtil; + /** * */ diff --git a/testing/testsrc/org/aspectj/testing/harness/bridge/ParseTestCase.java b/testing/testsrc/org/aspectj/testing/harness/bridge/ParseTestCase.java index 08724edf6..ee7720a68 100644 --- a/testing/testsrc/org/aspectj/testing/harness/bridge/ParseTestCase.java +++ b/testing/testsrc/org/aspectj/testing/harness/bridge/ParseTestCase.java @@ -12,39 +12,34 @@ package org.aspectj.testing.harness.bridge; +import java.io.File; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; + +import javax.xml.parsers.DocumentBuilder; +import javax.xml.parsers.DocumentBuilderFactory; +import javax.xml.parsers.ParserConfigurationException; + +import junit.framework.TestCase; + import org.aspectj.bridge.IMessage; -import org.aspectj.bridge.IMessageHandler; import org.aspectj.bridge.IMessageHolder; import org.aspectj.bridge.ISourceLocation; import org.aspectj.bridge.Message; import org.aspectj.bridge.MessageHandler; import org.aspectj.bridge.MessageUtil; import org.aspectj.bridge.SourceLocation; -import org.aspectj.testing.run.IRun; import org.aspectj.testing.run.IRunIterator; import org.aspectj.testing.run.IRunListener; -import org.aspectj.testing.run.IRunStatus; -import org.aspectj.testing.run.IRunValidator; import org.aspectj.testing.run.RunStatus; -import org.aspectj.testing.run.RunValidator; import org.aspectj.testing.run.Runner; import org.w3c.dom.Document; import org.w3c.dom.Node; import org.w3c.dom.NodeList; import org.xml.sax.SAXException; -import java.io.File; -import java.io.IOException; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Iterator; -import java.util.List; - -import javax.xml.parsers.DocumentBuilder; -import javax.xml.parsers.DocumentBuilderFactory; -import javax.xml.parsers.ParserConfigurationException; -import junit.framework.TestCase; - public class ParseTestCase extends TestCase { public ParseTestCase(String name) { diff --git a/testing/testsrc/org/aspectj/testing/harness/bridge/TestingBridgeTests.java b/testing/testsrc/org/aspectj/testing/harness/bridge/TestingBridgeTests.java index 82900a275..f9c5cd3ab 100644 --- a/testing/testsrc/org/aspectj/testing/harness/bridge/TestingBridgeTests.java +++ b/testing/testsrc/org/aspectj/testing/harness/bridge/TestingBridgeTests.java @@ -14,7 +14,9 @@ package org.aspectj.testing.harness.bridge; -import junit.framework.*; +import junit.framework.Test; +import junit.framework.TestCase; +import junit.framework.TestSuite; public class TestingBridgeTests extends TestCase { diff --git a/testing/testsrc/org/aspectj/testing/util/BridgeUtilTest.java b/testing/testsrc/org/aspectj/testing/util/BridgeUtilTest.java index ae0a7cdac..1b5fe348f 100644 --- a/testing/testsrc/org/aspectj/testing/util/BridgeUtilTest.java +++ b/testing/testsrc/org/aspectj/testing/util/BridgeUtilTest.java @@ -13,15 +13,14 @@ package org.aspectj.testing.util; +import junit.framework.TestCase; + import org.aspectj.bridge.MessageHandler; -import org.aspectj.bridge.MessageUtil; import org.aspectj.testing.run.IRun; import org.aspectj.testing.run.IRunStatus; import org.aspectj.testing.run.RunStatus; import org.aspectj.testing.run.Runner; -import junit.framework.TestCase; - /** * */ diff --git a/testing/testsrc/org/aspectj/testing/util/FileUtilTest.java b/testing/testsrc/org/aspectj/testing/util/FileUtilTest.java index 1ff4d6cf6..ca90c45a9 100644 --- a/testing/testsrc/org/aspectj/testing/util/FileUtilTest.java +++ b/testing/testsrc/org/aspectj/testing/util/FileUtilTest.java @@ -13,8 +13,6 @@ package org.aspectj.testing.util; -import java.io.File; - import junit.framework.TestCase; /** diff --git a/testing/testsrc/org/aspectj/testing/util/MessageUtilTest.java b/testing/testsrc/org/aspectj/testing/util/MessageUtilTest.java index 26d8523dd..215cfee5d 100644 --- a/testing/testsrc/org/aspectj/testing/util/MessageUtilTest.java +++ b/testing/testsrc/org/aspectj/testing/util/MessageUtilTest.java @@ -14,13 +14,6 @@ package org.aspectj.testing.util; -import org.aspectj.bridge.IMessage; -import org.aspectj.bridge.ISourceLocation; -import org.aspectj.bridge.Message; -import org.aspectj.bridge.MessageHandler; -import org.aspectj.bridge.MessageUtil; -import org.aspectj.bridge.SourceLocation; - import java.io.File; import java.io.IOException; import java.io.PrintStream; @@ -31,6 +24,13 @@ import java.util.List; import junit.framework.TestCase; +import org.aspectj.bridge.IMessage; +import org.aspectj.bridge.ISourceLocation; +import org.aspectj.bridge.Message; +import org.aspectj.bridge.MessageHandler; +import org.aspectj.bridge.MessageUtil; +import org.aspectj.bridge.SourceLocation; + /** * */ diff --git a/testing/testsrc/org/aspectj/testing/util/TestDiffsTest.java b/testing/testsrc/org/aspectj/testing/util/TestDiffsTest.java index 4ce7792c6..e321d9835 100644 --- a/testing/testsrc/org/aspectj/testing/util/TestDiffsTest.java +++ b/testing/testsrc/org/aspectj/testing/util/TestDiffsTest.java @@ -21,6 +21,7 @@ import java.util.ArrayList; import java.util.ListIterator; import junit.framework.TestCase; + import org.aspectj.util.FileUtil; /** diff --git a/testing/testsrc/org/aspectj/testing/util/UtilTests.java b/testing/testsrc/org/aspectj/testing/util/UtilTests.java index 3ec14d7df..a684eb7ad 100644 --- a/testing/testsrc/org/aspectj/testing/util/UtilTests.java +++ b/testing/testsrc/org/aspectj/testing/util/UtilTests.java @@ -14,7 +14,9 @@ package org.aspectj.testing.util; -import junit.framework.*; +import junit.framework.Test; +import junit.framework.TestCase; +import junit.framework.TestSuite; public class UtilTests extends TestCase { diff --git a/testing/testsrc/org/aspectj/testing/xml/AjcSpecXmlReaderTest.java b/testing/testsrc/org/aspectj/testing/xml/AjcSpecXmlReaderTest.java index 157cf2dba..38ff3f9f6 100644 --- a/testing/testsrc/org/aspectj/testing/xml/AjcSpecXmlReaderTest.java +++ b/testing/testsrc/org/aspectj/testing/xml/AjcSpecXmlReaderTest.java @@ -13,17 +13,6 @@ package org.aspectj.testing.xml; -import org.aspectj.bridge.MessageHandler; -import org.aspectj.bridge.MessageUtil; -import org.aspectj.testing.harness.bridge.AjcSpecTest; -import org.aspectj.testing.harness.bridge.CompilerRun; -import org.aspectj.testing.harness.bridge.FlatSuiteReader; -import org.aspectj.testing.harness.bridge.AjcTest; -import org.aspectj.testing.run.IRunStatus; -import org.aspectj.testing.run.IRunValidator; -import org.aspectj.testing.run.RunValidator; -import org.aspectj.util.LangUtil; - import java.beans.BeanInfo; import java.beans.IntrospectionException; import java.beans.Introspector; @@ -32,10 +21,14 @@ import java.io.File; import java.io.IOException; import java.util.ArrayList; import java.util.Iterator; -import java.util.List; import junit.framework.TestCase; +import org.aspectj.testing.harness.bridge.AjcSpecTest; +import org.aspectj.testing.harness.bridge.AjcTest; +import org.aspectj.testing.harness.bridge.FlatSuiteReader; +import org.aspectj.util.LangUtil; + /** * */ diff --git a/testing/testsrc/org/aspectj/testing/xml/TestingXmlTests.java b/testing/testsrc/org/aspectj/testing/xml/TestingXmlTests.java index fbefdba5d..0ea576af4 100644 --- a/testing/testsrc/org/aspectj/testing/xml/TestingXmlTests.java +++ b/testing/testsrc/org/aspectj/testing/xml/TestingXmlTests.java @@ -14,7 +14,9 @@ package org.aspectj.testing.xml; -import junit.framework.*; +import junit.framework.Test; +import junit.framework.TestCase; +import junit.framework.TestSuite; public class TestingXmlTests extends TestCase { diff --git a/weaver/src/org/aspectj/weaver/Advice.java b/weaver/src/org/aspectj/weaver/Advice.java index b90f2833c..4b90c9d35 100644 --- a/weaver/src/org/aspectj/weaver/Advice.java +++ b/weaver/src/org/aspectj/weaver/Advice.java @@ -13,11 +13,14 @@ package org.aspectj.weaver; -import java.util.*; +import java.util.Collections; +import java.util.List; -import org.aspectj.bridge.*; -import org.aspectj.bridge.MessageUtil; -import org.aspectj.weaver.patterns.*; +import org.aspectj.bridge.IMessage; +import org.aspectj.weaver.patterns.AndPointcut; +import org.aspectj.weaver.patterns.PerClause; +import org.aspectj.weaver.patterns.Pointcut; +import org.aspectj.weaver.patterns.TypePattern; public abstract class Advice extends ShadowMunger { diff --git a/weaver/src/org/aspectj/weaver/AdviceKind.java b/weaver/src/org/aspectj/weaver/AdviceKind.java index d9936427b..55fbb1e97 100644 --- a/weaver/src/org/aspectj/weaver/AdviceKind.java +++ b/weaver/src/org/aspectj/weaver/AdviceKind.java @@ -13,7 +13,8 @@ package org.aspectj.weaver; -import java.io.*; +import java.io.DataInputStream; +import java.io.IOException; import org.aspectj.util.TypeSafeEnum; diff --git a/weaver/src/org/aspectj/weaver/AjAttribute.java b/weaver/src/org/aspectj/weaver/AjAttribute.java index b72665dfa..f981d21b2 100644 --- a/weaver/src/org/aspectj/weaver/AjAttribute.java +++ b/weaver/src/org/aspectj/weaver/AjAttribute.java @@ -13,10 +13,16 @@ package org.aspectj.weaver; -import java.io.*; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.DataInputStream; +import java.io.DataOutputStream; +import java.io.IOException; import org.aspectj.util.FileUtil; -import org.aspectj.weaver.patterns.*; +import org.aspectj.weaver.patterns.Declare; +import org.aspectj.weaver.patterns.PerClause; +import org.aspectj.weaver.patterns.Pointcut; /** * These attributes are written to and read from .class files (see the JVM spec). diff --git a/weaver/src/org/aspectj/weaver/AsmAdaptor.java b/weaver/src/org/aspectj/weaver/AsmAdaptor.java index 0c3c7201d..caeeeaf41 100644 --- a/weaver/src/org/aspectj/weaver/AsmAdaptor.java +++ b/weaver/src/org/aspectj/weaver/AsmAdaptor.java @@ -13,13 +13,16 @@ package org.aspectj.weaver; -import java.util.*; +import java.util.ArrayList; import java.util.Iterator; -import org.aspectj.asm.*; +import org.aspectj.asm.AdviceAssociation; +import org.aspectj.asm.LinkNode; +import org.aspectj.asm.ProgramElementNode; +import org.aspectj.asm.Relation; +import org.aspectj.asm.RelationNode; import org.aspectj.asm.StructureModel; -import org.aspectj.bridge.*; -import org.aspectj.bridge.SourceLocation; +import org.aspectj.bridge.ISourceLocation; public class AsmAdaptor { public static void noteMunger(StructureModel model, Shadow shadow, ShadowMunger munger) { diff --git a/weaver/src/org/aspectj/weaver/Checker.java b/weaver/src/org/aspectj/weaver/Checker.java index 5c653b13c..ab4541de3 100644 --- a/weaver/src/org/aspectj/weaver/Checker.java +++ b/weaver/src/org/aspectj/weaver/Checker.java @@ -13,9 +13,10 @@ package org.aspectj.weaver; -import org.aspectj.weaver.patterns.*; +import org.aspectj.bridge.IMessage; +import org.aspectj.bridge.Message; +import org.aspectj.weaver.patterns.DeclareErrorOrWarning; import org.aspectj.weaver.patterns.PerClause; -import org.aspectj.bridge.*; public class Checker extends ShadowMunger { diff --git a/weaver/src/org/aspectj/weaver/CrosscuttingMembers.java b/weaver/src/org/aspectj/weaver/CrosscuttingMembers.java index 1ffb5dfdf..b5311a9ec 100644 --- a/weaver/src/org/aspectj/weaver/CrosscuttingMembers.java +++ b/weaver/src/org/aspectj/weaver/CrosscuttingMembers.java @@ -13,11 +13,18 @@ package org.aspectj.weaver; -import java.util.*; - -import org.aspectj.weaver.patterns.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Iterator; +import java.util.List; + +import org.aspectj.weaver.patterns.Declare; +import org.aspectj.weaver.patterns.DeclareErrorOrWarning; +import org.aspectj.weaver.patterns.DeclareParents; +import org.aspectj.weaver.patterns.DeclarePrecedence; +import org.aspectj.weaver.patterns.DeclareSoft; import org.aspectj.weaver.patterns.PerClause; -import org.aspectj.bridge.*; +import org.aspectj.weaver.patterns.Pointcut; /** diff --git a/weaver/src/org/aspectj/weaver/CrosscuttingMembersSet.java b/weaver/src/org/aspectj/weaver/CrosscuttingMembersSet.java index 0f2dafde3..5b2e84131 100644 --- a/weaver/src/org/aspectj/weaver/CrosscuttingMembersSet.java +++ b/weaver/src/org/aspectj/weaver/CrosscuttingMembersSet.java @@ -13,11 +13,11 @@ package org.aspectj.weaver; -import java.util.*; - -import org.aspectj.weaver.patterns.*; -import org.aspectj.weaver.patterns.PerClause; -import org.aspectj.bridge.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; /** diff --git a/weaver/src/org/aspectj/weaver/IntMap.java b/weaver/src/org/aspectj/weaver/IntMap.java index c36f50499..4025a6211 100644 --- a/weaver/src/org/aspectj/weaver/IntMap.java +++ b/weaver/src/org/aspectj/weaver/IntMap.java @@ -13,7 +13,8 @@ package org.aspectj.weaver; -import java.util.*; +import java.util.ArrayList; +import java.util.List; public class IntMap { public static final IntMap EMPTY = new IntMap(0) { diff --git a/weaver/src/org/aspectj/weaver/Iterators.java b/weaver/src/org/aspectj/weaver/Iterators.java index 44a06ee18..139243d96 100644 --- a/weaver/src/org/aspectj/weaver/Iterators.java +++ b/weaver/src/org/aspectj/weaver/Iterators.java @@ -13,7 +13,10 @@ package org.aspectj.weaver; -import java.util.*; +import java.util.HashSet; +import java.util.Iterator; +import java.util.NoSuchElementException; +import java.util.Set; public final class Iterators { diff --git a/weaver/src/org/aspectj/weaver/Lint.java b/weaver/src/org/aspectj/weaver/Lint.java index 80163d951..8872ca7e6 100644 --- a/weaver/src/org/aspectj/weaver/Lint.java +++ b/weaver/src/org/aspectj/weaver/Lint.java @@ -13,13 +13,20 @@ package org.aspectj.weaver; -import java.io.*; import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.io.InputStream; import java.text.MessageFormat; -import java.util.*; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Map; +import java.util.Properties; -import org.aspectj.bridge.*; -import org.aspectj.bridge.IMessage.Kind; +import org.aspectj.bridge.IMessage; +import org.aspectj.bridge.ISourceLocation; +import org.aspectj.bridge.Message; +import org.aspectj.bridge.MessageUtil; public class Lint { private Map kinds = new HashMap(); diff --git a/weaver/src/org/aspectj/weaver/Member.java b/weaver/src/org/aspectj/weaver/Member.java index b77aacc93..1b6c9aadf 100644 --- a/weaver/src/org/aspectj/weaver/Member.java +++ b/weaver/src/org/aspectj/weaver/Member.java @@ -13,9 +13,14 @@ package org.aspectj.weaver; -import java.io.*; +import java.io.DataInputStream; +import java.io.IOException; import java.lang.reflect.Modifier; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; import org.aspectj.util.TypeSafeEnum; diff --git a/weaver/src/org/aspectj/weaver/NameMangler.java b/weaver/src/org/aspectj/weaver/NameMangler.java index e510cc3e7..d554fc43d 100644 --- a/weaver/src/org/aspectj/weaver/NameMangler.java +++ b/weaver/src/org/aspectj/weaver/NameMangler.java @@ -15,9 +15,8 @@ package org.aspectj.weaver; import java.lang.reflect.Modifier; -import org.aspectj.util.FuzzyBoolean; -import org.aspectj.weaver.bcel.*; import org.aspectj.weaver.bcel.BcelObjectType; +import org.aspectj.weaver.bcel.LazyClassGen; public class NameMangler { private NameMangler() { diff --git a/weaver/src/org/aspectj/weaver/NewConstructorTypeMunger.java b/weaver/src/org/aspectj/weaver/NewConstructorTypeMunger.java index 29ab9f51a..ae62a630e 100644 --- a/weaver/src/org/aspectj/weaver/NewConstructorTypeMunger.java +++ b/weaver/src/org/aspectj/weaver/NewConstructorTypeMunger.java @@ -13,11 +13,12 @@ package org.aspectj.weaver; -import java.io.*; +import java.io.DataInputStream; +import java.io.DataOutputStream; +import java.io.IOException; import java.util.Set; import org.aspectj.bridge.IMessage; -import org.aspectj.weaver.ResolvedTypeMunger.Kind; public class NewConstructorTypeMunger extends ResolvedTypeMunger { private ResolvedMember syntheticConstructor; diff --git a/weaver/src/org/aspectj/weaver/NewFieldTypeMunger.java b/weaver/src/org/aspectj/weaver/NewFieldTypeMunger.java index c62733884..8733a3b8d 100644 --- a/weaver/src/org/aspectj/weaver/NewFieldTypeMunger.java +++ b/weaver/src/org/aspectj/weaver/NewFieldTypeMunger.java @@ -13,12 +13,11 @@ package org.aspectj.weaver; -import java.io.*; -import java.lang.reflect.Modifier; +import java.io.DataInputStream; +import java.io.DataOutputStream; +import java.io.IOException; import java.util.Set; -import org.aspectj.weaver.ResolvedTypeMunger.Kind; - public class NewFieldTypeMunger extends ResolvedTypeMunger { public NewFieldTypeMunger(ResolvedMember signature, Set superMethodsCalled) { super(Field, signature); diff --git a/weaver/src/org/aspectj/weaver/NewMethodTypeMunger.java b/weaver/src/org/aspectj/weaver/NewMethodTypeMunger.java index 380057980..92fcb2c8e 100644 --- a/weaver/src/org/aspectj/weaver/NewMethodTypeMunger.java +++ b/weaver/src/org/aspectj/weaver/NewMethodTypeMunger.java @@ -13,11 +13,11 @@ package org.aspectj.weaver; -import java.io.*; +import java.io.DataInputStream; +import java.io.DataOutputStream; +import java.io.IOException; import java.util.Set; -import org.aspectj.weaver.ResolvedTypeMunger.Kind; - public class NewMethodTypeMunger extends ResolvedTypeMunger { public NewMethodTypeMunger( ResolvedMember signature, diff --git a/weaver/src/org/aspectj/weaver/PerObjectInterfaceTypeMunger.java b/weaver/src/org/aspectj/weaver/PerObjectInterfaceTypeMunger.java index ae3098b6c..1064d7e83 100644 --- a/weaver/src/org/aspectj/weaver/PerObjectInterfaceTypeMunger.java +++ b/weaver/src/org/aspectj/weaver/PerObjectInterfaceTypeMunger.java @@ -13,10 +13,9 @@ package org.aspectj.weaver; -import java.io.*; -import java.util.Set; +import java.io.DataOutputStream; +import java.io.IOException; -import org.aspectj.weaver.ResolvedTypeMunger.Kind; import org.aspectj.weaver.patterns.Pointcut; public class PerObjectInterfaceTypeMunger extends ResolvedTypeMunger { diff --git a/weaver/src/org/aspectj/weaver/PrivilegedAccessMunger.java b/weaver/src/org/aspectj/weaver/PrivilegedAccessMunger.java index 7efb31754..909c4d669 100644 --- a/weaver/src/org/aspectj/weaver/PrivilegedAccessMunger.java +++ b/weaver/src/org/aspectj/weaver/PrivilegedAccessMunger.java @@ -13,11 +13,8 @@ package org.aspectj.weaver; -import java.io.*; -import java.util.Set; - -import org.aspectj.weaver.ResolvedTypeMunger.Kind; -import org.aspectj.weaver.patterns.Pointcut; +import java.io.DataOutputStream; +import java.io.IOException; public class PrivilegedAccessMunger extends ResolvedTypeMunger { public PrivilegedAccessMunger(ResolvedMember member) { diff --git a/weaver/src/org/aspectj/weaver/ResolvedMember.java b/weaver/src/org/aspectj/weaver/ResolvedMember.java index 7b2c1bc4e..b457db0b4 100644 --- a/weaver/src/org/aspectj/weaver/ResolvedMember.java +++ b/weaver/src/org/aspectj/weaver/ResolvedMember.java @@ -13,7 +13,9 @@ package org.aspectj.weaver; -import java.io.*; +import java.io.DataInputStream; +import java.io.DataOutputStream; +import java.io.IOException; import java.lang.reflect.Modifier; import org.aspectj.bridge.ISourceLocation; diff --git a/weaver/src/org/aspectj/weaver/ResolvedPointcutDefinition.java b/weaver/src/org/aspectj/weaver/ResolvedPointcutDefinition.java index 0e282a7b2..de565597d 100644 --- a/weaver/src/org/aspectj/weaver/ResolvedPointcutDefinition.java +++ b/weaver/src/org/aspectj/weaver/ResolvedPointcutDefinition.java @@ -13,7 +13,9 @@ package org.aspectj.weaver; -import java.io.*; +import java.io.DataInputStream; +import java.io.DataOutputStream; +import java.io.IOException; import org.aspectj.weaver.patterns.Pointcut; diff --git a/weaver/src/org/aspectj/weaver/ResolvedTypeMunger.java b/weaver/src/org/aspectj/weaver/ResolvedTypeMunger.java index 31227f643..b2365c388 100644 --- a/weaver/src/org/aspectj/weaver/ResolvedTypeMunger.java +++ b/weaver/src/org/aspectj/weaver/ResolvedTypeMunger.java @@ -13,8 +13,14 @@ package org.aspectj.weaver; -import java.io.*; -import java.util.*; +import java.io.DataInputStream; +import java.io.DataOutputStream; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; import java.util.Set; import org.aspectj.util.TypeSafeEnum; diff --git a/weaver/src/org/aspectj/weaver/ResolvedTypeX.java b/weaver/src/org/aspectj/weaver/ResolvedTypeX.java index e13b81bf3..cfce3b03c 100644 --- a/weaver/src/org/aspectj/weaver/ResolvedTypeX.java +++ b/weaver/src/org/aspectj/weaver/ResolvedTypeX.java @@ -14,12 +14,18 @@ package org.aspectj.weaver; import java.lang.reflect.Modifier; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.Iterator; +import java.util.List; -import org.aspectj.bridge.*; +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.*; +import org.aspectj.weaver.patterns.Declare; import org.aspectj.weaver.patterns.PerClause; public abstract class ResolvedTypeX extends TypeX { diff --git a/weaver/src/org/aspectj/weaver/Shadow.java b/weaver/src/org/aspectj/weaver/Shadow.java index fe58a5672..dd36e0eda 100644 --- a/weaver/src/org/aspectj/weaver/Shadow.java +++ b/weaver/src/org/aspectj/weaver/Shadow.java @@ -13,18 +13,18 @@ package org.aspectj.weaver; -import java.io.*; -import java.lang.reflect.Modifier; -import java.util.*; +import java.io.DataInputStream; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; -import org.apache.bcel.Constants; -import org.apache.bcel.classfile.Field; -import org.aspectj.weaver.ast.Var; -import org.aspectj.weaver.patterns.IScope; -import org.aspectj.bridge.*; +import org.aspectj.bridge.MessageUtil; import org.aspectj.bridge.SourceLocation; import org.aspectj.lang.JoinPoint; -import org.aspectj.util.*; +import org.aspectj.util.PartialOrder; +import org.aspectj.util.TypeSafeEnum; +import org.aspectj.weaver.ast.Var; /* * The superclass of anything representing a the shadow of a join point. A shadow represents diff --git a/weaver/src/org/aspectj/weaver/ShadowMunger.java b/weaver/src/org/aspectj/weaver/ShadowMunger.java index c81954afb..f6788f6da 100644 --- a/weaver/src/org/aspectj/weaver/ShadowMunger.java +++ b/weaver/src/org/aspectj/weaver/ShadowMunger.java @@ -15,8 +15,8 @@ package org.aspectj.weaver; import org.aspectj.bridge.ISourceLocation; import org.aspectj.util.PartialOrder; -import org.aspectj.weaver.patterns.*; import org.aspectj.weaver.patterns.PerClause; +import org.aspectj.weaver.patterns.Pointcut; /** * For every shadow munger, nothing can be done with it until it is concretized. Then... diff --git a/weaver/src/org/aspectj/weaver/StaticJoinPointFactory.java b/weaver/src/org/aspectj/weaver/StaticJoinPointFactory.java index c87d3a5af..79687ba6c 100644 --- a/weaver/src/org/aspectj/weaver/StaticJoinPointFactory.java +++ b/weaver/src/org/aspectj/weaver/StaticJoinPointFactory.java @@ -13,8 +13,6 @@ package org.aspectj.weaver; -import java.io.StringReader; -import java.util.*; public class StaticJoinPointFactory { // int usedKeys; diff --git a/weaver/src/org/aspectj/weaver/TypeX.java b/weaver/src/org/aspectj/weaver/TypeX.java index 8e6df145a..6b1443be0 100644 --- a/weaver/src/org/aspectj/weaver/TypeX.java +++ b/weaver/src/org/aspectj/weaver/TypeX.java @@ -13,12 +13,11 @@ package org.aspectj.weaver; -import java.io.*; -import java.lang.reflect.Modifier; +import java.io.DataInputStream; +import java.io.DataOutputStream; +import java.io.IOException; import java.util.Iterator; -import org.aspectj.weaver.patterns.PerClause; - public class TypeX { /** * This is the bytecode string representation of this Type diff --git a/weaver/src/org/aspectj/weaver/WeaverStateKind.java b/weaver/src/org/aspectj/weaver/WeaverStateKind.java index c5d226890..1960c8d12 100644 --- a/weaver/src/org/aspectj/weaver/WeaverStateKind.java +++ b/weaver/src/org/aspectj/weaver/WeaverStateKind.java @@ -13,7 +13,8 @@ package org.aspectj.weaver; -import java.io.*; +import java.io.DataInputStream; +import java.io.IOException; import org.aspectj.util.TypeSafeEnum; diff --git a/weaver/src/org/aspectj/weaver/World.java b/weaver/src/org/aspectj/weaver/World.java index a97664fd6..6a9080255 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.weaver.patterns.*; -import org.aspectj.weaver.patterns.Pointcut; import org.aspectj.asm.StructureModel; -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.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/ast/CallExpr.java b/weaver/src/org/aspectj/weaver/ast/CallExpr.java index 6760ad8e4..9bedb27c9 100644 --- a/weaver/src/org/aspectj/weaver/ast/CallExpr.java +++ b/weaver/src/org/aspectj/weaver/ast/CallExpr.java @@ -13,8 +13,8 @@ package org.aspectj.weaver.ast; -import org.aspectj.weaver.*; import org.aspectj.weaver.Member; +import org.aspectj.weaver.ResolvedTypeX; public class CallExpr extends Expr { // assert m.return value is boolean diff --git a/weaver/src/org/aspectj/weaver/ast/Expr.java b/weaver/src/org/aspectj/weaver/ast/Expr.java index 4001a0b33..f66010991 100644 --- a/weaver/src/org/aspectj/weaver/ast/Expr.java +++ b/weaver/src/org/aspectj/weaver/ast/Expr.java @@ -13,7 +13,8 @@ package org.aspectj.weaver.ast; -import org.aspectj.weaver.*; +import org.aspectj.weaver.Member; +import org.aspectj.weaver.ResolvedTypeX; public abstract class Expr extends ASTNode { diff --git a/weaver/src/org/aspectj/weaver/ast/FieldGet.java b/weaver/src/org/aspectj/weaver/ast/FieldGet.java index 88d17637e..7a31f8dee 100644 --- a/weaver/src/org/aspectj/weaver/ast/FieldGet.java +++ b/weaver/src/org/aspectj/weaver/ast/FieldGet.java @@ -13,7 +13,8 @@ package org.aspectj.weaver.ast; -import org.aspectj.weaver.*; +import org.aspectj.weaver.Member; +import org.aspectj.weaver.ResolvedTypeX; public class FieldGet extends Expr { diff --git a/weaver/src/org/aspectj/weaver/ast/Test.java b/weaver/src/org/aspectj/weaver/ast/Test.java index 37aaf64d4..b714ccb82 100644 --- a/weaver/src/org/aspectj/weaver/ast/Test.java +++ b/weaver/src/org/aspectj/weaver/ast/Test.java @@ -13,7 +13,7 @@ package org.aspectj.weaver.ast; -import org.aspectj.weaver.*; +import org.aspectj.weaver.Member; import org.aspectj.weaver.ResolvedTypeX; public abstract class Test extends ASTNode { diff --git a/weaver/src/org/aspectj/weaver/ast/Var.java b/weaver/src/org/aspectj/weaver/ast/Var.java index dc637b9cc..444f29e1a 100644 --- a/weaver/src/org/aspectj/weaver/ast/Var.java +++ b/weaver/src/org/aspectj/weaver/ast/Var.java @@ -13,7 +13,7 @@ package org.aspectj.weaver.ast; -import org.aspectj.weaver.*; +import org.aspectj.weaver.ResolvedTypeX; public class Var extends Expr { diff --git a/weaver/src/org/aspectj/weaver/bcel/BcelAdvice.java b/weaver/src/org/aspectj/weaver/bcel/BcelAdvice.java index 07b33ce13..de0738773 100644 --- a/weaver/src/org/aspectj/weaver/bcel/BcelAdvice.java +++ b/weaver/src/org/aspectj/weaver/bcel/BcelAdvice.java @@ -13,10 +13,25 @@ package org.aspectj.weaver.bcel; -import org.apache.bcel.generic.*; -import org.aspectj.weaver.*; -import org.aspectj.weaver.ast.*; -import org.aspectj.weaver.patterns.*; +import org.apache.bcel.generic.InstructionFactory; +import org.apache.bcel.generic.InstructionHandle; +import org.apache.bcel.generic.InstructionList; +import org.aspectj.weaver.Advice; +import org.aspectj.weaver.AdviceKind; +import org.aspectj.weaver.AjAttribute; +import org.aspectj.weaver.BCException; +import org.aspectj.weaver.ISourceContext; +import org.aspectj.weaver.Member; +import org.aspectj.weaver.ResolvedTypeX; +import org.aspectj.weaver.Shadow; +import org.aspectj.weaver.TypeX; +import org.aspectj.weaver.WeaverStateKind; +import org.aspectj.weaver.World; +import org.aspectj.weaver.ast.Literal; +import org.aspectj.weaver.ast.Test; +import org.aspectj.weaver.patterns.ExactTypePattern; +import org.aspectj.weaver.patterns.ExposedState; +import org.aspectj.weaver.patterns.Pointcut; /** * Advice implemented for bcel. diff --git a/weaver/src/org/aspectj/weaver/bcel/BcelAttributes.java b/weaver/src/org/aspectj/weaver/bcel/BcelAttributes.java index 803690af2..c73b65045 100644 --- a/weaver/src/org/aspectj/weaver/bcel/BcelAttributes.java +++ b/weaver/src/org/aspectj/weaver/bcel/BcelAttributes.java @@ -13,12 +13,14 @@ package org.aspectj.weaver.bcel; -import java.util.*; +import java.util.ArrayList; +import java.util.List; -import org.apache.bcel.classfile.*; +import org.apache.bcel.classfile.Attribute; +import org.apache.bcel.classfile.Unknown; import org.apache.bcel.generic.ConstantPoolGen; -import org.aspectj.weaver.*; import org.aspectj.weaver.AjAttribute; +import org.aspectj.weaver.ISourceContext; // this is a class o' static methods for reading attributes. It's pretty much a bridge from diff --git a/weaver/src/org/aspectj/weaver/bcel/BcelCflowAccessVar.java b/weaver/src/org/aspectj/weaver/bcel/BcelCflowAccessVar.java index 7ee150548..d920191ce 100644 --- a/weaver/src/org/aspectj/weaver/bcel/BcelCflowAccessVar.java +++ b/weaver/src/org/aspectj/weaver/bcel/BcelCflowAccessVar.java @@ -14,10 +14,13 @@ package org.aspectj.weaver.bcel; import org.apache.bcel.Constants; -import org.apache.bcel.generic.*; -import org.aspectj.weaver.*; +import org.apache.bcel.generic.Instruction; +import org.apache.bcel.generic.InstructionFactory; +import org.apache.bcel.generic.InstructionList; +import org.apache.bcel.generic.Type; +import org.aspectj.weaver.Member; +import org.aspectj.weaver.NameMangler; import org.aspectj.weaver.ResolvedTypeX; -import org.aspectj.weaver.ast.Var; /** * XXX Erik and I need to discuss this hierarchy. Having FieldRef diff --git a/weaver/src/org/aspectj/weaver/bcel/BcelCflowStackFieldAdder.java b/weaver/src/org/aspectj/weaver/bcel/BcelCflowStackFieldAdder.java index 405e28cb3..79acffa18 100644 --- a/weaver/src/org/aspectj/weaver/bcel/BcelCflowStackFieldAdder.java +++ b/weaver/src/org/aspectj/weaver/bcel/BcelCflowStackFieldAdder.java @@ -15,9 +15,15 @@ package org.aspectj.weaver.bcel; import org.apache.bcel.Constants; import org.apache.bcel.classfile.Field; -import org.apache.bcel.generic.*; import org.apache.bcel.generic.FieldGen; -import org.aspectj.weaver.*; +import org.apache.bcel.generic.InstructionFactory; +import org.apache.bcel.generic.InstructionList; +import org.apache.bcel.generic.ObjectType; +import org.apache.bcel.generic.Type; +import org.aspectj.weaver.Member; +import org.aspectj.weaver.NameMangler; +import org.aspectj.weaver.ResolvedMember; +import org.aspectj.weaver.ResolvedTypeX; public class BcelCflowStackFieldAdder extends BcelTypeMunger { private ResolvedMember cflowStackField; diff --git a/weaver/src/org/aspectj/weaver/bcel/BcelClassWeaver.java b/weaver/src/org/aspectj/weaver/bcel/BcelClassWeaver.java index 7babec184..1622758de 100644 --- a/weaver/src/org/aspectj/weaver/bcel/BcelClassWeaver.java +++ b/weaver/src/org/aspectj/weaver/bcel/BcelClassWeaver.java @@ -14,12 +14,53 @@ package org.aspectj.weaver.bcel; import java.lang.reflect.Modifier; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Set; import org.apache.bcel.Constants; -import org.apache.bcel.generic.*; +import org.apache.bcel.generic.BranchInstruction; +import org.apache.bcel.generic.CPInstruction; +import org.apache.bcel.generic.ConstantPoolGen; +import org.apache.bcel.generic.FieldInstruction; +import org.apache.bcel.generic.INVOKESPECIAL; +import org.apache.bcel.generic.IndexedInstruction; +import org.apache.bcel.generic.Instruction; +import org.apache.bcel.generic.InstructionFactory; +import org.apache.bcel.generic.InstructionHandle; +import org.apache.bcel.generic.InstructionList; +import org.apache.bcel.generic.InstructionTargeter; +import org.apache.bcel.generic.InvokeInstruction; +import org.apache.bcel.generic.LocalVariableInstruction; +import org.apache.bcel.generic.NEW; +import org.apache.bcel.generic.ObjectType; +import org.apache.bcel.generic.PUTFIELD; +import org.apache.bcel.generic.PUTSTATIC; +import org.apache.bcel.generic.RET; +import org.apache.bcel.generic.ReturnInstruction; +import org.apache.bcel.generic.Select; +import org.apache.bcel.generic.Type; import org.aspectj.util.PartialOrder; -import org.aspectj.weaver.*; +import org.aspectj.weaver.AjAttribute; +import org.aspectj.weaver.AjcMemberMaker; +import org.aspectj.weaver.BCException; +import org.aspectj.weaver.ConcreteTypeMunger; +import org.aspectj.weaver.IClassWeaver; +import org.aspectj.weaver.IntMap; +import org.aspectj.weaver.Member; +import org.aspectj.weaver.NameMangler; +import org.aspectj.weaver.NewFieldTypeMunger; +import org.aspectj.weaver.ResolvedMember; +import org.aspectj.weaver.ResolvedTypeX; +import org.aspectj.weaver.Shadow; +import org.aspectj.weaver.ShadowMunger; +import org.aspectj.weaver.WeaverStateKind; class BcelClassWeaver implements IClassWeaver { diff --git a/weaver/src/org/aspectj/weaver/bcel/BcelField.java b/weaver/src/org/aspectj/weaver/bcel/BcelField.java index e7d876817..7491482ec 100644 --- a/weaver/src/org/aspectj/weaver/bcel/BcelField.java +++ b/weaver/src/org/aspectj/weaver/bcel/BcelField.java @@ -13,10 +13,15 @@ package org.aspectj.weaver.bcel; -import java.util.*; +import java.util.Iterator; +import java.util.List; import org.apache.bcel.classfile.Field; -import org.aspectj.weaver.*; +import org.aspectj.weaver.AjAttribute; +import org.aspectj.weaver.BCException; +import org.aspectj.weaver.ResolvedMember; +import org.aspectj.weaver.TypeX; +import org.aspectj.weaver.World; final class BcelField extends ResolvedMember { diff --git a/weaver/src/org/aspectj/weaver/bcel/BcelFieldRef.java b/weaver/src/org/aspectj/weaver/bcel/BcelFieldRef.java index d32fee9e0..cf779ba8d 100644 --- a/weaver/src/org/aspectj/weaver/bcel/BcelFieldRef.java +++ b/weaver/src/org/aspectj/weaver/bcel/BcelFieldRef.java @@ -14,10 +14,10 @@ package org.aspectj.weaver.bcel; import org.apache.bcel.Constants; -import org.apache.bcel.generic.*; -import org.aspectj.weaver.*; +import org.apache.bcel.generic.Instruction; +import org.apache.bcel.generic.InstructionFactory; +import org.apache.bcel.generic.InstructionList; import org.aspectj.weaver.ResolvedTypeX; -import org.aspectj.weaver.ast.Var; /** * XXX Erik and I need to discuss this hierarchy. Having FieldRef diff --git a/weaver/src/org/aspectj/weaver/bcel/BcelMethod.java b/weaver/src/org/aspectj/weaver/bcel/BcelMethod.java index d79bc40b4..696a5df4d 100644 --- a/weaver/src/org/aspectj/weaver/bcel/BcelMethod.java +++ b/weaver/src/org/aspectj/weaver/bcel/BcelMethod.java @@ -14,10 +14,19 @@ package org.aspectj.weaver.bcel; import java.lang.reflect.Modifier; -import java.util.*; +import java.util.Iterator; +import java.util.List; -import org.apache.bcel.classfile.*; -import org.aspectj.weaver.*; +import org.apache.bcel.classfile.ExceptionTable; +import org.apache.bcel.classfile.LocalVariable; +import org.apache.bcel.classfile.LocalVariableTable; +import org.apache.bcel.classfile.Method; +import org.aspectj.weaver.AjAttribute; +import org.aspectj.weaver.BCException; +import org.aspectj.weaver.ResolvedMember; +import org.aspectj.weaver.ShadowMunger; +import org.aspectj.weaver.TypeX; +import org.aspectj.weaver.World; final class BcelMethod extends ResolvedMember { diff --git a/weaver/src/org/aspectj/weaver/bcel/BcelObjectType.java b/weaver/src/org/aspectj/weaver/bcel/BcelObjectType.java index 109e91498..ae1041c56 100644 --- a/weaver/src/org/aspectj/weaver/bcel/BcelObjectType.java +++ b/weaver/src/org/aspectj/weaver/bcel/BcelObjectType.java @@ -14,11 +14,24 @@ package org.aspectj.weaver.bcel; import java.io.PrintStream; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.Iterator; +import java.util.List; -import org.apache.bcel.classfile.*; -import org.aspectj.weaver.*; -import org.aspectj.weaver.patterns.*; +import org.apache.bcel.classfile.Field; +import org.apache.bcel.classfile.JavaClass; +import org.apache.bcel.classfile.Method; +import org.aspectj.weaver.AjAttribute; +import org.aspectj.weaver.BCException; +import org.aspectj.weaver.ResolvedMember; +import org.aspectj.weaver.ResolvedPointcutDefinition; +import org.aspectj.weaver.ResolvedTypeX; +import org.aspectj.weaver.TypeX; +import org.aspectj.weaver.WeaverStateKind; +import org.aspectj.weaver.World; import org.aspectj.weaver.patterns.PerClause; // ??? exposed for testing diff --git a/weaver/src/org/aspectj/weaver/bcel/BcelRenderer.java b/weaver/src/org/aspectj/weaver/bcel/BcelRenderer.java index 46fcea55f..ea391c7e3 100644 --- a/weaver/src/org/aspectj/weaver/bcel/BcelRenderer.java +++ b/weaver/src/org/aspectj/weaver/bcel/BcelRenderer.java @@ -14,10 +14,27 @@ package org.aspectj.weaver.bcel; import org.apache.bcel.Constants; -import org.apache.bcel.generic.*; -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.ObjectType; +import org.apache.bcel.generic.Type; import org.aspectj.weaver.BCException; -import org.aspectj.weaver.ast.*; +import org.aspectj.weaver.Member; +import org.aspectj.weaver.ast.And; +import org.aspectj.weaver.ast.Call; +import org.aspectj.weaver.ast.CallExpr; +import org.aspectj.weaver.ast.Expr; +import org.aspectj.weaver.ast.FieldGet; +import org.aspectj.weaver.ast.FieldGetCall; +import org.aspectj.weaver.ast.IExprVisitor; +import org.aspectj.weaver.ast.ITestVisitor; +import org.aspectj.weaver.ast.Instanceof; +import org.aspectj.weaver.ast.Literal; +import org.aspectj.weaver.ast.Not; +import org.aspectj.weaver.ast.Or; +import org.aspectj.weaver.ast.Test; +import org.aspectj.weaver.ast.Var; // we generate right to left, btw. public class BcelRenderer implements ITestVisitor, IExprVisitor { diff --git a/weaver/src/org/aspectj/weaver/bcel/BcelShadow.java b/weaver/src/org/aspectj/weaver/bcel/BcelShadow.java index 26d2d7f1d..0483a826e 100644 --- a/weaver/src/org/aspectj/weaver/bcel/BcelShadow.java +++ b/weaver/src/org/aspectj/weaver/bcel/BcelShadow.java @@ -15,14 +15,46 @@ package org.aspectj.weaver.bcel; import java.io.File; import java.lang.reflect.Modifier; -import java.util.*; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; import org.apache.bcel.Constants; import org.apache.bcel.classfile.Field; -import org.apache.bcel.generic.*; +import org.apache.bcel.generic.ACONST_NULL; +import org.apache.bcel.generic.ArrayType; +import org.apache.bcel.generic.BranchInstruction; +import org.apache.bcel.generic.ConstantPoolGen; +import org.apache.bcel.generic.DUP; +import org.apache.bcel.generic.DUP_X1; +import org.apache.bcel.generic.FieldInstruction; +import org.apache.bcel.generic.INVOKESPECIAL; +import org.apache.bcel.generic.INVOKESTATIC; +import org.apache.bcel.generic.Instruction; +import org.apache.bcel.generic.InstructionFactory; +import org.apache.bcel.generic.InstructionHandle; +import org.apache.bcel.generic.InstructionList; +import org.apache.bcel.generic.InstructionTargeter; +import org.apache.bcel.generic.InvokeInstruction; +import org.apache.bcel.generic.NEW; +import org.apache.bcel.generic.ObjectType; +import org.apache.bcel.generic.ReturnInstruction; +import org.apache.bcel.generic.SWAP; +import org.apache.bcel.generic.TargetLostException; +import org.apache.bcel.generic.Type; import org.aspectj.bridge.SourceLocation; -import org.aspectj.weaver.*; -import org.aspectj.weaver.Shadow.Kind; +import org.aspectj.weaver.AdviceKind; +import org.aspectj.weaver.AjcMemberMaker; +import org.aspectj.weaver.BCException; +import org.aspectj.weaver.IntMap; +import org.aspectj.weaver.Member; +import org.aspectj.weaver.NameMangler; +import org.aspectj.weaver.ResolvedMember; +import org.aspectj.weaver.ResolvedTypeX; +import org.aspectj.weaver.Shadow; +import org.aspectj.weaver.ShadowMunger; +import org.aspectj.weaver.TypeX; +import org.aspectj.weaver.World; import org.aspectj.weaver.ast.Var; diff --git a/weaver/src/org/aspectj/weaver/bcel/BcelSourceContext.java b/weaver/src/org/aspectj/weaver/bcel/BcelSourceContext.java index ed3095e60..287979b57 100644 --- a/weaver/src/org/aspectj/weaver/bcel/BcelSourceContext.java +++ b/weaver/src/org/aspectj/weaver/bcel/BcelSourceContext.java @@ -16,8 +16,9 @@ package org.aspectj.weaver.bcel; import java.io.File; import java.util.Arrays; -import org.aspectj.bridge.*; -import org.aspectj.weaver.*; +import org.aspectj.bridge.ISourceLocation; +import org.aspectj.bridge.SourceLocation; +import org.aspectj.weaver.IHasPosition; import org.aspectj.weaver.ISourceContext; import org.aspectj.weaver.AjAttribute.SourceContextAttribute; diff --git a/weaver/src/org/aspectj/weaver/bcel/BcelTypeMunger.java b/weaver/src/org/aspectj/weaver/bcel/BcelTypeMunger.java index 934ec96a2..860f91002 100644 --- a/weaver/src/org/aspectj/weaver/bcel/BcelTypeMunger.java +++ b/weaver/src/org/aspectj/weaver/bcel/BcelTypeMunger.java @@ -14,12 +14,28 @@ package org.aspectj.weaver.bcel; import java.lang.reflect.Modifier; -import java.util.*; +import java.util.Iterator; +import java.util.Set; import org.apache.bcel.Constants; -import org.apache.bcel.generic.*; -import org.aspectj.weaver.*; -import org.aspectj.weaver.patterns.*; +import org.apache.bcel.generic.FieldGen; +import org.apache.bcel.generic.InstructionFactory; +import org.apache.bcel.generic.InstructionList; +import org.apache.bcel.generic.Type; +import org.aspectj.weaver.AjcMemberMaker; +import org.aspectj.weaver.ConcreteTypeMunger; +import org.aspectj.weaver.Member; +import org.aspectj.weaver.NameMangler; +import org.aspectj.weaver.NewConstructorTypeMunger; +import org.aspectj.weaver.NewFieldTypeMunger; +import org.aspectj.weaver.NewMethodTypeMunger; +import org.aspectj.weaver.PerObjectInterfaceTypeMunger; +import org.aspectj.weaver.PrivilegedAccessMunger; +import org.aspectj.weaver.ResolvedMember; +import org.aspectj.weaver.ResolvedTypeMunger; +import org.aspectj.weaver.ResolvedTypeX; +import org.aspectj.weaver.TypeX; +import org.aspectj.weaver.patterns.Pointcut; //XXX addLazyMethodGen is probably bad everywhere diff --git a/weaver/src/org/aspectj/weaver/bcel/BcelVar.java b/weaver/src/org/aspectj/weaver/bcel/BcelVar.java index a60230075..249bc1de5 100644 --- a/weaver/src/org/aspectj/weaver/bcel/BcelVar.java +++ b/weaver/src/org/aspectj/weaver/bcel/BcelVar.java @@ -13,8 +13,9 @@ package org.aspectj.weaver.bcel; -import org.apache.bcel.generic.*; -import org.aspectj.weaver.*; +import org.apache.bcel.generic.Instruction; +import org.apache.bcel.generic.InstructionFactory; +import org.apache.bcel.generic.InstructionList; import org.aspectj.weaver.ResolvedTypeX; import org.aspectj.weaver.ast.Var; diff --git a/weaver/src/org/aspectj/weaver/bcel/BcelWeaver.java b/weaver/src/org/aspectj/weaver/bcel/BcelWeaver.java index 8e02045be..290fc33d7 100644 --- a/weaver/src/org/aspectj/weaver/bcel/BcelWeaver.java +++ b/weaver/src/org/aspectj/weaver/bcel/BcelWeaver.java @@ -13,15 +13,34 @@ package org.aspectj.weaver.bcel; -import java.io.*; -import java.util.*; -import java.util.zip.*; - -import org.apache.bcel.classfile.*; +import java.io.BufferedOutputStream; +import java.io.ByteArrayInputStream; +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.io.OutputStream; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.Comparator; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.zip.ZipEntry; +import java.util.zip.ZipInputStream; +import java.util.zip.ZipOutputStream; + +import org.apache.bcel.classfile.ClassParser; import org.apache.bcel.classfile.JavaClass; import org.aspectj.bridge.IMessage; import org.aspectj.util.FileUtil; -import org.aspectj.weaver.*; +import org.aspectj.weaver.ConcreteTypeMunger; +import org.aspectj.weaver.CrosscuttingMembersSet; +import org.aspectj.weaver.IWeaver; +import org.aspectj.weaver.ResolvedTypeX; +import org.aspectj.weaver.TypeX; public class BcelWeaver implements IWeaver { private BcelWorld world; diff --git a/weaver/src/org/aspectj/weaver/bcel/BcelWorld.java b/weaver/src/org/aspectj/weaver/bcel/BcelWorld.java index 539bb7dee..27249e2cf 100644 --- a/weaver/src/org/aspectj/weaver/bcel/BcelWorld.java +++ b/weaver/src/org/aspectj/weaver/bcel/BcelWorld.java @@ -13,22 +13,40 @@ 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 java.util.zip.*; -import java.util.zip.ZipInputStream; +import java.util.ArrayList; +import java.util.List; +import java.util.StringTokenizer; -import org.apache.bcel.classfile.*; -import org.apache.bcel.generic.*; +import org.apache.bcel.classfile.ClassParser; +import org.apache.bcel.classfile.JavaClass; +import org.apache.bcel.classfile.Method; +import org.apache.bcel.generic.ConstantPoolGen; +import org.apache.bcel.generic.FieldInstruction; +import org.apache.bcel.generic.GETSTATIC; +import org.apache.bcel.generic.INVOKEINTERFACE; +import org.apache.bcel.generic.INVOKESPECIAL; +import org.apache.bcel.generic.INVOKESTATIC; +import org.apache.bcel.generic.InvokeInstruction; +import org.apache.bcel.generic.PUTSTATIC; +import org.apache.bcel.generic.Type; import org.apache.bcel.util.ClassPath; -import org.aspectj.util.FileUtil; -import org.aspectj.weaver.*; -import org.aspectj.weaver.patterns.*; -import org.aspectj.asm.StructureModel; -import org.aspectj.bridge.*; import org.aspectj.bridge.IMessageHandler; +import org.aspectj.weaver.Advice; +import org.aspectj.weaver.AdviceKind; +import org.aspectj.weaver.AjAttribute; +import org.aspectj.weaver.ConcreteTypeMunger; +import org.aspectj.weaver.Member; +import org.aspectj.weaver.ResolvedMember; +import org.aspectj.weaver.ResolvedTypeMunger; +import org.aspectj.weaver.ResolvedTypeX; +import org.aspectj.weaver.TypeX; +import org.aspectj.weaver.World; +import org.aspectj.weaver.patterns.FormalBinding; +import org.aspectj.weaver.patterns.Pointcut; +import org.aspectj.weaver.patterns.SimpleScope; public class BcelWorld extends World { private ClassPathManager classPath; diff --git a/weaver/src/org/aspectj/weaver/bcel/ClassPathManager.java b/weaver/src/org/aspectj/weaver/bcel/ClassPathManager.java index ee2b55e6a..3f4c908e9 100644 --- a/weaver/src/org/aspectj/weaver/bcel/ClassPathManager.java +++ b/weaver/src/org/aspectj/weaver/bcel/ClassPathManager.java @@ -13,14 +13,19 @@ package org.aspectj.weaver.bcel; -import java.io.*; import java.io.File; -import java.util.*; -import java.util.zip.*; +import java.io.FileInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.util.ArrayList; +import java.util.Enumeration; +import java.util.Iterator; +import java.util.List; +import java.util.zip.ZipEntry; import java.util.zip.ZipFile; -import org.aspectj.bridge.*; import org.aspectj.bridge.IMessageHandler; +import org.aspectj.bridge.MessageUtil; import org.aspectj.weaver.TypeX; diff --git a/weaver/src/org/aspectj/weaver/bcel/ExceptionRange.java b/weaver/src/org/aspectj/weaver/bcel/ExceptionRange.java index d3ba351c9..1b92edaa5 100644 --- a/weaver/src/org/aspectj/weaver/bcel/ExceptionRange.java +++ b/weaver/src/org/aspectj/weaver/bcel/ExceptionRange.java @@ -13,7 +13,8 @@ package org.aspectj.weaver.bcel; -import org.apache.bcel.generic.*; +import org.apache.bcel.generic.InstructionHandle; +import org.apache.bcel.generic.InstructionList; import org.aspectj.weaver.TypeX; /** exceptionRanges are set initially to be low priority. The various setPriority methods diff --git a/weaver/src/org/aspectj/weaver/bcel/LazyClassGen.java b/weaver/src/org/aspectj/weaver/bcel/LazyClassGen.java index da0a2db8f..857e5f58e 100644 --- a/weaver/src/org/aspectj/weaver/bcel/LazyClassGen.java +++ b/weaver/src/org/aspectj/weaver/bcel/LazyClassGen.java @@ -13,16 +13,42 @@ package org.aspectj.weaver.bcel; -import java.io.*; +import java.io.ByteArrayOutputStream; +import java.io.File; +import java.io.IOException; +import java.io.PrintStream; import java.lang.reflect.Modifier; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; import org.apache.bcel.Constants; -import org.apache.bcel.classfile.*; -import org.apache.bcel.generic.*; -import org.apache.bcel.util.ClassPath; -import org.aspectj.weaver.*; +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; +import org.apache.bcel.generic.InstructionFactory; +import org.apache.bcel.generic.InstructionHandle; +import org.apache.bcel.generic.InstructionList; +import org.apache.bcel.generic.ObjectType; +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.AjAttribute; +import org.aspectj.weaver.BCException; +import org.aspectj.weaver.Member; +import org.aspectj.weaver.NameMangler; +import org.aspectj.weaver.TypeX; +import org.aspectj.weaver.WeaverStateKind; public final class LazyClassGen { diff --git a/weaver/src/org/aspectj/weaver/bcel/LazyMethodGen.java b/weaver/src/org/aspectj/weaver/bcel/LazyMethodGen.java index 5703b5197..f6d8ee854 100644 --- a/weaver/src/org/aspectj/weaver/bcel/LazyMethodGen.java +++ b/weaver/src/org/aspectj/weaver/bcel/LazyMethodGen.java @@ -13,14 +13,43 @@ package org.aspectj.weaver.bcel; -import java.io.*; +import java.io.ByteArrayOutputStream; +import java.io.PrintStream; import java.lang.reflect.Modifier; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.Stack; import org.apache.bcel.Constants; -import org.apache.bcel.classfile.*; -import org.apache.bcel.generic.*; -import org.aspectj.weaver.*; +import org.apache.bcel.classfile.Attribute; +import org.apache.bcel.classfile.ConstantPool; +import org.apache.bcel.classfile.Method; +import org.apache.bcel.generic.BranchHandle; +import org.apache.bcel.generic.BranchInstruction; +import org.apache.bcel.generic.CPInstruction; +import org.apache.bcel.generic.CodeExceptionGen; +import org.apache.bcel.generic.Instruction; +import org.apache.bcel.generic.InstructionHandle; +import org.apache.bcel.generic.InstructionList; +import org.apache.bcel.generic.InstructionTargeter; +import org.apache.bcel.generic.LineNumberGen; +import org.apache.bcel.generic.LocalVariableGen; +import org.apache.bcel.generic.LocalVariableInstruction; +import org.apache.bcel.generic.MethodGen; +import org.apache.bcel.generic.ObjectType; +import org.apache.bcel.generic.Select; +import org.apache.bcel.generic.Type; +import org.aspectj.weaver.AjAttribute; +import org.aspectj.weaver.BCException; +import org.aspectj.weaver.ISourceContext; +import org.aspectj.weaver.Member; +import org.aspectj.weaver.ResolvedTypeX; /** diff --git a/weaver/src/org/aspectj/weaver/bcel/Range.java b/weaver/src/org/aspectj/weaver/bcel/Range.java index 5c1d2031e..dfc882197 100644 --- a/weaver/src/org/aspectj/weaver/bcel/Range.java +++ b/weaver/src/org/aspectj/weaver/bcel/Range.java @@ -13,13 +13,14 @@ package org.aspectj.weaver.bcel; -import java.lang.reflect.Modifier; import java.util.Map; -import org.apache.bcel.Constants; -import org.apache.bcel.generic.*; -import org.aspectj.weaver.*; -import org.aspectj.weaver.IntMap; +import org.apache.bcel.generic.IMPDEP1; +import org.apache.bcel.generic.Instruction; +import org.apache.bcel.generic.InstructionHandle; +import org.apache.bcel.generic.InstructionList; +import org.apache.bcel.generic.InstructionTargeter; +import org.aspectj.weaver.BCException; abstract class Range implements InstructionTargeter { diff --git a/weaver/src/org/aspectj/weaver/bcel/ShadowRange.java b/weaver/src/org/aspectj/weaver/bcel/ShadowRange.java index 28a0e2ea2..3bbc1cd8a 100644 --- a/weaver/src/org/aspectj/weaver/bcel/ShadowRange.java +++ b/weaver/src/org/aspectj/weaver/bcel/ShadowRange.java @@ -13,8 +13,20 @@ package org.aspectj.weaver.bcel; -import org.apache.bcel.generic.*; -import org.aspectj.weaver.*; +import org.apache.bcel.generic.BranchInstruction; +import org.apache.bcel.generic.IndexedInstruction; +import org.apache.bcel.generic.Instruction; +import org.apache.bcel.generic.InstructionFactory; +import org.apache.bcel.generic.InstructionHandle; +import org.apache.bcel.generic.InstructionList; +import org.apache.bcel.generic.InstructionTargeter; +import org.apache.bcel.generic.LocalVariableInstruction; +import org.apache.bcel.generic.RET; +import org.apache.bcel.generic.Select; +import org.apache.bcel.generic.TargetLostException; +import org.aspectj.weaver.BCException; +import org.aspectj.weaver.IntMap; +import org.aspectj.weaver.Shadow; final class ShadowRange extends Range { diff --git a/weaver/src/org/aspectj/weaver/bcel/Tag.java b/weaver/src/org/aspectj/weaver/bcel/Tag.java index fb0a3eaef..ee1e9fa4a 100644 --- a/weaver/src/org/aspectj/weaver/bcel/Tag.java +++ b/weaver/src/org/aspectj/weaver/bcel/Tag.java @@ -13,7 +13,8 @@ package org.aspectj.weaver.bcel; -import org.apache.bcel.generic.*; +import org.apache.bcel.generic.InstructionHandle; +import org.apache.bcel.generic.InstructionTargeter; /** A tag is an instruction-targeter that doesn't bother remembering its target(s) */ abstract class Tag implements InstructionTargeter, Cloneable { diff --git a/weaver/src/org/aspectj/weaver/bcel/UnwovenClassFile.java b/weaver/src/org/aspectj/weaver/bcel/UnwovenClassFile.java index 6d1656e4b..88c23811c 100644 --- a/weaver/src/org/aspectj/weaver/bcel/UnwovenClassFile.java +++ b/weaver/src/org/aspectj/weaver/bcel/UnwovenClassFile.java @@ -13,8 +13,13 @@ package org.aspectj.weaver.bcel; -import java.io.*; -import java.util.*; +import java.io.BufferedOutputStream; +import java.io.File; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Iterator; +import java.util.List; import org.apache.bcel.classfile.JavaClass; import org.aspectj.util.FileUtil; diff --git a/weaver/src/org/aspectj/weaver/bcel/Utility.java b/weaver/src/org/aspectj/weaver/bcel/Utility.java index fde58e127..1fc189598 100644 --- a/weaver/src/org/aspectj/weaver/bcel/Utility.java +++ b/weaver/src/org/aspectj/weaver/bcel/Utility.java @@ -13,13 +13,34 @@ package org.aspectj.weaver.bcel; -import java.io.*; +import java.io.ByteArrayInputStream; +import java.io.IOException; import java.lang.reflect.Modifier; import org.apache.bcel.Constants; -import org.apache.bcel.classfile.*; -import org.apache.bcel.generic.*; -import org.aspectj.weaver.*; +import org.apache.bcel.classfile.ClassParser; +import org.apache.bcel.classfile.JavaClass; +import org.apache.bcel.classfile.Method; +import org.apache.bcel.generic.BIPUSH; +import org.apache.bcel.generic.BasicType; +import org.apache.bcel.generic.BranchInstruction; +import org.apache.bcel.generic.ConstantPushInstruction; +import org.apache.bcel.generic.INSTANCEOF; +import org.apache.bcel.generic.Instruction; +import org.apache.bcel.generic.InstructionFactory; +import org.apache.bcel.generic.InstructionHandle; +import org.apache.bcel.generic.InstructionList; +import org.apache.bcel.generic.InstructionTargeter; +import org.apache.bcel.generic.LDC; +import org.apache.bcel.generic.ObjectType; +import org.apache.bcel.generic.ReferenceType; +import org.apache.bcel.generic.SIPUSH; +import org.apache.bcel.generic.TargetLostException; +import org.apache.bcel.generic.Type; +import org.aspectj.weaver.BCException; +import org.aspectj.weaver.Member; +import org.aspectj.weaver.ResolvedTypeX; +import org.aspectj.weaver.TypeX; public class Utility { diff --git a/weaver/src/org/aspectj/weaver/bcel/ZipFileWeaver.java b/weaver/src/org/aspectj/weaver/bcel/ZipFileWeaver.java index e85f1f157..249f36325 100644 --- a/weaver/src/org/aspectj/weaver/bcel/ZipFileWeaver.java +++ b/weaver/src/org/aspectj/weaver/bcel/ZipFileWeaver.java @@ -13,10 +13,8 @@ package org.aspectj.weaver.bcel; -import java.io.*; -import java.util.zip.*; - -import org.aspectj.util.FileUtil; +import java.io.File; +import java.io.IOException; //XXX delete very soon diff --git a/weaver/src/org/aspectj/weaver/patterns/AndPointcut.java b/weaver/src/org/aspectj/weaver/patterns/AndPointcut.java index 1c6814ffe..f0e270d9b 100644 --- a/weaver/src/org/aspectj/weaver/patterns/AndPointcut.java +++ b/weaver/src/org/aspectj/weaver/patterns/AndPointcut.java @@ -13,12 +13,16 @@ package org.aspectj.weaver.patterns; -import java.io.*; -import java.util.Map; +import java.io.DataInputStream; +import java.io.DataOutputStream; +import java.io.IOException; -import org.aspectj.weaver.*; -import org.aspectj.weaver.ast.*; -import org.aspectj.util.*; +import org.aspectj.util.FuzzyBoolean; +import org.aspectj.weaver.ISourceContext; +import org.aspectj.weaver.IntMap; +import org.aspectj.weaver.ResolvedTypeX; +import org.aspectj.weaver.Shadow; +import org.aspectj.weaver.ast.Test; public class AndPointcut extends Pointcut { Pointcut left, right; // exposed for testing diff --git a/weaver/src/org/aspectj/weaver/patterns/AndTypePattern.java b/weaver/src/org/aspectj/weaver/patterns/AndTypePattern.java index 58617ef30..468e95ab2 100644 --- a/weaver/src/org/aspectj/weaver/patterns/AndTypePattern.java +++ b/weaver/src/org/aspectj/weaver/patterns/AndTypePattern.java @@ -13,10 +13,12 @@ package org.aspectj.weaver.patterns; -import java.io.*; +import java.io.DataInputStream; +import java.io.DataOutputStream; +import java.io.IOException; import org.aspectj.util.FuzzyBoolean; -import org.aspectj.weaver.*; +import org.aspectj.weaver.ISourceContext; import org.aspectj.weaver.ResolvedTypeX; /** diff --git a/weaver/src/org/aspectj/weaver/patterns/ArgsPointcut.java b/weaver/src/org/aspectj/weaver/patterns/ArgsPointcut.java index 9e2985e9a..3cfff4a68 100644 --- a/weaver/src/org/aspectj/weaver/patterns/ArgsPointcut.java +++ b/weaver/src/org/aspectj/weaver/patterns/ArgsPointcut.java @@ -13,12 +13,20 @@ package org.aspectj.weaver.patterns; -import java.io.*; +import java.io.DataInputStream; +import java.io.DataOutputStream; +import java.io.IOException; import org.aspectj.bridge.IMessage; import org.aspectj.util.FuzzyBoolean; -import org.aspectj.weaver.*; -import org.aspectj.weaver.ast.*; +import org.aspectj.weaver.BetaException; +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; /** * args(arguments) diff --git a/weaver/src/org/aspectj/weaver/patterns/BasicTokenSource.java b/weaver/src/org/aspectj/weaver/patterns/BasicTokenSource.java index c889d64f8..c267116b1 100644 --- a/weaver/src/org/aspectj/weaver/patterns/BasicTokenSource.java +++ b/weaver/src/org/aspectj/weaver/patterns/BasicTokenSource.java @@ -13,9 +13,11 @@ package org.aspectj.weaver.patterns; -import java.util.*; +import java.util.ArrayList; +import java.util.List; -import org.aspectj.weaver.*; +import org.aspectj.weaver.BCException; +import org.aspectj.weaver.ISourceContext; public class BasicTokenSource implements ITokenSource { diff --git a/weaver/src/org/aspectj/weaver/patterns/BindingTypePattern.java b/weaver/src/org/aspectj/weaver/patterns/BindingTypePattern.java index 54b6a6231..87a7b524d 100644 --- a/weaver/src/org/aspectj/weaver/patterns/BindingTypePattern.java +++ b/weaver/src/org/aspectj/weaver/patterns/BindingTypePattern.java @@ -13,9 +13,13 @@ package org.aspectj.weaver.patterns; -import java.io.*; +import java.io.DataInputStream; +import java.io.DataOutputStream; +import java.io.IOException; -import org.aspectj.weaver.*; +import org.aspectj.weaver.ISourceContext; +import org.aspectj.weaver.IntMap; +import org.aspectj.weaver.TypeX; public class BindingTypePattern extends ExactTypePattern { private int formalIndex; diff --git a/weaver/src/org/aspectj/weaver/patterns/Bindings.java b/weaver/src/org/aspectj/weaver/patterns/Bindings.java index 1a4f8dab4..7fd02c179 100644 --- a/weaver/src/org/aspectj/weaver/patterns/Bindings.java +++ b/weaver/src/org/aspectj/weaver/patterns/Bindings.java @@ -13,8 +13,8 @@ package org.aspectj.weaver.patterns; -import org.aspectj.weaver.BCException; import org.aspectj.bridge.IMessage; +import org.aspectj.weaver.BCException; public class Bindings { public static final Bindings NONE = new Bindings(0); diff --git a/weaver/src/org/aspectj/weaver/patterns/CflowPointcut.java b/weaver/src/org/aspectj/weaver/patterns/CflowPointcut.java index 2aa3aef3c..5cc3eb4df 100644 --- a/weaver/src/org/aspectj/weaver/patterns/CflowPointcut.java +++ b/weaver/src/org/aspectj/weaver/patterns/CflowPointcut.java @@ -13,16 +13,29 @@ package org.aspectj.weaver.patterns; -import java.io.*; +import java.io.DataInputStream; +import java.io.DataOutputStream; +import java.io.IOException; import java.lang.reflect.Modifier; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; import java.util.List; -import org.aspectj.weaver.*; -import org.aspectj.weaver.ast.*; -import org.aspectj.weaver.bcel.*; -import org.aspectj.weaver.bcel.BcelTypeMunger; -import org.aspectj.util.*; +import org.aspectj.util.FileUtil; +import org.aspectj.util.FuzzyBoolean; +import org.aspectj.weaver.Advice; +import org.aspectj.weaver.CrosscuttingMembers; +import org.aspectj.weaver.ISourceContext; +import org.aspectj.weaver.IntMap; +import org.aspectj.weaver.Member; +import org.aspectj.weaver.NameMangler; +import org.aspectj.weaver.ResolvedMember; +import org.aspectj.weaver.ResolvedPointcutDefinition; +import org.aspectj.weaver.ResolvedTypeX; +import org.aspectj.weaver.Shadow; +import org.aspectj.weaver.TypeX; +import org.aspectj.weaver.World; +import org.aspectj.weaver.ast.Test; public class CflowPointcut extends Pointcut { diff --git a/weaver/src/org/aspectj/weaver/patterns/ConcreteCflowPointcut.java b/weaver/src/org/aspectj/weaver/patterns/ConcreteCflowPointcut.java index 64da23fb1..e20a9a12a 100644 --- a/weaver/src/org/aspectj/weaver/patterns/ConcreteCflowPointcut.java +++ b/weaver/src/org/aspectj/weaver/patterns/ConcreteCflowPointcut.java @@ -13,16 +13,21 @@ package org.aspectj.weaver.patterns; -import java.io.*; -import java.lang.reflect.Modifier; -import java.util.*; +import java.io.DataOutputStream; +import java.io.IOException; +import java.util.Iterator; import java.util.List; -import org.aspectj.weaver.*; -import org.aspectj.weaver.ast.*; -import org.aspectj.weaver.bcel.*; -import org.aspectj.weaver.bcel.BcelTypeMunger; -import org.aspectj.util.*; +import org.aspectj.util.FuzzyBoolean; +import org.aspectj.weaver.IntMap; +import org.aspectj.weaver.Member; +import org.aspectj.weaver.NameMangler; +import org.aspectj.weaver.ResolvedTypeX; +import org.aspectj.weaver.Shadow; +import org.aspectj.weaver.TypeX; +import org.aspectj.weaver.ast.Expr; +import org.aspectj.weaver.ast.Test; +import org.aspectj.weaver.bcel.BcelCflowAccessVar; public class ConcreteCflowPointcut extends Pointcut { diff --git a/weaver/src/org/aspectj/weaver/patterns/Declare.java b/weaver/src/org/aspectj/weaver/patterns/Declare.java index 14e04eae1..010a306a1 100644 --- a/weaver/src/org/aspectj/weaver/patterns/Declare.java +++ b/weaver/src/org/aspectj/weaver/patterns/Declare.java @@ -13,7 +13,8 @@ package org.aspectj.weaver.patterns; -import java.io.*; +import java.io.DataInputStream; +import java.io.IOException; import org.aspectj.weaver.ISourceContext; diff --git a/weaver/src/org/aspectj/weaver/patterns/DeclareErrorOrWarning.java b/weaver/src/org/aspectj/weaver/patterns/DeclareErrorOrWarning.java index 7cbce2212..051b44d81 100644 --- a/weaver/src/org/aspectj/weaver/patterns/DeclareErrorOrWarning.java +++ b/weaver/src/org/aspectj/weaver/patterns/DeclareErrorOrWarning.java @@ -13,7 +13,9 @@ package org.aspectj.weaver.patterns; -import java.io.*; +import java.io.DataInputStream; +import java.io.DataOutputStream; +import java.io.IOException; import org.aspectj.weaver.ISourceContext; diff --git a/weaver/src/org/aspectj/weaver/patterns/DeclareParents.java b/weaver/src/org/aspectj/weaver/patterns/DeclareParents.java index 0902c7f9b..d71633e7f 100644 --- a/weaver/src/org/aspectj/weaver/patterns/DeclareParents.java +++ b/weaver/src/org/aspectj/weaver/patterns/DeclareParents.java @@ -13,10 +13,12 @@ package org.aspectj.weaver.patterns; -import java.io.*; +import java.io.DataInputStream; +import java.io.DataOutputStream; +import java.io.IOException; import java.util.List; -import org.aspectj.weaver.*; +import org.aspectj.weaver.ISourceContext; import org.aspectj.weaver.ResolvedTypeX; public class DeclareParents extends Declare { diff --git a/weaver/src/org/aspectj/weaver/patterns/DeclarePrecedence.java b/weaver/src/org/aspectj/weaver/patterns/DeclarePrecedence.java index cf0ff8d1a..dd6598388 100644 --- a/weaver/src/org/aspectj/weaver/patterns/DeclarePrecedence.java +++ b/weaver/src/org/aspectj/weaver/patterns/DeclarePrecedence.java @@ -13,11 +13,13 @@ package org.aspectj.weaver.patterns; -import java.io.*; +import java.io.DataInputStream; +import java.io.DataOutputStream; +import java.io.IOException; import java.util.List; import org.aspectj.bridge.IMessage; -import org.aspectj.weaver.*; +import org.aspectj.weaver.ISourceContext; import org.aspectj.weaver.ResolvedTypeX; public class DeclarePrecedence extends Declare { diff --git a/weaver/src/org/aspectj/weaver/patterns/DeclareSoft.java b/weaver/src/org/aspectj/weaver/patterns/DeclareSoft.java index 388e25d0b..99727d285 100644 --- a/weaver/src/org/aspectj/weaver/patterns/DeclareSoft.java +++ b/weaver/src/org/aspectj/weaver/patterns/DeclareSoft.java @@ -13,7 +13,9 @@ package org.aspectj.weaver.patterns; -import java.io.*; +import java.io.DataInputStream; +import java.io.DataOutputStream; +import java.io.IOException; import org.aspectj.bridge.IMessage; import org.aspectj.weaver.ISourceContext; diff --git a/weaver/src/org/aspectj/weaver/patterns/ExactTypePattern.java b/weaver/src/org/aspectj/weaver/patterns/ExactTypePattern.java index 42d60da19..ef5929888 100644 --- a/weaver/src/org/aspectj/weaver/patterns/ExactTypePattern.java +++ b/weaver/src/org/aspectj/weaver/patterns/ExactTypePattern.java @@ -13,10 +13,15 @@ package org.aspectj.weaver.patterns; -import java.io.*; +import java.io.DataInputStream; +import java.io.DataOutputStream; +import java.io.IOException; -import org.aspectj.weaver.*; -import org.aspectj.util.*; +import org.aspectj.util.FuzzyBoolean; +import org.aspectj.weaver.BCException; +import org.aspectj.weaver.ISourceContext; +import org.aspectj.weaver.ResolvedTypeX; +import org.aspectj.weaver.TypeX; public class ExactTypePattern extends TypePattern { protected TypeX type; diff --git a/weaver/src/org/aspectj/weaver/patterns/ExposedState.java b/weaver/src/org/aspectj/weaver/patterns/ExposedState.java index 9815f1eae..8e130c689 100644 --- a/weaver/src/org/aspectj/weaver/patterns/ExposedState.java +++ b/weaver/src/org/aspectj/weaver/patterns/ExposedState.java @@ -15,8 +15,9 @@ package org.aspectj.weaver.patterns; import java.util.Arrays; -import org.aspectj.weaver.*; -import org.aspectj.weaver.ast.*; +import org.aspectj.weaver.Member; +import org.aspectj.weaver.ast.Expr; +import org.aspectj.weaver.ast.Var; public class ExposedState { public Var[] vars; diff --git a/weaver/src/org/aspectj/weaver/patterns/FormalBinding.java b/weaver/src/org/aspectj/weaver/patterns/FormalBinding.java index 04e78bd32..589b1d0f0 100644 --- a/weaver/src/org/aspectj/weaver/patterns/FormalBinding.java +++ b/weaver/src/org/aspectj/weaver/patterns/FormalBinding.java @@ -13,7 +13,8 @@ package org.aspectj.weaver.patterns; -import org.aspectj.weaver.*; +import org.aspectj.weaver.IHasPosition; +import org.aspectj.weaver.TypeX; public class FormalBinding implements IHasPosition { private final TypeX type; diff --git a/weaver/src/org/aspectj/weaver/patterns/HandlerPointcut.java b/weaver/src/org/aspectj/weaver/patterns/HandlerPointcut.java index bf3e3a500..243205b7e 100644 --- a/weaver/src/org/aspectj/weaver/patterns/HandlerPointcut.java +++ b/weaver/src/org/aspectj/weaver/patterns/HandlerPointcut.java @@ -13,13 +13,17 @@ package org.aspectj.weaver.patterns; -import java.io.*; +import java.io.DataInputStream; +import java.io.DataOutputStream; +import java.io.IOException; -import org.apache.bcel.classfile.JavaClass; -import org.aspectj.weaver.*; -import org.aspectj.weaver.ast.*; -import org.aspectj.bridge.MessageUtil; import org.aspectj.util.FuzzyBoolean; +import org.aspectj.weaver.ISourceContext; +import org.aspectj.weaver.IntMap; +import org.aspectj.weaver.ResolvedTypeX; +import org.aspectj.weaver.Shadow; +import org.aspectj.weaver.ast.Literal; +import org.aspectj.weaver.ast.Test; /** * This is a kind of KindedPointcut. This belongs either in diff --git a/weaver/src/org/aspectj/weaver/patterns/IScope.java b/weaver/src/org/aspectj/weaver/patterns/IScope.java index 2fc54dd9c..a5803489d 100644 --- a/weaver/src/org/aspectj/weaver/patterns/IScope.java +++ b/weaver/src/org/aspectj/weaver/patterns/IScope.java @@ -13,9 +13,12 @@ package org.aspectj.weaver.patterns; -import org.aspectj.weaver.*; -import org.aspectj.bridge.*; +import org.aspectj.bridge.IMessage; import org.aspectj.bridge.IMessageHandler; +import org.aspectj.weaver.IHasPosition; +import org.aspectj.weaver.ResolvedTypeX; +import org.aspectj.weaver.TypeX; +import org.aspectj.weaver.World; public interface IScope { diff --git a/weaver/src/org/aspectj/weaver/patterns/IToken.java b/weaver/src/org/aspectj/weaver/patterns/IToken.java index c1defb103..e1331ccae 100644 --- a/weaver/src/org/aspectj/weaver/patterns/IToken.java +++ b/weaver/src/org/aspectj/weaver/patterns/IToken.java @@ -13,7 +13,7 @@ package org.aspectj.weaver.patterns; -import org.aspectj.weaver.*; +import org.aspectj.weaver.IHasPosition; public interface IToken extends IHasPosition { public static final IToken EOF = BasicToken.makeOperator("<eof>", 0, 0); diff --git a/weaver/src/org/aspectj/weaver/patterns/IfPointcut.java b/weaver/src/org/aspectj/weaver/patterns/IfPointcut.java index d8ee09149..4c4beb1ab 100644 --- a/weaver/src/org/aspectj/weaver/patterns/IfPointcut.java +++ b/weaver/src/org/aspectj/weaver/patterns/IfPointcut.java @@ -13,15 +13,25 @@ package org.aspectj.weaver.patterns; -import java.io.*; -import java.util.*; +import java.io.DataInputStream; +import java.io.DataOutputStream; +import java.io.IOException; +import java.util.ArrayList; import java.util.List; -import org.aspectj.weaver.*; -import org.aspectj.weaver.ast.*; -import org.aspectj.bridge.*; -import org.aspectj.bridge.MessageUtil; -import org.aspectj.util.*; +import org.aspectj.bridge.IMessage; +import org.aspectj.util.FuzzyBoolean; +import org.aspectj.weaver.Advice; +import org.aspectj.weaver.ISourceContext; +import org.aspectj.weaver.IntMap; +import org.aspectj.weaver.ResolvedMember; +import org.aspectj.weaver.ResolvedPointcutDefinition; +import org.aspectj.weaver.ResolvedTypeX; +import org.aspectj.weaver.Shadow; +import org.aspectj.weaver.ShadowMunger; +import org.aspectj.weaver.ast.Expr; +import org.aspectj.weaver.ast.Literal; +import org.aspectj.weaver.ast.Test; public class IfPointcut extends Pointcut { diff --git a/weaver/src/org/aspectj/weaver/patterns/KindedPointcut.java b/weaver/src/org/aspectj/weaver/patterns/KindedPointcut.java index 6003e8f74..1204c97a4 100644 --- a/weaver/src/org/aspectj/weaver/patterns/KindedPointcut.java +++ b/weaver/src/org/aspectj/weaver/patterns/KindedPointcut.java @@ -13,13 +13,18 @@ package org.aspectj.weaver.patterns; -import java.io.*; +import java.io.DataInputStream; +import java.io.DataOutputStream; +import java.io.IOException; import org.apache.bcel.classfile.JavaClass; -import org.aspectj.weaver.*; -import org.aspectj.weaver.ast.*; -import org.aspectj.bridge.MessageUtil; import org.aspectj.util.FuzzyBoolean; +import org.aspectj.weaver.ISourceContext; +import org.aspectj.weaver.IntMap; +import org.aspectj.weaver.ResolvedTypeX; +import org.aspectj.weaver.Shadow; +import org.aspectj.weaver.ast.Literal; +import org.aspectj.weaver.ast.Test; public class KindedPointcut extends Pointcut { Shadow.Kind kind; diff --git a/weaver/src/org/aspectj/weaver/patterns/ModifiersPattern.java b/weaver/src/org/aspectj/weaver/patterns/ModifiersPattern.java index 90c7f4666..f60eecc3b 100644 --- a/weaver/src/org/aspectj/weaver/patterns/ModifiersPattern.java +++ b/weaver/src/org/aspectj/weaver/patterns/ModifiersPattern.java @@ -13,9 +13,12 @@ package org.aspectj.weaver.patterns; -import java.io.*; +import java.io.DataInputStream; +import java.io.DataOutputStream; +import java.io.IOException; import java.lang.reflect.Modifier; -import java.util.*; +import java.util.HashMap; +import java.util.Map; public class ModifiersPattern extends PatternNode { private int requiredModifiers; diff --git a/weaver/src/org/aspectj/weaver/patterns/NameBindingPointcut.java b/weaver/src/org/aspectj/weaver/patterns/NameBindingPointcut.java index 23f062933..6fa9af440 100644 --- a/weaver/src/org/aspectj/weaver/patterns/NameBindingPointcut.java +++ b/weaver/src/org/aspectj/weaver/patterns/NameBindingPointcut.java @@ -13,11 +13,10 @@ package org.aspectj.weaver.patterns; -import java.io.*; - -import org.aspectj.util.FuzzyBoolean; -import org.aspectj.weaver.*; -import org.aspectj.weaver.ast.*; +import org.aspectj.weaver.TypeX; +import org.aspectj.weaver.World; +import org.aspectj.weaver.ast.Test; +import org.aspectj.weaver.ast.Var; /** * Common super type for Pointcuts that can bind formal parameters. diff --git a/weaver/src/org/aspectj/weaver/patterns/NamePattern.java b/weaver/src/org/aspectj/weaver/patterns/NamePattern.java index 0d2c70cef..361060faf 100644 --- a/weaver/src/org/aspectj/weaver/patterns/NamePattern.java +++ b/weaver/src/org/aspectj/weaver/patterns/NamePattern.java @@ -13,7 +13,9 @@ package org.aspectj.weaver.patterns; -import java.io.*; +import java.io.DataInputStream; +import java.io.DataOutputStream; +import java.io.IOException; public class NamePattern extends PatternNode { char[] pattern; diff --git a/weaver/src/org/aspectj/weaver/patterns/NotPointcut.java b/weaver/src/org/aspectj/weaver/patterns/NotPointcut.java index eab4a595c..56ade7763 100644 --- a/weaver/src/org/aspectj/weaver/patterns/NotPointcut.java +++ b/weaver/src/org/aspectj/weaver/patterns/NotPointcut.java @@ -13,11 +13,16 @@ package org.aspectj.weaver.patterns; -import java.io.*; +import java.io.DataInputStream; +import java.io.DataOutputStream; +import java.io.IOException; -import org.aspectj.weaver.*; -import org.aspectj.weaver.ast.*; -import org.aspectj.util.*; +import org.aspectj.util.FuzzyBoolean; +import org.aspectj.weaver.ISourceContext; +import org.aspectj.weaver.IntMap; +import org.aspectj.weaver.ResolvedTypeX; +import org.aspectj.weaver.Shadow; +import org.aspectj.weaver.ast.Test; public class NotPointcut extends Pointcut { private Pointcut body; diff --git a/weaver/src/org/aspectj/weaver/patterns/NotTypePattern.java b/weaver/src/org/aspectj/weaver/patterns/NotTypePattern.java index 17fef11c6..5a3ceacf9 100644 --- a/weaver/src/org/aspectj/weaver/patterns/NotTypePattern.java +++ b/weaver/src/org/aspectj/weaver/patterns/NotTypePattern.java @@ -13,10 +13,12 @@ package org.aspectj.weaver.patterns; -import java.io.*; +import java.io.DataInputStream; +import java.io.DataOutputStream; +import java.io.IOException; import org.aspectj.util.FuzzyBoolean; -import org.aspectj.weaver.*; +import org.aspectj.weaver.ISourceContext; import org.aspectj.weaver.ResolvedTypeX; /** diff --git a/weaver/src/org/aspectj/weaver/patterns/OrPointcut.java b/weaver/src/org/aspectj/weaver/patterns/OrPointcut.java index 2a32edea1..a66d0e1e1 100644 --- a/weaver/src/org/aspectj/weaver/patterns/OrPointcut.java +++ b/weaver/src/org/aspectj/weaver/patterns/OrPointcut.java @@ -13,11 +13,16 @@ package org.aspectj.weaver.patterns; -import java.io.*; +import java.io.DataInputStream; +import java.io.DataOutputStream; +import java.io.IOException; -import org.aspectj.weaver.*; -import org.aspectj.weaver.ast.*; -import org.aspectj.util.*; +import org.aspectj.util.FuzzyBoolean; +import org.aspectj.weaver.ISourceContext; +import org.aspectj.weaver.IntMap; +import org.aspectj.weaver.ResolvedTypeX; +import org.aspectj.weaver.Shadow; +import org.aspectj.weaver.ast.Test; public class OrPointcut extends Pointcut { private Pointcut left, right; diff --git a/weaver/src/org/aspectj/weaver/patterns/OrTypePattern.java b/weaver/src/org/aspectj/weaver/patterns/OrTypePattern.java index 618e6b485..2900d4a2b 100644 --- a/weaver/src/org/aspectj/weaver/patterns/OrTypePattern.java +++ b/weaver/src/org/aspectj/weaver/patterns/OrTypePattern.java @@ -13,10 +13,12 @@ package org.aspectj.weaver.patterns; -import java.io.*; +import java.io.DataInputStream; +import java.io.DataOutputStream; +import java.io.IOException; import org.aspectj.util.FuzzyBoolean; -import org.aspectj.weaver.*; +import org.aspectj.weaver.ISourceContext; import org.aspectj.weaver.ResolvedTypeX; /** diff --git a/weaver/src/org/aspectj/weaver/patterns/ParserException.java b/weaver/src/org/aspectj/weaver/patterns/ParserException.java index fdeac1deb..86774283d 100644 --- a/weaver/src/org/aspectj/weaver/patterns/ParserException.java +++ b/weaver/src/org/aspectj/weaver/patterns/ParserException.java @@ -13,7 +13,7 @@ package org.aspectj.weaver.patterns; -import org.aspectj.weaver.*; +import org.aspectj.weaver.IHasPosition; public class ParserException extends RuntimeException { diff --git a/weaver/src/org/aspectj/weaver/patterns/PatternNode.java b/weaver/src/org/aspectj/weaver/patterns/PatternNode.java index d75bb378a..c49b52923 100644 --- a/weaver/src/org/aspectj/weaver/patterns/PatternNode.java +++ b/weaver/src/org/aspectj/weaver/patterns/PatternNode.java @@ -13,11 +13,12 @@ package org.aspectj.weaver.patterns; -import java.io.*; +import java.io.DataInputStream; +import java.io.DataOutputStream; +import java.io.IOException; -import org.aspectj.bridge.*; import org.aspectj.bridge.ISourceLocation; -import org.aspectj.weaver.*; +import org.aspectj.weaver.IHasSourceLocation; import org.aspectj.weaver.ISourceContext; public abstract class PatternNode implements IHasSourceLocation { diff --git a/weaver/src/org/aspectj/weaver/patterns/PatternParser.java b/weaver/src/org/aspectj/weaver/patterns/PatternParser.java index 9b1ce7455..20d2e0550 100644 --- a/weaver/src/org/aspectj/weaver/patterns/PatternParser.java +++ b/weaver/src/org/aspectj/weaver/patterns/PatternParser.java @@ -13,9 +13,12 @@ package org.aspectj.weaver.patterns; -import java.util.*; +import java.util.ArrayList; +import java.util.List; -import org.aspectj.weaver.*; +import org.aspectj.weaver.ISourceContext; +import org.aspectj.weaver.Member; +import org.aspectj.weaver.Shadow; //XXX doesn't handle errors for extra tokens very well (sometimes ignores) public class PatternParser { diff --git a/weaver/src/org/aspectj/weaver/patterns/PerCflow.java b/weaver/src/org/aspectj/weaver/patterns/PerCflow.java index e1c56cf5c..9af28b7ee 100644 --- a/weaver/src/org/aspectj/weaver/patterns/PerCflow.java +++ b/weaver/src/org/aspectj/weaver/patterns/PerCflow.java @@ -13,14 +13,28 @@ package org.aspectj.weaver.patterns; -import java.io.*; +import java.io.DataInputStream; +import java.io.DataOutputStream; +import java.io.IOException; import java.lang.reflect.Modifier; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; import java.util.List; -import org.aspectj.weaver.*; -import org.aspectj.weaver.ast.*; import org.aspectj.util.FuzzyBoolean; +import org.aspectj.weaver.Advice; +import org.aspectj.weaver.AjcMemberMaker; +import org.aspectj.weaver.CrosscuttingMembers; +import org.aspectj.weaver.ISourceContext; +import org.aspectj.weaver.Member; +import org.aspectj.weaver.NameMangler; +import org.aspectj.weaver.ResolvedMember; +import org.aspectj.weaver.ResolvedTypeX; +import org.aspectj.weaver.Shadow; +import org.aspectj.weaver.TypeX; +import org.aspectj.weaver.World; +import org.aspectj.weaver.ast.Expr; +import org.aspectj.weaver.ast.Test; public class PerCflow extends PerClause { private boolean isBelow; diff --git a/weaver/src/org/aspectj/weaver/patterns/PerClause.java b/weaver/src/org/aspectj/weaver/patterns/PerClause.java index 961e88de0..7764b15cb 100644 --- a/weaver/src/org/aspectj/weaver/patterns/PerClause.java +++ b/weaver/src/org/aspectj/weaver/patterns/PerClause.java @@ -13,14 +13,14 @@ package org.aspectj.weaver.patterns; -import java.io.*; -import java.lang.reflect.Modifier; -import java.util.List; +import java.io.DataInputStream; +import java.io.IOException; -import org.aspectj.weaver.*; -import org.aspectj.weaver.ast.Test; -import org.aspectj.util.*; -import org.aspectj.util.FuzzyBoolean; +import org.aspectj.util.TypeSafeEnum; +import org.aspectj.weaver.BCException; +import org.aspectj.weaver.ISourceContext; +import org.aspectj.weaver.IntMap; +import org.aspectj.weaver.ResolvedTypeX; public abstract class PerClause extends Pointcut { protected ResolvedTypeX inAspect; diff --git a/weaver/src/org/aspectj/weaver/patterns/PerFromSuper.java b/weaver/src/org/aspectj/weaver/patterns/PerFromSuper.java index 6d248b11c..0977d7c7c 100644 --- a/weaver/src/org/aspectj/weaver/patterns/PerFromSuper.java +++ b/weaver/src/org/aspectj/weaver/patterns/PerFromSuper.java @@ -13,13 +13,16 @@ package org.aspectj.weaver.patterns; -import java.io.*; -import java.lang.reflect.Modifier; +import java.io.DataInputStream; +import java.io.DataOutputStream; +import java.io.IOException; -import org.aspectj.weaver.*; -import org.aspectj.weaver.ast.*; import org.aspectj.bridge.MessageUtil; import org.aspectj.util.FuzzyBoolean; +import org.aspectj.weaver.ISourceContext; +import org.aspectj.weaver.ResolvedTypeX; +import org.aspectj.weaver.Shadow; +import org.aspectj.weaver.ast.Test; public class PerFromSuper extends PerClause { private PerClause.Kind kind; diff --git a/weaver/src/org/aspectj/weaver/patterns/PerObject.java b/weaver/src/org/aspectj/weaver/patterns/PerObject.java index 9e1d52463..d49536abe 100644 --- a/weaver/src/org/aspectj/weaver/patterns/PerObject.java +++ b/weaver/src/org/aspectj/weaver/patterns/PerObject.java @@ -13,14 +13,22 @@ package org.aspectj.weaver.patterns; -import java.io.*; -import java.lang.reflect.Modifier; -import java.util.*; -import java.util.List; +import java.io.DataInputStream; +import java.io.DataOutputStream; +import java.io.IOException; -import org.aspectj.weaver.*; -import org.aspectj.weaver.ast.*; import org.aspectj.util.FuzzyBoolean; +import org.aspectj.weaver.Advice; +import org.aspectj.weaver.AjcMemberMaker; +import org.aspectj.weaver.ISourceContext; +import org.aspectj.weaver.PerObjectInterfaceTypeMunger; +import org.aspectj.weaver.ResolvedTypeMunger; +import org.aspectj.weaver.ResolvedTypeX; +import org.aspectj.weaver.Shadow; +import org.aspectj.weaver.World; +import org.aspectj.weaver.ast.Expr; +import org.aspectj.weaver.ast.Test; +import org.aspectj.weaver.ast.Var; public class PerObject extends PerClause { private boolean isThis; diff --git a/weaver/src/org/aspectj/weaver/patterns/PerSingleton.java b/weaver/src/org/aspectj/weaver/patterns/PerSingleton.java index a827d6f35..553bc5a94 100644 --- a/weaver/src/org/aspectj/weaver/patterns/PerSingleton.java +++ b/weaver/src/org/aspectj/weaver/patterns/PerSingleton.java @@ -13,12 +13,18 @@ package org.aspectj.weaver.patterns; -import java.io.*; -import java.lang.reflect.Modifier; +import java.io.DataInputStream; +import java.io.DataOutputStream; +import java.io.IOException; -import org.aspectj.weaver.*; -import org.aspectj.weaver.ast.*; import org.aspectj.util.FuzzyBoolean; +import org.aspectj.weaver.AjcMemberMaker; +import org.aspectj.weaver.ISourceContext; +import org.aspectj.weaver.ResolvedTypeX; +import org.aspectj.weaver.Shadow; +import org.aspectj.weaver.ast.Expr; +import org.aspectj.weaver.ast.Literal; +import org.aspectj.weaver.ast.Test; public class PerSingleton extends PerClause { public PerSingleton() { diff --git a/weaver/src/org/aspectj/weaver/patterns/Pointcut.java b/weaver/src/org/aspectj/weaver/patterns/Pointcut.java index 9e1b5c5f5..4d1696ae6 100644 --- a/weaver/src/org/aspectj/weaver/patterns/Pointcut.java +++ b/weaver/src/org/aspectj/weaver/patterns/Pointcut.java @@ -13,13 +13,21 @@ package org.aspectj.weaver.patterns; -import java.io.*; -import java.util.Map; - -import org.apache.bcel.classfile.*; -import org.aspectj.weaver.*; -import org.aspectj.weaver.ast.*; -import org.aspectj.util.*; +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; +import org.aspectj.weaver.ISourceContext; +import org.aspectj.weaver.IntMap; +import org.aspectj.weaver.ResolvedTypeX; +import org.aspectj.weaver.Shadow; +import org.aspectj.weaver.ShadowMunger; +import org.aspectj.weaver.ast.Literal; +import org.aspectj.weaver.ast.Test; /** * The lifecycle of Pointcuts is modeled by Pointcut.State. It has three things: diff --git a/weaver/src/org/aspectj/weaver/patterns/ReferencePointcut.java b/weaver/src/org/aspectj/weaver/patterns/ReferencePointcut.java index e94634cc9..1a12423b2 100644 --- a/weaver/src/org/aspectj/weaver/patterns/ReferencePointcut.java +++ b/weaver/src/org/aspectj/weaver/patterns/ReferencePointcut.java @@ -13,17 +13,23 @@ package org.aspectj.weaver.patterns; -import java.io.*; +import java.io.DataInputStream; +import java.io.DataOutputStream; +import java.io.IOException; import java.lang.reflect.Modifier; -import java.util.*; -import java.util.Map; -import org.apache.bcel.classfile.*; -import org.aspectj.weaver.*; -import org.aspectj.weaver.ast.*; -import org.aspectj.bridge.*; +import org.apache.bcel.classfile.JavaClass; +import org.aspectj.bridge.IMessage; import org.aspectj.bridge.MessageUtil; -import org.aspectj.util.*; +import org.aspectj.util.FuzzyBoolean; +import org.aspectj.weaver.BCException; +import org.aspectj.weaver.ISourceContext; +import org.aspectj.weaver.IntMap; +import org.aspectj.weaver.ResolvedPointcutDefinition; +import org.aspectj.weaver.ResolvedTypeX; +import org.aspectj.weaver.Shadow; +import org.aspectj.weaver.TypeX; +import org.aspectj.weaver.ast.Test; /** */ diff --git a/weaver/src/org/aspectj/weaver/patterns/SignaturePattern.java b/weaver/src/org/aspectj/weaver/patterns/SignaturePattern.java index f6b091289..58ada73f7 100644 --- a/weaver/src/org/aspectj/weaver/patterns/SignaturePattern.java +++ b/weaver/src/org/aspectj/weaver/patterns/SignaturePattern.java @@ -13,11 +13,19 @@ package org.aspectj.weaver.patterns; -import java.io.*; -import java.util.*; +import java.io.DataInputStream; +import java.io.DataOutputStream; +import java.io.IOException; import java.util.Collection; +import java.util.Iterator; -import org.aspectj.weaver.*; +import org.aspectj.weaver.ISourceContext; +import org.aspectj.weaver.Member; +import org.aspectj.weaver.NameMangler; +import org.aspectj.weaver.ResolvedMember; +import org.aspectj.weaver.ResolvedTypeX; +import org.aspectj.weaver.TypeX; +import org.aspectj.weaver.World; public class SignaturePattern extends PatternNode { diff --git a/weaver/src/org/aspectj/weaver/patterns/SimpleScope.java b/weaver/src/org/aspectj/weaver/patterns/SimpleScope.java index fe90901e5..54282a775 100644 --- a/weaver/src/org/aspectj/weaver/patterns/SimpleScope.java +++ b/weaver/src/org/aspectj/weaver/patterns/SimpleScope.java @@ -13,9 +13,15 @@ package org.aspectj.weaver.patterns; -import org.aspectj.weaver.*; -import org.aspectj.bridge.*; +import org.aspectj.bridge.IMessage; import org.aspectj.bridge.IMessageHandler; +import org.aspectj.bridge.ISourceLocation; +import org.aspectj.bridge.Message; +import org.aspectj.bridge.SourceLocation; +import org.aspectj.weaver.IHasPosition; +import org.aspectj.weaver.ResolvedTypeX; +import org.aspectj.weaver.TypeX; +import org.aspectj.weaver.World; public class SimpleScope implements IScope { diff --git a/weaver/src/org/aspectj/weaver/patterns/ThisOrTargetPointcut.java b/weaver/src/org/aspectj/weaver/patterns/ThisOrTargetPointcut.java index d6c130b48..4b4e80766 100644 --- a/weaver/src/org/aspectj/weaver/patterns/ThisOrTargetPointcut.java +++ b/weaver/src/org/aspectj/weaver/patterns/ThisOrTargetPointcut.java @@ -13,11 +13,19 @@ package org.aspectj.weaver.patterns; -import java.io.*; +import java.io.DataInputStream; +import java.io.DataOutputStream; +import java.io.IOException; import org.aspectj.util.FuzzyBoolean; -import org.aspectj.weaver.*; -import org.aspectj.weaver.ast.*; +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; +import org.aspectj.weaver.ast.Var; // diff --git a/weaver/src/org/aspectj/weaver/patterns/ThrowsPattern.java b/weaver/src/org/aspectj/weaver/patterns/ThrowsPattern.java index e840f9b94..2b6be4863 100644 --- a/weaver/src/org/aspectj/weaver/patterns/ThrowsPattern.java +++ b/weaver/src/org/aspectj/weaver/patterns/ThrowsPattern.java @@ -13,11 +13,14 @@ package org.aspectj.weaver.patterns; -import java.io.*; -import java.util.*; +import java.io.DataInputStream; +import java.io.DataOutputStream; +import java.io.IOException; -import org.aspectj.weaver.*; +import org.aspectj.weaver.ISourceContext; +import org.aspectj.weaver.ResolvedTypeX; import org.aspectj.weaver.TypeX; +import org.aspectj.weaver.World; public class ThrowsPattern extends PatternNode { diff --git a/weaver/src/org/aspectj/weaver/patterns/TypePattern.java b/weaver/src/org/aspectj/weaver/patterns/TypePattern.java index cf33acf0b..1cada03d5 100644 --- a/weaver/src/org/aspectj/weaver/patterns/TypePattern.java +++ b/weaver/src/org/aspectj/weaver/patterns/TypePattern.java @@ -13,13 +13,18 @@ package org.aspectj.weaver.patterns; -import java.io.*; -import java.util.*; +import java.io.DataInputStream; +import java.io.DataOutputStream; +import java.io.IOException; +import java.util.Iterator; -import org.aspectj.weaver.*; -import org.aspectj.bridge.*; -import org.aspectj.bridge.IMessageHandler; -import org.aspectj.util.*; +import org.aspectj.bridge.MessageUtil; +import org.aspectj.util.FuzzyBoolean; +import org.aspectj.weaver.BCException; +import org.aspectj.weaver.ISourceContext; +import org.aspectj.weaver.IntMap; +import org.aspectj.weaver.ResolvedTypeX; +import org.aspectj.weaver.TypeX; /** * On creation, type pattern only contains WildTypePattern nodes, not BindingType or ExactType. * diff --git a/weaver/src/org/aspectj/weaver/patterns/TypePatternList.java b/weaver/src/org/aspectj/weaver/patterns/TypePatternList.java index 8d150bd1d..dc4979e30 100644 --- a/weaver/src/org/aspectj/weaver/patterns/TypePatternList.java +++ b/weaver/src/org/aspectj/weaver/patterns/TypePatternList.java @@ -13,12 +13,18 @@ package org.aspectj.weaver.patterns; -import java.io.*; -import java.lang.reflect.Modifier; -import java.util.*; +import java.io.DataInputStream; +import java.io.DataOutputStream; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; -import org.aspectj.weaver.*; -import org.aspectj.util.*; +import org.aspectj.util.FuzzyBoolean; +import org.aspectj.weaver.ISourceContext; +import org.aspectj.weaver.IntMap; +import org.aspectj.weaver.ResolvedTypeX; +import org.aspectj.weaver.TypeX; public class TypePatternList extends PatternNode { private TypePattern[] typePatterns; diff --git a/weaver/src/org/aspectj/weaver/patterns/TypePatternQuestions.java b/weaver/src/org/aspectj/weaver/patterns/TypePatternQuestions.java index 6c0805904..acd022210 100644 --- a/weaver/src/org/aspectj/weaver/patterns/TypePatternQuestions.java +++ b/weaver/src/org/aspectj/weaver/patterns/TypePatternQuestions.java @@ -13,14 +13,12 @@ package org.aspectj.weaver.patterns; -import java.util.*; import java.util.HashMap; +import java.util.Iterator; import java.util.Map; -import org.aspectj.weaver.*; -import org.aspectj.weaver.ResolvedTypeX; -import org.aspectj.weaver.TypeX; import org.aspectj.util.FuzzyBoolean; +import org.aspectj.weaver.ResolvedTypeX; public class TypePatternQuestions { diff --git a/weaver/src/org/aspectj/weaver/patterns/WildTypePattern.java b/weaver/src/org/aspectj/weaver/patterns/WildTypePattern.java index 89b768c92..45f132875 100644 --- a/weaver/src/org/aspectj/weaver/patterns/WildTypePattern.java +++ b/weaver/src/org/aspectj/weaver/patterns/WildTypePattern.java @@ -13,15 +13,20 @@ package org.aspectj.weaver.patterns; -import java.io.*; -import java.util.*; +import java.io.DataInputStream; +import java.io.DataOutputStream; +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; -import org.aspectj.weaver.*; -import org.aspectj.bridge.*; import org.aspectj.bridge.IMessage; -import org.aspectj.util.*; - -import com.sun.corba.se.internal.util.Utility; +import org.aspectj.bridge.Message; +import org.aspectj.bridge.MessageUtil; +import org.aspectj.util.FileUtil; +import org.aspectj.util.FuzzyBoolean; +import org.aspectj.weaver.ISourceContext; +import org.aspectj.weaver.ResolvedTypeX; +import org.aspectj.weaver.TypeX; //XXX need to use dim in matching public class WildTypePattern extends TypePattern { diff --git a/weaver/src/org/aspectj/weaver/patterns/WithinPointcut.java b/weaver/src/org/aspectj/weaver/patterns/WithinPointcut.java index a0d791d89..3a6db4bec 100644 --- a/weaver/src/org/aspectj/weaver/patterns/WithinPointcut.java +++ b/weaver/src/org/aspectj/weaver/patterns/WithinPointcut.java @@ -13,11 +13,18 @@ package org.aspectj.weaver.patterns; -import java.io.*; +import java.io.DataInputStream; +import java.io.DataOutputStream; +import java.io.IOException; -import org.aspectj.weaver.*; -import org.aspectj.weaver.ast.*; -import org.aspectj.util.*; +import org.aspectj.util.FuzzyBoolean; +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; public class WithinPointcut extends Pointcut { TypePattern type; diff --git a/weaver/src/org/aspectj/weaver/patterns/WithincodePointcut.java b/weaver/src/org/aspectj/weaver/patterns/WithincodePointcut.java index cc6705b79..2b01f961a 100644 --- a/weaver/src/org/aspectj/weaver/patterns/WithincodePointcut.java +++ b/weaver/src/org/aspectj/weaver/patterns/WithincodePointcut.java @@ -13,11 +13,17 @@ package org.aspectj.weaver.patterns; -import java.io.*; +import java.io.DataInputStream; +import java.io.DataOutputStream; +import java.io.IOException; -import org.aspectj.weaver.*; -import org.aspectj.weaver.ast.*; -import org.aspectj.util.*; +import org.aspectj.util.FuzzyBoolean; +import org.aspectj.weaver.ISourceContext; +import org.aspectj.weaver.IntMap; +import org.aspectj.weaver.ResolvedTypeX; +import org.aspectj.weaver.Shadow; +import org.aspectj.weaver.ast.Literal; +import org.aspectj.weaver.ast.Test; public class WithincodePointcut extends Pointcut { SignaturePattern signature; |