Upgrade license from CPLv1/EPLv1 to EPLv2

This was required by the Eclipse team as one precondition for the next
release.

Signed-off-by: Alexander Kriegisch <Alexander@Kriegisch.name>

18 files changed, 182 insertions, 182 deletions

diff --git a/ajde/src/test/java/org/aspectj/ajde/AjdeCompilerTest.java b/ajde/src/test/java/org/aspectj/ajde/AjdeCompilerTest.java
index 1e3605db2..1f91e680d 100644
--- a/ajde/src/test/java/org/aspectj/ajde/AjdeCompilerTest.java
+++ b/ajde/src/test/java/org/aspectj/ajde/AjdeCompilerTest.java
@@ -1,11 +1,11 @@
 /********************************************************************
- * Copyright (c) 2007 Contributors. All rights reserved. 
- * This program and the accompanying materials are made available 
- * under the terms of the Eclipse Public License v1.0 
- * which accompanies this distribution and is available at 
- * http://eclipse.org/legal/epl-v10.html 
- *  
- * Contributors: IBM Corporation - initial API and implementation 
+ * Copyright (c) 2007 Contributors. All rights reserved.
+ * This program and the accompanying materials are made available
+ * under the terms of the Eclipse Public License v 2.0
+ * which accompanies this distribution and is available at
+ * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt
+ *
+ * Contributors: IBM Corporation - initial API and implementation
  * 				 Helen Hawkins   - initial version (bug 148190)
  *******************************************************************/
 package org.aspectj.ajde;
