Attachment #142195 for bug #284172

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

Lines 31-36 Link Here

(-)src/org/eclipse/mylyn/internal/tasks/core/sync/SynchronizeQueriesJob.java (-1 / +10 lines)
31	import org.eclipse.core.runtime.Status;	31	import org.eclipse.core.runtime.Status;
32	import org.eclipse.core.runtime.SubProgressMonitor;	32	import org.eclipse.core.runtime.SubProgressMonitor;
33	import org.eclipse.core.runtime.jobs.Job;	33	import org.eclipse.core.runtime.jobs.Job;
		34	import org.eclipse.mylyn.commons.core.DelegatingProgressMonitor;
		35	import org.eclipse.mylyn.commons.core.IDelegatingProgressMonitor;
34	import org.eclipse.mylyn.commons.core.StatusHandler;	36	import org.eclipse.mylyn.commons.core.StatusHandler;
35	import org.eclipse.mylyn.commons.net.Policy;	37	import org.eclipse.mylyn.commons.net.Policy;
36	import org.eclipse.mylyn.internal.tasks.core.AbstractTask;	38	import org.eclipse.mylyn.internal.tasks.core.AbstractTask;
Lines 120-125 Link Here
120		122
121	private final List<IStatus> statuses;	123	private final List<IStatus> statuses;
122		124
		125	protected final IDelegatingProgressMonitor monitor;
		126
123	public SynchronizeQueriesJob(TaskList taskList, TaskDataManager taskDataManager, IRepositoryModel tasksModel,	127	public SynchronizeQueriesJob(TaskList taskList, TaskDataManager taskDataManager, IRepositoryModel tasksModel,
124	AbstractRepositoryConnector connector, TaskRepository repository, Set<RepositoryQuery> queries) {	128	AbstractRepositoryConnector connector, TaskRepository repository, Set<RepositoryQuery> queries) {
125	super(Messages.SynchronizeQueriesJob_Synchronizing_Queries + " (" + repository.getRepositoryLabel() + ")"); //$NON-NLS-1$//$NON-NLS-2$	129	super(Messages.SynchronizeQueriesJob_Synchronizing_Queries + " (" + repository.getRepositoryLabel() + ")"); //$NON-NLS-1$//$NON-NLS-2$
Lines 130-139 Link Here
130	this.repository = repository;	134	this.repository = repository;
131	this.queries = queries;	135	this.queries = queries;
132	this.statuses = new ArrayList<IStatus>();	136	this.statuses = new ArrayList<IStatus>();
		137	this.monitor = new DelegatingProgressMonitor();
133	}	138	}
134		139
135	@Override	140	@Override
136	public IStatus run(IProgressMonitor monitor) {	141	public IStatus run(IProgressMonitor jobMonitor) {
		142	monitor.attach(jobMonitor);
137	try {	143	try {
138	monitor.beginTask(Messages.SynchronizeQueriesJob_Processing, 20 + queries.size() * 20 + 40 + 10);	144	monitor.beginTask(Messages.SynchronizeQueriesJob_Processing, 20 + queries.size() * 20 + 40 + 10);
139		145
Lines 319-322 Link Here
319	return Collections.unmodifiableCollection(statuses);	325	return Collections.unmodifiableCollection(statuses);
320	}	326	}
321		327
		328	public IDelegatingProgressMonitor getMonitor() {
		329	return monitor;
		330	}
322	}	331	}

Lines 25-30 Link Here

(-)src/org/eclipse/mylyn/internal/tasks/core/sync/SynchronizeRepositoriesJob.java (-1 / +11 lines)
25	import org.eclipse.core.runtime.Status;	25	import org.eclipse.core.runtime.Status;
26	import org.eclipse.core.runtime.SubProgressMonitor;	26	import org.eclipse.core.runtime.SubProgressMonitor;
27	import org.eclipse.core.runtime.jobs.Job;	27	import org.eclipse.core.runtime.jobs.Job;
		28	import org.eclipse.mylyn.commons.core.DelegatingProgressMonitor;
		29	import org.eclipse.mylyn.commons.core.IDelegatingProgressMonitor;
28	import org.eclipse.mylyn.commons.net.Policy;	30	import org.eclipse.mylyn.commons.net.Policy;
29	import org.eclipse.mylyn.internal.tasks.core.ITasksCoreConstants;	31	import org.eclipse.mylyn.internal.tasks.core.ITasksCoreConstants;
30	import org.eclipse.mylyn.internal.tasks.core.RepositoryQuery;	32	import org.eclipse.mylyn.internal.tasks.core.RepositoryQuery;
Lines 53-58 Link Here
53		55
54	private final IRepositoryModel tasksModel;	56	private final IRepositoryModel tasksModel;
55		57
		58	protected final IDelegatingProgressMonitor monitor;
		59
