Skip to content

Commit 49cb924

Browse files
committed
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 <[email protected]>
1 parent 82df3f0 commit 49cb924

File tree

1,671 files changed

+17965
-17890
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,671 files changed

+17965
-17890
lines changed

LICENSE

+249-169
Large diffs are not rendered by default.

ajbrowser/src/main/java/org/aspectj/tools/ajbrowser/BrowserManager.java

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
/* *******************************************************************
2-
* Copyright (c) 1999-2001 Xerox Corporation,
2+
* Copyright (c) 1999-2001 Xerox Corporation,
33
* 2002 Palo Alto Research Center, Incorporated (PARC).
4-
* All rights reserved.
5-
* This program and the accompanying materials are made available
6-
* under the terms of the Eclipse Public License v1.0
7-
* which accompanies this distribution and is available at
8-
* http://www.eclipse.org/legal/epl-v10.html
9-
*
10-
* Contributors:
4+
* All rights reserved.
5+
* This program and the accompanying materials are made available
6+
* under the terms of the Eclipse Public License v 2.0
7+
* which accompanies this distribution and is available at
8+
* https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt
9+
*
10+
* Contributors:
1111
* Xerox/PARC initial implementation
1212
* Helen Hawkins Converted to new interface (bug 148190)
1313
* ******************************************************************/
@@ -49,7 +49,7 @@
4949

