Attachment 144076 Details for Bug 284172 – patch (api) v2

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

[patch] patch (api) v2

clipboard.txt (text/plain), 6.80 KB, created by Thomas Ehrnhoefer

on 2009-08-11 13:06:54 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Thomas Ehrnhoefer

Created: 2009-08-11 13:06:54 EDT

Size: 6.80 KB

patch

obsolete

>### 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.51
>diff -u -r1.51 SynchronizeQueriesJob.java
>--- src/org/eclipse/mylyn/internal/tasks/core/sync/SynchronizeQueriesJob.java	11 Aug 2009 01:03:04 -0000	1.51
>+++ src/org/eclipse/mylyn/internal/tasks/core/sync/SynchronizeQueriesJob.java	11 Aug 2009 17:08:42 -0000
>@@ -31,8 +31,6 @@
> import org.eclipse.core.runtime.Status;
> import org.eclipse.core.runtime.SubProgressMonitor;
> import org.eclipse.core.runtime.jobs.Job;
>-import org.eclipse.mylyn.commons.core.DelegatingProgressMonitor;
>-import org.eclipse.mylyn.commons.core.IDelegatingProgressMonitor;
> import org.eclipse.mylyn.commons.core.StatusHandler;
> import org.eclipse.mylyn.commons.net.Policy;
> import org.eclipse.mylyn.internal.tasks.core.AbstractTask;
>@@ -123,8 +121,6 @@
> 
> 	private final List<IStatus> statuses;
> 
>-	private final IDelegatingProgressMonitor monitor;
>-
> 	public SynchronizeQueriesJob(TaskList taskList, TaskDataManager taskDataManager, IRepositoryModel tasksModel,
> 			AbstractRepositoryConnector connector, TaskRepository repository, Set<RepositoryQuery> queries) {
> 		super(Messages.SynchronizeQueriesJob_Synchronizing_Queries + " (" + repository.getRepositoryLabel() + ")"); //$NON-NLS-1$//$NON-NLS-2$
>@@ -135,7 +131,6 @@
> 		this.repository = repository;
> 		this.queries = queries;
> 		this.statuses = new ArrayList<IStatus>();
>-		this.monitor = new DelegatingProgressMonitor();
> 	}
> 
> 	@Override
>@@ -329,7 +324,4 @@
> 		return Collections.unmodifiableCollection(statuses);
> 	}
> 
>-	public IDelegatingProgressMonitor getMonitor() {
>-		return monitor;
>-	}
> }
>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.27
>diff -u -r1.27 SynchronizeRepositoriesJob.java
>--- src/org/eclipse/mylyn/internal/tasks/core/sync/SynchronizeRepositoriesJob.java	11 Aug 2009 01:03:04 -0000	1.27
>+++ src/org/eclipse/mylyn/internal/tasks/core/sync/SynchronizeRepositoriesJob.java	11 Aug 2009 17:08:42 -0000
>@@ -25,8 +25,6 @@
> import org.eclipse.core.runtime.Status;
> import org.eclipse.core.runtime.SubProgressMonitor;
> import org.eclipse.core.runtime.jobs.Job;
>-import org.eclipse.mylyn.commons.core.DelegatingProgressMonitor;
>-import org.eclipse.mylyn.commons.core.IDelegatingProgressMonitor;
> import org.eclipse.mylyn.commons.core.StatusHandler;
> import org.eclipse.mylyn.commons.net.Policy;
> import org.eclipse.mylyn.internal.tasks.core.ITasksCoreConstants;
>@@ -57,8 +55,6 @@
> 
> 	private final IRepositoryModel tasksModel;
> 
>-	private final IDelegatingProgressMonitor monitor;
>-
> 	public SynchronizeRepositoriesJob(TaskList taskList, TaskDataManager taskDataManager, IRepositoryModel tasksModel,
> 			IRepositoryManager repositoryManager) {
> 		super(Messages.SynchronizeRepositoriesJob_Synchronizing_Task_List);
>@@ -66,7 +62,6 @@
> 		this.taskDataManager = taskDataManager;
> 		this.tasksModel = tasksModel;
> 		this.repositoryManager = repositoryManager;
>-		this.monitor = new DelegatingProgressMonitor();
> 	}
> 
> 	public Collection<TaskRepository> getRepositories() {
>@@ -195,8 +190,4 @@
> 			monitor.done();
> 		}
> 	}
>-
>-	public IDelegatingProgressMonitor getMonitor() {
>-		return monitor;
>-	}
> }
>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.48
>diff -u -r1.48 SynchronizeTasksJob.java
>--- src/org/eclipse/mylyn/internal/tasks/core/sync/SynchronizeTasksJob.java	24 Jul 2009 12:07:58 -0000	1.48
>+++ src/org/eclipse/mylyn/internal/tasks/core/sync/SynchronizeTasksJob.java	11 Aug 2009 17:08:42 -0000
>@@ -27,8 +27,6 @@
> import org.eclipse.core.runtime.OperationCanceledException;
> import org.eclipse.core.runtime.Status;
> import org.eclipse.core.runtime.SubProgressMonitor;
>-import org.eclipse.mylyn.commons.core.DelegatingProgressMonitor;
>-import org.eclipse.mylyn.commons.core.IDelegatingProgressMonitor;
> import org.eclipse.mylyn.commons.core.StatusHandler;
> import org.eclipse.mylyn.commons.net.Policy;
> import org.eclipse.mylyn.internal.tasks.core.AbstractTask;
>@@ -81,8 +79,6 @@
> 
> 	private final List<IStatus> statuses;
> 
>-	private final IDelegatingProgressMonitor monitor;
>-
> 	public SynchronizeTasksJob(TaskList taskList, TaskDataManager synchronizationManager, IRepositoryModel tasksModel,
> 			AbstractRepositoryConnector connector, TaskRepository taskRepository, Set<ITask> tasks) {
> 		this(taskList, synchronizationManager, tasksModel, connector, (IRepositoryManager) null, tasks);
>@@ -100,7 +96,6 @@
> 		this.allTasks = tasks;
> 		this.statuses = new ArrayList<IStatus>();
> 		setRule(new MutexSchedulingRule());
>-		this.monitor = new DelegatingProgressMonitor();
> 	}
> 
> 	@Override
>@@ -333,7 +328,4 @@
> 		return Collections.unmodifiableCollection(statuses);
> 	}
> 
>-	public IDelegatingProgressMonitor getMonitor() {
>-		return monitor;
>-	}
> }
>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	11 Aug 2009 17:08:42 -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;
>+	}
> }

Actions: View | Diff

Attachments on bug 284172: 142195 | 142196 | 142197 | 142198 | 144076 | 144077