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

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

19 files changed, 190 insertions, 190 deletions

diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/RepositoryTaskSynchronizationTest.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/RepositoryTaskSynchronizationTest.java
index afcc4025b..aea04f07d 100644
--- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/RepositoryTaskSynchronizationTest.java
+++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/RepositoryTaskSynchronizationTest.java
@@ -17,12 +17,12 @@ import junit.framework.TestCase;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
 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.RepositoryTaskAttribute;
 import org.eclipse.mylyn.tasks.core.RepositoryTaskData;
 import org.eclipse.mylyn.tasks.core.TaskRepository;
-import org.eclipse.mylyn.tasks.core.AbstractRepositoryTask.RepositoryTaskSyncState;
+import org.eclipse.mylyn.tasks.core.AbstractTask.RepositoryTaskSyncState;
 import org.eclipse.mylyn.tasks.tests.connector.MockAttributeFactory;
 import org.eclipse.mylyn.tasks.tests.connector.MockRepositoryConnector;
 import org.eclipse.mylyn.tasks.tests.connector.MockRepositoryTask;
@@ -61,9 +61,9 @@ public class RepositoryTaskSynchronizationTest extends TestCase {
 	}
 
 	public void testHasIncoming() {
-		AbstractRepositoryTask task = new MockRepositoryTask(HANDLE1);
+		AbstractTask task = new MockRepositoryTask(HANDLE1);
 		RepositoryTaskData taskData = new RepositoryTaskData(new MockAttributeFactory(), connector.getRepositoryType(),
-				URL1, "1", AbstractRepositoryTask.DEFAULT_TASK_KIND);
+				URL1, "1", AbstractTask.DEFAULT_TASK_KIND);
 		task.setLastSyncDateStamp("never");
 
 		assertTrue(TasksUiPlugin.getSynchronizationManager().checkHasIncoming(task, taskData));
