polish

ajde/src/main/java/org/aspectj/ajde/IconRegistry.java

@@ -16,11 +16,13 @@ package org.aspectj.ajde;
 
 import java.net.URL;
 
-import javax.swing.*;
+import javax.swing.Icon;
+import javax.swing.ImageIcon;
 
-import org.aspectj.ajde.ui.*;
-import org.aspectj.asm.*;
+import org.aspectj.ajde.ui.AbstractIcon;
+import org.aspectj.ajde.ui.AbstractIconRegistry;
 import org.aspectj.asm.IProgramElement;
+import org.aspectj.asm.IRelationship;
 
 /**
  * Default icons.  Override behavior for custom icons.

ajde/src/main/java/org/aspectj/ajde/internal/BuildConfigManager.java

@@ -46,18 +46,18 @@ public interface BuildConfigManager {
 	/**
 	 * Add a listner that will be notified of build configuration change events
 	 */
-    public void addListener(BuildConfigListener configurationListener);
+	public void addListener(BuildConfigListener configurationListener);
 
 	/**
 	 * Remove a configuration listener.
 	 */
-    public void removeListener(BuildConfigListener configurationListener);
+	public void removeListener(BuildConfigListener configurationListener);
 
-   	/**
-   	 * Build a model for the corresponding configuration file.
-   	 *
-   	 * @param	full path to the file
-   	 */
+	/**
+	 * Build a model for the corresponding configuration file.
+	 *
+	 * @param	full path to the file
+	 */
 	public BuildConfigModel buildModel(String configFilePath);
 
 	/**
@@ -69,7 +69,7 @@ public interface BuildConfigManager {
 	 * Write a list of source files into a configuration file.  File paths will be
 	 * written relative to the path of the configuration file.
 	 */
-	public void writePaths(String configFilePath, List paths);
+	public void writePaths(String configFilePath, List<String> paths);
 
 	/**
 	 * Add files to a configuration.

ajde/src/main/java/org/aspectj/ajde/internal/LstBuildConfigFileUpdater.java

@@ -1,14 +1,14 @@
 /* *******************************************************************
- * Copyright (c) 1999-2001 Xerox Corporation, 
+ * Copyright (c) 1999-2001 Xerox Corporation,
  *               2002 Palo Alto Research Center, Incorporated (PARC).
- * All rights reserved. 
- * This program and the accompanying materials are made available 
- * under the terms of the Eclipse Public License v1.0 
- * which accompanies this distribution and is available at 
- * http://www.eclipse.org/legal/epl-v10.html 
- *  
- * Contributors: 
- *     Xerox/PARC     initial implementation 
+ * All rights reserved.
+ * This program and the accompanying materials are made available
+ * under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Xerox/PARC     initial implementation
  *     Helen Hawkins  Converted to new interface (bug 148190)
  * ******************************************************************/
 
