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>

LICENSE

@@ -1,199 +1,279 @@
-Per: https://www.eclipse.org/legal/epl-v10.html
+Per: https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt
 
-Eclipse Public License - v 1.0
+Eclipse Public License - v 2.0
 
-    THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC 
-    LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM 
-    CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+    THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
+    PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION
+    OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
 
 1. DEFINITIONS
 
 "Contribution" means:
 
-a) in the case of the initial Contributor, the initial code and documentation
-   distributed under this Agreement, and
-b) in the case of each subsequent Contributor:
-i) changes to the Program, and
-ii) additions to the Program;
-where such changes and/or additions to the Program originate from and are 
-distributed by that particular Contributor. A Contribution 'originates' from a
-Contributor if it was added to the Program by such Contributor itself or
-anyone acting on such Contributor's behalf. Contributions do not include
-additions to the Program which: (i) are separate modules of software
-distributed in conjunction with the Program under their own license agreement,
-and (ii) are not derivative works of the Program.
-"Contributor" means any person or entity that distributes the Program.
+  a) in the case of the initial Contributor, the initial content
+     Distributed under this Agreement, and
 
-"Licensed Patents" mean patent claims licensable by a Contributor which are
-necessarily infringed by the use or sale of its Contribution alone or when
-combined with the Program.
+  b) in the case of each subsequent Contributor:
+     i) changes to the Program, and
+     ii) additions to the Program;
+  where such changes and/or additions to the Program originate from
+  and are Distributed by that particular Contributor. A Contribution
+  "originates" from a Contributor if it was added to the Program by
+  such Contributor itself or anyone acting on such Contributor's behalf.
+  Contributions do not include changes or additions to the Program that
+  are not Modified Works.
 
-"Program" means the Contributions distributed in accordance with this Agreement.
+"Contributor" means any person or entity that Distributes the Program.
 
-"Recipient" means anyone who receives the Program under this Agreement, including all Contributors.
+"Licensed Patents" mean patent claims licensable by a Contributor which
+are necessarily infringed by the use or sale of its Contribution alone
+or when combined with the Program.
+
+"Program" means the Contributions Distributed in accordance with this
+Agreement.
+
+"Recipient" means anyone who receives the Program under this Agreement
+or any Secondary License (as applicable), including Contributors.
+
+"Derivative Works" shall mean any work, whether in Source Code or other
+form, that is based on (or derived from) the Program and for which the
+editorial revisions, annotations, elaborations, or other modifications
+represent, as a whole, an original work of authorship.
+
+"Modified Works" shall mean any work in Source Code or other form that
+results from an addition to, deletion from, or modification of the
+contents of the Program, including, for purposes of clarity any new file
+in Source Code form that contains any contents of the Program. Modified
+Works shall not include works that contain only declarations,
+interfaces, types, classes, structures, or files of the Program solely
+in each case in order to link to, bind by name, or subclass the Program
+or Modified Works thereof.
+
+"Distribute" means the acts of a) distributing or b) making available
+in any manner that enables the transfer of a copy.
+
+"Source Code" means the form of a Program preferred for making
+modifications, including but not limited to software source code,
+documentation source, and configuration files.
+
+"Secondary License" means either the GNU General Public License,
+Version 2.0, or any later versions of that license, including any
+exceptions or additional permissions as identified by the initial
+Contributor.
 
 2. GRANT OF RIGHTS
 
-a) Subject to the terms of this Agreement, each Contributor hereby grants 
-   Recipient a non-exclusive, worldwide, royalty-free copyright license to
-   reproduce, prepare derivative works of, publicly display, publicly perform,
-   distribute and sublicense the Contribution of such Contributor, if any,
-   and such derivative works, in source code and object code form.
-b) Subject to the terms of this Agreement, each Contributor hereby grants 
-   Recipient a non-exclusive, worldwide, royalty-free patent license under 
-   Licensed Patents to make, use, sell, offer to sell, import and otherwise 
-   transfer the Contribution of such Contributor, if any, in source code and 
-   object code form. This patent license shall apply to the combination of 
-   the Contribution and the Program if, at the time the Contribution is added 
-   by the Contributor, such addition of the Contribution causes such combination 
-   to be covered by the Licensed Patents. The patent license shall not apply to
-   any other combinations which include the Contribution. No hardware per se 
-   is licensed hereunder.
-c) Recipient understands that although each Contributor grants the licenses to
-   its Contributions set forth herein, no assurances are provided by any 
-   Contributor that the Program does not infringe the patent or other 
-   intellectual property rights of any other entity. Each Contributor disclaims
-   any liability to Recipient for claims brought by any other entity based on
-   infringement of intellectual property rights or otherwise. As a condition to
-   exercising the rights and licenses granted hereunder, each Recipient hereby
-   assumes sole responsibility to secure any other intellectual property rights
-   needed, if any. For example, if a third party patent license is required to
-   allow Recipient to distribute the Program, it is Recipient's responsibility 
-   to acquire that license before distributing the Program.
-d) Each Contributor represents that to its knowledge it has sufficient
-   copyright rights in its Contribution, if any, to grant the copyright license
-   set forth in this Agreement.
+  a) Subject to the terms of this Agreement, each Contributor hereby
+  grants Recipient a non-exclusive, worldwide, royalty-free copyright
+  license to reproduce, prepare Derivative Works of, publicly display,
+  publicly perform, Distribute and sublicense the Contribution of such
+  Contributor, if any, and such Derivative Works.
+
+  b) Subject to the terms of this Agreement, each Contributor hereby
+  grants Recipient a non-exclusive, worldwide, royalty-free patent
+  license under Licensed Patents to make, use, sell, offer to sell,
+  import and otherwise transfer the Contribution of such Contributor,
+  if any, in Source Code or other form. This patent license shall
+  apply to the combination of the Contribution and the Program if, at
+  the time the Contribution is added by the Contributor, such addition
+  of the Contribution causes such combination to be covered by the
+  Licensed Patents. The patent license shall not apply to any other
+  combinations which include the Contribution. No hardware per se is
+  licensed hereunder.
+
+  c) Recipient understands that although each Contributor grants the
+  licenses to its Contributions set forth herein, no assurances are
+  provided by any Contributor that the Program does not infringe the
+  patent or other intellectual property rights of any other entity.
+  Each Contributor disclaims any liability to Recipient for claims
+  brought by any other entity based on infringement of intellectual
+  property rights or otherwise. As a condition to exercising the
+  rights and licenses granted hereunder, each Recipient hereby
+  assumes sole responsibility to secure any other intellectual
+  property rights needed, if any. For example, if a third party
+  patent license is required to allow Recipient to Distribute the
+  Program, it is Recipient's responsibility to acquire that license
+  before distributing the Program.
+
+  d) Each Contributor represents that to its knowledge it has
+  sufficient copyright rights in its Contribution, if any, to grant
+  the copyright license set forth in this Agreement.
+
+  e) Notwithstanding the terms of any Secondary License, no
+  Contributor makes additional grants to any Recipient (other than
+  those set forth in this Agreement) as a result of such Recipient's
+  receipt of the Program under the terms of a Secondary License
+  (if permitted under the terms of Section 3).
+
 3. REQUIREMENTS
 
