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, 10 insertions, 5 deletions

diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/FileDocumentProvider.java b/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/FileDocumentProvider.java
index cbf28075663..61e86952eab 100644
--- a/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/FileDocumentProvider.java
+++ b/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/FileDocumentProvider.java
@@ -37,7 +37,7 @@ import org.eclipse.core.runtime.OperationCanceledException;
 import org.eclipse.core.runtime.Platform;
 import org.eclipse.core.runtime.QualifiedName;
 import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.SubMonitor;
+import org.eclipse.core.runtime.SubProgressMonitor;
 import org.eclipse.core.runtime.content.IContentDescription;
 import org.eclipse.core.runtime.content.IContentType;
 import org.eclipse.core.runtime.jobs.ISchedulingRule;
@@ -639,10 +639,15 @@ public class FileDocumentProvider extends StorageDocumentProvider {
 				}
 
 			} else {
-				SubMonitor subMonitor= SubMonitor.convert(monitor, TextEditorMessages.FileDocumentProvider_task_saving, 2);
-				ContainerCreator creator= new ContainerCreator(file.getWorkspace(), file.getParent().getFullPath());
-				creator.createContainer(subMonitor.newChild(1));
-				file.create(stream, false, subMonitor.newChild(1));
+				try {
+					monitor.beginTask(TextEditorMessages.FileDocumentProvider_task_saving, 2000);
+					ContainerCreator creator = new ContainerCreator(file.getWorkspace(), file.getParent().getFullPath());
+					creator.createContainer(new SubProgressMonitor(monitor, 1000));
+					file.create(stream, false, new SubProgressMonitor(monitor, 1000));
+				}
+				finally {
+					monitor.done();
+				}
 			}
 
 		} else {