5050
/**
5151
* IDE manager for standalone AJDE application.
52-
*
52+
*
5353
* @author Mik Kersten
5454
*/
5555
public class BrowserManager {
@@ -107,7 +107,7 @@ public void init(String[] configFilesArgs, boolean visible) {
107107

108108
/**
109109
* Find and create the set of build configuration files
110-
*
110+
*
111111
* @param configFilesArgs
112112
*/
113113
private void setUpConfigFiles(String[] configFilesArgs) {

ajbrowser/src/main/java/org/aspectj/tools/ajbrowser/Main.java

+11-11
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
/* *******************************************************************
2-
* Copyright (c) 1999-2001 Xerox Corporation,
2+
* Copyright (c) 1999-2001 Xerox Corporation,
33
* 2002 Palo Alto Research Center, Incorporated (PARC).
4-
* All rights reserved.
5-
* This program and the accompanying materials are made available
6-
* under the terms of the Eclipse Public License v1.0
7-
* which accompanies this distribution and is available at
8-
* http://www.eclipse.org/legal/epl-v10.html
9-
*
10-
* Contributors:
11-
* Xerox/PARC initial implementation
4+
* All rights reserved.
5+
* This program and the accompanying materials are made available
6+
* under the terms of the Eclipse Public License v 2.0
7+
* which accompanies this distribution and is available at
8+
* https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt
9+
*
10+
* Contributors:
11+
* Xerox/PARC initial implementation
1212
* ******************************************************************/
1313

1414
package org.aspectj.tools.ajbrowser;
@@ -23,7 +23,7 @@ public class Main {
2323

2424
/**
2525
* Run ajbrowser if args contains only .lst files and ajc otherwise.
26-
*
26+
*
2727
* @param args the String[] of args to interpret
2828
*/
2929
public static void main(String[] args) {
@@ -34,7 +34,7 @@ public static void main(String[] args) {
3434

3535
/**
3636
* Invoke the compiler if there are arguments and some are not .lst files.
37-
*
37+
*
3838
* @return false if compiler was not invoked and the browser main should be
3939
*/
4040
static boolean compilerMain(String[] args) {

ajbrowser/src/main/java/org/aspectj/tools/ajbrowser/core/BrowserBuildProgressMonitor.java

+13-13
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/********************************************************************
2-
* Copyright (c) 2007 Contributors. All rights reserved.
3-
* This program and the accompanying materials are made available
4-
* under the terms of the Eclipse Public License v1.0
5-
* which accompanies this distribution and is available at
6-
* http://eclipse.org/legal/epl-v10.html
7-
*
8-
* Contributors: IBM Corporation - initial API and implementation
2+
* Copyright (c) 2007 Contributors. All rights reserved.
3+
* This program and the accompanying materials are made available
4+
* under the terms of the Eclipse Public License v 2.0
5+
* which accompanies this distribution and is available at
6+
* https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt
7+
*
8+
* Contributors: IBM Corporation - initial API and implementation
99
* Helen Hawkins - initial version (bug 148190)
1010
*******************************************************************/
1111
package org.aspectj.tools.ajbrowser.core;
@@ -27,13 +27,13 @@
2727
public class BrowserBuildProgressMonitor extends Thread implements IBuildProgressMonitor {
2828

2929
public static final String PROGRESS_HEADING = "AspectJ Build";
30-
30+
3131
private BuildProgressPanel progressDialog = null;
3232
private JDialog dialog = null;
3333
private TopFrame topFrame;
34-
34+
3535
private BrowserMessageHandler handler;
36-
36+
3737
public BrowserBuildProgressMonitor(BrowserMessageHandler handler) {
3838
this.handler = handler;
3939
topFrame = (TopFrame) BrowserManager.getDefault().getRootFrame();
@@ -42,16 +42,16 @@ public BrowserBuildProgressMonitor(BrowserMessageHandler handler) {
4242
dialog.setContentPane(progressDialog);
4343
dialog.setSize(550, 120);
4444
try {
45-
dialog.setLocationRelativeTo(topFrame);
45+
dialog.setLocationRelativeTo(topFrame);
4646
} catch (NoSuchMethodError nsme) {
4747
// running on 1.3
4848
}
4949
}
50-
50+
5151
public void finish(boolean wasFullBuild) {
5252
Ajde.getDefault().getIdeUIAdapter().displayStatusInformation("build finished...");
5353
progressDialog.finish();
54-
dialog.dispose();
54+
dialog.dispose();
5555
if (handler.getMessages().isEmpty()) {
5656
topFrame.hideMessagesPanel(handler);
5757
} else {

ajbrowser/src/main/java/org/aspectj/tools/ajbrowser/core/BrowserCompilerConfiguration.java

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/********************************************************************
2-
* Copyright (c) 2007 Contributors. All rights reserved.
3-
* This program and the accompanying materials are made available
4-
* under the terms of the Eclipse Public License v1.0
5-
* which accompanies this distribution and is available at
6-
* http://eclipse.org/legal/epl-v10.html
7-
*
8-
* Contributors: IBM Corporation - initial API and implementation
2+
* Copyright (c) 2007 Contributors. All rights reserved.
3+
* This program and the accompanying materials are made available
4+
* under the terms of the Eclipse Public License v 2.0
5+
* which accompanies this distribution and is available at
6+
* https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt
7+
*
8+
* Contributors: IBM Corporation - initial API and implementation
99
* Helen Hawkins - initial version (bug 148190)
1010
*******************************************************************/
1111
package org.aspectj.tools.ajbrowser.core;

ajbrowser/src/main/java/org/aspectj/tools/ajbrowser/core/BrowserErrorHandler.java

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/********************************************************************
2-
* Copyright (c) 2007 Contributors. All rights reserved.
3-
* This program and the accompanying materials are made available
4-
* under the terms of the Eclipse Public License v1.0
5-
* which accompanies this distribution and is available at
6-
* http://eclipse.org/legal/epl-v10.html
7-
*
8-
* Contributors: IBM Corporation - initial API and implementation
2+
* Copyright (c) 2007 Contributors. All rights reserved.
3+
* This program and the accompanying materials are made available
4+
* under the terms of the Eclipse Public License v 2.0
5+
* which accompanies this distribution and is available at
6+
* https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt
7+
*
8+
* Contributors: IBM Corporation - initial API and implementation
99
* Helen Hawkins - initial version (bug 148190)
1010
*******************************************************************/
1111
package org.aspectj.tools.ajbrowser.core;
@@ -47,7 +47,7 @@ private static String getStackTraceAsString(Throwable t) {
4747
if (t != null) {
4848
t.printStackTrace(new PrintWriter(stringWriter));
4949
return stringWriter.getBuffer().toString();
50-
}
50+
}
5151
return "<no stack trace available>";
5252
}
5353

ajbrowser/src/main/java/org/aspectj/tools/ajbrowser/core/BrowserOutputLocationManager.java

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/********************************************************************
2-
* Copyright (c) 2007 Contributors. All rights reserved.
3-
* This program and the accompanying materials are made available
4-
* under the terms of the Eclipse Public License v1.0
5-
* which accompanies this distribution and is available at
6-
* http://eclipse.org/legal/epl-v10.html
7-
*
8-
* Contributors: IBM Corporation - initial API and implementation
2+
* Copyright (c) 2007 Contributors. All rights reserved.
3+
* This program and the accompanying materials are made available
4+
* under the terms of the Eclipse Public License v 2.0
5+
* which accompanies this distribution and is available at
6+
* https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt
7+
*
8+
* Contributors: IBM Corporation - initial API and implementation
99
* Helen Hawkins - initial version (bug 148190)
1010
*******************************************************************/
1111
package org.aspectj.tools.ajbrowser.core;
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/********************************************************************
2-
* Copyright (c) 2007 Contributors. All rights reserved.
3-
* This program and the accompanying materials are made available
4-
* under the terms of the Eclipse Public License v1.0
5-
* which accompanies this distribution and is available at
6-
* http://eclipse.org/legal/epl-v10.html
7-
*
8-
* Contributors: IBM Corporation - initial API and implementation
2+
* Copyright (c) 2007 Contributors. All rights reserved.
3+
* This program and the accompanying materials are made available
4+
* under the terms of the Eclipse Public License v 2.0
5+
* which accompanies this distribution and is available at
6+
* https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt
7+
*
8+
* Contributors: IBM Corporation - initial API and implementation
99
* Helen Hawkins - initial version (bug 148190)
1010
*******************************************************************/
1111
package org.aspectj.tools.ajbrowser.core;
@@ -20,5 +20,5 @@ public class PreferenceStoreConstants {
2020
public static final String BUILD_OUTPUTPATH = "build.outputpath";
2121
public static final String JAVA_CLASSPATH = "java.class.path";
2222
public static final String NONSTANDARD_OPTIONS = "ajc.nonStandardOptions";
23-
23+
2424
}

ajbrowser/src/main/java/org/aspectj/tools/ajbrowser/ui/BasicEditor.java

+12-12
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
/* *******************************************************************
2-
* Copyright (c) 1999-2001 Xerox Corporation,
2+
* Copyright (c) 1999-2001 Xerox Corporation,
33
* 2002 Palo Alto Research Center, Incorporated (PARC).
4-
* All rights reserved.
5-
* This program and the accompanying materials are made available
6-
* under the terms of the Eclipse Public License v1.0
7-
* which accompanies this distribution and is available at
8-
* http://www.eclipse.org/legal/epl-v10.html
9-
*
10-
* Contributors:
4+
* All rights reserved.
5+
* This program and the accompanying materials are made available
6+
* under the terms of the Eclipse Public License v 2.0
7+
* which accompanies this distribution and is available at
8+
* https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt
9+
*
10+
* Contributors:
1111
* Xerox/PARC initial implementation
12-
* Helen Hawkins Converted to new interface (bug 148190)
12+
* Helen Hawkins Converted to new interface (bug 148190)
1313
* ******************************************************************/
1414

1515

@@ -80,7 +80,7 @@ public void showSourceLine(ISourceLocation sourceLocation, boolean highlight) {
8080
Ajde.getDefault().getIdeUIAdapter().displayStatusInformation(" no corresponding source line to seek to");
8181
}
8282
}
83-
83+
8484
public void showSourceLine(int lineNumber, boolean highlight) {
8585
showSourceLine(filePath, lineNumber, highlight);
8686
}
@@ -95,7 +95,7 @@ public void pasteToCaretPos(String text) {
9595

9696
public void showSourceLine(String filePath, int lineNumber, boolean highlight) {
9797
//AjdeUIManager.getDefault().getIdeUIAdapter().resetEditor();
98-
98+
9999
this.filePath = filePath;
100100
// if (oldPath != filePath && !Ajde.INSTANCE.BROWSER_MANAGER.isGlobalMode()) {
101101
// Ajde.INSTANCE.BROWSER_MANAGER.updateView();
@@ -121,7 +121,7 @@ public void showSourceLine(String filePath, int lineNumber, boolean highlight) {
121121
public void showSourcelineAnnotation(String filePath, int lineNumber, java.util.List items) { }
122122

123123
public void addEditorViewForSourceLine(String filePath, int lineNumber) {
124-
124+
125125
}
126126

127127
public void saveContents() throws IOException {

ajbrowser/src/main/java/org/aspectj/tools/ajbrowser/ui/BrowserMessageHandler.java

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/********************************************************************
2-
* Copyright (c) 2007 Contributors. All rights reserved.
3-
* This program and the accompanying materials are made available
4-
* under the terms of the Eclipse Public License v1.0
5-
* which accompanies this distribution and is available at
6-
* http://eclipse.org/legal/epl-v10.html
7-
*
8-
* Contributors: IBM Corporation - initial API and implementation
2+
* Copyright (c) 2007 Contributors. All rights reserved.
3+
* This program and the accompanying materials are made available
4+
* under the terms of the Eclipse Public License v 2.0
5+
* which accompanies this distribution and is available at
6+
* https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt
7+
*
8+
* Contributors: IBM Corporation - initial API and implementation
99
* Helen Hawkins - initial version (bug 148190)
1010
*******************************************************************/
1111
package org.aspectj.tools.ajbrowser.ui;

ajbrowser/src/main/java/org/aspectj/tools/ajbrowser/ui/BrowserRuntimeProperties.java

+9-9
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/********************************************************************
2-
* Copyright (c) 2007 Contributors. All rights reserved.
3-
* This program and the accompanying materials are made available
4-
* under the terms of the Eclipse Public License v1.0
5-
* which accompanies this distribution and is available at
6-
* http://eclipse.org/legal/epl-v10.html
7-
*
8-
* Contributors: IBM Corporation - initial API and implementation
2+
* Copyright (c) 2007 Contributors. All rights reserved.
3+
* This program and the accompanying materials are made available
4+
* under the terms of the Eclipse Public License v 2.0
5+
* which accompanies this distribution and is available at
6+
* https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt
7+
*
8+
* Contributors: IBM Corporation - initial API and implementation
99
* Helen Hawkins - initial version (bug 148190)
1010
*******************************************************************/
1111
package org.aspectj.tools.ajbrowser.ui;
@@ -21,11 +21,11 @@
2121
public class BrowserRuntimeProperties implements IRuntimeProperties {
2222

2323
private UserPreferencesAdapter preferencesAdapter;
24-
24+
2525
public BrowserRuntimeProperties(UserPreferencesAdapter preferencesAdapter) {
2626
this.preferencesAdapter = preferencesAdapter;
2727
}
28-
28+
2929
public String getClassToExecute() {
3030
return preferencesAdapter.getProjectPreference(PreferenceStoreConstants.RUNTIME_MAINCLASS);
3131
}

ajbrowser/src/main/java/org/aspectj/tools/ajbrowser/ui/BrowserUIAdapter.java

+11-11
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
/* *******************************************************************
2-
* Copyright (c) 1999-2001 Xerox Corporation,
2+
* Copyright (c) 1999-2001 Xerox Corporation,
33
* 2002 Palo Alto Research Center, Incorporated (PARC).
4-
* All rights reserved.
5-
* This program and the accompanying materials are made available
6-
* under the terms of the Eclipse Public License v1.0
7-
* which accompanies this distribution and is available at
8-
* http://www.eclipse.org/legal/epl-v10.html
9-
*
10-
* Contributors:
11-
* Xerox/PARC initial implementation
4+
* All rights reserved.
5+
* This program and the accompanying materials are made available
6+
* under the terms of the Eclipse Public License v 2.0
7+
* which accompanies this distribution and is available at
8+
* https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt
9+
*
10+
* Contributors:
11+
* Xerox/PARC initial implementation
1212
* ******************************************************************/
1313

14-
14+
1515
package org.aspectj.tools.ajbrowser.ui;
1616

1717
import org.aspectj.ajde.IdeUIAdapter;
@@ -22,7 +22,7 @@
2222
* information in the status bar at the bottom of the AjBrowser GUI.
2323
*/
2424
public class BrowserUIAdapter implements IdeUIAdapter {
25-
25+
2626
public void displayStatusInformation(String message) {
2727
BrowserManager.getDefault().setStatusInformation(message);
2828
}

0 commit comments

Comments
 (0)