View | Details | Raw Unified | Return to bug 284172 | Differences between
and this patch

Collapse All | Expand All

(-)src/org/eclipse/mylyn/internal/tasks/core/sync/SynchronizeQueriesJob.java (-8 lines)
Lines 31-38 Link Here
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;
36
import org.eclipse.mylyn.commons.core.StatusHandler;
34
import org.eclipse.mylyn.commons.core.StatusHandler;
37
import org.eclipse.mylyn.commons.net.Policy;
35
import org.eclipse.mylyn.commons.net.Policy;
38
import org.eclipse.mylyn.internal.tasks.core.AbstractTask;
36
import org.eclipse.mylyn.internal.tasks.core.AbstractTask;
Lines 123-130 Link Here
123
121
124
	private final List<IStatus> statuses;
122
	private final List<IStatus> statuses;
125
123
126
	private final IDelegatingProgressMonitor monitor;
127
128
	public SynchronizeQueriesJob(TaskList taskList, TaskDataManager taskDataManager, IRepositoryModel tasksModel,
124
	public SynchronizeQueriesJob(TaskList taskList, TaskDataManager taskDataManager, IRepositoryModel tasksModel,
129
			AbstractRepositoryConnector connector, TaskRepository repository, Set<RepositoryQuery> queries) {
125
			AbstractRepositoryConnector connector, TaskRepository repository, Set<RepositoryQuery> queries) {
130
		super(Messages.SynchronizeQueriesJob_Synchronizing_Queries + " (" + repository.getRepositoryLabel() + ")"); //$NON-NLS-1$//$NON-NLS-2$
126
		super(Messages.SynchronizeQueriesJob_Synchronizing_Queries + " (" + repository.getRepositoryLabel() + ")"); //$NON-NLS-1$//$NON-NLS-2$
Lines 135-141 Link Here
135
		this.repository = repository;
131
		this.repository = repository;
136
		this.queries = queries;
132
		this.queries = queries;
137
		this.statuses = new ArrayList<IStatus>();
133
		this.statuses = new ArrayList<IStatus>();
138
		this.monitor = new DelegatingProgressMonitor();
139
	}
134
	}
140
135
141
	@Override
136
	@Override
Lines 329-335 Link Here
329
		return Collections.unmodifiableCollection(statuses);
324
		return Collections.unmodifiableCollection(statuses);
330
	}
325
	}
331
326
332
	public IDelegatingProgressMonitor getMonitor() {
333
		return monitor;
334
	}
335
}
327
}
(-)src/org/eclipse/mylyn/internal/tasks/core/sync/SynchronizeRepositoriesJob.java (-9 lines)
Lines 25-32 Link Here
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;
30
import org.eclipse.mylyn.commons.core.StatusHandler;
28
import org.eclipse.mylyn.commons.core.StatusHandler;
31
import org.eclipse.mylyn.commons.net.Policy;
29
import org.eclipse.mylyn.commons.net.Policy;
32
import org.eclipse.mylyn.internal.tasks.core.ITasksCoreConstants;
30
import org.eclipse.mylyn.internal.tasks.core.ITasksCoreConstants;
Lines 57-64 Link Here
57
55
58
	private final IRepositoryModel tasksModel;
56
	private final IRepositoryModel tasksModel;
59
57
60
	private final IDelegatingProgressMonitor monitor;
61
62
	public SynchronizeRepositoriesJob(TaskList taskList, TaskDataManager taskDataManager, IRepositoryModel tasksModel,
58
	public SynchronizeRepositoriesJob(TaskList taskList, TaskDataManager taskDataManager, IRepositoryModel tasksModel,
63
			IRepositoryManager repositoryManager) {
59
			IRepositoryManager repositoryManager) {
64
		super(Messages.SynchronizeRepositoriesJob_Synchronizing_Task_List);
60
		super(Messages.SynchronizeRepositoriesJob_Synchronizing_Task_List);
Lines 66-72 Link Here
66
		this.taskDataManager = taskDataManager;
62
		this.taskDataManager = taskDataManager;
67
		this.tasksModel = tasksModel;
63
		this.tasksModel = tasksModel;
68
		this.repositoryManager = repositoryManager;
64
		this.repositoryManager = repositoryManager;
69
		this.monitor = new DelegatingProgressMonitor();
70
	}
65
	}