-A Contributor may choose to distribute the Program in object code form under
-its own license agreement, provided that:
-
-a) it complies with the terms and conditions of this Agreement; and
-b) its license agreement:
-i) effectively disclaims on behalf of all Contributors all warranties and 
-   conditions, express and implied, including warranties or conditions of title
-   and non-infringement, and implied warranties or conditions of
-   merchantability and fitness for a particular purpose;
-ii) effectively excludes on behalf of all Contributors all liability for
-    damages, including direct, indirect, special, incidental and consequential
-    damages, such as lost profits;
-iii) states that any provisions which differ from this Agreement are offered by
-     that Contributor alone and not by any other party; and
-iv) states that source code for the Program is available from such Contributor,
-    and informs licensees how to obtain it in a reasonable manner on or through 
-    a medium customarily used for software exchange.
-When the Program is made available in source code form:
-
-a) it must be made available under this Agreement; and
-b) a copy of this Agreement must be included with each copy of the Program.
-Contributors may not remove or alter any copyright notices contained within
-the Program.
-
-Each Contributor must identify itself as the originator of its Contribution,
-if any, in a manner that reasonably allows subsequent Recipients to identify
-the originator of the Contribution.
+3.1 If a Contributor Distributes the Program in any form, then:
+
+  a) the Program must also be made available as Source Code, in
+  accordance with section 3.2, and the Contributor must accompany
+  the Program with a statement that the Source Code for the Program
+  is available under this Agreement, and informs Recipients how to
+  obtain it in a reasonable manner on or through a medium customarily
+  used for software exchange; and
+
+  b) the Contributor may Distribute the Program under a license
+  different than this Agreement, provided that such license:
+     i) effectively disclaims on behalf of all other Contributors all
+     warranties and conditions, express and implied, including
+     warranties or conditions of title and non-infringement, and
+     implied warranties or conditions of merchantability and fitness
+     for a particular purpose;
+
+     ii) effectively excludes on behalf of all other Contributors all
+     liability for damages, including direct, indirect, special,
+     incidental and consequential damages, such as lost profits;
+
+     iii) does not attempt to limit or alter the recipients' rights
+     in the Source Code under section 3.2; and
+
+     iv) requires any subsequent distribution of the Program by any
+     party to be under a license that satisfies the requirements
+     of this section 3.
+
+3.2 When the Program is Distributed as Source Code:
+
+  a) it must be made available under this Agreement, or if the
+  Program (i) is combined with other material in a separate file or
+  files made available under a Secondary License, and (ii) the initial
+  Contributor attached to the Source Code the notice described in
+  Exhibit A of this Agreement, then the Program may be made available
+  under the terms of such Secondary Licenses, and
+
+  b) a copy of this Agreement must be included with each copy of
+  the Program.
+
+3.3 Contributors may not remove or alter any copyright, patent,
+trademark, attribution notices, disclaimers of warranty, or limitations
+of liability ("notices") contained within the Program from any copy of
+the Program which they Distribute, provided that Contributors may add
+their own appropriate notices.
 
 4. COMMERCIAL DISTRIBUTION
 
-Commercial distributors of software may accept certain responsibilities with
-respect to end users, business partners and the like. While this license is
-intended to facilitate the commercial use of the Program, the Contributor 
-who includes the Program in a commercial product offering should do so in 
-a manner which does not create potential liability for other Contributors. 
-Therefore, if a Contributor includes the Program in a commercial product 
-offering, such Contributor ("Commercial Contributor") hereby agrees to 
-defend and indemnify every other Contributor ("Indemnified Contributor") 
-against any losses, damages and costs (collectively "Losses") arising from 
-claims, lawsuits and other legal actions brought by a third party against 
-the Indemnified Contributor to the extent caused by the acts or omissions 
-of such Commercial Contributor in connection with its distribution of the 
-Program in a commercial product offering. The obligations in this section 
-do not apply to any claims or Losses relating to any actual or alleged 
-intellectual property infringement. In order to qualify, an Indemnified 
-Contributor must: a) promptly notify the Commercial Contributor in writing 
-of such claim, and b) allow the Commercial Contributor to control, and 
-cooperate with the Commercial Contributor in, the defense and any 
-related settlement negotiations. The Indemnified Contributor may 
+Commercial distributors of software may accept certain responsibilities
+with respect to end users, business partners and the like. While this
+license is intended to facilitate the commercial use of the Program,
+the Contributor who includes the Program in a commercial product
+offering should do so in a manner which does not create potential
+liability for other Contributors. Therefore, if a Contributor includes
+the Program in a commercial product offering, such Contributor
+("Commercial Contributor") hereby agrees to defend and indemnify every
+other Contributor ("Indemnified Contributor") against any losses,
+damages and costs (collectively "Losses") arising from claims, lawsuits
+and other legal actions brought by a third party against the Indemnified
+Contributor to the extent caused by the acts or omissions of such
+Commercial Contributor in connection with its distribution of the Program
+in a commercial product offering. The obligations in this section do not
+apply to any claims or Losses relating to any actual or alleged
+intellectual property infringement. In order to qualify, an Indemnified
+Contributor must: a) promptly notify the Commercial Contributor in
+writing of such claim, and b) allow the Commercial Contributor to control,
+and cooperate with the Commercial Contributor in, the defense and any
+related settlement negotiations. The Indemnified Contributor may
 participate in any such claim at its own expense.
 
