"organized imports" to eliminate compiler warnings

9 files changed, 18 insertions, 44 deletions

diff --git a/ajde/src/org/aspectj/ajde/internal/AspectJBuildManager.java b/ajde/src/org/aspectj/ajde/internal/AspectJBuildManager.java
index 2fa636ccb..d4702fc9a 100644
--- a/ajde/src/org/aspectj/ajde/internal/AspectJBuildManager.java
+++ b/ajde/src/org/aspectj/ajde/internal/AspectJBuildManager.java
@@ -14,27 +14,11 @@
 
 package org.aspectj.ajde.internal;
 
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.IOException;
-import java.io.StringReader;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.Set;
-import java.util.Vector;
-
-import org.aspectj.ajde.Ajde;
-import org.aspectj.ajde.BuildListener;
-import org.aspectj.ajde.BuildManager;
-import org.aspectj.ajde.BuildOptionsAdapter;
-import org.aspectj.ajde.BuildProgressMonitor;
-import org.aspectj.ajde.ProjectPropertiesAdapter;
-import org.aspectj.ajde.TaskListManager;
-import org.aspectj.asm.StructureNode;
-import org.aspectj.bridge.IMessage;
-import org.aspectj.bridge.ISourceLocation;
-import org.aspectj.bridge.Message;
-import org.aspectj.bridge.SourceLocation;
+
+import org.aspectj.ajde.*;
 import org.aspectj.util.ConfigParser;
 
 /**
diff --git a/ajde/src/org/aspectj/ajde/internal/BuildNotifierAdapter.java b/ajde/src/org/aspectj/ajde/internal/BuildNotifierAdapter.java
index 1b309c5d2..95c490baa 100644
--- a/ajde/src/org/aspectj/ajde/internal/BuildNotifierAdapter.java
+++ b/ajde/src/org/aspectj/ajde/internal/BuildNotifierAdapter.java
@@ -16,10 +16,6 @@ package org.aspectj.ajde.internal;
 import org.aspectj.ajde.Ajde;
 import org.aspectj.ajde.BuildProgressMonitor;
 import org.aspectj.bridge.IProgressListener;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.jdt.internal.compiler.env.ICompilationUnit;
-import org.eclipse.jdt.internal.core.builder.BuildNotifier;
 
 public class BuildNotifierAdapter implements IProgressListener {
 
diff --git a/ajde/src/org/aspectj/ajde/internal/LstBuildConfigManager.java b/ajde/src/org/aspectj/ajde/internal/LstBuildConfigManager.java
index 8dacef516..f6e23cf61 100644
--- a/ajde/src/org/aspectj/ajde/internal/LstBuildConfigManager.java
+++ b/ajde/src/org/aspectj/ajde/internal/LstBuildConfigManager.java
@@ -17,11 +17,7 @@ package org.aspectj.ajde.internal;
 import java.io.File;
 import java.io.FileFilter;
 import java.io.FilenameFilter;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Iterator;
-import java.util.List;
+import java.util.*;
 
 import org.aspectj.ajde.Ajde;
 import org.aspectj.ajde.BuildConfigListener;
@@ -31,7 +27,6 @@ import org.aspectj.ajde.ui.BuildConfigNode;
 import org.aspectj.asm.StructureNode;
 import org.aspectj.bridge.IMessage;
 import org.aspectj.bridge.Message;
-import org.aspectj.bridge.MessageUtil;
 import org.aspectj.bridge.SourceLocation;
 import org.aspectj.util.ConfigParser;
 
diff --git a/ajde/src/org/aspectj/ajde/ui/swing/BrowserViewTreeListener.java b/ajde/src/org/aspectj/ajde/ui/swing/BrowserViewTreeListener.java
index e42806bfc..2dbc95fa4 100644
--- a/ajde/src/org/aspectj/ajde/ui/swing/BrowserViewTreeListener.java
+++ b/ajde/src/org/aspectj/ajde/ui/swing/BrowserViewTreeListener.java
@@ -15,6 +15,7 @@
 package org.aspectj.ajde.ui.swing;
 
 import java.awt.event.ActionEvent;
+import java.awt.event.InputEvent;
 import java.awt.event.MouseEvent;
 import java.awt.event.MouseListener;
 import java.util.ArrayList;
@@ -102,7 +103,7 @@ class BrowserViewTreeListener implements TreeSelectionListener, MouseListener {
      * has been clicked.
      */
     private void maybeShowPopup(MouseEvent e) {
-        if (e.getModifiers() == e.BUTTON3_MASK && tree.getSelectionCount() > 0) {
+        if (e.getModifiers() == InputEvent.BUTTON3_MASK && tree.getSelectionCount() > 0) {
             TreePath[] selectionPaths = tree.getSelectionPaths();
             final List signatures = new ArrayList();
             for (int i = 0; i < selectionPaths.length; i++) {
diff --git a/ajde/src/org/aspectj/ajde/ui/swing/CompilerMessage.java b/ajde/src/org/aspectj/ajde/ui/swing/CompilerMessage.java
index 467abcdb5..9ca312d83 100644
--- a/ajde/src/org/aspectj/ajde/ui/swing/CompilerMessage.java
+++ b/ajde/src/org/aspectj/ajde/ui/swing/CompilerMessage.java
@@ -15,7 +15,6 @@
 package org.aspectj.ajde.ui.swing;
    
 import org.aspectj.bridge.IMessage;
-import org.aspectj.bridge.ISourceLocation;
 import org.aspectj.util.LangUtil;
 
 /**
diff --git a/ajde/src/org/aspectj/ajde/ui/swing/GoToLineThread.java b/ajde/src/org/aspectj/ajde/ui/swing/GoToLineThread.java
index b5976b80d..401b1650c 100644
--- a/ajde/src/org/aspectj/ajde/ui/swing/GoToLineThread.java
+++ b/ajde/src/org/aspectj/ajde/ui/swing/GoToLineThread.java
@@ -72,7 +72,7 @@ public class GoToLineThread extends Thread {
 
     private void shortPause() {
         try {
-            this.sleep(100);
+            Thread.sleep(100);
         } catch (InterruptedException e) {
             throw new RuntimeException(e.getMessage());
         }
diff --git a/ajde/testsrc/org/aspectj/ajde/BuildConfigurationTests.java b/ajde/testsrc/org/aspectj/ajde/BuildConfigurationTests.java
index e65edea36..d6c7f1013 100644
--- a/ajde/testsrc/org/aspectj/ajde/BuildConfigurationTests.java
+++ b/ajde/testsrc/org/aspectj/ajde/BuildConfigurationTests.java
@@ -10,23 +10,22 @@ Adrian Colyer - initial version
 **********************************************************************/
 package org.aspectj.ajde;
 
-import org.aspectj.ajde.internal.CompilerAdapter;
-import org.aspectj.ajde.ui.UserPreferencesAdapter;
-import org.aspectj.ajde.ui.internal.AjcBuildOptions;
-import org.aspectj.ajde.ui.internal.UserPreferencesStore;
-import org.aspectj.ajdt.internal.core.builder.AjBuildConfig;
-import org.aspectj.util.LangUtil;
-import org.eclipse.jdt.internal.compiler.impl.CompilerOptions;
-
 import java.io.File;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import junit.framework.AssertionFailedError;
 import junit.framework.TestSuite;
 
+import org.aspectj.ajde.internal.CompilerAdapter;
+import org.aspectj.ajde.ui.UserPreferencesAdapter;
+import org.aspectj.ajde.ui.internal.AjcBuildOptions;
+import org.aspectj.ajde.ui.internal.UserPreferencesStore;
+import org.aspectj.ajdt.internal.core.builder.AjBuildConfig;
+import org.aspectj.util.LangUtil;
+import org.eclipse.jdt.internal.compiler.impl.CompilerOptions;
+
 /**
  * Tests that a correctly populated AjBuildConfig object is created
  * in reponse to the setting in BuildOptionsAdapter and 
diff --git a/ajde/testsrc/org/aspectj/ajde/CompilerMessagesTest.java b/ajde/testsrc/org/aspectj/ajde/CompilerMessagesTest.java
index 92174397a..35e1f46cf 100644
--- a/ajde/testsrc/org/aspectj/ajde/CompilerMessagesTest.java
+++ b/ajde/testsrc/org/aspectj/ajde/CompilerMessagesTest.java
@@ -12,8 +12,6 @@
 
 package org.aspectj.ajde;
 
-import org.aspectj.bridge.MessageUtil;
-
 import java.io.IOException;
 import java.util.List;
 
diff --git a/ajde/testsrc/org/aspectj/ajde/StructureModelTest.java b/ajde/testsrc/org/aspectj/ajde/StructureModelTest.java
index fedc151be..11babe0c5 100644
--- a/ajde/testsrc/org/aspectj/ajde/StructureModelTest.java
+++ b/ajde/testsrc/org/aspectj/ajde/StructureModelTest.java
@@ -16,11 +16,13 @@ package org.aspectj.ajde;
 import java.io.File;
 import java.io.IOException;
 import java.util.Iterator;
-import java.util.List;
 
 import junit.framework.TestSuite;
 
-import org.aspectj.asm.*;
+import org.aspectj.asm.ModelWalker;
+import org.aspectj.asm.ProgramElementNode;
+import org.aspectj.asm.StructureModel;
+import org.aspectj.asm.StructureNode;
 
 /**
  * @author Mik Kersten