mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-31 12:55:40 +02:00
Code Issues Wiki Activity

Externalization fixes

Browse source
This commit is contained in:
Mikhail Sennikovsky 2007-09-12 08:48:34 +00:00
parent 26290aad9f
commit d6e3cf9201
7 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/buildmodel/BuildResource.java
View file

@ -198,12 +198,12 @@ public class BuildResource implements IBuildResource {
public String toString() { public String toString() {
StringBuffer buf = new StringBuffer(); StringBuffer buf = new StringBuffer();
buf.append("BR "); buf.append("BR "); //$NON-NLS-1$
IPath fullPath = getFullPath(); IPath fullPath = getFullPath();
if(fullPath != null) if(fullPath != null)
buf.append("WSP|").append(fullPath); buf.append("WSP|").append(fullPath); //$NON-NLS-1$
else else
buf.append("FS|").append(getLocation()); buf.append("FS|").append(getLocation()); //$NON-NLS-1$
return buf.toString(); return buf.toString();
} }

2
build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ModificationStatus.java
View file

@ -28,7 +28,7 @@ public class ModificationStatus extends Status implements IModificationStatus {
private ITool[][] fToolConflicts; private ITool[][] fToolConflicts;
private ITool[] fNonManagedBuildTools; private ITool[] fNonManagedBuildTools;
public static final ModificationStatus OK = new ModificationStatus(IStatus.OK, "", null); public static final ModificationStatus OK = new ModificationStatus(IStatus.OK, "", null); //$NON-NLS-1$
ModificationStatus(String msg){ ModificationStatus(String msg){
this(msg, null); this(msg, null);

2
build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/PluginResources.properties
View file

@ -160,3 +160,5 @@ CommonBuilder.23=Buildfile generation error occurred..
CommonBuilder.24=Build stopped.. CommonBuilder.24=Build stopped..
MakeBuilder.buildError= MakeBuilder.buildError=
ResourceChangeHandler2.0=project build settings update job ResourceChangeHandler2.0=project build settings update job
ToolInfo.0=conversion failure
ToolInfo.1=the tool is removed

4
build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ToolInfo.java
View file

@ -92,7 +92,7 @@ class ToolInfo {
if(fConverterInfo != null){ if(fConverterInfo != null){
IBuildObject resultBo = fConverterInfo.getConvertedFromObject(); IBuildObject resultBo = fConverterInfo.getConvertedFromObject();
if(!(resultBo instanceof Tool)) { if(!(resultBo instanceof Tool)) {
status = new ModificationStatus("conversion failure"); status = new ModificationStatus(ManagedMakeMessages.getString("ToolInfo.0")); //$NON-NLS-1$
} else { } else {
result = (Tool)resultBo; result = (Tool)resultBo;
status = ModificationStatus.OK; status = ModificationStatus.OK;
@ -130,7 +130,7 @@ class ToolInfo {
} }
return fResultingTool; return fResultingTool;
case REMOVED: case REMOVED:
fModificationStatus = new ModificationStatus("the tool is removed"); fModificationStatus = new ModificationStatus(ManagedMakeMessages.getString("ToolInfo.1")); //$NON-NLS-1$
return null; return null;
case REMAINED: case REMAINED:
default: default:

4
build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ToolListModificationInfo.java
View file

@ -137,8 +137,8 @@ public class ToolListModificationInfo {
} }
if(statusList.size() != 0) if(statusList.size() != 0)
return new MultiStatus(ManagedBuilderCorePlugin.getUniqueIdentifier(), IStatus.INFO, "", null); return new MultiStatus(ManagedBuilderCorePlugin.getUniqueIdentifier(), IStatus.INFO, "", null); //$NON-NLS-1$
return new MultiStatus(ManagedBuilderCorePlugin.getUniqueIdentifier(), IStatus.ERROR, "", null); return new MultiStatus(ManagedBuilderCorePlugin.getUniqueIdentifier(), IStatus.ERROR, "", null); //$NON-NLS-1$
} }
private ToolInfo[][] calculateConflictingTools(ToolInfo[] infos){ private ToolInfo[][] calculateConflictingTools(ToolInfo[] infos){

4
build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/enablement/HasNatureExpression.java
View file

@ -27,9 +27,9 @@ import org.eclipse.core.runtime.CoreException;
*/ */
public class HasNatureExpression implements IBooleanExpression { public class HasNatureExpression implements IBooleanExpression {
public static final String NAME = "hasNature"; public static final String NAME = "hasNature"; //$NON-NLS-1$
private static final String NATURE_ID = "natureId"; private static final String NATURE_ID = "natureId"; //$NON-NLS-1$
private String natureId; private String natureId;

4
build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/envvar/MbsEnvironmentSupplier.java
View file

@ -76,10 +76,10 @@ public class MbsEnvironmentSupplier implements IEnvironmentVariableSupplier {
public IEnvironmentVariable[] getVariables(Object context) { public IEnvironmentVariable[] getVariables(Object context) {
if(context instanceof IConfiguration){ if(context instanceof IConfiguration){
List variables = new ArrayList(2); List variables = new ArrayList(2);
IBuildEnvironmentVariable var = getConfigurationVariable("CWD",(IConfiguration)context); IBuildEnvironmentVariable var = getConfigurationVariable("CWD",(IConfiguration)context); //$NON-NLS-1$
if(var != null){ if(var != null){
variables.add(var); variables.add(var);
variables.add(new BuildEnvVar("PWD", var.getValue(), IBuildEnvironmentVariable.ENVVAR_REPLACE, null)); variables.add(new BuildEnvVar("PWD", var.getValue(), IBuildEnvironmentVariable.ENVVAR_REPLACE, null)); //$NON-NLS-1$
} else { } else {
return null; return null;
} }