@@ -86,7 +86,7 @@ public class RepositoryTaskSynchronizationTest extends TestCase {
 		 */
 
 		// Test unforced
-		AbstractRepositoryTask task = primeTaskAndRepository(RepositoryTaskSyncState.INCOMING,
+		AbstractTask task = primeTaskAndRepository(RepositoryTaskSyncState.INCOMING,
 				RepositoryTaskSyncState.INCOMING);
 		RepositoryTaskData taskData = TasksUiPlugin.getDefault().getTaskDataManager().getNewTaskData(
 				task.getHandleIdentifier());
@@ -101,7 +101,7 @@ public class RepositoryTaskSynchronizationTest extends TestCase {
 		// and again...
 
 		RepositoryTaskData taskData3 = new RepositoryTaskData(new MockAttributeFactory(),
-				connector.getRepositoryType(), URL1, "1", AbstractRepositoryTask.DEFAULT_TASK_KIND);
+				connector.getRepositoryType(), URL1, "1", AbstractTask.DEFAULT_TASK_KIND);
 		taskData3.setAttributeValue(RepositoryTaskAttribute.DATE_MODIFIED, DATE_STAMP_3);
 		TasksUiPlugin.getSynchronizationManager().saveIncoming(task, taskData3, false);
 		// last modified stamp not updated until user synchronizes (newdata ==
@@ -125,7 +125,7 @@ public class RepositoryTaskSynchronizationTest extends TestCase {
 		// When not forced, tasks with incoming state should remain in incoming
 		// state if
 		// if new data has same date stamp as old data.
-		AbstractRepositoryTask task = primeTaskAndRepository(RepositoryTaskSyncState.INCOMING,
+		AbstractTask task = primeTaskAndRepository(RepositoryTaskSyncState.INCOMING,
 				RepositoryTaskSyncState.SYNCHRONIZED);
 		assertEquals(DATE_STAMP_1, task.getLastSyncDateStamp());
 		TasksUiPlugin.getSynchronizationManager().saveIncoming(task, newData, false);
@@ -158,7 +158,7 @@ public class RepositoryTaskSynchronizationTest extends TestCase {
 	// // gets to a synchronized state if the last mod time isn't set. It is now
 	// being set
 	// // if found to be null.
-	// AbstractRepositoryTask task =
+	// AbstractTask task =
 	// primeTaskAndRepository(RepositoryTaskSyncState.INCOMING,
 	// RepositoryTaskSyncState.SYNCHRONIZED);
 	// assertEquals(DATE_STAMP_1, task.getLastSyncDateStamp());
@@ -183,7 +183,7 @@ public class RepositoryTaskSynchronizationTest extends TestCase {
 	 */
 
 	public void testSynchronizedToIncoming() {
-		AbstractRepositoryTask task = primeTaskAndRepository(RepositoryTaskSyncState.SYNCHRONIZED,
+		AbstractTask task = primeTaskAndRepository(RepositoryTaskSyncState.SYNCHRONIZED,
 				RepositoryTaskSyncState.INCOMING);
 		assertEquals(DATE_STAMP_1, task.getLastSyncDateStamp());
 		TasksUiPlugin.getSynchronizationManager().saveIncoming(task, newData, false);
@@ -195,7 +195,7 @@ public class RepositoryTaskSynchronizationTest extends TestCase {
 	}
 
 	public void testSynchronizedToSynchronized() {
-		AbstractRepositoryTask task = primeTaskAndRepository(RepositoryTaskSyncState.SYNCHRONIZED,
+		AbstractTask task = primeTaskAndRepository(RepositoryTaskSyncState.SYNCHRONIZED,
 				RepositoryTaskSyncState.SYNCHRONIZED);
 		assertEquals(DATE_STAMP_1, task.getLastSyncDateStamp());
 		TasksUiPlugin.getSynchronizationManager().saveIncoming(task, newData, false);
@@ -208,7 +208,7 @@ public class RepositoryTaskSynchronizationTest extends TestCase {
 	 */
 
 	public void testSynchronizedToOutgoing() {
-		AbstractRepositoryTask task = primeTaskAndRepository(RepositoryTaskSyncState.SYNCHRONIZED,
+		AbstractTask task = primeTaskAndRepository(RepositoryTaskSyncState.SYNCHRONIZED,
 				RepositoryTaskSyncState.SYNCHRONIZED);
 		assertEquals(DATE_STAMP_1, task.getLastSyncDateStamp());
 
@@ -225,7 +225,7 @@ public class RepositoryTaskSynchronizationTest extends TestCase {
 	}
 
 	public void testConflictToConflict() {
-		AbstractRepositoryTask task = primeTaskAndRepository(RepositoryTaskSyncState.CONFLICT,
+		AbstractTask task = primeTaskAndRepository(RepositoryTaskSyncState.CONFLICT,
 				RepositoryTaskSyncState.INCOMING);
 		assertEquals(DATE_STAMP_1, task.getLastSyncDateStamp());
 		TasksUiPlugin.getSynchronizationManager().saveIncoming(task, newData, true);
@@ -256,7 +256,7 @@ public class RepositoryTaskSynchronizationTest extends TestCase {
 	// TODO: Test discard outgoing
 	public void testOutgoingToConflict() {
 		// Forced
-		AbstractRepositoryTask task = primeTaskAndRepository(RepositoryTaskSyncState.OUTGOING,
+		AbstractTask task = primeTaskAndRepository(RepositoryTaskSyncState.OUTGOING,
 				RepositoryTaskSyncState.INCOMING);
 		RepositoryTaskData taskData = TasksUiPlugin.getDefault().getTaskDataManager().getNewTaskData(
 				task.getHandleIdentifier());
@@ -274,7 +274,7 @@ public class RepositoryTaskSynchronizationTest extends TestCase {
 	// Illegal state change, test it doesn't occur
 	public void testOutgoingToSynchronized() {
 
-		AbstractRepositoryTask task = primeTaskAndRepository(RepositoryTaskSyncState.OUTGOING,
+		AbstractTask task = primeTaskAndRepository(RepositoryTaskSyncState.OUTGOING,
 				RepositoryTaskSyncState.SYNCHRONIZED);
 		assertEquals(DATE_STAMP_1, task.getLastSyncDateStamp());
 
@@ -284,7 +284,7 @@ public class RepositoryTaskSynchronizationTest extends TestCase {
 	}
 
 	public void testOutgoingToOutgoing() {
-		AbstractRepositoryTask task = primeTaskAndRepository(RepositoryTaskSyncState.OUTGOING,
+		AbstractTask task = primeTaskAndRepository(RepositoryTaskSyncState.OUTGOING,
 				RepositoryTaskSyncState.SYNCHRONIZED);
 		assertEquals(DATE_STAMP_1, task.getLastSyncDateStamp());
 		TasksUiPlugin.getSynchronizationManager().saveIncoming(task, newData, false);
@@ -293,7 +293,7 @@ public class RepositoryTaskSynchronizationTest extends TestCase {
 	}
 
 	public void testMarkRead() {
-		AbstractRepositoryTask task = primeTaskAndRepository(RepositoryTaskSyncState.INCOMING,
+		AbstractTask task = primeTaskAndRepository(RepositoryTaskSyncState.INCOMING,
 				RepositoryTaskSyncState.SYNCHRONIZED);
 		task.setLastSyncDateStamp(null);
 		assertEquals(RepositoryTaskSyncState.INCOMING, task.getSyncState());
@@ -303,7 +303,7 @@ public class RepositoryTaskSynchronizationTest extends TestCase {
 	}
 
 	public void testMarkUnread() {
-		AbstractRepositoryTask task = primeTaskAndRepository(RepositoryTaskSyncState.SYNCHRONIZED,
+		AbstractTask task = primeTaskAndRepository(RepositoryTaskSyncState.SYNCHRONIZED,
 				RepositoryTaskSyncState.SYNCHRONIZED);
 		task.setLastSyncDateStamp(null);
 		assertEquals(RepositoryTaskSyncState.SYNCHRONIZED, task.getSyncState());
@@ -312,11 +312,11 @@ public class RepositoryTaskSynchronizationTest extends TestCase {
 	}
 
 	public void testClearOutgoing() {
-		AbstractRepositoryTask task = primeTaskAndRepository(RepositoryTaskSyncState.SYNCHRONIZED,
+		AbstractTask task = primeTaskAndRepository(RepositoryTaskSyncState.SYNCHRONIZED,
 				RepositoryTaskSyncState.SYNCHRONIZED);
 		RepositoryTaskData taskData1 = new RepositoryTaskData(new MockAttributeFactory(),
 				MockRepositoryConnector.REPOSITORY_KIND, MockRepositoryConnector.REPOSITORY_URL, "1",
-				AbstractRepositoryTask.DEFAULT_TASK_KIND);
+				AbstractTask.DEFAULT_TASK_KIND);
 		TasksUiPlugin.getDefault().getTaskDataManager().setNewTaskData(task.getHandleIdentifier(), taskData1);
 		taskData1 = TasksUiPlugin.getDefault().getTaskDataManager().getEditableCopy(task.getHandleIdentifier());
 
@@ -345,8 +345,8 @@ public class RepositoryTaskSynchronizationTest extends TestCase {
 			return null;
 		}
 
-		public Set<AbstractRepositoryTask> getChangedSinceLastSync(TaskRepository repository,
-				Set<AbstractRepositoryTask> tasks) throws CoreException {
+		public Set<AbstractTask> getChangedSinceLastSync(TaskRepository repository,
+				Set<AbstractTask> tasks) throws CoreException {
 			return null;
 		}
 
@@ -412,26 +412,26 @@ public class RepositoryTaskSynchronizationTest extends TestCase {
 
 		// @Override
 		// protected RepositoryTaskData
-		// loadOfflineTaskData(AbstractRepositoryTask repositoryTask) {
+		// loadOfflineTaskData(AbstractTask repositoryTask) {
 		// return repositoryTask.getTaskData();
 		// }
 
 	}
 
-	private AbstractRepositoryTask primeTaskAndRepository(RepositoryTaskSyncState localState,
+	private AbstractTask primeTaskAndRepository(RepositoryTaskSyncState localState,
 			RepositoryTaskSyncState remoteState) {
 		RepositoryTaskData taskData = null;
-		AbstractRepositoryTask task = new MockRepositoryTask(HANDLE1);
+		AbstractTask task = new MockRepositoryTask(HANDLE1);
 
 		taskData = new RepositoryTaskData(new MockAttributeFactory(), connector.getRepositoryType(), URL1, "1",
-				AbstractRepositoryTask.DEFAULT_TASK_KIND);
+				AbstractTask.DEFAULT_TASK_KIND);
 		TasksUiPlugin.getDefault().getTaskDataManager().setNewTaskData(task.getHandleIdentifier(), taskData);
 		taskData.setAttributeValue(RepositoryTaskAttribute.DATE_MODIFIED, DATE_STAMP_1);
 		task.setLastSyncDateStamp(DATE_STAMP_1);
 		task.setSyncState(localState);
 
 		newData = new RepositoryTaskData(new MockAttributeFactory(), connector.getRepositoryType(), URL1, "1",
-				AbstractRepositoryTask.DEFAULT_TASK_KIND);
+				AbstractTask.DEFAULT_TASK_KIND);
 
 		switch (remoteState) {
 		case CONFLICT:
diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TableSorterTest.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TableSorterTest.java
index e20c51afd..004a52e2a 100644
--- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TableSorterTest.java
+++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TableSorterTest.java
@@ -16,7 +16,7 @@ import junit.framework.TestCase;
 import org.eclipse.mylyn.internal.tasks.core.LocalTask;
 import org.eclipse.mylyn.internal.tasks.ui.views.TaskListTableSorter;
 import org.eclipse.mylyn.internal.tasks.ui.views.TaskListView;
-import org.eclipse.mylyn.tasks.core.AbstractRepositoryTask;
+import org.eclipse.mylyn.tasks.core.AbstractTask;
 import org.eclipse.mylyn.tasks.core.TaskCategory;
 
 /**
@@ -27,7 +27,7 @@ public class TableSorterTest extends TestCase {
 	public void testRootTaskSorting() {
 		TaskListTableSorter sorter = new TaskListTableSorter(TaskListView.getFromActivePerspective(), TaskListTableSorter.SortByIndex.SUMMARY);
 		 		
-		AbstractRepositoryTask task = new LocalTask("1", "");
+		AbstractTask task = new LocalTask("1", "");
 		TaskCategory category = new TaskCategory("cat");
 		
 		assertEquals(-1, sorter.compare(null, task, category));
diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskActivityTest.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskActivityTest.java
index 8d493485a..bd2050353 100644
--- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskActivityTest.java
+++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskActivityTest.java
@@ -27,7 +27,7 @@ import org.eclipse.mylyn.internal.tasks.core.LocalTask;
 import org.eclipse.mylyn.monitor.core.InteractionEvent;
 import org.eclipse.mylyn.tasks.core.DateRangeActivityDelegate;
 import org.eclipse.mylyn.tasks.core.DateRangeContainer;
-import org.eclipse.mylyn.tasks.core.ITask;
+import org.eclipse.mylyn.tasks.core.AbstractTask;
 import org.eclipse.mylyn.tasks.ui.TasksUiPlugin;
 
 /**
@@ -71,8 +71,8 @@ public class TaskActivityTest extends TestCase {
 		midTime.setTimeInMillis(1500);
 		assertTrue(testContainer.includes(midTime));
 
-		ITask task1 = new LocalTask("task 1", "Task 1");
-		ITask task2 = new LocalTask("task 2", "Task 2");
+		AbstractTask task1 = new LocalTask("task 1", "Task 1");
+		AbstractTask task2 = new LocalTask("task 2", "Task 2");
 
 		Calendar currentTaskStart = GregorianCalendar.getInstance();
 		currentTaskStart.setTimeInMillis(currentStartMili);
@@ -118,8 +118,8 @@ public class TaskActivityTest extends TestCase {
 
 	public void testTaskListManagerActivity() {
 
-		ITask task1 = new LocalTask("task 1", "Task 1");
-		ITask task2 = new LocalTask("task 2", "Task 2");
+		AbstractTask task1 = new LocalTask("task 1", "Task 1");
+		AbstractTask task2 = new LocalTask("task 2", "Task 2");
 		TasksUiPlugin.getTaskListManager().getTaskList().addTask(task1);
 		TasksUiPlugin.getTaskListManager().getTaskList().addTask(task2);
 
@@ -252,7 +252,7 @@ public class TaskActivityTest extends TestCase {
 	 * @author Yuri Baburov (burchik@gmail.com)
 	 */
 	public void testTaskListManagerActivity2() {
-		ITask task1 = new LocalTask("task 1", "Task 1");
+		AbstractTask task1 = new LocalTask("task 1", "Task 1");
 		TasksUiPlugin.getTaskListManager().getTaskList().addTask(task1);
 		DateRangeContainer thisWeekActivity = TasksUiPlugin.getTaskListManager().getActivityThisWeek();
 		assertNotNull(thisWeekActivity);
@@ -320,7 +320,7 @@ public class TaskActivityTest extends TestCase {
 	 * @author Yuri Baburov (burchik@gmail.com)
 	 */
 	public void testTaskListManagerActivity3() {
-		ITask task1 = new LocalTask("task 1", "Task 1");
+		AbstractTask task1 = new LocalTask("task 1", "Task 1");
 		TasksUiPlugin.getTaskListManager().getTaskList().addTask(task1);
 		DateRangeContainer thisWeekActivity = TasksUiPlugin.getTaskListManager().getActivityThisWeek();
 		assertNotNull(thisWeekActivity);
@@ -397,7 +397,7 @@ public class TaskActivityTest extends TestCase {
 
 	public void testTaskListManagerInactivity() {
 
-		ITask task1 = new LocalTask("task 1", "Task 1");
+		AbstractTask task1 = new LocalTask("task 1", "Task 1");
 		TasksUiPlugin.getTaskListManager().getTaskList().addTask(task1);
 
 		DateRangeContainer activityThisWeek = TasksUiPlugin.getTaskListManager().getActivityThisWeek();
@@ -459,7 +459,7 @@ public class TaskActivityTest extends TestCase {
 
 	public void testInterleavedActivation() {
 
-		ITask task1 = new LocalTask("task 1", "Task 1");
+		AbstractTask task1 = new LocalTask("task 1", "Task 1");
 		TasksUiPlugin.getTaskListManager().getTaskList().addTask(task1);
 
 		DateRangeContainer activityThisWeek = TasksUiPlugin.getTaskListManager().getActivityThisWeek();
@@ -513,7 +513,7 @@ public class TaskActivityTest extends TestCase {
 
 	public void testInterleavedActivation2() {
 
-		ITask task1 = new LocalTask("task 1", "Task 1");
+		AbstractTask task1 = new LocalTask("task 1", "Task 1");
 		TasksUiPlugin.getTaskListManager().getTaskList().addTask(task1);
 
 		DateRangeContainer activityThisWeek = TasksUiPlugin.getTaskListManager().getActivityThisWeek();
@@ -597,7 +597,7 @@ public class TaskActivityTest extends TestCase {
 		futureWeekTaskStart.setTimeInMillis(futureStartTime + 10);
 		assertTrue(futureWeeks.includes(futureWeekTaskStart));
 
-		ITask task1 = new LocalTask("task 1", "Task 1");
+		AbstractTask task1 = new LocalTask("task 1", "Task 1");
 		TasksUiPlugin.getTaskListManager().getTaskList().addTask(task1);
 		InteractionEvent event1 = new InteractionEvent(InteractionEvent.Kind.SELECTION, "structureKind", task1
 				.getHandleIdentifier(), "originId", "navigatedRelation", InteractionContextManager.ACTIVITY_DELTA_ACTIVATED,
@@ -650,7 +650,7 @@ public class TaskActivityTest extends TestCase {
 	}
 
 	public void testAfterReloading() {
-		ITask task1 = new LocalTask("task 1", "Task 1");
+		AbstractTask task1 = new LocalTask("task 1", "Task 1");
 		TasksUiPlugin.getTaskListManager().getTaskList().addTask(task1);
 
 		Calendar startTime = Calendar.getInstance();
@@ -726,7 +726,7 @@ public class TaskActivityTest extends TestCase {
 		endTime2.add(Calendar.DAY_OF_MONTH, 1);
 		endTime2.add(Calendar.SECOND, 20);
 
-		ITask task1 = new LocalTask("task 1", "Task 1");
+		AbstractTask task1 = new LocalTask("task 1", "Task 1");
 		TasksUiPlugin.getTaskListManager().getTaskList().addTask(task1);
 		InteractionContext metaContext = ContextCorePlugin.getContextManager().getActivityMetaContext();
 		metaContext.reset();
diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskDataExportTest.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskDataExportTest.java
index c87b72562..2c88a069d 100644
--- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskDataExportTest.java
+++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskDataExportTest.java
@@ -22,7 +22,7 @@ import org.eclipse.mylyn.internal.context.core.InteractionContext;
 import org.eclipse.mylyn.internal.tasks.ui.wizards.TaskDataExportWizard;
 import org.eclipse.mylyn.internal.tasks.ui.wizards.TaskDataExportWizardPage;
 import org.eclipse.mylyn.monitor.core.InteractionEvent;
-import org.eclipse.mylyn.tasks.core.ITask;
+import org.eclipse.mylyn.tasks.core.AbstractTask;
 import org.eclipse.mylyn.tasks.ui.TaskListManager;
 import org.eclipse.mylyn.tasks.ui.TasksUiPlugin;
 import org.eclipse.swt.widgets.Shell;
@@ -41,7 +41,7 @@ public class TaskDataExportTest extends AbstractContextTest {
 
 	private File destinationDir = null;
 
-	private ITask task1 = null;
+	private AbstractTask task1 = null;
 
 	private TaskListManager manager = TasksUiPlugin.getTaskListManager();
 
diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskDataImportTest.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskDataImportTest.java
index f87af6c95..dbf79bd51 100644
--- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskDataImportTest.java
+++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskDataImportTest.java
@@ -19,9 +19,9 @@ import org.eclipse.mylyn.internal.context.core.InteractionContext;
 import org.eclipse.mylyn.internal.tasks.core.LocalTask;
 import org.eclipse.mylyn.internal.tasks.ui.wizards.TaskDataImportWizard;
 import org.eclipse.mylyn.internal.tasks.ui.wizards.TaskDataImportWizardPage;
-import org.eclipse.mylyn.tasks.core.AbstractRepositoryTask;
-import org.eclipse.mylyn.tasks.core.ITask;
-import org.eclipse.mylyn.tasks.core.TaskList;
+import org.eclipse.mylyn.tasks.core.AbstractTask;
+import org.eclipse.mylyn.tasks.core.AbstractTask;
+import org.eclipse.mylyn.tasks.core.getAllCategories;
 import org.eclipse.mylyn.tasks.ui.TaskListManager;
 import org.eclipse.mylyn.tasks.ui.TasksUiPlugin;
 import org.eclipse.swt.widgets.Shell;
@@ -81,7 +81,7 @@ public class TaskDataImportTest extends AbstractContextTest {
 	 * Tests the wizard when it has been asked to import all task data from a zip file
 	 */
 	public void testImportRepositoriesZip() {
-		TaskList taskList = TasksUiPlugin.getTaskListManager().getTaskList();
+		getAllCategories taskList = TasksUiPlugin.getTaskListManager().getTaskList();
 		InteractionContext historyContext = ContextCorePlugin.getContextManager().getActivityMetaContext();
 		assertNotNull(taskList);
 		assertNotNull(historyContext);
@@ -92,9 +92,9 @@ public class TaskDataImportTest extends AbstractContextTest {
 		wizardPage.setParameters(true, true, true, true, true, "", sourceZipFile.getPath());
 		wizard.performFinish();
 
-		Collection<ITask> tasks = taskList.getAllTasks();
+		Collection<AbstractTask> tasks = taskList.getAllTasks();
 		assertEquals(2, tasks.size());
-		for (ITask task : tasks) {
+		for (AbstractTask task : tasks) {
 			assertTrue(ContextCorePlugin.getContextManager().hasContext(task.getHandleIdentifier()));
 		}
 		historyContext = ContextCorePlugin.getContextManager().getActivityMetaContext();
@@ -104,7 +104,7 @@ public class TaskDataImportTest extends AbstractContextTest {
 	}
 
 	public void testImportOverwritesAllTasks() {
-		TaskList taskList = TasksUiPlugin.getTaskListManager().getTaskList();
+		getAllCategories taskList = TasksUiPlugin.getTaskListManager().getTaskList();
 		InteractionContext historyContext = ContextCorePlugin.getContextManager().getActivityMetaContext();
 		assertNotNull(taskList);
 		assertNotNull(historyContext);
@@ -112,9 +112,9 @@ public class TaskDataImportTest extends AbstractContextTest {
 		assertTrue(historyContext.getInteractionHistory().size() == 0);
 		assertEquals(2, TasksUiPlugin.getRepositoryManager().getAllRepositories().size());
 
-		AbstractRepositoryTask task1 = new LocalTask("999", "label");
+		AbstractTask task1 = new LocalTask("999", "label");
 		taskList.addTask(task1);
-		Collection<ITask> tasks = taskList.getAllTasks();
+		Collection<AbstractTask> tasks = taskList.getAllTasks();
 		assertEquals(1, tasks.size());
 
 		wizardPage.setParameters(true, true, true, true, true, "", sourceZipFile.getPath());
@@ -123,7 +123,7 @@ public class TaskDataImportTest extends AbstractContextTest {
 		tasks = taskList.getAllTasks();
 		assertEquals(2, tasks.size());
 		assertTrue(!taskList.getAllTasks().contains(task1));
-		for (ITask task : tasks) {
+		for (AbstractTask task : tasks) {
 			assertTrue(ContextCorePlugin.getContextManager().hasContext(task.getHandleIdentifier()));
 		}
 		historyContext = ContextCorePlugin.getContextManager().getActivityMetaContext();
diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskDataManagerTest.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskDataManagerTest.java
index 5a3b40d00..6cad59f7f 100644
--- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskDataManagerTest.java
+++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskDataManagerTest.java
@@ -18,7 +18,7 @@ import junit.framework.TestCase;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.mylyn.internal.tasks.core.RepositoryTaskHandleUtil;
 import org.eclipse.mylyn.internal.tasks.core.TaskDataManager;
-import org.eclipse.mylyn.tasks.core.AbstractRepositoryTask;
+import org.eclipse.mylyn.tasks.core.AbstractTask;
 import org.eclipse.mylyn.tasks.core.RepositoryTaskAttribute;
 import org.eclipse.mylyn.tasks.core.RepositoryTaskData;
 import org.eclipse.mylyn.tasks.tests.connector.MockAttributeFactory;
@@ -52,7 +52,7 @@ public class TaskDataManagerTest extends TestCase {
 	public void testAdd() throws CoreException {
 		RepositoryTaskData taskData = new RepositoryTaskData(new MockAttributeFactory(),
 				MockRepositoryConnector.REPOSITORY_KIND, MockRepositoryConnector.REPOSITORY_URL, "1",
-				AbstractRepositoryTask.DEFAULT_TASK_KIND);
+				AbstractTask.DEFAULT_TASK_KIND);
 		offlineTaskDataManager.setNewTaskData(RepositoryTaskHandleUtil.getHandle(MockRepositoryConnector.REPOSITORY_URL, "1"),
 				taskData);
 		assertNotNull(offlineTaskDataManager.getNewTaskData(RepositoryTaskHandleUtil.getHandle(
@@ -62,7 +62,7 @@ public class TaskDataManagerTest extends TestCase {
 	public void testSave() throws CoreException, IOException, ClassNotFoundException {
 		RepositoryTaskData taskData = new RepositoryTaskData(new MockAttributeFactory(),
 				MockRepositoryConnector.REPOSITORY_KIND, MockRepositoryConnector.REPOSITORY_URL, "1",
-				AbstractRepositoryTask.DEFAULT_TASK_KIND);
+				AbstractTask.DEFAULT_TASK_KIND);
 
 		RepositoryTaskAttribute attrib1 = new RepositoryTaskAttribute("key", "name", false);
 		attrib1.putMetaDataValue("key1", "value1");
@@ -77,7 +77,7 @@ public class TaskDataManagerTest extends TestCase {
 		
 		
 		taskData = new RepositoryTaskData(new MockAttributeFactory(), MockRepositoryConnector.REPOSITORY_KIND,
-				MockRepositoryConnector.REPOSITORY_URL, "2", AbstractRepositoryTask.DEFAULT_TASK_KIND);
+				MockRepositoryConnector.REPOSITORY_URL, "2", AbstractTask.DEFAULT_TASK_KIND);
 
 		RepositoryTaskAttribute attrib2 = new RepositoryTaskAttribute("key", "name", false);
 		attrib2.putMetaDataValue("key3", "value3");
@@ -131,7 +131,7 @@ public class TaskDataManagerTest extends TestCase {
 	public void testGetTaskData() throws CoreException, IOException, ClassNotFoundException {
 		RepositoryTaskData taskData = new RepositoryTaskData(new MockAttributeFactory(),
 				MockRepositoryConnector.REPOSITORY_KIND, MockRepositoryConnector.REPOSITORY_URL, "1",
-				AbstractRepositoryTask.DEFAULT_TASK_KIND);
+				AbstractTask.DEFAULT_TASK_KIND);
 		taskData.setNewComment("version 1");
 		offlineTaskDataManager.setNewTaskData(RepositoryTaskHandleUtil.getHandle(MockRepositoryConnector.REPOSITORY_URL, "1"),
 				taskData);
@@ -140,7 +140,7 @@ public class TaskDataManagerTest extends TestCase {
 		assertNotNull(offlineTaskDataManager.getNewTaskData(RepositoryTaskHandleUtil.getHandle(
 				MockRepositoryConnector.REPOSITORY_URL, "1")));
 		taskData = new RepositoryTaskData(new MockAttributeFactory(), MockRepositoryConnector.REPOSITORY_KIND,
-				MockRepositoryConnector.REPOSITORY_URL, "1", AbstractRepositoryTask.DEFAULT_TASK_KIND);
+				MockRepositoryConnector.REPOSITORY_URL, "1", AbstractTask.DEFAULT_TASK_KIND);
 		taskData.setNewComment("version 2");
 		offlineTaskDataManager.setNewTaskData(RepositoryTaskHandleUtil.getHandle(MockRepositoryConnector.REPOSITORY_URL, "1"),
 				taskData);
@@ -157,7 +157,7 @@ public class TaskDataManagerTest extends TestCase {
 	public void testUniqueCopy() throws Exception {
 		RepositoryTaskData taskData = new RepositoryTaskData(new MockAttributeFactory(),
 				MockRepositoryConnector.REPOSITORY_KIND, MockRepositoryConnector.REPOSITORY_URL, "1",
-				AbstractRepositoryTask.DEFAULT_TASK_KIND);
+				AbstractTask.DEFAULT_TASK_KIND);
 		offlineTaskDataManager.setNewTaskData(RepositoryTaskHandleUtil.getHandle(MockRepositoryConnector.REPOSITORY_URL, "1"),
 				taskData);
 		RepositoryTaskData taskData2 = offlineTaskDataManager.getEditableCopy(RepositoryTaskHandleUtil.getHandle(
@@ -177,11 +177,11 @@ public class TaskDataManagerTest extends TestCase {
 	public void testRemoveRepositoryTaskData() throws CoreException, IOException, ClassNotFoundException {
 		RepositoryTaskData taskData = new RepositoryTaskData(new MockAttributeFactory(),
 				MockRepositoryConnector.REPOSITORY_KIND, MockRepositoryConnector.REPOSITORY_URL, "1",
-				AbstractRepositoryTask.DEFAULT_TASK_KIND);
+				AbstractTask.DEFAULT_TASK_KIND);
 		offlineTaskDataManager.setNewTaskData(RepositoryTaskHandleUtil.getHandle(MockRepositoryConnector.REPOSITORY_URL, "1"),
 				taskData);
 		taskData = new RepositoryTaskData(new MockAttributeFactory(), MockRepositoryConnector.REPOSITORY_KIND,
-				MockRepositoryConnector.REPOSITORY_URL, "2", AbstractRepositoryTask.DEFAULT_TASK_KIND);
+				MockRepositoryConnector.REPOSITORY_URL, "2", AbstractTask.DEFAULT_TASK_KIND);
 		offlineTaskDataManager.setNewTaskData(RepositoryTaskHandleUtil.getHandle(MockRepositoryConnector.REPOSITORY_URL, "2"),
 				taskData);
 		offlineTaskDataManager.saveNow();
@@ -206,12 +206,12 @@ public class TaskDataManagerTest extends TestCase {
 	public void testRemoveListOfRepositoryTaskData() throws CoreException, IOException, ClassNotFoundException {
 		RepositoryTaskData taskData1 = new RepositoryTaskData(new MockAttributeFactory(),
 				MockRepositoryConnector.REPOSITORY_KIND, MockRepositoryConnector.REPOSITORY_URL, "1",
-				AbstractRepositoryTask.DEFAULT_TASK_KIND);
+				AbstractTask.DEFAULT_TASK_KIND);
 		offlineTaskDataManager.setNewTaskData(RepositoryTaskHandleUtil.getHandle(MockRepositoryConnector.REPOSITORY_URL, "1"),
 				taskData1);
 		RepositoryTaskData taskData2 = new RepositoryTaskData(new MockAttributeFactory(),
 				MockRepositoryConnector.REPOSITORY_KIND, MockRepositoryConnector.REPOSITORY_URL, "2",
-				AbstractRepositoryTask.DEFAULT_TASK_KIND);
+				AbstractTask.DEFAULT_TASK_KIND);
 		offlineTaskDataManager.setNewTaskData(RepositoryTaskHandleUtil.getHandle(MockRepositoryConnector.REPOSITORY_URL, "2"),
 				taskData2);
 		offlineTaskDataManager.saveNow();
@@ -239,7 +239,7 @@ public class TaskDataManagerTest extends TestCase {
 	public void testEditing() {
 		RepositoryTaskData taskData = new RepositoryTaskData(new MockAttributeFactory(),
 				MockRepositoryConnector.REPOSITORY_KIND, MockRepositoryConnector.REPOSITORY_URL, "1",
-				AbstractRepositoryTask.DEFAULT_TASK_KIND);
+				AbstractTask.DEFAULT_TASK_KIND);
 		offlineTaskDataManager.setNewTaskData(RepositoryTaskHandleUtil.getHandle(MockRepositoryConnector.REPOSITORY_URL, "1"),
 				taskData);
 
@@ -322,7 +322,7 @@ public class TaskDataManagerTest extends TestCase {
 	// TasksUiPlugin.getDefault().getOfflineReportsFilePath().toFile();
 	// offlineTaskDataManager.clear();
 	// offlineTaskDataManager.readOfflineData();
-	// assertNotNull(offlineTaskDataManager.getOldTaskData(AbstractRepositoryTask.getHandle(
+	// assertNotNull(offlineTaskDataManager.getOldTaskData(AbstractTask.getHandle(
 	// MockRepositoryConnector.REPOSITORY_URL, 400)));
 	// }
 }
diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskHistoryTest.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskHistoryTest.java
index 38a660c29..56f6a0612 100644
--- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskHistoryTest.java
+++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskHistoryTest.java
@@ -22,8 +22,8 @@ import org.eclipse.mylyn.internal.tasks.ui.actions.TaskDeactivateAction;
 import org.eclipse.mylyn.internal.tasks.ui.actions.TaskNavigateDropDownAction.TaskNavigateAction;
 import org.eclipse.mylyn.internal.tasks.ui.views.TaskActivationHistory;
 import org.eclipse.mylyn.internal.tasks.ui.views.TaskListView;
-import org.eclipse.mylyn.tasks.core.AbstractRepositoryTask;
-import org.eclipse.mylyn.tasks.core.ITask;
+import org.eclipse.mylyn.tasks.core.AbstractTask;
+import org.eclipse.mylyn.tasks.core.AbstractTask;
 import org.eclipse.mylyn.tasks.ui.TaskListManager;
 import org.eclipse.mylyn.tasks.ui.TasksUiPlugin;
 
@@ -39,15 +39,15 @@ public class TaskHistoryTest extends TestCase {
 
 	protected TaskListView taskView = null;
 
-	protected AbstractRepositoryTask task1 = null;
+	protected AbstractTask task1 = null;
 
-	protected AbstractRepositoryTask task2 = null;
+	protected AbstractTask task2 = null;
 
-	protected AbstractRepositoryTask task3 = null;
+	protected AbstractTask task3 = null;
 
-	protected AbstractRepositoryTask task4 = null;
+	protected AbstractTask task4 = null;
 
-	protected AbstractRepositoryTask task5 = null;
+	protected AbstractTask task5 = null;
 
 	@Override
 	protected void setUp() throws Exception {
@@ -161,7 +161,7 @@ public class TaskHistoryTest extends TestCase {
 
 		assertTrue(task4.isActive());
 		//TaskActivationHistory taskHistory = taskView.getTaskActivationHistory();
-		List<ITask> prevHistoryList = history.getPreviousTasks();
+		List<AbstractTask> prevHistoryList = history.getPreviousTasks();
 
 		// Check that the previous history list looks right
 		assertTrue(prevHistoryList.size() >= 3);
diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskListBackupManagerTest.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskListBackupManagerTest.java
index 461170a26..de006a593 100644
--- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskListBackupManagerTest.java
+++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskListBackupManagerTest.java
@@ -20,7 +20,7 @@ import junit.framework.TestCase;
 import org.eclipse.mylyn.internal.tasks.core.LocalTask;
 import org.eclipse.mylyn.internal.tasks.ui.TaskListBackupManager;
 import org.eclipse.mylyn.internal.tasks.ui.TasksUiPreferenceConstants;
-import org.eclipse.mylyn.tasks.core.AbstractRepositoryTask;
+import org.eclipse.mylyn.tasks.core.AbstractTask;
 import org.eclipse.mylyn.tasks.ui.TasksUiPlugin;
 
 /**
@@ -28,7 +28,7 @@ import org.eclipse.mylyn.tasks.ui.TasksUiPlugin;
  */
 public class TaskListBackupManagerTest extends TestCase {
 
-	private AbstractRepositoryTask task1;
+	private AbstractTask task1;
 
 	@Override
 	protected void setUp() throws Exception {
diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskListContentProviderTest.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskListContentProviderTest.java
index 9c12f0afc..2a5c94721 100644
--- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskListContentProviderTest.java
+++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskListContentProviderTest.java
@@ -14,8 +14,8 @@ import org.eclipse.mylyn.internal.tasks.core.LocalTask;
 import org.eclipse.mylyn.internal.tasks.ui.TasksUiPreferenceConstants;
 import org.eclipse.mylyn.internal.tasks.ui.views.TaskListContentProvider;
 import org.eclipse.mylyn.internal.tasks.ui.views.TaskListView;
-import org.eclipse.mylyn.tasks.core.AbstractRepositoryTask;
-import org.eclipse.mylyn.tasks.core.TaskList;
+import org.eclipse.mylyn.tasks.core.AbstractTask;
+import org.eclipse.mylyn.tasks.core.getAllCategories;
 import org.eclipse.mylyn.tasks.ui.TasksUiPlugin;
 
 /**
@@ -27,7 +27,7 @@ public class TaskListContentProviderTest extends TestCase {
 
 	private TaskListView view;
 
-	private TaskList taskList;
+	private getAllCategories taskList;
 
 	@Override
 	protected void setUp() throws Exception {
@@ -49,13 +49,13 @@ public class TaskListContentProviderTest extends TestCase {
 
 	public void testHasChildren() {
 
-		AbstractRepositoryTask parent = new LocalTask("parent", "parent label");
-		AbstractRepositoryTask completedChild = new LocalTask("completed child", "completed child label");
+		AbstractTask parent = new LocalTask("parent", "parent label");
+		AbstractTask completedChild = new LocalTask("completed child", "completed child label");
 		completedChild.setCompleted(true);
 		taskList.addTask(completedChild, parent);
 		assertFalse(provider.hasChildren(parent));
 
-		AbstractRepositoryTask incompleteChild = new LocalTask("incomplete child", "incomplete child label");
+		AbstractTask incompleteChild = new LocalTask("incomplete child", "incomplete child label");
 		incompleteChild.setCompleted(false);
 		taskList.addTask(incompleteChild, parent);
 		assertTrue(provider.hasChildren(parent));
diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskListDnDTest.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskListDnDTest.java
index 8396d9a9b..c23e72b34 100644
--- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskListDnDTest.java
+++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskListDnDTest.java
@@ -18,7 +18,7 @@ import junit.framework.TestCase;
 import org.eclipse.jface.viewers.TreeViewer;
 import org.eclipse.mylyn.internal.tasks.ui.views.TaskListDropAdapter;
 import org.eclipse.mylyn.internal.tasks.ui.views.TaskListView;
-import org.eclipse.mylyn.tasks.core.ITask;
+import org.eclipse.mylyn.tasks.core.AbstractTask;
 import org.eclipse.mylyn.tasks.ui.TaskListManager;
 import org.eclipse.mylyn.tasks.ui.TasksUiPlugin;
 
@@ -66,7 +66,7 @@ public class TaskListDnDTest extends TestCase {
 		String urlData = url + "\n" + title;
 
 		dropAdapter.performDrop(urlData);
-		Set<ITask> tasks = manager.getTaskList().getRootTasks();
+		Set<AbstractTask> tasks = manager.getTaskList().getRootTasks();
 		assertNotNull(tasks);
 		assertEquals(1, tasks.size());
 		assertEquals(url, tasks.iterator().next().getTaskUrl());
diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskListManagerTest.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskListManagerTest.java
index 30ac775fa..9821b6491 100644
--- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskListManagerTest.java
+++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskListManagerTest.java
@@ -34,16 +34,16 @@ import org.eclipse.mylyn.internal.tasks.ui.TasksUiPreferenceConstants;
 import org.eclipse.mylyn.internal.tasks.ui.actions.MarkTaskReadAction;
 import org.eclipse.mylyn.internal.tasks.ui.actions.MarkTaskUnreadAction;
 import org.eclipse.mylyn.tasks.core.AbstractRepositoryQuery;
-import org.eclipse.mylyn.tasks.core.AbstractRepositoryTask;
-import org.eclipse.mylyn.tasks.core.AbstractTaskContainer;
-import org.eclipse.mylyn.tasks.core.ITask;
-import org.eclipse.mylyn.tasks.core.ITaskListElement;
+import org.eclipse.mylyn.tasks.core.AbstractTask;
+import org.eclipse.mylyn.tasks.core.AbstractTaskListElement;
+import org.eclipse.mylyn.tasks.core.AbstractTask;
+import org.eclipse.mylyn.tasks.core.AbstractTaskListElement;
 import org.eclipse.mylyn.tasks.core.RepositoryTaskData;
 import org.eclipse.mylyn.tasks.core.TaskCategory;
-import org.eclipse.mylyn.tasks.core.TaskList;
+import org.eclipse.mylyn.tasks.core.getAllCategories;
 import org.eclipse.mylyn.tasks.core.TaskRepository;
 import org.eclipse.mylyn.tasks.core.UncategorizedCategory;
-import org.eclipse.mylyn.tasks.core.AbstractRepositoryTask.RepositoryTaskSyncState;
+import org.eclipse.mylyn.tasks.core.AbstractTask.RepositoryTaskSyncState;
 import org.eclipse.mylyn.tasks.tests.connector.MockAttributeFactory;
 import org.eclipse.mylyn.tasks.tests.connector.MockRepositoryConnector;
 import org.eclipse.mylyn.tasks.tests.connector.MockRepositoryQuery;
@@ -104,7 +104,7 @@ public class TaskListManagerTest extends TestCase {
 		manager.readExistingOrCreateNewList();
 		assertEquals(2, manager.getTaskList().getAllTasks().size());
 		assertEquals(3, manager.getTaskList().getLastTaskNum());
-		AbstractRepositoryTask task4 =manager.createNewLocalTask("label");
+		AbstractTask task4 =manager.createNewLocalTask("label");
 		assertTrue(task4.getHandleIdentifier() + " should end with 4", task4.getHandleIdentifier().endsWith("4"));
 	}
 
@@ -175,8 +175,8 @@ public class TaskListManagerTest extends TestCase {
 // }
 
 	public void testMigrateTaskHandles() {
-		AbstractRepositoryTask task = new MockRepositoryTask("http://a", "123");
-		AbstractRepositoryTask task2 = new MockRepositoryTask("http://other", "other");
+		AbstractTask task = new MockRepositoryTask("http://a", "123");
+		AbstractTask task2 = new MockRepositoryTask("http://other", "other");
 		manager.getTaskList().addTask(task);
 		manager.getTaskList().addTask(task2);
 
@@ -202,7 +202,7 @@ public class TaskListManagerTest extends TestCase {
 	}
 
 	public void testMigrateTaskHandlesWithExplicitSet() {
-		AbstractRepositoryTask task = new MockRepositoryTask("http://a", "123");
+		AbstractTask task = new MockRepositoryTask("http://a", "123");
 		task.setTaskUrl("http://a/task/123");
 		manager.getTaskList().addTask(task);
 		manager.refactorRepositoryUrl("http://a", "http://b");
@@ -212,7 +212,7 @@ public class TaskListManagerTest extends TestCase {
 	}
 
 	public void testIsActiveToday() {
-		ITask task = new LocalTask("1", "task-1");
+		AbstractTask task = new LocalTask("1", "task-1");
 		assertFalse(manager.isScheduledForToday(task));
 
 		task.setScheduledForDate(new Date());
@@ -234,7 +234,7 @@ public class TaskListManagerTest extends TestCase {
 	}
 
 	public void testScheduledForToday() {
-		ITask task = new LocalTask("1", "task-1");
+		AbstractTask task = new LocalTask("1", "task-1");
 		Calendar cal = Calendar.getInstance();
 		cal.add(Calendar.MINUTE, 2);
 		task.setScheduledForDate(cal.getTime());
@@ -257,7 +257,7 @@ public class TaskListManagerTest extends TestCase {
 	}
 
 	public void testIsCompletedToday() {
-		ITask task = new LocalTask("1", "task 1");
+		AbstractTask task = new LocalTask("1", "task 1");
 		task.setCompleted(true);
 		task.setCompletionDate(new Date());
 		assertTrue(manager.isCompletedToday(task));
@@ -281,7 +281,7 @@ public class TaskListManagerTest extends TestCase {
 
 	public void testMoveCategories() {
 		assertEquals(0, manager.getTaskList().getRootTasks().size());
-		AbstractRepositoryTask task1 = new LocalTask("t1", "t1");
+		AbstractTask task1 = new LocalTask("t1", "t1");
 
 		TaskCategory cat1 = new TaskCategory("cat1");
 		manager.getTaskList().addCategory(cat1);
@@ -299,7 +299,7 @@ public class TaskListManagerTest extends TestCase {
 
 	public void testMoveToRoot() {
 		assertEquals(0, manager.getTaskList().getRootTasks().size());
-		AbstractRepositoryTask task1 = new LocalTask("t1", "t1");
+		AbstractTask task1 = new LocalTask("t1", "t1");
 		manager.getTaskList().moveToRoot(task1);
 		assertEquals(1, manager.getTaskList().getRootTasks().size());
 		assertEquals(UncategorizedCategory.HANDLE, task1.getContainer().getHandleIdentifier());
@@ -350,7 +350,7 @@ public class TaskListManagerTest extends TestCase {
 	}
 
 	public void testDeleteCategoryMovesTasksToRoot() {
-		ITask task = new MockRepositoryTask("delete");
+		AbstractTask task = new MockRepositoryTask("delete");
 		TaskCategory category = new TaskCategory("cat");
 		manager.getTaskList().addTask(task, category);
 		manager.getTaskList().addCategory(category);
@@ -368,7 +368,7 @@ public class TaskListManagerTest extends TestCase {
 		assertEquals(3, manager.getTaskList().getCategories().size());
 		String newDesc = "newDescription";
 		manager.getTaskList().renameContainer(category, newDesc);
-		AbstractTaskContainer container = manager.getTaskList().getContainerForHandle(newDesc);
+		AbstractTaskListElement container = manager.getTaskList().getContainerForHandle(newDesc);
 		assertNotNull(container);
 		assertEquals(newDesc, container.getSummary());
 		manager.getTaskList().deleteCategory(container);
@@ -396,12 +396,12 @@ public class TaskListManagerTest extends TestCase {
 		TaskCategory category2 = new TaskCategory("cat");
 		manager.getTaskList().addCategory(category2);
 		assertEquals(3, manager.getTaskList().getCategories().size());
-		AbstractTaskContainer container = manager.getTaskList().getContainerForHandle("cat");
+		AbstractTaskListElement container = manager.getTaskList().getContainerForHandle("cat");
 		assertEquals(container, category);
 	}
 
 	public void testDeleteRootTask() {
-		ITask task = new LocalTask("task-1", "label");
+		AbstractTask task = new LocalTask("task-1", "label");
 		manager.getTaskList().addTask(task);
 		manager.getTaskList().internalAddRootTask(task);
 		manager.getTaskList().deleteTask(task);
@@ -416,7 +416,7 @@ public class TaskListManagerTest extends TestCase {
 		assertEquals(0, manager.getTaskList().getArchiveContainer().getChildren().size());
 		assertEquals(2, manager.getTaskList().getCategories().size());
 
-		ITask task = new LocalTask("task-1", "label");
+		AbstractTask task = new LocalTask("task-1", "label");
 		TaskCategory category = new TaskCategory("handleAndDescription");
 		manager.getTaskList().addTask(task);
 		assertEquals(1, manager.getTaskList().getArchiveContainer().getChildren().size());
@@ -442,7 +442,7 @@ public class TaskListManagerTest extends TestCase {
 		TasksUiPlugin.getRepositoryManager().addRepository(repository,
 				TasksUiPlugin.getDefault().getRepositoriesFilePath());
 		MockRepositoryTask task = new MockRepositoryTask(repositoryUrl, "1");
-		TaskList taskList = TasksUiPlugin.getTaskListManager().getTaskList();
+		getAllCategories taskList = TasksUiPlugin.getTaskListManager().getTaskList();
 		taskList.moveToRoot(task);
 		MockRepositoryQuery query = new MockRepositoryQuery("query");
 		taskList.addQuery(query);
@@ -484,10 +484,10 @@ public class TaskListManagerTest extends TestCase {
 		manager.readExistingOrCreateNewList();
 
 		// read once
-		Set<AbstractTaskContainer> readCats = manager.getTaskList().getTaskContainers();
+		Set<AbstractTaskListElement> readCats = manager.getTaskList().getTaskContainers();
 		assertTrue(manager.getTaskList().getCategories().contains(cat1));
-		Iterator<AbstractTaskContainer> iterator = readCats.iterator();
-		AbstractTaskContainer readCat1 = iterator.next();
+		Iterator<AbstractTaskListElement> iterator = readCats.iterator();
+		AbstractTaskListElement readCat1 = iterator.next();
 		assertEquals(cat1, readCat1);
 		assertEquals(1, readCat1.getChildren().size());
 
@@ -509,33 +509,33 @@ public class TaskListManagerTest extends TestCase {
 	}
 
 	public void testCreationAndExternalization() {
-		Set<ITask> rootTasks = new HashSet<ITask>();
-		AbstractRepositoryTask task1 = manager.createNewLocalTask("task 1");
+		Set<AbstractTask> rootTasks = new HashSet<AbstractTask>();
+		AbstractTask task1 = manager.createNewLocalTask("task 1");
 		manager.getTaskList().moveToRoot(task1);
 		rootTasks.add(task1);
 
-		AbstractRepositoryTask sub1 = manager.createNewLocalTask("sub 1");
+		AbstractTask sub1 = manager.createNewLocalTask("sub 1");
 		manager.getTaskList().addTask(sub1, task1);
 		manager.getTaskList().moveToContainer(manager.getTaskList().getArchiveContainer(), sub1);
 
-		AbstractRepositoryTask task2 = manager.createNewLocalTask("task 2");
+		AbstractTask task2 = manager.createNewLocalTask("task 2");
 		manager.getTaskList().moveToRoot(task2);
 		rootTasks.add(task2);
 
 		Set<TaskCategory> categories = new HashSet<TaskCategory>();
-		Set<ITask> cat1Contents = new HashSet<ITask>();
+		Set<AbstractTask> cat1Contents = new HashSet<AbstractTask>();
 		TaskCategory cat1 = new TaskCategory("Category 1");
 		manager.getTaskList().addCategory(cat1);
 		categories.add(cat1);
-		AbstractRepositoryTask task3 =manager.createNewLocalTask("task 3");
+		AbstractTask task3 =manager.createNewLocalTask("task 3");
 		manager.getTaskList().moveToContainer(cat1, task3);
 		cat1Contents.add(task3);
 		assertEquals(cat1, task3.getContainer());
-		AbstractRepositoryTask sub2 = manager.createNewLocalTask("sub 2");
+		AbstractTask sub2 = manager.createNewLocalTask("sub 2");
 		manager.getTaskList().addTask(sub2, task3);
 		manager.getTaskList().moveToContainer(manager.getTaskList().getArchiveContainer(), sub2);
 
-		AbstractRepositoryTask task4 = manager.createNewLocalTask("task 4");
+		AbstractTask task4 = manager.createNewLocalTask("task 4");
 		manager.getTaskList().moveToContainer(cat1, task4);
 		cat1Contents.add(task4);
 
@@ -561,8 +561,8 @@ public class TaskListManagerTest extends TestCase {
 		assertNotNull(manager.getTaskList());
 		assertTrue(rootTasks.containsAll(manager.getTaskList().getRootTasks()));
 
-		Set<ITask> readList = manager.getTaskList().getRootTasks();
-		for (ITask task : readList) {
+		Set<AbstractTask> readList = manager.getTaskList().getRootTasks();
+		for (AbstractTask task : readList) {
 			if (task.equals(task1)) {
 				assertEquals(task1.getSummary(), task.getSummary());
 				assertEquals(1, task.getChildren().size());
@@ -572,20 +572,20 @@ public class TaskListManagerTest extends TestCase {
 			}
 		}
 
-		Set<AbstractTaskContainer> readCats = manager.getTaskList().getTaskContainers();
+		Set<AbstractTaskListElement> readCats = manager.getTaskList().getTaskContainers();
 		assertTrue(manager.getTaskList().getCategories().contains(cat1));
-		Iterator<AbstractTaskContainer> iterator = readCats.iterator();
-		AbstractTaskContainer readCat1 = iterator.next();
+		Iterator<AbstractTaskListElement> iterator = readCats.iterator();
+		AbstractTaskListElement readCat1 = iterator.next();
 		assertEquals(cat1, readCat1);
 		assertEquals(cat1Contents, readCat1.getChildren());
 	}
 
 	public void testExternalizationOfHandlesWithDash() {
-		Set<ITask> rootTasks = new HashSet<ITask>();
+		Set<AbstractTask> rootTasks = new HashSet<AbstractTask>();
 
-// String handle = AbstractRepositoryTask.getHandle("http://url/repo-location",
+// String handle = AbstractTask.getHandle("http://url/repo-location",
 // 1);
-		AbstractRepositoryTask task1 = manager.createNewLocalTask("task 1");
+		AbstractTask task1 = manager.createNewLocalTask("task 1");
 		manager.getTaskList().moveToRoot(task1);
 		rootTasks.add(task1);
 
@@ -617,7 +617,7 @@ public class TaskListManagerTest extends TestCase {
 	}
 
 	public void testgetQueriesAndHitsForHandle() {
-		TaskList taskList = manager.getTaskList();
+		getAllCategories taskList = manager.getTaskList();
 
 		MockRepositoryTask hit1 = new MockRepositoryTask("1");
 		MockRepositoryTask hit2 = new MockRepositoryTask("2");
@@ -656,7 +656,7 @@ public class TaskListManagerTest extends TestCase {
 
 		Set<String> handles = new HashSet<String>();
 		handles.add(RepositoryTaskHandleUtil.getHandle(MockRepositoryConnector.REPOSITORY_URL, "2"));
-		Collection<ITask> hitsReturned = taskList.getTasks(handles);
+		Collection<AbstractTask> hitsReturned = taskList.getTasks(handles);
 		assertNotNull(hitsReturned);
 		assertEquals(1, hitsReturned.size());
 		assertTrue(hitsReturned.contains(hit2));
@@ -678,7 +678,7 @@ public class TaskListManagerTest extends TestCase {
 // }
 
 	public void testUpdateQueryHits() {
-		TaskList taskList = manager.getTaskList();
+		getAllCategories taskList = manager.getTaskList();
 
 		MockRepositoryTask hit1 = new MockRepositoryTask("1");
 		MockRepositoryTask hit2 = new MockRepositoryTask("2");
@@ -714,7 +714,7 @@ public class TaskListManagerTest extends TestCase {
 		assertTrue(query1.getHits().contains(hit1twin));
 		assertTrue(query1.getHits().contains(hit2twin));
 		assertTrue(query1.getHits().contains(hit3twin));
-		for (AbstractRepositoryTask hit : query1.getHits()) {
+		for (AbstractTask hit : query1.getHits()) {
 			if (hit.equals(hit1twin)) {
 				assertTrue(hit.isNotified());
 			} else {
@@ -735,18 +735,18 @@ public class TaskListManagerTest extends TestCase {
 		MockRepositoryTask task2 = new MockRepositoryTask("https://unresolved", bugNumber);
 		manager.getTaskList().addTask(task2);
 
-		TaskList taskList = manager.getTaskList();
+		getAllCategories taskList = manager.getTaskList();
 		assertEquals(2, taskList.getAllTasks().size());
-		Set<AbstractRepositoryTask> tasksReturned = taskList.getRepositoryTasks(repositoryUrl);
+		Set<AbstractTask> tasksReturned = taskList.getRepositoryTasks(repositoryUrl);
 		assertNotNull(tasksReturned);
 		assertEquals(1, tasksReturned.size());
 		assertTrue(tasksReturned.contains(task1));
 	}
 
 	public void testAllTasksDeactivation() {
-		AbstractRepositoryTask task1 = new LocalTask("task1", "description1");
-		AbstractRepositoryTask task2 = new LocalTask("task2", "description2");
-		TaskList taskList = manager.getTaskList();
+		AbstractTask task1 = new LocalTask("task1", "description1");
+		AbstractTask task2 = new LocalTask("task2", "description2");
+		getAllCategories taskList = manager.getTaskList();
 		taskList.addTask(task1);
 		taskList.addTask(task2);
 		assertTrue(taskList.getActiveTasks().isEmpty());
@@ -764,7 +764,7 @@ public class TaskListManagerTest extends TestCase {
 		MockRepositoryTask task2 = new MockRepositoryTask(repositoryUrl, "2");
 		task1.setSyncState(RepositoryTaskSyncState.INCOMING);
 		task2.setSyncState(RepositoryTaskSyncState.INCOMING);
-		List<ITaskListElement> elements = new ArrayList<ITaskListElement>();
+		List<AbstractTaskListElement> elements = new ArrayList<AbstractTaskListElement>();
 		elements.add(task1);
 		elements.add(task2);
 		MarkTaskReadAction readAction = new MarkTaskReadAction(elements);
@@ -785,7 +785,7 @@ public class TaskListManagerTest extends TestCase {
 		readAction = new MarkTaskReadAction(elements);
 		readAction.run();
 		assertEquals(2, query.getChildren().size());
-		for (ITaskListElement element : query.getChildren()) {
+		for (AbstractTaskListElement element : query.getChildren()) {
 			if (element instanceof MockRepositoryTask) {
 				MockRepositoryTask mockTask = (MockRepositoryTask) element;
 				assertEquals(RepositoryTaskSyncState.SYNCHRONIZED, mockTask.getSyncState());
@@ -800,7 +800,7 @@ public class TaskListManagerTest extends TestCase {
 		MockRepositoryTask task2 = new MockRepositoryTask(repositoryUrl, "2");
 		assertEquals(RepositoryTaskSyncState.SYNCHRONIZED, task1.getSyncState());
 		assertEquals(RepositoryTaskSyncState.SYNCHRONIZED, task2.getSyncState());
-		List<ITaskListElement> elements = new ArrayList<ITaskListElement>();
+		List<AbstractTaskListElement> elements = new ArrayList<AbstractTaskListElement>();
 		elements.add(task1);
 		elements.add(task2);
 		MarkTaskUnreadAction unreadAction = new MarkTaskUnreadAction(elements);
@@ -821,7 +821,7 @@ public class TaskListManagerTest extends TestCase {
 		MarkTaskReadAction readAction = new MarkTaskReadAction(elements);
 		readAction.run();
 		assertEquals(2, query.getChildren().size());
-		for (ITaskListElement element : query.getChildren()) {
+		for (AbstractTaskListElement element : query.getChildren()) {
 			if (element instanceof MockRepositoryTask) {
 				MockRepositoryTask mockTask = (MockRepositoryTask) element;
 				assertEquals(RepositoryTaskSyncState.SYNCHRONIZED, mockTask.getSyncState());
@@ -833,7 +833,7 @@ public class TaskListManagerTest extends TestCase {
 		unreadAction = new MarkTaskUnreadAction(elements);
 		unreadAction.run();
 		assertEquals(2, query.getChildren().size());
-		for (ITaskListElement element : query.getChildren()) {
+		for (AbstractTaskListElement element : query.getChildren()) {
 			if (element instanceof MockRepositoryTask) {
 				MockRepositoryTask mockTask = (MockRepositoryTask) element;
 				assertEquals(RepositoryTaskSyncState.INCOMING, mockTask.getSyncState());
diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskListTest.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskListTest.java
index 8eca69ff1..d3acd6fd4 100644
--- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskListTest.java
+++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskListTest.java
@@ -11,7 +11,7 @@ package org.eclipse.mylyn.tasks.tests;
 import junit.framework.TestCase;
 
 import org.eclipse.mylyn.tasks.core.TaskCategory;
-import org.eclipse.mylyn.tasks.core.TaskList;
+import org.eclipse.mylyn.tasks.core.getAllCategories;
 
 
 /**
@@ -20,7 +20,7 @@ import org.eclipse.mylyn.tasks.core.TaskList;
 public class TaskListTest extends TestCase {
 
 	public void testGetUserCategories() {
-		TaskList taskList = new TaskList();
+		getAllCategories taskList = new getAllCategories();
 		taskList.addCategory(new TaskCategory("a"));
 		assertEquals(2, taskList.getUserCategories().size());
 	}
diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskListUiTest.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskListUiTest.java
index 83b6dfe40..1a16cfe1f 100644
--- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskListUiTest.java
+++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskListUiTest.java
@@ -27,12 +27,12 @@ import org.eclipse.mylyn.internal.tasks.ui.TaskPriorityFilter;
 import org.eclipse.mylyn.internal.tasks.ui.actions.MarkTaskCompleteAction;
 import org.eclipse.mylyn.internal.tasks.ui.actions.NewCategoryAction;
 import org.eclipse.mylyn.internal.tasks.ui.views.TaskListView;
-import org.eclipse.mylyn.tasks.core.AbstractRepositoryTask;
-import org.eclipse.mylyn.tasks.core.ITask;
+import org.eclipse.mylyn.tasks.core.AbstractTask;
+import org.eclipse.mylyn.tasks.core.AbstractTask;
 import org.eclipse.mylyn.tasks.core.ITaskListChangeListener;
-import org.eclipse.mylyn.tasks.core.ITaskListElement;
+import org.eclipse.mylyn.tasks.core.AbstractTaskListElement;
 import org.eclipse.mylyn.tasks.core.TaskCategory;
-import org.eclipse.mylyn.tasks.core.AbstractRepositoryTask.PriorityLevel;
+import org.eclipse.mylyn.tasks.core.AbstractTask.PriorityLevel;
 import org.eclipse.mylyn.tasks.tests.connector.MockRepositoryQuery;
 import org.eclipse.mylyn.tasks.ui.TaskListManager;
 import org.eclipse.mylyn.tasks.ui.TasksUiPlugin;
@@ -52,31 +52,31 @@ public class TaskListUiTest extends TestCase {
 
 	private TaskCategory cat1 = null;
 
-	private AbstractRepositoryTask cat1task1 = null;
+	private AbstractTask cat1task1 = null;
 
-	private AbstractRepositoryTask cat1task2 = null;
+	private AbstractTask cat1task2 = null;
 
-	private AbstractRepositoryTask cat1task3 = null;
+	private AbstractTask cat1task3 = null;
 
-	private AbstractRepositoryTask cat1task4 = null;
+	private AbstractTask cat1task4 = null;
 
-	private AbstractRepositoryTask cat1task5 = null;
+	private AbstractTask cat1task5 = null;
 
-	private AbstractRepositoryTask cat1task1sub1 = null;
+	private AbstractTask cat1task1sub1 = null;
 
 	private TaskCategory cat2 = null;
 
-	private AbstractRepositoryTask cat2task1 = null;
+	private AbstractTask cat2task1 = null;
 
-	private AbstractRepositoryTask cat2task2 = null;
+	private AbstractTask cat2task2 = null;
 
-	private AbstractRepositoryTask cat2task3 = null;
+	private AbstractTask cat2task3 = null;
 
-	private AbstractRepositoryTask cat2task4 = null;
+	private AbstractTask cat2task4 = null;
 
-	private AbstractRepositoryTask cat2task5 = null;
+	private AbstractTask cat2task5 = null;
 
-	private AbstractRepositoryTask cat2task1sub1 = null;
+	private AbstractTask cat2task1sub1 = null;
 
 	private final static int CHECK_COMPLETE_FILTER = 1;
 
@@ -180,7 +180,7 @@ public class TaskListUiTest extends TestCase {
 		view.getViewer().refresh();
 		// Arrays.asList(view.getViewer().getVisibleExpandedElements());
 		assertFalse(webTask.isCompleted());
-		ArrayList<ITaskListElement> tasks = new ArrayList<ITaskListElement>();
+		ArrayList<AbstractTaskListElement> tasks = new ArrayList<AbstractTaskListElement>();
 		tasks.add(webTask);
 		new MarkTaskCompleteAction(tasks).run();
 		assertTrue(webTask.isCompleted());
@@ -253,7 +253,7 @@ public class TaskListUiTest extends TestCase {
 	public void testGetSubMenuManagerContainsAllCategoriesPlusNewCategory() {
 		// setup
 		MoveToCategoryMenuContributor moveToMenuContrib = new MoveToCategoryMenuContributor();
-		List<ITaskListElement> selectedElements = new Vector<ITaskListElement>();
+		List<AbstractTaskListElement> selectedElements = new Vector<AbstractTaskListElement>();
 		selectedElements.add(cat1task1);
 		int nrOfCategoriesMinusArchiveContainer = manager.getTaskList().getCategories().size() - 1;
 		int nrOfSeparators = 1;
@@ -284,15 +284,15 @@ public class TaskListUiTest extends TestCase {
 		//setup
 		MoveToCategoryMenuContributor moveToMenuContrib = new MoveToCategoryMenuContributor();
 		MenuManager menuManager = null;
-		List<ITaskListElement> selectedElements = new Vector<ITaskListElement>();
+		List<AbstractTaskListElement> selectedElements = new Vector<AbstractTaskListElement>();
 		selectedElements.add(cat1task1);
 
-		List<ITaskListElement> emptySelection = new Vector<ITaskListElement>();
+		List<AbstractTaskListElement> emptySelection = new Vector<AbstractTaskListElement>();
 
-		List<ITaskListElement> categorySelection = new Vector<ITaskListElement>();
+		List<AbstractTaskListElement> categorySelection = new Vector<AbstractTaskListElement>();
 		categorySelection.add(cat1);
 
-		List<ITaskListElement> querySelection = new Vector<ITaskListElement>();
+		List<AbstractTaskListElement> querySelection = new Vector<AbstractTaskListElement>();
 		querySelection.add(new MockRepositoryQuery("query", null));
 
 		//execute system under test & assert
@@ -355,8 +355,8 @@ public class TaskListUiTest extends TestCase {
 			assertTrue(items[i].getData() instanceof TaskCategory);
 			TreeItem[] sub = items[i].getItems();
 			for (int j = 0; j < sub.length; j++) {
-				assertTrue(sub[j].getData() instanceof ITask);
-				ITask task = (ITask) sub[j].getData();
+				assertTrue(sub[j].getData() instanceof AbstractTask);
+				AbstractTask task = (AbstractTask) sub[j].getData();
 				if (checkComplete) {
 					assertTrue(task.isCompleted());
 				} else {
@@ -377,8 +377,8 @@ public class TaskListUiTest extends TestCase {
 			assertTrue(items[i].getData() instanceof TaskCategory);
 			TreeItem[] sub = items[i].getItems();
 			for (int j = 0; j < sub.length; j++) {
-				assertTrue(sub[j].getData() instanceof ITask);
-				ITask task = (ITask) sub[j].getData();
+				assertTrue(sub[j].getData() instanceof AbstractTask);
+				AbstractTask task = (AbstractTask) sub[j].getData();
 				assertTrue(task.getPriority().equals("P2") || task.getPriority().equals("P1"));
 				if (task.getPriority().equals("P2")) {
 					p2Count++;
diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskRepositoryManagerTest.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskRepositoryManagerTest.java
index be38a542a..99420aa8e 100644
--- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskRepositoryManagerTest.java
+++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskRepositoryManagerTest.java
@@ -61,7 +61,7 @@ public class TaskRepositoryManagerTest extends TestCase {
 		String handle = RepositoryTaskHandleUtil.getHandle(url, id);
 		assertEquals(url, RepositoryTaskHandleUtil.getRepositoryUrl(handle));
 		assertEquals(id, RepositoryTaskHandleUtil.getTaskId(handle));
-//		assertEquals(123, AbstractRepositoryTask.getTaskIdAsInt(handle));
+//		assertEquals(123, AbstractTask.getTaskIdAsInt(handle));
 	}
 
 	public void testMultipleNotAdded() throws MalformedURLException {
diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskTest.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskTest.java
index 139fb6f99..dfb665227 100644
--- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskTest.java
+++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskTest.java
@@ -14,8 +14,8 @@ package org.eclipse.mylyn.tasks.tests;
 import junit.framework.TestCase;
 
 import org.eclipse.mylyn.internal.tasks.core.LocalTask;
-import org.eclipse.mylyn.tasks.core.AbstractRepositoryTask;
-import org.eclipse.mylyn.tasks.core.AbstractRepositoryTask.PriorityLevel;
+import org.eclipse.mylyn.tasks.core.AbstractTask;
+import org.eclipse.mylyn.tasks.core.AbstractTask.PriorityLevel;
 
 /**
  * @author Mik Kersten
@@ -33,7 +33,7 @@ public class TaskTest extends TestCase {
 	}
 
 	public void testUrl() {
-		AbstractRepositoryTask task = new LocalTask("handle", "label");
+		AbstractTask task = new LocalTask("handle", "label");
 		task.setTaskUrl("http://eclipse.org/mylar/doc.php");
 		assertTrue(task.hasValidUrl());
 
@@ -51,12 +51,12 @@ public class TaskTest extends TestCase {
 	}
 	
 	public void testPriorityNeverNull() {
-		AbstractRepositoryTask task = new LocalTask("handle", "label");
+		AbstractTask task = new LocalTask("handle", "label");
 		assertNotNull(task.getPriority());
 		
 		PriorityLevel def = PriorityLevel.getDefault();		
 		assertNotNull(def);		
-		assertEquals(def, AbstractRepositoryTask.PriorityLevel.fromDescription("garbage"));
-		assertEquals(def, AbstractRepositoryTask.PriorityLevel.fromString("garbage"));		
+		assertEquals(def, AbstractTask.PriorityLevel.fromDescription("garbage"));
+		assertEquals(def, AbstractTask.PriorityLevel.fromString("garbage"));		
 	}
 }
diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/connector/MockAttachmentHandler.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/connector/MockAttachmentHandler.java
index ea4c18f37..bc58b8bde 100644
--- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/connector/MockAttachmentHandler.java
+++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/connector/MockAttachmentHandler.java
@@ -15,7 +15,7 @@ import java.io.OutputStream;
 
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
-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.ITaskAttachment;
 import org.eclipse.mylyn.tasks.core.RepositoryAttachment;
@@ -33,12 +33,12 @@ public class MockAttachmentHandler implements IAttachmentHandler {
 		return false;
 	}
 
-	public boolean canDownloadAttachment(TaskRepository repository, AbstractRepositoryTask task) {
+	public boolean canDownloadAttachment(TaskRepository repository, AbstractTask task) {
 		// ignore
 		return true;
 	}
 
-	public boolean canUploadAttachment(TaskRepository repository, AbstractRepositoryTask task) {
+	public boolean canUploadAttachment(TaskRepository repository, AbstractTask task) {
 		// ignore
 		return true;
 	}
@@ -62,7 +62,7 @@ public class MockAttachmentHandler implements IAttachmentHandler {
 		// ignore
 	}
 
-	public void uploadAttachment(TaskRepository repository, AbstractRepositoryTask task, ITaskAttachment attachment,
+	public void uploadAttachment(TaskRepository repository, AbstractTask task, ITaskAttachment attachment,
 			String comment, IProgressMonitor monitor) throws CoreException {
 		// ignore
 	}
diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/connector/MockRepositoryConnector.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/connector/MockRepositoryConnector.java
index 08748b9b7..f2c2e8e8a 100644
--- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/connector/MockRepositoryConnector.java
+++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/connector/MockRepositoryConnector.java
@@ -20,7 +20,7 @@ import org.eclipse.core.runtime.IStatus;
 import org.eclipse.mylyn.tasks.core.AbstractAttributeFactory;
 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;
@@ -128,24 +128,24 @@ public class MockRepositoryConnector extends AbstractRepositoryConnector {
 	}
 
 	@Override
-	public void updateTaskFromRepository(TaskRepository repository, AbstractRepositoryTask repositoryTask, IProgressMonitor monitor) {
+	public void updateTaskFromRepository(TaskRepository repository, AbstractTask repositoryTask, IProgressMonitor monitor) {
 		// ignore
 	}
 
 	@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 {
 		return Collections.emptySet();
 	}
 
 	@Override
-	public AbstractRepositoryTask createTask(String repositoryUrl, String id, String summary) {
+	public AbstractTask createTask(String repositoryUrl, String id, String summary) {
 		// ignore
 		return null;
 	}
 
 	@Override
-	public void updateTaskFromTaskData(TaskRepository repository, AbstractRepositoryTask repositoryTask,
+	public void updateTaskFromTaskData(TaskRepository repository, AbstractTask repositoryTask,
 			RepositoryTaskData taskData) {
 		// ignore
 
diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/connector/MockRepositoryExternalizer.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/connector/MockRepositoryExternalizer.java
index ede10073f..8c77c2eb7 100644
--- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/connector/MockRepositoryExternalizer.java
+++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/connector/MockRepositoryExternalizer.java
@@ -12,11 +12,11 @@
 package org.eclipse.mylyn.tasks.tests.connector;
 
 import org.eclipse.mylyn.tasks.core.AbstractRepositoryQuery;
-import org.eclipse.mylyn.tasks.core.AbstractTaskContainer;
+import org.eclipse.mylyn.tasks.core.AbstractTaskListElement;
 import org.eclipse.mylyn.tasks.core.DelegatingTaskExternalizer;
-import org.eclipse.mylyn.tasks.core.ITask;
+import org.eclipse.mylyn.tasks.core.AbstractTask;
 import org.eclipse.mylyn.tasks.core.TaskExternalizationException;
-import org.eclipse.mylyn.tasks.core.TaskList;
+import org.eclipse.mylyn.tasks.core.getAllCategories;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 
@@ -33,7 +33,7 @@ public class MockRepositoryExternalizer extends DelegatingTaskExternalizer {
 	}
 
 	@Override
-	public boolean canCreateElementFor(ITask task) {
+	public boolean canCreateElementFor(AbstractTask task) {
 		return task instanceof MockRepositoryTask;
 	}
 
@@ -63,7 +63,7 @@ public class MockRepositoryExternalizer extends DelegatingTaskExternalizer {
 	}
 	
 	@Override
-	public ITask createTask(String repositoryUrl, String taskId, String summary, Element element, TaskList taskList, AbstractTaskContainer category, ITask parent)
+	public AbstractTask createTask(String repositoryUrl, String taskId, String summary, Element element, getAllCategories taskList, AbstractTaskListElement category, AbstractTask parent)
 			throws TaskExternalizationException {
 		MockRepositoryTask task = new MockRepositoryTask(repositoryUrl, taskId, summary);
 		return task;
diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/connector/MockRepositoryTask.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/connector/MockRepositoryTask.java
index 0219f9373..b0c68949e 100644
--- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/connector/MockRepositoryTask.java
+++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/connector/MockRepositoryTask.java
@@ -11,12 +11,12 @@
 
 package org.eclipse.mylyn.tasks.tests.connector;
 
-import org.eclipse.mylyn.tasks.core.AbstractRepositoryTask;
+import org.eclipse.mylyn.tasks.core.AbstractTask;
 
 /**
  * @author Mik Kersten
  */
-public class MockRepositoryTask extends AbstractRepositoryTask {
+public class MockRepositoryTask extends AbstractTask {
 	
 	private String ownerId;