NEW - bug 336430: separate Tasks framework from Context

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

Change-Id: Id47587b48f071ccbd2f3229eda0984db5524dcb2

2 files changed, 18 insertions, 5 deletions

diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/context/DefaultTaskContextStore.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/context/DefaultTaskContextStore.java
index 882362e98..394b42bb9 100644
--- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/context/DefaultTaskContextStore.java
+++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/context/DefaultTaskContextStore.java
@@ -15,6 +15,7 @@ import java.io.File;
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
 
+import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.mylyn.commons.core.StatusHandler;
@@ -34,8 +35,8 @@ public class DefaultTaskContextStore extends AbstractTaskContextStore {
 	private File contextDirectory;
 
 	@Override
-	public void cloneContext(ITask sourceTask, ITask destinationTask) {
-		// ignore
+	public IAdaptable cloneContext(ITask sourceTask, ITask destinationTask) {
+		return null;
 	}
 
 	@Override
@@ -90,4 +91,9 @@ public class DefaultTaskContextStore extends AbstractTaskContextStore {
 		this.contextDirectory = directory;
 	}
 
+	@Override
+	public void mergeContext(ITask sourceTask, ITask targetTask) {
+		// ignore		
+	}
+
 }
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 542d87d8f..91b85bc02 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
@@ -13,10 +13,11 @@ package org.eclipse.mylyn.tasks.core.context;
 
 import java.io.File;
 
+import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.mylyn.tasks.core.ITask;
 
 /**
- * A store for persisting task context.
+ * A store for persisting task contexts.
  * 
  * @author Steffen Pingel
  * @since 3.7
@@ -27,14 +28,15 @@ 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.
 	 * 
+	 * @return result of the clone operation
 	 * @since 3.7
 	 */
-	public abstract void cloneContext(ITask sourceTask, ITask destinationTask);
+	public abstract IAdaptable cloneContext(ITask sourceTask, ITask destinationTask);
 
 	/**
 	 * @since 3.7
 	 */
-	public abstract void deleteContext(ITask oldTask);
+	public abstract void deleteContext(ITask task);
 
 	/**
 	 * Return the location of the context for <code>task</code>.
@@ -64,4 +66,9 @@ public abstract class AbstractTaskContextStore {
 	 */
 	public abstract void setContextDirectory(File contextStoreDir);
 
+	/**
+	 * @since 3.7
+	 */
+	public abstract void mergeContext(ITask sourceTask, ITask targetTask);
+
 }