Upgraded to new JDT compiler - neon.1 and a bit

3 files changed, 15 insertions, 20 deletions

diff --git a/build/testsrc/org/aspectj/build/BuildModuleTests.java b/build/testsrc/org/aspectj/build/BuildModuleTests.java
index bfc6b58cc..073cf0f39 100644
--- a/build/testsrc/org/aspectj/build/BuildModuleTests.java
+++ b/build/testsrc/org/aspectj/build/BuildModuleTests.java
@@ -27,7 +27,6 @@ import java.io.FileFilter;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
-import java.util.Iterator;
 import java.util.List;
 import java.util.StringTokenizer;
 
@@ -62,7 +61,7 @@ public class BuildModuleTests extends TestCase {
         return null; // use permissive default
     }
 
-    final static List SOURCE_NAMES = Collections.unmodifiableList(
+    final static List<String> SOURCE_NAMES = Collections.unmodifiableList(
             Arrays.asList(new String[]{"src", "testsrc", "java5-src", "java5-testsrc", "aspectj-src"}));
 
     /**
@@ -70,9 +69,8 @@ public class BuildModuleTests extends TestCase {
      * @return
      */
     private static File[] findSourceRoots(File moduleDir) {
-        ArrayList result = new ArrayList();
-        for (Iterator iter = SOURCE_NAMES.iterator(); iter.hasNext();) {
-            String name = (String) iter.next();
+        ArrayList<File> result = new ArrayList<>();
+        for (String name: SOURCE_NAMES) {
             File srcDir = new File(moduleDir, name);
             if (srcDir.canRead() && srcDir.isDirectory()) {
                 result.add(srcDir);
@@ -219,12 +217,12 @@ public class BuildModuleTests extends TestCase {
      */
     static class UnknownFileCheck implements FileFilter {
         private static final UnknownFileCheck SINGLETON = new UnknownFileCheck();
-        private static final ArrayList STATIC_ERRORS = new ArrayList();
+        private static final ArrayList<String> STATIC_ERRORS = new ArrayList<>();
         // Builder.BINARY_SOURCE_PATTERN and Builder.RESOURCE_PATTERN
-        public static final List KNOWN_SUFFIXES;
+        public static final List<String> KNOWN_SUFFIXES;
 
         static {
-            List suffixes = new ArrayList();
+            List<String> suffixes = new ArrayList<>();
             // sources from org.aspectj.util.FileUtil.SOURCE_SUFFIXES
             suffixes.add(".aj");
             suffixes.add(".java");
@@ -278,8 +276,7 @@ public class BuildModuleTests extends TestCase {
                 return false;
             }
             // to do not accepting uppercase suffixes...
-            for (Iterator iter = KNOWN_SUFFIXES.iterator(); iter.hasNext();) {
-                String suffix = (String) iter.next();
+            for (String suffix: KNOWN_SUFFIXES) {
                 if (name.endsWith(suffix)) {
                     return false;
                 }
@@ -287,7 +284,7 @@ public class BuildModuleTests extends TestCase {
             return true;
             
         }
-        void unknownFiles(File dir, ArrayList results) {
+        void unknownFiles(File dir, ArrayList<File> results) {
             File[] files = dir.listFiles(this);
             for (int j = 0; j < files.length; j++) {
                 File file = files[j];
diff --git a/build/testsrc/org/aspectj/internal/build/BuildModuleTest.java b/build/testsrc/org/aspectj/internal/build/BuildModuleTest.java
index d513c1b71..d0dfb55f2 100644
--- a/build/testsrc/org/aspectj/internal/build/BuildModuleTest.java
+++ b/build/testsrc/org/aspectj/internal/build/BuildModuleTest.java
@@ -80,7 +80,7 @@ public class BuildModuleTest extends TestCase {
         }
     }
         
-    ArrayList tempFiles = new ArrayList();
+    ArrayList<File> tempFiles = new ArrayList<>();
     private File jarDir;
     private boolean deleteJars;
     boolean building;  // must be enabled for tests to run
diff --git a/build/testsrc/org/aspectj/internal/build/ModulesTest.java b/build/testsrc/org/aspectj/internal/build/ModulesTest.java
index c482950c6..0478c44c2 100644
--- a/build/testsrc/org/aspectj/internal/build/ModulesTest.java
+++ b/build/testsrc/org/aspectj/internal/build/ModulesTest.java
@@ -41,7 +41,7 @@ import org.aspectj.internal.tools.build.Result.Kind;
  * 
  */
 public class ModulesTest extends TestCase {
-    public static final List /*String*/ MODULE_NAMES;
+    public static final List<String> MODULE_NAMES;
     private static final File BASE_DIR = new File("..");
     static {
         String[] names = {
@@ -49,7 +49,7 @@ public class ModulesTest extends TestCase {
         "bridge", "loadtime", "loadtime5", "org.aspectj.ajdt.core",
         "runtime", "taskdefs", "testing-client", "testing-util",
         "tests", "util", "weaver"};
-        List list = Arrays.asList(names);
+        List<String> list = Arrays.asList(names);
         MODULE_NAMES = Collections.unmodifiableList(list);
     }
 
@@ -80,7 +80,7 @@ public class ModulesTest extends TestCase {
 
 	protected void tearDown() throws Exception {
 		super.tearDown();
-        for (Iterator iter = tempFiles.iterator(); iter.hasNext();) {
+        for (Iterator<File> iter = tempFiles.iterator(); iter.hasNext();) {
 			File file = (File) iter.next();
             if (!ModulesTest.delete(file)) {
                 System.err.println("warning: ModulesTest unable to delete " + file);
@@ -101,9 +101,8 @@ public class ModulesTest extends TestCase {
     }
       
     public void testAllModulesCreation() {
-        ArrayList badModules = new ArrayList();
-        for (Iterator iter = MODULE_NAMES.iterator(); iter.hasNext();) {
-            String name = (String) iter.next();
+        ArrayList<Module> badModules = new ArrayList<>();
+        for (String name: MODULE_NAMES) {
             File dir = new File(BASE_DIR, name);
             if (dir.isDirectory()) {
                 File classpath = new File(dir, ".classpath");
@@ -118,8 +117,7 @@ public class ModulesTest extends TestCase {
         }
         if (!badModules.isEmpty()) {
             StringBuffer sb = new StringBuffer();
-            for (Iterator iter = badModules.iterator(); iter.hasNext();) {
-                Module module = (Module) iter.next();
+            for (Module module: badModules) {
                 System.err.println(module.toLongString());
                 sb.append("\n");
                 sb.append(module);