better test tidyup

18 files changed, 7 insertions, 6 deletions

diff --git a/testing/figures-coverage/bin/figures/Checks.class b/testing/figures-coverage/bin/figures/Checks.class
deleted file mode 100644
index 729d06c42..000000000
--- a/testing/figures-coverage/bin/figures/Checks.class
+++ /dev/null
diff --git a/testing/figures-coverage/bin/figures/Debug.class b/testing/figures-coverage/bin/figures/Debug.class
deleted file mode 100644
index da1dcc1f8..000000000
--- a/testing/figures-coverage/bin/figures/Debug.class
+++ /dev/null
diff --git a/testing/figures-coverage/bin/figures/Element.class b/testing/figures-coverage/bin/figures/Element.class
deleted file mode 100644
index ef4f449fa..000000000
--- a/testing/figures-coverage/bin/figures/Element.class
+++ /dev/null
diff --git a/testing/figures-coverage/bin/figures/Figure.class b/testing/figures-coverage/bin/figures/Figure.class
deleted file mode 100644
index 98685e17c..000000000
--- a/testing/figures-coverage/bin/figures/Figure.class
+++ /dev/null
diff --git a/testing/figures-coverage/bin/figures/FigureElement.class b/testing/figures-coverage/bin/figures/FigureElement.class
deleted file mode 100644
index c77045592..000000000
--- a/testing/figures-coverage/bin/figures/FigureElement.class
+++ /dev/null
diff --git a/testing/figures-coverage/bin/figures/Main$TestGUI.class b/testing/figures-coverage/bin/figures/Main$TestGUI.class
deleted file mode 100644
index 94fdfabaf..000000000
--- a/testing/figures-coverage/bin/figures/Main$TestGUI.class
+++ /dev/null
diff --git a/testing/figures-coverage/bin/figures/Main.class b/testing/figures-coverage/bin/figures/Main.class
deleted file mode 100644
index 41a9482e2..000000000
--- a/testing/figures-coverage/bin/figures/Main.class
+++ /dev/null
diff --git a/testing/figures-coverage/bin/figures/Test.class b/testing/figures-coverage/bin/figures/Test.class
deleted file mode 100644
index 04768405a..000000000
--- a/testing/figures-coverage/bin/figures/Test.class
+++ /dev/null
diff --git a/testing/figures-coverage/bin/figures/composites/BoundedLine.class b/testing/figures-coverage/bin/figures/composites/BoundedLine.class
deleted file mode 100644
index 12eda2226..000000000
--- a/testing/figures-coverage/bin/figures/composites/BoundedLine.class
+++ /dev/null
diff --git a/testing/figures-coverage/bin/figures/composites/Line.class b/testing/figures-coverage/bin/figures/composites/Line.class
deleted file mode 100644
index ceb1b35dd..000000000
--- a/testing/figures-coverage/bin/figures/composites/Line.class
+++ /dev/null
diff --git a/testing/figures-coverage/bin/figures/composites/Square.class b/testing/figures-coverage/bin/figures/composites/Square.class
deleted file mode 100644
index 9334b6836..000000000
--- a/testing/figures-coverage/bin/figures/composites/Square.class
+++ /dev/null
diff --git a/testing/figures-coverage/bin/figures/primitives/planar/BoundedPoint.class b/testing/figures-coverage/bin/figures/primitives/planar/BoundedPoint.class
deleted file mode 100644
index 6d51d46e3..000000000
--- a/testing/figures-coverage/bin/figures/primitives/planar/BoundedPoint.class
+++ /dev/null
diff --git a/testing/figures-coverage/bin/figures/primitives/planar/Point.class b/testing/figures-coverage/bin/figures/primitives/planar/Point.class
deleted file mode 100644
index c14c89149..000000000
--- a/testing/figures-coverage/bin/figures/primitives/planar/Point.class
+++ /dev/null
diff --git a/testing/figures-coverage/bin/figures/primitives/planar/PointBoundsException.class b/testing/figures-coverage/bin/figures/primitives/planar/PointBoundsException.class
deleted file mode 100644
index d62ce0f17..000000000
--- a/testing/figures-coverage/bin/figures/primitives/planar/PointBoundsException.class
+++ /dev/null
diff --git a/testing/figures-coverage/bin/figures/primitives/planar/StrictlyBoundedPoint.class b/testing/figures-coverage/bin/figures/primitives/planar/StrictlyBoundedPoint.class
deleted file mode 100644
index 9f985f6a2..000000000
--- a/testing/figures-coverage/bin/figures/primitives/planar/StrictlyBoundedPoint.class
+++ /dev/null
diff --git a/testing/figures-coverage/bin/figures/primitives/solid/SolidPoint.class b/testing/figures-coverage/bin/figures/primitives/solid/SolidPoint.class
deleted file mode 100644
index f95982af8..000000000
--- a/testing/figures-coverage/bin/figures/primitives/solid/SolidPoint.class
+++ /dev/null
diff --git a/testing/src/test/java/org/aspectj/testing/util/StructureModelUtil.java b/testing/src/test/java/org/aspectj/testing/util/StructureModelUtil.java
index 10e03dd22..cd3727e9b 100644
--- a/testing/src/test/java/org/aspectj/testing/util/StructureModelUtil.java
+++ b/testing/src/test/java/org/aspectj/testing/util/StructureModelUtil.java
@@ -144,9 +144,9 @@ public class StructureModelUtil {
 	 * @return the set of aspects with advice that affects the specified package
 	 */
 	public static Set getAspectsAffectingPackage(IProgramElement packageNode) {
-		List files = StructureModelUtil.getFilesInPackage(packageNode);
+		List<IProgramElement> files = StructureModelUtil.getFilesInPackage(packageNode);
 		Set aspects = new HashSet();
-		for (Iterator it = files.iterator(); it.hasNext();) {
+		for (Iterator<IProgramElement> it = files.iterator(); it.hasNext();) {
 			IProgramElement fileNode = (IProgramElement) it.next();
 			Map adviceMap = getLinesToAspectMap(fileNode.getSourceLocation().getSourceFile().getAbsolutePath());
 			Collection values = adviceMap.values();
@@ -243,15 +243,15 @@ public class StructureModelUtil {
 	/**
 	 * @return all of the AspectJ and Java source files in a package
 	 */
-	public static List getFilesInPackage(IProgramElement packageNode) {
-		List packageContents;
+	public static List<IProgramElement> getFilesInPackage(IProgramElement packageNode) {
+		List<IProgramElement> packageContents;
 		if (packageNode == null) {
 			return null;
 		} else {
 			packageContents = packageNode.getChildren();
 		}
-		List files = new ArrayList();
-		for (Iterator it = packageContents.iterator(); it.hasNext();) {
+		List<IProgramElement> files = new ArrayList<IProgramElement>();
+		for (Iterator<IProgramElement> it = packageContents.iterator(); it.hasNext();) {
 			IProgramElement packageItem = (IProgramElement) it.next();
 			if (packageItem.getKind() == IProgramElement.Kind.FILE_JAVA
 					|| packageItem.getKind() == IProgramElement.Kind.FILE_ASPECTJ) {
diff --git a/testing/src/test/java/org/aspectj/testing/util/StructureModelUtilTest.java b/testing/src/test/java/org/aspectj/testing/util/StructureModelUtilTest.java
index e3f91decc..366727b80 100644
--- a/testing/src/test/java/org/aspectj/testing/util/StructureModelUtilTest.java
+++ b/testing/src/test/java/org/aspectj/testing/util/StructureModelUtilTest.java
@@ -67,6 +67,7 @@ public class StructureModelUtilTest extends AjdeCoreTestCase {
 	}
 
 	protected void setUp() throws Exception {
+		super.setUp();
 		initialiseProject("figures-coverage");
 		TestCompilerConfiguration compilerConfig = (TestCompilerConfiguration) getCompiler().getCompilerConfiguration();
 		compilerConfig.setProjectSourceFiles(getSourceFileList(files));