REOPENED - bug 124321: [api] merge local tasks with repository tasks

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

10 files changed, 32 insertions, 12 deletions

diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/LocalRepositoryConnector.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/LocalRepositoryConnector.java
index baca70ac3..d3180777f 100644
--- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/LocalRepositoryConnector.java
+++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/LocalRepositoryConnector.java
@@ -53,7 +53,7 @@ public class LocalRepositoryConnector extends AbstractRepositoryConnector {
 
 	@Override
 	public AbstractRepositoryTask createTask(String repositoryUrl, String id, String summary) {
-		return new LocalTask(repositoryUrl, id, summary);
+		return new LocalTask(id, summary);
 	}
 
 	@Override
diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/LocalTaskExternalizer.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/LocalTaskExternalizer.java
index d91d620e9..fc1eb3f3c 100644
--- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/LocalTaskExternalizer.java
+++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/LocalTaskExternalizer.java
@@ -37,7 +37,7 @@ public class LocalTaskExternalizer extends DelegatingTaskExternalizer {
 //		} else {
 //			throw new TaskExternalizationException("Handle not stored for task");
 //		}
-		LocalTask task = new LocalTask(repositoryUrl, taskId, summary);
+		LocalTask task = new LocalTask(taskId, summary);
 		return task;
 	}
 
diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/WebTask.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/WebTask.java
index 8f1fd2990..ab48b80b8 100644
--- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/WebTask.java
+++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/WebTask.java
@@ -54,5 +54,11 @@ public class WebTask extends AbstractRepositoryTask {
 	public String getOwner() {
 		return UNKNOWN_OWNER;
 	}
+
+	@Override
+	public boolean isLocal() {
+		// ignore
+		return false;
+	}
 	
 }
diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/AbstractRepositoryQuery.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/AbstractRepositoryQuery.java
index 0e11bd1cf..7e85a7150 100644
--- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/AbstractRepositoryQuery.java
+++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/AbstractRepositoryQuery.java
@@ -14,6 +14,7 @@ import java.util.HashSet;
 import java.util.Set;
 
 import org.eclipse.core.runtime.IStatus;
+import org.eclipse.mylyn.tasks.core.AbstractRepositoryTask.PriorityLevel;
 
 /**
  * @author Mik Kersten
@@ -48,9 +49,9 @@ public abstract class AbstractRepositoryQuery extends AbstractTaskContainer {
 
 	public synchronized String getPriority() {
 		if (super.isEmpty()) {
-			return Task.PriorityLevel.P1.toString();
+			return PriorityLevel.P1.toString();
 		}
-		String highestPriority = Task.PriorityLevel.P5.toString();
+		String highestPriority = PriorityLevel.P5.toString();
 		for (AbstractRepositoryTask hit : getHits()) {
 			if (highestPriority.compareTo(hit.getPriority()) > 0) {
 				highestPriority = hit.getPriority();
diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/AbstractRepositoryTask.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/AbstractRepositoryTask.java
index 4e7542bb5..cc1fff1b0 100644
--- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/AbstractRepositoryTask.java
+++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/AbstractRepositoryTask.java
@@ -157,14 +157,15 @@ public abstract class AbstractRepositoryTask extends Task {
 	protected String kind = DEFAULT_TASK_KIND;
 	
 	public AbstractRepositoryTask(String repositoryUrl, String taskId, String summary) {
+		super(RepositoryTaskHandleUtil.getHandle(repositoryUrl, taskId));
 		this.repositoryUrl = repositoryUrl;
 		this.taskId = taskId;
 		this.summary = summary;
 	}
 
-	public final String getHandleIdentifier() {
-		return RepositoryTaskHandleUtil.getHandle(repositoryUrl, taskId);
-	}
+//	public final String getHandleIdentifier() {
+//		return RepositoryTaskHandleUtil.getHandle(repositoryUrl, taskId);
+//	}
 
 	public abstract String getRepositoryKind();
 
diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/DelegatingTaskExternalizer.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/DelegatingTaskExternalizer.java
index fd809278a..7fb436637 100644
--- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/DelegatingTaskExternalizer.java
+++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/DelegatingTaskExternalizer.java
@@ -22,6 +22,7 @@ import java.util.Locale;
 import org.eclipse.mylyn.core.MylarStatusHandler;
 import org.eclipse.mylyn.internal.tasks.core.LocalTask;
 import org.eclipse.mylyn.internal.tasks.core.RepositoryTaskHandleUtil;
+import org.eclipse.mylyn.tasks.core.AbstractRepositoryTask.PriorityLevel;
 import org.eclipse.mylyn.tasks.core.AbstractRepositoryTask.RepositoryTaskSyncState;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
@@ -48,7 +49,7 @@ import org.w3c.dom.NodeList;
  */
 public class DelegatingTaskExternalizer implements ITaskListExternalizer {
 
-	private static final String DEFAULT_PRIORITY = Task.PriorityLevel.P3.toString();
+	private static final String DEFAULT_PRIORITY = PriorityLevel.P3.toString();
 
 	private static final String DATE_FORMAT = "yyyy-MM-dd HH:mm:ss.S z";
 
diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/Task.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/Task.java
index 3b42dc465..c5c5c1eee 100644
--- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/Task.java
+++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/Task.java
@@ -17,6 +17,11 @@ package org.eclipse.mylyn.tasks.core;
  */
 public abstract class Task extends AbstractTaskContainer implements ITask {
 
+	public Task(String handleAndDescription) {
+		super(handleAndDescription);
+		// ignore
+	}
+
 //	private static final String REPOSITORY_KIND_LOCAL = "local";
 //
 //	public static final String DEFAULT_TASK_KIND = "task";
diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/TaskArchive.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/TaskArchive.java
index deca9748e..9ad5cf1cc 100644
--- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/TaskArchive.java
+++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/TaskArchive.java
@@ -11,6 +11,8 @@
 
 package org.eclipse.mylyn.tasks.core;
 
+import org.eclipse.mylyn.tasks.core.AbstractRepositoryTask.PriorityLevel;
+
 
 
 /**
@@ -27,7 +29,7 @@ public class TaskArchive extends AbstractTaskContainer {
 	}
 
 	public String getPriority() {
-		return Task.PriorityLevel.P1.toString();
+		return PriorityLevel.P1.toString();
 	}
 
 	@Override
diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/TaskCategory.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/TaskCategory.java
index d448c018a..260772231 100644
--- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/TaskCategory.java
+++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/TaskCategory.java
@@ -15,6 +15,8 @@ package org.eclipse.mylyn.tasks.core;
 
 import java.util.Set;
 
+import org.eclipse.mylyn.tasks.core.AbstractRepositoryTask.PriorityLevel;
+
 
 /**
  * @author Mik Kersten
@@ -26,10 +28,10 @@ public class TaskCategory extends AbstractTaskContainer {
 	}	
 
 	public String getPriority() {
-		String highestPriority = Task.PriorityLevel.P5.toString();
+		String highestPriority = PriorityLevel.P5.toString();
 		Set<ITask> tasks = getChildren();
 		if (tasks.isEmpty()) {
-			return Task.PriorityLevel.P1.toString();
+			return PriorityLevel.P1.toString();
 		}
 		for (ITask task : tasks) {
 			if (highestPriority.compareTo(task.getPriority()) > 0) {
diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/UncategorizedCategory.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/UncategorizedCategory.java
index 0c3654786..ecc8f98b1 100644
--- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/UncategorizedCategory.java
+++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/UncategorizedCategory.java
@@ -11,6 +11,8 @@
 
 package org.eclipse.mylyn.tasks.core;
 
+import org.eclipse.mylyn.tasks.core.AbstractRepositoryTask.PriorityLevel;
+
 /**
  * @author Rob Elves
  */
@@ -25,7 +27,7 @@ public class UncategorizedCategory extends AbstractTaskContainer {
 	}
 
 	public String getPriority() {
-		return Task.PriorityLevel.P1.toString();
+		return PriorityLevel.P1.toString();
 	}
 
 	@Override