diff options
| author | Alexander Kriegisch <Alexander@Kriegisch.name> | 2021-06-04 07:58:52 +0700 |
|---|---|---|
| committer | Alexander Kriegisch <Alexander@Kriegisch.name> | 2021-06-04 07:58:52 +0700 |
| commit | 49cb924f5402c9d24379ae1af62def6fa5892649 (patch) | |
| tree | 69844405209043e2e18aa9eef0f01f287bc1ae52 /ajde/src | |
| parent | 82df3f0fc9842758f15f12299c9113e48f1ccb5c (diff) | |
| download | aspectj-49cb924f5402c9d24379ae1af62def6fa5892649.tar.gz aspectj-49cb924f5402c9d24379ae1af62def6fa5892649.zip | |
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>
Diffstat (limited to 'ajde/src')
83 files changed, 869 insertions, 869 deletions
diff --git a/ajde/src/main/java/org/aspectj/ajde/Ajde.java b/ajde/src/main/java/org/aspectj/ajde/Ajde.java index 1446e8278..3eef4fd06 100644 --- a/ajde/src/main/java/org/aspectj/ajde/Ajde.java +++ b/ajde/src/main/java/org/aspectj/ajde/Ajde.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) *******************************************************************/ package org.aspectj.ajde; @@ -46,9 +46,9 @@ import org.aspectj.util.Reflection; * Singleton class used to initialize the Ajde ui as well as the properties required to run the compiler. Users must call * "Ajde.init(...)" before doing anything else. There are getter methods for the various properties that are set in the * initialization. - * + * * This also defines the factory for getting new AjCompiler instances. - * + * * @author Mik Kersten * @author Andy Clement */ @@ -159,7 +159,7 @@ public class Ajde { /** * Utility to run the project main class from the project properties in the same VM using a class loader populated with the * classpath and output path or jar. Errors are logged to the ErrorHandler. - * + * * @return Thread running with process, or null if unable to start */ public Thread runInSameVM() { @@ -184,7 +184,7 @@ public class Ajde { /** * Utility to run the project main class from the project properties in a new VM. Errors are logged to the ErrorHandler. - * + * * @return LangUtil.ProcessController running with process, or null if unable to start */ public LangUtil.ProcessController runInNewVM() { @@ -286,7 +286,7 @@ public class Ajde { /** * Set the build off in the same thread - * + * * @param configFile * @param buildFresh - true if want to do a full build, false otherwise */ @@ -304,7 +304,7 @@ public class Ajde { /** * Set the build off in a different thread. Would need to set the build off in a different thread if using a swing application * to display the build progress. - * + * * @param configFile * @param buildFresh - true if want to do a full build, false otherwise */ @@ -447,7 +447,7 @@ public class Ajde { /** * If the provided configFile is the same as the id for the last compiler then returns that, otherwise clears the state for the * saved compiler and creates a new one for the provided configFile - * + * * @param configFile * @return the AjCompiler with the id of the given configFile */ diff --git a/ajde/src/main/java/org/aspectj/ajde/EditorAdapter.java b/ajde/src/main/java/org/aspectj/ajde/EditorAdapter.java index 9e51cf8af..8200ccb5f 100644 --- a/ajde/src/main/java/org/aspectj/ajde/EditorAdapter.java +++ b/ajde/src/main/java/org/aspectj/ajde/EditorAdapter.java @@ -3,9 +3,9 @@ * 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 + * 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: * Xerox/PARC initial implementation diff --git a/ajde/src/main/java/org/aspectj/ajde/EditorListener.java b/ajde/src/main/java/org/aspectj/ajde/EditorListener.java index 6c7c087b7..8f3522c41 100644 --- a/ajde/src/main/java/org/aspectj/ajde/EditorListener.java +++ b/ajde/src/main/java/org/aspectj/ajde/EditorListener.java @@ -3,9 +3,9 @@ * 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 + * 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: * Xerox/PARC initial implementation diff --git a/ajde/src/main/java/org/aspectj/ajde/IRuntimeProperties.java b/ajde/src/main/java/org/aspectj/ajde/IRuntimeProperties.java index 2a4f20ba2..a51fce0aa 100644 --- a/ajde/src/main/java/org/aspectj/ajde/IRuntimeProperties.java +++ b/ajde/src/main/java/org/aspectj/ajde/IRuntimeProperties.java @@ -1,9 +1,9 @@ /******************************************************************** * Copyright (c) 2007 Contributors. All rights reserved. * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 + * under the terms of the Eclipse Public License v 2.0 * which accompanies this distribution and is available at - * http://eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt * * Contributors: IBM Corporation - initial API and implementation * Helen Hawkins - initial version (bug 148190) diff --git a/ajde/src/main/java/org/aspectj/ajde/IUIBuildMessageHandler.java b/ajde/src/main/java/org/aspectj/ajde/IUIBuildMessageHandler.java index 243a6947e..2ec881c92 100644 --- a/ajde/src/main/java/org/aspectj/ajde/IUIBuildMessageHandler.java +++ b/ajde/src/main/java/org/aspectj/ajde/IUIBuildMessageHandler.java @@ -1,9 +1,9 @@ /******************************************************************** * Copyright (c) 2007 Contributors. All rights reserved. * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 + * under the terms of the Eclipse Public License v 2.0 * which accompanies this distribution and is available at - * http://eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt * * Contributors: IBM Corporation - initial API and implementation * Helen Hawkins - initial version (bug 148190) diff --git a/ajde/src/main/java/org/aspectj/ajde/IconRegistry.java b/ajde/src/main/java/org/aspectj/ajde/IconRegistry.java index 8169f2735..b36378b22 100644 --- a/ajde/src/main/java/org/aspectj/ajde/IconRegistry.java +++ b/ajde/src/main/java/org/aspectj/ajde/IconRegistry.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 * ******************************************************************/ @@ -33,7 +33,7 @@ public class IconRegistry extends AbstractIconRegistry { //public static IconRegistry INSTANCE = null; protected String RESOURCE_PATH = "org/aspectj/ajde/resources/"; - + private final Icon START_AJDE = makeIcon("actions/startAjde.gif"); private final Icon STOP_AJDE = makeIcon("actions/stopAjde.gif"); private final Icon BUILD = makeIcon("actions/build.gif"); @@ -41,28 +41,28 @@ public class IconRegistry extends AbstractIconRegistry { private final Icon EXECUTE = makeIcon("actions/execute.gif"); private final Icon AJBROWSER = makeIcon("structure/advice.gif"); private final Icon AJBROWSER_ENABLED = makeIcon("actions/browserEnabled.gif"); - private final Icon AJBROWSER_DISABLED = makeIcon("actions/browserDisabled.gif"); - private final Icon STRUCTURE_VIEW = makeIcon("actions/structureView.gif"); + private final Icon AJBROWSER_DISABLED = makeIcon("actions/browserDisabled.gif"); + private final Icon STRUCTURE_VIEW = makeIcon("actions/structureView.gif"); - private final Icon HIDE_ASSOCIATIONS = makeIcon("actions/hideAssociations.gif"); - private final Icon HIDE_NON_AJ = makeIcon("actions/hideNonAJ.gif"); - private final Icon GRANULARITY = makeIcon("actions/granularity.gif"); - private final Icon AJDE_SMALL = makeIcon("actions/ajdeSmall.gif"); + private final Icon HIDE_ASSOCIATIONS = makeIcon("actions/hideAssociations.gif"); + private final Icon HIDE_NON_AJ = makeIcon("actions/hideNonAJ.gif"); + private final Icon GRANULARITY = makeIcon("actions/granularity.gif"); + private final Icon AJDE_SMALL = makeIcon("actions/ajdeSmall.gif"); private final Icon ERROR = makeIcon("structure/error.gif"); private final Icon WARNING = makeIcon("structure/warning.gif"); - private final Icon INFO = makeIcon("structure/info.gif"); + private final Icon INFO = makeIcon("structure/info.gif"); private final Icon POPUP = makeIcon("actions/popup.gif"); private final Icon FILTER = makeIcon("actions/filter.gif"); private final Icon RELATIONS = makeIcon("actions/relations.gif"); private final Icon ORDER = makeIcon("actions/order.gif"); - + private final Icon ZOOM_STRUCTURE_TO_FILE_MODE = makeIcon("actions/zoomStructureToFileMode.gif"); private final Icon ZOOM_STRUCTURE_TO_GLOBAL_MODE = makeIcon("actions/zoomStructureToGlobalMode.gif"); private final Icon SPLIT_STRUCTURE_VIEW = makeIcon("actions/splitStructureView.gif"); private final Icon MERGE_STRUCTURE_VIEW = makeIcon("actions/mergeStructureView.gif"); - + private final Icon BACK = makeIcon("actions/back.gif"); private final Icon FORWARD = makeIcon("actions/forward.gif"); private final Icon SEARCH = makeIcon("actions/search.gif"); @@ -71,7 +71,7 @@ public class IconRegistry extends AbstractIconRegistry { private final Icon SAVE = makeIcon("actions/save.gif"); private final Icon SAVE_ALL = makeIcon("actions/saveAll.gif"); private final Icon BROWSER_OPTIONS = makeIcon("actions/browseroptions.gif"); - + private final Icon ACCESSIBILITY_PUBLIC = makeIcon("structure/accessibility-public.gif"); private final Icon ACCESSIBILITY_PACKAGE = makeIcon("structure/accessibility-package.gif"); private final Icon ACCESSIBILITY_PROTECTED = makeIcon("structure/accessibility-protected.gif"); @@ -113,17 +113,17 @@ public class IconRegistry extends AbstractIconRegistry { public Icon getStructureViewIcon() { return STRUCTURE_VIEW; } public Icon getAssociationSwingIcon(IRelationship.Kind relation) { - return convertToSwingIcon(getIcon(relation)); + return convertToSwingIcon(getIcon(relation)); } - + public AbstractIcon getStructureIcon(IProgramElement.Kind kind, IProgramElement.Accessibility accessibility) { - return getIcon(kind); + return getIcon(kind); } - - public Icon getStructureSwingIcon(IProgramElement.Kind kind, IProgramElement.Accessibility accessibility) { - return convertToSwingIcon(getStructureIcon(kind, accessibility)); + + public Icon getStructureSwingIcon(IProgramElement.Kind kind, IProgramElement.Accessibility accessibility) { + return convertToSwingIcon(getStructureIcon(kind, accessibility)); } - + public Icon getStructureSwingIcon(IProgramElement.Kind kind) { return convertToSwingIcon(getIcon(kind)); } @@ -149,7 +149,7 @@ public class IconRegistry extends AbstractIconRegistry { return (Icon)iconAdapter.getIconResource(); } else { return null; - } + } } protected AbstractIcon createIcon(String path) { @@ -157,8 +157,8 @@ public class IconRegistry extends AbstractIconRegistry { if (resource == null) { throw new IllegalStateException("Unable to find icon resource: "+path); } - return new AbstractIcon(new ImageIcon(resource)); -// return new AbstractIcon(new ImageIcon(ClassLoader.getSystemResource(path))); + return new AbstractIcon(new ImageIcon(resource)); +// return new AbstractIcon(new ImageIcon(ClassLoader.getSystemResource(path))); } protected Icon makeIcon(String iconPath) { diff --git a/ajde/src/main/java/org/aspectj/ajde/IdeUIAdapter.java b/ajde/src/main/java/org/aspectj/ajde/IdeUIAdapter.java index 09f986540..bb74daa96 100644 --- a/ajde/src/main/java/org/aspectj/ajde/IdeUIAdapter.java +++ b/ajde/src/main/java/org/aspectj/ajde/IdeUIAdapter.java @@ -3,9 +3,9 @@ * 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 + * 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: * Xerox/PARC initial implementation diff --git a/ajde/src/main/java/org/aspectj/ajde/internal/BuildConfigListener.java b/ajde/src/main/java/org/aspectj/ajde/internal/BuildConfigListener.java index 9fd974e32..a0fa47833 100644 --- a/ajde/src/main/java/org/aspectj/ajde/internal/BuildConfigListener.java +++ b/ajde/src/main/java/org/aspectj/ajde/internal/BuildConfigListener.java @@ -3,9 +3,9 @@ * 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 + * 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: * Xerox/PARC initial implementation diff --git a/ajde/src/main/java/org/aspectj/ajde/internal/BuildConfigManager.java b/ajde/src/main/java/org/aspectj/ajde/internal/BuildConfigManager.java index 310662335..293bedb43 100644 --- a/ajde/src/main/java/org/aspectj/ajde/internal/BuildConfigManager.java +++ b/ajde/src/main/java/org/aspectj/ajde/internal/BuildConfigManager.java @@ -3,9 +3,9 @@ * 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 + * 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: * Xerox/PARC initial implementation diff --git a/ajde/src/main/java/org/aspectj/ajde/internal/LstBuildConfigFileParser.java b/ajde/src/main/java/org/aspectj/ajde/internal/LstBuildConfigFileParser.java index 9f0d1c818..88b7bec47 100644 --- a/ajde/src/main/java/org/aspectj/ajde/internal/LstBuildConfigFileParser.java +++ b/ajde/src/main/java/org/aspectj/ajde/internal/LstBuildConfigFileParser.java @@ -1,14 +1,14 @@ /* ******************************************************************* - * Copyright (c) 1999-2001 Xerox Corporation, + * Copyright (c) 1999-2001 Xerox Corporation, * 2002 Palo Alto Research Center, Incorporated (PARC). - * All rights reserved. - * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Xerox/PARC initial implementation + * All rights reserved. + * This program and the accompanying materials are made available + * under the terms of the Eclipse Public License v 2.0 + * which accompanies this distribution and is available at + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt + * + * Contributors: + * Xerox/PARC initial implementation * ******************************************************************/ package org.aspectj.ajde.internal; diff --git a/ajde/src/main/java/org/aspectj/ajde/internal/LstBuildConfigFileUpdater.java b/ajde/src/main/java/org/aspectj/ajde/internal/LstBuildConfigFileUpdater.java index ece904adf..8e409b4d9 100644 --- a/ajde/src/main/java/org/aspectj/ajde/internal/LstBuildConfigFileUpdater.java +++ b/ajde/src/main/java/org/aspectj/ajde/internal/LstBuildConfigFileUpdater.java @@ -3,9 +3,9 @@ * 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 + * 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: * Xerox/PARC initial implementation diff --git a/ajde/src/main/java/org/aspectj/ajde/internal/LstBuildConfigManager.java b/ajde/src/main/java/org/aspectj/ajde/internal/LstBuildConfigManager.java index 2837de76b..5a90fe77b 100644 --- a/ajde/src/main/java/org/aspectj/ajde/internal/LstBuildConfigManager.java +++ b/ajde/src/main/java/org/aspectj/ajde/internal/LstBuildConfigManager.java @@ -3,9 +3,9 @@ * 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 + * 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: * Xerox/PARC initial implementation diff --git a/ajde/src/main/java/org/aspectj/ajde/internal/StructureUtilities.java b/ajde/src/main/java/org/aspectj/ajde/internal/StructureUtilities.java index 6e84a99c5..6d75e4b31 100644 --- a/ajde/src/main/java/org/aspectj/ajde/internal/StructureUtilities.java +++ b/ajde/src/main/java/org/aspectj/ajde/internal/StructureUtilities.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.ajde.internal; //import org.aspectj.ajde.compiler.AjdeCompiler; @@ -56,7 +56,7 @@ public class StructureUtilities { */ // public static void dumpStructure(StructureNode node, String indent) { // if (node == null) return; -// Syste.println(indent + node); +// Syste.println(indent + node); // if (node.getChildren() != null) { // for (Iterator it = node.getChildren().iterator(); it.hasNext(); ) { // dumpStructure((StructureNode)it.next(), indent + " "); diff --git a/ajde/src/main/java/org/aspectj/ajde/ui/AbstractIcon.java b/ajde/src/main/java/org/aspectj/ajde/ui/AbstractIcon.java index c9485c885..4338f188c 100644 --- a/ajde/src/main/java/org/aspectj/ajde/ui/AbstractIcon.java +++ b/ajde/src/main/java/org/aspectj/ajde/ui/AbstractIcon.java @@ -1,31 +1,31 @@ /* ******************************************************************* - * Copyright (c) 1999-2001 Xerox Corporation, + * Copyright (c) 1999-2001 Xerox Corporation, * 2002 Palo Alto Research Center, Incorporated (PARC). - * All rights reserved. - * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Xerox/PARC initial implementation + * All rights reserved. + * This program and the accompanying materials are made available + * under the terms of the Eclipse Public License v 2.0 + * which accompanies this distribution and is available at + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt + * + * Contributors: + * Xerox/PARC initial implementation * ******************************************************************/ - + package org.aspectj.ajde.ui; /** * @author Mik Kersten */ public class AbstractIcon { - + private Object iconResource; - + public AbstractIcon(Object iconResource) { - this.iconResource = iconResource; - } + this.iconResource = iconResource; + } public Object getIconResource() { - return iconResource; + return iconResource; } } diff --git a/ajde/src/main/java/org/aspectj/ajde/ui/AbstractIconRegistry.java b/ajde/src/main/java/org/aspectj/ajde/ui/AbstractIconRegistry.java index a81485ca7..ba757a88f 100644 --- a/ajde/src/main/java/org/aspectj/ajde/ui/AbstractIconRegistry.java +++ b/ajde/src/main/java/org/aspectj/ajde/ui/AbstractIconRegistry.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 * ******************************************************************/ @@ -19,11 +19,11 @@ import org.aspectj.asm.IRelationship; /** * Uses the factory pattern. - * + * * @author Mik Kersten */ public abstract class AbstractIconRegistry { - + protected final String RESOURCE_PATH = "org/aspectj/ajde/resources/"; protected final String STRUCTURE_PATH = RESOURCE_PATH + "structure/"; @@ -41,12 +41,12 @@ public abstract class AbstractIconRegistry { protected final AbstractIcon DECLARE_SOFT = createIcon(STRUCTURE_PATH + "declareSoft.gif"); protected final AbstractIcon CODE = createIcon(STRUCTURE_PATH + "code.gif"); protected final AbstractIcon ERROR = createIcon(STRUCTURE_PATH + "error.gif"); - + protected final AbstractIcon FILE = createIcon(STRUCTURE_PATH + "file.gif"); protected final AbstractIcon FILE_JAVA = createIcon(STRUCTURE_PATH + "file-java.gif"); protected final AbstractIcon FILE_ASPECTJ = createIcon(STRUCTURE_PATH + "file-aspectj.gif"); protected final AbstractIcon FILE_LST = createIcon(STRUCTURE_PATH + "file-lst.gif"); - + protected final AbstractIcon METHOD = createIcon(STRUCTURE_PATH + "method.gif"); protected final AbstractIcon FIELD = createIcon(STRUCTURE_PATH + "field.gif"); protected final AbstractIcon ENUM_VALUE = createIcon(STRUCTURE_PATH + "field.gif"); // ??? should be enum value icon @@ -78,13 +78,13 @@ public abstract class AbstractIconRegistry { * @return null if the kind could not be resolved */ protected abstract AbstractIcon getStructureIcon(IProgramElement.Kind kind, IProgramElement.Accessibility accessibility); - + /** * Assumes "public" visibility for the icon. - * + * * @return null if the kind could not be resolved */ - public AbstractIcon getIcon(IProgramElement.Kind kind) { + public AbstractIcon getIcon(IProgramElement.Kind kind) { if (kind == IProgramElement.Kind.PROJECT) { return PROJECT; } else if (kind == IProgramElement.Kind.PACKAGE) { @@ -148,10 +148,10 @@ public abstract class AbstractIconRegistry { return null; } } - + /** * Implement to create platform-specific icons. - */ + */ protected abstract AbstractIcon createIcon(String path); } diff --git a/ajde/src/main/java/org/aspectj/ajde/ui/BuildConfigEditor.java b/ajde/src/main/java/org/aspectj/ajde/ui/BuildConfigEditor.java index 8e7d26e58..8f485b9b6 100644 --- a/ajde/src/main/java/org/aspectj/ajde/ui/BuildConfigEditor.java +++ b/ajde/src/main/java/org/aspectj/ajde/ui/BuildConfigEditor.java @@ -3,9 +3,9 @@ * 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 + * 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: * Xerox/PARC initial implementation diff --git a/ajde/src/main/java/org/aspectj/ajde/ui/BuildConfigModel.java b/ajde/src/main/java/org/aspectj/ajde/ui/BuildConfigModel.java index 659ada21d..31b64fb2a 100644 --- a/ajde/src/main/java/org/aspectj/ajde/ui/BuildConfigModel.java +++ b/ajde/src/main/java/org/aspectj/ajde/ui/BuildConfigModel.java @@ -3,9 +3,9 @@ * 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 + * 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: * Xerox/PARC initial implementation diff --git a/ajde/src/main/java/org/aspectj/ajde/ui/BuildConfigNode.java b/ajde/src/main/java/org/aspectj/ajde/ui/BuildConfigNode.java index 06749bf23..ce3434cb9 100644 --- a/ajde/src/main/java/org/aspectj/ajde/ui/BuildConfigNode.java +++ b/ajde/src/main/java/org/aspectj/ajde/ui/BuildConfigNode.java @@ -1,14 +1,14 @@ /* ******************************************************************* - * Copyright (c) 1999-2001 Xerox Corporation, + * Copyright (c) 1999-2001 Xerox Corporation, * 2002 Palo Alto Research Center, Incorporated (PARC). - * All rights reserved. - * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Xerox/PARC initial implementation + * All rights reserved. + * This program and the accompanying materials are made available + * under the terms of the Eclipse Public License v 2.0 + * which accompanies this distribution and is available at + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt + * + * Contributors: + * Xerox/PARC initial implementation * ******************************************************************/ package org.aspectj.ajde.ui; @@ -24,7 +24,7 @@ import org.aspectj.util.FileUtil; /** * @author Mik Kersten - * + * * TODO: clean-up after merging of org.aspectj.asm.StructureNode */ public class BuildConfigNode { diff --git a/ajde/src/main/java/org/aspectj/ajde/ui/FileStructureView.java b/ajde/src/main/java/org/aspectj/ajde/ui/FileStructureView.java index 6e5107549..291118784 100644 --- a/ajde/src/main/java/org/aspectj/ajde/ui/FileStructureView.java +++ b/ajde/src/main/java/org/aspectj/ajde/ui/FileStructureView.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 * ******************************************************************/ @@ -18,16 +18,16 @@ package org.aspectj.ajde.ui; /** * Should only be created by the {@link StructureViewManager} or an * equivalent factory. - * + * * @author Mik Kersten */ public class FileStructureView extends StructureView { - + private String sourceFilePath = null; - + public FileStructureView(StructureViewProperties viewProperties) { - super.viewProperties = viewProperties; - } + super.viewProperties = viewProperties; + } public String getSourceFile() { return sourceFilePath; } @@ -40,9 +40,9 @@ public class FileStructureView extends StructureView { super.setRootNode(rootNode); notifyViewUpdated(); } - + public String getName() { - return "File view for: " + sourceFilePath; + return "File view for: " + sourceFilePath; } } diff --git a/ajde/src/main/java/org/aspectj/ajde/ui/GlobalStructureView.java b/ajde/src/main/java/org/aspectj/ajde/ui/GlobalStructureView.java index 3abf9c31f..3b1614df9 100644 --- a/ajde/src/main/java/org/aspectj/ajde/ui/GlobalStructureView.java +++ b/ajde/src/main/java/org/aspectj/ajde/ui/GlobalStructureView.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 * ******************************************************************/ @@ -18,7 +18,7 @@ package org.aspectj.ajde.ui; /** * Should only be created by the {@link StructureViewManager} or an * equivalent factory. - * + * * @author Mik Kersten */ public class GlobalStructureView extends FileStructureView { @@ -27,26 +27,26 @@ public class GlobalStructureView extends FileStructureView { public GlobalStructureView(GlobalViewProperties viewProperties) { super(viewProperties); - this.viewProperties = viewProperties; - } - + this.viewProperties = viewProperties; + } + public GlobalViewProperties getGlobalViewProperties() { - return viewProperties; + return viewProperties; } - + // public void setActiveNode(StructureViewNode activeNode) { // StructureNode node = activeNode.getStructureNode(); -// +// // activeNode = activeNode; // if (renderer != null) renderer.setActiveNode(activeNode); // } -// +// // public void setActiveNode(StructureViewNode activeNode, int sourceLine) { // activeNode = activeNode; // if (renderer != null) renderer.setActiveNode(activeNode, sourceLine); // } - + public String toString() { - return viewProperties.getHierarchy().toString(); + return viewProperties.getHierarchy().toString(); } } diff --git a/ajde/src/main/java/org/aspectj/ajde/ui/GlobalViewProperties.java b/ajde/src/main/java/org/aspectj/ajde/ui/GlobalViewProperties.java index fb58021cc..1df7de9ba 100644 --- a/ajde/src/main/java/org/aspectj/ajde/ui/GlobalViewProperties.java +++ b/ajde/src/main/java/org/aspectj/ajde/ui/GlobalViewProperties.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 * ******************************************************************/ @@ -20,12 +20,12 @@ package org.aspectj.ajde.ui; public class GlobalViewProperties extends StructureViewProperties { private StructureViewProperties.Granularity granularity = StructureViewProperties.Granularity.DECLARED_ELEMENTS; - private StructureViewProperties.Hierarchy hierarchy = StructureViewProperties.Hierarchy.DECLARATION; + private StructureViewProperties.Hierarchy hierarchy = StructureViewProperties.Hierarchy.DECLARATION; public GlobalViewProperties(StructureViewProperties.Hierarchy hierarchy) { this.hierarchy = hierarchy; } - + public void setGranularity(StructureViewProperties.Granularity granularity) { this.granularity = granularity; } @@ -33,15 +33,15 @@ public class GlobalViewProperties extends StructureViewProperties { public StructureViewProperties.Granularity getGranularity() { return granularity; } - + public void setHierarchy(StructureViewProperties.Hierarchy hierarchy) { - this.hierarchy = hierarchy; + this.hierarchy = hierarchy; } - + public StructureViewProperties.Hierarchy getHierarchy() { return hierarchy; } - + public String getName() { return hierarchy.toString(); } diff --git a/ajde/src/main/java/org/aspectj/ajde/ui/IStructureViewNode.java b/ajde/src/main/java/org/aspectj/ajde/ui/IStructureViewNode.java index a66e1faf6..e56da3869 100644 --- a/ajde/src/main/java/org/aspectj/ajde/ui/IStructureViewNode.java +++ b/ajde/src/main/java/org/aspectj/ajde/ui/IStructureViewNode.java @@ -3,9 +3,9 @@ * 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 + * 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: * Xerox/PARC initial implementation diff --git a/ajde/src/main/java/org/aspectj/ajde/ui/InvalidResourceException.java b/ajde/src/main/java/org/aspectj/ajde/ui/InvalidResourceException.java index f8b24afd6..3d458c5ed 100644 --- a/ajde/src/main/java/org/aspectj/ajde/ui/InvalidResourceException.java +++ b/ajde/src/main/java/org/aspectj/ajde/ui/InvalidResourceException.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 * ******************************************************************/ diff --git a/ajde/src/main/java/org/aspectj/ajde/ui/StructureSearchManager.java b/ajde/src/main/java/org/aspectj/ajde/ui/StructureSearchManager.java index ce0560287..b30e3e395 100644 --- a/ajde/src/main/java/org/aspectj/ajde/ui/StructureSearchManager.java +++ b/ajde/src/main/java/org/aspectj/ajde/ui/StructureSearchManager.java @@ -3,9 +3,9 @@ * 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 + * 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: * Xerox/PARC initial implementation diff --git a/ajde/src/main/java/org/aspectj/ajde/ui/StructureView.java b/ajde/src/main/java/org/aspectj/ajde/ui/StructureView.java index 4a10462a2..acba6b332 100644 --- a/ajde/src/main/java/org/aspectj/ajde/ui/StructureView.java +++ b/ajde/src/main/java/org/aspectj/ajde/ui/StructureView.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 * ******************************************************************/ @@ -21,17 +21,17 @@ import org.aspectj.asm.IProgramElement; */ public abstract class StructureView { - private IStructureViewNode rootNode = null; - private IStructureViewNode activeNode = null; + private IStructureViewNode rootNode = null; + private IStructureViewNode activeNode = null; protected StructureViewProperties viewProperties = null; protected StructureViewRenderer renderer = null; - + public StructureViewProperties getViewProperties() { - return viewProperties; - } - + return viewProperties; + } + public IStructureViewNode getRootNode() { - return rootNode; + return rootNode; } public void setRootNode(IStructureViewNode rootNode) { @@ -54,7 +54,7 @@ public abstract class StructureView { * @return the view node corresponding to the active ProgramElementNode or null */ public IStructureViewNode getActiveNode() { - if (activeNode != null + if (activeNode != null && activeNode.getStructureNode()!=null) { return activeNode; } else { @@ -64,40 +64,40 @@ public abstract class StructureView { /** * Searches from the root node of the view down in order to find matches. - * + * * @return the first match */ public IStructureViewNode findCorrespondingViewNode(IProgramElement node) { return findCorrespondingViewNodeHelper(rootNode, node); } - private IStructureViewNode findCorrespondingViewNodeHelper(IStructureViewNode node, IProgramElement pNode) { + private IStructureViewNode findCorrespondingViewNodeHelper(IStructureViewNode node, IProgramElement pNode) { if (node != null - && node.getStructureNode() != null + && node.getStructureNode() != null && node.getStructureNode().equals(pNode) - && node.getKind() == IStructureViewNode.Kind.DECLARATION) { - - return node; - } - + && node.getKind() == IStructureViewNode.Kind.DECLARATION) { + + return node; + } + if (node != null && node.getChildren() != null) { for (Object o : node.getChildren()) { IStructureViewNode foundNode = findCorrespondingViewNodeHelper((IStructureViewNode) o, pNode); if (foundNode != null) return foundNode; } } - + return null; - } + } public void setActiveNode(IStructureViewNode activeNode) { this.activeNode = activeNode; if (renderer != null) renderer.setActiveNode(activeNode); } - + public void setActiveNode(IStructureViewNode activeNode, int sourceLine) { this.activeNode = activeNode; if (renderer != null) renderer.setActiveNode(activeNode, sourceLine); } } - + diff --git a/ajde/src/main/java/org/aspectj/ajde/ui/StructureViewManager.java b/ajde/src/main/java/org/aspectj/ajde/ui/StructureViewManager.java index 2ca5386d1..3c8953a9f 100644 --- a/ajde/src/main/java/org/aspectj/ajde/ui/StructureViewManager.java +++ b/ajde/src/main/java/org/aspectj/ajde/ui/StructureViewManager.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) * ******************************************************************/ package org.aspectj.ajde.ui; @@ -82,7 +82,7 @@ public class StructureViewManager { /** * Only navigations of the default view are registered with the history. - * + * * @param newFilePath the canonicalized path to the new file */ public void fireNavigationAction(String newFilePath, int lineNumber) { diff --git a/ajde/src/main/java/org/aspectj/ajde/ui/StructureViewNodeFactory.java b/ajde/src/main/java/org/aspectj/ajde/ui/StructureViewNodeFactory.java index afefbbe18..60991439a 100644 --- a/ajde/src/main/java/org/aspectj/ajde/ui/StructureViewNodeFactory.java +++ b/ajde/src/main/java/org/aspectj/ajde/ui/StructureViewNodeFactory.java @@ -1,14 +1,14 @@ /* ******************************************************************* - * Copyright (c) 1999-2001 Xerox Corporation, + * Copyright (c) 1999-2001 Xerox Corporation, * 2002 Palo Alto Research Center, Incorporated (PARC). - * All rights reserved. - * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Xerox/PARC initial implementation + * All rights reserved. + * This program and the accompanying materials are made available + * under the terms of the Eclipse Public License v 2.0 + * which accompanies this distribution and is available at + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt + * + * Contributors: + * Xerox/PARC initial implementation * ******************************************************************/ package org.aspectj.ajde.ui; @@ -77,7 +77,7 @@ public abstract class StructureViewNodeFactory { /** * Implementors must override this method in order to create new relationship nodes. - * + * * If returned node is null it will not be added to the tree. */ protected abstract IStructureViewNode createRelationship(IRelationship relationship, AbstractIcon icon); diff --git a/ajde/src/main/java/org/aspectj/ajde/ui/StructureViewProperties.java b/ajde/src/main/java/org/aspectj/ajde/ui/StructureViewProperties.java index a6604abd6..0b7f32553 100644 --- a/ajde/src/main/java/org/aspectj/ajde/ui/StructureViewProperties.java +++ b/ajde/src/main/java/org/aspectj/ajde/ui/StructureViewProperties.java @@ -3,9 +3,9 @@ * 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 + * 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: * Xerox/PARC initial implementation diff --git a/ajde/src/main/java/org/aspectj/ajde/ui/StructureViewRenderer.java b/ajde/src/main/java/org/aspectj/ajde/ui/StructureViewRenderer.java index 49cf27279..d4067f330 100644 --- a/ajde/src/main/java/org/aspectj/ajde/ui/StructureViewRenderer.java +++ b/ajde/src/main/java/org/aspectj/ajde/ui/StructureViewRenderer.java @@ -3,9 +3,9 @@ * 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 + * 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: * Xerox/PARC initial implementation diff --git a/ajde/src/main/java/org/aspectj/ajde/ui/UserPreferencesAdapter.java b/ajde/src/main/java/org/aspectj/ajde/ui/UserPreferencesAdapter.java index 6d00fb96a..d2a2b0a5b 100644 --- a/ajde/src/main/java/org/aspectj/ajde/ui/UserPreferencesAdapter.java +++ b/ajde/src/main/java/org/aspectj/ajde/ui/UserPreferencesAdapter.java @@ -3,9 +3,9 @@ * 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 + * 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: * Xerox/PARC initial implementation diff --git a/ajde/src/main/java/org/aspectj/ajde/ui/internal/NavigationHistoryModel.java b/ajde/src/main/java/org/aspectj/ajde/ui/internal/NavigationHistoryModel.java index 0aad967fb..dcca917cd 100644 --- a/ajde/src/main/java/org/aspectj/ajde/ui/internal/NavigationHistoryModel.java +++ b/ajde/src/main/java/org/aspectj/ajde/ui/internal/NavigationHistoryModel.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 * ******************************************************************/ @@ -22,17 +22,17 @@ import org.aspectj.asm.IProgramElement; * @author Mik Kersten */ public class NavigationHistoryModel { - + private IProgramElement currNode = null; private Stack backHistory = new Stack(); private Stack forwardHistory = new Stack(); - + /** * @return null if the history is empty */ public IProgramElement navigateBack() { if (backHistory.isEmpty() || currNode == null) return null; - + forwardHistory.push(currNode); currNode = (IProgramElement)backHistory.pop(); return currNode; @@ -40,18 +40,18 @@ public class NavigationHistoryModel { /** * @return null if the history is empty - */ + */ public IProgramElement navigateForward() { if (forwardHistory.isEmpty() || currNode == null) return null; - + backHistory.push(currNode); currNode = (IProgramElement)forwardHistory.pop(); return currNode; } - + public void navigateToNode(IProgramElement toNode) { if (currNode != null) backHistory.push(currNode); - currNode = toNode; + currNode = toNode; } } diff --git a/ajde/src/main/java/org/aspectj/ajde/ui/internal/TreeStructureViewBuilder.java b/ajde/src/main/java/org/aspectj/ajde/ui/internal/TreeStructureViewBuilder.java index 9d885396d..6def17bd6 100644 --- a/ajde/src/main/java/org/aspectj/ajde/ui/internal/TreeStructureViewBuilder.java +++ b/ajde/src/main/java/org/aspectj/ajde/ui/internal/TreeStructureViewBuilder.java @@ -3,9 +3,9 @@ * 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 + * 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: * Xerox/PARC initial implementation diff --git a/ajde/src/main/java/org/aspectj/ajde/ui/internal/UserPreferencesStore.java b/ajde/src/main/java/org/aspectj/ajde/ui/internal/UserPreferencesStore.java index b827e9231..b8dc93332 100644 --- a/ajde/src/main/java/org/aspectj/ajde/ui/internal/UserPreferencesStore.java +++ b/ajde/src/main/java/org/aspectj/ajde/ui/internal/UserPreferencesStore.java @@ -3,9 +3,9 @@ * 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 + * 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: * Xerox/PARC initial implementation diff --git a/ajde/src/main/java/org/aspectj/ajde/ui/javaoptions/JavaBuildOptions.java b/ajde/src/main/java/org/aspectj/ajde/ui/javaoptions/JavaBuildOptions.java index 0fd719f85..668d4e560 100644 --- a/ajde/src/main/java/org/aspectj/ajde/ui/javaoptions/JavaBuildOptions.java +++ b/ajde/src/main/java/org/aspectj/ajde/ui/javaoptions/JavaBuildOptions.java @@ -1,11 +1,11 @@ /******************************************************************** - * Copyright (c) 2007 Contributors. All rights reserved. - * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution and is available at - * http://eclipse.org/legal/epl-v10.html - * - * Contributors: IBM Corporation - initial API and implementation + * Copyright (c) 2007 Contributors. All rights reserved. + * This program and the accompanying materials are made available + * under the terms of the Eclipse Public License v 2.0 + * which accompanies this distribution and is available at + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt + * + * Contributors: IBM Corporation - initial API and implementation * Helen Hawkins - initial version (bug 148190) *******************************************************************/ package org.aspectj.ajde.ui.javaoptions; diff --git a/ajde/src/main/java/org/aspectj/ajde/ui/javaoptions/JavaCompilerWarningsOptionsPanel.java b/ajde/src/main/java/org/aspectj/ajde/ui/javaoptions/JavaCompilerWarningsOptionsPanel.java index d00146ff9..1163c21be 100644 --- a/ajde/src/main/java/org/aspectj/ajde/ui/javaoptions/JavaCompilerWarningsOptionsPanel.java +++ b/ajde/src/main/java/org/aspectj/ajde/ui/javaoptions/JavaCompilerWarningsOptionsPanel.java @@ -1,11 +1,11 @@ /******************************************************************** - * Copyright (c) 2007 Contributors. All rights reserved. - * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution and is available at - * http://eclipse.org/legal/epl-v10.html - * - * Contributors: IBM Corporation - initial API and implementation + * Copyright (c) 2007 Contributors. All rights reserved. + * This program and the accompanying materials are made available + * under the terms of the Eclipse Public License v 2.0 + * which accompanies this distribution and is available at + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt + * + * Contributors: IBM Corporation - initial API and implementation * Helen Hawkins - initial version (bug 148190) *******************************************************************/ package org.aspectj.ajde.ui.javaoptions; @@ -35,21 +35,21 @@ import org.aspectj.ajde.ui.swing.OptionsPanel; */ public class JavaCompilerWarningsOptionsPanel extends OptionsPanel { - private final String[] ignoreOrWarning = new String[] {JavaOptions.IGNORE,JavaOptions.WARNING}; + private final String[] ignoreOrWarning = new String[] {JavaOptions.IGNORE,JavaOptions.WARNING}; private static final long serialVersionUID = 4491319302490183151L; - + private JPanel parentPanel; - + private Border warningsEtchedBorder; private TitledBorder warningsTitleBorder; private Border warningsCompoundBorder; private JPanel warningsPanel; private Box warningsBox = Box.createVerticalBox(); - + private JavaBuildOptions javaBuildOptions; private Map/*String --> JComboBox*/ warningComboBoxes = new HashMap(); - + public JavaCompilerWarningsOptionsPanel(JavaBuildOptions javaBuildOptions) { this.javaBuildOptions = javaBuildOptions; try { @@ -63,8 +63,8 @@ public class JavaCompilerWarningsOptionsPanel extends OptionsPanel { public void loadOptions() throws IOException { createWarningContents(); } - - public void saveOptions() throws IOException { + + public void saveOptions() throws IOException { Set s = warningComboBoxes.entrySet(); for (Object o : s) { Entry entry = (Entry) o; @@ -73,7 +73,7 @@ public class JavaCompilerWarningsOptionsPanel extends OptionsPanel { String value = (String) combo.getSelectedItem(); javaBuildOptions.setOption(javaOption, value); } - } + } private void jbInit() throws Exception { this.setLayout(new BorderLayout()); @@ -96,40 +96,40 @@ public class JavaCompilerWarningsOptionsPanel extends OptionsPanel { createWarningsEntry("Non-externalized strings",JavaOptions.WARN_NON_NLS); warningsPanel.add(warningsBox,null); } - + private void createWarningsEntry(String labelText, String javaOptionToSet) { JPanel panel = new JPanel(); panel.setLayout(new BorderLayout()); - + JLabel label = new JLabel(); label.setFont(new java.awt.Font("Dialog", 0, 11)); label.setText(labelText); panel.add(label,BorderLayout.WEST); - + JComboBox warnings = new JComboBox(ignoreOrWarning); String value = (String) javaBuildOptions.getJavaBuildOptionsMap().get(javaOptionToSet); if (value.equals(JavaOptions.IGNORE)) { warnings.setSelectedIndex(0); } else { - warnings.setSelectedIndex(1); + warnings.setSelectedIndex(1); } panel.add(warnings,BorderLayout.EAST); warningsBox.add(panel,null); warningComboBoxes.put(javaOptionToSet,warnings); } - - private void createBorders() { + + private void createBorders() { warningsEtchedBorder = BorderFactory.createEtchedBorder(Color.white, new Color(156, 156, 158)); warningsTitleBorder = new TitledBorder(warningsEtchedBorder, "Warning Options"); warningsCompoundBorder = BorderFactory.createCompoundBorder(warningsTitleBorder, BorderFactory.createEmptyBorder(5, 5, 5, 5)); warningsTitleBorder.setTitleFont(new java.awt.Font("Dialog", 0, 11)); } - + private void addBordersToPanel() { parentPanel = new JPanel(); parentPanel.setLayout(new BorderLayout()); - + warningsPanel = new JPanel(); warningsPanel.setBorder(warningsCompoundBorder); parentPanel.add(warningsPanel,BorderLayout.CENTER); diff --git a/ajde/src/main/java/org/aspectj/ajde/ui/javaoptions/JavaComplianceOptionsPanel.java b/ajde/src/main/java/org/aspectj/ajde/ui/javaoptions/JavaComplianceOptionsPanel.java index 667e673ae..89ebb60f3 100644 --- a/ajde/src/main/java/org/aspectj/ajde/ui/javaoptions/JavaComplianceOptionsPanel.java +++ b/ajde/src/main/java/org/aspectj/ajde/ui/javaoptions/JavaComplianceOptionsPanel.java @@ -1,9 +1,9 @@ /******************************************************************** * Copyright (c) 2007 Contributors. All rights reserved. * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 + * under the terms of the Eclipse Public License v 2.0 * which accompanies this distribution and is available at - * http://eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt * * Contributors: IBM Corporation - initial API and implementation * Helen Hawkins - initial version (bug 148190) diff --git a/ajde/src/main/java/org/aspectj/ajde/ui/javaoptions/JavaDebugOptionsPanel.java b/ajde/src/main/java/org/aspectj/ajde/ui/javaoptions/JavaDebugOptionsPanel.java index 0e7e09abc..128b995c9 100644 --- a/ajde/src/main/java/org/aspectj/ajde/ui/javaoptions/JavaDebugOptionsPanel.java +++ b/ajde/src/main/java/org/aspectj/ajde/ui/javaoptions/JavaDebugOptionsPanel.java @@ -1,9 +1,9 @@ /******************************************************************** * Copyright (c) 2007 Contributors. All rights reserved. * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 + * under the terms of the Eclipse Public License v 2.0 * which accompanies this distribution and is available at - * http://eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt * * Contributors: IBM Corporation - initial API and implementation * Helen Hawkins - initial version (bug 148190) diff --git a/ajde/src/main/java/org/aspectj/ajde/ui/javaoptions/JavaOtherOptionsPanel.java b/ajde/src/main/java/org/aspectj/ajde/ui/javaoptions/JavaOtherOptionsPanel.java index 5ffaf13c3..25f84334b 100644 --- a/ajde/src/main/java/org/aspectj/ajde/ui/javaoptions/JavaOtherOptionsPanel.java +++ b/ajde/src/main/java/org/aspectj/ajde/ui/javaoptions/JavaOtherOptionsPanel.java @@ -1,11 +1,11 @@ /******************************************************************** - * Copyright (c) 2007 Contributors. All rights reserved. - * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution and is available at - * http://eclipse.org/legal/epl-v10.html - * - * Contributors: IBM Corporation - initial API and implementation + * Copyright (c) 2007 Contributors. All rights reserved. + * This program and the accompanying materials are made available + * under the terms of the Eclipse Public License v 2.0 + * which accompanies this distribution and is available at + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt + * + * Contributors: IBM Corporation - initial API and implementation * Helen Hawkins - initial version (bug 148190) *******************************************************************/ package org.aspectj.ajde.ui.javaoptions; @@ -33,7 +33,7 @@ import org.aspectj.ajde.ui.swing.OptionsPanel; public class JavaOtherOptionsPanel extends OptionsPanel { private static final long serialVersionUID = 4491319302490183151L; - + private JPanel parentPanel; private Border otherEtchedBorder; @@ -41,11 +41,11 @@ public class JavaOtherOptionsPanel extends OptionsPanel { private Border otherCompoundBorder; private JPanel otherPanel; private Box otherBox = Box.createVerticalBox(); - + private JavaBuildOptions javaBuildOptions; private JTextField characterEncoding; - + public JavaOtherOptionsPanel(JavaBuildOptions javaBuildOptions) { this.javaBuildOptions = javaBuildOptions; try { @@ -59,14 +59,14 @@ public class JavaOtherOptionsPanel extends OptionsPanel { public void loadOptions() throws IOException { createOtherContents(); } - - public void saveOptions() throws IOException { + + public void saveOptions() throws IOException { String text = characterEncoding.getText(); if (text != null ) { javaBuildOptions.setCharacterEncoding(text); - } - } - + } + } + private void jbInit() throws Exception { this.setLayout(new BorderLayout()); createBorders(); @@ -82,35 +82,35 @@ public class JavaOtherOptionsPanel extends OptionsPanel { label.setFont(new java.awt.Font("Dialog", 0, 11)); label.setText("Character encoding (will default to platform encoding)"); panel.add(label,BorderLayout.WEST); - - characterEncoding = new JTextField(); + + characterEncoding = new JTextField(); characterEncoding.setFont(new java.awt.Font("SansSerif", 0, 11)); characterEncoding.setMinimumSize(new Dimension(100, 21)); characterEncoding.setPreferredSize(new Dimension(150, 21)); panel.add(characterEncoding,BorderLayout.EAST); - + String option = (String) javaBuildOptions.getJavaBuildOptionsMap().get( JavaOptions.CHARACTER_ENCODING); if (option != null) { characterEncoding.setText(option); } - + otherBox.add(panel,null); otherPanel.add(otherBox); } - + private void createBorders() { otherEtchedBorder = BorderFactory.createEtchedBorder(Color.white, new Color(156, 156, 158)); otherTitleBorder = new TitledBorder(otherEtchedBorder, "Other Options"); otherCompoundBorder = BorderFactory.createCompoundBorder(otherTitleBorder, - BorderFactory.createEmptyBorder(5, 5, 5, 5)); + BorderFactory.createEmptyBorder(5, 5, 5, 5)); otherTitleBorder.setTitleFont(new java.awt.Font("Dialog", 0, 11)); } - + private void addBordersToPanel() { parentPanel = new JPanel(); parentPanel.setLayout(new BorderLayout()); - + otherPanel = new JPanel(); otherPanel.setBorder(otherCompoundBorder); parentPanel.add(otherPanel,BorderLayout.CENTER); diff --git a/ajde/src/main/java/org/aspectj/ajde/ui/swing/AJButtonMenuCombo.java b/ajde/src/main/java/org/aspectj/ajde/ui/swing/AJButtonMenuCombo.java index 72b7abeba..8af92063b 100644 --- a/ajde/src/main/java/org/aspectj/ajde/ui/swing/AJButtonMenuCombo.java +++ b/ajde/src/main/java/org/aspectj/ajde/ui/swing/AJButtonMenuCombo.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) * ******************************************************************/ @@ -31,7 +31,7 @@ import javax.swing.JPopupMenu; import org.aspectj.ajde.Ajde; public class AJButtonMenuCombo extends JPanel { - + private static final long serialVersionUID = -4866207530403336160L; private JButton mainButton; @@ -39,13 +39,13 @@ public class AJButtonMenuCombo extends JPanel { private JPopupMenu menu; // private boolean depressable = false; private boolean isPressed = false; - - public AJButtonMenuCombo(String name, - String toolTipText, - Icon icon, + + public AJButtonMenuCombo(String name, + String toolTipText, + Icon icon, JPopupMenu menu, boolean depressable) { - + this.menu = menu; // this.depressable = depressable; mainButton = new JButton(); @@ -54,24 +54,24 @@ public class AJButtonMenuCombo extends JPanel { mainButton.setToolTipText(toolTipText); mainButton.setPreferredSize(new Dimension(22, 20)); mainButton.setMinimumSize(new Dimension(22, 20)); - mainButton.setMaximumSize(new Dimension(22, 20)); - + mainButton.setMaximumSize(new Dimension(22, 20)); + popupButton = new JButton(); popupButton.setIcon(Ajde.getDefault().getIconRegistry().getPopupIcon()); popupButton.setBorder(BorderFactory.createEmptyBorder()); popupButton.setToolTipText(toolTipText); popupButton.setPreferredSize(new Dimension(13, 20)); popupButton.setMinimumSize(new Dimension(13, 20)); - popupButton.setMaximumSize(new Dimension(13, 20)); - + popupButton.setMaximumSize(new Dimension(13, 20)); + PopupListener popupListener = new PopupListener(mainButton); - + if (depressable) { mainButton.addActionListener(new ButtonActionListener()); } else { - mainButton.addMouseListener(popupListener); + mainButton.addMouseListener(popupListener); } - + popupButton.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) { popupButton.setBorder(null); @@ -81,15 +81,15 @@ public class AJButtonMenuCombo extends JPanel { BorderUpdateListener borderUpdateListner = new BorderUpdateListener(); mainButton.addMouseListener(borderUpdateListner); popupButton.addMouseListener(borderUpdateListner); - + popupButton.addMouseListener(popupListener); - + this.setLayout(new BorderLayout()); this.add(mainButton, BorderLayout.CENTER); this.add(popupButton, BorderLayout.EAST); - + this.setMinimumSize(new Dimension(35, 20)); - this.setMaximumSize(new Dimension(35, 20)); + this.setMaximumSize(new Dimension(35, 20)); } class ButtonActionListener implements ActionListener { @@ -103,14 +103,14 @@ public class AJButtonMenuCombo extends JPanel { } } } - + class BorderUpdateListener extends MouseAdapter { public void mouseEntered(MouseEvent e) { popupButton.setBorder(AjdeWidgetStyles.RAISED_BEVEL_BORDER); mainButton.setBorder(AjdeWidgetStyles.RAISED_BEVEL_BORDER); } - + public void mouseExited(MouseEvent e) { popupButton.setBorder(AjdeWidgetStyles.DEFAULT_BORDER); if (isPressed) { @@ -140,7 +140,7 @@ public class AJButtonMenuCombo extends JPanel { menu.show(e.getComponent(), button.getX(), button.getY() + popupButton.getHeight()); } } - + public void setEnabled(boolean enabled) { mainButton.setEnabled(enabled); popupButton.setEnabled(enabled); diff --git a/ajde/src/main/java/org/aspectj/ajde/ui/swing/AjdeWidgetStyles.java b/ajde/src/main/java/org/aspectj/ajde/ui/swing/AjdeWidgetStyles.java index 714971f03..30f9f24df 100644 --- a/ajde/src/main/java/org/aspectj/ajde/ui/swing/AjdeWidgetStyles.java +++ b/ajde/src/main/java/org/aspectj/ajde/ui/swing/AjdeWidgetStyles.java @@ -3,9 +3,9 @@ * 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 + * 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: * Xerox/PARC initial implementation diff --git a/ajde/src/main/java/org/aspectj/ajde/ui/swing/BrowserStructureViewToolPanel.java b/ajde/src/main/java/org/aspectj/ajde/ui/swing/BrowserStructureViewToolPanel.java index 10601a27b..f66635f57 100644 --- a/ajde/src/main/java/org/aspectj/ajde/ui/swing/BrowserStructureViewToolPanel.java +++ b/ajde/src/main/java/org/aspectj/ajde/ui/swing/BrowserStructureViewToolPanel.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: - * Xerox/PARC initial implementation - * Helen Hawkins Converted to new interface (bug 148190) + * 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) * ******************************************************************/ diff --git a/ajde/src/main/java/org/aspectj/ajde/ui/swing/BrowserView.java b/ajde/src/main/java/org/aspectj/ajde/ui/swing/BrowserView.java index de7a16d54..350f461ed 100644 --- a/ajde/src/main/java/org/aspectj/ajde/ui/swing/BrowserView.java +++ b/ajde/src/main/java/org/aspectj/ajde/ui/swing/BrowserView.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,14 +80,14 @@ class BrowserView extends JPanel { configs_comboBox.setRenderer(new ConfigsCellRenderer()); // configs_comboBox.addItemListener(new ItemListener() { // public void itemStateChanged(ItemEvent e) { -// Ajde.getDefault().getConfigurationManager().setCurrConfigFile(lastSelectedConfig); +// Ajde.getDefault().getConfigurationManager().setCurrConfigFile(lastSelectedConfig); // } // }); - + if (Ajde.getDefault().getBuildConfigManager().getAllBuildConfigFiles().size() > 0) { - Ajde.getDefault().getBuildConfigManager().setActiveConfigFile((String)Ajde.getDefault().getBuildConfigManager().getAllBuildConfigFiles().get(0)); + Ajde.getDefault().getBuildConfigManager().setActiveConfigFile((String)Ajde.getDefault().getBuildConfigManager().getAllBuildConfigFiles().get(0)); } - + jbInit(); fixButtonBorders(); views_splitPane.add(masterView, JSplitPane.TOP); diff --git a/ajde/src/main/java/org/aspectj/ajde/ui/swing/BrowserViewManager.java b/ajde/src/main/java/org/aspectj/ajde/ui/swing/BrowserViewManager.java index cd01dec70..300a56cd2 100644 --- a/ajde/src/main/java/org/aspectj/ajde/ui/swing/BrowserViewManager.java +++ b/ajde/src/main/java/org/aspectj/ajde/ui/swing/BrowserViewManager.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) * ******************************************************************/ @@ -34,7 +34,7 @@ public class BrowserViewManager { // private boolean globalMode = true; // private boolean splitViewMode = false; // private IconRegistry icons; -// +// // private Stack backHistory = new Stack(); // private Stack forwardHistory = new Stack(); // private IProgramElement currNode = null; @@ -64,12 +64,12 @@ public class BrowserViewManager { pointcutWizard.setVisible(true); pointcutWizard.setLocation(Ajde.getDefault().getRootFrame().getX()+100, Ajde.getDefault().getRootFrame().getY()+100); } - - { + + { DECLARATION_VIEW_PROPERTIES = new GlobalViewProperties(StructureViewProperties.Hierarchy.DECLARATION); CROSSCUTTING_VIEW_PROPERTIES = new GlobalViewProperties(StructureViewProperties.Hierarchy.CROSSCUTTING); - INHERITANCE_VIEW_PROPERTIES = new GlobalViewProperties(StructureViewProperties.Hierarchy.INHERITANCE); - + INHERITANCE_VIEW_PROPERTIES = new GlobalViewProperties(StructureViewProperties.Hierarchy.INHERITANCE); + // CROSSCUTTING_VIEW_PROPERTIES.addRelation(IRelationship.Kind.ADVICE); // CROSSCUTTING_VIEW_PROPERTIES.addRelation(IRelationship.Kind.ADVICE); // CROSSCUTTING_VIEW_PROPERTIES.addRelation(IRelationship.Kind.ADVICE); @@ -83,7 +83,7 @@ public class BrowserViewManager { // INHERITANCE_VIEW_PROPERTIES.addRelation(InheritanceAssociation.IMPLEMENTS_RELATION); // INHERITANCE_VIEW_PROPERTIES.addRelation(InheritanceAssociation.INHERITS_MEMBERS_RELATION); // INHERITANCE_VIEW_PROPERTIES.addRelation(InheritanceAssociation.INHERITS_RELATION); - + DECLARATION_VIEW_PROPERTIES.setRelations(Ajde.getDefault().getStructureViewManager().getAvailableRelations()); CROSSCUTTING_VIEW = Ajde.getDefault().getStructureViewManager().createGlobalView(CROSSCUTTING_VIEW_PROPERTIES); diff --git a/ajde/src/main/java/org/aspectj/ajde/ui/swing/BrowserViewPanel.java b/ajde/src/main/java/org/aspectj/ajde/ui/swing/BrowserViewPanel.java index 5459e916f..bb2c3c8c3 100644 --- a/ajde/src/main/java/org/aspectj/ajde/ui/swing/BrowserViewPanel.java +++ b/ajde/src/main/java/org/aspectj/ajde/ui/swing/BrowserViewPanel.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: - * Xerox/PARC initial implementation - * Helen Hawkins Converted to new interface (bug 148190) + * 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) * ******************************************************************/ diff --git a/ajde/src/main/java/org/aspectj/ajde/ui/swing/BrowserViewTreeListener.java b/ajde/src/main/java/org/aspectj/ajde/ui/swing/BrowserViewTreeListener.java index 8e88a38a4..64971dc22 100644 --- a/ajde/src/main/java/org/aspectj/ajde/ui/swing/BrowserViewTreeListener.java +++ b/ajde/src/main/java/org/aspectj/ajde/ui/swing/BrowserViewTreeListener.java @@ -1,18 +1,18 @@ /* ******************************************************************* - * 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) * ******************************************************************/ - + package org.aspectj.ajde.ui.swing; import java.awt.event.ActionEvent; @@ -67,7 +67,7 @@ class BrowserViewTreeListener implements TreeSelectionListener, MouseListener { //if (AjdeUIManager.getDefault().getViewManager().isSplitViewMode()) { // AjdeUIManager.getDefault().getViewManager().showNodeInSlaveView((ProgramElementNode)currNode); //} - } + } // else if (currNode instanceof LinkNode) { //if (!AjdeUIManager.getDefault().getViewManager().isSplitViewMode()) { // AjdeUIManager.getDefault().getViewManager().showNodeInMasterView((LinkNode)currNode); @@ -87,7 +87,7 @@ class BrowserViewTreeListener implements TreeSelectionListener, MouseListener { && e.getModifiers() != 4) { //AjdeUIManager.getDefault().getViewManager().showNodeInMasterView(((LinkNode)currNode).getProgramElementNode()); //AjdeUIManager.getDefault().getViewManager().showNodeInSlaveView(((LinkNode)currNode).getProgramElementNode()); - } + } // else if (currNode instanceof LinkNode) { // if (clickCount == 1) { // //AjdeUIManager.getDefault().getViewManager().showLink((LinkNode)currNode); @@ -118,7 +118,7 @@ class BrowserViewTreeListener implements TreeSelectionListener, MouseListener { JMenuItem showSourcesItem = new JMenuItem("Display sources", Ajde.getDefault().getIconRegistry().getStructureSwingIcon(IProgramElement.Kind.CODE)); showSourcesItem.setFont(new java.awt.Font("Dialog", 0, 11)); showSourcesItem.addActionListener(new AbstractAction() { - + private static final long serialVersionUID = 1L; public void actionPerformed(ActionEvent e) { @@ -150,7 +150,7 @@ class BrowserViewTreeListener implements TreeSelectionListener, MouseListener { JMenuItem generatePCD = new JMenuItem("Pointcut Wizard (alpha)...", Ajde.getDefault().getIconRegistry().getStructureSwingIcon(IProgramElement.Kind.POINTCUT)); generatePCD.setFont(new java.awt.Font("Dialog", 0, 11)); generatePCD.addActionListener(new AbstractAction() { - + private static final long serialVersionUID = 1L; public void actionPerformed(ActionEvent e) { diff --git a/ajde/src/main/java/org/aspectj/ajde/ui/swing/BuildConfigPopupMenu.java b/ajde/src/main/java/org/aspectj/ajde/ui/swing/BuildConfigPopupMenu.java index f1aca6bcd..c52e5dd72 100644 --- a/ajde/src/main/java/org/aspectj/ajde/ui/swing/BuildConfigPopupMenu.java +++ b/ajde/src/main/java/org/aspectj/ajde/ui/swing/BuildConfigPopupMenu.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) * ******************************************************************/ @@ -30,7 +30,7 @@ import org.aspectj.asm.IProgramElement; /** * Creates a popup menu that displays all the available .lst files. When one * is selected it runs a full build of files within the selected .lst file - * in a separate thread. + * in a separate thread. */ public class BuildConfigPopupMenu extends JPopupMenu { diff --git a/ajde/src/main/java/org/aspectj/ajde/ui/swing/BuildProgressPanel.java b/ajde/src/main/java/org/aspectj/ajde/ui/swing/BuildProgressPanel.java index ac8dcf2a0..3b9decc54 100644 --- a/ajde/src/main/java/org/aspectj/ajde/ui/swing/BuildProgressPanel.java +++ b/ajde/src/main/java/org/aspectj/ajde/ui/swing/BuildProgressPanel.java @@ -1,20 +1,20 @@ /* ******************************************************************* - * 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) * ******************************************************************/ package org.aspectj.ajde.ui.swing; - + import java.awt.BorderLayout; import java.awt.Dimension; import java.awt.event.ActionEvent; @@ -44,7 +44,7 @@ public class BuildProgressPanel extends JPanel { JProgressBar compile_progressBar = new JProgressBar(); private boolean buildIsCancelled = false; - + public BuildProgressPanel() { try { jbInit(); @@ -134,7 +134,7 @@ public class BuildProgressPanel extends JPanel { void cancel_button_actionPerformed(ActionEvent e) { buildIsCancelled = true; } - + public boolean isCancelRequested() { return buildIsCancelled; } diff --git a/ajde/src/main/java/org/aspectj/ajde/ui/swing/CompilerMessagesCellRenderer.java b/ajde/src/main/java/org/aspectj/ajde/ui/swing/CompilerMessagesCellRenderer.java index ea681475f..103d6c1d9 100644 --- a/ajde/src/main/java/org/aspectj/ajde/ui/swing/CompilerMessagesCellRenderer.java +++ b/ajde/src/main/java/org/aspectj/ajde/ui/swing/CompilerMessagesCellRenderer.java @@ -1,20 +1,20 @@ /* ******************************************************************* - * 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) * ******************************************************************/ package org.aspectj.ajde.ui.swing; - + import java.awt.Component; import javax.swing.JLabel; diff --git a/ajde/src/main/java/org/aspectj/ajde/ui/swing/DefaultBuildProgressMonitor.java b/ajde/src/main/java/org/aspectj/ajde/ui/swing/DefaultBuildProgressMonitor.java index 7fab45d91..01e41b431 100644 --- a/ajde/src/main/java/org/aspectj/ajde/ui/swing/DefaultBuildProgressMonitor.java +++ b/ajde/src/main/java/org/aspectj/ajde/ui/swing/DefaultBuildProgressMonitor.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) * ******************************************************************/ @@ -21,7 +21,7 @@ import javax.swing.JDialog; import org.aspectj.ajde.Ajde; import org.aspectj.ajde.core.IBuildProgressMonitor; - + /** * This dialog box is open while ajc is compiling the system and displays * a corresponding progress bar. @@ -31,7 +31,7 @@ import org.aspectj.ajde.core.IBuildProgressMonitor; public class DefaultBuildProgressMonitor extends Thread implements IBuildProgressMonitor { public static final String PROGRESS_HEADING = "AspectJ Build"; - + private BuildProgressPanel progressDialog = null; private JDialog dialog = null; @@ -41,7 +41,7 @@ public class DefaultBuildProgressMonitor extends Thread implements IBuildProgres dialog.setContentPane(progressDialog); dialog.setSize(550, 120); try { - dialog.setLocationRelativeTo(parent); + dialog.setLocationRelativeTo(parent); } catch (NoSuchMethodError nsme) { // running on 1.3 } @@ -69,7 +69,7 @@ public class DefaultBuildProgressMonitor extends Thread implements IBuildProgres */ public void finish(boolean wasFullBuild) { progressDialog.finish(); - dialog.dispose(); + dialog.dispose(); } public boolean isCancelRequested() { @@ -77,6 +77,6 @@ public class DefaultBuildProgressMonitor extends Thread implements IBuildProgres } public void setProgress(double percentDone) { - progressDialog.setProgressBarVal((int) (percentDone*progressDialog.getProgressBarMax())); + progressDialog.setProgressBarVal((int) (percentDone*progressDialog.getProgressBarMax())); } } diff --git a/ajde/src/main/java/org/aspectj/ajde/ui/swing/ErrorDialog.java b/ajde/src/main/java/org/aspectj/ajde/ui/swing/ErrorDialog.java index 582926a92..68bf340cf 100644 --- a/ajde/src/main/java/org/aspectj/ajde/ui/swing/ErrorDialog.java +++ b/ajde/src/main/java/org/aspectj/ajde/ui/swing/ErrorDialog.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 * ******************************************************************/ diff --git a/ajde/src/main/java/org/aspectj/ajde/ui/swing/GoToLineThread.java b/ajde/src/main/java/org/aspectj/ajde/ui/swing/GoToLineThread.java index 7b7ae7b68..adbddfa1f 100644 --- a/ajde/src/main/java/org/aspectj/ajde/ui/swing/GoToLineThread.java +++ b/ajde/src/main/java/org/aspectj/ajde/ui/swing/GoToLineThread.java @@ -1,18 +1,18 @@ /* ******************************************************************* - * 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) * ******************************************************************/ - + package org.aspectj.ajde.ui.swing; @@ -26,12 +26,12 @@ import org.aspectj.bridge.Message; /** * Used to ensure that a source line has been seeked to. Will repeatedly attempt * to seek to the line until this has succeeded. - * + * * @author Mik Kersten */ public class GoToLineThread extends Thread { private EditorAdapter editorAdapter = null; - + private int lineNumber = 0; private String fileToSeekTo = ""; private boolean finished = false; @@ -62,7 +62,7 @@ public class GoToLineThread extends Thread { editorAdapter.showSourceLine(lineNumber, true); } }); - } catch (Exception e) { + } catch (Exception e) { Message msg = new Message("Could not seek to line.",IMessage.ERROR,e,null); Ajde.getDefault().getMessageHandler().handleMessage(msg); } diff --git a/ajde/src/main/java/org/aspectj/ajde/ui/swing/MultiStructureViewPanel.java b/ajde/src/main/java/org/aspectj/ajde/ui/swing/MultiStructureViewPanel.java index 5c44d09ba..038a2e001 100644 --- a/ajde/src/main/java/org/aspectj/ajde/ui/swing/MultiStructureViewPanel.java +++ b/ajde/src/main/java/org/aspectj/ajde/ui/swing/MultiStructureViewPanel.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) * ******************************************************************/ @@ -28,7 +28,7 @@ import org.aspectj.bridge.Message; * @author Mik Kersten */ public class MultiStructureViewPanel extends JPanel { - + private static final long serialVersionUID = -4409192026967597082L; JSplitPane views_splitPane; BorderLayout borderLayout1 = new BorderLayout(); @@ -37,7 +37,7 @@ public class MultiStructureViewPanel extends JPanel { super(); try { views_splitPane = new JSplitPane(JSplitPane.VERTICAL_SPLIT, topPanel, bottomPanel); - jbInit(); + jbInit(); } catch(Exception e) { Message msg = new Message("Could not initialize GUI.",IMessage.ERROR,e,null); Ajde.getDefault().getMessageHandler().handleMessage(msg); diff --git a/ajde/src/main/java/org/aspectj/ajde/ui/swing/OptionsFrame.java b/ajde/src/main/java/org/aspectj/ajde/ui/swing/OptionsFrame.java index 1729ac87a..6a21852aa 100644 --- a/ajde/src/main/java/org/aspectj/ajde/ui/swing/OptionsFrame.java +++ b/ajde/src/main/java/org/aspectj/ajde/ui/swing/OptionsFrame.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) * ******************************************************************/ @@ -58,14 +58,14 @@ public class OptionsFrame extends JFrame { "version 1.0, approved by the Open Source Initiative as\n" + "conforming to the Open Source Definition.\n\n" + "For support or for more information about the AspectJ\n" + - "project or the license, visit the project home page at\n" + + "project or the license, visit the project home page at\n" + " http://eclipse.org/aspectj\n\n" + "If you find a bug (not solved by the documentation in the\n" + "Development Environment Guide available with this release,\n" + "any release notes, or the bug database), please submit steps\n" + - "to reproduce the bug (using the IDE component) at:\n" + + "to reproduce the bug (using the IDE component) at:\n" + " http://bugs.eclipse.org/bugs/enter_bug.cgi?product=AspectJ"; - + private JTabbedPane main_tabbedPane = new JTabbedPane(); private JPanel button_panel = new JPanel(); private JButton apply_button = new JButton(); @@ -267,7 +267,7 @@ public class OptionsFrame extends JFrame { jTextArea1.setFont(new java.awt.Font("SansSerif", 0, 12)); jTextArea1.setEditable(false); jTextArea1.setText(ABOUT_TEXT); - + about_panel.setBorder(border9); built_label.setText("Built: "); built_label.setFont(new java.awt.Font("Dialog", 1, 12)); diff --git a/ajde/src/main/java/org/aspectj/ajde/ui/swing/OptionsPanel.java b/ajde/src/main/java/org/aspectj/ajde/ui/swing/OptionsPanel.java index e49fc247a..cbb35436c 100644 --- a/ajde/src/main/java/org/aspectj/ajde/ui/swing/OptionsPanel.java +++ b/ajde/src/main/java/org/aspectj/ajde/ui/swing/OptionsPanel.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 * ******************************************************************/ @@ -22,7 +22,7 @@ import javax.swing.JPanel; * @author Mik Kersten */ public abstract class OptionsPanel extends JPanel { - + public abstract void loadOptions() throws IOException; public abstract void saveOptions() throws IOException; diff --git a/ajde/src/main/java/org/aspectj/ajde/ui/swing/PointcutWizard.java b/ajde/src/main/java/org/aspectj/ajde/ui/swing/PointcutWizard.java index f80ff76e6..efe13e636 100644 --- a/ajde/src/main/java/org/aspectj/ajde/ui/swing/PointcutWizard.java +++ b/ajde/src/main/java/org/aspectj/ajde/ui/swing/PointcutWizard.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 * ******************************************************************/ @@ -59,7 +59,7 @@ class PointcutWizard extends JFrame { List views = new ArrayList(); views.add(StructureViewProperties.Hierarchy.INHERITANCE); // typeTreeView = new BrowserViewPanel(AjdeUIManager.getDefault().getIconRegistry(), views, StructureViewProperties.Hierarchy.INHERITANCE); - + throw new RuntimeException("unimplemented, can't get the current file"); //typeTreeView.updateTree(Ajde.getDefault().getEditorManager().getCurrFile()); // try { diff --git a/ajde/src/main/java/org/aspectj/ajde/ui/swing/SimpleStructureViewToolPanel.java b/ajde/src/main/java/org/aspectj/ajde/ui/swing/SimpleStructureViewToolPanel.java index b12698d5e..f3ac1ee09 100644 --- a/ajde/src/main/java/org/aspectj/ajde/ui/swing/SimpleStructureViewToolPanel.java +++ b/ajde/src/main/java/org/aspectj/ajde/ui/swing/SimpleStructureViewToolPanel.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) * ******************************************************************/ package org.aspectj.ajde.ui.swing; diff --git a/ajde/src/main/java/org/aspectj/ajde/ui/swing/StructureTree.java b/ajde/src/main/java/org/aspectj/ajde/ui/swing/StructureTree.java index af4cd16e2..69134c6b0 100644 --- a/ajde/src/main/java/org/aspectj/ajde/ui/swing/StructureTree.java +++ b/ajde/src/main/java/org/aspectj/ajde/ui/swing/StructureTree.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) * ******************************************************************/ @@ -58,5 +58,5 @@ class StructureTree extends JTree { public int getToggleClickCount() { return 1; - } + } } diff --git a/ajde/src/main/java/org/aspectj/ajde/ui/swing/StructureTreeManager.java b/ajde/src/main/java/org/aspectj/ajde/ui/swing/StructureTreeManager.java index 474ba1f60..c6d937d8d 100644 --- a/ajde/src/main/java/org/aspectj/ajde/ui/swing/StructureTreeManager.java +++ b/ajde/src/main/java/org/aspectj/ajde/ui/swing/StructureTreeManager.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) * ******************************************************************/ package org.aspectj.ajde.ui.swing; @@ -213,7 +213,7 @@ class StructureTreeManager { // try { // SwingUtilities.invokeAndWait(update); // } catch (Exception ee) { -// +// // } // } // } @@ -228,7 +228,7 @@ class StructureTreeManager { // setIcon(getProgramElementNodeIcon(lexicalNode)); // } else if (node instanceof RelationNode) { // RelationNode relationNode = (RelationNode)node; -// +// // setIcon(icons.getAssociationSwingIcon(relationNode.getRelation())); // this.setFont(new Font(this.getFont().getName(), Font.ITALIC, this.getFont().getSize())); // @@ -349,7 +349,7 @@ class StructureTreeManager { // return null; // } -// +// // if (relationNode.getKind().equals(org.aspectj.asm.associations.Advice.NAME) || // relationNode.getKind().equals(org.aspectj.asm.associations.Introduction.NAME)) { // if (relationNode.getRelation().getBackNavigationName().equals(relationNode.getName()) ){ @@ -421,7 +421,7 @@ class StructureTreeManager { // } // private class StructureViewNodeAdapter extends DefaultMutableTreeNode { -// +// // private StructureViewNode nodeInfo = null; // // public StructureViewNodeAdapter(StructureViewNode nodeInfo) { diff --git a/ajde/src/main/java/org/aspectj/ajde/ui/swing/StructureViewPanel.java b/ajde/src/main/java/org/aspectj/ajde/ui/swing/StructureViewPanel.java index c3e87bcf8..8a8cb7e61 100644 --- a/ajde/src/main/java/org/aspectj/ajde/ui/swing/StructureViewPanel.java +++ b/ajde/src/main/java/org/aspectj/ajde/ui/swing/StructureViewPanel.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) * ******************************************************************/ @@ -69,7 +69,7 @@ public class StructureViewPanel extends JPanel implements StructureViewRenderer structureToolBar_panel = new BrowserStructureViewToolPanel(structureViews, currentView, this); init(); } - + private void init() { try { jbInit(); @@ -87,8 +87,8 @@ public class StructureViewPanel extends JPanel implements StructureViewRenderer public void updateView(StructureView structureView) { if (structureView == currentView) { - treeManager.updateTree(structureView); - } + treeManager.updateTree(structureView); + } } private void initView(StructureView view) { diff --git a/ajde/src/main/java/org/aspectj/ajde/ui/swing/StructureViewTreeListener.java b/ajde/src/main/java/org/aspectj/ajde/ui/swing/StructureViewTreeListener.java index 589762fef..a0846205c 100644 --- a/ajde/src/main/java/org/aspectj/ajde/ui/swing/StructureViewTreeListener.java +++ b/ajde/src/main/java/org/aspectj/ajde/ui/swing/StructureViewTreeListener.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.ajde.ui.swing; import java.awt.event.MouseEvent; @@ -52,14 +52,14 @@ class StructureViewTreeListener implements TreeSelectionListener, MouseListener SwingTreeViewNode treeNode = (SwingTreeViewNode)tree.getLastSelectedPathComponent(); if (treeNode == null || lastSelectedNode == treeNode) return; lastSelectedNode = treeNode; - + //if (e.getClickCount() == 2) { Ajde.getDefault().getStructureViewManager().fireNavigationAction( treeNode.getStructureNode(), treeNode.getKind() == IStructureViewNode.Kind.LINK ); //} - } + } } diff --git a/ajde/src/main/java/org/aspectj/ajde/ui/swing/SwingTreeViewNode.java b/ajde/src/main/java/org/aspectj/ajde/ui/swing/SwingTreeViewNode.java index 987c2d130..fd418872a 100644 --- a/ajde/src/main/java/org/aspectj/ajde/ui/swing/SwingTreeViewNode.java +++ b/ajde/src/main/java/org/aspectj/ajde/ui/swing/SwingTreeViewNode.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 * ******************************************************************/ @@ -39,13 +39,13 @@ public class SwingTreeViewNode extends DefaultMutableTreeNode implements IStruct /** * Create a declaration node. - */ + */ public SwingTreeViewNode(IProgramElement programElement, AbstractIcon icon, List children) { super(programElement, true); this.programElement = programElement; this.icon = icon; this.kind = Kind.DECLARATION; - + if (children != null) { for (Object o : children) { SwingTreeViewNode child = (SwingTreeViewNode) o; @@ -58,52 +58,52 @@ public class SwingTreeViewNode extends DefaultMutableTreeNode implements IStruct /** * Create a relationship node. - */ + */ public SwingTreeViewNode(IRelationship relationship, AbstractIcon icon) { super(null, true); this.icon = icon; this.kind = Kind.RELATIONSHIP; this.relationshipName = relationship.getName(); } - + /** * Create a link. - */ + */ public SwingTreeViewNode(IProgramElement programElement, AbstractIcon icon) { super(programElement, false); this.programElement = programElement; this.kind = Kind.LINK; this.icon = icon; } - + public IProgramElement getStructureNode() { - return programElement; + return programElement; } - + public AbstractIcon getIcon() { return icon; - } + } - public void add(IStructureViewNode child) { + public void add(IStructureViewNode child) { super.add((DefaultMutableTreeNode)child); } - public void add(IStructureViewNode child, int position) { + public void add(IStructureViewNode child, int position) { super.insert((DefaultMutableTreeNode)child, position); } - - public void remove(IStructureViewNode child) { + + public void remove(IStructureViewNode child) { super.remove((DefaultMutableTreeNode)child); } - + public List getChildren() { if (children == null) { return new ArrayList(); } else { return children; - } + } } - + public Kind getKind() { return kind; } @@ -111,12 +111,12 @@ public class SwingTreeViewNode extends DefaultMutableTreeNode implements IStruct public String getRelationshipName() { return relationshipName; } - + public String toString() { if (kind == IStructureViewNode.Kind.RELATIONSHIP) { return relationshipName; } else if (kind == IStructureViewNode.Kind.LINK) { - return programElement.toLinkLabelString(); + return programElement.toLinkLabelString(); } else { return programElement.toLabelString(); } diff --git a/ajde/src/main/java/org/aspectj/ajde/ui/swing/SwingTreeViewNodeFactory.java b/ajde/src/main/java/org/aspectj/ajde/ui/swing/SwingTreeViewNodeFactory.java index 32aa3708a..18d88e7ae 100644 --- a/ajde/src/main/java/org/aspectj/ajde/ui/swing/SwingTreeViewNodeFactory.java +++ b/ajde/src/main/java/org/aspectj/ajde/ui/swing/SwingTreeViewNodeFactory.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: - * Xerox/PARC initial implementation - * Helen Hawkins Converted to new interface (bug 148190) + * 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) * ******************************************************************/ @@ -28,9 +28,9 @@ import org.aspectj.asm.IRelationship; * @author Mik Kersten */ public class SwingTreeViewNodeFactory extends StructureViewNodeFactory { - + public SwingTreeViewNodeFactory(IconRegistry iconRegistry) { - super(iconRegistry); + super(iconRegistry); } protected IStructureViewNode createDeclaration( diff --git a/ajde/src/main/java/org/aspectj/ajde/ui/swing/SwingTreeViewNodeRenderer.java b/ajde/src/main/java/org/aspectj/ajde/ui/swing/SwingTreeViewNodeRenderer.java index 80396be73..bed2fb783 100644 --- a/ajde/src/main/java/org/aspectj/ajde/ui/swing/SwingTreeViewNodeRenderer.java +++ b/ajde/src/main/java/org/aspectj/ajde/ui/swing/SwingTreeViewNodeRenderer.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) * ******************************************************************/ @@ -43,39 +43,39 @@ class SwingTreeViewNodeRenderer extends DefaultTreeCellRenderer { boolean leaf, int row, boolean hasFocus) { - if (treeNode == null) return null; - this.setFont(StructureTree.DEFAULT_FONT); + if (treeNode == null) return null; + this.setFont(StructureTree.DEFAULT_FONT); SwingTreeViewNode viewNode = (SwingTreeViewNode)treeNode; IProgramElement node = viewNode.getStructureNode(); if (viewNode.getKind() == IStructureViewNode.Kind.LINK) { ISourceLocation sourceLoc = node.getSourceLocation(); - if ((null != sourceLoc) + if ((null != sourceLoc) && (null != sourceLoc.getSourceFile().getAbsolutePath())) { setTextNonSelectionColor(AjdeWidgetStyles.LINK_NODE_COLOR); } else { setTextNonSelectionColor(AjdeWidgetStyles.LINK_NODE_NO_SOURCE_COLOR); } - + } else if (viewNode.getKind() == IStructureViewNode.Kind.RELATIONSHIP) { this.setFont(new Font(this.getFont().getName(), Font.ITALIC, this.getFont().getSize())); setTextNonSelectionColor(new Color(0, 0, 0)); - + } else if (viewNode.getKind() == IStructureViewNode.Kind.DECLARATION) { setTextNonSelectionColor(new Color(0, 0, 0)); } - - super.getTreeCellRendererComponent(tree, treeNode, sel, expanded, leaf, row, hasFocus); + + super.getTreeCellRendererComponent(tree, treeNode, sel, expanded, leaf, row, hasFocus); if (viewNode.getIcon() != null && viewNode.getIcon().getIconResource() != null) { setIcon((Icon)viewNode.getIcon().getIconResource()); } else { setIcon(null); } - + if (node != null) { if (node.isRunnable()) { setIcon(Ajde.getDefault().getIconRegistry().getExecuteIcon()); - } + } if (node.getMessage() != null) { if (node.getMessage().getKind().equals(IMessage.WARNING)) { setIcon(Ajde.getDefault().getIconRegistry().getWarningIcon()); @@ -86,7 +86,7 @@ class SwingTreeViewNodeRenderer extends DefaultTreeCellRenderer { } } - } + } return this; } } diff --git a/ajde/src/main/java/org/aspectj/ajde/ui/swing/TreeViewBuildConfigEditor.java b/ajde/src/main/java/org/aspectj/ajde/ui/swing/TreeViewBuildConfigEditor.java index 9e8b21fb5..4a2fb09e2 100644 --- a/ajde/src/main/java/org/aspectj/ajde/ui/swing/TreeViewBuildConfigEditor.java +++ b/ajde/src/main/java/org/aspectj/ajde/ui/swing/TreeViewBuildConfigEditor.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) * ******************************************************************/ @@ -60,12 +60,12 @@ public class TreeViewBuildConfigEditor extends JPanel implements BuildConfigEdit private ConfigTreeNode root; // private ConfigTreeNode currNode; private BuildConfigModel model = null; - + private static java.util.List selectedEntries = new ArrayList(); // private String configFile = null; // private File sourcePath = null; //private BuildConfigModelBuilder configTreeBuilder = new BuildConfigModelBuilder(); - + BorderLayout borderLayout1 = new BorderLayout(); JPanel jPanel1 = new JPanel(); JLabel jLabel1 = new JLabel(); @@ -88,7 +88,7 @@ public class TreeViewBuildConfigEditor extends JPanel implements BuildConfigEdit jbInit(); jLabel1.setText(" Build configuration: " + configFile); - model = Ajde.getDefault().getBuildConfigManager().buildModel(configFile); + model = Ajde.getDefault().getBuildConfigManager().buildModel(configFile); root = buildTree(model.getRoot()); buildConfig_tree.setModel(new DefaultTreeModel(root)); @@ -103,15 +103,15 @@ public class TreeViewBuildConfigEditor extends JPanel implements BuildConfigEdit Ajde.getDefault().getMessageHandler().handleMessage(msg); } } - + private ConfigTreeNode buildTree(BuildConfigNode node) { ConfigTreeNode treeNode = new ConfigTreeNode(node); for (BuildConfigNode childNode : node.getChildren()) { treeNode.add(buildTree(childNode)); } return treeNode; - } - + } + private void saveModel() { Ajde.getDefault().getBuildConfigManager().writeModel(model); } @@ -154,7 +154,7 @@ public class TreeViewBuildConfigEditor extends JPanel implements BuildConfigEdit } private static class ConfigTreeNode extends DefaultMutableTreeNode { - + private static final long serialVersionUID = 1L; public JCheckBox checkBox = null; public BuildConfigNode modelNode; @@ -193,12 +193,12 @@ public class TreeViewBuildConfigEditor extends JPanel implements BuildConfigEdit // if (isCheckBox(x, tree.getPathBounds(path).x)) { if (node.checkBox.isSelected()) { node.getModelNode().setActive(false); - node.checkBox.setSelected(false); + node.checkBox.setSelected(false); } else { node.getModelNode().setActive(true); - node.checkBox.setSelected(true); + node.checkBox.setSelected(true); } - + ((DefaultTreeModel)tree.getModel()).nodeChanged(node); if (node.getModelNode().getName() != null) { if (node.checkBox.isSelected()) { @@ -237,41 +237,41 @@ public class TreeViewBuildConfigEditor extends JPanel implements BuildConfigEdit final JCheckBox cbox = ((ConfigTreeNode)value).checkBox; cbox.setBackground(Color.white); if (row != 0) { - p.add(cbox); + p.add(cbox); } ConfigTreeNode ctn = (ConfigTreeNode)value; //if (TreeViewBuildConfigEditor.selectedEntries.contains(ctn.getSourceFile())) { if (ctn.getModelNode().isActive()) { cbox.setSelected(true); - } - + } + if (!ctn.getModelNode().isValidResource()) { - ctn.checkBox.setEnabled(false); + ctn.checkBox.setEnabled(false); } - + //} BuildConfigNode.Kind kind = ctn.getModelNode().getBuildConfigNodeKind(); if (kind.equals(BuildConfigNode.Kind.FILE_ASPECTJ)) { - setIcon(Ajde.getDefault().getIconRegistry().getStructureSwingIcon(IProgramElement.Kind.FILE_ASPECTJ)); + setIcon(Ajde.getDefault().getIconRegistry().getStructureSwingIcon(IProgramElement.Kind.FILE_ASPECTJ)); } else if (kind.equals(BuildConfigNode.Kind.FILE_JAVA)) { - setIcon(Ajde.getDefault().getIconRegistry().getStructureSwingIcon(IProgramElement.Kind.FILE_JAVA)); + setIcon(Ajde.getDefault().getIconRegistry().getStructureSwingIcon(IProgramElement.Kind.FILE_JAVA)); } else if (kind.equals(BuildConfigNode.Kind.FILE_LST)) { - setIcon(Ajde.getDefault().getIconRegistry().getStructureSwingIcon(IProgramElement.Kind.FILE_LST)); + setIcon(Ajde.getDefault().getIconRegistry().getStructureSwingIcon(IProgramElement.Kind.FILE_LST)); } else if (kind.equals(BuildConfigNode.Kind.DIRECTORY)) { - setIcon(Ajde.getDefault().getIconRegistry().getStructureSwingIcon(IProgramElement.Kind.PACKAGE)); + setIcon(Ajde.getDefault().getIconRegistry().getStructureSwingIcon(IProgramElement.Kind.PACKAGE)); } else { - setIcon((Icon)Ajde.getDefault().getIconRegistry().getIcon(IProgramElement.Kind.ERROR).getIconResource()); + setIcon((Icon)Ajde.getDefault().getIconRegistry().getIcon(IProgramElement.Kind.ERROR).getIconResource()); p.remove(cbox); } - + // if (ctn.getModelNode().getResourcePath() != null) { // if (ctn.getModelNode().getResourcePath().endsWith(".java")) { -// this.setIcon(AjdeUIManager.getDefault().getIconRegistry().getStructureSwingIcon(ProgramElementNode.Kind.CLASS)); +// this.setIcon(AjdeUIManager.getDefault().getIconRegistry().getStructureSwingIcon(ProgramElementNode.Kind.CLASS)); // } else if (ctn.getModelNode().getResourcePath().endsWith(".aj")) { -// this.setIcon(AjdeUIManager.getDefault().getIconRegistry().getStructureSwingIcon(ProgramElementNode.Kind.ASPECT)); +// this.setIcon(AjdeUIManager.getDefault().getIconRegistry().getStructureSwingIcon(ProgramElementNode.Kind.ASPECT)); // } else { -// this.setIcon(AjdeUIManager.getDefault().getIconRegistry().getStructureSwingIcon(ProgramElementNode.Kind.PACKAGE)); +// this.setIcon(AjdeUIManager.getDefault().getIconRegistry().getStructureSwingIcon(ProgramElementNode.Kind.PACKAGE)); // } // } diff --git a/ajde/src/main/java/org/aspectj/ajde/ui/swing/UpdateConfigurationDialog.java b/ajde/src/main/java/org/aspectj/ajde/ui/swing/UpdateConfigurationDialog.java index 2fc7bf201..1a429419b 100644 --- a/ajde/src/main/java/org/aspectj/ajde/ui/swing/UpdateConfigurationDialog.java +++ b/ajde/src/main/java/org/aspectj/ajde/ui/swing/UpdateConfigurationDialog.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) * ******************************************************************/ diff --git a/ajde/src/test/java/org/aspectj/ajde/AjdeCompilerTest.java b/ajde/src/test/java/org/aspectj/ajde/AjdeCompilerTest.java index 1e3605db2..1f91e680d 100644 --- a/ajde/src/test/java/org/aspectj/ajde/AjdeCompilerTest.java +++ b/ajde/src/test/java/org/aspectj/ajde/AjdeCompilerTest.java @@ -1,11 +1,11 @@ /******************************************************************** - * Copyright (c) 2007 Contributors. All rights reserved. - * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution and is available at - * http://eclipse.org/legal/epl-v10.html - * - * Contributors: IBM Corporation - initial API and implementation + * Copyright (c) 2007 Contributors. All rights reserved. + * This program and the accompanying materials are made available + * under the terms of the Eclipse Public License v 2.0 + * which accompanies this distribution and is available at + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt + * + * Contributors: IBM Corporation - initial API and implementation * Helen Hawkins - initial version (bug 148190) *******************************************************************/ package org.aspectj.ajde; @@ -18,12 +18,12 @@ import org.aspectj.ajde.core.AjCompiler; * to only remember the compiler for the last .lst file. */ public class AjdeCompilerTest extends AjdeTestCase { - + protected void setUp() throws Exception { super.setUp(); initialiseProject("LstBuildConfigManagerTest"); } - + // Expect to get a different compiler instance for each // different config file public void testGetSameAjCompilerForSameConfigFiles() { @@ -32,7 +32,7 @@ public class AjdeCompilerTest extends AjdeTestCase { assertEquals("expected the same AjCompiler instance to be returned" + " for the same configFile but found different ones", c1, c2); } - + // Expect to get a different compiler instance for each // different config file public void testGetDifferentAjCompilerForDifferentConfigFiles() { @@ -41,36 +41,36 @@ public class AjdeCompilerTest extends AjdeTestCase { assertNotSame("expected different AjCompiler instances to be returned" + " for different configFiles but found the smae", c1, c2); } - + // want to keep the same setting regardless of the configFile // being built - therefore the same instance should be passed // from one AjCompiler instance to the next - public void testSameCompilerConfigForDifferentConfigFiles() { + public void testSameCompilerConfigForDifferentConfigFiles() { AjCompiler c1 = getCompilerForConfigFileWithName("bad-injar.lst"); AjCompiler c2 = getCompilerForConfigFileWithName("dir-entry.lst"); assertEquals("expected the same compilerConfig instance to be associated" + - " with the different AjCompiler's however found different ones", + " with the different AjCompiler's however found different ones", c1.getCompilerConfiguration(), c2.getCompilerConfiguration()); } - + // want to have a different messageHandler instance for the different // config files - or we can just reset?!?! Resetting would be easier public void testSameMessageHandlerForDifferentConfigFiles() { AjCompiler c1 = getCompilerForConfigFileWithName("bad-injar.lst"); AjCompiler c2 = getCompilerForConfigFileWithName("dir-entry.lst"); assertEquals("expected the same messageHandler instance to be associated" + - " with the different AjCompiler's however found different ones", + " with the different AjCompiler's however found different ones", c1.getMessageHandler(), c2.getMessageHandler()); } - + // can have the same buildProgressMonitor for the different configFiles // because it holds no state public void testSameBuildProgressMonitorForDifferentConfigFiles() { AjCompiler c1 = getCompilerForConfigFileWithName("bad-injar.lst"); AjCompiler c2 = getCompilerForConfigFileWithName("dir-entry.lst"); assertEquals("expected the same buildProgressMonitor instance to be associated" + - " with the different AjCompiler's however found different ones", + " with the different AjCompiler's however found different ones", c1.getBuildProgressMonitor(), c2.getBuildProgressMonitor()); } - + } diff --git a/ajde/src/test/java/org/aspectj/ajde/AjdeModuleTests.java b/ajde/src/test/java/org/aspectj/ajde/AjdeModuleTests.java index 354c00d32..09753ad84 100644 --- a/ajde/src/test/java/org/aspectj/ajde/AjdeModuleTests.java +++ b/ajde/src/test/java/org/aspectj/ajde/AjdeModuleTests.java @@ -1,14 +1,14 @@ /* ******************************************************************* - * Copyright (c) 1999-2001 Xerox Corporation, + * Copyright (c) 1999-2001 Xerox Corporation, * 2002 Palo Alto Research Center, Incorporated (PARC). - * All rights reserved. - * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Xerox/PARC initial implementation + * All rights reserved. + * This program and the accompanying materials are made available + * under the terms of the Eclipse Public License v 2.0 + * which accompanies this distribution and is available at + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt + * + * Contributors: + * Xerox/PARC initial implementation * ******************************************************************/ package org.aspectj.ajde; @@ -22,18 +22,18 @@ import junit.framework.TestSuite; public class AjdeModuleTests extends TestCase { - public static TestSuite suite() { + public static TestSuite suite() { TestSuite suite = new TestSuite(AjdeModuleTests.class.getName()); suite.addTestSuite(SymbolFileGenerationTest.class); suite.addTestSuite(ExtensionTest.class); - suite.addTestSuite(AspectJBuildManagerTest.class); + suite.addTestSuite(AspectJBuildManagerTest.class); suite.addTestSuite(LstBuildConfigManagerTest.class); - suite.addTestSuite(StructureSearchManagerTest.class); - suite.addTestSuite(StructureViewManagerTest.class); + suite.addTestSuite(StructureSearchManagerTest.class); + suite.addTestSuite(StructureViewManagerTest.class); suite.addTestSuite(AjdeCompilerTest.class); return suite; } public AjdeModuleTests(String name) { super(name); } -} +} diff --git a/ajde/src/test/java/org/aspectj/ajde/AjdeTestCase.java b/ajde/src/test/java/org/aspectj/ajde/AjdeTestCase.java index f1d979181..66ba851e5 100644 --- a/ajde/src/test/java/org/aspectj/ajde/AjdeTestCase.java +++ b/ajde/src/test/java/org/aspectj/ajde/AjdeTestCase.java @@ -1,12 +1,12 @@ /******************************************************************** * Copyright (c) 2002 Palo Alto Research Center, Incorporated (PARC). - * All rights reserved. - * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution and is available at - * http://eclipse.org/legal/epl-v10.html - * - * Contributors: + * All rights reserved. + * This program and the accompanying materials are made available + * under the terms of the Eclipse Public License v 2.0 + * which accompanies this distribution and is available at + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt + * + * Contributors: * Xerox/PARC initial implementation * Helen Hawkins Converted to new interface (bug 148190) and * to use a sandbox directory diff --git a/ajde/src/test/java/org/aspectj/ajde/ExtensionTest.java b/ajde/src/test/java/org/aspectj/ajde/ExtensionTest.java index 384d417f7..450bf0036 100644 --- a/ajde/src/test/java/org/aspectj/ajde/ExtensionTest.java +++ b/ajde/src/test/java/org/aspectj/ajde/ExtensionTest.java @@ -1,10 +1,10 @@ /******************************************************************************* * Copyright (c) 2004 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt + * * Contributors: * Andy Clement - initial implementation *******************************************************************************/ @@ -38,9 +38,9 @@ public class ExtensionTest extends AjcTestCase { /** * Aim: Check that the ID of certain message kinds are correct - * + * * ajc -warn:unusedImport UnusedImport.java - * + * * Expected result is that id matches IProblem.UnusedImport */ public void testMessageID() { @@ -121,9 +121,9 @@ public class ExtensionTest extends AjcTestCase { /** * Aim: Check that the start/end of certain warnings are correct - * + * * ajc -warn:unusedImport UnusedImport.java - * + * * Expected result is first warning message has start=7 end=20 */ public void testMessageSourceStartEnd() { diff --git a/ajde/src/test/java/org/aspectj/ajde/SymbolFileGenerationTest.java b/ajde/src/test/java/org/aspectj/ajde/SymbolFileGenerationTest.java index 2d1669695..19201a36d 100644 --- a/ajde/src/test/java/org/aspectj/ajde/SymbolFileGenerationTest.java +++ b/ajde/src/test/java/org/aspectj/ajde/SymbolFileGenerationTest.java @@ -1,14 +1,14 @@ /* ******************************************************************* - * Copyright (c) 1999-2001 Xerox Corporation, + * Copyright (c) 1999-2001 Xerox Corporation, * 2002 Palo Alto Research Center, Incorporated (PARC). - * All rights reserved. - * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Xerox/PARC initial implementation + * All rights reserved. + * This program and the accompanying materials are made available + * under the terms of the Eclipse Public License v 2.0 + * which accompanies this distribution and is available at + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt + * + * Contributors: + * Xerox/PARC initial implementation * ******************************************************************/ package org.aspectj.ajde; diff --git a/ajde/src/test/java/org/aspectj/ajde/internal/AspectJBuildManagerTest.java b/ajde/src/test/java/org/aspectj/ajde/internal/AspectJBuildManagerTest.java index 4382dfe7d..567806924 100644 --- a/ajde/src/test/java/org/aspectj/ajde/internal/AspectJBuildManagerTest.java +++ b/ajde/src/test/java/org/aspectj/ajde/internal/AspectJBuildManagerTest.java @@ -1,14 +1,14 @@ /* ******************************************************************* * Copyright (c) 2002 Palo Alto Research Center, Incorporated (PARC). - * All rights reserved. - * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: + * All rights reserved. + * This program and the accompanying materials are made available + * under the terms of the Eclipse Public License v 2.0 + * which accompanies this distribution and is available at + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt + * + * Contributors: * Xerox/PARC initial implementation - * Helen Hawkins Converted to new interface (bug 148190) + * Helen Hawkins Converted to new interface (bug 148190) * ******************************************************************/ @@ -28,7 +28,7 @@ public class AspectJBuildManagerTest extends AjdeTestCase { public static TestSuite suite() { TestSuite result = new TestSuite(); - result.addTestSuite(AspectJBuildManagerTest.class); + result.addTestSuite(AspectJBuildManagerTest.class); return result; } @@ -50,15 +50,15 @@ public class AspectJBuildManagerTest extends AjdeTestCase { file.delete(); } else { assertTrue("expected class " + file, false); - } - + } + // TODO-path file = openFile("all.ajsym"); if (file.exists()) { file.delete(); } else { assertTrue("expected .ajsym: " + file, false); - } + } } finally { AsmManager.dumpModelPostBuild=false; } diff --git a/ajde/src/test/java/org/aspectj/ajde/internal/LstBuildConfigManagerTest.java b/ajde/src/test/java/org/aspectj/ajde/internal/LstBuildConfigManagerTest.java index 74a8cc1eb..280c11e77 100644 --- a/ajde/src/test/java/org/aspectj/ajde/internal/LstBuildConfigManagerTest.java +++ b/ajde/src/test/java/org/aspectj/ajde/internal/LstBuildConfigManagerTest.java @@ -1,18 +1,18 @@ /* ******************************************************************* * Copyright (c) 2002 Palo Alto Research Center, Incorporated (PARC). - * All rights reserved. - * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: + * All rights reserved. + * This program and the accompanying materials are made available + * under the terms of the Eclipse Public License v 2.0 + * which accompanies this distribution and is available at + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt + * + * Contributors: * Xerox/PARC initial implementation - * Helen Hawkins Converted to new interface (bug 148190) + * Helen Hawkins Converted to new interface (bug 148190) * ******************************************************************/ -package org.aspectj.ajde.internal; +package org.aspectj.ajde.internal; import java.io.File; import java.io.IOException; @@ -25,15 +25,15 @@ import org.aspectj.ajde.ui.utils.TestMessageHandler.TestMessage; import junit.framework.TestSuite; public class LstBuildConfigManagerTest extends AjdeTestCase { - + private BuildConfigManager buildConfigManager = new LstBuildConfigManager(); public static TestSuite suite() { TestSuite result = new TestSuite(); - result.addTestSuite(LstBuildConfigManagerTest.class); + result.addTestSuite(LstBuildConfigManagerTest.class); return result; } - + protected void setUp() throws Exception { super.setUp(); initialiseProject("LstBuildConfigManagerTest"); @@ -43,7 +43,7 @@ public class LstBuildConfigManagerTest extends AjdeTestCase { doBuild("dir-entry.lst"); List messages = getMessages("dir-entry.lst"); TestMessage message = (TestMessage)messages.get(0); - + assertEquals(message.getContainedMessage().getSourceLocation().getSourceFile().getAbsolutePath(), openFile("dir-entry.lst").getAbsolutePath()); doBuild("bad-injar.lst"); @@ -56,25 +56,25 @@ public class LstBuildConfigManagerTest extends AjdeTestCase { doBuild("invalid-entry.lst"); assertFalse("expected there to be error messages because the build failed but didn't" + " find any", getErrorMessages("invalid-entry.lst").isEmpty()); - + List messages = getMessages("invalid-entry.lst"); - TestMessage message = (TestMessage)messages.get(0); + TestMessage message = (TestMessage)messages.get(0); assertTrue(message.getContainedMessage().getMessage(), message.getContainedMessage().getMessage().contains("aaa.bbb")); - + } public void testNonExistentConfigFile() throws IOException { File file = openFile("mumbleDoesNotExist.lst"); assertTrue("valid non-existing file", !file.exists()); BuildConfigModel model = buildConfigManager.buildModel(file.getCanonicalPath()); - assertTrue("root: " + model.getRoot(), model.getRoot() != null); + assertTrue("root: " + model.getRoot(), model.getRoot() != null); } public void testFileRelativePathSameDir() throws IOException { File file = openFile("file-relPath-sameDir.lst"); buildConfigManager.buildModel(file.getCanonicalPath()); assertTrue("single file", true); - } - + } + } diff --git a/ajde/src/test/java/org/aspectj/ajde/ui/NullIdeFileStructureView.java b/ajde/src/test/java/org/aspectj/ajde/ui/NullIdeFileStructureView.java index 40c0b2b92..228119c93 100644 --- a/ajde/src/test/java/org/aspectj/ajde/ui/NullIdeFileStructureView.java +++ b/ajde/src/test/java/org/aspectj/ajde/ui/NullIdeFileStructureView.java @@ -1,13 +1,13 @@ /* ******************************************************************* * Copyright (c) 2002 Palo Alto Research Center, Incorporated (PARC). - * All rights reserved. - * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Xerox/PARC initial implementation + * All rights reserved. + * This program and the accompanying materials are made available + * under the terms of the Eclipse Public License v 2.0 + * which accompanies this distribution and is available at + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt + * + * Contributors: + * Xerox/PARC initial implementation * ******************************************************************/ @@ -18,12 +18,12 @@ package org.aspectj.ajde.ui; * @author Mik Kersten */ public class NullIdeFileStructureView extends FileStructureView { - + private String sourceFilePath = null; - + public NullIdeFileStructureView(StructureViewProperties viewProperties) { - super(viewProperties); - } + super(viewProperties); + } public String getSourceFile() { return sourceFilePath; } diff --git a/ajde/src/test/java/org/aspectj/ajde/ui/NullIdeStructureViewRenderer.java b/ajde/src/test/java/org/aspectj/ajde/ui/NullIdeStructureViewRenderer.java index 81b65dea0..ef47a972f 100644 --- a/ajde/src/test/java/org/aspectj/ajde/ui/NullIdeStructureViewRenderer.java +++ b/ajde/src/test/java/org/aspectj/ajde/ui/NullIdeStructureViewRenderer.java @@ -1,13 +1,13 @@ /* ******************************************************************* * Copyright (c) 2002 Palo Alto Research Center, Incorporated (PARC). - * All rights reserved. - * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Xerox/PARC initial implementation + * All rights reserved. + * This program and the accompanying materials are made available + * under the terms of the Eclipse Public License v 2.0 + * which accompanies this distribution and is available at + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt + * + * Contributors: + * Xerox/PARC initial implementation * ******************************************************************/ @@ -20,19 +20,19 @@ package org.aspectj.ajde.ui; public class NullIdeStructureViewRenderer implements StructureViewRenderer { private boolean hasBeenNotified = false; - + public void updateView(StructureView structureView) { - hasBeenNotified = true; + hasBeenNotified = true; } - + public void setActiveNode(IStructureViewNode node) { - // ignored + // ignored } - + public void setActiveNode(IStructureViewNode node, int lineOffset) { // ignored } - + public boolean getHasBeenNotified() { return hasBeenNotified; } @@ -41,4 +41,4 @@ public class NullIdeStructureViewRenderer implements StructureViewRenderer { this.hasBeenNotified = hasBeenNotified; } } - + diff --git a/ajde/src/test/java/org/aspectj/ajde/ui/StructureSearchManagerTest.java b/ajde/src/test/java/org/aspectj/ajde/ui/StructureSearchManagerTest.java index ecbfed0d7..b95a5370b 100644 --- a/ajde/src/test/java/org/aspectj/ajde/ui/StructureSearchManagerTest.java +++ b/ajde/src/test/java/org/aspectj/ajde/ui/StructureSearchManagerTest.java @@ -1,13 +1,13 @@ /* ******************************************************************* * Copyright (c) 2002 Palo Alto Research Center, Incorporated (PARC). - * All rights reserved. - * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Xerox/PARC initial implementation + * All rights reserved. + * This program and the accompanying materials are made available + * under the terms of the Eclipse Public License v 2.0 + * which accompanies this distribution and is available at + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt + * + * Contributors: + * Xerox/PARC initial implementation * Helen Hawkins Converted to new interface (bug 148190) * ******************************************************************/ @@ -29,7 +29,7 @@ public class StructureSearchManagerTest extends AjdeTestCase { public static TestSuite suite() { TestSuite result = new TestSuite(); - result.addTestSuite(StructureSearchManagerTest.class); + result.addTestSuite(StructureSearchManagerTest.class); return result; } @@ -56,11 +56,11 @@ public class StructureSearchManagerTest extends AjdeTestCase { ); assertTrue("non existent", matches.isEmpty()); } - + protected void setUp() throws Exception { super.setUp(); initialiseProject("StructureSearchManagerTest"); - doBuild("all.lst"); + doBuild("all.lst"); } protected void tearDown() throws Exception { diff --git a/ajde/src/test/java/org/aspectj/ajde/ui/StructureViewManagerTest.java b/ajde/src/test/java/org/aspectj/ajde/ui/StructureViewManagerTest.java index 5948d2c5a..ab7743183 100644 --- a/ajde/src/test/java/org/aspectj/ajde/ui/StructureViewManagerTest.java +++ b/ajde/src/test/java/org/aspectj/ajde/ui/StructureViewManagerTest.java @@ -1,14 +1,14 @@ /* ******************************************************************* * Copyright (c) 2002 Palo Alto Research Center, Incorporated (PARC). - * All rights reserved. - * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: + * All rights reserved. + * This program and the accompanying materials are made available + * under the terms of the Eclipse Public License v 2.0 + * which accompanies this distribution and is available at + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt + * + * Contributors: * Xerox/PARC initial implementation - * Helen Hawkins Converted to new interface (bug 148190) + * Helen Hawkins Converted to new interface (bug 148190) * ******************************************************************/ package org.aspectj.ajde.ui; diff --git a/ajde/src/test/java/org/aspectj/ajde/ui/utils/TestBuildProgressMonitor.java b/ajde/src/test/java/org/aspectj/ajde/ui/utils/TestBuildProgressMonitor.java index ef70388ad..aaf1b0833 100644 --- a/ajde/src/test/java/org/aspectj/ajde/ui/utils/TestBuildProgressMonitor.java +++ b/ajde/src/test/java/org/aspectj/ajde/ui/utils/TestBuildProgressMonitor.java @@ -1,9 +1,9 @@ /******************************************************************** * Copyright (c) 2007 Contributors. All rights reserved. * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 + * under the terms of the Eclipse Public License v 2.0 * which accompanies this distribution and is available at - * http://eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt * * Contributors: IBM Corporation - initial API and implementation * Helen Hawkins - initial version (bug 148190) diff --git a/ajde/src/test/java/org/aspectj/ajde/ui/utils/TestCompilerConfiguration.java b/ajde/src/test/java/org/aspectj/ajde/ui/utils/TestCompilerConfiguration.java index 4dd195aed..68ecee15d 100644 --- a/ajde/src/test/java/org/aspectj/ajde/ui/utils/TestCompilerConfiguration.java +++ b/ajde/src/test/java/org/aspectj/ajde/ui/utils/TestCompilerConfiguration.java @@ -1,9 +1,9 @@ /******************************************************************** * Copyright (c) 2007 Contributors. All rights reserved. * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 + * under the terms of the Eclipse Public License v 2.0 * which accompanies this distribution and is available at - * http://eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt * * Contributors: IBM Corporation - initial API and implementation * Helen Hawkins - initial version (bug 148190) diff --git a/ajde/src/test/java/org/aspectj/ajde/ui/utils/TestEditorAdapter.java b/ajde/src/test/java/org/aspectj/ajde/ui/utils/TestEditorAdapter.java index 6c94e7f33..c09510877 100644 --- a/ajde/src/test/java/org/aspectj/ajde/ui/utils/TestEditorAdapter.java +++ b/ajde/src/test/java/org/aspectj/ajde/ui/utils/TestEditorAdapter.java @@ -1,11 +1,11 @@ /******************************************************************** - * Copyright (c) 2007 Contributors. All rights reserved. - * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution and is available at - * http://eclipse.org/legal/epl-v10.html - * - * Contributors: IBM Corporation - initial API and implementation + * Copyright (c) 2007 Contributors. All rights reserved. + * This program and the accompanying materials are made available + * under the terms of the Eclipse Public License v 2.0 + * which accompanies this distribution and is available at + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt + * + * Contributors: IBM Corporation - initial API and implementation * Helen Hawkins - initial version (bug 148190) *******************************************************************/ package org.aspectj.ajde.ui.utils; diff --git a/ajde/src/test/java/org/aspectj/ajde/ui/utils/TestIdeUIAdapter.java b/ajde/src/test/java/org/aspectj/ajde/ui/utils/TestIdeUIAdapter.java index 2bc23ec60..77a0963d7 100644 --- a/ajde/src/test/java/org/aspectj/ajde/ui/utils/TestIdeUIAdapter.java +++ b/ajde/src/test/java/org/aspectj/ajde/ui/utils/TestIdeUIAdapter.java @@ -1,11 +1,11 @@ /******************************************************************** - * Copyright (c) 2007 Contributors. All rights reserved. - * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution and is available at - * http://eclipse.org/legal/epl-v10.html - * - * Contributors: IBM Corporation - initial API and implementation + * Copyright (c) 2007 Contributors. All rights reserved. + * This program and the accompanying materials are made available + * under the terms of the Eclipse Public License v 2.0 + * which accompanies this distribution and is available at + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt + * + * Contributors: IBM Corporation - initial API and implementation * Helen Hawkins - initial version (bug 148190) *******************************************************************/ package org.aspectj.ajde.ui.utils; diff --git a/ajde/src/test/java/org/aspectj/ajde/ui/utils/TestMessageHandler.java b/ajde/src/test/java/org/aspectj/ajde/ui/utils/TestMessageHandler.java index 8901b02f4..d0fd36bd0 100644 --- a/ajde/src/test/java/org/aspectj/ajde/ui/utils/TestMessageHandler.java +++ b/ajde/src/test/java/org/aspectj/ajde/ui/utils/TestMessageHandler.java @@ -1,11 +1,11 @@ /******************************************************************** - * Copyright (c) 2007 Contributors. All rights reserved. - * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution and is available at - * http://eclipse.org/legal/epl-v10.html - * - * Contributors: IBM Corporation - initial API and implementation + * Copyright (c) 2007 Contributors. All rights reserved. + * This program and the accompanying materials are made available + * under the terms of the Eclipse Public License v 2.0 + * which accompanies this distribution and is available at + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt + * + * Contributors: IBM Corporation - initial API and implementation * Helen Hawkins - initial version (bug 148190) *******************************************************************/ package org.aspectj.ajde.ui.utils; @@ -30,7 +30,7 @@ public class TestMessageHandler implements IUIBuildMessageHandler { private List ignoring; private List messages; private List errors; - + public TestMessageHandler() { ignoring = new ArrayList(); messages = new ArrayList(); @@ -40,7 +40,7 @@ public class TestMessageHandler implements IUIBuildMessageHandler { } public boolean handleMessage(IMessage message) throws AbortException { - IMessage.Kind kind = message.getKind(); + IMessage.Kind kind = message.getKind(); if (isIgnoring(kind)) { return true; } @@ -66,32 +66,32 @@ public class TestMessageHandler implements IUIBuildMessageHandler { public boolean isIgnoring(Kind kind) { return ((null != kind) && (ignoring.contains(kind))); } - + public void ignore(Kind kind) { if ((null != kind) && (!ignoring.contains(kind))) { ignoring.add(kind); - } + } } public List getMessages() { return messages; } - + public List getErrors() { return errors; } - + public static class TestMessage { IMessage message; - + public TestMessage(IMessage m) { message = m; } - + public IMessage getContainedMessage() { return message; } - + public String toString() { String loc = "<no location>"; if (null != message.getSourceLocation()) { diff --git a/ajde/src/test/java/org/aspectj/ajde/ui/utils/TestOutputLocationManager.java b/ajde/src/test/java/org/aspectj/ajde/ui/utils/TestOutputLocationManager.java index 157f3ecd4..3872b45bd 100644 --- a/ajde/src/test/java/org/aspectj/ajde/ui/utils/TestOutputLocationManager.java +++ b/ajde/src/test/java/org/aspectj/ajde/ui/utils/TestOutputLocationManager.java @@ -1,11 +1,11 @@ /******************************************************************** - * Copyright (c) 2007 Contributors. All rights reserved. - * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution and is available at - * http://eclipse.org/legal/epl-v10.html - * - * Contributors: IBM Corporation - initial API and implementation + * Copyright (c) 2007 Contributors. All rights reserved. + * This program and the accompanying materials are made available + * under the terms of the Eclipse Public License v 2.0 + * which accompanies this distribution and is available at + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt + * + * Contributors: IBM Corporation - initial API and implementation * Helen Hawkins - initial version (bug 148190) *******************************************************************/ package org.aspectj.ajde.ui.utils; @@ -40,7 +40,7 @@ public class TestOutputLocationManager implements IOutputLocationManager { public String getUniqueIdentifier() { return testProjectOutputPath; } - + public Map getInpathMap() { return Collections.EMPTY_MAP; } diff --git a/ajde/src/test/java/org/aspectj/ajde/ui/utils/TestRuntimeProperties.java b/ajde/src/test/java/org/aspectj/ajde/ui/utils/TestRuntimeProperties.java index a9e923e2a..588bcbb41 100644 --- a/ajde/src/test/java/org/aspectj/ajde/ui/utils/TestRuntimeProperties.java +++ b/ajde/src/test/java/org/aspectj/ajde/ui/utils/TestRuntimeProperties.java @@ -1,11 +1,11 @@ /******************************************************************** - * Copyright (c) 2007 Contributors. All rights reserved. - * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution and is available at - * http://eclipse.org/legal/epl-v10.html - * - * Contributors: IBM Corporation - initial API and implementation + * Copyright (c) 2007 Contributors. All rights reserved. + * This program and the accompanying materials are made available + * under the terms of the Eclipse Public License v 2.0 + * which accompanies this distribution and is available at + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt + * + * Contributors: IBM Corporation - initial API and implementation * Helen Hawkins - initial version (bug 148190) *******************************************************************/ package org.aspectj.ajde.ui.utils; |