Attachment #142197 for bug #284172

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

Lines 133-139 Link Here

(-)src/org/eclipse/mylyn/internal/tasks/core/sync/SynchronizeQueriesJob.java (-1 / +2 lines)
133	}	133	}
134		134
135	@Override	135	@Override
136	public IStatus run(IProgressMonitor monitor) {	136	public IStatus run(IProgressMonitor jobMonitor) {
		137	monitor.attach(jobMonitor);
137	try {	138	try {
138	monitor.beginTask(Messages.SynchronizeQueriesJob_Processing, 20 + queries.size() * 20 + 40 + 10);	139	monitor.beginTask(Messages.SynchronizeQueriesJob_Processing, 20 + queries.size() * 20 + 40 + 10);
139		140

Lines 75-81 Link Here

(-)src/org/eclipse/mylyn/internal/tasks/core/sync/SynchronizeRepositoriesJob.java (-1 / +2 lines)
75	}	75	}
76		76
77	@Override	77	@Override
78	public IStatus run(IProgressMonitor monitor) {	78	public IStatus run(IProgressMonitor jobMonitor) {
		79	monitor.attach(jobMonitor);
79	// get the current list of repositories	80	// get the current list of repositories
80	Set<TaskRepository> repositories = this.repositories;	81	Set<TaskRepository> repositories = this.repositories;
81	if (repositories == null) {	82	if (repositories == null) {




	}

	@Override
	public IStatus run(IProgressMonitor jobMonitor) {
		monitor.attach(jobMonitor);
		try {
			if (taskRepository == null) {
				try {

		synchronizedTaskRelations(monitor, relationsByTaskId);
	}

	public void synchronizedTaskRelations(IProgressMonitor jobMonitor, Map<String, TaskRelation[]> relationsByTaskId) {
		monitor.attach(jobMonitor);
		updateRelations = false;
		for (String taskId : relationsByTaskId.keySet()) {
			ITask parentTask = taskList.getTask(taskRepository.getRepositoryUrl(), taskId);

Lines 12-17 Link Here

(-)src/org/eclipse/mylyn/tasks/core/sync/SynchronizationJob.java (+8 lines)
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

Lines 99-105 Link Here

(-)src/org/eclipse/mylyn/internal/tasks/core/sync/SynchronizeTasksJob.java (-2 / +4 lines)
99	}	99	}
100		100
101	@Override	101	@Override
102	public IStatus run(IProgressMonitor monitor) {	102	public IStatus run(IProgressMonitor jobMonitor) {
		103	monitor.attach(jobMonitor);
103	try {	104	try {
104	if (taskRepository == null) {	105	if (taskRepository == null) {
105	try {	106	try {
Lines 147-153 Link Here
147	synchronizedTaskRelations(monitor, relationsByTaskId);	148	synchronizedTaskRelations(monitor, relationsByTaskId);
148	}	149	}
149		150
150	public void synchronizedTaskRelations(IProgressMonitor monitor, Map<String, TaskRelation[]> relationsByTaskId) {	151	public void synchronizedTaskRelations(IProgressMonitor jobMonitor, Map<String, TaskRelation[]> relationsByTaskId) {
		152	monitor.attach(jobMonitor);
151	updateRelations = false;	153	updateRelations = false;
152	for (String taskId : relationsByTaskId.keySet()) {	154	for (String taskId : relationsByTaskId.keySet()) {
153	ITask parentTask = taskList.getTask(taskRepository.getRepositoryUrl(), taskId);	155	ITask parentTask = taskList.getTask(taskRepository.getRepositoryUrl(), taskId);