-For example, a Contributor might include the Program in a commercial product 
-offering, Product X. That Contributor is then a Commercial Contributor. If 
-that Commercial Contributor then makes performance claims, or offers 
-warranties related to Product X, those performance claims and warranties 
-are such Commercial Contributor's responsibility alone. Under this section, 
-the Commercial Contributor would have to defend claims against the other 
-Contributors related to those performance claims and warranties, and if a 
-court requires any other Contributor to pay any damages as a result, the 
-Commercial Contributor must pay those damages.
+For example, a Contributor might include the Program in a commercial
+product offering, Product X. That Contributor is then a Commercial
+Contributor. If that Commercial Contributor then makes performance
+claims, or offers warranties related to Product X, those performance
+claims and warranties are such Commercial Contributor's responsibility
+alone. Under this section, the Commercial Contributor would have to
+defend claims against the other Contributors related to those performance
+claims and warranties, and if a court requires any other Contributor to
+pay any damages as a result, the Commercial Contributor must pay
+those damages.
 
 5. NO WARRANTY
 
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON 
-AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER
-EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR 
-CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A 
-PARTICULAR PURPOSE. Each Recipient is solely responsible for determining 
-the appropriateness of using and distributing the Program and assumes all 
-risks associated with its exercise of rights under this Agreement , 
-including but not limited to the risks and costs of program errors, compliance
-with applicable laws, damage to or loss of data, programs or equipment, and
-unavailability or interruption of operations.
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT
+PERMITTED BY APPLICABLE LAW, THE PROGRAM IS PROVIDED ON AN "AS IS"
+BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR
+IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF
+TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR
+PURPOSE. Each Recipient is solely responsible for determining the
+appropriateness of using and distributing the Program and assumes all
+risks associated with its exercise of rights under this Agreement,
+including but not limited to the risks and costs of program errors,
+compliance with applicable laws, damage to or loss of data, programs
+or equipment, and unavailability or interruption of operations.
 
 6. DISCLAIMER OF LIABILITY
 
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY
-CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION 
-LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 
-ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE 
-EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE 
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT
+PERMITTED BY APPLICABLE LAW, NEITHER RECIPIENT NOR ANY CONTRIBUTORS
+SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST
+PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE
+EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGES.
 
 7. GENERAL
 
