Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSean Evoy2004-05-27 13:57:10 -0400
committerSean Evoy2004-05-27 13:57:10 -0400
commitc092fa64d28ee692d58d40c55e5caf728542f8ee (patch)
tree63f03294a94e71f8a9f0cdbbf3ced29325a2e468
parente21a791587d8b09fadb514056fb719e86e7abbe5 (diff)
downloadorg.eclipse.cdt-c092fa64d28ee692d58d40c55e5caf728542f8ee.tar.gz
org.eclipse.cdt-c092fa64d28ee692d58d40c55e5caf728542f8ee.tar.xz
org.eclipse.cdt-c092fa64d28ee692d58d40c55e5caf728542f8ee.zip
Fix for bug 64206 -NPE because of invalid return type on Job.run method
-rw-r--r--build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ManagedBuildInfo.java15
-rw-r--r--build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/PluginResources.properties3
2 files changed, 14 insertions, 4 deletions
diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ManagedBuildInfo.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ManagedBuildInfo.java
index 07b57eddc2..9795b0e788 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ManagedBuildInfo.java
+++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ManagedBuildInfo.java
@@ -102,16 +102,23 @@ public class ManagedBuildInfo implements IManagedBuildInfo, IScannerInfo {
if (entries.length > 0 && entries[0].equals(containerEntry)) {
} else {
- Job initJob = new Job("Initializing path container") { //$NON-NLS-1$
+ Job initJob = new Job(ManagedMakeMessages.getFormattedString("ManagedBuildInfo.message.job.init", getOwner().getName())) { //$NON-NLS-1$
protected IStatus run(IProgressMonitor monitor) {
try {
// Set the raw path entries
cModelElement.setRawPathEntries(new IPathEntry[]{containerEntry}, new NullProgressMonitor());
} catch (CModelException e) {
- return new Status(IStatus.ERROR, ManagedBuilderCorePlugin.getUniqueIdentifier(), -1, e.getLocalizedMessage(), e);
+ return new Status(IStatus.ERROR,
+ ManagedBuilderCorePlugin.getUniqueIdentifier(),
+ -1,
+ e.getLocalizedMessage(),
+ e);
}
- return new Status(IStatus.OK, ManagedBuilderCorePlugin.getUniqueIdentifier(), IStatus.OK, null, null);
-
+ return new Status(IStatus.OK,
+ ManagedBuilderCorePlugin.getUniqueIdentifier(),
+ IStatus.OK,
+ ManagedMakeMessages.getFormattedString("ManagedBuildInfo.message.init.ok", getOwner().getName()), //$NON-NLS-1$
+ 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 0f489178ed..b2cddcbc89 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
@@ -50,3 +50,6 @@ MakefileGenerator.comment.module.make.includes = Include the makefiles for each
MakefileGenerator.comment.module.dep.includes = Include automatically-generated dependency list:
MakefileGenerator.comment.autodeps = Automatically-generated dependency list:
MakefileGenerator.comment.header = Automatically-generated file. Do not edit!
+
+ManagedBuildInfo.message.job.init = Initializing path container for {0}
+ManagedBuildInfo.message.init.ok = Initializing path container succeeded for {0} \ No newline at end of file

Back to the top