Bug 531389 - Replace SubProgressMonitor by SubMonitor
Change-Id: I981ad30eb8faf0a59484232ddf796f8cf4e2ea7c
Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
diff --git a/ant/org.eclipse.ant.core/src_ant/org/eclipse/ant/internal/core/ant/ProgressBuildListener.java b/ant/org.eclipse.ant.core/src_ant/org/eclipse/ant/internal/core/ant/ProgressBuildListener.java
index 2be5aa5..6a03160 100644
--- a/ant/org.eclipse.ant.core/src_ant/org/eclipse/ant/internal/core/ant/ProgressBuildListener.java
+++ b/ant/org.eclipse.ant.core/src_ant/org/eclipse/ant/internal/core/ant/ProgressBuildListener.java
@@ -31,7 +31,7 @@
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.core.runtime.SubProgressMonitor;
+import org.eclipse.core.runtime.SubMonitor;
/**
* Reports progress and checks for cancellation of a script execution.
@@ -330,6 +330,6 @@
if (monitor instanceof NullProgressMonitor) {
return monitor;
}
- return new SubProgressMonitor(monitor, ticks);
+ return SubMonitor.convert(monitor, ticks);
}
}
diff --git a/ant/org.eclipse.ant.launching/src/org/eclipse/ant/internal/launching/launchConfigurations/AntLaunchDelegate.java b/ant/org.eclipse.ant.launching/src/org/eclipse/ant/internal/launching/launchConfigurations/AntLaunchDelegate.java
index 507e628..f2e1c2b 100644
--- a/ant/org.eclipse.ant.launching/src/org/eclipse/ant/internal/launching/launchConfigurations/AntLaunchDelegate.java
+++ b/ant/org.eclipse.ant.launching/src/org/eclipse/ant/internal/launching/launchConfigurations/AntLaunchDelegate.java
@@ -49,7 +49,7 @@
import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.Platform;
import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.SubProgressMonitor;
+import org.eclipse.core.runtime.SubMonitor;
import org.eclipse.core.runtime.URIUtil;
import org.eclipse.debug.core.DebugEvent;
import org.eclipse.debug.core.DebugPlugin;
@@ -575,7 +575,7 @@
}
// copy.setAttribute(IJavaLaunchConfigurationConstants.ATTR_VM_ARGUMENTS,
// "-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000");
- IProgressMonitor subMonitor = new SubProgressMonitor(monitor, 10);
+ IProgressMonitor subMonitor = SubMonitor.convert(monitor, 10);
AntJavaLaunchDelegate delegate = new AntJavaLaunchDelegate();
delegate.preLaunchCheck(copy, ILaunchManager.RUN_MODE, subMonitor);
delegate.launch(copy, ILaunchManager.RUN_MODE, launch, subMonitor);
