Attachment 142195 Details for Bug 284172 – patch (internal)

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

[patch] patch (internal)

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

on 2009-07-21 17:58:58 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Thomas Ehrnhoefer

Created: 2009-07-21 17:58:58 EDT

Size: 6.78 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.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:00:28 -0000
>@@ -31,6 +31,8 @@
> 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;
>@@ -120,6 +122,8 @@
> 
> 	private final List<IStatus> statuses;
> 
>+	protected 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$
>@@ -130,10 +134,12 @@
> 		this.repository = repository;
> 		this.queries = queries;
> 		this.statuses = new ArrayList<IStatus>();
>+		this.monitor = new DelegatingProgressMonitor();
> 	}
> 
> 	@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);
> 
>@@ -319,4 +325,7 @@
> 		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.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:00:28 -0000
>@@ -25,6 +25,8 @@
> 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.net.Policy;
> import org.eclipse.mylyn.internal.tasks.core.ITasksCoreConstants;
> import org.eclipse.mylyn.internal.tasks.core.RepositoryQuery;
>@@ -53,6 +55,8 @@
> 
> 	private final IRepositoryModel tasksModel;
> 
>+	protected final IDelegatingProgressMonitor monitor;
>+
> 	public SynchronizeRepositoriesJob(TaskList taskList, TaskDataManager taskDataManager, IRepositoryModel tasksModel,
> 			IRepositoryManager repositoryManager) {
> 		super(Messages.SynchronizeRepositoriesJob_Synchronizing_Task_List);
>@@ -60,6 +64,7 @@
> 		this.taskDataManager = taskDataManager;
> 		this.tasksModel = tasksModel;
> 		this.repositoryManager = repositoryManager;
>+		this.monitor = new DelegatingProgressMonitor();
> 	}
> 
> 	public Collection<TaskRepository> getRepositories() {
>@@ -75,7 +80,8 @@
> 	}
> 
> 	@Override
>-	public IStatus run(IProgressMonitor monitor) {
>+	public IStatus run(IProgressMonitor jobMonitor) {
>+		monitor.attach(jobMonitor);
> 		// get the current list of repositories
> 		Set<TaskRepository> repositories = this.repositories;
> 		if (repositories == null) {
>@@ -182,4 +188,8 @@
> 			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.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:00:28 -0000
>@@ -27,6 +27,8 @@
> 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;
>@@ -79,6 +81,8 @@
> 
> 	private final List<IStatus> statuses;
> 
>+	protected 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);
>@@ -96,10 +100,12 @@
> 		this.allTasks = tasks;
> 		this.statuses = new ArrayList<IStatus>();
> 		setRule(new MutexSchedulingRule());
>+		this.monitor = new DelegatingProgressMonitor();
> 	}
> 
> 	@Override
>-	public IStatus run(IProgressMonitor monitor) {
>+	public IStatus run(IProgressMonitor jobMonitor) {
>+		monitor.attach(jobMonitor);
> 		try {
> 			if (taskRepository == null) {
> 				try {
>@@ -147,7 +153,8 @@
> 		synchronizedTaskRelations(monitor, relationsByTaskId);
> 	}
> 
>-	public void synchronizedTaskRelations(IProgressMonitor monitor, Map<String, TaskRelation[]> 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);
>@@ -327,4 +334,7 @@
> 		return Collections.unmodifiableCollection(statuses);
> 	}
> 
>+	public IDelegatingProgressMonitor getMonitor() {
>+		return monitor;
>+	}
> }

Actions: View | Diff

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