From 4dc26f9a206cc41127d3ae259832c3ae7279a19b Mon Sep 17 00:00:00 2001 From: Stefan Xenos Date: Wed, 6 May 2015 21:24:35 -0700 Subject: [PATCH] Switch from SubProgressMonitor to SubMonitor to improve progress reporting. Signed-off-by: Stefan Xenos Change-Id: Ibd635b59d17e88f93439c7041994b6006d74434e --- .../src/org/eclipse/cdt/make/ui/TargetBuild.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/TargetBuild.java b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/TargetBuild.java index c7cb4d5b276..99eb508a7af 100644 --- a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/TargetBuild.java +++ b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/TargetBuild.java @@ -29,7 +29,7 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.OperationCanceledException; import org.eclipse.core.runtime.Status; -import org.eclipse.core.runtime.SubProgressMonitor; +import org.eclipse.core.runtime.SubMonitor; import org.eclipse.core.runtime.jobs.Job; import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.IEditorInput; @@ -106,7 +106,9 @@ public class TargetBuild { Job targetJob = new Job(MakeUIPlugin.getResourceString("TargetBuild.backgroundTask.name")) { //$NON-NLS-1$ @Override protected IStatus run(IProgressMonitor monitor) { - monitor.beginTask(MakeUIPlugin.getResourceString("TargetBuild.monitor.beginTask"), targets.length); //$NON-NLS-1$ + SubMonitor subMonitor = SubMonitor.convert(monitor, + MakeUIPlugin.getResourceString("TargetBuild.monitor.beginTask"), //$NON-NLS-1$ + targets.length); try { for (int i = 0; i < targets.length; i++) { final IMakeTarget target = targets[i]; @@ -114,10 +116,10 @@ public class TargetBuild { @Override public void run(IProgressMonitor monitor) throws CoreException { - target.build(new SubProgressMonitor(monitor, 1)); + target.build(monitor); } }; - MakeUIPlugin.getWorkspace().run(runnable, null, IResource.NONE, monitor); + MakeUIPlugin.getWorkspace().run(runnable, null, IResource.NONE, subMonitor.newChild(1)); } } catch (CoreException e) { return e.getStatus();