Skip to main content
aboutsummaryrefslogtreecommitdiffstats
path: root/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder
diff options
context:
space:
mode:
authorMikhail Sennikovsky2007-06-06 10:19:57 +0000
committerMikhail Sennikovsky2007-06-06 10:19:57 +0000
commit3f69713735e277b1849cbfd2193b30ff5d13a4e9 (patch)
treeb192e04d1eaf86015cda3572bfa203f3d9d6a8f8 /build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder
parent8645c4e377fb73bc7c4180c779af87226e721533 (diff)
downloadorg.eclipse.cdt-3f69713735e277b1849cbfd2193b30ff5d13a4e9.tar.gz
org.eclipse.cdt-3f69713735e277b1849cbfd2193b30ff5d13a4e9.tar.xz
org.eclipse.cdt-3f69713735e277b1849cbfd2193b30ff5d13a4e9.zip
externalization fixes
Diffstat (limited to 'build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder')
-rw-r--r--build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/core/OptionStringValue.java2
-rw-r--r--build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/BuilderFactory.java4
-rw-r--r--build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/CommonBuilder.java4
-rw-r--r--build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/PluginResources.properties2
-rw-r--r--build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/BuildEntryStorage.java6
-rw-r--r--build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/BuildSystemSpecificVariableSubstitutor.java2
6 files changed, 11 insertions, 9 deletions
diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/core/OptionStringValue.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/core/OptionStringValue.java
index 8d374801d5e..fa8addf6753 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/core/OptionStringValue.java
+++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/core/OptionStringValue.java
@@ -192,6 +192,6 @@ public final class OptionStringValue {
}
public String toString() {
- return new StringBuffer().append("ov:").append(value.toString()).toString();
+ return new StringBuffer().append("ov:").append(value.toString()).toString(); //$NON-NLS-1$
}
} \ No newline at end of file
diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/BuilderFactory.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/BuilderFactory.java
index d6251e60ef9..d58bc9d52aa 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/BuilderFactory.java
+++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/BuilderFactory.java
@@ -320,8 +320,8 @@ public class BuilderFactory {
args.remove(IMakeCommonBuildInfo.BUILD_COMMAND);
args.remove(IMakeCommonBuildInfo.BUILD_ARGUMENTS);
} else {
- args.put(IBuilder.ATTRIBUTE_IGNORE_ERR_CMD, "");
- args.put(IBuilder.ATTRIBUTE_PARALLEL_BUILD_CMD, "");
+ args.put(IBuilder.ATTRIBUTE_IGNORE_ERR_CMD, ""); //$NON-NLS-1$
+ args.put(IBuilder.ATTRIBUTE_PARALLEL_BUILD_CMD, ""); //$NON-NLS-1$
}
}
//end adjusting settings
diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/CommonBuilder.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/CommonBuilder.java
index 2066c6e787f..44e180c0a74 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/CommonBuilder.java
+++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/CommonBuilder.java
@@ -1322,13 +1322,13 @@ public class CommonBuilder extends ACBuilder {
}
} else if (result.getCode() == IStatus.ERROR){
StringBuffer buf = new StringBuffer();
- buf.append("Buildfile generation error occured..").append(NEWLINE);
+ buf.append(ManagedMakeMessages.getString("CommonBuilder.23")).append(NEWLINE); //$NON-NLS-1$
String message = result.getMessage();
if(message != null || message.length() != 0){
buf.append(message).append(NEWLINE);
}
- buf.append("Build stopped..").append(NEWLINE);
+ buf.append(ManagedMakeMessages.getString("CommonBuilder.24")).append(NEWLINE); //$NON-NLS-1$
message = buf.toString();
buildStatus.getConsoleMessagesList().add(message);
buildStatus.cancelBuild();
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 5769ef00efa..31ea502a629 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
@@ -156,5 +156,7 @@ CommonBuilder.16=can not clean programmatically: build workspace path is not the
CommonBuilder.12=can not clean programmatically: build workspace path is not folder
CommonBuilder.13=can not clean programmatically: build folder is not accessible
CommonBuilder.22=Building referenced configurations..
+CommonBuilder.23=Buildfile generation error occured..
+CommonBuilder.24=Build stopped..
MakeBuilder.buildError=
ResourceChangeHandler2.0=project build settings update job
diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/BuildEntryStorage.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/BuildEntryStorage.java
index db6f138a646..9339f96d68a 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/BuildEntryStorage.java
+++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/BuildEntryStorage.java
@@ -204,7 +204,7 @@ public class BuildEntryStorage extends AbstractEntryStorage {
return bsVarsOnly ?
new BuildSystemSpecificVariableSubstitutor(ci)
- : new SupplierBasedCdtVariableSubstitutor(ci, "", " ");
+ : new SupplierBasedCdtVariableSubstitutor(ci, "", " "); //$NON-NLS-1$ //$NON-NLS-2$
}
private UserEntryInfo[] getUserEntries(int flags, boolean usr, List emptyValuesInfos){
@@ -288,7 +288,7 @@ public class BuildEntryStorage extends AbstractEntryStorage {
Path path = new Path(info.getUnresolvedPath());
String projPath;
- if(path.segmentCount() != 0 && "..".equals(path.segment(0))){
+ if(path.segmentCount() != 0 && "..".equals(path.segment(0))){ //$NON-NLS-1$
projPath = path.removeFirstSegments(1).toString();
} else {
StringBuffer buf = new StringBuffer();
@@ -308,7 +308,7 @@ public class BuildEntryStorage extends AbstractEntryStorage {
projPath = path.removeFirstSegments(1).toString();
} else {
StringBuffer buf = new StringBuffer();
- buf.append("../").append(info.getUnresolvedPath());
+ buf.append("../").append(info.getUnresolvedPath()); //$NON-NLS-1$
projPath = buf.toString();
}
return new PathInfo(projPath, info.isWorkspacePath(), info.getSubstitutor());
diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/BuildSystemSpecificVariableSubstitutor.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/BuildSystemSpecificVariableSubstitutor.java
index bb22e043ece..e44e42be7f3 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/BuildSystemSpecificVariableSubstitutor.java
+++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/BuildSystemSpecificVariableSubstitutor.java
@@ -36,7 +36,7 @@ public class BuildSystemSpecificVariableSubstitutor extends SupplierBasedCdtVari
}
public BuildSystemSpecificVariableSubstitutor(IVariableContextInfo contextInfo){
- this(contextInfo, "", " ");
+ this(contextInfo, "", " "); //$NON-NLS-1$ //$NON-NLS-2$
}
public BuildSystemSpecificVariableSubstitutor(

Back to the top