Bug 475785 - Remove usage of SubProgressMonitor in org.eclipse.ui.internal.ide.dialogs

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

2 files changed, 21 insertions, 32 deletions

diff --git a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/dialogs/CleanDialog.java b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/dialogs/CleanDialog.java
index c40614f4d9e..026f21409af 100644
--- a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/dialogs/CleanDialog.java
+++ b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/dialogs/CleanDialog.java
@@ -27,7 +27,7 @@ import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.SubProgressMonitor;
+import org.eclipse.core.runtime.SubMonitor;
 import org.eclipse.jface.dialogs.IDialogConstants;
 import org.eclipse.jface.dialogs.IDialogSettings;
 import org.eclipse.jface.dialogs.MessageDialog;
@@ -313,15 +313,10 @@ public class CleanDialog extends MessageDialog {
         if (cleanAll) {
 			ResourcesPlugin.getWorkspace().build(IncrementalProjectBuilder.CLEAN_BUILD, monitor);
         } else {
-            try {
-                monitor.beginTask(IDEWorkbenchMessages.CleanDialog_cleanSelectedTaskName, selection.length);
-                for (int i = 0; i < selection.length; i++) {
-                    ((IProject) selection[i]).build(
-                            IncrementalProjectBuilder.CLEAN_BUILD,
-                            new SubProgressMonitor(monitor, 1));
-                }
-            } finally {
-                monitor.done();
+			SubMonitor subMonitor = SubMonitor.convert(monitor, IDEWorkbenchMessages.CleanDialog_cleanSelectedTaskName,
+					selection.length);
+			for (int i = 0; i < selection.length; i++) {
+				((IProject) selection[i]).build(IncrementalProjectBuilder.CLEAN_BUILD, subMonitor.newChild(1));
             }
         }
     }
diff --git a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/dialogs/LinkedResourceEditor.java b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/dialogs/LinkedResourceEditor.java
index 3977153b39c..f68dcdc60ad 100644
--- a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/dialogs/LinkedResourceEditor.java
+++ b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/dialogs/LinkedResourceEditor.java
@@ -32,7 +32,7 @@ import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.core.runtime.Path;
 import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.SubProgressMonitor;
+import org.eclipse.core.runtime.SubMonitor;
 import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.dialogs.IDialogConstants;
 import org.eclipse.jface.dialogs.MessageDialog;
@@ -545,30 +545,24 @@ return true;
 				IDEWorkbenchMessages.LinkedResourceEditor_removeTitle,
 				IDEWorkbenchMessages.LinkedResourceEditor_removeMessage)) {
 			final IResource[] selectedResources = getSelectedResource();
-			final ArrayList/*<IResource>*/ removedResources = new ArrayList();
+			final ArrayList<IResource> removedResources = new ArrayList<>();
 
 			IRunnableWithProgress op = monitor -> {
-				try {
-					monitor.beginTask(
-							IDEWorkbenchMessages.LinkedResourceEditor_removingMessage,
-							selectedResources.length);
-					for (int i = 0; i < selectedResources.length; i++) {
-						if (monitor.isCanceled())
-							break;
-						String fullPath = selectedResources[i]
-								.getFullPath().toPortableString();
-						try {
-							selectedResources[i].delete(true, new SubProgressMonitor(monitor, 1));
-							removedResources.add(selectedResources[i]);
-							fBrokenResources.remove(fullPath);
-							fFixedResources.remove(fullPath);
-							fAbsoluteResources.remove(fullPath);
-						} catch (CoreException e) {
-							e.printStackTrace();
-						}
+				SubMonitor subMonitor = SubMonitor.convert(monitor,
+						IDEWorkbenchMessages.LinkedResourceEditor_removingMessage, selectedResources.length);
+				for (int i = 0; i < selectedResources.length; i++) {
+					if (subMonitor.isCanceled())
+						break;
+					String fullPath = selectedResources[i].getFullPath().toPortableString();
+					try {
+						selectedResources[i].delete(true, subMonitor.newChild(1));
+						removedResources.add(selectedResources[i]);
+						fBrokenResources.remove(fullPath);
+						fFixedResources.remove(fullPath);
+						fAbsoluteResources.remove(fullPath);
+					} catch (CoreException e) {
+						e.printStackTrace();
 					}
-				} finally {
-					monitor.done();
 				}
 			};
 			try {