diff options
author | Andy Clement <aclement@pivotal.io> | 2017-10-20 12:40:53 -0700 |
---|---|---|
committer | Andy Clement <aclement@pivotal.io> | 2017-10-20 12:40:53 -0700 |
commit | d56414bb670df56c2d98b4b5288a7b059ebee01a (patch) | |
tree | 2b1537ea9f0f9012664a72758f9ed287c18e1124 /build | |
parent | fb97139465471e7964062a7af6721be4592237a3 (diff) | |
download | aspectj-d56414bb670df56c2d98b4b5288a7b059ebee01a.tar.gz aspectj-d56414bb670df56c2d98b4b5288a7b059ebee01a.zip |
Switched from diamond to specific types
Diffstat (limited to 'build')
3 files changed, 8 insertions, 8 deletions
diff --git a/build/testsrc/org/aspectj/build/BuildModuleTests.java b/build/testsrc/org/aspectj/build/BuildModuleTests.java index 6c2e63dc4..52510c75f 100644 --- a/build/testsrc/org/aspectj/build/BuildModuleTests.java +++ b/build/testsrc/org/aspectj/build/BuildModuleTests.java @@ -69,7 +69,7 @@ public class BuildModuleTests extends TestCase { * @return */ private static File[] findSourceRoots(File moduleDir) { - ArrayList<File> result = new ArrayList<>(); + ArrayList<File> result = new ArrayList<File>(); for (String name: SOURCE_NAMES) { File srcDir = new File(moduleDir, name); if (srcDir.canRead() && srcDir.isDirectory()) { @@ -196,7 +196,7 @@ public class BuildModuleTests extends TestCase { // separate check to verify all file types (suffixes) are known if (!"testsrc".equals(srcDir.getName())) { - ArrayList<File> unknownFiles = new ArrayList<>(); + ArrayList<File> unknownFiles = new ArrayList<File>(); UnknownFileCheck.SINGLETON.unknownFiles(srcDir, unknownFiles); if (!unknownFiles.isEmpty()) { String s = "unknown files (see readme-build-module.html to " @@ -217,12 +217,12 @@ public class BuildModuleTests extends TestCase { */ static class UnknownFileCheck implements FileFilter { private static final UnknownFileCheck SINGLETON = new UnknownFileCheck(); - private static final ArrayList<String> STATIC_ERRORS = new ArrayList<>(); + private static final ArrayList<String> STATIC_ERRORS = new ArrayList<String>(); // Builder.BINARY_SOURCE_PATTERN and Builder.RESOURCE_PATTERN public static final List<String> KNOWN_SUFFIXES; static { - List<String> suffixes = new ArrayList<>(); + List<String> suffixes = new ArrayList<String>(); // sources from org.aspectj.util.FileUtil.SOURCE_SUFFIXES suffixes.add(".aj"); suffixes.add(".java"); diff --git a/build/testsrc/org/aspectj/internal/build/BuildModuleTest.java b/build/testsrc/org/aspectj/internal/build/BuildModuleTest.java index c06e678e2..bc96bef6a 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<File> tempFiles = new ArrayList<>(); + ArrayList<File> tempFiles = new ArrayList<File>(); private File jarDir; private boolean deleteJars; boolean building; // must be enabled for tests to run @@ -343,7 +343,7 @@ public class BuildModuleTest extends TestCase { try { zipFile = new ZipFile(weaverAllJar); Enumeration e = zipFile.entries(); - ArrayList<String> entryNames = new ArrayList<>(); + ArrayList<String> entryNames = new ArrayList<String>(); while (e.hasMoreElements()) { ZipEntry entry = (ZipEntry) e.nextElement(); String name = entry.getName(); diff --git a/build/testsrc/org/aspectj/internal/build/ModulesTest.java b/build/testsrc/org/aspectj/internal/build/ModulesTest.java index 51a58142a..16786404c 100644 --- a/build/testsrc/org/aspectj/internal/build/ModulesTest.java +++ b/build/testsrc/org/aspectj/internal/build/ModulesTest.java @@ -72,7 +72,7 @@ public class ModulesTest extends TestCase { } } - ArrayList<File> tempFiles = new ArrayList<>(); + ArrayList<File> tempFiles = new ArrayList<File>(); public ModulesTest(String name) { super(name); @@ -101,7 +101,7 @@ public class ModulesTest extends TestCase { } public void testAllModulesCreation() { - ArrayList<Module> badModules = new ArrayList<>(); + ArrayList<Module> badModules = new ArrayList<Module>(); for (String name: MODULE_NAMES) { File dir = new File(BASE_DIR, name); if (dir.isDirectory()) { |