Bug 475785 - Remove usage of SubProgressMonitor in org.eclipse.ui.internal.views.markers

Change-Id: I2ecff59cf893f6dd51b1376ea2d83f75b96c6bd4
Signed-off-by: Stefan Xenos <sxenos@gmail.com>

2 files changed, 21 insertions, 25 deletions

diff --git a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/views/markers/MarkCompletedHandler.java b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/views/markers/MarkCompletedHandler.java
index 1e2f39a9e1c..3459bef96db 100644
--- a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/views/markers/MarkCompletedHandler.java
+++ b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/views/markers/MarkCompletedHandler.java
@@ -18,7 +18,7 @@ import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.core.commands.operations.IUndoableOperation;
 import org.eclipse.core.resources.IMarker;
 import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.SubProgressMonitor;
+import org.eclipse.core.runtime.SubMonitor;
 import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.ide.undo.UpdateMarkersOperation;
 import org.eclipse.ui.internal.ide.StatusUtil;
@@ -40,8 +40,8 @@ public class MarkCompletedHandler extends MarkerViewHandler {
 
 		final ExecutionEvent finalEvent = event;
 		try {
-			PlatformUI.getWorkbench().getProgressService().run(true, true, monitor -> {
-				monitor.beginTask(MarkerMessages.markCompletedHandler_task, 100);
+			PlatformUI.getWorkbench().getProgressService().run(true, true, mon -> {
+				SubMonitor subMonitor = SubMonitor.convert(mon, MarkerMessages.markCompletedHandler_task, 100);
 				IMarker[] markers = getSelectedMarkers(finalEvent);
 				if (markers.length == 0) {
 					return;
@@ -52,12 +52,11 @@ public class MarkCompletedHandler extends MarkerViewHandler {
 				IUndoableOperation op = new UpdateMarkersOperation(markers, attrs,
 						MarkerMessages.markCompletedAction_title, true);
 
-				monitor.worked(20);
-				if(monitor.isCanceled()) {
+				subMonitor.worked(20);
+				if (subMonitor.isCanceled()) {
 					return;
 				}
-				execute(op, MarkerMessages.markCompletedAction_title, new SubProgressMonitor(monitor, 80), null);
-				monitor.done();
+				execute(op, MarkerMessages.markCompletedAction_title, subMonitor.newChild(80), null);
 			});
 		} catch (InvocationTargetException e) {
 			StatusManager.getManager().handle(
diff --git a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/views/markers/QuickFixWizard.java b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/views/markers/QuickFixWizard.java
index 7ee6e58161d..d4ca28c62f7 100644
--- a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/views/markers/QuickFixWizard.java
+++ b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/views/markers/QuickFixWizard.java
@@ -17,7 +17,7 @@ import java.util.Map;
 
 import org.eclipse.core.resources.IMarker;
 import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.SubProgressMonitor;
+import org.eclipse.core.runtime.SubMonitor;
 import org.eclipse.jface.operation.IRunnableWithProgress;
 import org.eclipse.jface.wizard.IWizardPage;
 import org.eclipse.jface.wizard.Wizard;
@@ -68,23 +68,20 @@ class QuickFixWizard extends Wizard {
 
 	@Override
 	public boolean performFinish() {
-		IRunnableWithProgress finishRunnable = monitor -> {
-		IWizardPage[] pages = getPages();
-		monitor.beginTask(MarkerMessages.MarkerResolutionDialog_Fixing,
-				(10 * pages.length) + 1);
-		monitor.worked(1);
-		for (int i = 0; i < pages.length; i++) {
-			//Allow for cancel event processing
-			getShell().getDisplay().readAndDispatch();
-			if(monitor.isCanceled())
-				return;
-			QuickFixPage wizardPage = (QuickFixPage) pages[i];
-			wizardPage.performFinish(new SubProgressMonitor(monitor,10));
-			monitor.worked(1);
-		}
-		monitor.done();
-
-};
+		IRunnableWithProgress finishRunnable = mon -> {
+			IWizardPage[] pages = getPages();
+			SubMonitor subMonitor = SubMonitor.convert(mon, MarkerMessages.MarkerResolutionDialog_Fixing,
+					(10 * pages.length) + 1);
+			subMonitor.worked(1);
+			for (int i = 0; i < pages.length; i++) {
+				// Allow for cancel event processing
+				getShell().getDisplay().readAndDispatch();
+				if (subMonitor.isCanceled())
+					return;
+				QuickFixPage wizardPage = (QuickFixPage) pages[i];
+				wizardPage.performFinish(subMonitor.newChild(10));
+			}
+		};
 
 		try {
 			getContainer().run(false, true, finishRunnable);