71
66
72
	public Collection<TaskRepository> getRepositories() {
67
	public Collection<TaskRepository> getRepositories() {
Lines 195-202 Link Here
195
			monitor.done();
190
			monitor.done();
196
		}
191
		}
197
	}
192
	}
198
199
	public IDelegatingProgressMonitor getMonitor() {
200
		return monitor;
201
	}
202
}
193
}
(-)src/org/eclipse/mylyn/internal/tasks/core/sync/SynchronizeTasksJob.java (-8 lines)
Lines 27-34 Link Here
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;
32
import org.eclipse.mylyn.commons.core.StatusHandler;
30
import org.eclipse.mylyn.commons.core.StatusHandler;
33
import org.eclipse.mylyn.commons.net.Policy;
31
import org.eclipse.mylyn.commons.net.Policy;
34
import org.eclipse.mylyn.internal.tasks.core.AbstractTask;
32
import org.eclipse.mylyn.internal.tasks.core.AbstractTask;
Lines 81-88 Link Here
81
79
82
	private final List<IStatus> statuses;
80
	private final List<IStatus> statuses;
83
81
84
	private final IDelegatingProgressMonitor monitor;
85
86
	public SynchronizeTasksJob(TaskList taskList, TaskDataManager synchronizationManager, IRepositoryModel tasksModel,
82
	public SynchronizeTasksJob(TaskList taskList, TaskDataManager synchronizationManager, IRepositoryModel tasksModel,
87
			AbstractRepositoryConnector connector, TaskRepository taskRepository, Set<ITask> tasks) {
83
			AbstractRepositoryConnector connector, TaskRepository taskRepository, Set<ITask> tasks) {
88
		this(taskList, synchronizationManager, tasksModel, connector, (IRepositoryManager) null, tasks);
84
		this(taskList, synchronizationManager, tasksModel, connector, (IRepositoryManager) null, tasks);
Lines 100-106 Link Here
100
		this.allTasks = tasks;
96
		this.allTasks = tasks;
101
		this.statuses = new ArrayList<IStatus>();
97
		this.statuses = new ArrayList<IStatus>();
102
		setRule(new MutexSchedulingRule());
98
		setRule(new MutexSchedulingRule());
103
		this.monitor = new DelegatingProgressMonitor();
104
	}
99
	}
105
100
106
	@Override
101
	@Override
Lines 333-339 Link Here
333
		return Collections.unmodifiableCollection(statuses);
328
		return Collections.unmodifiableCollection(statuses);
334
	}
329
	}
335
330
336
	public IDelegatingProgressMonitor getMonitor() {
337
		return monitor;
338
	}
339
}
331
}
(-)src/org/eclipse/mylyn/tasks/core/sync/SynchronizationJob.java (+8 lines)
Lines 12-17 Link Here
12
package org.eclipse.mylyn.tasks.core.sync;
12
package org.eclipse.mylyn.tasks.core.sync;
13
13
14
import org.eclipse.core.runtime.jobs.Job;
14
import org.eclipse.core.runtime.jobs.Job;
15
import org.eclipse.mylyn.commons.core.DelegatingProgressMonitor;
16
import org.eclipse.mylyn.commons.core.IDelegatingProgressMonitor;
15
17
16
/**
18
/**
17
 * @author Steffen Pingel
19
 * @author Steffen Pingel
Lines 24-34 Link Here
24
26
25
	private boolean fullSynchronization = false;
27
	private boolean fullSynchronization = false;
26
28
29
	protected final IDelegatingProgressMonitor monitor;
30
27
	/**
31
	/**
28
	 * @since 3.0
32
	 * @since 3.0
29
	 */
33
	 */
30
	public SynchronizationJob(String name) {
34
	public SynchronizationJob(String name) {
31
		super(name);
35
		super(name);
36
		this.monitor = new DelegatingProgressMonitor();
32
	}
37
	}
33
38
34
//	public boolean isChangedTasksSynchronization() {
39
//	public boolean isChangedTasksSynchronization() {
Lines 53-56 Link Here
53
		this.fullSynchronization = fullSynchronization;
58
		this.fullSynchronization = fullSynchronization;
54
	}
59
	}
55
60
61
	public IDelegatingProgressMonitor getMonitor() {
62
		return monitor;
63
	}
56
}
64
}

Return to bug 284172