@@ -34,7 +34,7 @@ import org.aspectj.bridge.Message;
 
 /**
  * Used for reading and writing build configuration (".lst") files.
- * 
+ *
  * @author Mik Kersten
  */
 class LstBuildConfigFileUpdater {
@@ -43,7 +43,7 @@ class LstBuildConfigFileUpdater {
 	 * Adds an entry to a build configuration file.
 	 */
 	public void updateBuildConfigFile(String buildConfigFile, String update, boolean addToConfiguration) {
-		List fileContents = readConfigFile(buildConfigFile);
+		List<String> fileContents = readConfigFile(buildConfigFile);
 		if (addToConfiguration) {
 			fileContents.add(update);
 		} else {
@@ -117,21 +117,21 @@ class LstBuildConfigFileUpdater {
 		return null;
 	}
 
-	public void writeConfigFile(String filePath, List files, List importedNodes) {
+	public void writeConfigFile(String filePath, List<BuildConfigNode> files, List<BuildConfigNode> importedNodes) {
 		// Set contentsSet = new TreeSet(fileContents);
 		String fileContentsString = "";
 		// List filesToWrite = null;
-		Set includedFiles = new HashSet();
-		for (Iterator it = importedNodes.iterator(); it.hasNext();) {
-			BuildConfigNode node = (BuildConfigNode) it.next();
+		Set<String> includedFiles = new HashSet<>();
+		for (Iterator<BuildConfigNode> it = importedNodes.iterator(); it.hasNext();) {
+			BuildConfigNode node = it.next();
 			fileContentsString += '@' + node.getResourcePath() + "\n";
 			String parentPath = new File(filePath).getParent();
 			String importedFilePath = parentPath + File.separator + node.getResourcePath();
 			includedFiles.addAll(getIncludedFiles(importedFilePath, parentPath));
 		}
 
-		for (Iterator it = files.iterator(); it.hasNext();) {
-			BuildConfigNode node = (BuildConfigNode) it.next();
+		for (Iterator<BuildConfigNode> it = files.iterator(); it.hasNext();) {
+			BuildConfigNode node = it.next();
 			if (node.getName().endsWith(".lst") && !node.getResourcePath().startsWith("..")) {
 				fileContentsString += '@';
 				fileContentsString += node.getResourcePath() + "\n";
@@ -151,7 +151,7 @@ class LstBuildConfigFileUpdater {
 			List<File> files = configParser.getFiles();
 			List<String> relativeFiles = new ArrayList<String>();
 			for (Iterator<File> it = files.iterator(); it.hasNext();) {
-				relativeFiles.add(relativizePath(((File) it.next()).getPath(), rootPath));
+				relativeFiles.add(relativizePath(it.next().getPath(), rootPath));
 			}
 			return relativeFiles;
 		} catch (ConfigParser.ParseException pe) {
@@ -184,13 +184,13 @@ class LstBuildConfigFileUpdater {
 
 	/**
 	 * Sorts and does not write duplicates.
-	 * 
+	 *
 	 * @param fileContents full paths representing file entries
 	 */
-	public void writeConfigFile(String filePath, List fileContents) {
-		Set contentsSet = new TreeSet(fileContents);
+	public void writeConfigFile(String filePath, List<String> fileContents) {
+		Set<String> contentsSet = new TreeSet<>(fileContents);
 		StringBuffer fileContentsSB = new StringBuffer();
-		Iterator it = contentsSet.iterator();
+		Iterator<String> it = contentsSet.iterator();
 		while (it.hasNext()) {
 			fileContentsSB.append(it.next().toString());
 			fileContentsSB.append("\n");

ajde/src/main/java/org/aspectj/ajde/internal/LstBuildConfigManager.java

@@ -37,23 +37,27 @@ import org.aspectj.util.FileUtil;
  */
 public class LstBuildConfigManager implements BuildConfigManager {
 
+
 	private List<String> allBuildConfigFiles;
 	private List<BuildConfigListener> listeners = new ArrayList<BuildConfigListener>();
 	private LstBuildConfigFileUpdater fileUpdater = new LstBuildConfigFileUpdater();
 	protected String currConfigFilePath = null;
 
 	private static final FilenameFilter SOURCE_FILE_FILTER = new FilenameFilter() {
+		@Override
 		public boolean accept(File dir, String name) {
 			return FileUtil.hasSourceSuffix(name) || name.endsWith(".lst");
 		}
 	};
 
 	private static final FileFilter DIR_FILTER = new FileFilter() {
+		@Override
 		public boolean accept(File file) {
 			return file.isDirectory();
 		}
 	};
 
+	@Override
 	public BuildConfigModel buildModel(String configFilePath) {
 		File configFile = new File(configFilePath);
 		String rootPath = configFile.getParent();
@@ -89,12 +93,13 @@ public class LstBuildConfigManager implements BuildConfigManager {
 		return model;
 	}
 
-	private void addProblemEntries(BuildConfigNode root, List badEntries) {
-		for (Iterator it = badEntries.iterator(); it.hasNext();) {
-			root.addChild(new BuildConfigNode(it.next().toString(), BuildConfigNode.Kind.ERROR, null));
+	private void addProblemEntries(BuildConfigNode root, List<String> badEntries) {
+		for (String string : badEntries) {
+			root.addChild(new BuildConfigNode(string.toString(), BuildConfigNode.Kind.ERROR, null));
 		}
 	}
 
+	@Override
 	public void writeModel(BuildConfigModel model) {
 		// final List paths = new ArrayList();
 		// StructureWalker walker = new StructureWalker() {
@@ -113,14 +118,17 @@ public class LstBuildConfigManager implements BuildConfigManager {
 		fileUpdater.writeConfigFile(model.getSourceFile(), activeSourceFiles, activeImportedFiles);
 	}
 
-	public void writePaths(String configFilePath, List files) {
+	@Override
+	public void writePaths(String configFilePath, List<String> files) {
 		fileUpdater.writeConfigFile(configFilePath, files);
 	}
 
+	@Override
 	public void addFilesToConfig(String configFilePath, List paths) {
 
 	}
 
+	@Override
 	public void removeFilesFromConfig(String configFilePath, List files) {
 
 	}
@@ -148,16 +156,16 @@ public class LstBuildConfigManager implements BuildConfigManager {
 		File[] dirs = new File(node.getResourcePath()).listFiles(DIR_FILTER);
 		if (dirs == null)
 			return;
-		for (int i = 0; i < dirs.length; i++) {
-			BuildConfigNode dir = new BuildConfigNode(dirs[i].getName(), BuildConfigNode.Kind.DIRECTORY, dirs[i].getPath());
-			File[] files = dirs[i].listFiles(SOURCE_FILE_FILTER);
-			for (int j = 0; j < files.length; j++) {
-				if (files[j] != null) {// && !files[j].getName().endsWith(".lst")) {
-					String filePath = fileUpdater.relativizePath(files[j].getPath(), rootPath);
+		for (File dir2 : dirs) {
+			BuildConfigNode dir = new BuildConfigNode(dir2.getName(), BuildConfigNode.Kind.DIRECTORY, dir2.getPath());
+			File[] files = dir2.listFiles(SOURCE_FILE_FILTER);
+			for (File file2 : files) {
+				if (file2 != null) {// && !files[j].getName().endsWith(".lst")) {
+					String filePath = fileUpdater.relativizePath(file2.getPath(), rootPath);
 					BuildConfigNode.Kind kind = BuildConfigNode.Kind.FILE_JAVA;
-					if (!files[j].getName().endsWith(".lst")) {
+					if (!file2.getName().endsWith(".lst")) {
 						// kind = BuildConfigNode.Kind.FILE_LST;
-						BuildConfigNode file = new BuildConfigNode(files[j].getName(), kind, filePath);
+						BuildConfigNode file = new BuildConfigNode(file2.getName(), kind, filePath);
 						file.setActive(false);
 						dir.addChild(file);
 					}
@@ -167,15 +175,15 @@ public class LstBuildConfigManager implements BuildConfigManager {
 			// boolean foundMatch = false;
 			for (Iterator it = importedFiles.iterator(); it.hasNext();) {
 				File importedFile = (File) it.next();
-				if (importedFile.getParentFile().getAbsolutePath().equals(dirs[i].getAbsolutePath())) {
+				if (importedFile.getParentFile().getAbsolutePath().equals(dir2.getAbsolutePath())) {
 					// foundMatch = true;
 					BuildConfigNode importedFileNode = new BuildConfigNode(importedFile.getName(), BuildConfigNode.Kind.FILE_LST,
 							fileUpdater.relativizePath(importedFile.getPath(), rootPath));
 					importedFileNode.setActive(true);
 					// dir.getChildren().clear();
 					boolean found = false;
-					for (Iterator it2 = dir.getChildren().iterator(); it2.hasNext();) {
-						if (((BuildConfigNode) it2.next()).getName().equals(importedFile.getName())) {
+					for (BuildConfigNode buildConfigNode : dir.getChildren()) {
+						if (buildConfigNode.getName().equals(importedFile.getName())) {
 							found = true;
 						}
 					}
@@ -192,13 +200,13 @@ public class LstBuildConfigManager implements BuildConfigManager {
 			File[] files = new File(rootPath).listFiles(SOURCE_FILE_FILTER);
 			if (files == null)
 				return;
-			for (int i = 0; i < files.length; i++) {
-				if (files[i] != null && !files[i].getName().equals(configFileName)) {// && !files[i].getName().endsWith(".lst")) {
+			for (File file2 : files) {
+				if (file2 != null && !file2.getName().equals(configFileName)) {// && !files[i].getName().endsWith(".lst")) {
 					BuildConfigNode.Kind kind = BuildConfigNode.Kind.FILE_JAVA;
-					if (files[i].getName().endsWith(".lst")) {
+					if (file2.getName().endsWith(".lst")) {
 						kind = BuildConfigNode.Kind.FILE_LST;
 					}
-					BuildConfigNode file = new BuildConfigNode(files[i].getName(), kind, files[i].getName());
+					BuildConfigNode file = new BuildConfigNode(file2.getName(), kind, file2.getName());
 					file.setActive(false);
 					node.addChild(file);
 				}
@@ -232,25 +240,25 @@ public class LstBuildConfigManager implements BuildConfigManager {
 
 	private boolean pruneEmptyDirs(BuildConfigNode node) {
 		List<BuildConfigNode> nodesToRemove = new ArrayList<>();
-		for (Iterator<BuildConfigNode> it = node.getChildren().iterator(); it.hasNext();) {
-			BuildConfigNode currNode = it.next();
+		for (BuildConfigNode currNode : node.getChildren()) {
 			boolean hasValidChildren = pruneEmptyDirs(currNode);
 			if (!currNode.isValidResource() && !hasValidChildren) {
 				nodesToRemove.add(currNode);
 			}
 		}
 
-		for (Iterator<BuildConfigNode> it = nodesToRemove.iterator(); it.hasNext();) {
-			BuildConfigNode currNode = it.next();
+		for (BuildConfigNode currNode : nodesToRemove) {
 			node.removeChild(currNode);
 		}
 		return node.getChildren().size() > 0;
 	}
 
+	@Override
 	public String getActiveConfigFile() {
 		return currConfigFilePath;
 	}
 
+	@Override
 	public void setActiveConfigFile(String currConfigFilePath) {
 		if (currConfigFilePath == null)
 			return;
@@ -258,17 +266,19 @@ public class LstBuildConfigManager implements BuildConfigManager {
 		notifyConfigChanged();
 	}
 
+	@Override
 	public void addListener(BuildConfigListener configurationListener) {
 		listeners.add(configurationListener);
 	}
 
+	@Override
 	public void removeListener(BuildConfigListener configurationListener) {
 		listeners.remove(configurationListener);
 	}
 
 	private void notifyConfigChanged() {
-		for (Iterator it = listeners.iterator(); it.hasNext();) {
-			((BuildConfigListener) it.next()).currConfigChanged(currConfigFilePath);
+		for (Object element : listeners) {
+			((BuildConfigListener) element).currConfigChanged(currConfigFilePath);
 		}
 	}
 
@@ -282,19 +292,20 @@ public class LstBuildConfigManager implements BuildConfigManager {
 		if (node == null || node.getChildren() == null)
 			return;
 		Collections.sort(node.getChildren(), comparator);
-		for (Iterator<BuildConfigNode> it = node.getChildren().iterator(); it.hasNext();) {
-			BuildConfigNode nextNode = it.next();
+		for (BuildConfigNode nextNode : node.getChildren()) {
 			if (nextNode != null)
 				sortModel(nextNode, comparator);
 		}
 	}
 
 	private static final Comparator<BuildConfigNode> ALPHABETICAL_COMPARATOR = new Comparator<BuildConfigNode>() {
+		@Override
 		public int compare(BuildConfigNode n1, BuildConfigNode n2) {
 			return n1.getName().compareTo(n2.getName());
 		}
 	};
 
+	@Override
 	public List<String> getAllBuildConfigFiles() {
 		if (allBuildConfigFiles == null) {
 			allBuildConfigFiles = new ArrayList<String>();

ajde/src/main/java/org/aspectj/ajde/ui/AbstractIconRegistry.java

@@ -14,7 +14,8 @@
 
 package org.aspectj.ajde.ui;
 
-import org.aspectj.asm.*;
+import org.aspectj.asm.IProgramElement;
+import org.aspectj.asm.IRelationship;
 
 /**
  * Uses the factory pattern.

ajde/src/main/java/org/aspectj/ajde/ui/BuildConfigModel.java

@@ -1,27 +1,26 @@
 /* *******************************************************************
- * Copyright (c) 1999-2001 Xerox Corporation, 
+ * Copyright (c) 1999-2001 Xerox Corporation,
  *               2002 Palo Alto Research Center, Incorporated (PARC).
- * All rights reserved. 
- * This program and the accompanying materials are made available 
- * under the terms of the Eclipse Public License v1.0 
- * which accompanies this distribution and is available at 
- * http://www.eclipse.org/legal/epl-v10.html 
- *  
- * Contributors: 
- *     Xerox/PARC     initial implementation 
+ * All rights reserved.
+ * This program and the accompanying materials are made available
+ * under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Xerox/PARC     initial implementation
  * ******************************************************************/
 
 package org.aspectj.ajde.ui;
 
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.Iterator;
 import java.util.List;
 import java.util.StringTokenizer;
 
 /**
  * TODO: we have schitzophrenia between BuildConfigNode(s) and IProgramElement(s), fix.
- * 
+ *
  * @author Mik Kersten
  */
 public class BuildConfigModel {
@@ -59,9 +58,9 @@ public class BuildConfigModel {
 	private BuildConfigNode getNodeForPathHelper(StringTokenizer st, BuildConfigNode node) {
 		BuildConfigNode parent = node;
 		while (st.hasMoreElements()) {
-			String pathItem = (String) st.nextElement();
-			for (Iterator it = node.getChildren().iterator(); it.hasNext();) {
-				node = (BuildConfigNode) it.next();
+			String pathItem = st.nextToken();
+			for (BuildConfigNode element : node.getChildren()) {
+				node = element;
 				String childName = node.getName();
 				if (childName.equals(pathItem)) {
 					return getNodeForPathHelper(st, node);
@@ -113,8 +112,8 @@ public class BuildConfigModel {
 		}
 
 		if (node != null && node.getChildren() != null) {
-			for (Iterator it = node.getChildren().iterator(); it.hasNext();) {
-				BuildConfigNode foundNode = findNodeForSourceLineHelper((BuildConfigNode) it.next(), sourceFilePath, lineNumber);
+			for (Object element : node.getChildren()) {
+				BuildConfigNode foundNode = findNodeForSourceLineHelper((BuildConfigNode) element, sourceFilePath, lineNumber);
 				if (foundNode != null)
 					return foundNode;
 			}
@@ -134,10 +133,10 @@ public class BuildConfigModel {
 	}
 
 	private boolean hasMoreSpecificChild(BuildConfigNode node, String sourceFilePath, int lineNumber) {
-		for (Iterator it = node.getChildren().iterator(); it.hasNext();) {
-			BuildConfigNode child = (BuildConfigNode) it.next();
-			if (matches(child, sourceFilePath, lineNumber))
+		for (BuildConfigNode child : node.getChildren()) {
+			if (matches(child, sourceFilePath, lineNumber)) {
 				return true;
+			}
 		}
 		return false;
 	}

ajde/src/main/java/org/aspectj/ajde/ui/IStructureViewNode.java

@@ -14,7 +14,8 @@
  
 package org.aspectj.ajde.ui;
 
-import java.io.*;
+import java.io.ObjectStreamException;
+import java.io.Serializable;
 import java.util.List;
 
 import org.aspectj.asm.IProgramElement;

ajde/src/main/java/org/aspectj/ajde/ui/StructureSearchManager.java

@@ -1,15 +1,15 @@
 /* *******************************************************************
- * Copyright (c) 1999-2001 Xerox Corporation, 
+ * Copyright (c) 1999-2001 Xerox Corporation,
  *               2002 Palo Alto Research Center, Incorporated (PARC).
- * All rights reserved. 
- * This program and the accompanying materials are made available 
- * under the terms of the Eclipse Public License v1.0 
- * which accompanies this distribution and is available at 
- * http://www.eclipse.org/legal/epl-v10.html 
- *  
- * Contributors: 
+ * All rights reserved.
+ * This program and the accompanying materials are made available
+ * under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
  *     Xerox/PARC     initial implementation
- *     Helen Hawkins  Converted to new interface (bug 148190) 
+ *     Helen Hawkins  Converted to new interface (bug 148190)
  * ******************************************************************/
 
 package org.aspectj.ajde.ui;
@@ -29,12 +29,12 @@ public class StructureSearchManager {
 
 	/**
 	 * @param pattern case-sensitive substring of node name
-	 * 
+	 *
 	 * @return null if a corresponding node was not found
 	 */
-	public List findMatches(String pattern, IProgramElement.Kind kind) {
+	public List<IProgramElement> findMatches(String pattern, IProgramElement.Kind kind) {
 
-		List matches = new ArrayList();
+		List<IProgramElement> matches = new ArrayList<>();
 		IHierarchy model = AsmManager.lastActiveStructureModel.getHierarchy();
 		if (model.getRoot().equals(IHierarchy.NO_STRUCTURE)) {
 			return null;
@@ -43,7 +43,7 @@ public class StructureSearchManager {
 		}
 	}
 
-	private List findMatchesHelper(IProgramElement node, String pattern, IProgramElement.Kind kind, List matches) {
+	private List<IProgramElement> findMatchesHelper(IProgramElement node, String pattern, IProgramElement.Kind kind, List<IProgramElement> matches) {
 
 		if (node != null && node.getName().indexOf(pattern) != -1) {
 			if (kind == null || node.getKind().equals(kind)) {
@@ -51,8 +51,8 @@ public class StructureSearchManager {
 			}
 		}
 		if (node != null && node.getChildren() != null) {
-			for (Iterator it = node.getChildren().iterator(); it.hasNext();) {
-				IProgramElement nextNode = (IProgramElement) it.next();
+			for (Iterator<IProgramElement> it = node.getChildren().iterator(); it.hasNext();) {
+				IProgramElement nextNode = it.next();
 				if (nextNode != null) {
 					findMatchesHelper(nextNode, pattern, kind, matches);
 				}

ajde/src/main/java/org/aspectj/ajde/ui/StructureViewProperties.java

@@ -19,6 +19,8 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.aspectj.asm.IProgramElement;
+import org.aspectj.asm.IProgramElement.Accessibility;
+import org.aspectj.asm.IProgramElement.Modifiers;
 import org.aspectj.asm.IRelationship;
 
 /**
@@ -62,11 +64,11 @@ public class StructureViewProperties {
         relations.remove(kind);
     }
 
-    public void setFilteredMemberAccessibility(List memberVisibility) {
+    public void setFilteredMemberAccessibility(List<Accessibility> memberVisibility) {
         this.filteredMemberAccessibility = memberVisibility;
     }
 
-    public List getFilteredMemberAccessibility() {
+    public List<Accessibility> getFilteredMemberAccessibility() {
         return filteredMemberAccessibility;
     }
 
@@ -78,11 +80,11 @@ public class StructureViewProperties {
 		this.filteredMemberAccessibility.remove(accessibility);
 	}
 
-    public List getFilteredMemberModifiers() {
+    public List<Modifiers> getFilteredMemberModifiers() {
         return filteredMemberModifiers;
     }
 
-    public void setFilteredMemberModifiers(List memberModifiers) {
+    public void setFilteredMemberModifiers(List<Modifiers> memberModifiers) {
         this.filteredMemberModifiers = memberModifiers;
     }
 
@@ -102,11 +104,11 @@ public class StructureViewProperties {
         this.sorting = sorting;
     }
 
-	public List getFilteredMemberKinds() {
+	public List<IProgramElement.Kind> getFilteredMemberKinds() {
 		return filteredMemberKinds;
 	}
 
-	public void setFilteredMemberKinds(List memberKinds) {
+	public void setFilteredMemberKinds(List<IProgramElement.Kind> memberKinds) {
 		this.filteredMemberKinds = memberKinds;
 	}
 
@@ -118,11 +120,11 @@ public class StructureViewProperties {
 		this.filteredMemberKinds.remove(kind);
 	}
 
-	public List getGrouping() {
+	public List<Grouping> getGrouping() {
 		return grouping;
 	}
 
-	public void setGrouping(List grouping) {
+	public void setGrouping(List<Grouping> grouping) {
 		this.grouping = grouping;
 	}
 

ajde/src/main/java/org/aspectj/ajde/ui/internal/TreeStructureViewBuilder.java

@@ -14,12 +14,22 @@
 
 package org.aspectj.ajde.ui.internal;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Iterator;
+import java.util.List;
 
-import org.aspectj.ajde.ui.*;
-import org.aspectj.asm.*;
+import org.aspectj.ajde.ui.FileStructureView;
+import org.aspectj.ajde.ui.GlobalStructureView;
+import org.aspectj.ajde.ui.IStructureViewNode;
+import org.aspectj.ajde.ui.StructureView;
+import org.aspectj.ajde.ui.StructureViewNodeFactory;
+import org.aspectj.ajde.ui.StructureViewProperties;
 //import org.aspectj.asm.internal.*;
 //import org.aspectj.asm.internal.ProgramElement;
+import org.aspectj.asm.IHierarchy;
+import org.aspectj.asm.IProgramElement;
 
 /**
  * @author Mik Kersten

ajde/src/main/java/org/aspectj/ajde/ui/javaoptions/JavaCompilerWarningsOptionsPanel.java

@@ -16,8 +16,8 @@ import java.io.IOException;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
-import java.util.Set;
 import java.util.Map.Entry;
+import java.util.Set;
 
 import javax.swing.BorderFactory;
 import javax.swing.Box;

ajde/src/main/java/org/aspectj/ajde/ui/javaoptions/JavaComplianceOptionsPanel.java

@@ -16,8 +16,8 @@ import java.io.IOException;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
-import java.util.Set;
 import java.util.Map.Entry;
+import java.util.Set;
 
 import javax.swing.BorderFactory;
 import javax.swing.Box;

ajde/src/main/java/org/aspectj/ajde/ui/javaoptions/JavaDebugOptionsPanel.java

@@ -16,8 +16,8 @@ import java.io.IOException;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
-import java.util.Set;
 import java.util.Map.Entry;
+import java.util.Set;
 
 import javax.swing.BorderFactory;
 import javax.swing.Box;

ajde/src/main/java/org/aspectj/ajde/ui/swing/PointcutWizard.java

@@ -14,14 +14,18 @@
 
 package org.aspectj.ajde.ui.swing;
 
-import java.awt.*;
+import java.awt.BorderLayout;
 //import java.awt.event.ActionEvent;
-import java.util.*;
+import java.util.ArrayList;
 
-import javax.swing.*;
+import javax.swing.JButton;
+import javax.swing.JCheckBox;
+import javax.swing.JFrame;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
 
-import org.aspectj.ajde.ui.*;
 //import org.aspectj.asm.IRelationship;
+import org.aspectj.ajde.ui.StructureViewProperties;
 
 /**
  * @author Mik Kersten

ajde/src/main/java/org/aspectj/ajde/ui/swing/SwingTreeViewNode.java

@@ -14,13 +14,18 @@
 
 package org.aspectj.ajde.ui.swing;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
 
 import javax.swing.tree.DefaultMutableTreeNode;
 
-import org.aspectj.ajde.ui.*;
+import org.aspectj.ajde.ui.AbstractIcon;
+import org.aspectj.ajde.ui.IStructureViewNode;
+import org.aspectj.ajde.ui.StructureViewNodeFactory;
 //import org.aspectj.ajde.ui.IStructureViewNode.Kind;
-import org.aspectj.asm.*;
+import org.aspectj.asm.IProgramElement;
+import org.aspectj.asm.IRelationship;
 
 /**
  * @author Mik Kersten

ajde/src/main/java/org/aspectj/ajde/ui/swing/SwingTreeViewNodeFactory.java

@@ -18,8 +18,11 @@ package org.aspectj.ajde.ui.swing;
 import java.util.List;
 
 import org.aspectj.ajde.IconRegistry;
-import org.aspectj.ajde.ui.*;
-import org.aspectj.asm.*;
+import org.aspectj.ajde.ui.AbstractIcon;
+import org.aspectj.ajde.ui.IStructureViewNode;
+import org.aspectj.ajde.ui.StructureViewNodeFactory;
+import org.aspectj.asm.IProgramElement;
+import org.aspectj.asm.IRelationship;
 
 /**
  * @author Mik Kersten

ajde/src/test/java/org/aspectj/ajde/AjdeTestCase.java

@@ -17,9 +17,6 @@ import java.io.File;
 import java.io.IOException;
 import java.util.List;
 
-import junit.framework.AssertionFailedError;
-import junit.framework.TestCase;
-
 import org.aspectj.ajde.core.AjCompiler;
 import org.aspectj.ajde.ui.utils.TestBuildProgressMonitor;
 import org.aspectj.ajde.ui.utils.TestCompilerConfiguration;
@@ -28,7 +25,9 @@ import org.aspectj.ajde.ui.utils.TestIdeUIAdapter;
 import org.aspectj.ajde.ui.utils.TestMessageHandler;
 import org.aspectj.ajde.ui.utils.TestRuntimeProperties;
 import org.aspectj.testing.util.TestUtil;
-import org.aspectj.tools.ajc.Ajc;
+
+import junit.framework.AssertionFailedError;
+import junit.framework.TestCase;
 
 public abstract class AjdeTestCase extends TestCase {
 

ajde/src/test/java/org/aspectj/ajde/internal/AspectJBuildManagerTest.java

@@ -14,11 +14,12 @@
 
 package org.aspectj.ajde.internal;
 
-import junit.framework.*;
-import org.aspectj.ajde.*;
+import java.io.File;
+
+import org.aspectj.ajde.AjdeTestCase;
 import org.aspectj.asm.AsmManager;
 
-import java.io.*;
+import junit.framework.TestSuite;
 
 /**
  * @author Mik Kersten

ajde/src/test/java/org/aspectj/ajde/internal/LstBuildConfigManagerTest.java

@@ -18,12 +18,12 @@ import java.io.File;
 import java.io.IOException;
 import java.util.List;
 
-import junit.framework.TestSuite;
-
 import org.aspectj.ajde.AjdeTestCase;
 import org.aspectj.ajde.ui.BuildConfigModel;
 import org.aspectj.ajde.ui.utils.TestMessageHandler.TestMessage;
 
+import junit.framework.TestSuite;
+
 public class LstBuildConfigManagerTest extends AjdeTestCase {
 	
 	private BuildConfigManager buildConfigManager = new LstBuildConfigManager();

ajde/src/test/java/org/aspectj/ajde/ui/StructureSearchManagerTest.java

@@ -16,12 +16,12 @@ package org.aspectj.ajde.ui;
 
 import java.util.List;
 
-import junit.framework.TestSuite;
-
 import org.aspectj.ajde.Ajde;
 import org.aspectj.ajde.AjdeTestCase;
 import org.aspectj.asm.IProgramElement;
 
+import junit.framework.TestSuite;
+
 /**
  * @author Mik Kersten
  */

ajde/src/test/java/org/aspectj/ajde/ui/StructureViewManagerTest.java

@@ -16,14 +16,14 @@ package org.aspectj.ajde.ui;
 import java.io.File;
 import java.util.Iterator;
 
-import junit.framework.TestSuite;
-
 import org.aspectj.ajde.Ajde;
 import org.aspectj.ajde.AjdeTestCase;
 import org.aspectj.asm.AsmManager;
 import org.aspectj.asm.IHierarchy;
 import org.aspectj.asm.IProgramElement;
 
+import junit.framework.TestSuite;
+
 /**
  * @author Mik Kersten
  */

bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/CodeException.java

@@ -1,5 +1,10 @@
 package org.aspectj.apache.bcel.classfile;
 
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.io.Serializable;
+
 /* ====================================================================
  * The Apache Software License, Version 1.1
  *
@@ -55,7 +60,6 @@ package org.aspectj.apache.bcel.classfile;
  */
 
 import  org.aspectj.apache.bcel.Constants;
-import  java.io.*;
 
 /**
  * This class represents an entry in the exception table of the <em>Code</em>

bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/StackMapType.java

@@ -1,5 +1,9 @@
 package org.aspectj.apache.bcel.classfile;
 
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
+
 /* ====================================================================
  * The Apache Software License, Version 1.1
  *
@@ -55,7 +59,6 @@ package org.aspectj.apache.bcel.classfile;
  */
 
 import  org.aspectj.apache.bcel.Constants;
-import  java.io.*;
 
 /**
  * This class represents the type of a local variable or item on stack

bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/annotation/RuntimeInvisAnnos.java

@@ -17,8 +17,8 @@ import java.io.IOException;
 
 import org.aspectj.apache.bcel.Constants;
 import org.aspectj.apache.bcel.classfile.Attribute;
-import org.aspectj.apache.bcel.classfile.ConstantPool;
 import org.aspectj.apache.bcel.classfile.ClassVisitor;
+import org.aspectj.apache.bcel.classfile.ConstantPool;
 
 public class RuntimeInvisAnnos extends RuntimeAnnos {
 	

bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/annotation/RuntimeInvisParamAnnos.java

@@ -16,8 +16,8 @@ import java.io.IOException;
 
 import org.aspectj.apache.bcel.Constants;
 import org.aspectj.apache.bcel.classfile.Attribute;
-import org.aspectj.apache.bcel.classfile.ConstantPool;
 import org.aspectj.apache.bcel.classfile.ClassVisitor;
+import org.aspectj.apache.bcel.classfile.ConstantPool;
 
 public class RuntimeInvisParamAnnos extends RuntimeParamAnnos {
 	  

bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/annotation/RuntimeInvisTypeAnnos.java

@@ -15,8 +15,8 @@ import java.io.DataInputStream;
 import java.io.IOException;
 
 import org.aspectj.apache.bcel.Constants;
-import org.aspectj.apache.bcel.classfile.ConstantPool;
 import org.aspectj.apache.bcel.classfile.ClassVisitor;
+import org.aspectj.apache.bcel.classfile.ConstantPool;
 
 public class RuntimeInvisTypeAnnos extends RuntimeTypeAnnos {
 

bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/annotation/RuntimeVisAnnos.java

@@ -17,8 +17,8 @@ import java.io.IOException;
 
 import org.aspectj.apache.bcel.Constants;
 import org.aspectj.apache.bcel.classfile.Attribute;
-import org.aspectj.apache.bcel.classfile.ConstantPool;
 import org.aspectj.apache.bcel.classfile.ClassVisitor;
+import org.aspectj.apache.bcel.classfile.ConstantPool;
 
 public class RuntimeVisAnnos extends RuntimeAnnos {
 	

bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/annotation/RuntimeVisParamAnnos.java

@@ -16,8 +16,8 @@ import java.io.IOException;
 
 import org.aspectj.apache.bcel.Constants;
 import org.aspectj.apache.bcel.classfile.Attribute;
-import org.aspectj.apache.bcel.classfile.ConstantPool;
 import org.aspectj.apache.bcel.classfile.ClassVisitor;
+import org.aspectj.apache.bcel.classfile.ConstantPool;
 
 public class RuntimeVisParamAnnos extends RuntimeParamAnnos {
 	

bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/annotation/RuntimeVisTypeAnnos.java

@@ -15,8 +15,8 @@ import java.io.DataInputStream;
 import java.io.IOException;
 
 import org.aspectj.apache.bcel.Constants;
-import org.aspectj.apache.bcel.classfile.ConstantPool;
 import org.aspectj.apache.bcel.classfile.ClassVisitor;
+import org.aspectj.apache.bcel.classfile.ConstantPool;
 
 public class RuntimeVisTypeAnnos extends RuntimeTypeAnnos {
 	

bcel-builder/src/main/java/org/aspectj/apache/bcel/generic/ReturnaddressType.java

@@ -54,7 +54,6 @@ package org.aspectj.apache.bcel.generic;
  * <http://www.apache.org/>.
  */
 import org.aspectj.apache.bcel.Constants;
-import org.aspectj.apache.bcel.generic.InstructionHandle;
 
 /** 
  * Returnaddress, the type JSR or JSR_W instructions push upon the stack.

bcel-builder/src/main/java/org/aspectj/apache/bcel/generic/TABLESWITCH.java

@@ -59,8 +59,6 @@ import java.io.IOException;
 import org.aspectj.apache.bcel.Constants;
 import org.aspectj.apache.bcel.util.ByteSequence;
 
-import com.sun.org.apache.bcel.internal.generic.SWITCH;
-
 /**
  * TABLESWITCH - Switch within given range of values, i.e., low..high
  * 

bcel-builder/src/main/java/org/aspectj/apache/bcel/util/ByteSequence.java

@@ -53,7 +53,8 @@ package org.aspectj.apache.bcel.util;
  * information on the Apache Software Foundation, please see
  * <http://www.apache.org/>.
  */
-import java.io.*;
+import java.io.ByteArrayInputStream;
+import java.io.DataInputStream;
 
 /**
  * Utility class that implements a sequence of bytes which can be read

bcel-builder/src/test/java/org/aspectj/apache/bcel/classfile/tests/AnnotationAccessFlagTest.java

@@ -14,13 +14,13 @@ package org.aspectj.apache.bcel.classfile.tests;
 
 import java.io.File;
 
-import junit.framework.TestCase;
-
 import org.aspectj.apache.bcel.classfile.ConstantPool;
 import org.aspectj.apache.bcel.classfile.JavaClass;
 import org.aspectj.apache.bcel.util.ClassPath;
 import org.aspectj.apache.bcel.util.SyntheticRepository;
 
+import junit.framework.TestCase;
+
 public class AnnotationAccessFlagTest extends TestCase {
 	
 	private boolean verbose = false;

bcel-builder/src/test/java/org/aspectj/apache/bcel/classfile/tests/AnnotationGenTest.java

@@ -24,8 +24,8 @@ import org.aspectj.apache.bcel.classfile.Attribute;
 import org.aspectj.apache.bcel.classfile.ConstantPool;
 import org.aspectj.apache.bcel.classfile.Utility;
 import org.aspectj.apache.bcel.classfile.annotation.AnnotationGen;
-import org.aspectj.apache.bcel.classfile.annotation.NameValuePair;
 import org.aspectj.apache.bcel.classfile.annotation.ElementValue;
+import org.aspectj.apache.bcel.classfile.annotation.NameValuePair;
 import org.aspectj.apache.bcel.classfile.annotation.RuntimeAnnos;
 import org.aspectj.apache.bcel.classfile.annotation.RuntimeInvisAnnos;
 import org.aspectj.apache.bcel.classfile.annotation.RuntimeVisAnnos;

bcel-builder/src/test/java/org/aspectj/apache/bcel/classfile/tests/BcelTestCase.java

@@ -16,21 +16,21 @@ import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 
-import junit.framework.TestCase;
-
 import org.aspectj.apache.bcel.classfile.Attribute;
 import org.aspectj.apache.bcel.classfile.ConstantPool;
 import org.aspectj.apache.bcel.classfile.Field;
 import org.aspectj.apache.bcel.classfile.JavaClass;
 import org.aspectj.apache.bcel.classfile.Method;
 import org.aspectj.apache.bcel.classfile.annotation.AnnotationGen;
-import org.aspectj.apache.bcel.classfile.annotation.NameValuePair;
 import org.aspectj.apache.bcel.classfile.annotation.ElementValue;
+import org.aspectj.apache.bcel.classfile.annotation.NameValuePair;
 import org.aspectj.apache.bcel.classfile.annotation.SimpleElementValue;
 import org.aspectj.apache.bcel.generic.ObjectType;
 import org.aspectj.apache.bcel.util.ClassPath;
 import org.aspectj.apache.bcel.util.SyntheticRepository;
 
+import junit.framework.TestCase;
+
 /**
  * Super class for the Java5 tests, includes various helper methods.
  */

bcel-builder/src/test/java/org/aspectj/apache/bcel/classfile/tests/EnumAccessFlagTest.java

@@ -14,13 +14,13 @@ package org.aspectj.apache.bcel.classfile.tests;
 
 import java.io.File;
 
-import junit.framework.TestCase;
-
 import org.aspectj.apache.bcel.classfile.ConstantPool;
 import org.aspectj.apache.bcel.classfile.JavaClass;
 import org.aspectj.apache.bcel.util.ClassPath;
 import org.aspectj.apache.bcel.util.SyntheticRepository;
 
+import junit.framework.TestCase;
+
 public class EnumAccessFlagTest extends TestCase {
 	
 	private boolean verbose = false;

bcel-builder/src/test/java/org/aspectj/apache/bcel/classfile/tests/GeneratingAnnotatedClassesTest.java

@@ -21,8 +21,8 @@ import org.aspectj.apache.bcel.classfile.Method;
 import org.aspectj.apache.bcel.classfile.annotation.AnnotationElementValue;
 import org.aspectj.apache.bcel.classfile.annotation.AnnotationGen;
 import org.aspectj.apache.bcel.classfile.annotation.ArrayElementValue;
-import org.aspectj.apache.bcel.classfile.annotation.NameValuePair;
 import org.aspectj.apache.bcel.classfile.annotation.ElementValue;
+import org.aspectj.apache.bcel.classfile.annotation.NameValuePair;
 import org.aspectj.apache.bcel.classfile.annotation.SimpleElementValue;
 import org.aspectj.apache.bcel.generic.ArrayType;
 import org.aspectj.apache.bcel.generic.ClassGen;

bcel-builder/src/test/java/org/aspectj/apache/bcel/classfile/tests/NonCachingClassLoaderRepositoryTest.java

@@ -57,11 +57,11 @@ package org.aspectj.apache.bcel.classfile.tests;
 import java.util.ArrayList;
 import java.util.List;
 
-import junit.framework.TestCase;
-
 import org.aspectj.apache.bcel.classfile.JavaClass;
 import org.aspectj.apache.bcel.util.NonCachingClassLoaderRepository;
 
+import junit.framework.TestCase;
+
 /**
  * @author Kristian Rosenvold
  */

bcel-builder/src/test/java/org/aspectj/apache/bcel/classfile/tests/ParameterAnnotationsTest.java

@@ -21,8 +21,8 @@ import org.aspectj.apache.bcel.classfile.Method;
 import org.aspectj.apache.bcel.classfile.annotation.AnnotationElementValue;
 import org.aspectj.apache.bcel.classfile.annotation.AnnotationGen;
 import org.aspectj.apache.bcel.classfile.annotation.ArrayElementValue;
-import org.aspectj.apache.bcel.classfile.annotation.NameValuePair;
 import org.aspectj.apache.bcel.classfile.annotation.ElementValue;
+import org.aspectj.apache.bcel.classfile.annotation.NameValuePair;
 import org.aspectj.apache.bcel.classfile.annotation.SimpleElementValue;
 import org.aspectj.apache.bcel.generic.ArrayType;
 import org.aspectj.apache.bcel.generic.ClassGen;

bcel-builder/src/test/java/org/aspectj/apache/bcel/classfile/tests/RuntimeVisibleAnnotationAttributeTest.java

@@ -26,9 +26,9 @@ import org.aspectj.apache.bcel.classfile.annotation.AnnotationElementValue;
 import org.aspectj.apache.bcel.classfile.annotation.AnnotationGen;
 import org.aspectj.apache.bcel.classfile.annotation.ArrayElementValue;
 import org.aspectj.apache.bcel.classfile.annotation.ClassElementValue;
-import org.aspectj.apache.bcel.classfile.annotation.NameValuePair;
 import org.aspectj.apache.bcel.classfile.annotation.ElementValue;
 import org.aspectj.apache.bcel.classfile.annotation.EnumElementValue;
+import org.aspectj.apache.bcel.classfile.annotation.NameValuePair;
 import org.aspectj.apache.bcel.classfile.annotation.RuntimeVisAnnos;
 import org.aspectj.apache.bcel.classfile.annotation.SimpleElementValue;
 import org.aspectj.apache.bcel.generic.ClassGen;

loadtime/src/main/java/org/aspectj/weaver/loadtime/Agent.java

@@ -11,8 +11,8 @@
  *******************************************************************************/
 package org.aspectj.weaver.loadtime;
 
-import java.lang.instrument.Instrumentation;
 import java.lang.instrument.ClassFileTransformer;
+import java.lang.instrument.Instrumentation;
 
 /**
  * Java 1.5 preMain agent to hook in the class pre processor

loadtime/src/main/java/org/aspectj/weaver/loadtime/DefaultMessageHandler.java

@@ -11,9 +11,9 @@
  *******************************************************************************/
 package org.aspectj.weaver.loadtime;
 
-import org.aspectj.bridge.IMessageHandler;
-import org.aspectj.bridge.IMessage;
 import org.aspectj.bridge.AbortException;
+import org.aspectj.bridge.IMessage;
+import org.aspectj.bridge.IMessageHandler;
 
 /**
  * @author <a href="mailto:alex AT gnilux DOT com">Alexandre Vasseur</a>

loadtime/src/main/java/org/aspectj/weaver/loadtime/Options.java

@@ -23,7 +23,7 @@ import org.aspectj.util.LangUtil;
 /**
  * A class that hanldes LTW options. Note: AV - I choosed to not reuse AjCompilerOptions and alike since those implies too many
  * dependancies on jdt and ajdt modules.
- * 
+ *
  * @author <a href="mailto:alex AT gnilux DOT com">Alexandre Vasseur</a>
  */
 public class Options {
@@ -66,7 +66,7 @@ public class Options {
 				if (arg.length() > OPTIONVALUED_messageHandler.length()) {
 					String handlerClass = arg.substring(OPTIONVALUED_messageHandler.length()).trim();
 					try {
-						Class handler = Class.forName(handlerClass, false, laoder);
+						Class<?> handler = Class.forName(handlerClass, false, laoder);
 						weaverOption.messageHandler = ((IMessageHandler) handler.newInstance());
 					} catch (Throwable t) {
 						weaverOption.messageHandler.handleMessage(new Message("Cannot instantiate message handler " + handlerClass,
@@ -78,7 +78,7 @@ public class Options {
 
 		// configure the other options
 		for (Iterator<String> iterator = flags.iterator(); iterator.hasNext();) {
-			String arg = (String) iterator.next();
+			String arg = iterator.next();
 			if (arg.equals(OPTION_15)) {
 				weaverOption.java5 = true;
 			} else if (arg.equalsIgnoreCase(OPTION_lazyTjp)) {

loadtime/src/test/java/org/aspectj/weaver/loadtime/ClassLoaderWeavingAdaptorTest.java

@@ -19,8 +19,6 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-import junit.framework.TestCase;
-
 import org.aspectj.apache.bcel.classfile.JavaClass;
 import org.aspectj.apache.bcel.util.ClassPath;
 import org.aspectj.apache.bcel.util.SyntheticRepository;
@@ -31,6 +29,8 @@ import org.aspectj.weaver.bcel.BcelWorld;
 import org.aspectj.weaver.loadtime.definition.Definition;
 import org.aspectj.weaver.tools.WeavingAdaptor;
 
+import junit.framework.TestCase;
+
 public class ClassLoaderWeavingAdaptorTest extends TestCase {
 
 	public void testClassLoaderWeavingAdaptor() {

loadtime/src/test/java/org/aspectj/weaver/loadtime/JRockitAgentTest.java

@@ -27,11 +27,11 @@ import java.util.zip.ZipEntry;
 import org.aspectj.util.FileUtil;
 import org.aspectj.util.LangUtil;
 
-import junit.framework.TestCase;
-
 import com.bea.jvm.ClassPreProcessor;
 import com.bea.jvm.JVMFactory;
 
+import junit.framework.TestCase;
+
 public class JRockitAgentTest extends TestCase {
 
 	protected void setUp() throws Exception {

loadtime/src/test/java/org/aspectj/weaver/loadtime/WeavingContextTest.java

@@ -17,10 +17,10 @@ import java.net.URLClassLoader;
 import java.util.Enumeration;
 import java.util.List;
 
-import junit.framework.TestCase;
-
 import org.aspectj.weaver.tools.WeavingAdaptor;
 
+import junit.framework.TestCase;
+
 public class WeavingContextTest extends TestCase {
 
 	private boolean called;

loadtime/src/test/java/org/aspectj/weaver/loadtime/WeavingURLClassLoaderTest.java

@@ -15,19 +15,17 @@ package org.aspectj.weaver.loadtime;
 import java.io.File;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
-import java.net.URISyntaxException;
 import java.net.URL;
 import java.util.Enumeration;
 import java.util.Properties;
 
-import junit.framework.TestCase;
-
 import org.aspectj.bridge.AbortException;
-import org.aspectj.testing.util.TestUtil;
 import org.aspectj.testing.util.TestUtil.TestError;
 import org.aspectj.util.FileUtil;
 import org.aspectj.weaver.tools.WeavingAdaptor;
 
+import junit.framework.TestCase;
+
 /**
  * @author websterm
  * 

loadtime/src/test/java/org/aspectj/weaver/loadtime/test/DocumentParserTest.java

@@ -11,13 +11,13 @@
  *******************************************************************************/
 package org.aspectj.weaver.loadtime.test;
 
-import junit.framework.TestCase;
-
 import java.net.URL;
 
 import org.aspectj.weaver.loadtime.definition.Definition;
 import org.aspectj.weaver.loadtime.definition.DocumentParser;
 
+import junit.framework.TestCase;
+
 /**
  * @author <a href="mailto:alex AT gnilux DOT com">Alexandre Vasseur</a>
  */

util/src/main/java/org/aspectj/util/Reflection.java

@@ -14,7 +14,7 @@
 package org.aspectj.util;
 
 import java.io.File;
-import java.lang.reflect.*;
+import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.net.URL;
 import java.util.ArrayList;

util/src/main/java/org/aspectj/util/SoftHashMap.java

@@ -7,8 +7,12 @@
  * http://www.eclipse.org/legal/epl-v10.html 
  * ******************************************************************/package org.aspectj.util;
 
-import java.lang.ref.*;
-import java.util.*;
+import java.lang.ref.ReferenceQueue;
+import java.lang.ref.SoftReference;
+import java.util.AbstractMap;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
 
 public class SoftHashMap<K,V> extends AbstractMap<K,V> {
 	private Map<K, SpecialValue> map;

util/src/test/java/org/aspectj/util/UtilModuleTests.java

@@ -12,8 +12,9 @@
  * ******************************************************************/
 package org.aspectj.util;
 
-import junit.framework.*;
 import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
 
 public class UtilModuleTests extends TestCase {
 

weaver/src/main/java/org/aspectj/weaver/bcel/BcelRenderer.java

@@ -12,8 +12,6 @@
 
 package org.aspectj.weaver.bcel;
 
-import java.lang.reflect.Modifier;
-
 import org.aspectj.apache.bcel.Constants;
 import org.aspectj.apache.bcel.generic.InstructionFactory;
 import org.aspectj.apache.bcel.generic.InstructionHandle;

weaver/src/main/java/org/aspectj/weaver/bcel/BcelWeaver.java

@@ -53,7 +53,6 @@ import org.aspectj.util.FileUtil;
 import org.aspectj.util.FuzzyBoolean;
 import org.aspectj.weaver.Advice;
 import org.aspectj.weaver.AdviceKind;
-import org.aspectj.weaver.AjAttribute.WeaverVersionInfo;
 import org.aspectj.weaver.AnnotationAJ;
 import org.aspectj.weaver.AnnotationOnTypeMunger;
 import org.aspectj.weaver.BCException;

weaver/src/main/java/org/aspectj/weaver/loadtime/definition/DocumentParser.java

@@ -22,7 +22,6 @@ import javax.xml.parsers.SAXParserFactory;
 
 import org.aspectj.util.LangUtil;
 import org.aspectj.weaver.loadtime.definition.Definition.AdviceKind;
-import org.aspectj.weaver.loadtime.definition.Definition.DeclareAnnotation;
 import org.aspectj.weaver.loadtime.definition.Definition.DeclareAnnotationKind;
 import org.xml.sax.Attributes;
 import org.xml.sax.InputSource;

weaver/src/main/java/org/aspectj/weaver/loadtime/definition/SimpleAOPParser.java

@@ -17,7 +17,6 @@ import java.io.InputStreamReader;
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.Map;
-import java.util.Set;
 
 import org.aspectj.util.LangUtil;
 import org.aspectj.weaver.loadtime.definition.Definition.AdviceKind;

weaver/src/main/java/org/aspectj/weaver/tools/cache/WeavedClassCache.java

@@ -13,15 +13,15 @@
 
 package org.aspectj.weaver.tools.cache;
 
+import java.util.LinkedList;
+import java.util.List;
+
 import org.aspectj.bridge.IMessage;
 import org.aspectj.bridge.IMessageHandler;
 import org.aspectj.bridge.Message;
 import org.aspectj.bridge.MessageUtil;
 import org.aspectj.weaver.tools.GeneratedClassHandler;
 
-import java.util.LinkedList;
-import java.util.List;
-
 /**
  * Manages a cache of weaved and generated classes similar to Eclipse Equinox,
  * except designed to operate across multiple restarts of the JVM and with one

weaver/src/test/java/org/aspectj/weaver/AbstractTraceTest.java

@@ -12,12 +12,12 @@ package org.aspectj.weaver;
 
 import java.util.ArrayList;
 
-import junit.framework.TestCase;
-
 import org.aspectj.weaver.tools.AbstractTrace;
 import org.aspectj.weaver.tools.DefaultTrace;
 import org.aspectj.weaver.tools.Traceable;
 
+import junit.framework.TestCase;
+
 public abstract class AbstractTraceTest extends TestCase {
 
 	protected AbstractTrace trace;

weaver/src/test/java/org/aspectj/weaver/BoundedReferenceTypeTestCase.java

@@ -11,10 +11,10 @@
  * ******************************************************************/
 package org.aspectj.weaver;
 
-import junit.framework.TestCase;
-
 import org.aspectj.weaver.bcel.BcelWorld;
 
+import junit.framework.TestCase;
+
 public class BoundedReferenceTypeTestCase extends TestCase {
 
 	ReferenceType javaLangClass;

weaver/src/test/java/org/aspectj/weaver/CommonsTraceFactoryTest.java

@@ -10,11 +10,11 @@
  *******************************************************************************/
 package org.aspectj.weaver;
 
-import junit.framework.TestCase;
-
 import org.aspectj.weaver.tools.CommonsTraceFactory;
 import org.aspectj.weaver.tools.Trace;
 
+import junit.framework.TestCase;
+
 public class CommonsTraceFactoryTest extends TestCase {
 
 	public void testGetTraceFactory() {

weaver/src/test/java/org/aspectj/weaver/DumpTestCase.java

@@ -15,13 +15,13 @@ import java.io.File;
 import java.io.FileReader;
 import java.io.IOException;
 
-import junit.framework.TestCase;
-
 import org.aspectj.bridge.IMessage;
 import org.aspectj.bridge.IMessageHolder;
 import org.aspectj.bridge.Message;
 import org.aspectj.bridge.MessageHandler;
 
+import junit.framework.TestCase;
+
 /**
  * @author websterm
  *

weaver/src/test/java/org/aspectj/weaver/GenericSignatureParserTest.java

@@ -10,13 +10,13 @@
  * ******************************************************************/
  package org.aspectj.weaver;
 
-import junit.framework.TestCase;
-
 import org.aspectj.apache.bcel.classfile.JavaClass;
 import org.aspectj.apache.bcel.classfile.Method;
 import org.aspectj.apache.bcel.util.SyntheticRepository;
 import org.aspectj.util.GenericSignatureParser;
 
+import junit.framework.TestCase;
+
 /**
  * @author Adrian Colyer
  * @author Andy Clement

weaver/src/test/java/org/aspectj/weaver/Jdk14TraceFactoryTest.java

@@ -10,11 +10,11 @@
  *******************************************************************************/
 package org.aspectj.weaver;
 
-import junit.framework.TestCase;
-
 import org.aspectj.weaver.tools.Jdk14TraceFactory;
 import org.aspectj.weaver.tools.Trace;
 
+import junit.framework.TestCase;
+
 public class Jdk14TraceFactoryTest extends TestCase {
 
 	public void testJdk14TraceFactory() {

weaver/src/test/java/org/aspectj/weaver/JoinPointSignatureIteratorTest.java

@@ -17,10 +17,10 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
-import junit.framework.TestCase;
-
 import org.aspectj.weaver.reflect.ReflectionWorld;
 
+import junit.framework.TestCase;
+
 /**
  * @author Andy Clement
  */

weaver/src/test/java/org/aspectj/weaver/LocaleTest.java

@@ -13,11 +13,11 @@ package org.aspectj.weaver;
 import java.io.IOException;
 import java.util.Locale;
 
-import junit.framework.TestCase;
-
 import org.aspectj.apache.bcel.generic.Instruction;
 import org.aspectj.apache.bcel.util.ByteSequence;
 
+import junit.framework.TestCase;
+
 public class LocaleTest extends TestCase {
 
 	public LocaleTest(String name) {

weaver/src/test/java/org/aspectj/weaver/MemberTestCase.java

@@ -16,10 +16,10 @@ package org.aspectj.weaver;
 
 import java.lang.reflect.Modifier;
 
-import junit.framework.TestCase;
-
 import org.aspectj.testing.util.TestUtil;
 
+import junit.framework.TestCase;
+
 /**
  * This is a test case for all the portions of Member that don't require a world.
  */

weaver/src/test/java/org/aspectj/weaver/ReferenceTypeTestCase.java

@@ -16,11 +16,11 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Random;
 
-import junit.framework.TestCase;
-
 import org.aspectj.util.PartialOrder;
 import org.aspectj.weaver.bcel.BcelWorld;
 
+import junit.framework.TestCase;
+
 // test cases for Adrian's additions to ReferenceType
 // XXX - couldn't find any unit test cases for the rest of the ReferenceType class
 public class ReferenceTypeTestCase extends TestCase {

weaver/src/test/java/org/aspectj/weaver/TypeVariableReferenceTypeTestCase.java

@@ -11,10 +11,10 @@
  * ******************************************************************/
 package org.aspectj.weaver;
 
-import junit.framework.TestCase;
-
 import org.aspectj.weaver.bcel.BcelWorld;
 
+import junit.framework.TestCase;
+
 /**
  * @author colyer
  * 

weaver/src/test/java/org/aspectj/weaver/TypeVariableTestCase.java

@@ -11,10 +11,10 @@
  * ******************************************************************/
 package org.aspectj.weaver;
 
-import junit.framework.TestCase;
-
 import org.aspectj.weaver.bcel.BcelWorld;
 
+import junit.framework.TestCase;
+
 public class TypeVariableTestCase extends TestCase {
 
 	private UnresolvedType javaLangNumber;

weaver/src/test/java/org/aspectj/weaver/TypeXTestCase.java

@@ -13,12 +13,12 @@
 
 package org.aspectj.weaver;
 
-import junit.framework.TestCase;
-
 import org.aspectj.testing.util.TestUtil;
 import org.aspectj.util.LangUtil;
 import org.aspectj.weaver.bcel.BcelWorld;
 
+import junit.framework.TestCase;
+
 /**
  * This is a test case for all the portions of UnresolvedType that don't require a world.
  */

weaver/src/test/java/org/aspectj/weaver/WeaverModuleTests.java

@@ -13,12 +13,58 @@ package org.aspectj.weaver;
 
 import org.aspectj.matcher.tools.ReflectionWorldAdvancedPointcutExpressionTest;
 import org.aspectj.util.LangUtil;
-import org.aspectj.weaver.bcel.*;
-import org.aspectj.weaver.patterns.*;
-import org.aspectj.weaver.patterns.bcel.*;
-import org.aspectj.weaver.reflect.*;
-import org.aspectj.weaver.tools.*;
-import org.aspectj.weaver.tools.cache.*;
+import org.aspectj.weaver.bcel.AfterReturningWeaveTestCase;
+import org.aspectj.weaver.bcel.AfterThrowingWeaveTestCase;
+import org.aspectj.weaver.bcel.AfterWeaveTestCase;
+import org.aspectj.weaver.bcel.ArgsWeaveTestCase;
+import org.aspectj.weaver.bcel.AroundArgsWeaveTestCase;
+import org.aspectj.weaver.bcel.AroundWeaveTestCase;
+import org.aspectj.weaver.bcel.BcelGenericSignatureToTypeXTestCase;
+import org.aspectj.weaver.bcel.BcelWorldReferenceTypeTest;
+import org.aspectj.weaver.bcel.BeforeWeaveTestCase;
+import org.aspectj.weaver.bcel.CheckerTestCase;
+import org.aspectj.weaver.bcel.ClassLoaderRepositoryTest;
+import org.aspectj.weaver.bcel.FieldSetTestCase;
+import org.aspectj.weaver.bcel.HierarchyDependsTestCase;
+import org.aspectj.weaver.bcel.IdWeaveTestCase;
+import org.aspectj.weaver.bcel.JImageTestCase;
+import org.aspectj.weaver.bcel.MegaZipTestCase;
+import org.aspectj.weaver.bcel.MoveInstructionsWeaveTestCase;
+import org.aspectj.weaver.bcel.NonstaticWeaveTestCase;
+import org.aspectj.weaver.bcel.PatternWeaveTestCase;
+import org.aspectj.weaver.bcel.PointcutResidueTestCase;
+import org.aspectj.weaver.bcel.TjpWeaveTestCase;
+import org.aspectj.weaver.bcel.TraceJarWeaveTestCase;
+import org.aspectj.weaver.bcel.UtilityTestCase;
+import org.aspectj.weaver.bcel.WeaveOrderTestCase;
+import org.aspectj.weaver.bcel.WorldTestCase;
+import org.aspectj.weaver.bcel.ZipTestCase;
+import org.aspectj.weaver.patterns.AnnotationPatternMatchingTestCase;
+import org.aspectj.weaver.patterns.AnnotationPatternTestCase;
+import org.aspectj.weaver.patterns.ConcretizationTestCase;
+import org.aspectj.weaver.patterns.WildTypePatternResolutionTestCase;
+import org.aspectj.weaver.patterns.bcel.BcelAndOrNotTestCase;
+import org.aspectj.weaver.patterns.bcel.BcelBindingTestCase;
+import org.aspectj.weaver.patterns.bcel.BcelModifiersPatternTestCase;
+import org.aspectj.weaver.patterns.bcel.BcelParserTestCase;
+import org.aspectj.weaver.patterns.bcel.BcelSignaturePatternTestCase;
+import org.aspectj.weaver.patterns.bcel.BcelTypePatternListTestCase;
+import org.aspectj.weaver.patterns.bcel.BcelTypePatternTestCase;
+import org.aspectj.weaver.patterns.bcel.BcelWithinTestCase;
+import org.aspectj.weaver.reflect.ReflectionWorldReferenceTypeTest;
+import org.aspectj.weaver.reflect.ReflectionWorldTest;
+import org.aspectj.weaver.tools.Java15PointcutExpressionTest;
+import org.aspectj.weaver.tools.PointcutDesignatorHandlerTest;
+import org.aspectj.weaver.tools.PointcutExpressionTest;
+import org.aspectj.weaver.tools.PointcutParserTest;
+import org.aspectj.weaver.tools.ReadingAttributesTest;
+import org.aspectj.weaver.tools.TypePatternMatcherTest;
+import org.aspectj.weaver.tools.cache.DefaultCacheKeyResolverTest;
+import org.aspectj.weaver.tools.cache.DefaultFileCacheBackingTest;
+import org.aspectj.weaver.tools.cache.FlatFileCacheBackingTest;
+import org.aspectj.weaver.tools.cache.SimpleClassCacheTest;
+import org.aspectj.weaver.tools.cache.WeavedClassCacheTest;
+import org.aspectj.weaver.tools.cache.ZippedFileCacheBackingTest;
 
 import junit.framework.Test;
 import junit.framework.TestCase;

weaver/src/test/java/org/aspectj/weaver/WeaverTestCase.java

@@ -14,12 +14,10 @@ package org.aspectj.weaver;
 
 import java.io.File;
 
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
 import org.aspectj.util.FileUtil;
 
+import junit.framework.TestCase;
+
 public abstract class WeaverTestCase extends TestCase {
 
 	public static final String TESTDATA_PATH = "../weaver/testdata";

weaver/src/test/java/org/aspectj/weaver/bcel/AfterWeaveTestCase.java

@@ -13,7 +13,7 @@
 
 package org.aspectj.weaver.bcel;
 
-import java.io.*;
+import java.io.IOException;
 
 public class AfterWeaveTestCase extends WeaveTestCase {
 	{

weaver/src/test/java/org/aspectj/weaver/bcel/BcelGenericSignatureToTypeXTestCase.java

@@ -11,19 +11,19 @@
  * ******************************************************************/
 package org.aspectj.weaver.bcel;
 
-import junit.framework.TestCase;
-
 import java.util.Arrays;
 
 import org.aspectj.apache.bcel.Repository;
 import org.aspectj.apache.bcel.classfile.JavaClass;
 import org.aspectj.apache.bcel.classfile.Signature;
 import org.aspectj.util.GenericSignature;
+import org.aspectj.util.GenericSignature.ClassSignature;
 import org.aspectj.util.GenericSignatureParser;
 import org.aspectj.util.LangUtil;
-import org.aspectj.util.GenericSignature.ClassSignature;
 import org.aspectj.weaver.UnresolvedType;
 
+import junit.framework.TestCase;
+
 /**
  * @author colyer
  * 

weaver/src/test/java/org/aspectj/weaver/bcel/CheckerTestCase.java

@@ -15,10 +15,10 @@ package org.aspectj.weaver.bcel;
 
 import java.io.IOException;
 
+import org.aspectj.bridge.IMessage;
+import org.aspectj.bridge.MessageHandler;
 import org.aspectj.weaver.Checker;
 import org.aspectj.weaver.patterns.DeclareErrorOrWarning;
-import org.aspectj.bridge.*;
-import org.aspectj.bridge.MessageHandler;
 
 public class CheckerTestCase extends WeaveTestCase {
 	{

weaver/src/test/java/org/aspectj/weaver/bcel/ClassLoaderRepositoryTest.java

@@ -23,10 +23,10 @@ import java.util.Map;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
 
-import junit.framework.TestCase;
-
 import org.aspectj.apache.bcel.util.ClassLoaderRepository;
 
+import junit.framework.TestCase;
+
 /** NOT YET INCLUDED IN A FULL TEST RUN - WORK IN PROGRESS CHECKING CLASSLOADERREPOSITORY OPTIMIZATIONS */
 public class ClassLoaderRepositoryTest extends TestCase {
 	private File f;

weaver/src/test/java/org/aspectj/weaver/bcel/MegaZipTestCase.java

@@ -19,12 +19,12 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.aspectj.weaver.AdviceKind;
-import org.aspectj.weaver.WeaverTestCase;
 import org.aspectj.weaver.Member;
 import org.aspectj.weaver.MemberImpl;
 import org.aspectj.weaver.Shadow;
 import org.aspectj.weaver.ShadowMunger;
 import org.aspectj.weaver.UnresolvedType;
+import org.aspectj.weaver.WeaverTestCase;
 
 public class MegaZipTestCase extends WeaveTestCase {
 

weaver/src/test/java/org/aspectj/weaver/bcel/NonstaticWeaveTestCase.java

@@ -15,8 +15,13 @@ package org.aspectj.weaver.bcel;
 
 import java.io.IOException;
 
-import org.aspectj.weaver.*;
-import org.aspectj.weaver.patterns.*;
+import org.aspectj.weaver.CrosscuttingMembers;
+import org.aspectj.weaver.ResolvedType;
+import org.aspectj.weaver.ShadowMunger;
+import org.aspectj.weaver.patterns.PatternParser;
+import org.aspectj.weaver.patterns.PerClause;
+import org.aspectj.weaver.patterns.PerSingleton;
+import org.aspectj.weaver.patterns.TestScope;
 
 public class NonstaticWeaveTestCase extends WeaveTestCase {
 	{

weaver/src/test/java/org/aspectj/weaver/bcel/UtilityTestCase.java

@@ -12,7 +12,7 @@
 
 
 package org.aspectj.weaver.bcel;
-import java.io.*;
+import java.io.IOException;
 
 import junit.framework.TestCase;
 

weaver/src/test/java/org/aspectj/weaver/bcel/WeaveOrderTestCase.java

@@ -13,8 +13,14 @@
 
 package org.aspectj.weaver.bcel;
 
-import org.aspectj.weaver.patterns.*;
-import org.aspectj.weaver.*;
+import org.aspectj.weaver.Advice;
+import org.aspectj.weaver.AdviceKind;
+import org.aspectj.weaver.CrosscuttingMembers;
+import org.aspectj.weaver.MemberImpl;
+import org.aspectj.weaver.ResolvedType;
+import org.aspectj.weaver.UnresolvedType;
+import org.aspectj.weaver.patterns.Declare;
+import org.aspectj.weaver.patterns.PatternParser;
 
 /**.
  */

weaver/src/test/java/org/aspectj/weaver/bcel/WorldTestCase.java

@@ -15,7 +15,6 @@ package org.aspectj.weaver.bcel;
 import java.lang.reflect.Modifier;
 
 import org.aspectj.weaver.Advice;
-import org.aspectj.weaver.WeaverTestCase;
 import org.aspectj.weaver.CommonWorldTests;
 import org.aspectj.weaver.Member;
 import org.aspectj.weaver.MemberImpl;
@@ -24,6 +23,7 @@ import org.aspectj.weaver.ResolvedType;
 import org.aspectj.weaver.ShadowMunger;
 import org.aspectj.weaver.TestUtils;
 import org.aspectj.weaver.UnresolvedType;
+import org.aspectj.weaver.WeaverTestCase;
 import org.aspectj.weaver.World;
 
 /**

weaver/src/test/java/org/aspectj/weaver/bcel/ZipTestCase.java

@@ -16,10 +16,10 @@ import java.io.File;
 import java.io.IOException;
 import java.util.Collection;
 
-import junit.framework.TestCase;
-
 import org.aspectj.weaver.WeaverTestCase;
 
+import junit.framework.TestCase;
+
 public class ZipTestCase extends TestCase {
 
 	File outDir;

weaver/src/test/java/org/aspectj/weaver/patterns/AnnotationPatternMatchingTestCase.java

@@ -14,18 +14,18 @@ package org.aspectj.weaver.patterns;
 import java.util.ArrayList;
 import java.util.List;
 
-import junit.framework.TestCase;
-
 import org.aspectj.bridge.AbortException;
 import org.aspectj.bridge.IMessage;
 import org.aspectj.bridge.IMessage.Kind;
 import org.aspectj.bridge.IMessageHandler;
 import org.aspectj.util.LangUtil;
-import org.aspectj.weaver.WeaverTestCase;
 import org.aspectj.weaver.ResolvedMember;
 import org.aspectj.weaver.ResolvedType;
+import org.aspectj.weaver.WeaverTestCase;
 import org.aspectj.weaver.bcel.BcelWorld;
 
+import junit.framework.TestCase;
+
 /*
  * Sample types that this program uses are:
 

weaver/src/test/java/org/aspectj/weaver/patterns/AnnotationPatternTestCase.java

@@ -9,17 +9,17 @@
  * ******************************************************************/
 package org.aspectj.weaver.patterns;
 
-import junit.framework.TestCase;
-
 import org.aspectj.bridge.AbortException;
 import org.aspectj.util.LangUtil;
 import org.aspectj.weaver.AnnotatedElement;
 import org.aspectj.weaver.AnnotationAJ;
-import org.aspectj.weaver.WeaverTestCase;
 import org.aspectj.weaver.ResolvedType;
 import org.aspectj.weaver.UnresolvedType;
+import org.aspectj.weaver.WeaverTestCase;
 import org.aspectj.weaver.bcel.BcelWorld;
 
+import junit.framework.TestCase;
+
 public class AnnotationPatternTestCase extends TestCase {
 
 	public void testParseSimpleAnnotationPattern() {

weaver/src/test/java/org/aspectj/weaver/patterns/WildTypePatternResolutionTestCase.java

@@ -15,8 +15,7 @@ import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 
-import junit.framework.TestCase;
-
+import org.aspectj.weaver.AjAttribute.WeaverVersionInfo;
 import org.aspectj.weaver.BoundedReferenceType;
 import org.aspectj.weaver.CompressingDataOutputStream;
 import org.aspectj.weaver.ResolvedType;
@@ -24,9 +23,10 @@ import org.aspectj.weaver.TypeFactory;
 import org.aspectj.weaver.UnresolvedType;
 import org.aspectj.weaver.VersionedDataInputStream;
 import org.aspectj.weaver.World;
-import org.aspectj.weaver.AjAttribute.WeaverVersionInfo;
 import org.aspectj.weaver.bcel.BcelWorld;
 
+import junit.framework.TestCase;
+
 // TODO write test cases for instanceof matching
 
 public class WildTypePatternResolutionTestCase extends TestCase {

weaver/src/test/java/org/aspectj/weaver/reflect/ReflectionBasedReferenceTypeDelegateTest.java

@@ -15,8 +15,6 @@ import java.lang.reflect.Method;
 import java.util.HashSet;
 import java.util.Set;
 
-import junit.framework.TestCase;
-
 import org.aspectj.bridge.IMessageHandler;
 import org.aspectj.weaver.ReferenceType;
 import org.aspectj.weaver.ResolvedMember;
@@ -24,6 +22,8 @@ import org.aspectj.weaver.ResolvedType;
 import org.aspectj.weaver.UnresolvedType;
 import org.aspectj.weaver.bcel.BcelWorld;
 
+import junit.framework.TestCase;
+
 public abstract class ReflectionBasedReferenceTypeDelegateTest extends TestCase {
 
 	protected ReflectionWorld world;

weaver/src/test/java/org/aspectj/weaver/tools/Java15PointcutExpressionTest.java

@@ -39,12 +39,11 @@ import org.aspectj.weaver.patterns.TypePattern;
 import org.aspectj.weaver.patterns.TypePatternList;
 import org.aspectj.weaver.patterns.WildAnnotationTypePattern;
 
-import test.A1AnnotatedType;
-import test.A2AnnotatedType;
-
 import junit.framework.Test;
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
+import test.A1AnnotatedType;
+import test.A2AnnotatedType;
 
 /**
  * Test parameter pointcut parsing.  Extended by Andy Clement to cover parameter annotation matching.

weaver/src/test/java/org/aspectj/weaver/tools/PointcutDesignatorHandlerTest.java

@@ -11,10 +11,10 @@
  * ******************************************************************/
 package org.aspectj.weaver.tools;
 
-import junit.framework.TestCase;
-
 import org.aspectj.util.LangUtil;
 
+import junit.framework.TestCase;
+
 /**
  * @author Adrian Colyer
  * 

weaver/src/test/java/org/aspectj/weaver/tools/PointcutExpressionTest.java

@@ -14,10 +14,10 @@ import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 
-import junit.framework.TestCase;
-
 import org.aspectj.util.LangUtil;
 
+import junit.framework.TestCase;
+
 public class PointcutExpressionTest extends TestCase {
 
 	PointcutParser p;

weaver/src/test/java/org/aspectj/weaver/tools/PointcutParserTest.java

@@ -13,9 +13,6 @@ import java.util.HashSet;
 import java.util.Properties;
 import java.util.Set;
 
-import junit.framework.Assert;
-import junit.framework.TestCase;
-
 import org.aspectj.bridge.AbortException;
 import org.aspectj.bridge.IMessage;
 import org.aspectj.bridge.IMessage.Kind;
@@ -25,6 +22,9 @@ import org.aspectj.weaver.patterns.PatternParser;
 import org.aspectj.weaver.patterns.Pointcut;
 import org.aspectj.weaver.patterns.PointcutRewriter;
 
+import junit.framework.Assert;
+import junit.framework.TestCase;
+
 /**
  * Test cases for the PointcutParser class
  */

weaver/src/test/java/org/aspectj/weaver/tools/ReadingAttributesTest.java

@@ -15,8 +15,6 @@ import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.IOException;
 
-import junit.framework.TestCase;
-
 import org.aspectj.apache.bcel.classfile.Attribute;
 import org.aspectj.apache.bcel.classfile.JavaClass;
 import org.aspectj.apache.bcel.classfile.Unknown;
@@ -25,6 +23,8 @@ import org.aspectj.apache.bcel.util.SyntheticRepository;
 import org.aspectj.weaver.VersionedDataInputStream;
 import org.aspectj.weaver.WeaverStateInfo;
 
+import junit.framework.TestCase;
+
 public class ReadingAttributesTest extends TestCase {
 
 	public void testSkip() {} // Review what to do about these tests

weaver/src/test/java/org/aspectj/weaver/tools/cache/AbstractCacheBackingTestSupport.java

@@ -27,12 +27,12 @@ import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 
-import junit.framework.TestCase;
-
 import org.aspectj.util.FileUtil;
 import org.aspectj.util.LangUtil;
 import org.aspectj.weaver.tools.cache.AbstractIndexedFileCacheBacking.IndexEntry;
 
+import junit.framework.TestCase;
+
 /**
  */
 public abstract class AbstractCacheBackingTestSupport extends TestCase {

weaver/src/test/java/org/aspectj/weaver/tools/cache/DefaultCacheKeyResolverTest.java

@@ -12,13 +12,13 @@
 
 package org.aspectj.weaver.tools.cache;
 
-import junit.framework.TestCase;
-
 import java.net.URL;
 import java.net.URLClassLoader;
 import java.util.Arrays;
 import java.util.Collections;
 
+import junit.framework.TestCase;
+
 /**
  */
 public class DefaultCacheKeyResolverTest extends TestCase {

weaver/src/test/java/test/A3.java

@@ -11,7 +11,8 @@
  * ******************************************************************/
 package test;
 
-import java.lang.annotation.*;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
 
 @Retention(RetentionPolicy.RUNTIME)
 public @interface A3 {