### Eclipse Workspace Patch 1.0 #P org.eclipse.mylyn.tasks.core Index: src/org/eclipse/mylyn/internal/tasks/core/sync/SynchronizeQueriesJob.java =================================================================== RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/sync/SynchronizeQueriesJob.java,v retrieving revision 1.48 diff -u -r1.48 SynchronizeQueriesJob.java --- src/org/eclipse/mylyn/internal/tasks/core/sync/SynchronizeQueriesJob.java 13 Mar 2009 00:32:49 -0000 1.48 +++ src/org/eclipse/mylyn/internal/tasks/core/sync/SynchronizeQueriesJob.java 21 Jul 2009 22:05:20 -0000 @@ -133,7 +133,8 @@ } @Override - public IStatus run(IProgressMonitor monitor) { + public IStatus run(IProgressMonitor jobMonitor) { + monitor.attach(jobMonitor); try { monitor.beginTask(Messages.SynchronizeQueriesJob_Processing, 20 + queries.size() * 20 + 40 + 10); Index: src/org/eclipse/mylyn/internal/tasks/core/sync/SynchronizeRepositoriesJob.java =================================================================== RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/sync/SynchronizeRepositoriesJob.java,v retrieving revision 1.24 diff -u -r1.24 SynchronizeRepositoriesJob.java --- src/org/eclipse/mylyn/internal/tasks/core/sync/SynchronizeRepositoriesJob.java 1 Jun 2009 08:45:19 -0000 1.24 +++ src/org/eclipse/mylyn/internal/tasks/core/sync/SynchronizeRepositoriesJob.java 21 Jul 2009 22:05:20 -0000 @@ -75,7 +75,8 @@ } @Override - public IStatus run(IProgressMonitor monitor) { + public IStatus run(IProgressMonitor jobMonitor) { + monitor.attach(jobMonitor); // get the current list of repositories Set repositories = this.repositories; if (repositories == null) { Index: src/org/eclipse/mylyn/internal/tasks/core/sync/SynchronizeTasksJob.java =================================================================== RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/sync/SynchronizeTasksJob.java,v retrieving revision 1.45 diff -u -r1.45 SynchronizeTasksJob.java --- src/org/eclipse/mylyn/internal/tasks/core/sync/SynchronizeTasksJob.java 29 Jan 2009 05:28:19 -0000 1.45 +++ src/org/eclipse/mylyn/internal/tasks/core/sync/SynchronizeTasksJob.java 21 Jul 2009 22:05:20 -0000 @@ -99,7 +99,8 @@ } @Override - public IStatus run(IProgressMonitor monitor) { + public IStatus run(IProgressMonitor jobMonitor) { + monitor.attach(jobMonitor); try { if (taskRepository == null) { try { @@ -147,7 +148,8 @@ synchronizedTaskRelations(monitor, relationsByTaskId); } - public void synchronizedTaskRelations(IProgressMonitor monitor, Map relationsByTaskId) { + public void synchronizedTaskRelations(IProgressMonitor jobMonitor, Map relationsByTaskId) { + monitor.attach(jobMonitor); updateRelations = false; for (String taskId : relationsByTaskId.keySet()) { ITask parentTask = taskList.getTask(taskRepository.getRepositoryUrl(), taskId); Index: src/org/eclipse/mylyn/tasks/core/sync/SynchronizationJob.java =================================================================== RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/sync/SynchronizationJob.java,v retrieving revision 1.5 diff -u -r1.5 SynchronizationJob.java --- src/org/eclipse/mylyn/tasks/core/sync/SynchronizationJob.java 13 Jan 2009 07:05:11 -0000 1.5 +++ src/org/eclipse/mylyn/tasks/core/sync/SynchronizationJob.java 21 Jul 2009 22:05:20 -0000 @@ -12,6 +12,8 @@ package org.eclipse.mylyn.tasks.core.sync; import org.eclipse.core.runtime.jobs.Job; +import org.eclipse.mylyn.commons.core.DelegatingProgressMonitor; +import org.eclipse.mylyn.commons.core.IDelegatingProgressMonitor; /** * @author Steffen Pingel @@ -24,11 +26,14 @@ private boolean fullSynchronization = false; + protected final IDelegatingProgressMonitor monitor; + /** * @since 3.0 */ public SynchronizationJob(String name) { super(name); + this.monitor = new DelegatingProgressMonitor(); } // public boolean isChangedTasksSynchronization() { @@ -53,4 +58,7 @@ this.fullSynchronization = fullSynchronization; } + public IDelegatingProgressMonitor getMonitor() { + return monitor; + } }