mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-08 00:35:49 +02:00
Code Issues Wiki Activity

bug 357442: Cosmetics changes mostly

Browse source
This commit is contained in:
Andrew Gvozdev 2012-11-26 09:25:26 -05:00
parent 0cb4542e0b
commit 50cf74d461
5 changed files with 137 additions and 278 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/core/IBuildPathResolver.java
View file

@ -1,5 +1,5 @@
/******************************************************************************* /*******************************************************************************
* Copyright (c) 2005 Intel Corporation and others. * Copyright (c) 2005, 2012 Intel Corporation and others.
* All rights reserved. This program and the accompanying materials * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0 * are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at * which accompanies this distribution, and is available at
@ -11,24 +11,22 @@
package org.eclipse.cdt.managedbuilder.core; package org.eclipse.cdt.managedbuilder.core;
/** /**
* this interface is to be implemented by the tool-integrator to provide some specific * This interface is to be implemented by the tool-integrator to provide some specific
* logic for resolving the build path variable values to the build paths * logic for resolving the build path variable values to the build paths.
* <br/><br/>
* See extension point {@code org.eclipse.cdt.managedbuilder.core.buildDefinitions},
* element {@code envVarBuildPath} attribute {@code buildPathResolver}.
*
* @since 3.0 * @since 3.0
*/ */
public interface IBuildPathResolver { public interface IBuildPathResolver {
/** /**
*
* @param pathType one of the IEnvVarBuildPath.BUILDPATH _xxx * @param pathType one of the IEnvVarBuildPath.BUILDPATH _xxx
* @param variableName represents the name of the variable that holds the build paths * @param variableName represents the name of the variable that holds the build paths
* @param variableValue represents the value of the value specified with the * @param variableValue represents the value of the value specified with the
* variableName argument * variableName argument
* @param configuration represents configuration for which the build paths are requested * @param configuration represents configuration for which the build paths are requested
*/ */
String[] resolveBuildPaths( String[] resolveBuildPaths(int pathType, String variableName, String variableValue, IConfiguration configuration);
int pathType,
String variableName,
String variableValue,
IConfiguration configuration);
} }

24
build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/BuildObject.java
View file

