Revert "Bug 479523 - Replace usage of SubProgressMonitor with SubMonitor in eclipse.platform.text"

This was unintentially commited, I selected the wrong tab in the browser. Reverting. I want to commit this early M3 and not late M2.

This reverts commit 17c9cb2d257048b6cbfc5a6c7afa89680da4864c.

Change-Id: I7efae943288e94f34ca38b8b4bd87408dbea8208

1 files changed, 26 insertions, 12 deletions

diff --git a/org.eclipse.core.filebuffers/src/org/eclipse/core/filebuffers/manipulation/ContainerCreator.java b/org.eclipse.core.filebuffers/src/org/eclipse/core/filebuffers/manipulation/ContainerCreator.java
index b57a918bf00..4dfbaaf1d00 100644
--- a/org.eclipse.core.filebuffers/src/org/eclipse/core/filebuffers/manipulation/ContainerCreator.java
+++ b/org.eclipse.core.filebuffers/src/org/eclipse/core/filebuffers/manipulation/ContainerCreator.java
@@ -20,7 +20,7 @@ import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.OperationCanceledException;
 import org.eclipse.core.runtime.Path;
 import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.SubMonitor;
+import org.eclipse.core.runtime.SubProgressMonitor;
 
 import org.eclipse.core.resources.IContainer;
 import org.eclipse.core.resources.IFolder;
@@ -68,7 +68,7 @@ public class ContainerCreator {
 		IWorkspaceRunnable runnable= new IWorkspaceRunnable() {
 			@Override
 			public void run(IProgressMonitor monitor) throws CoreException {
-				SubMonitor subMonitor = SubMonitor.convert(monitor, FileBuffersMessages.ContainerCreator_task_creatingContainer, fContainerFullPath.segmentCount());
+				monitor.beginTask(FileBuffersMessages.ContainerCreator_task_creatingContainer, fContainerFullPath.segmentCount());
 				if (fContainer != null)
 					return;
 
@@ -91,7 +91,7 @@ public class ContainerCreator {
 					if (resource != null) {
 						if (resource instanceof IContainer) {
 							fContainer= (IContainer) resource;
-							subMonitor.worked(1);
+							monitor.worked(1);
 						} else {
 							// fContainerFullPath specifies a file as directory
 							throw new CoreException(new Status(IStatus.ERROR, FileBuffersPlugin.PLUGIN_ID, IStatus.OK, NLSUtility.format(FileBuffersMessages.ContainerCreator_destinationMustBeAContainer, resource.getFullPath()), null));
@@ -100,11 +100,15 @@ public class ContainerCreator {
 					else {
 						if (i == 0) {
 							IProject projectHandle= createProjectHandle(root, currentSegment);
-							fContainer= createProject(projectHandle, subMonitor.newChild(1));
+							IProgressMonitor subMonitor= new SubProgressMonitor(monitor, 1);
+							fContainer= createProject(projectHandle, subMonitor);
+							subMonitor.done();
 						}
 						else {
 							IFolder folderHandle= createFolderHandle(fContainer, currentSegment);
-							fContainer= createFolder(folderHandle, subMonitor.newChild(1));
+							IProgressMonitor subMonitor= new SubProgressMonitor(monitor, 1);
+							fContainer= createFolder(folderHandle, subMonitor);
+							subMonitor.done();
 						}
 					}
 				}
@@ -134,16 +138,26 @@ public class ContainerCreator {
 	}
 
 	private IProject createProject(IProject projectHandle, IProgressMonitor monitor) throws CoreException {
-		SubMonitor subMonitor= SubMonitor.convert(monitor, 2);
-		projectHandle.create(subMonitor.newChild(1));
+		monitor.beginTask("", 100);//$NON-NLS-1$
+		try {
 
-		if (monitor.isCanceled())
-			throw new OperationCanceledException();
+			IProgressMonitor subMonitor= new SubProgressMonitor(monitor, 50);
+			projectHandle.create(subMonitor);
+			subMonitor.done();
 
-		projectHandle.open(subMonitor.newChild(1));
+			if (monitor.isCanceled())
+				throw new OperationCanceledException();
 
-		if (monitor.isCanceled())
-			throw new OperationCanceledException();
+			subMonitor= new SubProgressMonitor(monitor, 50);
+			projectHandle.open(subMonitor);
+			subMonitor.done();
+
+			if (monitor.isCanceled())
+				throw new OperationCanceledException();
+
+		} finally {
+			monitor.done();
+		}
 
 		return projectHandle;
 	}