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

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

4 files changed, 22 insertions, 22 deletions

diff --git a/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/TracAttachmentHandler.java b/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/TracAttachmentHandler.java
index e1e469bd4..c2fb82091 100644
--- a/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/TracAttachmentHandler.java
+++ b/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/TracAttachmentHandler.java
@@ -18,7 +18,7 @@ import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.mylyn.internal.trac.core.model.TracTicket;
 import org.eclipse.mylyn.tasks.core.AbstractAttachmentHandler;
-import org.eclipse.mylyn.tasks.core.AbstractRepositoryTask;
+import org.eclipse.mylyn.tasks.core.AbstractTask;
 import org.eclipse.mylyn.tasks.core.ITaskAttachment;
 import org.eclipse.mylyn.tasks.core.RepositoryAttachment;
 import org.eclipse.mylyn.tasks.core.RepositoryStatus;
@@ -54,7 +54,7 @@ public class TracAttachmentHandler extends AbstractAttachmentHandler {
 		}
 	}
 
-	public void uploadAttachment(TaskRepository repository, AbstractRepositoryTask task, ITaskAttachment attachment,
+	public void uploadAttachment(TaskRepository repository, AbstractTask task, ITaskAttachment attachment,
 			String comment, IProgressMonitor monitor) throws CoreException {
 		if (!TracRepositoryConnector.hasAttachmentSupport(repository, task)) {
 			throw new CoreException(new RepositoryStatus(repository.getUrl(), IStatus.INFO, TracCorePlugin.PLUGIN_ID,
@@ -80,14 +80,14 @@ public class TracAttachmentHandler extends AbstractAttachmentHandler {
 		}
 	}
 
-	public boolean canDownloadAttachment(TaskRepository repository, AbstractRepositoryTask task) {
+	public boolean canDownloadAttachment(TaskRepository repository, AbstractTask task) {
 		if (repository == null) {
 			return false;
 		}
 		return TracRepositoryConnector.hasAttachmentSupport(repository, task);
 	}
 
-	public boolean canUploadAttachment(TaskRepository repository, AbstractRepositoryTask task) {
+	public boolean canUploadAttachment(TaskRepository repository, AbstractTask task) {
 		if (repository == null) {
 			return false;
 		}
diff --git a/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/TracRepositoryConnector.java b/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/TracRepositoryConnector.java
index 4e2041081..fe35c47f5 100644
--- a/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/TracRepositoryConnector.java
+++ b/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/TracRepositoryConnector.java
@@ -31,7 +31,7 @@ import org.eclipse.mylyn.internal.trac.core.model.TracTicket.Key;
 import org.eclipse.mylyn.internal.trac.core.util.TracUtils;
 import org.eclipse.mylyn.tasks.core.AbstractRepositoryConnector;
 import org.eclipse.mylyn.tasks.core.AbstractRepositoryQuery;
-import org.eclipse.mylyn.tasks.core.AbstractRepositoryTask;
+import org.eclipse.mylyn.tasks.core.AbstractTask;
 import org.eclipse.mylyn.tasks.core.IAttachmentHandler;
 import org.eclipse.mylyn.tasks.core.ITaskDataHandler;
 import org.eclipse.mylyn.tasks.core.QueryHitCollector;
@@ -111,7 +111,7 @@ public class TracRepositoryConnector extends AbstractRepositoryConnector {
 	}
 
 	@Override
-	public void updateTaskFromRepository(TaskRepository repository, AbstractRepositoryTask repositoryTask,
+	public void updateTaskFromRepository(TaskRepository repository, AbstractTask repositoryTask,
 			IProgressMonitor monitor) throws CoreException {
 		if (repositoryTask instanceof TracTask) {
 			try {
@@ -138,7 +138,7 @@ public class TracRepositoryConnector extends AbstractRepositoryConnector {
 			}
 
 			for (TracTicket ticket : tickets) {
-				AbstractRepositoryTask task = createTask(repository.getUrl(), ticket.getId() + "", "");
+				AbstractTask task = createTask(repository.getUrl(), ticket.getId() + "", "");
 				updateTaskFromTicket((TracTask) task, ticket, false);
 				resultCollector.accept(task);
 			}
@@ -150,8 +150,8 @@ public class TracRepositoryConnector extends AbstractRepositoryConnector {
 	}
 
 	@Override
-	public Set<AbstractRepositoryTask> getChangedSinceLastSync(TaskRepository repository,
-			Set<AbstractRepositoryTask> tasks, IProgressMonitor monitor) throws CoreException {
+	public Set<AbstractTask> getChangedSinceLastSync(TaskRepository repository,
+			Set<AbstractTask> tasks, IProgressMonitor monitor) throws CoreException {
 		if (repository.getSyncTimeStamp() == null) {
 			return tasks;
 		}
@@ -172,9 +172,9 @@ public class TracRepositoryConnector extends AbstractRepositoryConnector {
 			client = getClientManager().getRepository(repository);
 			Set<Integer> ids = client.getChangedTickets(since);
 
-			Set<AbstractRepositoryTask> result = new HashSet<AbstractRepositoryTask>();
+			Set<AbstractTask> result = new HashSet<AbstractTask>();
 			if (!ids.isEmpty()) {
-				for (AbstractRepositoryTask task : tasks) {
+				for (AbstractTask task : tasks) {
 					Integer id = getTicketId(task.getTaskId());
 					if (ids.contains(id)) {
 						result.add(task);
@@ -189,9 +189,9 @@ public class TracRepositoryConnector extends AbstractRepositoryConnector {
 	}
 
 	@Override
-	public AbstractRepositoryTask createTaskFromExistingId(TaskRepository repository, String taskId,
+	public AbstractTask createTaskFromExistingId(TaskRepository repository, String taskId,
 			IProgressMonitor monitor) throws CoreException {
-		AbstractRepositoryTask task = super.createTaskFromExistingId(repository, taskId, monitor);
+		AbstractTask task = super.createTaskFromExistingId(repository, taskId, monitor);
 		if (task == null) {
 			// repository does not support XML-RPC, fall back to web access
 			try {
@@ -210,13 +210,13 @@ public class TracRepositoryConnector extends AbstractRepositoryConnector {
 		return task;
 	}
 
-	public AbstractRepositoryTask createTask(String repositoryUrl, String id, String summary) {
+	public AbstractTask createTask(String repositoryUrl, String id, String summary) {
 		TracTask tracTask = new TracTask(repositoryUrl, id, summary);
 		tracTask.setCreationDate(new Date());
 		return tracTask;
 	}
 
-	public void updateTaskFromTaskData(TaskRepository repository, AbstractRepositoryTask repositoryTask,
+	public void updateTaskFromTaskData(TaskRepository repository, AbstractTask repositoryTask,
 			RepositoryTaskData taskData) {
 		if (taskData != null) {
 			repositoryTask.setSummary(taskData.getSummary());
@@ -281,11 +281,11 @@ public class TracRepositoryConnector extends AbstractRepositoryConnector {
 		return Version.XML_RPC.name().equals(repository.getVersion());
 	}
 
-	public static boolean hasRichEditor(TaskRepository repository, AbstractRepositoryTask task) {
+	public static boolean hasRichEditor(TaskRepository repository, AbstractTask task) {
 		return hasRichEditor(repository);
 	}
 
-	public static boolean hasAttachmentSupport(TaskRepository repository, AbstractRepositoryTask task) {
+	public static boolean hasAttachmentSupport(TaskRepository repository, AbstractTask task) {
 		return Version.XML_RPC.name().equals(repository.getVersion());
 	}
 
diff --git a/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/TracTask.java b/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/TracTask.java
index 4ce863c0b..6ed7aec81 100644
--- a/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/TracTask.java
+++ b/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/TracTask.java
@@ -11,12 +11,12 @@
 
 package org.eclipse.mylyn.internal.trac.core;
 
-import org.eclipse.mylyn.tasks.core.AbstractRepositoryTask;
+import org.eclipse.mylyn.tasks.core.AbstractTask;
 
 /**
  * @author Steffen Pingel
  */
-public class TracTask extends AbstractRepositoryTask {
+public class TracTask extends AbstractTask {
 
 	public enum PriorityLevel {
 		BLOCKER, CRITICAL, MAJOR, MINOR, TRIVIAL;
@@ -152,7 +152,7 @@ public class TracTask extends AbstractRepositoryTask {
 				return priority.toString();
 			}
 		}
-		return AbstractRepositoryTask.PriorityLevel.P3.toString();
+		return AbstractTask.PriorityLevel.P3.toString();
 	}
 
 	public static boolean isCompleted(String tracStatus) {
diff --git a/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/TracTaskDataHandler.java b/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/TracTaskDataHandler.java
index 42ac7109d..845cc19b4 100644
--- a/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/TracTaskDataHandler.java
+++ b/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/TracTaskDataHandler.java
@@ -31,7 +31,7 @@ import org.eclipse.mylyn.internal.trac.core.model.TracTicketField;
 import org.eclipse.mylyn.internal.trac.core.model.TracTicket.Key;
 import org.eclipse.mylyn.internal.trac.core.util.TracUtils;
 import org.eclipse.mylyn.tasks.core.AbstractAttributeFactory;
-import org.eclipse.mylyn.tasks.core.AbstractRepositoryTask;
+import org.eclipse.mylyn.tasks.core.AbstractTask;
 import org.eclipse.mylyn.tasks.core.ITaskDataHandler;
 import org.eclipse.mylyn.tasks.core.RepositoryAttachment;
 import org.eclipse.mylyn.tasks.core.RepositoryOperation;
@@ -68,7 +68,7 @@ public class TracTaskDataHandler implements ITaskDataHandler {
 
 		try {
 			RepositoryTaskData data = new RepositoryTaskData(attributeFactory, TracCorePlugin.REPOSITORY_KIND,
-					repository.getUrl(), id + "", AbstractRepositoryTask.DEFAULT_TASK_KIND);
+					repository.getUrl(), id + "", AbstractTask.DEFAULT_TASK_KIND);
 			ITracClient client = connector.getClientManager().getRepository(repository);
 			client.updateAttributes(new NullProgressMonitor(), false);
 			TracTicket ticket = client.getTicket(id);