Use the diamond operator where possible

Signed-off-by: Lars Grefer <eclipse@larsgrefer.de>

14 files changed, 52 insertions, 52 deletions

diff --git a/ajde.core/src/main/java/org/aspectj/ajde/core/JavaOptions.java b/ajde.core/src/main/java/org/aspectj/ajde/core/JavaOptions.java
index 5de225339..cab96198b 100644
--- a/ajde.core/src/main/java/org/aspectj/ajde/core/JavaOptions.java
+++ b/ajde.core/src/main/java/org/aspectj/ajde/core/JavaOptions.java
@@ -68,7 +68,7 @@ public final class JavaOptions {
 	public static Map<String,String> getDefaultJavaOptions() {
 		if (defaultOptionsMap != null) return defaultOptionsMap;
 		
-		defaultOptionsMap = new HashMap<String,String>();
+		defaultOptionsMap = new HashMap<>();
 		defaultOptionsMap.put(COMPLIANCE_LEVEL, VERSION_14);
 		defaultOptionsMap.put(SOURCE_COMPATIBILITY_LEVEL, VERSION_13);
 		defaultOptionsMap.put(PRESERVE_ALL_LOCALS, OPTIMIZE);
diff --git a/ajde.core/src/main/java/org/aspectj/ajde/core/internal/AjdeCoreBuildManager.java b/ajde.core/src/main/java/org/aspectj/ajde/core/internal/AjdeCoreBuildManager.java
index b64588001..6547d101c 100644
--- a/ajde.core/src/main/java/org/aspectj/ajde/core/internal/AjdeCoreBuildManager.java
+++ b/ajde.core/src/main/java/org/aspectj/ajde/core/internal/AjdeCoreBuildManager.java
@@ -272,7 +272,7 @@ public class AjdeCoreBuildManager {
 		if (propcp != null && propcp.length() != 0) {
 			StringTokenizer st = new StringTokenizer(propcp, File.pathSeparator);
 			List<String> configClasspath = config.getClasspath();
-			ArrayList<String> toAdd = new ArrayList<String>();
+			ArrayList<String> toAdd = new ArrayList<>();
 			while (st.hasMoreTokens()) {
 				String entry = st.nextToken();
 				if (!configClasspath.contains(entry)) {
@@ -280,7 +280,7 @@ public class AjdeCoreBuildManager {
 				}
 			}
 			if (0 < toAdd.size()) {
-				ArrayList<String> both = new ArrayList<String>(configClasspath.size() + toAdd.size());
+				ArrayList<String> both = new ArrayList<>(configClasspath.size() + toAdd.size());
 				both.addAll(configClasspath);
 				both.addAll(toAdd);
 				config.setClasspath(both);
@@ -376,7 +376,7 @@ public class AjdeCoreBuildManager {
 		// Break a string into a string array of non-standard options.
 		// Allows for one option to include a ' '. i.e. assuming it has been quoted, it
 		// won't accidentally get treated as a pair of options (can be needed for xlint props file option)
-		List<String> tokens = new ArrayList<String>();
+		List<String> tokens = new ArrayList<>();
 		int ind = nonStdOptions.indexOf('\"');
 		int ind2 = nonStdOptions.indexOf('\"', ind + 1);
 		if ((ind > -1) && (ind2 > -1)) { // dont tokenize within double quotes
@@ -404,7 +404,7 @@ public class AjdeCoreBuildManager {
 
 	/** Local helper method for splitting option strings */
 	private List<String> tokenizeString(String str) {
-		List<String> tokens = new ArrayList<String>();
+		List<String> tokens = new ArrayList<>();
 		StringTokenizer tok = new StringTokenizer(str);
 		while (tok.hasMoreTokens()) {
 			tokens.add(tok.nextToken());
diff --git a/ajde.core/src/test/java/org/aspectj/ajde/core/AjdeCoreTestCase.java b/ajde.core/src/test/java/org/aspectj/ajde/core/AjdeCoreTestCase.java
index c692d6d50..2d17fc41e 100644
--- a/ajde.core/src/test/java/org/aspectj/ajde/core/AjdeCoreTestCase.java
+++ b/ajde.core/src/test/java/org/aspectj/ajde/core/AjdeCoreTestCase.java
@@ -139,7 +139,7 @@ public abstract class AjdeCoreTestCase extends TestCase {
 	}
 
 	public List<String> getSourceFileList(String[] files) {
-		List<String> sourceFiles = new ArrayList<String>();
+		List<String> sourceFiles = new ArrayList<>();
 		for (String file : files) {
 			sourceFiles.add(getAbsoluteProjectDir() + File.separator + file);
 		}
diff --git a/ajde.core/src/test/java/org/aspectj/ajde/core/TestBuildProgressMonitor.java b/ajde.core/src/test/java/org/aspectj/ajde/core/TestBuildProgressMonitor.java
index e214faeae..f732d2acb 100644
--- a/ajde.core/src/test/java/org/aspectj/ajde/core/TestBuildProgressMonitor.java
+++ b/ajde.core/src/test/java/org/aspectj/ajde/core/TestBuildProgressMonitor.java
@@ -28,7 +28,7 @@ public class TestBuildProgressMonitor implements IBuildProgressMonitor {
     
 	private String programmableString;
 	private int count;
-	private List<String> messagesReceived = new ArrayList<String>();
+	private List<String> messagesReceived = new ArrayList<>();
 	private int currentVal;
 	private boolean isCancelRequested = false;
 		
diff --git a/ajde.core/src/test/java/org/aspectj/ajde/core/TestCompilerConfiguration.java b/ajde.core/src/test/java/org/aspectj/ajde/core/TestCompilerConfiguration.java
index e8432c8cf..d2081df15 100644
--- a/ajde.core/src/test/java/org/aspectj/ajde/core/TestCompilerConfiguration.java
+++ b/ajde.core/src/test/java/org/aspectj/ajde/core/TestCompilerConfiguration.java
@@ -39,7 +39,7 @@ public class TestCompilerConfiguration implements ICompilerConfiguration {
 	private String outjar;
 	private Map<String, String> javaOptions;
 	private String nonStandardOptions;
-	private List<String> projectSourceFiles = new ArrayList<String>();
+	private List<String> projectSourceFiles = new ArrayList<>();
 	private Map<String, File> sourcePathResources;
 
 	private String srcDirName = "src";
@@ -76,7 +76,7 @@ public class TestCompilerConfiguration implements ICompilerConfiguration {
 
 	public Map<String, String> getJavaOptionsMap() {
 		if (javaOptions == null) {
-			javaOptions = new Hashtable<String, String>();
+			javaOptions = new Hashtable<>();
 			javaOptions.put(JavaOptions.COMPLIANCE_LEVEL, JavaOptions.VERSION_13);
 			javaOptions.put(JavaOptions.SOURCE_COMPATIBILITY_LEVEL, JavaOptions.VERSION_13);
 		}
@@ -111,7 +111,7 @@ public class TestCompilerConfiguration implements ICompilerConfiguration {
 
 	public Map<String, File> getSourcePathResources() {
 		if (sourcePathResources == null) {
-			sourcePathResources = new HashMap<String, File>();
+			sourcePathResources = new HashMap<>();
 
 			/* Allow the user to override the testProjectPath by using sourceRoots */
 			File[] srcBase = new File[] { new File(projectPath + File.separator + srcDirName) };
diff --git a/ajde.core/src/test/java/org/aspectj/ajde/core/TestMessageHandler.java b/ajde.core/src/test/java/org/aspectj/ajde/core/TestMessageHandler.java
index 6cc8b8a8d..662971cfe 100644
--- a/ajde.core/src/test/java/org/aspectj/ajde/core/TestMessageHandler.java
+++ b/ajde.core/src/test/java/org/aspectj/ajde/core/TestMessageHandler.java
@@ -29,9 +29,9 @@ public class TestMessageHandler implements IBuildMessageHandler {
 	private List<TestMessage> errors;
 
 	public TestMessageHandler() {
-		ignoring = new ArrayList<Kind>();
-		messages = new ArrayList<TestMessage>();
-		errors = new ArrayList<TestMessage>();
+		ignoring = new ArrayList<>();
+		messages = new ArrayList<>();
+		errors = new ArrayList<>();
 		ignore(IMessage.INFO);
 		ignore(IMessage.WEAVEINFO);
 	}
diff --git a/ajde.core/src/test/java/org/aspectj/ajde/core/TestOutputLocationManager.java b/ajde.core/src/test/java/org/aspectj/ajde/core/TestOutputLocationManager.java
index 4249d2d56..6313dd4a2 100644
--- a/ajde.core/src/test/java/org/aspectj/ajde/core/TestOutputLocationManager.java
+++ b/ajde.core/src/test/java/org/aspectj/ajde/core/TestOutputLocationManager.java
@@ -67,7 +67,7 @@ public class TestOutputLocationManager implements IOutputLocationManager {
 	@Override
 	public List<File> getAllOutputLocations() {
 		if (allOutputLocations == null) {
-			allOutputLocations = new ArrayList<File>();
+			allOutputLocations = new ArrayList<>();
 			initLocations();
 			allOutputLocations.add(classOutputLoc);
 			if (!classOutputLoc.equals(resourceOutputLoc)) {
diff --git a/ajde.core/src/test/java/org/aspectj/ajde/core/tests/AjConfigTest.java b/ajde.core/src/test/java/org/aspectj/ajde/core/tests/AjConfigTest.java
index 15d2ff696..b32ea2623 100644
--- a/ajde.core/src/test/java/org/aspectj/ajde/core/tests/AjConfigTest.java
+++ b/ajde.core/src/test/java/org/aspectj/ajde/core/tests/AjConfigTest.java
@@ -60,7 +60,7 @@ public class AjConfigTest extends AjdeCoreTestCase {
 	}
 
 	public void testAspectPath() {
-		Set<File> aspects = new HashSet<File>();
+		Set<File> aspects = new HashSet<>();
 		compilerConfig.setAspectPath(aspects);
 		AjBuildConfig buildConfig = genAjBuildConfig();
 		List<File> aPath = buildConfig.getAspectpath();
@@ -83,7 +83,7 @@ public class AjConfigTest extends AjdeCoreTestCase {
 	}
 
 	public void testInpath() {
-		Set<File> jars = new HashSet<File>();
+		Set<File> jars = new HashSet<>();
 		compilerConfig.setInpath(jars);
 		AjBuildConfig buildConfig = genAjBuildConfig();
 		List<File> inJars = buildConfig.getInpath();
@@ -130,7 +130,7 @@ public class AjConfigTest extends AjdeCoreTestCase {
 	}
 
 	public void testSourcePathResources() {
-		Map<String, File> m = new HashMap<String, File>();
+		Map<String, File> m = new HashMap<>();
 		m.put("newFile.txt", getWorkingDir());
 		compilerConfig.setSourcePathResources(m);
 		AjBuildConfig buildConfig = genAjBuildConfig();
diff --git a/ajde.core/src/test/java/org/aspectj/ajde/core/tests/DuplicateManifestTest.java b/ajde.core/src/test/java/org/aspectj/ajde/core/tests/DuplicateManifestTest.java
index b7c2a9251..c438715b7 100644
--- a/ajde.core/src/test/java/org/aspectj/ajde/core/tests/DuplicateManifestTest.java
+++ b/ajde.core/src/test/java/org/aspectj/ajde/core/tests/DuplicateManifestTest.java
@@ -46,10 +46,10 @@ public class DuplicateManifestTest extends AjdeCoreTestCase {
 	}
 
 	public void testWeave() {
-		Set<File> injars = new HashSet<File>();
+		Set<File> injars = new HashSet<>();
 		injars.add(openFile(injarName));
 		compilerConfig.setInpath(injars);
-		Set<File> aspectpath = new HashSet<File>();
+		Set<File> aspectpath = new HashSet<>();
 		aspectpath.add(openFile(aspectjarName));
 		compilerConfig.setAspectPath(aspectpath);
 		File outjar = openFile(outjarName);
diff --git a/ajde.core/src/test/java/org/aspectj/ajde/core/tests/InpathTest.java b/ajde.core/src/test/java/org/aspectj/ajde/core/tests/InpathTest.java
index 2d1b3fd7c..ee54cef96 100644
--- a/ajde.core/src/test/java/org/aspectj/ajde/core/tests/InpathTest.java
+++ b/ajde.core/src/test/java/org/aspectj/ajde/core/tests/InpathTest.java
@@ -71,7 +71,7 @@ public class InpathTest extends AjdeCoreTestCase {
 	 * Expected result = output jar file contains contents of indir1 and class file for source that was in src
 	 */
 	public void testInpathToOutjar() {
-		Set<File> inpath = new HashSet<File>();
+		Set<File> inpath = new HashSet<>();
 		File indir1 = openFile(indir1Name);
 		inpath.add(indir1);
 		compilerConfig.setInpath(inpath);
@@ -83,7 +83,7 @@ public class InpathTest extends AjdeCoreTestCase {
 		doBuild(true);
 		assertTrue("Expected no compiler errors or warnings but found " + handler.getMessages(), handler.getMessages().isEmpty());
 
-		Set<String> expectedOutputJarContents = new HashSet<String>();
+		Set<String> expectedOutputJarContents = new HashSet<>();
 		// From indir1
 		// If we don't copy resources, these next three files won't make it.
 		// expectedOutputJarContents.add("META-INF/MANIFEST.MF");
@@ -100,7 +100,7 @@ public class InpathTest extends AjdeCoreTestCase {
 	 * 
 	 */
 	public void testInpathToBin() {
-		Set<File> inpath = new HashSet<File>();
+		Set<File> inpath = new HashSet<>();
 		File indir1 = openFile(indir1Name);
 		inpath.add(indir1);
 		compilerConfig.setInpath(inpath);
@@ -109,7 +109,7 @@ public class InpathTest extends AjdeCoreTestCase {
 		doBuild(true);
 		assertTrue("Expected no compiler errors or warnings but found " + handler.getMessages(), handler.getMessages().isEmpty());
 
-		Set<String> expectedBindirContents = new HashSet<String>();
+		Set<String> expectedBindirContents = new HashSet<>();
 		// From indir1
 		// If we don't copy resources, these next three files won't make it
 		// expectedBindirContents.add("META-INF/MANIFEST.MF");
@@ -133,7 +133,7 @@ public class InpathTest extends AjdeCoreTestCase {
 	 * An extra check is done at the end of this test to verify that HelloWorld has changed size (due to the weaving).
 	 */
 	public void testInpathToOutjar2() {
-		Set<File> inpath = new HashSet<File>();
+		Set<File> inpath = new HashSet<>();
 		File indir2 = openFile(indir2Name);
 		inpath.add(indir2);
 		compilerConfig.setInpath(inpath);
@@ -145,7 +145,7 @@ public class InpathTest extends AjdeCoreTestCase {
 		doBuild(true);
 		assertTrue("Expected no compiler errors or warnings but found " + handler.getMessages(), handler.getMessages().isEmpty());
 
-		Set<String> expectedOutputJarContents = new HashSet<String>();
+		Set<String> expectedOutputJarContents = new HashSet<>();
 		// From indir1
 		expectedOutputJarContents.add("example/HelloWorld.class");
 
@@ -181,7 +181,7 @@ public class InpathTest extends AjdeCoreTestCase {
 	 * 
 	 */
 	public void testInpathAndInjarToBin() {
-		Set<File> inpath = new HashSet<File>();
+		Set<File> inpath = new HashSet<>();
 		File indir2 = openFile(indir2Name);
 		inpath.add(indir2);
 		inpath.add(openFile(injarName));
@@ -191,7 +191,7 @@ public class InpathTest extends AjdeCoreTestCase {
 		doBuild(true);
 		assertTrue("Expected no compiler errors or warnings but found " + handler.getMessages(), handler.getMessages().isEmpty());
 
-		Set<String> expectedBindirContents = new HashSet<String>();
+		Set<String> expectedBindirContents = new HashSet<>();
 
 		// From indir1
 		expectedBindirContents.add("example/HelloWorld.class");
diff --git a/ajde.core/src/test/java/org/aspectj/ajde/core/tests/OutxmlTest.java b/ajde.core/src/test/java/org/aspectj/ajde/core/tests/OutxmlTest.java
index 7cf08b1c7..6434629bf 100644
--- a/ajde.core/src/test/java/org/aspectj/ajde/core/tests/OutxmlTest.java
+++ b/ajde.core/src/test/java/org/aspectj/ajde/core/tests/OutxmlTest.java
@@ -112,7 +112,7 @@ public class OutxmlTest extends AjdeCoreTestCase {
 	 */
 	public void testOutxmlToOutjarWithAop_xml () {
 		File f = new File( getAbsoluteProjectDir() + File.separator + "src-resources" + File.separator + "testjar.jar");
-		Set<File> roots = new HashSet<File>();
+		Set<File> roots = new HashSet<>();
 		roots.add(f);
 		compilerConfig.setInpath(roots);
 		
diff --git a/ajde.core/src/test/java/org/aspectj/ajde/core/tests/ResourceCopyTest.java b/ajde.core/src/test/java/org/aspectj/ajde/core/tests/ResourceCopyTest.java
index 889e2e5ce..3176f1e31 100644
--- a/ajde.core/src/test/java/org/aspectj/ajde/core/tests/ResourceCopyTest.java
+++ b/ajde.core/src/test/java/org/aspectj/ajde/core/tests/ResourceCopyTest.java
@@ -68,7 +68,7 @@ public class ResourceCopyTest extends AjdeCoreTestCase {
 	}
 
 	public void testInjarsToOutjar() {
-		Set<File> injars = new HashSet<File>();
+		Set<File> injars = new HashSet<>();
 		File injar1 = openFile(injar1Name);
 		injars.add(injar1);
 		compilerConfig.setInpath(injars);
@@ -81,7 +81,7 @@ public class ResourceCopyTest extends AjdeCoreTestCase {
 	}
 
 	public void testDuplicateResources() {
-		Set<File> injars = new HashSet<File>();
+		Set<File> injars = new HashSet<>();
 		File injar1 = openFile(injar1Name);
 		File injar2 = openFile(injar2Name);
 		injars.add(injar1);
@@ -110,7 +110,7 @@ public class ResourceCopyTest extends AjdeCoreTestCase {
 	}
 
 	public void testInjarsToBin() {
-		Set<File> injars = new HashSet<File>();
+		Set<File> injars = new HashSet<>();
 		File injar1 = openFile(injar1Name);
 		injars.add(injar1);
 		compilerConfig.setInpath(injars);
@@ -133,7 +133,7 @@ public class ResourceCopyTest extends AjdeCoreTestCase {
 	// }
 
 	public void testInjarsToOutjarOddNames() {
-		Set<File> injars = new HashSet<File>();
+		Set<File> injars = new HashSet<>();
 		File injar1 = openFile("input1");
 		File outjar = openFile(outjarName + ".fozout");
 		injars.add(injar1);
diff --git a/ajde.core/src/test/java/org/aspectj/ajde/core/tests/ReweavableTest.java b/ajde.core/src/test/java/org/aspectj/ajde/core/tests/ReweavableTest.java
index 24723b253..c29f4ba21 100644
--- a/ajde.core/src/test/java/org/aspectj/ajde/core/tests/ReweavableTest.java
+++ b/ajde.core/src/test/java/org/aspectj/ajde/core/tests/ReweavableTest.java
@@ -324,7 +324,7 @@ public class ReweavableTest extends AjdeCoreTestCase {
 		Set<File> paths = new HashSet<>();
 		paths.add(openFile(binDir));
 		compilerConfig.setInpath(paths);
-		compilerConfig.setProjectSourceFiles(new ArrayList<String>());
+		compilerConfig.setProjectSourceFiles(new ArrayList<>());
 		doBuild(true);
 
 		String expMessage = "aspect tjp.GetInfo cannot be found when reweaving tjp.Demo";
@@ -356,7 +356,7 @@ public class ReweavableTest extends AjdeCoreTestCase {
 		Set<File> paths = new HashSet<>();
 		paths.add(openFile(binDir));
 		compilerConfig.setInpath(paths);
-		compilerConfig.setProjectSourceFiles(new ArrayList<String>());
+		compilerConfig.setProjectSourceFiles(new ArrayList<>());
 		doBuild(true);
 
 		String expMessage = "successfully verified type tjp.GetInfo exists";
diff --git a/ajde.core/src/test/java/org/aspectj/ajde/core/tests/ShowWeaveMessagesTest.java b/ajde.core/src/test/java/org/aspectj/ajde/core/tests/ShowWeaveMessagesTest.java
index bc4263f4e..4e5a87882 100644
--- a/ajde.core/src/test/java/org/aspectj/ajde/core/tests/ShowWeaveMessagesTest.java
+++ b/ajde.core/src/test/java/org/aspectj/ajde/core/tests/ShowWeaveMessagesTest.java
@@ -202,10 +202,10 @@ public class ShowWeaveMessagesTest extends AjdeCoreTestCase {
 	public void testWeaveMessagesBinaryAdvice() {
 		if (debugTests)
 			System.out.println("\ntestWeaveMessagesBinaryAdvice: Simple.jar + AspectAdvice.jar");
-		Set<File> inpath = new HashSet<File>();
+		Set<File> inpath = new HashSet<>();
 		inpath.add(openFile("Simple.jar"));
 		compilerConfig.setInpath(inpath);
-		Set<File> aspectpath = new HashSet<File>();
+		Set<File> aspectpath = new HashSet<>();
 		aspectpath.add(openFile("AspectAdvice.jar"));
 		compilerConfig.setAspectPath(aspectpath);
 		doBuild();
@@ -216,10 +216,10 @@ public class ShowWeaveMessagesTest extends AjdeCoreTestCase {
 	public void testWeaveMessagesBinaryITD() {
 		if (debugTests)
 			System.out.println("\ntestWeaveMessagesBinaryITD: Simple.jar + AspectITD.jar");
-		Set<File> inpath = new HashSet<File>();
+		Set<File> inpath = new HashSet<>();
 		inpath.add(openFile("Simple.jar"));
 		compilerConfig.setInpath(inpath);
-		Set<File> aspectpath = new HashSet<File>();
+		Set<File> aspectpath = new HashSet<>();
 		aspectpath.add(openFile("AspectITD.jar"));
 		compilerConfig.setAspectPath(aspectpath);
 		doBuild();
@@ -230,10 +230,10 @@ public class ShowWeaveMessagesTest extends AjdeCoreTestCase {
 	public void testWeaveMessagesBinaryDeclare() {
 		if (debugTests)
 			System.out.println("\ntestWeaveMessagesBinaryDeclare: Simple.jar + AspectDeclare.jar");
-		Set<File> inpath = new HashSet<File>();
+		Set<File> inpath = new HashSet<>();
 		inpath.add(openFile("Simple.jar"));
 		compilerConfig.setInpath(inpath);
-		Set<File> aspectpath = new HashSet<File>();
+		Set<File> aspectpath = new HashSet<>();
 		aspectpath.add(openFile("AspectDeclare.jar"));
 		compilerConfig.setAspectPath(aspectpath);
 		doBuild();
@@ -247,10 +247,10 @@ public class ShowWeaveMessagesTest extends AjdeCoreTestCase {
 	public void testWeaveMessagesBinaryDeclareSoft() {
 		if (debugTests)
 			System.out.println("\ntestWeaveMessagesBinaryDeclareSoft: Simple.jar + AspectDeclareSoft.jar");
-		Set<File> inpath = new HashSet<File>();
+		Set<File> inpath = new HashSet<>();
 		inpath.add(openFile("Simple.jar"));
 		compilerConfig.setInpath(inpath);
-		Set<File> aspectpath = new HashSet<File>();
+		Set<File> aspectpath = new HashSet<>();
 		aspectpath.add(openFile("AspectDeclareSoft.jar"));
 		compilerConfig.setAspectPath(aspectpath);
 		doBuild();
@@ -261,10 +261,10 @@ public class ShowWeaveMessagesTest extends AjdeCoreTestCase {
 	public void testWeaveMessagesBinaryAdviceInPackageFromJar() {
 		if (debugTests)
 			System.out.println("\ntestWeaveMessagesBinaryAdviceInPackageFromJar: Simple.jar + AspectInPackage.jar");
-		Set<File> inpath = new HashSet<File>();
+		Set<File> inpath = new HashSet<>();
 		inpath.add(openFile("Simple.jar"));
 		compilerConfig.setInpath(inpath);
-		Set<File> aspectpath = new HashSet<File>();
+		Set<File> aspectpath = new HashSet<>();
 		aspectpath.add(openFile("AspectInPackage.jar"));
 		compilerConfig.setAspectPath(aspectpath);
 		doBuild();
@@ -275,10 +275,10 @@ public class ShowWeaveMessagesTest extends AjdeCoreTestCase {
 	public void testWeaveMessagesBinaryAdviceInPackage() {
 		if (debugTests)
 			System.out.println("\ntestWeaveMessagesBinaryAdviceInPackage: Simple.jar + AspectInPackage.jar");
-		Set<File> inpath = new HashSet<File>();
+		Set<File> inpath = new HashSet<>();
 		inpath.add(openFile("Simple.jar"));
 		compilerConfig.setInpath(inpath);
-		Set<File> aspectpath = new HashSet<File>();
+		Set<File> aspectpath = new HashSet<>();
 		aspectpath.add(openFile("pkg"));
 		compilerConfig.setAspectPath(aspectpath);
 		doBuild();
@@ -291,10 +291,10 @@ public class ShowWeaveMessagesTest extends AjdeCoreTestCase {
 	public void testWeaveMessagesBinaryAdviceNoDebugInfo() {
 		if (debugTests)
 			System.out.println("\ntestWeaveMessagesBinaryAdvice: Simple.jar + AspectAdvice.jar");
-		Set<File> inpath = new HashSet<File>();
+		Set<File> inpath = new HashSet<>();
 		inpath.add(openFile("Simple_nodebug.jar"));
 		compilerConfig.setInpath(inpath);
-		Set<File> aspectpath = new HashSet<File>();
+		Set<File> aspectpath = new HashSet<>();
 		aspectpath.add(openFile("AspectAdvice_nodebug.jar"));
 		compilerConfig.setAspectPath(aspectpath);
 		doBuild();
@@ -319,10 +319,10 @@ public class ShowWeaveMessagesTest extends AjdeCoreTestCase {
 	public void testWeaveMessagesBinaryDeclareNoDebugInfo() {
 		if (debugTests)
 			System.out.println("\ntestWeaveMessagesBinaryDeclareNoDebugInfo: Simple.jar + AspectDeclare.jar");
-		Set<File> inpath = new HashSet<File>();
+		Set<File> inpath = new HashSet<>();
 		inpath.add(openFile("Simple_nodebug.jar"));
 		compilerConfig.setInpath(inpath);
-		Set<File> aspectpath = new HashSet<File>();
+		Set<File> aspectpath = new HashSet<>();
 		aspectpath.add(openFile("AspectDeclare_nodebug.jar"));
 		compilerConfig.setAspectPath(aspectpath);
 		doBuild();
@@ -336,10 +336,10 @@ public class ShowWeaveMessagesTest extends AjdeCoreTestCase {
 	public void testWeaveMessagesBinaryDeclareSoftNoDebugInfo() {
 		if (debugTests)
 			System.out.println("\ntestWeaveMessagesBinaryDeclareSoftNoDebugInfo: Simple.jar + AspectDeclareSoft.jar");
-		Set<File> inpath = new HashSet<File>();
+		Set<File> inpath = new HashSet<>();
 		inpath.add(openFile("Simple_nodebug.jar"));
 		compilerConfig.setInpath(inpath);
-		Set<File> aspectpath = new HashSet<File>();
+		Set<File> aspectpath = new HashSet<>();
 		aspectpath.add(openFile("AspectDeclareSoft_nodebug.jar"));
 		compilerConfig.setAspectPath(aspectpath);
 		doBuild();