Ran "Organize imports" to remove redundant imports etc -

clears up a huge set of warnings in Eclipse so that you
can see the wood for the trees!

diff --git a/bridge/src/org/aspectj/bridge/CountingMessageHandler.java b/bridge/src/org/aspectj/bridge/CountingMessageHandler.java
index 103461ca7a9ac90d5a3aba841047fdf187576037..cbf5bd0cec5c99eef674a39622201950784472c7 100644 (file)
--- 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 0dda25d65aebc46e519eb2eaa5754c8138672062..ddb93b4760ded9595902e17c3fbb9b7e080ba158 100644 (file)
--- 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 9c8ebab3b6457ca63004f875d677b90023c0dc2f..0c28d20d28f685edb3b3fd8e1e25ae72fdac96df 100644 (file)
--- 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 db563fd494be59df8e28cb66b3dc97a81121bc74..e0049f863d1dff92bff42edfda2b4861f72936dd 100644 (file)
--- 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 2ab9b9ac1bfcb2edd90b666c6513b17e8382c0f8..eb06558cd206885e312f1f5199c3c6be6c54aed0 100644 (file)
--- 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 423501e133eb2fb551c8faacde3b28d5df094c81..fdb8307acb5a202d6b8d333651f4a856b6f3b675 100644 (file)
--- 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 f6f5e733eae1767e1cdd79511ad401e4527550dd..ec2b122803291762d3ad7714138b7062ae8f30f9 100644 (file)
--- 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 614e60f44a94b7556c749e2a14c2907e4a264ff6..bdeb456c69d632b1f1ae42cd59b2823b42f28d67 100644 (file)
--- 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 fe6e12b45157c7e392158c99f7252ec7e37db595..48f0d60834d2517bc62821fa00992054f6dee311 100644 (file)
--- 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 613e713417013fc2e971c6ac05387e68b063c3a6..0cfd097b77e34aac652f1d8b2d2fc3f78b07c2fa 100644 (file)
--- 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 9e29b81384dc2b992228a16297eae82ac7a8bddb..81aa5f63c33b1428daf288067028e21d7e5b1eeb 100644 (file)
--- 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 d79c9774fc67d46c428c1ff8bf304f44fd74faa9..01b818e97973e567586961ed3af9f54742df7939 100644 (file)
--- 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 8b51841211fa5ecb2e9bd3db886b7d8c9ac8657f..4d3d8ad3184cd43bcf4e0405bf7dde238b42409d 100644 (file)
--- 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 bafe5da2b0a597caa6be2e0720d0bf9edc566f8f..624ed44c170714e4000bb02b9ccc29784b08fc66 100644 (file)
--- 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 0a019707c1a7847cc24bc664d389601260076999..70b18c08644d45da06e14c32b93223f5f4cb5504 100644 (file)
--- 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 374f71d79e610e0d8d42a3917c68542763ce54b1..04e1bb54ade9b4c24c5d0be9c2a8670a3a6ace5c 100644 (file)
--- 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 61042c54badd172742e848ef5802c6f6cdbb8837..ff1d9f4d18f2b40a573b0a3c6b0d41b11d8805bc 100644 (file)
--- 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 7eddfcfdf29006a495cf8e8a87d25ab99554a5e6..14aa22d0f25dd0608b1cb398fc86c0aa131727f5 100644 (file)
--- 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 c0a3e31e106bd825fdf0ade126e51653c768bd1c..9f733f6bb1c54db7e5a0f3678bcc8c4ea38ab02e 100644 (file)
--- 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 e448d7dd2751ce818215611c63ae53fec8d6baea..9fd107443622b0bda95e547e59dc145dd8e02eb5 100644 (file)
--- 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 18e0272ce5dd855d2b4d4512dcac9e8f6cee3277..daa6ef576b6c1dfaca3485faf3ef09df053c9add 100644 (file)
--- 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 537fbb527291a6b728b5468a0195ca8b8e46def1..ca891e962176a97361f1cdb4e74cea3eec958a80 100644 (file)
--- 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 fed43961ab0871163288965477abce9372921676..8e3503b844c1a1a85e4a232af5edc67064107e56 100644 (file)
--- 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 2ea980df50363102988ecf2661ea32fa55216edb..7b8295af5fa3190819ac716f10ec3d2209eac8b0 100644 (file)
--- 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 1ea039fc8cc85b5dbfb833889f2c617091884472..34ae325559192be840cde34f9614583b6ce59644 100644 (file)
--- 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 389672f9e5153216f83d6ac7eb0318a25d9033bb..1a048928d3b968a1b920c5442fcf3ff8f7025977 100644 (file)
--- 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 434a0562545477c12624ba6bc91abb3f3a138e5e..dacdbb4639848bfc1d13f9485dce07a88ff1e130 100644 (file)
--- 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 ca95ba129cf036786e7b356247ec27063fc01d74..71f4b41a48e1ce4de494d511a662d2fa8848f2bf 100644 (file)
--- 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 5abe2ce07fe53cfda05c4ac2fa614dbe0c3ec38e..cb059de9b3c0b3d4b79434b24301e14042f727a9 100644 (file)
--- 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 80ca2ddd67931fbab2c0f173aa89f3cea82b28ed..0a2398484dffa8a3832b3e6db67585f9ae370fea 100644 (file)
--- 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 4fbb3cdd559f82abf210f5a589f0703b145cbf8c..d4e5f8fbba77ef12cc5c2437b46d96f6f3503422 100644 (file)
--- 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 f76ee99cae9f597c755c512b4a45f82087d419df..e5cbcf21b4465d65e364892f8815399754803661 100644 (file)
--- 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 d1d736b548229446c9841b378b013cf390561d37..17fbf776c6b091d9ccb555999d979dcca8d3fa81 100644 (file)
--- 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 9b89aa2225583c6f44a6107c5951795f3effc5f4..317f92aec5792efaaec8c05a365e7a8ed25b4395 100644 (file)
--- 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 5e9463932db44b3053ac538cf25e95e80fc0cb97..bd661a6de785441c2217a63471313e129904e2e3 100644 (file)
--- 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 e776093aa6f308759abc75c0a27aaea696359c1d..c93c4e7032370d60b3834c2029011e061d10f789 100644 (file)
--- 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 0744b00f098b3620acc12e64b0c07c8288620f7c..65c362167d94fc07e4c1e6f53ede3d7a1a9f386c 100644 (file)
--- 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 056038ee221e58a9463c9f3122a069dcd7202326..9713d31a3a25e471259d4236ac37245766a6c0be 100644 (file)
--- 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 e731a85cf8650522be289e2560bc95f8b81aee1d..397cb68c5f5a15a5dc3c5e8d1c81191902eafe08 100644 (file)
--- 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 d917469774f3523337a849b3a839f2e8ad8f3e1e..22aa8a395e8b09bd4b9704c5d7f332ea698bd1c7 100644 (file)
--- 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 122385473c2298e65abd2088ab787c2e3e499734..07ac6b9d9969fb0e0386d54afdcdf05bb3e308c8 100644 (file)
--- 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 74d071b6ca25f95ad0a7d602251a1e6da300b361..09efa97df8f5d00a05896d9a38e122691aef096a 100644 (file)
--- 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 a940ffbe46e90b4fc06235469264a95825bc5dab..bb40f71e2942ae968f8d90534bc59a53e636ebb4 100644 (file)
--- 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 ae428f3f1356eef821db3ea4c61f9a43c26251bf..0f7d613d664f4fa013d8b2c03f59194ca463582f 100644 (file)
--- 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 a93d026b71f935fef18d1edc66ce9755f9dbf31d..1faee8d3b138d0495d531d9a694553181c76c516 100644 (file)
--- 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 fdc33ae291934256ead849526928540d649ca29c..e551749032e0ac13e3f613c31e867ca2af2a4644 100644 (file)
--- 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 a214f9de6bb19baabf431b1c967a4a8db0acf454..56cbecab3acde7e22e69cb41c23d629a114cad69 100644 (file)
--- 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 9477a72682ff7eb4a3c7af12f48e8caeff408b95..635cb18e7eaf37b8a4e286f18c686cee5af99c4f 100644 (file)
--- 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 6a5639dce1dbb47cd04ed77cbf2f8a082ed57a79..d90f99781b5854e4343bb4922657737b1fe5e5b6 100644 (file)
--- 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 789c92272374e05d2db6a54d9be22dc95b2e2932..8808443cf9cd38e5a445c1f58f3147c9001ce352 100644 (file)
--- 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 5e17f93c5c09f2337d27e83f19639fb4c9d3760b..e5aa34279bdbd0da2189d0bd8b5477d3cbff5f8d 100644 (file)
--- 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 5f2d85d5d98982d2f6c289283df166cab4b99bdd..a45ab703ceee2a6476fb6d32d3f1069163c6a725 100644 (file)
--- 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 1815a4e7a181a74cfb2dee6e11ef5177dcda2766..3894e8b0ff880434a66254a3c6ba6f8810d7faf8 100644 (file)
--- 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 32f2a9ef7cead58e1815eb2aff6fb71717004b08..12708fc8dbd2c890b901cea3f5a312618a8caaaa 100644 (file)
--- 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 389bfa8d008ba008917f826ca5c6e2f47e400bf7..61f37145a4b63a0fca89370ee48c2b55719dd59f 100644 (file)
--- 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 7c1e455e67dc93f7ede03f93ecdc231d3303f656..b665f45b03fe5ff89c9d082f212ee25f351b3729 100644 (file)
--- 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 e35c0996e5b15aef846b3faf81292ab45a9514e8..37be6e4948d4a4dc0cc3b4aee32ec8d6df421cf6 100644 (file)
--- 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 fac054a2d579fecf1f6fe8f2c72b85793074415a..f4de471fc541c9b586245ae83a39f65d8d328f5c 100644 (file)
--- 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 d9c94fe5a68e13f20b1552e4d1487bf4a638c88f..bfdb999f6951dc263f0f2df76ac213d4a60d3f54 100644 (file)
--- 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 c7e9ace14c632939d2fd8589d7944208ba4aa6e6..c21b2545c4050ea530e26870698c9602103e64f5 100644 (file)
--- 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 0028827f19230e93206b78bd7cfb27bc43adbb96..67d2aaa3616b5f672a6e1e66668d44f7b4bfb0cc 100644 (file)
--- 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 f834773ebde65379a13bd3e47861c814040ca665..04f674a0c692187fd234e47b778a8cf3a705bd9d 100644 (file)
--- 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 04cd29f395ff9fbe9ab35fc634ad03cf2abedefd..b1f05c1c289792cfa90b6a18ee2bf6ffe9d55123 100644 (file)
--- 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 c4efc18a12a258e4fafdf4a89f3f9433d1c0bd08..5deff00ebeaea336e7f11e022ffe6e0a6b601318 100644 (file)
--- 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 070b79b8736779456dead4ba7c4e1bde8aed9dab..c36003a77f6249cccfd2c4ea2feec3baee7063b6 100644 (file)
--- 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 47f3333b482447757f987020f274f3465bb632dd..be2ccd2a54ea5f972000876350a3fcef0d9fac89 100644 (file)
--- 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 8ef8f17d979c0eb09d6366eb24461f26a27bfb83..6b73b5136fab3973c4d5b5f8a35f0f5aaa28eccc 100644 (file)
--- 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 fcde89c061bc32dbb1db45d10b4b7024e54ad129..7176a10350ec523f73dca91b1afcc6e52bce2e84 100644 (file)
--- 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 b64cdd6b41ae6cc1f3784f7c3656c3592c5fb69d..65769fe1099933e9f8b1b1725cf07e7cebb9f048 100644 (file)
--- 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 89832472a4e360a68c6192a5384f3b6fb142c693..836ae7ecb8160d42864ed1c7e5747ea7131fc364 100644 (file)
--- 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 92e5c25524f464f50e741b52237f9a5caa69af68..9c7e5646d4b564502b8fca4094ea968985d4d62b 100644 (file)
--- 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 08cf363f78a9f8962b28af2813270a2a02dbc9bf..5817bd4ae5222f4bd6419f82be434b5be08d825a 100644 (file)
--- 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 11c2e5533d6edf947cd5d85c91f8514f87e811e2..da612da9105133925c003fbd764ba92fd52578e8 100644 (file)
--- 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 36f6611d91c1bb6d061631d0cbbc4a60567430c4..d3181edf3143bfb48a2d2af70482c972a2583bd3 100644 (file)
--- 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 98e0b7e4115c93a6e255ea2b1d7fbb4e251f1f01..aba11ea679dd6dcc6c0803b0a1a6a7a70d4da45b 100644 (file)
--- 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 35c42f4e8a8ba736ce28a9c3f2ccd77de8b02f5c..39b6fbf2a30c0e8100a859f63c7f87355e786a59 100644 (file)
--- 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 3c7f9523a9871b0023ad852f7b13ae1bf93e56fa..24e13f2eaea541866ccd9cb8f793761304daf84b 100644 (file)
--- 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 6caf35594096b52838959efb65e79340e89d9a88..f54ebc1a1955a2fd2d34c0af15fe389e7ff2f7c4 100644 (file)
--- 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 7f87a8fa17e611c6d40f49e8192eaf7ada3bb82a..57cd45e9887d59ce5cea6819ac0348a22541eecd 100644 (file)
--- 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 41f7cb9f74c05f7bc82516241051df2e0cb67d24..4c19219aae9b4fd292adf2540b7e8b764c5e71d0 100644 (file)
--- 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 216bdf091bb0d32404b5ee1c166d7f9dc3403232..66dbf35c461bea04c5f3cb8626465a7ef3b05cb9 100644 (file)
--- 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 499c158afe0adc55ce15c9ec56536f0afaa095e3..2956774a581557b87a22506da5b6b158ba036987 100644 (file)
--- 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 f4d25fe19e103069eb9fc5f11db10546daeb1ecb..d6aa188762a680dc0c0df2e3124c0ac399df1115 100644 (file)
--- 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 adb04c750a1aad04a867ffa8ee0400f58c772987..5864a4669ba340ab6fdcc4f7446ef01a45704fdf 100644 (file)
--- 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 560037a18ebc13ffbc7df2b790a46636d650dfba..c621072b2d0006363d5897017dae66385b1dbed7 100644 (file)
--- 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 5f6fb98b8488bc4f06d26ecd52e437b3a2829ff6..17092a860ccb3d535b7f34ff4d280daf146998ce 100644 (file)
--- 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 96797cf5ec8652bc103b9f655154d156a64e4d23..a21578b921a09f2a4bd21c4df8b462524f8d8bee 100644 (file)
--- 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 6584a612a04ac7305b2eee5c939157b0bed4e54b..3dae542b7744b882284017872aaa102aec3ebfe7 100644 (file)
--- 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 645c3ee8881e1b374678cce1dfaaa230ef06dc00..0dbc3a2328ee165ec4643bb73f9039a93d57844b 100644 (file)
--- 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="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;
@@ -14,7 +14,7 @@
 "/>
         <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;
 &lt;runtimeClasspathEntry internalArchive=&quot;/lib/junit/junit.jar&quot; path=&quot;3&quot;
