Bug 479523 - Replace usage of SubProgressMonitor with SubMonitor in

eclipse.platform.text

Also using split for automatic cancelation checking


Change-Id: I0d78f0071a0b1d25683bd4404b489dd4334c6b5a
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>

1 files changed, 5 insertions, 10 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 61e86952eab..7307e6080ae 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.SubProgressMonitor;
+import org.eclipse.core.runtime.SubMonitor;
 import org.eclipse.core.runtime.content.IContentDescription;
 import org.eclipse.core.runtime.content.IContentType;
 import org.eclipse.core.runtime.jobs.ISchedulingRule;
@@ -639,15 +639,10 @@ public class FileDocumentProvider extends StorageDocumentProvider {
 				}
 
 			} else {
-				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();
-				}
+				SubMonitor subMonitor= SubMonitor.convert(monitor, TextEditorMessages.FileDocumentProvider_task_saving, 2);
+				ContainerCreator creator= new ContainerCreator(file.getWorkspace(), file.getParent().getFullPath());
+				creator.createContainer(subMonitor.split(1));
+				file.create(stream, false, subMonitor.split(1));
 			}
 
 		} else {