Externalization fixes

7 files changed, 14 insertions, 12 deletions

diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/buildmodel/BuildResource.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/buildmodel/BuildResource.java
index 7e6cf8bd635..bd5e360f831 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/buildmodel/BuildResource.java
+++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/buildmodel/BuildResource.java
@@ -198,12 +198,12 @@ public class BuildResource implements IBuildResource {
 
 	public String toString() {
 		StringBuffer buf = new StringBuffer();
-		buf.append("BR ");
+		buf.append("BR "); //$NON-NLS-1$
 		IPath fullPath = getFullPath();
 		if(fullPath != null)
-			buf.append("WSP|").append(fullPath);
+			buf.append("WSP|").append(fullPath); //$NON-NLS-1$
 		else
-			buf.append("FS|").append(getLocation());
+			buf.append("FS|").append(getLocation()); //$NON-NLS-1$
 			
 		return buf.toString();
 	}
diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ModificationStatus.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ModificationStatus.java
index 69cfeaff5d7..f31fd1180ee 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ModificationStatus.java
+++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ModificationStatus.java
@@ -28,7 +28,7 @@ public class ModificationStatus extends Status implements IModificationStatus {
 	private ITool[][] fToolConflicts;
 	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){
 		this(msg, null);
diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/PluginResources.properties b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/PluginResources.properties
index f3f104d4f7b..c2905ea1e35 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/PluginResources.properties
+++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/PluginResources.properties
@@ -160,3 +160,5 @@ CommonBuilder.23=Buildfile generation error occurred..
 CommonBuilder.24=Build stopped..
 MakeBuilder.buildError=
 ResourceChangeHandler2.0=project build settings update job
+ToolInfo.0=conversion failure
+ToolInfo.1=the tool is removed
diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ToolInfo.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ToolInfo.java
index ba889257918..4b6f2a07f6e 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ToolInfo.java
+++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ToolInfo.java
@@ -92,7 +92,7 @@ class ToolInfo {
 				if(fConverterInfo != null){
 					IBuildObject resultBo = fConverterInfo.getConvertedFromObject();
 					if(!(resultBo instanceof Tool)) {
-						status = new ModificationStatus("conversion failure");
+						status = new ModificationStatus(ManagedMakeMessages.getString("ToolInfo.0")); //$NON-NLS-1$
 					} else {
 						result = (Tool)resultBo;
 						status = ModificationStatus.OK;
@@ -130,7 +130,7 @@ class ToolInfo {
 			}
 			return fResultingTool;
 		case REMOVED:
-			fModificationStatus = new ModificationStatus("the tool is removed");
+			fModificationStatus = new ModificationStatus(ManagedMakeMessages.getString("ToolInfo.1")); //$NON-NLS-1$
 			return null;
 		case REMAINED:
 		default:
diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ToolListModificationInfo.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ToolListModificationInfo.java
index defe85d453c..39ea0a4de4a 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ToolListModificationInfo.java
+++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ToolListModificationInfo.java
@@ -137,8 +137,8 @@ public class ToolListModificationInfo {
 		}
 		
 		if(statusList.size() != 0)
-			return new MultiStatus(ManagedBuilderCorePlugin.getUniqueIdentifier(), IStatus.INFO, "", null);
-		return new MultiStatus(ManagedBuilderCorePlugin.getUniqueIdentifier(), IStatus.ERROR, "", null);
+			return new MultiStatus(ManagedBuilderCorePlugin.getUniqueIdentifier(), IStatus.INFO, "", null); //$NON-NLS-1$
+		return new MultiStatus(ManagedBuilderCorePlugin.getUniqueIdentifier(), IStatus.ERROR, "", null); //$NON-NLS-1$
 	}
 
 	private ToolInfo[][] calculateConflictingTools(ToolInfo[] infos){
diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/enablement/HasNatureExpression.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/enablement/HasNatureExpression.java
index 6598f217dbc..45a388c2cbc 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/enablement/HasNatureExpression.java
+++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/enablement/HasNatureExpression.java
@@ -27,9 +27,9 @@ import org.eclipse.core.runtime.CoreException;
  */
 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;
 	
diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/envvar/MbsEnvironmentSupplier.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/envvar/MbsEnvironmentSupplier.java
index ea22af4897c..0b3ebd28e1e 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/envvar/MbsEnvironmentSupplier.java
+++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/envvar/MbsEnvironmentSupplier.java
@@ -76,10 +76,10 @@ public class MbsEnvironmentSupplier implements IEnvironmentVariableSupplier {
 	public IEnvironmentVariable[] getVariables(Object context) {
 		if(context instanceof IConfiguration){
 			List variables = new ArrayList(2);
-			IBuildEnvironmentVariable var = getConfigurationVariable("CWD",(IConfiguration)context);
+			IBuildEnvironmentVariable var = getConfigurationVariable("CWD",(IConfiguration)context); //$NON-NLS-1$
 			if(var != null){
 				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 {
 				return null;
 			}