Ensure DownloadJob.run(IProgressMonitor) provides monitor task details

IProgressMonitor.slice() only propagates the work to its parent monitor, but not any details. Follow-up to #576
eclipse-equinox · Dec 19, 2024 · 57a3cf3 · 57a3cf3
1 parent 1cfa5de
commit 57a3cf3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/...epository/src/org/eclipse/equinox/internal/p2/artifact/repository/simple/DownloadJob.java b/...epository/src/org/eclipse/equinox/internal/p2/artifact/repository/simple/DownloadJob.java
@@ -24,11 +24,11 @@ public class DownloadJob extends Job {
 
 	private final LinkedList<IArtifactRequest> requestsPending;
 	private final SimpleArtifactRepository repository;
-	private final IProgressMonitor masterMonitor;
+	private final SubMonitor masterMonitor;
 	private final MultiStatus overallStatus;
 
 	DownloadJob(String name, SimpleArtifactRepository repository, LinkedList<IArtifactRequest> requestsPending,
-			IProgressMonitor masterMonitor, MultiStatus overallStatus) {
+			SubMonitor masterMonitor, MultiStatus overallStatus) {
 		super(name);
 		setSystem(true);
 		this.repository = repository;
@@ -56,8 +56,7 @@ protected IStatus run(IProgressMonitor jobMonitor) {
 			if (masterMonitor.isCanceled())
 				return Status.CANCEL_STATUS;
 			// process the actual request
-			SubMonitor subMonitor = SubMonitor.convert(masterMonitor.slice(1), 1);
-			IStatus status = repository.getArtifact(request, subMonitor);
+			IStatus status = repository.getArtifact(request, masterMonitor.newChild(1));
 			if (!status.isOK()) {
 				synchronized (overallStatus) {
 					overallStatus.add(status);

diff --git a/.../org/eclipse/equinox/internal/p2/artifact/repository/simple/SimpleArtifactRepository.java b/.../org/eclipse/equinox/internal/p2/artifact/repository/simple/SimpleArtifactRepository.java
@@ -914,11 +914,12 @@ public IStatus getArtifacts(IArtifactRequest[] requests, IProgressMonitor monito
 			}
 		} else {
 			// initialize the various jobs needed to process the get artifact requests
-			monitor.beginTask(NLS.bind(Messages.sar_downloading, Integer.toString(requests.length)), requests.length);
+			SubMonitor subMonitor = SubMonitor.convert(monitor,
+					NLS.bind(Messages.sar_downloading, Integer.toString(requests.length)), requests.length);
 			try {
 				DownloadJob jobs[] = new DownloadJob[numberOfJobs];
 				for (int i = 0; i < numberOfJobs; i++) {
-					jobs[i] = new DownloadJob(Messages.sar_downloadJobName + i, this, requestsPending, monitor,
+					jobs[i] = new DownloadJob(Messages.sar_downloadJobName + i, this, requestsPending, subMonitor,
 							overallStatus);
 					jobs[i].schedule();
 				}