Skip to content

Commit

Permalink
Upgrade license from CPLv1/EPLv1 to EPLv2
Browse files Browse the repository at this point in the history
This was required by the Eclipse team as one precondition for the next
release.

Signed-off-by: Alexander Kriegisch <[email protected]>
  • Loading branch information
kriegaex committed Jun 4, 2021
1 parent 82df3f0 commit 49cb924
Show file tree
Hide file tree
Showing 1,671 changed files with 17,965 additions and 17,890 deletions.
418 changes: 249 additions & 169 deletions LICENSE

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -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)
* ******************************************************************/
Expand Down Expand Up @@ -49,7 +49,7 @@

/**
* IDE manager for standalone AJDE application.
*
*
* @author Mik Kersten
*/
public class BrowserManager {
Expand Down Expand Up @@ -107,7 +107,7 @@ public void init(String[] configFilesArgs, boolean visible) {

/**
* Find and create the set of build configuration files
*
*
* @param configFilesArgs
*/
private void setUpConfigFiles(String[] configFilesArgs) {
Expand Down
22 changes: 11 additions & 11 deletions ajbrowser/src/main/java/org/aspectj/tools/ajbrowser/Main.java
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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) {
Expand All @@ -34,7 +34,7 @@ public static void main(String[] args) {

/**
* 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) {
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -27,13 +27,13 @@
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();
Expand All @@ -42,16 +42,16 @@ public BrowserBuildProgressMonitor(BrowserMessageHandler handler) {
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 {
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down Expand Up @@ -47,7 +47,7 @@ private static String getStackTraceAsString(Throwable t) {
if (t != null) {
t.printStackTrace(new PrintWriter(stringWriter));
return stringWriter.getBuffer().toString();
}
}
return "<no stack trace available>";
}

Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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";

}
Original file line number Diff line number Diff line change
@@ -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)
* ******************************************************************/


Expand Down Expand Up @@ -80,7 +80,7 @@ public void showSourceLine(ISourceLocation sourceLocation, boolean highlight) {
Ajde.getDefault().getIdeUIAdapter().displayStatusInformation(" no corresponding source line to seek to");
}
}

public void showSourceLine(int lineNumber, boolean highlight) {
showSourceLine(filePath, lineNumber, highlight);
}
Expand All @@ -95,7 +95,7 @@ public void pasteToCaretPos(String text) {

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();
Expand All @@ -121,7 +121,7 @@ public void showSourceLine(String filePath, int lineNumber, boolean highlight) {
public void showSourcelineAnnotation(String filePath, int lineNumber, java.util.List items) { }

public void addEditorViewForSourceLine(String filePath, int lineNumber) {

}

public void saveContents() throws IOException {
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -21,11 +21,11 @@
public class BrowserRuntimeProperties implements IRuntimeProperties {

private UserPreferencesAdapter preferencesAdapter;

public BrowserRuntimeProperties(UserPreferencesAdapter preferencesAdapter) {
this.preferencesAdapter = preferencesAdapter;
}

public String getClassToExecute() {
return preferencesAdapter.getProjectPreference(PreferenceStoreConstants.RUNTIME_MAINCLASS);
}
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -22,7 +22,7 @@
* 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);
}
Expand Down
Loading

0 comments on commit 49cb924

Please sign in to comment.