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>

16 files changed, 155 insertions, 155 deletions

diff --git a/ajbrowser/src/main/java/org/aspectj/tools/ajbrowser/BrowserManager.java b/ajbrowser/src/main/java/org/aspectj/tools/ajbrowser/BrowserManager.java
index a5856afd9..e140d3bd9 100644
--- a/ajbrowser/src/main/java/org/aspectj/tools/ajbrowser/BrowserManager.java
+++ b/ajbrowser/src/main/java/org/aspectj/tools/ajbrowser/BrowserManager.java
@@ -1,13 +1,13 @@
 /* *******************************************************************
- * 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: 
+ * 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)
  * ******************************************************************/
@@ -49,7 +49,7 @@ import org.aspectj.util.FileUtil;
 
 /**
  * IDE manager for standalone AJDE application.
- * 
+ *
  * @author Mik Kersten
  */
 public class BrowserManager {
@@ -107,7 +107,7 @@ public class BrowserManager {
 
 	/**
 	 * Find and create the set of build configuration files
-	 * 
+	 *
 	 * @param configFilesArgs
 	 */
 	private void setUpConfigFiles(String[] configFilesArgs) {
diff --git a/ajbrowser/src/main/java/org/aspectj/tools/ajbrowser/Main.java b/ajbrowser/src/main/java/org/aspectj/tools/ajbrowser/Main.java
index 6d56a6f2a..51a33c73e 100644
--- a/ajbrowser/src/main/java/org/aspectj/tools/ajbrowser/Main.java
+++ b/ajbrowser/src/main/java/org/aspectj/tools/ajbrowser/Main.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.tools.ajbrowser;
@@ -23,7 +23,7 @@ public class Main {
 
 	/**
 	 * Run ajbrowser if args contains only .lst files and ajc otherwise.
-	 * 
+	 *
 	 * @param args the String[] of args to interpret
 	 */
 	public static void main(String[] args) {
@@ -34,7 +34,7 @@ public class Main {
 
 	/**
 	 * Invoke the compiler if there are arguments and some are not .lst files.
-	 * 
+	 *
 	 * @return false if compiler was not invoked and the browser main should be
 	 */
 	static boolean compilerMain(String[] args) {
diff --git a/ajbrowser/src/main/java/org/aspectj/tools/ajbrowser/core/BrowserBuildProgressMonitor.java b/ajbrowser/src/main/java/org/aspectj/tools/ajbrowser/core/BrowserBuildProgressMonitor.java
index aab3e3b3a..a19c2b717 100644
--- a/ajbrowser/src/main/java/org/aspectj/tools/ajbrowser/core/BrowserBuildProgressMonitor.java
+++ b/ajbrowser/src/main/java/org/aspectj/tools/ajbrowser/core/BrowserBuildProgressMonitor.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.tools.ajbrowser.core;
@@ -27,13 +27,13 @@ import org.aspectj.tools.ajbrowser.ui.swing.TopFrame;
 public class BrowserBuildProgressMonitor extends Thread implements IBuildProgressMonitor {
 
 	public static final String PROGRESS_HEADING = "AspectJ Build";
-	
+
 	private BuildProgressPanel progressDialog = null;
 	private JDialog dialog = null;
 	private TopFrame topFrame;
-	
+
 	private BrowserMessageHandler handler;
-	
+
 	public BrowserBuildProgressMonitor(BrowserMessageHandler handler) {
 		this.handler = handler;
 		topFrame = (TopFrame) BrowserManager.getDefault().getRootFrame();
@@ -42,16 +42,16 @@ public class BrowserBuildProgressMonitor extends Thread implements IBuildProgres
         dialog.setContentPane(progressDialog);
         dialog.setSize(550, 120);
         try {
-	        dialog.setLocationRelativeTo(topFrame);	
+	        dialog.setLocationRelativeTo(topFrame);
 		} catch (NoSuchMethodError nsme) {
 			// running on 1.3
 		}
 	}
-	
+
 	public void finish(boolean wasFullBuild) {
 		Ajde.getDefault().getIdeUIAdapter().displayStatusInformation("build finished...");
 		progressDialog.finish();
-		dialog.dispose();    	
+		dialog.dispose();
 		if (handler.getMessages().isEmpty()) {
 			topFrame.hideMessagesPanel(handler);
 		} else {
diff --git a/ajbrowser/src/main/java/org/aspectj/tools/ajbrowser/core/BrowserCompilerConfiguration.java b/ajbrowser/src/main/java/org/aspectj/tools/ajbrowser/core/BrowserCompilerConfiguration.java
index 254696531..e1ec5c81d 100644
--- a/ajbrowser/src/main/java/org/aspectj/tools/ajbrowser/core/BrowserCompilerConfiguration.java
+++ b/ajbrowser/src/main/java/org/aspectj/tools/ajbrowser/core/BrowserCompilerConfiguration.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.tools.ajbrowser.core;
diff --git a/ajbrowser/src/main/java/org/aspectj/tools/ajbrowser/core/BrowserErrorHandler.java b/ajbrowser/src/main/java/org/aspectj/tools/ajbrowser/core/BrowserErrorHandler.java
index 9d8e3857c..d264e1900 100644
--- a/ajbrowser/src/main/java/org/aspectj/tools/ajbrowser/core/BrowserErrorHandler.java
+++ b/ajbrowser/src/main/java/org/aspectj/tools/ajbrowser/core/BrowserErrorHandler.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.tools.ajbrowser.core;
@@ -47,7 +47,7 @@ public class BrowserErrorHandler {
 		if (t != null) {
 			t.printStackTrace(new PrintWriter(stringWriter));
 			return stringWriter.getBuffer().toString();
-		} 
+		}
 		return "<no stack trace available>";
 	}
 
diff --git a/ajbrowser/src/main/java/org/aspectj/tools/ajbrowser/core/BrowserOutputLocationManager.java b/ajbrowser/src/main/java/org/aspectj/tools/ajbrowser/core/BrowserOutputLocationManager.java
index c721394e2..81192131d 100644
--- a/ajbrowser/src/main/java/org/aspectj/tools/ajbrowser/core/BrowserOutputLocationManager.java
+++ b/ajbrowser/src/main/java/org/aspectj/tools/ajbrowser/core/BrowserOutputLocationManager.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.tools.ajbrowser.core;
diff --git a/ajbrowser/src/main/java/org/aspectj/tools/ajbrowser/core/PreferenceStoreConstants.java b/ajbrowser/src/main/java/org/aspectj/tools/ajbrowser/core/PreferenceStoreConstants.java
index 6ad9b448c..f92fae4c1 100644
--- a/ajbrowser/src/main/java/org/aspectj/tools/ajbrowser/core/PreferenceStoreConstants.java
+++ b/ajbrowser/src/main/java/org/aspectj/tools/ajbrowser/core/PreferenceStoreConstants.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.tools.ajbrowser.core;
@@ -20,5 +20,5 @@ public class PreferenceStoreConstants {
 	public static final String BUILD_OUTPUTPATH = "build.outputpath";
 	public static final String JAVA_CLASSPATH = "java.class.path";
 	public static final String NONSTANDARD_OPTIONS = "ajc.nonStandardOptions";
-	
+
 }
diff --git a/ajbrowser/src/main/java/org/aspectj/tools/ajbrowser/ui/BasicEditor.java b/ajbrowser/src/main/java/org/aspectj/tools/ajbrowser/ui/BasicEditor.java
index 7830f8b19..d81367a82 100644
--- a/ajbrowser/src/main/java/org/aspectj/tools/ajbrowser/ui/BasicEditor.java
+++ b/ajbrowser/src/main/java/org/aspectj/tools/ajbrowser/ui/BasicEditor.java
@@ -1,15 +1,15 @@
 /* *******************************************************************
- * 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: 
+ * 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)
  * ******************************************************************/
 
 
@@ -80,7 +80,7 @@ public class BasicEditor implements EditorAdapter {
     		Ajde.getDefault().getIdeUIAdapter().displayStatusInformation(" no corresponding source line to seek to");
     	}
     }
-    	
+
     public void showSourceLine(int lineNumber, boolean highlight) {
         showSourceLine(filePath, lineNumber, highlight);
     }
@@ -95,7 +95,7 @@ public class BasicEditor implements EditorAdapter {
 
     public void showSourceLine(String filePath, int lineNumber, boolean highlight) {
     	//AjdeUIManager.getDefault().getIdeUIAdapter().resetEditor();
-        
+
         this.filePath = filePath;
 //        if (oldPath != filePath && !Ajde.INSTANCE.BROWSER_MANAGER.isGlobalMode()) {
 //            Ajde.INSTANCE.BROWSER_MANAGER.updateView();
@@ -121,7 +121,7 @@ public class BasicEditor implements EditorAdapter {
     public void showSourcelineAnnotation(String filePath, int lineNumber, java.util.List items) { }
 
 	public void addEditorViewForSourceLine(String filePath, int lineNumber) {
-		
+
 	}
 
     public void saveContents() throws IOException {
diff --git a/ajbrowser/src/main/java/org/aspectj/tools/ajbrowser/ui/BrowserMessageHandler.java b/ajbrowser/src/main/java/org/aspectj/tools/ajbrowser/ui/BrowserMessageHandler.java
index 5188f8daf..2878e84a3 100644
--- a/ajbrowser/src/main/java/org/aspectj/tools/ajbrowser/ui/BrowserMessageHandler.java
+++ b/ajbrowser/src/main/java/org/aspectj/tools/ajbrowser/ui/BrowserMessageHandler.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.tools.ajbrowser.ui;
diff --git a/ajbrowser/src/main/java/org/aspectj/tools/ajbrowser/ui/BrowserRuntimeProperties.java b/ajbrowser/src/main/java/org/aspectj/tools/ajbrowser/ui/BrowserRuntimeProperties.java
index a00c51d0d..a680da984 100644
--- a/ajbrowser/src/main/java/org/aspectj/tools/ajbrowser/ui/BrowserRuntimeProperties.java
+++ b/ajbrowser/src/main/java/org/aspectj/tools/ajbrowser/ui/BrowserRuntimeProperties.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.tools.ajbrowser.ui;
@@ -21,11 +21,11 @@ import org.aspectj.tools.ajbrowser.core.PreferenceStoreConstants;
 public class BrowserRuntimeProperties implements IRuntimeProperties {
 
 	private UserPreferencesAdapter preferencesAdapter;
-	
+
 	public BrowserRuntimeProperties(UserPreferencesAdapter preferencesAdapter) {
 		this.preferencesAdapter = preferencesAdapter;
 	}
-	
+
 	public String getClassToExecute() {
 		return preferencesAdapter.getProjectPreference(PreferenceStoreConstants.RUNTIME_MAINCLASS);
 	}
diff --git a/ajbrowser/src/main/java/org/aspectj/tools/ajbrowser/ui/BrowserUIAdapter.java b/ajbrowser/src/main/java/org/aspectj/tools/ajbrowser/ui/BrowserUIAdapter.java
index 2388c3390..a6a993d91 100644
--- a/ajbrowser/src/main/java/org/aspectj/tools/ajbrowser/ui/BrowserUIAdapter.java
+++ b/ajbrowser/src/main/java/org/aspectj/tools/ajbrowser/ui/BrowserUIAdapter.java
@@ -1,17 +1,17 @@
 /* *******************************************************************
- * 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.tools.ajbrowser.ui;
 
 import org.aspectj.ajde.IdeUIAdapter;
@@ -22,7 +22,7 @@ import org.aspectj.tools.ajbrowser.BrowserManager;
  * information in the status bar at the bottom of the AjBrowser GUI.
  */
 public class BrowserUIAdapter implements IdeUIAdapter {
-	
+
 	public void displayStatusInformation(String message) {
 		BrowserManager.getDefault().setStatusInformation(message);
 	}
diff --git a/ajbrowser/src/main/java/org/aspectj/tools/ajbrowser/ui/EditorManager.java b/ajbrowser/src/main/java/org/aspectj/tools/ajbrowser/ui/EditorManager.java
index f58a5c81d..f004e6e2b 100644
--- a/ajbrowser/src/main/java/org/aspectj/tools/ajbrowser/ui/EditorManager.java
+++ b/ajbrowser/src/main/java/org/aspectj/tools/ajbrowser/ui/EditorManager.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.tools.ajbrowser.ui;
@@ -31,7 +31,7 @@ import org.aspectj.tools.ajbrowser.core.BrowserErrorHandler;
 
 /**
  * Responsible for controlling the editor.
- * 
+ *
  * <p><b>TODO:</b> remove coupling to <CODE>BasicEditor</CODE></p>
  * @author Mik Kersten
  */
diff --git a/ajbrowser/src/main/java/org/aspectj/tools/ajbrowser/ui/swing/BrowserOptionsPanel.java b/ajbrowser/src/main/java/org/aspectj/tools/ajbrowser/ui/swing/BrowserOptionsPanel.java
index e01c01f12..fd93bb51f 100644
--- a/ajbrowser/src/main/java/org/aspectj/tools/ajbrowser/ui/swing/BrowserOptionsPanel.java
+++ b/ajbrowser/src/main/java/org/aspectj/tools/ajbrowser/ui/swing/BrowserOptionsPanel.java
@@ -1,15 +1,15 @@
 /* *******************************************************************
- * 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: 
+ * 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)
  * ******************************************************************/
 
 
@@ -25,11 +25,11 @@ import org.aspectj.tools.ajbrowser.core.PreferenceStoreConstants;
 
 /**
  * Panel the displays both ajc and runtime options
- * 
+ *
  * @author Mik Kersten
  */
 public class BrowserOptionsPanel extends OptionsPanel {
-	
+
 	private static final long serialVersionUID = 4491319302490183151L;
 	private JPanel runOptions_panel = new JPanel();
 	private JPanel build_panel = new JPanel();
@@ -81,8 +81,8 @@ public class BrowserOptionsPanel extends OptionsPanel {
 				getProjectPreference(PreferenceStoreConstants.RUNTIME_MAINCLASS)
 		);
 	}
-	
-	public void saveOptions() throws IOException {		
+
+	public void saveOptions() throws IOException {
 		BrowserManager.getDefault().getPreferencesAdapter().setProjectPreference(
 				PreferenceStoreConstants.BUILD_OUTPUTPATH, outputPath_field.getText());
 		BrowserManager.getDefault().getPreferencesAdapter().setProjectPreference(
@@ -91,7 +91,7 @@ public class BrowserOptionsPanel extends OptionsPanel {
 				PreferenceStoreConstants.BUILD_CLASSPATH, classpath_field.getText());
 		BrowserManager.getDefault().getPreferencesAdapter().setProjectPreference(
 				PreferenceStoreConstants.RUNTIME_MAINCLASS, classToRun_field.getText());
-	}	
+	}
 
 	private void jbInit() throws Exception {
 		border1 =
diff --git a/ajbrowser/src/main/java/org/aspectj/tools/ajbrowser/ui/swing/MessageHandlerPanel.java b/ajbrowser/src/main/java/org/aspectj/tools/ajbrowser/ui/swing/MessageHandlerPanel.java
index 26ec8f00c..7c02f6426 100644
--- a/ajbrowser/src/main/java/org/aspectj/tools/ajbrowser/ui/swing/MessageHandlerPanel.java
+++ b/ajbrowser/src/main/java/org/aspectj/tools/ajbrowser/ui/swing/MessageHandlerPanel.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/ajbrowser/src/main/java/org/aspectj/tools/ajbrowser/ui/swing/TopFrame.java b/ajbrowser/src/main/java/org/aspectj/tools/ajbrowser/ui/swing/TopFrame.java
index 5949e2e07..5d9b7cc17 100644
--- a/ajbrowser/src/main/java/org/aspectj/tools/ajbrowser/ui/swing/TopFrame.java
+++ b/ajbrowser/src/main/java/org/aspectj/tools/ajbrowser/ui/swing/TopFrame.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.tools.ajbrowser.ui.swing;
@@ -51,7 +51,7 @@ import org.aspectj.tools.ajbrowser.ui.EditorManager;
 
 /**
  * UI for standalone operation.
- * 
+ *
  * @author Mik Kersten
  */
 public class TopFrame extends JFrame {
diff --git a/ajbrowser/src/test/java/org/aspectj/tools/ajbrowser/JemmyDriver.java b/ajbrowser/src/test/java/org/aspectj/tools/ajbrowser/JemmyDriver.java
index b993713ca..48bc0aabe 100644
--- a/ajbrowser/src/test/java/org/aspectj/tools/ajbrowser/JemmyDriver.java
+++ b/ajbrowser/src/test/java/org/aspectj/tools/ajbrowser/JemmyDriver.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
  * ******************************************************************/
 
 
@@ -26,17 +26,17 @@ package org.aspectj.tools.ajbrowser;
 // */
 //public class JemmyDriver implements Scenario {
 //
-//    public static final String CUT 
+//    public static final String CUT
 //        = "org.aspectj.tools.ajbrowser.Main";
-//    public static final String DRIVER 
+//    public static final String DRIVER
 //        = "org.aspectj.tools.ajbrowser.JemmyDriver";
-//    
+//
 //    // XXX need to fix literal path locations
-//    public static final String USERDIR 
+//    public static final String USERDIR
 //        = "j:/home/wes/dev/tools/aj/examples";
-//    public static final String FILENAME_RELATIVE 
+//    public static final String FILENAME_RELATIVE
 //        = USERDIR + "spacewar/debug.lst";
-//    public static final String FILENAME 
+//    public static final String FILENAME
 //        = USERDIR + "/" + FILENAME_RELATIVE;
 //
 //    public static void main(String[] argv) {
@@ -53,7 +53,7 @@ package org.aspectj.tools.ajbrowser;
 //            // grab parameter - pass in .lst file
 //            if (null != param) {
 //                Class c = param.getClass();
-//                if (c.isArray() && 
+//                if (c.isArray() &&
 //                    (String.class == c.getComponentType())) {
 //                    args = (String[]) param;
 //                    if (0 < args.length) {