From f34080f8b9904a4e4b9800c55d479fb56dec1418 Mon Sep 17 00:00:00 2001
From: Sam Davis
Date: Fri, 24 Apr 2015 10:52:40 -0700
Subject: 465346: support partial repository configuration update

Change-Id: Ie970355deaa35b7916ec32d4947f64f1db1ed28e
Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=465346
---
 .../mylyn/internal/tasks/core/TaskJobFactory.java   |  2 +-
 .../core/sync/UpdateRepositoryConfigurationJob.java | 21 ++++++++++++++++-----
 2 files changed, 17 insertions(+), 6 deletions(-)

(limited to 'org.eclipse.mylyn.tasks.core/src')

diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/TaskJobFactory.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/TaskJobFactory.java
index 3fbab5c51..2539e7db3 100644
--- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/TaskJobFactory.java
+++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/TaskJobFactory.java
@@ -165,7 +165,7 @@ public class TaskJobFactory implements ITaskJobFactory {
 	public TaskJob createUpdateRepositoryConfigurationJob(final AbstractRepositoryConnector connector,
 			final TaskRepository taskRepository, final ITask task) {
 		UpdateRepositoryConfigurationJob updateJob = new UpdateRepositoryConfigurationJob(
-				Messages.TaskJobFactory_Refreshing_repository_configuration, taskRepository, connector);
+				Messages.TaskJobFactory_Refreshing_repository_configuration, taskRepository, task, connector);
 		updateJob.setPriority(Job.INTERACTIVE);
 		updateJob.setRule(new ObjectSchedulingRule(taskRepository));
 		updateJob.setUser(true);
diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/sync/UpdateRepositoryConfigurationJob.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/sync/UpdateRepositoryConfigurationJob.java
index 44bab3c92..5fc0d9fcc 100644
--- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/sync/UpdateRepositoryConfigurationJob.java
+++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/sync/UpdateRepositoryConfigurationJob.java
@@ -15,7 +15,10 @@ import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
+import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.jdt.annotation.Nullable;
 import org.eclipse.mylyn.tasks.core.AbstractRepositoryConnector;
+import org.eclipse.mylyn.tasks.core.ITask;
 import org.eclipse.mylyn.tasks.core.TaskRepository;
 import org.eclipse.mylyn.tasks.core.sync.TaskJob;
 
@@ -26,11 +29,19 @@ public class UpdateRepositoryConfigurationJob extends TaskJob {
 
 	private IStatus error;
 
-	public UpdateRepositoryConfigurationJob(String name, TaskRepository repository,
-			AbstractRepositoryConnector connector) {
+	private final ITask task;
+
+	public UpdateRepositoryConfigurationJob(@NonNull String name, @NonNull TaskRepository repository,
+			@NonNull AbstractRepositoryConnector connector) {
+		this(name, repository, null, connector);
+	}
+
+	public UpdateRepositoryConfigurationJob(@NonNull String name, @NonNull TaskRepository repository,
+			@Nullable ITask task, @NonNull AbstractRepositoryConnector connector) {
 		super(name);
-		this.connector = connector;
 		this.repository = repository;
+		this.task = task;
+		this.connector = connector;
 	}
 
 	@Override
@@ -39,11 +50,11 @@ public class UpdateRepositoryConfigurationJob extends TaskJob {
 	}
 
 	@Override
-	protected IStatus run(IProgressMonitor monitor) {
+	protected IStatus run(@NonNull IProgressMonitor monitor) {
 		monitor.beginTask(Messages.UpdateRepositoryConfigurationJob_Receiving_configuration, 100);
 		try {
 			try {
-				connector.updateRepositoryConfiguration(repository, subMonitorFor(monitor, 100));
+				connector.updateRepositoryConfiguration(repository, task, subMonitorFor(monitor, 100));
 			} catch (CoreException e) {
 				error = e.getStatus();
 			}
-- 
cgit v1.2.3