@ -1,5 +1,5 @@
/******************************************************************************* /*******************************************************************************
* Copyright (c) 2003, 2007 IBM Corporation and others. * Copyright (c) 2003, 2012 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0 * are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at * which accompanies this distribution, and is available at
@ -24,42 +24,32 @@ public class BuildObject implements IBuildObject {
protected Version version = null; protected Version version = null;
protected String managedBuildRevision = null; protected String managedBuildRevision = null;
/* (non-Javadoc)
* @see org.eclipse.cdt.core.build.managed.IBuildObject#getId()
*/
@Override @Override
public String getId() { public String getId() {
return id; return id;
} }
/* (non-Javadoc)
* @see org.eclipse.cdt.core.build.managed.IBuildObject#setId(java.lang.String)
*/
public void setId(String id) { public void setId(String id) {
this.id = id; this.id = id;
} }
/* (non-Javadoc)
* @see org.eclipse.cdt.core.build.managed.IBuildObject#getName()
*/
@Override @Override
public String getName() { public String getName() {
return name; return name;
} }
/* (non-Javadoc)
* @see org.eclipse.cdt.core.build.managed.IBuildObject#setName(java.lang.String)
*/
public void setName(String name) { public void setName(String name) {
this.name = name; this.name = name;
} }
/* (non-Javadoc) @SuppressWarnings("nls")
* @see java.lang.Object#toString()
*/
@Override @Override
public String toString() { public String toString() {
if (name != null) {
return name; return name;
} else {
return "id=" + id;
}
} }
/** /**
@ -126,7 +116,7 @@ public class BuildObject implements IBuildObject {
this.managedBuildRevision = managedBuildRevision; this.managedBuildRevision = managedBuildRevision;
} }
/* /**
* updates revision for this build object and all its children * updates revision for this build object and all its children
*/ */
public void updateManagedBuildRevision(String revision){ public void updateManagedBuildRevision(String revision){

188
build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ToolChain.java
View file

@ -165,8 +165,7 @@ public class ToolChain extends HoldsOptions implements IToolChain, IMatchKeyProv
ManagedBuildManager.addExtensionToolChain(this); ManagedBuildManager.addExtensionToolChain(this);
// Load the TargetPlatform child // Load the TargetPlatform child
IManagedConfigElement[] targetPlatforms = IManagedConfigElement[] targetPlatforms = element.getChildren(ITargetPlatform.TARGET_PLATFORM_ELEMENT_NAME);
element.getChildren(ITargetPlatform.TARGET_PLATFORM_ELEMENT_NAME);
if (targetPlatforms.length < 1 || targetPlatforms.length > 1) { if (targetPlatforms.length < 1 || targetPlatforms.length > 1) {
// TODO: Report error // TODO: Report error
} }
@ -175,8 +174,7 @@ public class ToolChain extends HoldsOptions implements IToolChain, IMatchKeyProv
} }
// Load the Builder child // Load the Builder child
IManagedConfigElement[] builders = IManagedConfigElement[] builders = element.getChildren(IBuilder.BUILDER_ELEMENT_NAME);
element.getChildren(IBuilder.BUILDER_ELEMENT_NAME);
if (builders.length < 1 || builders.length > 1) { if (builders.length < 1 || builders.length > 1) {
// TODO: Report error // TODO: Report error
} }
@ -377,9 +375,8 @@ public class ToolChain extends HoldsOptions implements IToolChain, IMatchKeyProv
String subName; String subName;
if (toolChain.builder.getSuperClass() != null) { if (toolChain.builder.getSuperClass() != null) {
subId = copyIds ? toolChain.builder.getId() : ManagedBuildManager.calculateChildId( subId = copyIds ? toolChain.builder.getId() :
toolChain.builder.getSuperClass().getId(), ManagedBuildManager.calculateChildId(toolChain.builder.getSuperClass().getId(), null);
null);
subName = toolChain.builder.getSuperClass().getName(); subName = toolChain.builder.getSuperClass().getName();
} else { } else {
subId = copyIds ? toolChain.builder.getId() : ManagedBuildManager.calculateChildId( subId = copyIds ? toolChain.builder.getId() : ManagedBuildManager.calculateChildId(
@ -417,7 +414,6 @@ public class ToolChain extends HoldsOptions implements IToolChain, IMatchKeyProv
// } // }
targetPlatform = new TargetPlatform(this, subId, subName, (TargetPlatform)tpBase); targetPlatform = new TargetPlatform(this, subId, subName, (TargetPlatform)tpBase);
} }
//
} }
IConfiguration cfg = parentFolderInfo.getParent(); IConfiguration cfg = parentFolderInfo.getParent();
@ -439,10 +435,10 @@ public class ToolChain extends HoldsOptions implements IToolChain, IMatchKeyProv
if(subId == null){ if(subId == null){
if (extTool != null) { if (extTool != null) {
subId = copyIds ? toolChild.getId() : ManagedBuildManager.calculateChildId(extTool.getId(), null); subId = copyIds ? toolChild.getId() : ManagedBuildManager.calculateChildId(extTool.getId(), null);
// subName = toolChild.getSuperClass().getName(); // subName = toolChild.getSuperClass().getName();
} else { } else {
subId = copyIds ? toolChild.getId() : ManagedBuildManager.calculateChildId(toolChild.getId(), null); subId = copyIds ? toolChild.getId() : ManagedBuildManager.calculateChildId(toolChild.getId(), null);
// subName = toolChild.getName(); // subName = toolChild.getName();
} }
} }
// version = ManagedBuildManager.getVersionFromIdAndVersion(tmpId); // version = ManagedBuildManager.getVersionFromIdAndVersion(tmpId);
@ -630,7 +626,7 @@ public class ToolChain extends HoldsOptions implements IToolChain, IMatchKeyProv
} }
/* (non-Javadoc) /**
* Initialize the tool-chain information from the XML element * Initialize the tool-chain information from the XML element
* specified in the argument * specified in the argument
* *
@ -854,11 +850,11 @@ public class ToolChain extends HoldsOptions implements IToolChain, IMatchKeyProv
} }
//serialize user-defined macros //serialize user-defined macros
/* if(userDefinedMacros != null){ // if(userDefinedMacros != null){
ICStorageElement macrosElement = element.createChild(StorableMacros.MACROS_ELEMENT_NAME); // ICStorageElement macrosElement = element.createChild(StorableMacros.MACROS_ELEMENT_NAME);
userDefinedMacros.serialize(macrosElement); // userDefinedMacros.serialize(macrosElement);
} // }
*/
// Note: optionPathConverter cannot be specified in a project file because // Note: optionPathConverter cannot be specified in a project file because
// an IConfigurationElement is needed to load it! // an IConfigurationElement is needed to load it!
if (pathconverterElement != null) { if (pathconverterElement != null) {
@ -883,23 +879,17 @@ public class ToolChain extends HoldsOptions implements IToolChain, IMatchKeyProv
} catch (Exception e) { } catch (Exception e) {
// TODO: issue an error message // TODO: issue an error message
} }
} }
/* /*
* P A R E N T A N D C H I L D H A N D L I N G * P A R E N T A N D C H I L D H A N D L I N G
*/ */
/* (non-Javadoc)
* @see org.eclipse.cdt.core.build.managed.IToolChain#getConfiguration()
*/
@Override @Override
public IConfiguration getParent() { public IConfiguration getParent() {
return config; return config;
} }
/* (non-Javadoc)
* @see org.eclipse.cdt.core.build.managed.IToolChain#createTargetPlatform(ITargetPlatform, String, String, boolean)
*/
@Override @Override
public ITargetPlatform createTargetPlatform(ITargetPlatform superClass, String id, String name, boolean isExtensionElement) { public ITargetPlatform createTargetPlatform(ITargetPlatform superClass, String id, String name, boolean isExtensionElement) {
targetPlatform = new TargetPlatform(this, superClass, id, name, isExtensionElement); targetPlatform = new TargetPlatform(this, superClass, id, name, isExtensionElement);
@ -907,9 +897,6 @@ public class ToolChain extends HoldsOptions implements IToolChain, IMatchKeyProv
return targetPlatform; return targetPlatform;
} }
/* (non-Javadoc)
* @see org.eclipse.cdt.core.build.managed.IToolChain#getTargetPlatform()
*/
@Override @Override
public ITargetPlatform getTargetPlatform() { public ITargetPlatform getTargetPlatform() {
if (targetPlatform == null) { if (targetPlatform == null) {
@ -920,9 +907,6 @@ public class ToolChain extends HoldsOptions implements IToolChain, IMatchKeyProv
return targetPlatform; return targetPlatform;
} }
/* (non-Javadoc)
* @see org.eclipse.cdt.core.build.managed.IToolChain#removeLocalTargetPlatform()
*/
@Override @Override
public void removeLocalTargetPlatform() { public void removeLocalTargetPlatform() {
if (targetPlatform == null) return; if (targetPlatform == null) return;
@ -930,9 +914,6 @@ public class ToolChain extends HoldsOptions implements IToolChain, IMatchKeyProv
setDirty(true); setDirty(true);
} }
/* (non-Javadoc)
* @see org.eclipse.cdt.core.build.managed.IToolChain#createBuilder(IBuilder, String, String, boolean)
*/
@Override @Override
public IBuilder createBuilder(IBuilder superClass, String id, String name, boolean isExtensionElement) { public IBuilder createBuilder(IBuilder superClass, String id, String name, boolean isExtensionElement) {
builder = new Builder(this, superClass, id, name, isExtensionElement); builder = new Builder(this, superClass, id, name, isExtensionElement);
@ -944,9 +925,6 @@ public class ToolChain extends HoldsOptions implements IToolChain, IMatchKeyProv
this.builder = builder; this.builder = builder;
} }
/* (non-Javadoc)
* @see org.eclipse.cdt.core.build.managed.IToolChain#getBuilder()
*/
@Override @Override
public IBuilder getBuilder() { public IBuilder getBuilder() {
if (builder == null) { if (builder == null) {
@ -957,9 +935,6 @@ public class ToolChain extends HoldsOptions implements IToolChain, IMatchKeyProv
return builder; return builder;
} }
/* (non-Javadoc)
* @see org.eclipse.cdt.core.build.managed.IToolChain#removeLocalBuilder()
*/
@Override @Override
public void removeLocalBuilder() { public void removeLocalBuilder() {
if (builder == null) return; if (builder == null) return;
@ -967,9 +942,6 @@ public class ToolChain extends HoldsOptions implements IToolChain, IMatchKeyProv
setDirty(true); setDirty(true);
} }
/* (non-Javadoc)
* @see org.eclipse.cdt.core.build.managed.IToolChain#createTool(ITool, String, String, boolean)
*/
@Override @Override
public ITool createTool(ITool superClass, String id, String name, boolean isExtensionElement) { public ITool createTool(ITool superClass, String id, String name, boolean isExtensionElement) {
Tool tool = new Tool(this, superClass, id, name, isExtensionElement); Tool tool = new Tool(this, superClass, id, name, isExtensionElement);
@ -978,9 +950,6 @@ public class ToolChain extends HoldsOptions implements IToolChain, IMatchKeyProv
return tool; return tool;
} }
/* (non-Javadoc)
* @see org.eclipse.cdt.core.build.managed.IToolChain#getTools()
*/
@Override @Override
public ITool[] getTools() { public ITool[] getTools() {
ITool tools[] = getAllTools(false); ITool tools[] = getAllTools(false);
@ -1071,18 +1040,12 @@ public class ToolChain extends HoldsOptions implements IToolChain, IMatchKeyProv
return filterUsedTools(all, false); return filterUsedTools(all, false);
} }
/* (non-Javadoc)
* @see org.eclipse.cdt.managedbuilder.core.IToolChain#getTool(java.lang.String)
*/
@Override @Override
public ITool getTool(String id) { public ITool getTool(String id) {
Tool tool = getToolMap().get(id); Tool tool = getToolMap().get(id);
return tool; return tool;
} }
/* (non-Javadoc)
* @see org.eclipse.cdt.managedbuilder.core.IToolChain#getToolsBySuperClassId(java.lang.String)
*/
@Override @Override
public ITool[] getToolsBySuperClassId(String id) { public ITool[] getToolsBySuperClassId(String id) {
List<ITool> retTools = new ArrayList<ITool>(); List<ITool> retTools = new ArrayList<ITool>();
@ -1160,15 +1123,12 @@ public class ToolChain extends HoldsOptions implements IToolChain, IMatchKeyProv
* M O D E L A T T R I B U T E A C C E S S O R S * M O D E L A T T R I B U T E A C C E S S O R S
*/ */
/* (non-Javadoc)
* @see org.eclipse.cdt.managedbuilder.core.IToolChain#getSuperClass()
*/
@Override @Override
public IToolChain getSuperClass() { public IToolChain getSuperClass() {
return (IToolChain)superClass; return (IToolChain)superClass;
} }
/* (non-Javadoc) /**
* Access function to set the superclass element that is defined in * Access function to set the superclass element that is defined in
* the base class. * the base class.
*/ */
@ -1190,17 +1150,11 @@ public class ToolChain extends HoldsOptions implements IToolChain, IMatchKeyProv
} }
} }
/* (non-Javadoc)
* @see org.eclipse.cdt.core.build.managed.IToolChain#getName()
*/
@Override @Override
public String getName() { public String getName() {
return (name == null && getSuperClass() != null) ? getSuperClass().getName() : name; return (name == null && getSuperClass() != null) ? getSuperClass().getName() : name;
} }
/* (non-Javadoc)
* @see org.eclipse.cdt.core.build.managed.IToolChain#isAbstract()
*/
@Override @Override
public boolean isAbstract() { public boolean isAbstract() {
if (isAbstract != null) { if (isAbstract != null) {
@ -1210,9 +1164,6 @@ public class ToolChain extends HoldsOptions implements IToolChain, IMatchKeyProv
} }
} }
/* (non-Javadoc)
* @see org.eclipse.cdt.core.build.managed.IToolChain#getUnusedChildren()
*/
@Override @Override
public String getUnusedChildren() { public String getUnusedChildren() {
if (unusedChildren != null) { if (unusedChildren != null) {
@ -1221,9 +1172,6 @@ public class ToolChain extends HoldsOptions implements IToolChain, IMatchKeyProv
return EMPTY_STRING; // Note: no inheritance from superClass return EMPTY_STRING; // Note: no inheritance from superClass
} }
/* (non-Javadoc)
* @see org.eclipse.cdt.managedbuilder.core.IToolChain#getErrorParserIds()
*/
@Override @Override
public String getErrorParserIds() { public String getErrorParserIds() {
String ids = errorParserIds; String ids = errorParserIds;
@ -1264,9 +1212,6 @@ public class ToolChain extends HoldsOptions implements IToolChain, IMatchKeyProv
return ids; return ids;
} }
/* (non-Javadoc)
* @see org.eclipse.cdt.managedbuilder.core.IToolChain#getSecondaryOutputs()
*/
@Override @Override
public IOutputType[] getSecondaryOutputs() { public IOutputType[] getSecondaryOutputs() {
IOutputType[] types = null; IOutputType[] types = null;
@ -1297,9 +1242,6 @@ public class ToolChain extends HoldsOptions implements IToolChain, IMatchKeyProv
return types; return types;
} }
/* (non-Javadoc)
* @see org.eclipse.cdt.managedbuilder.core.IToolChain#getTargetToolIds()
*/
@Override @Override
public String getTargetToolIds() { public String getTargetToolIds() {
if (targetToolIds == null) { if (targetToolIds == null) {
@ -1313,9 +1255,6 @@ public class ToolChain extends HoldsOptions implements IToolChain, IMatchKeyProv
return targetToolIds; return targetToolIds;
} }
/* (non-Javadoc)
* @see org.eclipse.cdt.managedbuilder.core.IToolChain#getTargetToolList()
*/
@Override @Override
public String[] getTargetToolList() { public String[] getTargetToolList() {
String IDs = getTargetToolIds(); String IDs = getTargetToolIds();
@ -1339,9 +1278,6 @@ public class ToolChain extends HoldsOptions implements IToolChain, IMatchKeyProv
return targetTools; return targetTools;
} }
/* (non-Javadoc)
* @see org.eclipse.cdt.managedbuilder.core.IToolChain#getErrorParserIds(IConfiguration)
*/
@Override @Override
public String getErrorParserIds(IConfiguration config) { public String getErrorParserIds(IConfiguration config) {
String ids = errorParserIds; String ids = errorParserIds;
@ -1373,9 +1309,6 @@ public class ToolChain extends HoldsOptions implements IToolChain, IMatchKeyProv
return ids; return ids;
} }
/* (non-Javadoc)
* @see org.eclipse.cdt.managedbuilder.core.IToolChain#getErrorParserList()
*/
@Override @Override
public String[] getErrorParserList() { public String[] getErrorParserList() {
String parserIDs = getErrorParserIds(); String parserIDs = getErrorParserIds();
@ -1424,9 +1357,6 @@ public class ToolChain extends HoldsOptions implements IToolChain, IMatchKeyProv
return set; return set;
} }
/* (non-Javadoc)
* @see org.eclipse.cdt.managedbuilder.core.IToolChain#getArchList()
*/
@Override @Override
public String[] getArchList() { public String[] getArchList() {
if (archList == null) { if (archList == null) {
@ -1441,9 +1371,6 @@ public class ToolChain extends HoldsOptions implements IToolChain, IMatchKeyProv
return archList.toArray(new String[archList.size()]); return archList.toArray(new String[archList.size()]);
} }
/* (non-Javadoc)
* @see org.eclipse.cdt.managedbuilder.core.IToolChain#getOSList()
*/
@Override @Override
public String[] getOSList() { public String[] getOSList() {
if (osList == null) { if (osList == null) {
@ -1458,18 +1385,12 @@ public class ToolChain extends HoldsOptions implements IToolChain, IMatchKeyProv
return osList.toArray(new String[osList.size()]); return osList.toArray(new String[osList.size()]);
} }
/* (non-Javadoc)
* @see org.eclipse.cdt.managedbuilder.core.IToolChain#setIsAbstract(boolean)
*/
@Override @Override
public void setIsAbstract(boolean b) { public void setIsAbstract(boolean b) {
isAbstract = new Boolean(b); isAbstract = new Boolean(b);
setDirty(true); setDirty(true);
} }
/* (non-Javadoc)
* @see org.eclipse.cdt.managedbuilder.core.IToolChain#setErrorParserIds(String)
*/
@Override @Override
public void setErrorParserIds(String ids) { public void setErrorParserIds(String ids) {
String currentIds = getErrorParserIds(); String currentIds = getErrorParserIds();
@ -1480,9 +1401,6 @@ public class ToolChain extends HoldsOptions implements IToolChain, IMatchKeyProv
} }
} }
/* (non-Javadoc)
* @see org.eclipse.cdt.managedbuilder.core.IToolChain#setSecondaryOutputs()
*/
@Override @Override
public void setSecondaryOutputs(String newIds) { public void setSecondaryOutputs(String newIds) {
if (secondaryOutputIds == null && newIds == null) return; if (secondaryOutputIds == null && newIds == null) return;
@ -1492,9 +1410,6 @@ public class ToolChain extends HoldsOptions implements IToolChain, IMatchKeyProv
} }
} }
/* (non-Javadoc)
* @see org.eclipse.cdt.managedbuilder.core.IToolChain#setTargetToolIds()
*/
@Override @Override
public void setTargetToolIds(String newIds) { public void setTargetToolIds(String newIds) {
if (targetToolIds == null && newIds == null) return; if (targetToolIds == null && newIds == null) return;
@ -1504,9 +1419,6 @@ public class ToolChain extends HoldsOptions implements IToolChain, IMatchKeyProv
} }
} }
/* (non-Javadoc)
* @see org.eclipse.cdt.managedbuilder.core.IToolChain#setOSList(String[])
*/
@Override @Override
public void setOSList(String[] OSs) { public void setOSList(String[] OSs) {
if (osList == null) { if (osList == null) {
@ -1520,9 +1432,6 @@ public class ToolChain extends HoldsOptions implements IToolChain, IMatchKeyProv
setDirty(true); setDirty(true);
} }
/* (non-Javadoc)
* @see org.eclipse.cdt.managedbuilder.core.IToolChain#setArchList(String[])
*/
@Override @Override
public void setArchList(String[] archs) { public void setArchList(String[] archs) {
if (archList == null) { if (archList == null) {
@ -1602,9 +1511,6 @@ public class ToolChain extends HoldsOptions implements IToolChain, IMatchKeyProv
return scannerConfigDiscoveryProfileId; return scannerConfigDiscoveryProfileId;
} }
/* (non-Javadoc)
* @see org.eclipse.cdt.managedbuilder.core.IToolChain#setScannerConfigDiscoveryProfileId(java.lang.String)
*/
@Override @Override
public void setScannerConfigDiscoveryProfileId(String profileId) { public void setScannerConfigDiscoveryProfileId(String profileId) {
if (scannerConfigDiscoveryProfileId == null && profileId == null) return; if (scannerConfigDiscoveryProfileId == null && profileId == null) return;
@ -1622,9 +1528,6 @@ public class ToolChain extends HoldsOptions implements IToolChain, IMatchKeyProv
return pathconverterElement; return pathconverterElement;
} }
/* (non-Javadoc)
* @see org.eclipse.cdt.managedbuilder.core.IToolChain#getPathConverter()
*/
@Override @Override
public IOptionPathConverter getOptionPathConverter() { public IOptionPathConverter getOptionPathConverter() {
if (optionPathConverter != null) { if (optionPathConverter != null) {
@ -1653,17 +1556,11 @@ public class ToolChain extends HoldsOptions implements IToolChain, IMatchKeyProv
* O B J E C T S T A T E M A I N T E N A N C E * O B J E C T S T A T E M A I N T E N A N C E
*/ */
/* (non-Javadoc)
* @see org.eclipse.cdt.managedbuilder.core.IToolChain#isExtensionElement()
*/
@Override @Override
public boolean isExtensionElement() { public boolean isExtensionElement() {
return isExtensionToolChain; return isExtensionToolChain;
} }
/* (non-Javadoc)
* @see org.eclipse.cdt.managedbuilder.core.IToolChain#isDirty()
*/
@Override @Override
public boolean isDirty() { public boolean isDirty() {
// This shouldn't be called for an extension tool-chain // This shouldn't be called for an extension tool-chain
@ -1696,9 +1593,6 @@ public class ToolChain extends HoldsOptions implements IToolChain, IMatchKeyProv
return isDirty; return isDirty;
} }
/* (non-Javadoc)
* @see org.eclipse.cdt.managedbuilder.core.IToolChain#setDirty(boolean)
*/
@Override @Override
public void setDirty(boolean isDirty) { public void setDirty(boolean isDirty) {
this.isDirty = isDirty; this.isDirty = isDirty;
@ -1772,9 +1666,6 @@ public class ToolChain extends HoldsOptions implements IToolChain, IMatchKeyProv
} }
} }
/* (non-Javadoc)
* @see org.eclipse.cdt.managedbuilder.core.IToolChain#getConvertToId()
*/
@Override @Override
public String getConvertToId() { public String getConvertToId() {
if (convertToId == null) { if (convertToId == null) {
@ -1788,9 +1679,6 @@ public class ToolChain extends HoldsOptions implements IToolChain, IMatchKeyProv
return convertToId; return convertToId;
} }
/* (non-Javadoc)
* @see org.eclipse.cdt.managedbuilder.core.IToolChain#setConvertToId(String)
*/
@Override @Override
public void setConvertToId(String convertToId) { public void setConvertToId(String convertToId) {
if (convertToId == null && this.convertToId == null) return; if (convertToId == null && this.convertToId == null) return;
@ -1801,9 +1689,6 @@ public class ToolChain extends HoldsOptions implements IToolChain, IMatchKeyProv
return; return;
} }
/* (non-Javadoc)
* @see org.eclipse.cdt.managedbuilder.core.IToolChain#getVersionsSupported()
*/
@Override @Override
public String getVersionsSupported() { public String getVersionsSupported() {
if (versionsSupported == null) { if (versionsSupported == null) {
@ -1817,9 +1702,6 @@ public class ToolChain extends HoldsOptions implements IToolChain, IMatchKeyProv
return versionsSupported; return versionsSupported;
} }
/* (non-Javadoc)
* @see org.eclipse.cdt.managedbuilder.core.IToolChain#setVersionsSupported(String)
*/
@Override @Override
public void setVersionsSupported(String versionsSupported) { public void setVersionsSupported(String versionsSupported) {
if (versionsSupported == null && this.versionsSupported == null) return; if (versionsSupported == null && this.versionsSupported == null) return;
@ -1839,9 +1721,6 @@ public class ToolChain extends HoldsOptions implements IToolChain, IMatchKeyProv
return managedIsToolChainSupportedElement; return managedIsToolChainSupportedElement;
} }
/* (non-Javadoc)
* @see org.eclipse.cdt.managedbuilder.core.IToolChain#isSupported()
*/
@Override @Override
public boolean isSupported(){ public boolean isSupported(){
if (managedIsToolChainSupported == null) { if (managedIsToolChainSupported == null) {
@ -1875,9 +1754,6 @@ public class ToolChain extends HoldsOptions implements IToolChain, IMatchKeyProv
} }
/* (non-Javadoc)
* @see org.eclipse.cdt.managedbuilder.core.IToolChain#getEnvironmentVariableSupplier()
*/
@Override @Override
public IConfigurationEnvironmentVariableSupplier getEnvironmentVariableSupplier(){ public IConfigurationEnvironmentVariableSupplier getEnvironmentVariableSupplier(){
if (environmentVariableSupplier != null) { if (environmentVariableSupplier != null) {
@ -1895,19 +1771,19 @@ public class ToolChain extends HoldsOptions implements IToolChain, IMatchKeyProv
return null; return null;
} }
/* // /*
* this method is called by the UserDefinedMacroSupplier to obtain user-defined // * this method is called by the UserDefinedMacroSupplier to obtain user-defined
* macros available for this tool-chain // * macros available for this tool-chain
*/ // */
/* public StorableMacros getUserDefinedMacros(){ // public StorableMacros getUserDefinedMacros(){
if(isExtensionToolChain) // if(isExtensionToolChain)
return null; // return null;
//
// if(userDefinedMacros == null)
// userDefinedMacros = new StorableMacros();
// return userDefinedMacros;
// }
if(userDefinedMacros == null)
userDefinedMacros = new StorableMacros();
return userDefinedMacros;
}
*/
// public StorableEnvironment getUserDefinedEnvironment(){ // public StorableEnvironment getUserDefinedEnvironment(){
// if(isExtensionToolChain) // if(isExtensionToolChain)
// return null; // return null;
@ -1936,9 +1812,6 @@ public class ToolChain extends HoldsOptions implements IToolChain, IMatchKeyProv
} }
/* (non-Javadoc)
* @see org.eclipse.cdt.managedbuilder.core.IToolChain#getBuildMacroSupplier()
*/
@Override @Override
public IConfigurationBuildMacroSupplier getBuildMacroSupplier(){ public IConfigurationBuildMacroSupplier getBuildMacroSupplier(){
if (buildMacroSupplier != null) { if (buildMacroSupplier != null) {
@ -2139,9 +2012,6 @@ public class ToolChain extends HoldsOptions implements IToolChain, IMatchKeyProv
return currentMbsVersionConversionElement; return currentMbsVersionConversionElement;
} }
/* (non-Javadoc)
* @see org.eclipse.cdt.managedbuilder.internal.core.BuildObject#updateManagedBuildRevision(java.lang.String)
*/
@Override @Override
public void updateManagedBuildRevision(String revision){ public void updateManagedBuildRevision(String revision){
super.updateManagedBuildRevision(revision); super.updateManagedBuildRevision(revision);
@ -2153,9 +2023,6 @@ public class ToolChain extends HoldsOptions implements IToolChain, IMatchKeyProv
builder.updateManagedBuildRevision(revision); builder.updateManagedBuildRevision(revision);
} }
/* (non-Javadoc)
* @see org.eclipse.cdt.managedbuilder.internal.core.HoldsOptions#needsRebuild()
*/
@Override @Override
public boolean needsRebuild() { public boolean needsRebuild() {
if(rebuildState) if(rebuildState)
@ -2170,9 +2037,6 @@ public class ToolChain extends HoldsOptions implements IToolChain, IMatchKeyProv
return super.needsRebuild(); return super.needsRebuild();
} }
/* (non-Javadoc)
* @see org.eclipse.cdt.managedbuilder.internal.core.HoldsOptions#setRebuildState(boolean)
*/
@Override @Override
public void setRebuildState(boolean rebuild) { public void setRebuildState(boolean rebuild) {
if(isExtensionElement() && rebuild) if(isExtensionElement() && rebuild)

13
build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/envvar/BuildEnvVar.java
View file

@ -12,6 +12,7 @@ package org.eclipse.cdt.managedbuilder.internal.envvar;
import org.eclipse.cdt.core.envvar.EnvironmentVariable; import org.eclipse.cdt.core.envvar.EnvironmentVariable;
import org.eclipse.cdt.core.envvar.IEnvironmentVariable; import org.eclipse.cdt.core.envvar.IEnvironmentVariable;
import org.eclipse.cdt.internal.core.envvar.EnvironmentVariableManager;
import org.eclipse.cdt.managedbuilder.envvar.IBuildEnvironmentVariable; import org.eclipse.cdt.managedbuilder.envvar.IBuildEnvironmentVariable;
/** /**
@ -20,10 +21,6 @@ import org.eclipse.cdt.managedbuilder.envvar.IBuildEnvironmentVariable;
* @since 3.0 * @since 3.0
*/ */
public class BuildEnvVar extends EnvironmentVariable implements IBuildEnvironmentVariable { public class BuildEnvVar extends EnvironmentVariable implements IBuildEnvironmentVariable {
public BuildEnvVar(String name, String value, int op, String delimiter){
super(name, value, op, delimiter);
}
protected BuildEnvVar(){ protected BuildEnvVar(){
} }
@ -40,6 +37,14 @@ public class BuildEnvVar extends EnvironmentVariable implements IBuildEnvironmen
super(name, value, delimiter); super(name, value, delimiter);
} }
public BuildEnvVar(String name, String value, int op){
super(name, value, op, EnvironmentVariableManager.getDefault().getDefaultDelimiter());
}
public BuildEnvVar(String name, String value, int op, String delimiter){
super(name, value, op, delimiter);
}
public BuildEnvVar(IEnvironmentVariable var){ public BuildEnvVar(IEnvironmentVariable var){
super(var); super(var);
} }

2
core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/envvar/EnvironmentVariableManager.java
View file

@ -91,12 +91,14 @@ public class EnvironmentVariableManager implements IEnvironmentVariableManager {
protected int getVarMacroSupplierNum(EnvVarDescriptor var, IVariableContextInfo varMacroInfo) { protected int getVarMacroSupplierNum(EnvVarDescriptor var, IVariableContextInfo varMacroInfo) {
int varSupplierNum = -1; int varSupplierNum = -1;
ICdtVariableSupplier macroSuppliers[] = varMacroInfo.getSuppliers(); ICdtVariableSupplier macroSuppliers[] = varMacroInfo.getSuppliers();
if (macroSuppliers != null) {
for(int i = 0; i < macroSuppliers.length; i++) { for(int i = 0; i < macroSuppliers.length; i++) {
if (macroSuppliers[i] instanceof EnvironmentVariableSupplier) { if (macroSuppliers[i] instanceof EnvironmentVariableSupplier) {
varSupplierNum = i; varSupplierNum = i;
break; break;
} }
} }
}
return varSupplierNum; return varSupplierNum;
} }
} }