better test tidyup

diff --git a/testing/figures-coverage/bin/figures/Checks.class b/testing/figures-coverage/bin/figures/Checks.class
deleted file mode 100644 (file)
index 729d06c..0000000
Binary files a/testing/figures-coverage/bin/figures/Checks.class and /dev/null differ

diff --git a/testing/figures-coverage/bin/figures/Debug.class b/testing/figures-coverage/bin/figures/Debug.class
deleted file mode 100644 (file)
index da1dcc1..0000000
Binary files a/testing/figures-coverage/bin/figures/Debug.class and /dev/null differ

diff --git a/testing/figures-coverage/bin/figures/Element.class b/testing/figures-coverage/bin/figures/Element.class
deleted file mode 100644 (file)
index ef4f449..0000000
Binary files a/testing/figures-coverage/bin/figures/Element.class and /dev/null differ

diff --git a/testing/figures-coverage/bin/figures/Figure.class b/testing/figures-coverage/bin/figures/Figure.class
deleted file mode 100644 (file)
index 98685e1..0000000
Binary files a/testing/figures-coverage/bin/figures/Figure.class and /dev/null differ

diff --git a/testing/figures-coverage/bin/figures/FigureElement.class b/testing/figures-coverage/bin/figures/FigureElement.class
deleted file mode 100644 (file)
index c770455..0000000
Binary files a/testing/figures-coverage/bin/figures/FigureElement.class and /dev/null differ

diff --git a/testing/figures-coverage/bin/figures/Main$TestGUI.class b/testing/figures-coverage/bin/figures/Main$TestGUI.class
deleted file mode 100644 (file)
index 94fdfab..0000000
Binary files a/testing/figures-coverage/bin/figures/Main$TestGUI.class and /dev/null differ

diff --git a/testing/figures-coverage/bin/figures/Main.class b/testing/figures-coverage/bin/figures/Main.class
deleted file mode 100644 (file)
index 41a9482..0000000
Binary files a/testing/figures-coverage/bin/figures/Main.class and /dev/null differ

diff --git a/testing/figures-coverage/bin/figures/Test.class b/testing/figures-coverage/bin/figures/Test.class
deleted file mode 100644 (file)
index 0476840..0000000
Binary files a/testing/figures-coverage/bin/figures/Test.class and /dev/null differ

diff --git a/testing/figures-coverage/bin/figures/composites/BoundedLine.class b/testing/figures-coverage/bin/figures/composites/BoundedLine.class
deleted file mode 100644 (file)
index 12eda22..0000000
Binary files a/testing/figures-coverage/bin/figures/composites/BoundedLine.class and /dev/null differ

diff --git a/testing/figures-coverage/bin/figures/composites/Line.class b/testing/figures-coverage/bin/figures/composites/Line.class
deleted file mode 100644 (file)
index ceb1b35..0000000
Binary files a/testing/figures-coverage/bin/figures/composites/Line.class and /dev/null differ

diff --git a/testing/figures-coverage/bin/figures/composites/Square.class b/testing/figures-coverage/bin/figures/composites/Square.class
deleted file mode 100644 (file)
index 9334b68..0000000
Binary files a/testing/figures-coverage/bin/figures/composites/Square.class and /dev/null differ

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 (file)
index 6d51d46..0000000
Binary files a/testing/figures-coverage/bin/figures/primitives/planar/BoundedPoint.class and /dev/null differ

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 (file)
index c14c891..0000000
Binary files a/testing/figures-coverage/bin/figures/primitives/planar/Point.class and /dev/null differ

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 (file)
index d62ce0f..0000000
Binary files a/testing/figures-coverage/bin/figures/primitives/planar/PointBoundsException.class and /dev/null differ

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 (file)
index 9f985f6..0000000
Binary files a/testing/figures-coverage/bin/figures/primitives/planar/StrictlyBoundedPoint.class and /dev/null differ

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 (file)
index f95982a..0000000
Binary files a/testing/figures-coverage/bin/figures/primitives/solid/SolidPoint.class and /dev/null differ

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 10e03dd225b45f3d3a7b3c9e3f24a22ebe65bf8a..cd3727e9b96989cd38a6584320625f0e154b183f 100644 (file)
--- 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 e3f91decc6f58ecda501a4cf7edee570951dc453..366727b8042cf81db7c18d751b0a13dc0f3d1281 100644 (file)
--- 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));