-    sourceAttachmentPath=&quot;/lib/junit/junit-src.jar&quot; type=&quot;2&quot;/&gt;
+    sourceAttachmentPath=&quot;/lib/junit/junit-src.jar&quot; sourceRootPath=&quot;&quot; type=&quot;2&quot;/&gt;
 "/>
         <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;
 &lt;runtimeClasspathEntry path=&quot;3&quot; projectName=&quot;util&quot; type=&quot;1&quot;/&gt;
@@ -32,7 +32,8 @@
 &lt;runtimeClasspathEntry internalArchive=&quot;/lib/bcel/bcel.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;
 "/>
     </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 f9c2076e7328474dec27fc4993f9929813f5b51e..709bbc5c27b087605ea655eb523e36a6229188e1 100644 (file)
--- 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 e066e1ac506f977734d5e1e7406c63f5ccd9fe89..da93ac6655dea22c3efe7605379accfdbfdd68ab 100644 (file)
--- 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 2501db2ab877afa70fc3ee5559bc57a89aba3775..3b6356bca26ee51ce5f6e2768a04376efad73f2b 100644 (file)
--- 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 943110df3c4fbad80398f9a72961991ffd732bc3..565bcdee8684d99673b0c22200b10ef116457eb2 100644 (file)
--- 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 6592f3381b81d861d432007ec3f1eb351287ec75..8f9afefe6b140cd702ceb739c17166fc2055260d 100644 (file)
--- 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 4e577b1a4673ffd6118d4c9c597767d40acb6cd6..873302d12b5944df34e521e6e16c47ef11bdad1f 100644 (file)
--- 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 dbf5dd2595f741e978a169ffa80d0c818d3eb973..96e15bdc9aecec902723a9d3b127cd2d8c0c3edd 100644 (file)
--- 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 7c4f524a5dc6ed46036808ef165db17e290e56c8..8f5871a65087895a8b6c4950ab5065a9efd1fcf3 100644 (file)
--- 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 4ee4cc183e331e9b4bc5f83f6ba7d0255e35aab4..6e8d626e712a0902e29404493db004303eef9008 100644 (file)
--- 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 030f5497f188dd0ae2ca010b0c6694d1898979db..aa891e32a587946d02587de49b3f5a1b34d447f8 100644 (file)
--- 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 ebc4c14c6c173a6e73b80e2f134f19c7fd14d520..3e1f536f508a655e0e80fb1a760381be86037805 100644 (file)
--- 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 198e6c775271df968cabb6d4853c4025bf09979d..2bfb8e63b46ffff0137eb127b18e26e5776b64d8 100644 (file)
--- 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 55c3962e8b146c209f00535c41a22d0ba54c5838..a7a43db08eb10d53ba1b9b833fd5d5ce8ccfe8d0 100644 (file)
--- 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 37e3187edb38fbf587834c00e9a811803c82a99f..eb444ba47ae9e67e5db107a7effc4291b2ace38e 100644 (file)
--- 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 523862991c3cc423d0c6aa5a1665743bfa360c62..bbfbf6c9f0c163e04be6982c0e7432d090371de0 100644 (file)
--- 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 0a53080e126cbcc5afd64827bf4394a8afc44bce..be971f6b973177e65102b1892ff2e3392a34ea12 100644 (file)
--- 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 6cb9e75fa145ee41e1b13b7a5780b848a893dc59..2ea278e72040afa857cfe23bf74242985d10ee1d 100644 (file)
--- 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 8e4b60fca6e5e6cc6ba18c4444dc5729415a04b6..963a7f551018446710ba2c8fadfa3a3665e71af9 100644 (file)
--- 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 1adf409248a176f56c0a287cc9bea7ee6e03b8c8..7f77afc642135392a3fbd24d8f635bcb45038554 100644 (file)
--- 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 2cbd870381f7e4c3297942da63b5d8fbeb12ea8f..6059dcca88d52425eaf4613bcb41dc5a025ecb46 100644 (file)
--- 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 febfac442a0c793d8c7881cf7061e19e9a4a4219..cedc72c84a2d87ed65c2049c3ce9d182d04b0dbe 100644 (file)
--- 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 f2b57e13d543cf65c9dbc7784c8968be3494a8a7..2d2a9deef7d36ea06cb6b70482411baf9c027369 100644 (file)
--- 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 2a847f0398f50f80eec1d476c950f3de281a969d..f07ed9664414d83494344ae32fa3a40f9513ea8f 100644 (file)
--- 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 42d0a0e668ea4f0bebbbdd8a9ca1211aad87fbc3..bf2ae782d66240eb55cf47dc09cbb69d58f8e302 100644 (file)
--- 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 62c32db3bd36e5801aeadd4c803025503522231d..bd909ed3f3c1ff1f5c0e7083ed60dd5a64f90277 100644 (file)
--- 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 30266023f849868fdc6108e95a93c2db7ccd6762..8d8d1722c548772d594dd7367a42c3f2f2110623 100644 (file)
--- 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 c301c0dcaade27aeadb5e9d3400b9dd53fcbff48..b380381a0cb9d987364fa253fc1026986c6b841e 100644 (file)
--- 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 7d15339c218f625ad3be736cd4dd6e69e42812ba..fd7bbf19fe91c367ed05df349f8fcffaaf45622d 100644 (file)
--- 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 a07fd861760c6c13b53d3e840ce91b1185f805f2..37396e20010e782d69d34c8916bebfdb46507b3b 100644 (file)
--- 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 0e5b8651f36a33f025b22f7a6bf551ac554606f4..0ed0010c2377bdc95832996c00e253640dfb5b72 100644 (file)
--- 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 f3d23101477e5239cf85a893d2ecd5978853a5e4..6424da62e2455dcc1deb397f80bd6b1442e08d6e 100644 (file)
--- 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 9be6a3b3bacfe0882c03bdda3d1a7e984f9dc327..a876db105a986dac751564c27791dea451eafa12 100644 (file)
--- 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 a8c5ccd9c9f2a0681ad037316d4e6b740ed6f4d9..5b35d559a5c752ea4f8c09534cf1b2fa8d736a2b 100644 (file)
--- 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 08724edf69cf8c547ee52a4fbafda8191eee46b8..ee7720a681300813f67f0f32a077e27d75359e1e 100644 (file)
--- 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 82900a2751bf926d8e67a1edb687a819f577fabb..f9c5cd3ab7304b72286d0f0ea2b2bb6cd17caa79 100644 (file)
--- 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 ae0a7cdac772f50137d75034ef3727fbe7a8435a..1b5fe348f839d8ec9c1a6f11dcf28246f35a28ff 100644 (file)
--- 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 1ff4d6cf6275a96f30d29cc3e9de32308586b3e4..ca90c45a90cf390d44c1987a89af4c095cc68ce4 100644 (file)
--- 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 26d8523dd938a48f577e71a7b4b0ec2b1440700d..215cfee5d6967e69aae2c3aeb1c4d316c1526683 100644 (file)
--- 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 4ce7792c61183acac1d88fa171d59481db71d92a..e321d983579ad8848ae955966d29cb20b9f2f0e3 100644 (file)
--- 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 3ec14d7df737117e3f5df67a4390d50748d90d90..a684eb7ad4b0b19af718655fb3fe6df9fce1dcfd 100644 (file)
--- 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 157cf2dba855edbbb58b7ab0d151ee6301358c41..38ff3f9f6fa49b212e4ebc51e6bb25c21245372c 100644 (file)
--- 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 fbefdba5dad87c8793c4d57838f039226fd502f3..0ea576af40dd225da9ecac0dba917dbcf6f7d7a5 100644 (file)
--- 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 b90f2833cfa213777a2931bf3bb221a8d38c4b99..4b90c9d35c631ba6dcd601b5387a7d20497b2f67 100644 (file)
--- 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 d9936427b8c7d1cbee6559315697dee725e4be0b..55fbb1e971441bed5e8b45cbfb028bf61b633227 100644 (file)
--- 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 b72665dfa1d14d1f6a9364734adc902a8d18af3a..f981d21b261c5b8ccc54ab2a4a12cde7f4467203 100644 (file)
--- 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 0c3c7201d656d732fcfb844817195934b11927f3..caeeeaf419509222c2d1d90dc61fe4b5e8d218b3 100644 (file)
--- 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 5c653b13caa11d209b4c0c5ec40c2b3806e8e05c..ab4541de371bd3d1b19063b27e067d9e2b3233cb 100644 (file)
--- 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 1ffb5dfdfee6f7e3149bd912f8d84177b41918c5..b5311a9ec5a1e4f66fcc64ba9d56455941539623 100644 (file)
--- 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 0f2dafde3cdce03beb3efc72bfc8f59cf3c171b2..5b2e8413153f4532b6730327f84770941fff1e5d 100644 (file)
--- 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 c36f50499ae8ac0a35df55ab5869f1a6b2d5f7d6..4025a62114027da8953aa01766e0d9e7973185d8 100644 (file)
--- 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 44a06ee185e759c6c60e78339ff319f344edf4f9..139243d968e398c1bd4371ffd5a43dfe1c5a5708 100644 (file)
--- 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 80163d951823838629cbcaf9ce3fe4d8620708da..8872ca7e6ee3b52491a2fcff3f0f95be30c81e00 100644 (file)
--- 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 b77aacc93d342ebcab1d0267fb323fe01eb20707..1b6c9aadf96be82243ca46d976d6da675bfc3c4c 100644 (file)
--- 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 e510cc3e76e4ab065bc86ec5b49ebe0d808364d3..d554fc43d71fe285fd02cf318613809b0a28e4a3 100644 (file)
--- 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 29ab9f51a83beb7c604fe2f93f4470c7a2967de8..ae62a630e8cc99ffb8b1c78992ad2d657f5ec79a 100644 (file)
--- 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 c627338841a15154203f054a73a3d25d00ae8e86..8733a3b8d00c56d3e82b7c215502dfe82f3cfb53 100644 (file)
--- 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 380057980bea63640d0fabc329c01187836207fa..92fcb2c8e4700f4f4b17d0696132979379d21ac4 100644 (file)
--- 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 ae3098b6c2998da3443bea74616e0a2d3e8f1a76..1064d7e83032f4a748dbaca8feccbfa6830c76f4 100644 (file)
--- 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 7efb31754c5f8610b7cbd7c7a5240c76154db4e6..909c4d66997d1e59174deeec4c159cbfae2e0796 100644 (file)
--- 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 7b2c1bc4efe29a16baae18c3430144c8b115362a..b457db0b488cea29b5586f0d5e3eb23da6dd06cf 100644 (file)
--- 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 0e282a7b22966852112a965607d55030f272f5e9..de565597d9552a6b203d6c636f5defa0f0833425 100644 (file)
--- 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 31227f64320c07930fb93bbf6af9512eeea185da..b2365c388d92456302cbbcc5bb6fcfcd6891c1e3 100644 (file)
--- 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 e13b81bf3908d44f1031e133f6cbfa7fd99942e5..cfce3b03cf401e7afc5e6b82d221dfd10745927b 100644 (file)
--- 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 fe58a5672359700898d98a3aa87ae435b7e6e698..dd36e0edaafbbdc98415ba29e47fe43cfcef2aca 100644 (file)
--- 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 c81954afbb824ce820e4729142f3c1a1cdd4b7b9..f6788f6daf5b61b567f9eaedeb24d40b02980f0a 100644 (file)
--- 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 c87d3a5af15bcad8cd29d08dfe4a82f7da0d9668..79687ba6cebaaf77ad1cb3e4ba7fa582e2bf4d9b 100644 (file)
--- 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 8e6df145aa259861813518c2123b1b53de14d701..6b1443be06ef880529da18d36bf3ce927fbe3532 100644 (file)
--- 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 c5d2268905d8382852c26f00d80ea93a648cd037..1960c8d12f99a82192f71f889199069eb3f1119f 100644 (file)
--- 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 a97664fd6a5c9a44048f1e564aa1a53efc76df6e..6a908025588c1d41aa4d6e8fcb3631e7895f7269 100644 (file)
--- a/weaver/src/org/aspectj/weaver/World.java
+++ b/weaver/src/org/aspectj/weaver/World.java
@@ -13,13 +13,20 @@
 
 package org.aspectj.weaver;
 