56	public SynchronizeRepositoriesJob(TaskList taskList, TaskDataManager taskDataManager, IRepositoryModel tasksModel,	60	public SynchronizeRepositoriesJob(TaskList taskList, TaskDataManager taskDataManager, IRepositoryModel tasksModel,
57	IRepositoryManager repositoryManager) {	61	IRepositoryManager repositoryManager) {
58	super(Messages.SynchronizeRepositoriesJob_Synchronizing_Task_List);	62	super(Messages.SynchronizeRepositoriesJob_Synchronizing_Task_List);
Lines 60-65 Link Here
60	this.taskDataManager = taskDataManager;	64	this.taskDataManager = taskDataManager;
61	this.tasksModel = tasksModel;	65	this.tasksModel = tasksModel;
62	this.repositoryManager = repositoryManager;	66	this.repositoryManager = repositoryManager;
		67	this.monitor = new DelegatingProgressMonitor();
63	}	68	}
64		69
65	public Collection<TaskRepository> getRepositories() {	70	public Collection<TaskRepository> getRepositories() {
Lines 75-81 Link Here
75	}	80	}
76		81
77	@Override	82	@Override
78	public IStatus run(IProgressMonitor monitor) {	83	public IStatus run(IProgressMonitor jobMonitor) {
		84	monitor.attach(jobMonitor);
79	// get the current list of repositories	85	// get the current list of repositories
80	Set<TaskRepository> repositories = this.repositories;	86	Set<TaskRepository> repositories = this.repositories;
81	if (repositories == null) {	87	if (repositories == null) {
Lines 182-185 Link Here
182	monitor.done();	188	monitor.done();
183	}	189	}
184	}	190	}
		191
		192	public IDelegatingProgressMonitor getMonitor() {
		193	return monitor;
		194	}
185	}	195	}

Lines 27-32 Link Here

(-)src/org/eclipse/mylyn/internal/tasks/core/sync/SynchronizeTasksJob.java (-2 / +12 lines)
27	import org.eclipse.core.runtime.OperationCanceledException;	27	import org.eclipse.core.runtime.OperationCanceledException;
28	import org.eclipse.core.runtime.Status;	28	import org.eclipse.core.runtime.Status;
29	import org.eclipse.core.runtime.SubProgressMonitor;	29	import org.eclipse.core.runtime.SubProgressMonitor;
		30	import org.eclipse.mylyn.commons.core.DelegatingProgressMonitor;
		31	import org.eclipse.mylyn.commons.core.IDelegatingProgressMonitor;
30	import org.eclipse.mylyn.commons.core.StatusHandler;	32	import org.eclipse.mylyn.commons.core.StatusHandler;
31	import org.eclipse.mylyn.commons.net.Policy;	33	import org.eclipse.mylyn.commons.net.Policy;
32	import org.eclipse.mylyn.internal.tasks.core.AbstractTask;	34	import org.eclipse.mylyn.internal.tasks.core.AbstractTask;
Lines 79-84 Link Here
79		81
80	private final List<IStatus> statuses;	82	private final List<IStatus> statuses;
81		83
		84	protected final IDelegatingProgressMonitor monitor;
		85
82	public SynchronizeTasksJob(TaskList taskList, TaskDataManager synchronizationManager, IRepositoryModel tasksModel,	86	public SynchronizeTasksJob(TaskList taskList, TaskDataManager synchronizationManager, IRepositoryModel tasksModel,
83	AbstractRepositoryConnector connector, TaskRepository taskRepository, Set<ITask> tasks) {	87	AbstractRepositoryConnector connector, TaskRepository taskRepository, Set<ITask> tasks) {
84	this(taskList, synchronizationManager, tasksModel, connector, (IRepositoryManager) null, tasks);	88	this(taskList, synchronizationManager, tasksModel, connector, (IRepositoryManager) null, tasks);
Lines 96-105 Link Here
96	this.allTasks = tasks;	100	this.allTasks = tasks;
97	this.statuses = new ArrayList<IStatus>();	101	this.statuses = new ArrayList<IStatus>();
98	setRule(new MutexSchedulingRule());	102	setRule(new MutexSchedulingRule());
		103	this.monitor = new DelegatingProgressMonitor();
99	}	104	}
100		105
101	@Override	106	@Override
102	public IStatus run(IProgressMonitor monitor) {	107	public IStatus run(IProgressMonitor jobMonitor) {
		108	monitor.attach(jobMonitor);
103	try {	109	try {
104	if (taskRepository == null) {	110	if (taskRepository == null) {
105	try {	111	try {
Lines 147-153 Link Here
147	synchronizedTaskRelations(monitor, relationsByTaskId);	153	synchronizedTaskRelations(monitor, relationsByTaskId);
148	}	154	}
149		155
150	public void synchronizedTaskRelations(IProgressMonitor monitor, Map<String, TaskRelation[]> relationsByTaskId) {	156	public void synchronizedTaskRelations(IProgressMonitor jobMonitor, Map<String, TaskRelation[]> relationsByTaskId) {
		157	monitor.attach(jobMonitor);
151	updateRelations = false;	158	updateRelations = false;
152	for (String taskId : relationsByTaskId.keySet()) {	159	for (String taskId : relationsByTaskId.keySet()) {
153	ITask parentTask = taskList.getTask(taskRepository.getRepositoryUrl(), taskId);	160	ITask parentTask = taskList.getTask(taskRepository.getRepositoryUrl(), taskId);
Lines 327-330 Link Here
327	return Collections.unmodifiableCollection(statuses);	334	return Collections.unmodifiableCollection(statuses);
328	}	335	}
329		336
		337	public IDelegatingProgressMonitor getMonitor() {
		338	return monitor;
		339	}
330	}	340	}

Return to bug 284172