diff options
| author | Sean Evoy | 2004-05-27 17:57:10 +0000 |
|---|---|---|
| committer | Sean Evoy | 2004-05-27 17:57:10 +0000 |
| commit | c092fa64d28ee692d58d40c55e5caf728542f8ee (patch) | |
| tree | 63f03294a94e71f8a9f0cdbbf3ced29325a2e468 /build | |
| parent | e21a791587d8b09fadb514056fb719e86e7abbe5 (diff) | |
| download | org.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
Diffstat (limited to 'build')
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 07b57eddc2b..9795b0e788f 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 0f489178ede..b2cddcbc892 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 |