1 files changed, 30 insertions, 11 deletions

diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/context/AbstractTaskContextStore.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/context/AbstractTaskContextStore.java
index 60d7babde..613369ae1 100644
--- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/context/AbstractTaskContextStore.java
+++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/context/AbstractTaskContextStore.java
@@ -15,6 +15,7 @@ import java.io.File;
 
 import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.mylyn.tasks.core.ITask;
+import org.eclipse.mylyn.tasks.core.TaskRepository;
 
 /**
  * A store for persisting task contexts.
@@ -25,24 +26,24 @@ import org.eclipse.mylyn.tasks.core.ITask;
 public abstract class AbstractTaskContextStore {
 
 	/**
-	 * Copies the context from <code>sourceTask</code> to <code>destinationTask</code>. Creates a new context if a
-	 * <code>sourceTask</code> does not have a context.
+	 * Clears the context of <code>task</code>.
 	 * 
-	 * @return result of the copy operation
 	 * @since 3.7
 	 */
-	public abstract IAdaptable copyContext(ITask sourceTask, ITask destinationTask);
+	public abstract void clearContext(ITask task);
 
 	/**
-	 * Moves the context from <code>sourceTask</code> to <code>destinationTask</code>. Creates a new context if a
+	 * Copies the context from <code>sourceTask</code> to <code>destinationTask</code>. Creates a new context if a
 	 * <code>sourceTask</code> does not have a context.
 	 * 
-	 * @return result of the move operation
+	 * @return result of the copy operation
 	 * @since 3.7
 	 */
-	public abstract IAdaptable moveContext(ITask sourceTask, ITask destinationTask);
+	public abstract IAdaptable copyContext(ITask sourceTask, ITask destinationTask);
 
 	/**
+	 * Deletes the context of <code>task</code>.
+	 * 
 	 * @since 3.7
 	 */
 	public abstract void deleteContext(ITask task);
@@ -63,21 +64,39 @@ public abstract class AbstractTaskContextStore {
 	/**
 	 * @since 3.7
 	 */
-	public abstract void refactorRepositoryUrl(String oldRepositoryUrl, String newRepositoryUrl);
+	public abstract void mergeContext(ITask sourceTask, ITask targetTask);
+
+	/**
+	 * Moves the context from <code>sourceTask</code> to <code>destinationTask</code>. Creates a new context if a
+	 * <code>sourceTask</code> does not have a context.
+	 * 
+	 * @return result of the move operation
+	 * @since 3.7
+	 */
+	public abstract IAdaptable moveContext(ITask sourceTask, ITask destinationTask);
 
 	/**
 	 * @since 3.7
 	 */
-	public abstract void saveActiveContext();
+	public abstract void refactorRepositoryUrl(TaskRepository repository, String oldRepositoryUrl,
+			String newRepositoryUrl);
+
+	/**
+	 * Returns an object for persisting task related information. The object needs to be released when it is no longer
+	 * used.
+	 */
+	//public abstract ICommonStorable getStorable(ITask task);
 
 	/**
 	 * @since 3.7
 	 */
-	public abstract void setContextDirectory(File contextStoreDir);
+	public abstract void saveActiveContext();
 
 	/**
+	 * Sets the location of task file.
+	 * 
 	 * @since 3.7
 	 */
-	public abstract void mergeContext(ITask sourceTask, ITask targetTask);
+	public abstract void setDirectory(File directory);
 
 }