@@ -18,12 +18,12 @@ import org.aspectj.ajde.core.AjCompiler;
  * to only remember the compiler for the last .lst file.
  */
 public class AjdeCompilerTest extends AjdeTestCase {
-	
+
 	protected void setUp() throws Exception {
 		super.setUp();
 		initialiseProject("LstBuildConfigManagerTest");
 	}
-	
+
 	// Expect to get a different compiler instance for each
 	// different config file
 	public void testGetSameAjCompilerForSameConfigFiles() {
@@ -32,7 +32,7 @@ public class AjdeCompilerTest extends AjdeTestCase {
 		assertEquals("expected the same AjCompiler instance to be returned" +
 				" for the same configFile but found different ones", c1, c2);
 	}
-	
+
 	// Expect to get a different compiler instance for each
 	// different config file
 	public void testGetDifferentAjCompilerForDifferentConfigFiles() {
@@ -41,36 +41,36 @@ public class AjdeCompilerTest extends AjdeTestCase {
 		assertNotSame("expected different AjCompiler instances to be returned" +
 				" for different configFiles but found the smae", c1, c2);
 	}
-	
+
 	// want to keep the same setting regardless of the configFile
 	// being built - therefore the same instance should be passed
 	// from one AjCompiler instance to the next
-	public void testSameCompilerConfigForDifferentConfigFiles() { 
+	public void testSameCompilerConfigForDifferentConfigFiles() {
 		AjCompiler c1 = getCompilerForConfigFileWithName("bad-injar.lst");
 		AjCompiler c2 = getCompilerForConfigFileWithName("dir-entry.lst");
 		assertEquals("expected the same compilerConfig instance to be associated" +
-				" with the different AjCompiler's however found different ones", 
+				" with the different AjCompiler's however found different ones",
 				c1.getCompilerConfiguration(), c2.getCompilerConfiguration());
 	}
-	
+
 	// want to have a different messageHandler instance for the different
 	// config files - or we can just reset?!?! Resetting would be easier
 	public void testSameMessageHandlerForDifferentConfigFiles() {
 		AjCompiler c1 = getCompilerForConfigFileWithName("bad-injar.lst");
 		AjCompiler c2 = getCompilerForConfigFileWithName("dir-entry.lst");
 		assertEquals("expected the same messageHandler instance to be associated" +
-				" with the different AjCompiler's however found different ones", 
+				" with the different AjCompiler's however found different ones",
 				c1.getMessageHandler(), c2.getMessageHandler());
 	}
-	
+
 	// can have the same buildProgressMonitor for the different configFiles
 	// because it holds no state
 	public void testSameBuildProgressMonitorForDifferentConfigFiles() {
 		AjCompiler c1 = getCompilerForConfigFileWithName("bad-injar.lst");
 		AjCompiler c2 = getCompilerForConfigFileWithName("dir-entry.lst");
 		assertEquals("expected the same buildProgressMonitor instance to be associated" +
-				" with the different AjCompiler's however found different ones", 
+				" with the different AjCompiler's however found different ones",
 				c1.getBuildProgressMonitor(), c2.getBuildProgressMonitor());
 	}
-	
+
 }
diff --git a/ajde/src/test/java/org/aspectj/ajde/AjdeModuleTests.java b/ajde/src/test/java/org/aspectj/ajde/AjdeModuleTests.java
index 354c00d32..09753ad84 100644
--- a/ajde/src/test/java/org/aspectj/ajde/AjdeModuleTests.java
+++ b/ajde/src/test/java/org/aspectj/ajde/AjdeModuleTests.java
@@ -1,14 +1,14 @@
 /* *******************************************************************
- * Copyright (c) 1999-2001 Xerox Corporation, 
+ * Copyright (c) 1999-2001 Xerox Corporation,
  *               2002 Palo Alto Research Center, Incorporated (PARC).
- * All rights reserved. 
- * This program and the accompanying materials are made available 
- * under the terms of the Eclipse Public License v1.0 
- * which accompanies this distribution and is available at 
- * http://www.eclipse.org/legal/epl-v10.html 
- *  
- * Contributors: 
- *     Xerox/PARC     initial implementation 
+ * All rights reserved.
+ * This program and the accompanying materials are made available
+ * under the terms of the Eclipse Public License v 2.0
+ * which accompanies this distribution and is available at
+ * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt
+ *
+ * Contributors:
+ *     Xerox/PARC     initial implementation
  * ******************************************************************/
 package org.aspectj.ajde;
 
@@ -22,18 +22,18 @@ import junit.framework.TestSuite;
 
 public class AjdeModuleTests extends TestCase {
 
-    public static TestSuite suite() { 
+    public static TestSuite suite() {
         TestSuite suite = new TestSuite(AjdeModuleTests.class.getName());
         suite.addTestSuite(SymbolFileGenerationTest.class);
 		suite.addTestSuite(ExtensionTest.class);
-		suite.addTestSuite(AspectJBuildManagerTest.class); 
+		suite.addTestSuite(AspectJBuildManagerTest.class);
         suite.addTestSuite(LstBuildConfigManagerTest.class);
-        suite.addTestSuite(StructureSearchManagerTest.class); 
-        suite.addTestSuite(StructureViewManagerTest.class); 
+        suite.addTestSuite(StructureSearchManagerTest.class);
+        suite.addTestSuite(StructureViewManagerTest.class);
         suite.addTestSuite(AjdeCompilerTest.class);
         return suite;
     }
 
     public AjdeModuleTests(String name) { super(name); }
 
-}  
+}
diff --git a/ajde/src/test/java/org/aspectj/ajde/AjdeTestCase.java b/ajde/src/test/java/org/aspectj/ajde/AjdeTestCase.java
index f1d979181..66ba851e5 100644
--- a/ajde/src/test/java/org/aspectj/ajde/AjdeTestCase.java
+++ b/ajde/src/test/java/org/aspectj/ajde/AjdeTestCase.java
@@ -1,12 +1,12 @@
 /********************************************************************
  * Copyright (c) 2002 Palo Alto Research Center, Incorporated (PARC).
- * All rights reserved. 
- * This program and the accompanying materials are made available 
- * under the terms of the Eclipse Public License v1.0 
- * which accompanies this distribution and is available at 
- * http://eclipse.org/legal/epl-v10.html 
- *  
- * Contributors: 
+ * All rights reserved.
+ * This program and the accompanying materials are made available
+ * under the terms of the Eclipse Public License v 2.0
+ * which accompanies this distribution and is available at
+ * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt
+ *
+ * Contributors:
  *      Xerox/PARC     initial implementation
  * 		Helen Hawkins  Converted to new interface (bug 148190) and
  *                     to use a sandbox directory
diff --git a/ajde/src/test/java/org/aspectj/ajde/ExtensionTest.java b/ajde/src/test/java/org/aspectj/ajde/ExtensionTest.java
index 384d417f7..450bf0036 100644
--- a/ajde/src/test/java/org/aspectj/ajde/ExtensionTest.java
+++ b/ajde/src/test/java/org/aspectj/ajde/ExtensionTest.java
@@ -1,10 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
+ * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt
+ *
  * Contributors:
  *     Andy Clement - initial implementation
  *******************************************************************************/
@@ -38,9 +38,9 @@ public class ExtensionTest extends AjcTestCase {
 
 	/**
 	 * Aim: Check that the ID of certain message kinds are correct
-	 * 
+	 *
 	 * ajc -warn:unusedImport UnusedImport.java
-	 * 
+	 *
 	 * Expected result is that id matches IProblem.UnusedImport
 	 */
 	public void testMessageID() {
@@ -121,9 +121,9 @@ public class ExtensionTest extends AjcTestCase {
 
 	/**
 	 * Aim: Check that the start/end of certain warnings are correct
-	 * 
+	 *
 	 * ajc -warn:unusedImport UnusedImport.java
-	 * 
+	 *
 	 * Expected result is first warning message has start=7 end=20
 	 */
 	public void testMessageSourceStartEnd() {
diff --git a/ajde/src/test/java/org/aspectj/ajde/SymbolFileGenerationTest.java b/ajde/src/test/java/org/aspectj/ajde/SymbolFileGenerationTest.java
index 2d1669695..19201a36d 100644
--- a/ajde/src/test/java/org/aspectj/ajde/SymbolFileGenerationTest.java
+++ b/ajde/src/test/java/org/aspectj/ajde/SymbolFileGenerationTest.java
@@ -1,14 +1,14 @@
 /* *******************************************************************
- * Copyright (c) 1999-2001 Xerox Corporation, 
+ * Copyright (c) 1999-2001 Xerox Corporation,
  *               2002 Palo Alto Research Center, Incorporated (PARC).
- * All rights reserved. 
- * This program and the accompanying materials are made available 
- * under the terms of the Eclipse Public License v1.0 
- * which accompanies this distribution and is available at 
- * http://www.eclipse.org/legal/epl-v10.html 
- *  
- * Contributors: 
- *     Xerox/PARC     initial implementation 
+ * All rights reserved.
+ * This program and the accompanying materials are made available
+ * under the terms of the Eclipse Public License v 2.0
+ * which accompanies this distribution and is available at
+ * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt
+ *
+ * Contributors:
+ *     Xerox/PARC     initial implementation
  * ******************************************************************/
 
 package org.aspectj.ajde;
diff --git a/ajde/src/test/java/org/aspectj/ajde/internal/AspectJBuildManagerTest.java b/ajde/src/test/java/org/aspectj/ajde/internal/AspectJBuildManagerTest.java
index 4382dfe7d..567806924 100644
--- a/ajde/src/test/java/org/aspectj/ajde/internal/AspectJBuildManagerTest.java
+++ b/ajde/src/test/java/org/aspectj/ajde/internal/AspectJBuildManagerTest.java
@@ -1,14 +1,14 @@
 /* *******************************************************************
  * Copyright (c) 2002 Palo Alto Research Center, Incorporated (PARC).
- * All rights reserved. 
- * This program and the accompanying materials are made available 
- * under the terms of the Eclipse Public License v1.0 
- * which accompanies this distribution and is available at 
- * http://www.eclipse.org/legal/epl-v10.html 
- *  
- * Contributors: 
+ * All rights reserved.
+ * This program and the accompanying materials are made available
+ * under the terms of the Eclipse Public License v 2.0
+ * which accompanies this distribution and is available at
+ * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt
+ *
+ * Contributors:
  *     Xerox/PARC     initial implementation
- *     Helen Hawkins  Converted to new interface (bug 148190) 
+ *     Helen Hawkins  Converted to new interface (bug 148190)
  * ******************************************************************/
 
 
@@ -28,7 +28,7 @@ public class AspectJBuildManagerTest extends AjdeTestCase {
 
 	public static TestSuite suite() {
 		TestSuite result = new TestSuite();
-		result.addTestSuite(AspectJBuildManagerTest.class);	
+		result.addTestSuite(AspectJBuildManagerTest.class);
 		return result;
 	}
 
@@ -50,15 +50,15 @@ public class AspectJBuildManagerTest extends AjdeTestCase {
             file.delete();
         } else {
             assertTrue("expected class " + file, false);
-		}			
-        
+		}
+
         // TODO-path
 		file = openFile("all.ajsym");
         if (file.exists()) {
             file.delete();
         } else {
             assertTrue("expected .ajsym: " + file, false);
-        }    
+        }
 		} finally {
 			AsmManager.dumpModelPostBuild=false;
 		}
diff --git a/ajde/src/test/java/org/aspectj/ajde/internal/LstBuildConfigManagerTest.java b/ajde/src/test/java/org/aspectj/ajde/internal/LstBuildConfigManagerTest.java
index 74a8cc1eb..280c11e77 100644
--- a/ajde/src/test/java/org/aspectj/ajde/internal/LstBuildConfigManagerTest.java
+++ b/ajde/src/test/java/org/aspectj/ajde/internal/LstBuildConfigManagerTest.java
@@ -1,18 +1,18 @@
 /* *******************************************************************
  * Copyright (c) 2002 Palo Alto Research Center, Incorporated (PARC).
- * All rights reserved. 
- * This program and the accompanying materials are made available 
- * under the terms of the Eclipse Public License v1.0 
- * which accompanies this distribution and is available at 
- * http://www.eclipse.org/legal/epl-v10.html 
- *  
- * Contributors: 
+ * All rights reserved.
+ * This program and the accompanying materials are made available
+ * under the terms of the Eclipse Public License v 2.0
+ * which accompanies this distribution and is available at
+ * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt
+ *
+ * Contributors:
  *     Xerox/PARC     initial implementation
- *     Helen Hawkins  Converted to new interface (bug 148190) 
+ *     Helen Hawkins  Converted to new interface (bug 148190)
  * ******************************************************************/
 
 
-package org.aspectj.ajde.internal; 
+package org.aspectj.ajde.internal;
 
 import java.io.File;
 import java.io.IOException;
@@ -25,15 +25,15 @@ import org.aspectj.ajde.ui.utils.TestMessageHandler.TestMessage;
 import junit.framework.TestSuite;
 
 public class LstBuildConfigManagerTest extends AjdeTestCase {
-	
+
 	private BuildConfigManager buildConfigManager = new LstBuildConfigManager();
 
 	public static TestSuite suite() {
 		TestSuite result = new TestSuite();
-		result.addTestSuite(LstBuildConfigManagerTest.class);	
+		result.addTestSuite(LstBuildConfigManagerTest.class);
 		return result;
 	}
-	
+
 	protected void setUp() throws Exception {
 		super.setUp();
 		initialiseProject("LstBuildConfigManagerTest");
@@ -43,7 +43,7 @@ public class LstBuildConfigManagerTest extends AjdeTestCase {
 		doBuild("dir-entry.lst");
 		List messages = getMessages("dir-entry.lst");
 		TestMessage message = (TestMessage)messages.get(0);
-		
+
 		assertEquals(message.getContainedMessage().getSourceLocation().getSourceFile().getAbsolutePath(), openFile("dir-entry.lst").getAbsolutePath());
 
 		doBuild("bad-injar.lst");
@@ -56,25 +56,25 @@ public class LstBuildConfigManagerTest extends AjdeTestCase {
 		doBuild("invalid-entry.lst");
 		assertFalse("expected there to be error messages because the build failed but didn't" +
 				" find any", getErrorMessages("invalid-entry.lst").isEmpty());
-		  
+
 		List messages = getMessages("invalid-entry.lst");
-		TestMessage message = (TestMessage)messages.get(0);	
+		TestMessage message = (TestMessage)messages.get(0);
 		assertTrue(message.getContainedMessage().getMessage(), message.getContainedMessage().getMessage().contains("aaa.bbb"));
-	
+
 	}
 
 	public void testNonExistentConfigFile() throws IOException {
 		File file = openFile("mumbleDoesNotExist.lst");
 		assertTrue("valid non-existing file", !file.exists());
 		BuildConfigModel model = buildConfigManager.buildModel(file.getCanonicalPath());
-		assertTrue("root: " + model.getRoot(), model.getRoot() != null);		
+		assertTrue("root: " + model.getRoot(), model.getRoot() != null);
 	}
 
 	public void testFileRelativePathSameDir() throws IOException {
 		File file = openFile("file-relPath-sameDir.lst");
 		buildConfigManager.buildModel(file.getCanonicalPath());
 		assertTrue("single file", true);
-	}  
-	
+	}
+
 }
 
diff --git a/ajde/src/test/java/org/aspectj/ajde/ui/NullIdeFileStructureView.java b/ajde/src/test/java/org/aspectj/ajde/ui/NullIdeFileStructureView.java
index 40c0b2b92..228119c93 100644
--- a/ajde/src/test/java/org/aspectj/ajde/ui/NullIdeFileStructureView.java
+++ b/ajde/src/test/java/org/aspectj/ajde/ui/NullIdeFileStructureView.java
@@ -1,13 +1,13 @@
 /* *******************************************************************
  * Copyright (c) 2002 Palo Alto Research Center, Incorporated (PARC).
- * All rights reserved. 
- * This program and the accompanying materials are made available 
- * under the terms of the Eclipse Public License v1.0 
- * which accompanies this distribution and is available at 
- * http://www.eclipse.org/legal/epl-v10.html 
- *  
- * Contributors: 
- *     Xerox/PARC     initial implementation 
+ * All rights reserved.
+ * This program and the accompanying materials are made available
+ * under the terms of the Eclipse Public License v 2.0
+ * which accompanies this distribution and is available at
+ * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt
+ *
+ * Contributors:
+ *     Xerox/PARC     initial implementation
  * ******************************************************************/
 
 
@@ -18,12 +18,12 @@ package org.aspectj.ajde.ui;
  * @author Mik Kersten
  */
 public class NullIdeFileStructureView extends FileStructureView {
-	
+
 	private String sourceFilePath = null;
-	
+
 	public NullIdeFileStructureView(StructureViewProperties viewProperties) {
-		super(viewProperties);	
-	} 
+		super(viewProperties);
+	}
 	public String getSourceFile() {
 		return sourceFilePath;
 	}
diff --git a/ajde/src/test/java/org/aspectj/ajde/ui/NullIdeStructureViewRenderer.java b/ajde/src/test/java/org/aspectj/ajde/ui/NullIdeStructureViewRenderer.java
index 81b65dea0..ef47a972f 100644
--- a/ajde/src/test/java/org/aspectj/ajde/ui/NullIdeStructureViewRenderer.java
+++ b/ajde/src/test/java/org/aspectj/ajde/ui/NullIdeStructureViewRenderer.java
@@ -1,13 +1,13 @@
 /* *******************************************************************
  * Copyright (c) 2002 Palo Alto Research Center, Incorporated (PARC).
- * All rights reserved. 
- * This program and the accompanying materials are made available 
- * under the terms of the Eclipse Public License v1.0 
- * which accompanies this distribution and is available at 
- * http://www.eclipse.org/legal/epl-v10.html 
- *  
- * Contributors: 
- *     Xerox/PARC     initial implementation 
+ * All rights reserved.
+ * This program and the accompanying materials are made available
+ * under the terms of the Eclipse Public License v 2.0
+ * which accompanies this distribution and is available at
+ * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt
+ *
+ * Contributors:
+ *     Xerox/PARC     initial implementation
  * ******************************************************************/
 
 
@@ -20,19 +20,19 @@ package org.aspectj.ajde.ui;
 public class NullIdeStructureViewRenderer implements StructureViewRenderer {
 
 	private boolean hasBeenNotified = false;
-	
+
     public void updateView(StructureView structureView) {
-    	hasBeenNotified = true;	
+    	hasBeenNotified = true;
     }
-    
+
     public void setActiveNode(IStructureViewNode node) {
-    	// ignored	
+    	// ignored
     }
-    
+
 	public void setActiveNode(IStructureViewNode node, int lineOffset) {
 		// ignored
 	}
-    
+
 	public boolean getHasBeenNotified() {
 		return hasBeenNotified;
 	}
@@ -41,4 +41,4 @@ public class NullIdeStructureViewRenderer implements StructureViewRenderer {
 		this.hasBeenNotified = hasBeenNotified;
 	}
 }
-  
+
diff --git a/ajde/src/test/java/org/aspectj/ajde/ui/StructureSearchManagerTest.java b/ajde/src/test/java/org/aspectj/ajde/ui/StructureSearchManagerTest.java
index ecbfed0d7..b95a5370b 100644
--- a/ajde/src/test/java/org/aspectj/ajde/ui/StructureSearchManagerTest.java
+++ b/ajde/src/test/java/org/aspectj/ajde/ui/StructureSearchManagerTest.java
@@ -1,13 +1,13 @@
 /* *******************************************************************
  * Copyright (c) 2002 Palo Alto Research Center, Incorporated (PARC).
- * All rights reserved. 
- * This program and the accompanying materials are made available 
- * under the terms of the Eclipse Public License v1.0 
- * which accompanies this distribution and is available at 
- * http://www.eclipse.org/legal/epl-v10.html 
- *  
- * Contributors: 
- *     Xerox/PARC     initial implementation 
+ * All rights reserved.
+ * This program and the accompanying materials are made available
+ * under the terms of the Eclipse Public License v 2.0
+ * which accompanies this distribution and is available at
+ * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt
+ *
+ * Contributors:
+ *     Xerox/PARC     initial implementation
  *     Helen Hawkins  Converted to new interface (bug 148190)
  * ******************************************************************/
 
@@ -29,7 +29,7 @@ public class StructureSearchManagerTest extends AjdeTestCase {
 
 	public static TestSuite suite() {
 		TestSuite result = new TestSuite();
-		result.addTestSuite(StructureSearchManagerTest.class);	
+		result.addTestSuite(StructureSearchManagerTest.class);
 		return result;
 	}
 
@@ -56,11 +56,11 @@ public class StructureSearchManagerTest extends AjdeTestCase {
 		);
 		assertTrue("non existent", matches.isEmpty());
 	}
-  
+
 	protected void setUp() throws Exception {
 		super.setUp();
 		initialiseProject("StructureSearchManagerTest");
-		doBuild("all.lst");		
+		doBuild("all.lst");
 	}
 
 	protected void tearDown() throws Exception {
diff --git a/ajde/src/test/java/org/aspectj/ajde/ui/StructureViewManagerTest.java b/ajde/src/test/java/org/aspectj/ajde/ui/StructureViewManagerTest.java
index 5948d2c5a..ab7743183 100644
--- a/ajde/src/test/java/org/aspectj/ajde/ui/StructureViewManagerTest.java
+++ b/ajde/src/test/java/org/aspectj/ajde/ui/StructureViewManagerTest.java
@@ -1,14 +1,14 @@
 /* *******************************************************************
  * Copyright (c) 2002 Palo Alto Research Center, Incorporated (PARC).
- * All rights reserved. 
- * This program and the accompanying materials are made available 
- * under the terms of the Eclipse Public License v1.0 
- * which accompanies this distribution and is available at 
- * http://www.eclipse.org/legal/epl-v10.html 
- *  
- * Contributors: 
+ * All rights reserved.
+ * This program and the accompanying materials are made available
+ * under the terms of the Eclipse Public License v 2.0
+ * which accompanies this distribution and is available at
+ * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt
+ *
+ * Contributors:
  *     Xerox/PARC     initial implementation
- *     Helen Hawkins  Converted to new interface (bug 148190) 
+ *     Helen Hawkins  Converted to new interface (bug 148190)
  * ******************************************************************/
 
 package org.aspectj.ajde.ui;
diff --git a/ajde/src/test/java/org/aspectj/ajde/ui/utils/TestBuildProgressMonitor.java b/ajde/src/test/java/org/aspectj/ajde/ui/utils/TestBuildProgressMonitor.java
index ef70388ad..aaf1b0833 100644
--- a/ajde/src/test/java/org/aspectj/ajde/ui/utils/TestBuildProgressMonitor.java
+++ b/ajde/src/test/java/org/aspectj/ajde/ui/utils/TestBuildProgressMonitor.java
@@ -1,9 +1,9 @@
 /********************************************************************
  * Copyright (c) 2007 Contributors. All rights reserved.
  * This program and the accompanying materials are made available
- * under the terms of the Eclipse Public License v1.0
+ * under the terms of the Eclipse Public License v 2.0
  * which accompanies this distribution and is available at
- * http://eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt
  *
  * Contributors: IBM Corporation - initial API and implementation
  * 				 Helen Hawkins   - initial version (bug 148190)
diff --git a/ajde/src/test/java/org/aspectj/ajde/ui/utils/TestCompilerConfiguration.java b/ajde/src/test/java/org/aspectj/ajde/ui/utils/TestCompilerConfiguration.java
index 4dd195aed..68ecee15d 100644
--- a/ajde/src/test/java/org/aspectj/ajde/ui/utils/TestCompilerConfiguration.java
+++ b/ajde/src/test/java/org/aspectj/ajde/ui/utils/TestCompilerConfiguration.java
@@ -1,9 +1,9 @@
 /********************************************************************
  * Copyright (c) 2007 Contributors. All rights reserved.
  * This program and the accompanying materials are made available
- * under the terms of the Eclipse Public License v1.0
+ * under the terms of the Eclipse Public License v 2.0
  * which accompanies this distribution and is available at
- * http://eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt
  *
  * Contributors: IBM Corporation - initial API and implementation
  * 				 Helen Hawkins   - initial version (bug 148190)
diff --git a/ajde/src/test/java/org/aspectj/ajde/ui/utils/TestEditorAdapter.java b/ajde/src/test/java/org/aspectj/ajde/ui/utils/TestEditorAdapter.java
index 6c94e7f33..c09510877 100644
--- a/ajde/src/test/java/org/aspectj/ajde/ui/utils/TestEditorAdapter.java
+++ b/ajde/src/test/java/org/aspectj/ajde/ui/utils/TestEditorAdapter.java
@@ -1,11 +1,11 @@
 /********************************************************************
- * Copyright (c) 2007 Contributors. All rights reserved. 
- * This program and the accompanying materials are made available 
- * under the terms of the Eclipse Public License v1.0 
- * which accompanies this distribution and is available at 
- * http://eclipse.org/legal/epl-v10.html 
- *  
- * Contributors: IBM Corporation - initial API and implementation 
+ * Copyright (c) 2007 Contributors. All rights reserved.
+ * This program and the accompanying materials are made available
+ * under the terms of the Eclipse Public License v 2.0
+ * which accompanies this distribution and is available at
+ * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt
+ *
+ * Contributors: IBM Corporation - initial API and implementation
  * 				 Helen Hawkins   - initial version (bug 148190)
  *******************************************************************/
 package org.aspectj.ajde.ui.utils;
diff --git a/ajde/src/test/java/org/aspectj/ajde/ui/utils/TestIdeUIAdapter.java b/ajde/src/test/java/org/aspectj/ajde/ui/utils/TestIdeUIAdapter.java
index 2bc23ec60..77a0963d7 100644
--- a/ajde/src/test/java/org/aspectj/ajde/ui/utils/TestIdeUIAdapter.java
+++ b/ajde/src/test/java/org/aspectj/ajde/ui/utils/TestIdeUIAdapter.java
@@ -1,11 +1,11 @@
 /********************************************************************
- * Copyright (c) 2007 Contributors. All rights reserved. 
- * This program and the accompanying materials are made available 
- * under the terms of the Eclipse Public License v1.0 
- * which accompanies this distribution and is available at 
- * http://eclipse.org/legal/epl-v10.html 
- *  
- * Contributors: IBM Corporation - initial API and implementation 
+ * Copyright (c) 2007 Contributors. All rights reserved.
+ * This program and the accompanying materials are made available
+ * under the terms of the Eclipse Public License v 2.0
+ * which accompanies this distribution and is available at
+ * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt
+ *
+ * Contributors: IBM Corporation - initial API and implementation
  * 				 Helen Hawkins   - initial version (bug 148190)
  *******************************************************************/
 package org.aspectj.ajde.ui.utils;
diff --git a/ajde/src/test/java/org/aspectj/ajde/ui/utils/TestMessageHandler.java b/ajde/src/test/java/org/aspectj/ajde/ui/utils/TestMessageHandler.java
index 8901b02f4..d0fd36bd0 100644
--- a/ajde/src/test/java/org/aspectj/ajde/ui/utils/TestMessageHandler.java
+++ b/ajde/src/test/java/org/aspectj/ajde/ui/utils/TestMessageHandler.java
@@ -1,11 +1,11 @@
 /********************************************************************
- * Copyright (c) 2007 Contributors. All rights reserved. 
- * This program and the accompanying materials are made available 
- * under the terms of the Eclipse Public License v1.0 
- * which accompanies this distribution and is available at 
- * http://eclipse.org/legal/epl-v10.html 
- *  
- * Contributors: IBM Corporation - initial API and implementation 
+ * Copyright (c) 2007 Contributors. All rights reserved.
+ * This program and the accompanying materials are made available
+ * under the terms of the Eclipse Public License v 2.0
+ * which accompanies this distribution and is available at
+ * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt
+ *
+ * Contributors: IBM Corporation - initial API and implementation
  * 				 Helen Hawkins   - initial version (bug 148190)
  *******************************************************************/
 package org.aspectj.ajde.ui.utils;
@@ -30,7 +30,7 @@ public class TestMessageHandler implements IUIBuildMessageHandler {
 	private List ignoring;
 	private List messages;
 	private List errors;
-	
+
 	public TestMessageHandler() {
 		ignoring = new ArrayList();
 		messages = new ArrayList();
@@ -40,7 +40,7 @@ public class TestMessageHandler implements IUIBuildMessageHandler {
 	}
 
 	public boolean handleMessage(IMessage message) throws AbortException {
-        IMessage.Kind kind = message.getKind(); 
+        IMessage.Kind kind = message.getKind();
         if (isIgnoring(kind)) {
             return true;
         }
@@ -66,32 +66,32 @@ public class TestMessageHandler implements IUIBuildMessageHandler {
 	public boolean isIgnoring(Kind kind) {
 		return ((null != kind) && (ignoring.contains(kind)));
 	}
-	
+
 	public void ignore(Kind kind) {
 	    if ((null != kind) && (!ignoring.contains(kind))) {
 	        ignoring.add(kind);
-	    }	
+	    }
 	}
 
 	public List getMessages() {
 		return messages;
 	}
-	
+
 	public List getErrors() {
 		return errors;
 	}
-	
+
 	public static class TestMessage {
 		IMessage message;
-		
+
 		public TestMessage(IMessage m) {
 			message = m;
 		}
-		
+
 		public IMessage getContainedMessage() {
 			return message;
 		}
-		
+
         public String toString() {
             String loc = "<no location>";
             if (null != message.getSourceLocation()) {
diff --git a/ajde/src/test/java/org/aspectj/ajde/ui/utils/TestOutputLocationManager.java b/ajde/src/test/java/org/aspectj/ajde/ui/utils/TestOutputLocationManager.java
index 157f3ecd4..3872b45bd 100644
--- a/ajde/src/test/java/org/aspectj/ajde/ui/utils/TestOutputLocationManager.java
+++ b/ajde/src/test/java/org/aspectj/ajde/ui/utils/TestOutputLocationManager.java
@@ -1,11 +1,11 @@
 /********************************************************************
- * Copyright (c) 2007 Contributors. All rights reserved. 
- * This program and the accompanying materials are made available 
- * under the terms of the Eclipse Public License v1.0 
- * which accompanies this distribution and is available at 
- * http://eclipse.org/legal/epl-v10.html 
- *  
- * Contributors: IBM Corporation - initial API and implementation 
+ * Copyright (c) 2007 Contributors. All rights reserved.
+ * This program and the accompanying materials are made available
+ * under the terms of the Eclipse Public License v 2.0
+ * which accompanies this distribution and is available at
+ * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt
+ *
+ * Contributors: IBM Corporation - initial API and implementation
  * 				 Helen Hawkins   - initial version (bug 148190)
  *******************************************************************/
 package org.aspectj.ajde.ui.utils;
@@ -40,7 +40,7 @@ public class TestOutputLocationManager implements IOutputLocationManager {
 	public String getUniqueIdentifier() {
 		return testProjectOutputPath;
 	}
-	
+
 	public Map getInpathMap() {
 		return Collections.EMPTY_MAP;
 	}
diff --git a/ajde/src/test/java/org/aspectj/ajde/ui/utils/TestRuntimeProperties.java b/ajde/src/test/java/org/aspectj/ajde/ui/utils/TestRuntimeProperties.java
index a9e923e2a..588bcbb41 100644
--- a/ajde/src/test/java/org/aspectj/ajde/ui/utils/TestRuntimeProperties.java
+++ b/ajde/src/test/java/org/aspectj/ajde/ui/utils/TestRuntimeProperties.java
@@ -1,11 +1,11 @@
 /********************************************************************
- * Copyright (c) 2007 Contributors. All rights reserved. 
- * This program and the accompanying materials are made available 
- * under the terms of the Eclipse Public License v1.0 
- * which accompanies this distribution and is available at 
- * http://eclipse.org/legal/epl-v10.html 
- *  
- * Contributors: IBM Corporation - initial API and implementation 
+ * Copyright (c) 2007 Contributors. All rights reserved.
+ * This program and the accompanying materials are made available
+ * under the terms of the Eclipse Public License v 2.0
+ * which accompanies this distribution and is available at
+ * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt
+ *
+ * Contributors: IBM Corporation - initial API and implementation
  * 				 Helen Hawkins   - initial version (bug 148190)
  *******************************************************************/
 package org.aspectj.ajde.ui.utils;