-If any provision of this Agreement is invalid or unenforceable under applicable
-law, it shall not affect the validity or enforceability of the remainder of
-the terms of this Agreement, and without further action by the parties hereto,
-such provision shall be reformed to the minimum extent necessary to make
-such provision valid and enforceable.
-
-If Recipient institutes patent litigation against any entity (including a
-cross-claim or counterclaim in a lawsuit) alleging that the Program itself 
-(excluding combinations of the Program with other software or hardware) 
-infringes such Recipient's patent(s), then such Recipient's rights granted 
-under Section 2(b) shall terminate as of the date such litigation is filed.
-
-All Recipient's rights under this Agreement shall terminate if it fails to 
-comply with any of the material terms or conditions of this Agreement and 
-does not cure such failure in a reasonable period of time after becoming 
-aware of such noncompliance. If all Recipient's rights under this Agreement 
-terminate, Recipient agrees to cease use and distribution of the Program as 
-soon as reasonably practicable. However, Recipient's obligations under this 
-Agreement and any licenses granted by Recipient relating to the Program 
-shall continue and survive.
-
-Everyone is permitted to copy and distribute copies of this Agreement, but 
-in order to avoid inconsistency the Agreement is copyrighted and may only 
-be modified in the following manner. The Agreement Steward reserves the 
-right to publish new versions (including revisions) of this Agreement from 
-time to time. No one other than the Agreement Steward has the right to 
-modify this Agreement. The Eclipse Foundation is the initial Agreement 
-Steward. The Eclipse Foundation may assign the responsibility to serve as 
-the Agreement Steward to a suitable separate entity. Each new version of 
-the Agreement will be given a distinguishing version number. The Program 
-(including Contributions) may always be distributed subject to the 
-version of the Agreement under which it was received. In addition, after 
-a new version of the Agreement is published, Contributor may elect to 
-distribute the Program (including its Contributions) under the new version. 
-Except as expressly stated in Sections 2(a) and 2(b) above, Recipient 
-receives no rights or licenses to the intellectual property of any 
-Contributor under this Agreement, whether expressly, by implication, 
-estoppel or otherwise. All rights in the Program not expressly granted 
-under this Agreement are reserved.
-
-This Agreement is governed by the laws of the State of New York and the 
-intellectual property laws of the United States of America. No party to this 
-Agreement will bring a legal action under this Agreement more than one year 
-after the cause of action arose. Each party waives its rights to a jury 
-trial in any resulting litigation.
+If any provision of this Agreement is invalid or unenforceable under
+applicable law, it shall not affect the validity or enforceability of
+the remainder of the terms of this Agreement, and without further
+action by the parties hereto, such provision shall be reformed to the
+minimum extent necessary to make such provision valid and enforceable.
+
+If Recipient institutes patent litigation against any entity
+(including a cross-claim or counterclaim in a lawsuit) alleging that the
+Program itself (excluding combinations of the Program with other software
+or hardware) infringes such Recipient's patent(s), then such Recipient's
+rights granted under Section 2(b) shall terminate as of the date such
+litigation is filed.
+
+All Recipient's rights under this Agreement shall terminate if it
+fails to comply with any of the material terms or conditions of this
+Agreement and does not cure such failure in a reasonable period of
+time after becoming aware of such noncompliance. If all Recipient's
+rights under this Agreement terminate, Recipient agrees to cease use
+and distribution of the Program as soon as reasonably practicable.
+However, Recipient's obligations under this Agreement and any licenses
+granted by Recipient relating to the Program shall continue and survive.
+
+Everyone is permitted to copy and distribute copies of this Agreement,
+but in order to avoid inconsistency the Agreement is copyrighted and
+may only be modified in the following manner. The Agreement Steward
+reserves the right to publish new versions (including revisions) of
+this Agreement from time to time. No one other than the Agreement
+Steward has the right to modify this Agreement. The Eclipse Foundation
+is the initial Agreement Steward. The Eclipse Foundation may assign the
+responsibility to serve as the Agreement Steward to a suitable separate
+entity. Each new version of the Agreement will be given a distinguishing
+version number. The Program (including Contributions) may always be
+Distributed subject to the version of the Agreement under which it was
+received. In addition, after a new version of the Agreement is published,
+Contributor may elect to Distribute the Program (including its
+Contributions) under the new version.
+
+Except as expressly stated in Sections 2(a) and 2(b) above, Recipient
+receives no rights or licenses to the intellectual property of any
+Contributor under this Agreement, whether expressly, by implication,
+estoppel or otherwise. All rights in the Program not expressly granted
+under this Agreement are reserved. Nothing in this Agreement is intended
+to be enforceable by any entity that is not a Contributor or Recipient.
+No third-party beneficiary rights are created under this Agreement.
+
+Exhibit A - Form of Secondary Licenses Notice
+
+"This Source Code may also be made available under the following 
+Secondary Licenses when the conditions for such availability set forth 
+in the Eclipse Public License, v. 2.0 are satisfied: {name license(s),
+version(s), and exceptions or additional permissions here}."
+
+  Simply including a copy of this Agreement, including this Exhibit A
+  is not sufficient to license the Source Code under Secondary Licenses.
+
+  If it is not possible or desirable to put the notice in a particular
+  file, then You may include the notice in a location (such as a LICENSE
+  file in a relevant directory) where a recipient would be likely to
+  look for such a notice.
+
+  You may add additional accurate notices of copyright ownership.

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) {

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) {

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 {

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;

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>";
 	}
 

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;

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";
-	
+
 }

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 {

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;

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);
 	}

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);
 	}

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
  */

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 =

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)

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 {

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) {

ajde.core/src/main/java/org/aspectj/ajde/core/AjCompiler.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.core;
@@ -24,7 +24,7 @@ import org.aspectj.org.eclipse.jdt.internal.compiler.impl.CompilerOptions;
  * The class to be used by tools to drive a build. An AjCompiler is created with a unique id (for example the absolute pathname of a
  * project or .lst file) along with implementations of ICompilerConfiguration, IBuildProgressMonitor and IBuildMessageHandler. Tools
  * then call build() or buildFresh() on this AjCompiler.
- * 
+ *
  * <p>
  * An AjCompiler is associated with one id, therefore a new one needs to be created for a new id (project, .lst file etc.). It is
  * the responsibility of the tools to manage the lifecycle of the AjCompiler's.
@@ -40,7 +40,7 @@ public class AjCompiler {
 	/**
 	 * Creates a new AjCompiler for the given id, ICompilerConfiguration, IBuildProgressMonitor and IBuildMessageHandler. None of
 	 * the arguments can be null.
-	 * 
+	 *
 	 * @param compilerId - Unique String used to identify this AjCompiler
 	 * @param compilerConfig - ICompilerConfiguration implementation
 	 * @param buildProgressMonitor - IBuildProgressMonitor implementation
@@ -138,10 +138,10 @@ public class AjCompiler {
 
 	/**
 	 * Set a CustomMungerFactory to the compiler's weaver
-	 * 
+	 *
 	 * The type of factory should be org.aspectj.weaver.CustomMungerFactory but due to dependency problem of project ajde.core, it
 	 * is Object for now.
-	 * 
+	 *
 	 * @param factory
 	 */
 	public void setCustomMungerFactory(Object factory) {
@@ -150,7 +150,7 @@ public class AjCompiler {
 
 	/**
 	 * @return the CustomMungerFactory from the compiler's weaver
-	 * 
+	 *
 	 *         The return type should be org.aspectj.weaver.CustomMungerFactory but due to dependency problem of project ajde.core,
 	 *         it is Object for now.
 	 */

ajde.core/src/main/java/org/aspectj/ajde/core/IBuildMessageHandler.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.core;
@@ -16,13 +16,13 @@ import org.aspectj.bridge.IMessage;
 /**
  * Interface that handles messages sent from the compiler.
  * Implementations define which messages are logged and whether
- * the handler aborts the process.  
+ * the handler aborts the process.
  */
 public interface IBuildMessageHandler {
 
-	/** 
+	/**
 	 * Handle message by reporting and/or throwing an AbortException.
-	 * 
+	 *
 	 * @param message the IMessage to handle - never null
 	 * @return true if this message was handled by this handler
 	 * @throws IllegalArgumentException if message is null
@@ -32,25 +32,25 @@ public interface IBuildMessageHandler {
 
 	/**
 	 * Signal whether this will ignore messages of a given type.
-	 * Clients may use this to avoid constructing or sending 
+	 * Clients may use this to avoid constructing or sending
 	 * certain messages.
-	 * 
+	 *
 	 * @return true if this handler is ignoring all messages of this type
 	 */
 	boolean isIgnoring(IMessage.Kind kind);
 
     /**
-     * Allow fine grained configuration after initialization. 
-     *  
+     * Allow fine grained configuration after initialization.
+     *
      * @param kind
      */
     void dontIgnore(IMessage.Kind kind);
-    
+
     /**
-     * Allow fine grained configuration after initialization. 
-     *  
+     * Allow fine grained configuration after initialization.
+     *
      * @param kind
      */
     void ignore(IMessage.Kind kind);
-	
+
 }

ajde.core/src/main/java/org/aspectj/ajde/core/IBuildProgressMonitor.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)

ajde.core/src/main/java/org/aspectj/ajde/core/ICompilerConfiguration.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)

ajde.core/src/main/java/org/aspectj/ajde/core/IOutputLocationManager.java

@@ -1,11 +1,11 @@
 /********************************************************************
- * Copyright (c) 2006 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: 
+ * Copyright (c) 2006 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:
  *   Adrian Colyer			Initial implementation
  *   Helen Hawkins          bug 166580 and 148190
  * ******************************************************************/
@@ -25,7 +25,7 @@ public interface IOutputLocationManager {
 	 * Return the directory root under which the results of compiling the given source file. For example, if the source file
 	 * contains the type a.b.C, and this method returns "target/classes" the resulting class file will be written to
 	 * "target/classes/a/b/C.class"
-	 * 
+	 *
 	 * @param compilationUnit the compilation unit that has been compiled
 	 * @return a File object representing the root directory under which compilation results for this unit should be written
 	 */
@@ -34,7 +34,7 @@ public interface IOutputLocationManager {
 	/**
 	 * For environments where multiple source folders are supported, they need to be included in the model. This method allows
 	 * AspectJ to determine which source folder a source file came from. Example return values would be "src" or "main/java"
-	 * 
+	 *
 	 * @param sourceFile the File object for the source file
 	 * @return the source folder where this file came from, or null if in project root or source folders not supported.
 	 */
@@ -43,7 +43,7 @@ public interface IOutputLocationManager {
 	/**
 	 * When copying resources from source folders to output location, return the root directory under which the resource should be
 	 * copied.
-	 * 
+	 *
 	 * @param resource the resource to be copied
 	 * @return a File object representing the root directory under which this resource should be copied
 	 */
@@ -63,7 +63,7 @@ public interface IOutputLocationManager {
 	/**
 	 * Callback from the compiler to indicate that a file has been written to disk, the type of the file (if known) is also
 	 * supplied.
-	 * 
+	 *
 	 * @param outputfile the file that has been written
 	 * @param fileType the kind of file from the FILETYPE_XXX constants defined in this type
 	 */
@@ -77,7 +77,7 @@ public interface IOutputLocationManager {
 	/**
 	 * Callback from the compiler to indicate that a file has been removed from disk, the type of the file (if known) is also
 	 * supplied.
-	 * 
+	 *
 	 * @param file the file that has been written
 	 * @param fileType the kind of file from the FILETYPE_XXX constants defined in this type
 	 */

ajde.core/src/main/java/org/aspectj/ajde/core/JavaOptions.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.core;
@@ -19,7 +19,7 @@ import org.aspectj.org.eclipse.jdt.internal.compiler.impl.CompilerOptions;
  * Class containing the current custom java options
  */
 public final class JavaOptions {
-	
+
 	public static final String COMPLIANCE_LEVEL = CompilerOptions.OPTION_Compliance;
 	public static final String SOURCE_COMPATIBILITY_LEVEL = CompilerOptions.OPTION_Source;
 	public static final String TARGET_COMPATIBILITY_LEVEL = CompilerOptions.OPTION_TargetPlatform;
@@ -28,46 +28,46 @@ public final class JavaOptions {
 	public static final String VERSION_14 = CompilerOptions.VERSION_1_4;
 	public static final String VERSION_15 = CompilerOptions.VERSION_1_5;
 	public static final String VERSION_16 = CompilerOptions.VERSION_1_6;
-	
-	// by default will use the platform default encoding 
+
+	// by default will use the platform default encoding
 	public static final String CHARACTER_ENCODING = CompilerOptions.OPTION_Encoding;
-	
+
 	// indicates if unused/optimizable local variables need to be preserved (debugging purpose)
 	public static final String PRESERVE_ALL_LOCALS = CompilerOptions.OPTION_PreserveUnusedLocal;
 	public static final String PRESERVE = CompilerOptions.PRESERVE;
 	public static final String OPTIMIZE = CompilerOptions.OPTIMIZE_OUT;
-	
+
 	// Warning constants
 	public static final String WARN_METHOD_WITH_CONSTRUCTOR_NAME = CompilerOptions.OPTION_ReportMethodWithConstructorName;
-	public static final String WARN_OVERRIDING_PACKAGE_DEFAULT_METHOD = CompilerOptions.OPTION_ReportOverridingPackageDefaultMethod;	
-	public static final String WARN_DEPRECATION = CompilerOptions.OPTION_ReportDeprecation;	
-	public static final String WARN_HIDDEN_CATCH_BLOCKS = CompilerOptions.OPTION_ReportHiddenCatchBlock;	
-	public static final String WARN_UNUSED_LOCALS = CompilerOptions.OPTION_ReportUnusedLocal;	
-	public static final String WARN_UNUSED_PARAMETER = CompilerOptions.OPTION_ReportUnusedParameter;	
-	public static final String WARN_UNUSED_IMPORTS = CompilerOptions.OPTION_ReportUnusedImport;	
-	public static final String WARN_SYNTHETIC_ACCESS = CompilerOptions.OPTION_ReportSyntheticAccessEmulation;	
-	public static final String WARN_ASSERT_IDENITIFIER = CompilerOptions.OPTION_ReportAssertIdentifier;	
+	public static final String WARN_OVERRIDING_PACKAGE_DEFAULT_METHOD = CompilerOptions.OPTION_ReportOverridingPackageDefaultMethod;
+	public static final String WARN_DEPRECATION = CompilerOptions.OPTION_ReportDeprecation;
+	public static final String WARN_HIDDEN_CATCH_BLOCKS = CompilerOptions.OPTION_ReportHiddenCatchBlock;
+	public static final String WARN_UNUSED_LOCALS = CompilerOptions.OPTION_ReportUnusedLocal;
+	public static final String WARN_UNUSED_PARAMETER = CompilerOptions.OPTION_ReportUnusedParameter;
+	public static final String WARN_UNUSED_IMPORTS = CompilerOptions.OPTION_ReportUnusedImport;
+	public static final String WARN_SYNTHETIC_ACCESS = CompilerOptions.OPTION_ReportSyntheticAccessEmulation;
+	public static final String WARN_ASSERT_IDENITIFIER = CompilerOptions.OPTION_ReportAssertIdentifier;
 	public static final String WARN_NON_NLS = CompilerOptions.OPTION_ReportNonExternalizedStringLiteral;
 	// warning option constants
 	public static final String IGNORE = CompilerOptions.IGNORE;
 	public static final String WARNING = CompilerOptions.WARNING;
-	
-	// Debug constants	
+
+	// Debug constants
 	public static final String DEBUG_SOURCE = CompilerOptions.OPTION_SourceFileAttribute;
 	public static final String DEBUG_LINES  = CompilerOptions.OPTION_LocalVariableAttribute;
 	public static final String DEBUG_VARS   = CompilerOptions.OPTION_LineNumberAttribute;
 	// Debug option constants
 	public static final String GENERATE = CompilerOptions.GENERATE;
 	public static final String DO_NOT_GENERATE = CompilerOptions.DO_NOT_GENERATE;
-	
+
 	private static Map<String,String> defaultOptionsMap;
-	
+
 	/**
 	 * @return the java options map with the default settings
 	 */
 	public static Map<String,String> getDefaultJavaOptions() {
 		if (defaultOptionsMap != null) return defaultOptionsMap;
-		
+
 		defaultOptionsMap = new HashMap<>();
 		defaultOptionsMap.put(COMPLIANCE_LEVEL, VERSION_14);
 		defaultOptionsMap.put(SOURCE_COMPATIBILITY_LEVEL, VERSION_13);
@@ -85,10 +85,10 @@ public final class JavaOptions {
 		defaultOptionsMap.put(DEBUG_SOURCE, GENERATE);
 		defaultOptionsMap.put(DEBUG_LINES, GENERATE);
 		defaultOptionsMap.put(DEBUG_VARS, DO_NOT_GENERATE);
-		
+
 		return defaultOptionsMap;
 	}
-	
+
 	/**
 	 * @return true if the given value is a valid JVM version
 	 * (JavaOptions.VERSION_13, JavaOptions.VERSION_134, JavaOptions.VERSION_15,
@@ -100,23 +100,23 @@ public final class JavaOptions {
 	}
 
 	/**
-	 * @return true if the given option is JavaOptions.PRESERVE or 
+	 * @return true if the given option is JavaOptions.PRESERVE or
 	 * JavaOptions.OPTIMIZE and false otherwise
 	 */
 	public static boolean isValidPreserveAllLocalsOption(String option) {
 		return PRESERVE.equals(option) || OPTIMIZE.equals(option);
 	}
-	
+
 	/**
-	 * @return true if the given option is JavaOptions.IGNORE or 
+	 * @return true if the given option is JavaOptions.IGNORE or
 	 * JavaOptions.WARNING and false otherwise
 	 */
 	public static boolean isIgnoreOrWarning(String option) {
 		return IGNORE.equals(option) || WARNING.equals(option);
 	}
-	
+
 	/**
-	 * @return true if the given option is JavaOptions.GENERATE or 
+	 * @return true if the given option is JavaOptions.GENERATE or
 	 * JavaOptions.DO_NOT_GENERATE and false otherwise
 	 */
 	public static boolean isGenerateOrNot(String option) {

ajde.core/src/main/java/org/aspectj/ajde/core/internal/AjdeCoreBuildManager.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)

ajde.core/src/main/java/org/aspectj/ajde/core/internal/AjdeCoreBuildNotifierAdapter.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 (pr148190) 
+ *     Helen Hawkins  converted to new interface (pr148190)
  * ******************************************************************/
 
 
@@ -18,8 +18,8 @@ import org.aspectj.ajde.core.IBuildProgressMonitor;
 import org.aspectj.bridge.IProgressListener;
 
 /**
- * Enables the compiler/weaver progres to be related to the user via the 
- * IBuildProgressMonitor as well as relating whether or not the user has 
+ * Enables the compiler/weaver progres to be related to the user via the
+ * IBuildProgressMonitor as well as relating whether or not the user has
  * cancelled the build progress back to the compiler/weaver.
  */
 public class AjdeCoreBuildNotifierAdapter implements IProgressListener {

ajde.core/src/main/java/org/aspectj/ajde/core/internal/AjdeCoreMessageHandlerAdapter.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.core.internal;
@@ -23,11 +23,11 @@ import org.aspectj.bridge.IMessage.Kind;
 public class AjdeCoreMessageHandlerAdapter implements IMessageHandler {
 
 	private IBuildMessageHandler handler;
-	
+
 	public AjdeCoreMessageHandlerAdapter(IBuildMessageHandler messageHandler) {
 		this.handler = messageHandler;
 	}
-	
+
 	public void dontIgnore(Kind kind) {
 		handler.dontIgnore(kind);
 	}

ajde.core/src/main/java/org/aspectj/ajde/core/internal/OutputLocationAdapter.java

@@ -1,14 +1,14 @@
 /********************************************************************
- * Copyright (c) 2006 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: 
+ * Copyright (c) 2006 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:
  *   Adrian Colyer			Initial implementation
  *   Helen Hawkins          converted to new interface (bug 148190)
- *   
+ *
  *******************************************************************/
 package org.aspectj.ajde.core.internal;
 
@@ -64,7 +64,7 @@ public class OutputLocationAdapter implements CompilationResultDestinationManage
 
 	/**
 	 * Return a map from fully qualified jar/dir entries to handle components.
-	 * 
+	 *
 	 * @return a map from inpath entries (jars/dirs) to handle components.
 	 */
 	public Map<File,String> getInpathMap() {

ajde.core/src/test/java/org/aspectj/ajde/core/AjdeCoreModuleTests.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

ajde.core/src/test/java/org/aspectj/ajde/core/AjdeCoreTestCase.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
  *******************************************************************/
 package org.aspectj.ajde.core;

ajde.core/src/test/java/org/aspectj/ajde/core/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

ajde.core/src/test/java/org/aspectj/ajde/core/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

ajde.core/src/test/java/org/aspectj/ajde/core/TestMessageHandler.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

ajde.core/src/test/java/org/aspectj/ajde/core/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
  *******************************************************************/
 package org.aspectj.ajde.core;

ajde.core/src/test/java/org/aspectj/ajde/core/tests/AjConfigTest.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
  *******************************************************************/
 package org.aspectj.ajde.core.tests;

ajde.core/src/test/java/org/aspectj/ajde/core/tests/BuildCancellingTest.java

@@ -1,12 +1,12 @@
 /********************************************************************
  * Copyright (c) 2004 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://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:
  *    Andy Clement     Initial version
  *    Helen Hawkins    Converted to new interface (bug 148190)
  * ******************************************************************/
@@ -21,21 +21,21 @@ import org.aspectj.ajde.core.TestCompilerConfiguration;
  * weaving phases - this testcase verifies a few cases, making sure the process
  * stops when expected. It can check the disk contents, but it doesn't right
  * now.
- * 
+ *
  * Two different .lst files are used during these tests: LoadsaCode.lst and
  * EvenMoreCode.lst which contain mixes of aspects and classes
- * 
+ *
  * Here are some things to think about that will help you understand what is on
  * the disk when we cancel the compiler.
- * 
+ *
  * There are 3 important phases worth remembering : - Compile all the types -
  * Weave all the aspects - Weave all the classes
- * 
+ *
  * Each of those steps goes through all the types. This means during the 'weave
  * all the aspects' step we are jumping over classes and during the 'weave all
  * the classes ' step we are jumping over aspects. Why is this important?
- * 
- * 
+ *
+ *
  * We only write bytes out during the 'weave all the classes ' phase and it is
  * even during that phase that we write out the bytes for aspects. This means if
  * you cancel during compilation or during the weaving of aspects - there will
@@ -204,10 +204,10 @@ public class BuildCancellingTest extends AjdeCoreTestCase {
 	 * After first weave class message, get it to cancel, there should be one
 	 * more warning message about cancelling the weave and their should be
 	 * nothing on the disk.
-	 * 
+	 *
 	 * EvenMoreCode.lst contains: A1.aj Cl1.java A2.aj Cl2.java HW.java A3.aj
 	 * Cl3.java A4.aj
-	 * 
+	 *
 	 */
 	public void testCancelFirstClassWeave() {
 		if (debugTests)
@@ -238,10 +238,10 @@ public class BuildCancellingTest extends AjdeCoreTestCase {
 	 * After first weave aspect message, get it to cancel, there should be one
 	 * more warning message about cancelling the weave and their should be
 	 * nothing on the disk.
-	 * 
+	 *
 	 * EvenMoreCode.lst contains: A1.aj Cl1.java A2.aj Cl2.java HW.java A3.aj
 	 * Cl3.java A4.aj
-	 * 
+	 *
 	 */
 	public void testCancelSecondClassWeave() {
 		if (debugTests)

ajde.core/src/test/java/org/aspectj/ajde/core/tests/CompilerMessagesTest.java

@@ -1,12 +1,12 @@
 /* *******************************************************************
  * Copyright (c) 2003 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://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:
  *     AMC 2003         initial version
  *     Helen Hawkins    Converted to new interface (bug 148190)
  * ******************************************************************/
@@ -28,7 +28,7 @@ public class CompilerMessagesTest extends AjdeCoreTestCase {
 	private TestCompilerConfiguration compilerConfig;
 	private String[] files = { "apackage" + File.separator + "InitCatcher.java",
 			"apackage" + File.separator + "SomeClass.java" };
-	
+
 	protected void setUp() throws Exception {
 		super.setUp();
 		initialiseProject("declare-warning");
@@ -43,7 +43,7 @@ public class CompilerMessagesTest extends AjdeCoreTestCase {
 		handler = null;
 		compilerConfig = null;
 	}
-	
+
 	public void testMessages() {
 		// bug 33474
 		// The build has happened, what messages did the compiler give, and do they
@@ -53,7 +53,7 @@ public class CompilerMessagesTest extends AjdeCoreTestCase {
             assertTrue("not two messages: " + msgs, false);
         }
 		assertEquals("Two warning messages should be produced",2,msgs.size());
-		TestMessageHandler.TestMessage msg = 
+		TestMessageHandler.TestMessage msg =
 			(TestMessageHandler.TestMessage) msgs.get(0);
 		assertEquals( 8, msg.getContainedMessage().getSourceLocation().getLine());
 		assertEquals( "Please don't call init methods", msg.getContainedMessage().getMessage());
@@ -62,13 +62,13 @@ public class CompilerMessagesTest extends AjdeCoreTestCase {
 			// this name has a tester specific prefix, followed by the location of the file.
 			// we can validate the ending.
 			fullyQualifiedFile = fullyQualifiedFile.replace('\\','/');  // ignore platform differences in slashes
-			assertTrue( "Fully-qualified source file location returned", 
+			assertTrue( "Fully-qualified source file location returned",
 				fullyQualifiedFile.endsWith("/declare-warning/apackage/SomeClass.java"));
 		} catch (IOException ex) {
 			assertTrue( "Unable to convert source file location: " + msg.getContainedMessage().getSourceLocation().getSourceFile(), false);
 		}
 	}
-	
+
 	public void testDeclareMessageContents() {
 		List<TestMessage> msgs = handler.getMessages();
 		IMessage msg = ((TestMessageHandler.TestMessage)msgs.get(1)).getContainedMessage();

ajde.core/src/test/java/org/aspectj/ajde/core/tests/DuplicateManifestTest.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:
  *     Matthew Webster - initial implementation
  *     Helen Hawkins   - Converted to new interface (bug 148190)

ajde.core/src/test/java/org/aspectj/ajde/core/tests/InpathTest.java

@@ -1,14 +1,14 @@
 /* *******************************************************************
  * Copyright (c) 2003 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://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:
  *     Mik Kersten     initial implementation
- *    Andy Clement     Copied/changed for -inpath testing 
+ *    Andy Clement     Copied/changed for -inpath testing
  *    Helen Hawkins    Changed to use new ajde interface (bug 148190)
  * ******************************************************************/
 package org.aspectj.ajde.core.tests;
@@ -67,7 +67,7 @@ public class InpathTest extends AjdeCoreTestCase {
 
 	/**
 	 * Inputs to the compiler: inpath = 'indir1/' source = 'src' output = a jar file
-	 * 
+	 *
 	 * Expected result = output jar file contains contents of indir1 and class file for source that was in src
 	 */
 	public void testInpathToOutjar() {
@@ -97,7 +97,7 @@ public class InpathTest extends AjdeCoreTestCase {
 
 	/**
 	 * Similar to the first test but outputs to a directory rather than a jar.
-	 * 
+	 *
 	 */
 	public void testInpathToBin() {
 		Set<File> inpath = new HashSet<>();
@@ -126,10 +126,10 @@ public class InpathTest extends AjdeCoreTestCase {
 	/**
 	 * Inputs to the compiler: inpath is 'indir2' that contains a helloworld source file and class file. source is 'src2' which
 	 * contains Aspect.java which weaves before advice into the HelloWorld code from 'indir2'
-	 * 
+	 *
 	 * Expected result: HelloWorld copied through to output jar and 'weaved'. Compiled version of Aspect.java put into the output
 	 * jar. The HelloWorld.java source file is also copied through to the output jar.
-	 * 
+	 *
 	 * 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() {
@@ -174,11 +174,11 @@ public class InpathTest extends AjdeCoreTestCase {
 
 	/**
 	 * More complex inpath - a jar and a directory
-	 * 
+	 *
 	 * Inputs: -inpath injar.jar;indir2 source is 'src2' which contains Aspect.java
-	 * 
+	 *
 	 * Expected result: Result should be a directory containing the contents of injar.jar and indir2 and the Aspect.class file.
-	 * 
+	 *
 	 */
 	public void testInpathAndInjarToBin() {
 		Set<File> inpath = new HashSet<>();

ajde.core/src/test/java/org/aspectj/ajde/core/tests/JarManifestTest.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:
  *     IBM Corporation - initial API and implementation
  *     Helen Hawkins   - Converted to new interface (bug 148190)
@@ -27,7 +27,7 @@ public class JarManifestTest extends AjdeCoreTestCase {
 
 	private String[] weave = { "src" + File.separator + "Main.java",
 			"src" + File.separator + "Logging.aj" };
-	
+
 	private TestMessageHandler handler;
 	private TestCompilerConfiguration compilerConfig;
 
@@ -44,7 +44,7 @@ public class JarManifestTest extends AjdeCoreTestCase {
 		handler = null;
 		compilerConfig = null;
 	}
-	
+
 	public void testWeave () {
 		File outjar = openFile(outjarName);
 		compilerConfig.setOutjar(outjar.getAbsolutePath());
@@ -54,7 +54,7 @@ public class JarManifestTest extends AjdeCoreTestCase {
 				+ handler.getMessages(), handler.getMessages().isEmpty());
 		checkManifest(outjar);
 	}
-	
+
 	public void testNoWeave () {
 		File outjar = openFile(outjarName);
 		compilerConfig.setOutjar(outjar.getAbsolutePath());
@@ -65,7 +65,7 @@ public class JarManifestTest extends AjdeCoreTestCase {
 				+ handler.getMessages(), handler.getMessages().isEmpty());
 		checkManifest(outjar);
 	}
-	
+
 	private void checkManifest (File outjarFile) {
 		Manifest manifest = null;
 

ajde.core/src/test/java/org/aspectj/ajde/core/tests/OutxmlTest.java

@@ -1,9 +1,9 @@
 /********************************************************************
  * Copyright (c) 2003 Contributors. All rights reserved.
  * This program and the accompanying materials are made available