-import java.util.*;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
 
-import org.aspectj.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 6760ad8e4bd3c94dc3ad64018117c4e5b9700003..9bedb27c9e3fae211def9e98ac32b577f46a5ea1 100644 (file)
--- 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 4001a0b33d25f42a94f20c0c29090a5a960e6b6e..f660109918db2eccaedf320cb7037119ed926636 100644 (file)
--- 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 88d17637eeb6685e50a56e5734a8e42680c098e0..7a31f8dee77c6b790d40aec83ac35b97a77bd274 100644 (file)
--- 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 37aaf64d447d40c7004323d215b5c043af5ee60e..b714ccb82a3ec712188b7266e102566f160141a8 100644 (file)
--- 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 dc637b9cca9fba7728fad3984eceeaeb7f3c535e..444f29e1a7bbe62e2093d950f9186d8e84a163f5 100644 (file)
--- 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 07b33ce1385aa8c1a4f66319babf831c3d6d02aa..de07387736ada1e1c1da4c0d6f4afea9cb46d6e2 100644 (file)
--- 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 803690af285e12d18a45341b6461a451d0fd17a2..c73b65045e56f1c0d047a86bae235fe5357bf25e 100644 (file)
--- 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 7ee1505487761387165e91e009300aa8f7704538..d920191cefc97556116487633c0e2eef9fbdbc40 100644 (file)
--- 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 405e28cb36e6db2d0027a5681f65ce9d7f390684..79acffa180e6ec1d86fee4151ea949dbe55add3b 100644 (file)
--- 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 7babec1847b78773395fc88a620ada67005ffa89..1622758dedeb88eb4265a6a995e118df691c0549 100644 (file)
--- 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 e7d876817ab4ff40399e95e19afd948fba761253..7491482ecb7b055a6b9c9268787fe52ffd1484cb 100644 (file)
--- 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 d32fee9e0f41d3eb86fd7d2109ab4afabc3d2276..cf779ba8d2d419b136b35cc6d348e6f62efaf505 100644 (file)
--- 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 d79bc40b4e539d685b48f11d0eb88f1a8a6c7658..696a5df4dc654009ce1232f0b5c59834b54feb9b 100644 (file)
--- 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 109e914981452d7f64eb97a4dbf51380c35e621b..ae1041c5649abd0c1baaa49a86eb51969afc3043 100644 (file)
--- 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 46fcea55fd2aae1ff7691e0c29d118f835b2526f..ea391c7e3c9d351b233ecbb45936a77d41b7a151 100644 (file)
--- 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 26d2d7f1d926bf133481fc7c90fdba9cc2807865..0483a826ebbecc3f356e5ed2f20b3423dc4b033d 100644 (file)
--- 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 ed3095e60f7968fe47cf6a8ce0cfe6c8f5bc0f9d..287979b57dee11e2c59fca098fdc93a7fbc3195a 100644 (file)
--- 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 934ec96a254be230b73e602e80b4c4999560ec80..860f91002439509e45532f0bc25128222c65ecb6 100644 (file)
--- 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 a60230075721e1ee6c748b259f6ed69187299659..249bc1de59f4fb06a0fd40e848a977a6cdbb0ed8 100644 (file)
--- 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 8e02045be0a0737a461902f69137df79d71759cb..290fc33d7acf854248a0367965cedaeae8a03809 100644 (file)
--- 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 539bb7dee5255c46254299489784708907083b9c..27249e2cffc238cb95553ff685ef9f86a3fc3e4e 100644 (file)
--- 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 ee2b55e6aaae7f40a3b1c4149bb6e48033645a90..3f4c908e92ef8409335f2d7e0093791b13badc04 100644 (file)
--- 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 d3ba351c91eeeb5e4720ffd967872cc293b3b99d..1b92edaa5d01a18515f191f808106ccfb969ebf3 100644 (file)
--- 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 da0a2db8fe823aabcae0dfe3fae5101970dca68d..857e5f58e4788e2ff0240905f4efff02e89eacac 100644 (file)
--- 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 5703b5197902bfca44ec7210930e39aa8fa6f4fd..f6d8ee854fa18ef75da1c631bfc5c83aa0b56fd1 100644 (file)
--- 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 5c1d2031e2fb7284e12c9ae0b0d06c4d69d27494..dfc8821979753c5c812685bbea43a9e90973c97f 100644 (file)
--- 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 28a0e2ea2c231ef1d1d24994241ccd2072ac1b95..3bbc1cd8af525a282dbf7ff9d4997bc71ad4ec59 100644 (file)
--- 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 fb0a3eaef786309521e2a73b617b5209ac3724ca..ee1e9fa4a117ce460318f1e15c4627d64bf6ae92 100644 (file)
--- 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 6d1656e4b0bf338e0a03e03bfa7d432de0829282..88c23811cb16a1ec9b05d16678a41441ab058423 100644 (file)
--- 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 fde58e127b2730feddcc9f2a68b5e6c2efff940b..1fc1895981153a490d323f5e9adeec040528f118 100644 (file)
--- 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 e85f1f1575b78d3eeeeccfec55f7a78283e00f91..249f3632519b997058824023ad5d4bc05ceb604c 100644 (file)
--- 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 1c6814ffe0366c2916d5c159ac22c41d0e662ce1..f0e270d9bcf1a211d0d28206b5eeec1f3c46011a 100644 (file)
--- 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 58617ef30880e09926d60e29a4f013b9e9def601..468e95ab219795700da7c92161a5c62819ef34ce 100644 (file)
--- 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 9e2985e9a0add5a50b9af35c98af80173fe6ecfe..3cfff4a6832ec3188797e7bd230294d35998f4f0 100644 (file)
--- 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 c889d64f8c456b125c7976a12dbf5a6799778deb..c267116b14554dc2175ceed74bb90f734261c3f2 100644 (file)
--- 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 54b6a623107631c2a7df33982837eca62335addf..87a7b524de936f238cf33e69a97e326ad35bc5ef 100644 (file)
--- 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 1a4f8dab49c9dadb668daa3580780037ac788f0e..7fd02c179970586f4db1b0f18f7d1563a1210b07 100644 (file)
--- 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 2aa3aef3c7db3beb1a62e2897bc53018a6a7973b..5cc3eb4dfae9a7781ff59499d1384911661b2c05 100644 (file)
--- 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 64da23fb1c26949e78aa3ad0a67befae914cbdf7..e20a9a12a04740ad7eb5bc08df83229d7afcbccb 100644 (file)
--- 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 14e04eae10c603fe89f1c1d905252ca3aa05e6fb..010a306a1d4c7de298b47c4b858d39f15b2a98ac 100644 (file)
--- 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 7cbce2212ec8b4647296b24099c264c4ecbe726a..051b44d817dfd907f65f05f033e92154e35e1e1d 100644 (file)
--- 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 0902c7f9bc7f9de534399d8dc7b606de3e562894..d71633e7f76ee64db3448731168c79ac2fbdac85 100644 (file)
--- 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 cf0ff8d1a43f2086e3975ea345179f510ea94005..dd6598388a2326505d3c5665ecb20754f0c08e5b 100644 (file)
--- 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 388e25d0b5a297cb8e309bbc7293da5c654e4fef..99727d2854a965df20dd58079980f8600c322a6f 100644 (file)
--- 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 42d60da193f438327f67d5e19a8965e4bb973d28..ef5929888c91376a159db05018c3e1107ee2948d 100644 (file)
--- 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 9815f1eaef78cbcfeac643aee76c053b1f710e57..8e130c6893e7c2e1b7e3ce5993c4507851eea0b0 100644 (file)
--- 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 04e78bd32df95852a6e28fd16f822e2c1cd624c8..589b1d0f0dee00462d82c5c3c3ab1705af6ea164 100644 (file)
--- 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 bf3e3a500688452749ba2ade5754f34624b8949e..243205b7e4ad6e5bcac6574bec23a84ff2fd9354 100644 (file)
--- 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 2fc54dd9cebaf5ef1241148ae801d7b8ed2f5bc4..a5803489d25b1e3ed5d62abd215446fca2aea881 100644 (file)
--- 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 c1defb103537c7d634f89da2a4d0acbb3532a3f5..e1331ccae154c5847893ad08198c18e5e9f7a969 100644 (file)
--- 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 d8ee0914903312fca891f00c66909b62a6252f2e..4c4beb1ab748984974b22b5114804c167db294da 100644 (file)
--- 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 6003e8f7478b705d2776f9079ed0b3c48b869f83..1204c97a4245509ec7c882cd4e83ffe1b7c746fb 100644 (file)
--- 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 90c7f46668bfbbbeb436c1800439810cd5a27129..f60eecc3b477cc310271d8202b93a10c613c8ab6 100644 (file)
--- 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 23f06293378b5b93c2c603ff40b4cb6aaff6a549..6fa9af44000dba76dd46768149096a3d9416b886 100644 (file)
--- 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 0d2c70cefdeb5b438c3338b4cf72d3d504daa17a..361060faf1cb12e074f80f6dd59fa9ac0b62744c 100644 (file)
--- 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 eab4a595c85980a2c0b47b4f7789bd808e85d89f..56ade77636a5610e9d2c18963d02364476711a38 100644 (file)
--- 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 17fef11c6989cd901a6bfe4b6386d1052ce56ee4..5a3ceacf9b77ce0bc7663176124ab6091dc661e6 100644 (file)
--- 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 2a32edea16132bee12b3909f5c14c85c4dc48f34..a66d0e1e1835d2e3ea8fbf1c25a767568d7fb2e4 100644 (file)
--- 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 618e6b4858143a57d5db11cc1874a7b3082650fa..2900d4a2b0ec858ab9a25314f03a819f6bbd6182 100644 (file)
--- 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 fdeac1deb4dadef58d9e4de7934d793787af8df3..86774283d3a63fe548ce5ca22bf24519ddb4314a 100644 (file)
--- 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 d75bb378a86cbac820f31d3dc2bae00c962e0390..c49b529231929acbd1f572c3a8a48e2339c94d40 100644 (file)
--- 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 9b1ce7455138ad05b8555054c00ed3697a95fc9f..20d2e0550d4ffdcacb1e251bdb1817b0bb447488 100644 (file)
--- 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 e1c56cf5c8b6e4b44af752c30ecf98f614d0affe..9af28b7eefa76937ac6fe62eba20a7002b4a57cd 100644 (file)
--- 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 961e88de0edef5f104f832a4a0ceb06b7bd2cd42..7764b15cbeecdf3c0f5e4e744a319b826c50cbeb 100644 (file)
--- 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 6d248b11c2a85ddd4147ce1c2f4666612cd1e7e4..0977d7c7ce7520638118a8e87565e7d261c3f3b1 100644 (file)
--- 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 9e1d52463807785d4f228e841889b73e568c238c..d49536abe0da37a31df833c94e4e402917070386 100644 (file)
--- 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 a827d6f35766acde38fab57f871bbe0f29e3cd9d..553bc5a94d65e5bc5eae330f1aef07fae86808e5 100644 (file)
--- 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 9e1b5c5f5a09f556f0bbb0f7d214d460a425e543..4d1696ae637fcfddfa79acd2763d9da51c17039b 100644 (file)
--- 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 e94634cc94156082a54f68f0c0d0f0a43c7b705e..1a12423b25e728984f18c80a11eb2238fbaec74b 100644 (file)
--- 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 f6b0912893cf7cd465df6ac98cc872153d5438c0..58ada73f76c4ccb8fc40a2e0105b06778841b340 100644 (file)
--- 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 fe90901e5be8c112513a9218d2ffccb50c176ab6..54282a775d1964dd00c728f85fd09dfee8cacfb7 100644 (file)
--- 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 d6c130b488b7c77ed54e94755af02589dbad6ca1..4b4e8076657b04afa1c4eb91c75b013b54e5c6c7 100644 (file)
--- 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 e840f9b9403bd6fd5e8f49f97f861acc7430c856..2b6be4863217ba0ac9c0083cf929457a854b5310 100644 (file)
--- 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 cf33acf0b889e6d7e33918e8ed244148f60a79ea..1cada03d558f5b2c3198202bbeb8788231462c60 100644 (file)
--- 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 8d150bd1df205507b7b551b443da3794a4bbea15..dc4979e30bff7f2b3e16bb24498b65b0796c8559 100644 (file)
--- 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 6c0805904ab431d5a8eaf4ac49775c6a19ad1bdc..acd0222109e6f937f9d211998852fb7ac10834f9 100644 (file)
--- 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 89b768c925c8c36777115fb3d075e54722e06c0a..45f1328754af2e802bd6426c15e11a8196e90abf 100644 (file)
--- 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 a0d791d8935459445394659b824169478d921f56..3a6db4becebe98177a17c855f258caef59db320f 100644 (file)
--- 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 cc6705b79fc112728223383dba4451a341e420dd..2b01f961a0f38354cb064fa21a5c79254fbc0a52 100644 (file)
--- 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;