NEW - bug 358554: [api] provide an extensible store for task-related

information 
https://bugs.eclipse.org/bugs/show_bug.cgi?id=358554

Change-Id: Iebf65bc3560a3b3240ff86eb453f1c76391d972a

3 files changed, 12 insertions, 11 deletions

diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/RefactorRepositoryUrlOperation.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/RefactorRepositoryUrlOperation.java
index 2ab9c8071..798d587b6 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/RefactorRepositoryUrlOperation.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/RefactorRepositoryUrlOperation.java
@@ -19,6 +19,7 @@ import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.mylyn.internal.tasks.core.ITasksCoreConstants;
 import org.eclipse.mylyn.internal.tasks.core.data.TaskDataManager;
 import org.eclipse.mylyn.tasks.core.ITask;
+import org.eclipse.mylyn.tasks.core.TaskRepository;
 
 /**
  * @author Rob Elves
@@ -29,11 +30,18 @@ public class RefactorRepositoryUrlOperation extends TaskListModifyOperation {
 
 	private final String newUrl;
 
+	private final TaskRepository repository;
+
 	public RefactorRepositoryUrlOperation(String oldUrl, String newUrl) {
+		this(null, oldUrl, newUrl);
+	}
+
+	public RefactorRepositoryUrlOperation(TaskRepository repository, String oldUrl, String newUrl) {
 		super(ITasksCoreConstants.ROOT_SCHEDULING_RULE);
 		Assert.isNotNull(oldUrl);
 		Assert.isNotNull(newUrl);
 		Assert.isTrue(!oldUrl.equals(newUrl));
+		this.repository = repository;
 		this.oldUrl = oldUrl;
 		this.newUrl = newUrl;
 	}
@@ -46,7 +54,7 @@ public class RefactorRepositoryUrlOperation extends TaskListModifyOperation {
 			monitor.beginTask(Messages.RefactorRepositoryUrlOperation_Repository_URL_update, IProgressMonitor.UNKNOWN);
 			refactorOfflineHandles(oldUrl, newUrl);
 			getTaskList().refactorRepositoryUrl(oldUrl, newUrl);
-			TasksUiPlugin.getContextStore().refactorRepositoryUrl(oldUrl, newUrl);
+			TasksUiPlugin.getContextStore().refactorRepositoryUrl(repository, oldUrl, newUrl);
 			TasksUiPlugin.getTaskActivityMonitor().reloadActivityTime();
 		} finally {
 			monitor.done();
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TasksUiPlugin.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TasksUiPlugin.java
index b3a80b4f8..7ae9bc85a 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TasksUiPlugin.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TasksUiPlugin.java
@@ -865,7 +865,7 @@ public class TasksUiPlugin extends AbstractUIPlugin {
 	public void initializeDataSources() {
 		taskDataManager.setDataPath(getDataDirectory());
 		externalizationManager.setRootFolderPath(getDataDirectory());
-		getContextStore().setContextDirectory(getContextStoreDir());
+		getContextStore().setDirectory(new File(getDataDirectory(), "tasks")); //$NON-NLS-1$
 
 		externalizationManager.load();
 		// TODO: Move management of template repositories to TaskRepositoryManager
@@ -914,14 +914,6 @@ public class TasksUiPlugin extends AbstractUIPlugin {
 		}
 	}
 
-	private File getContextStoreDir() {
-		File storeFile = new File(getDataDirectory(), ITasksCoreConstants.CONTEXTS_DIRECTORY);
-		if (!storeFile.exists()) {
-			storeFile.mkdirs();
-		}
-		return storeFile;
-	}
-
 	@SuppressWarnings("deprecation")
 	private void initializePreferences(IPreferenceStore store) {
 		store.setDefault(ITasksUiPreferenceConstants.PREF_DATA_DIR, getDefaultDataDirectory());
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/EditRepositoryWizard.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/EditRepositoryWizard.java
index f5e76463f..7ede44201 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/EditRepositoryWizard.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/EditRepositoryWizard.java
@@ -59,7 +59,8 @@ public class EditRepositoryWizard extends Wizard implements INewWizard {
 			if (oldUrl != null && newUrl != null && !oldUrl.equals(newUrl)) {
 				TasksUi.getTaskActivityManager().deactivateActiveTask();
 
-				RefactorRepositoryUrlOperation operation = new RefactorRepositoryUrlOperation(oldUrl, newUrl);
+				RefactorRepositoryUrlOperation operation = new RefactorRepositoryUrlOperation(repository, oldUrl,
+						newUrl);
 				try {
 					getContainer().run(true, false, operation);
 				} catch (InvocationTargetException e) {