Progress on: 129625: make task list backed by single task container mechanism

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

2 files changed, 14 insertions, 14 deletions

diff --git a/org.eclipse.mylyn.tests/src/org/eclipse/mylyn/tests/integration/ChangeDataDirTest.java b/org.eclipse.mylyn.tests/src/org/eclipse/mylyn/tests/integration/ChangeDataDirTest.java
index 1c69456b..5ea83aae 100644
--- a/org.eclipse.mylyn.tests/src/org/eclipse/mylyn/tests/integration/ChangeDataDirTest.java
+++ b/org.eclipse.mylyn.tests/src/org/eclipse/mylyn/tests/integration/ChangeDataDirTest.java
@@ -51,7 +51,7 @@ public class ChangeDataDirTest extends TestCase {
 		File dir = new File(newDataDir);
 		dir.mkdir();
 		dir.deleteOnExit();
-		MylarTaskListPlugin.getTaskListManager().createNewTaskList();
+		MylarTaskListPlugin.getTaskListManager().resetTaskList();
 		MylarTaskListPlugin.getDefault().getTaskListSaveManager().saveTaskListAndContexts();
 	}
 
@@ -95,7 +95,7 @@ public class ChangeDataDirTest extends TestCase {
 	public void testTaskMove() {
 		String handle = "task-1";
 		ITask task = new Task(handle, "label", true);
-		manager.moveToRoot(task);
+		manager.getTaskList().moveToRoot(task);
 
 		ITask readTaskBeforeMove = manager.getTaskForHandle(handle, true);
 		MylarTaskListPlugin.getDefault().getTaskListSaveManager().copyDataDirContentsTo(newDataDir);
@@ -132,7 +132,7 @@ public class ChangeDataDirTest extends TestCase {
 		MylarTaskListPlugin.getTaskListManager().getTaskList().addTaskToArchive(newTask);
 //		BugzillaTaskHandler handler = new BugzillaTaskHandler();
 //		handler.addTaskToArchive(newTask);
-		MylarTaskListPlugin.getTaskListManager().moveToRoot(newTask);
+		MylarTaskListPlugin.getTaskListManager().getTaskList().moveToRoot(newTask);
 	}
 
 	// /**
diff --git a/org.eclipse.mylyn.tests/src/org/eclipse/mylyn/tests/misc/BugzillaSearchPluginTest.java b/org.eclipse.mylyn.tests/src/org/eclipse/mylyn/tests/misc/BugzillaSearchPluginTest.java
index ad88134f..f18dca96 100644
--- a/org.eclipse.mylyn.tests/src/org/eclipse/mylyn/tests/misc/BugzillaSearchPluginTest.java
+++ b/org.eclipse.mylyn.tests/src/org/eclipse/mylyn/tests/misc/BugzillaSearchPluginTest.java
@@ -230,29 +230,29 @@ public class BugzillaSearchPluginTest extends TestCase {
 		// MylarTaskListPlugin.getTaskListManager().setTaskList(t);
 		TaskListManager manager = MylarTaskListPlugin.getTaskListManager();
 		TaskCategory cat = new TaskCategory("Testing Category");
-		manager.addCategory(cat);
+		manager.getTaskList().addCategory(cat);
 		BugzillaTask bugTask1 = new BugzillaTask(bugPrefix + 94185, "<bugzilla info>", true);
 
-		manager.moveToCategory(cat, bugTask1);
+		manager.getTaskList().moveToCategory(cat, bugTask1);
 		// cat.addTask(bugTask1);
 		while (bugTask1.isCurrentlySynchronizing()) {
 			Thread.sleep(500);
 		}
 		BugzillaTask bugTask2 = new BugzillaTask(bugPrefix + 3692, "<bugzilla info>", true);
-		manager.moveToCategory(cat, bugTask2);
+		manager.getTaskList().moveToCategory(cat, bugTask2);
 		// cat.addTask(bugTask2);
 		while (bugTask2.isCurrentlySynchronizing()) {
 			Thread.sleep(500);
 		}
 		BugzillaTask bugTask3 = new BugzillaTask(bugPrefix + 3693, "<bugzilla info>", true);
-		manager.moveToCategory(cat, bugTask3);
+		manager.getTaskList().moveToCategory(cat, bugTask3);
 		// cat.addTask(bugTask3);
 		while (bugTask3.isCurrentlySynchronizing()) {
 			Thread.sleep(500);
 		}
 
 		BugzillaTask bugTask4 = new BugzillaTask(bugPrefix + 9583, "<bugzilla info>", true);
-		manager.moveToCategory(cat, bugTask4);
+		manager.getTaskList().moveToCategory(cat, bugTask4);
 		// cat.addTask(bugTask4);
 		while (bugTask4.isCurrentlySynchronizing()) {
 			Thread.sleep(500);
@@ -283,7 +283,7 @@ public class BugzillaSearchPluginTest extends TestCase {
 		assertEquals("Results not the right size", 3, c.size());
 
 		MylarBugsPlugin.getBridge().removeFromLandmarksHash(astNodeType);
-		MylarTaskListPlugin.getTaskListManager().deleteCategory(cat);
+		MylarTaskListPlugin.getTaskListManager().getTaskList().deleteCategory(cat);
 	}
 
 	// TODO need to test a bug that wraps...should fail since we can only search
@@ -297,22 +297,22 @@ public class BugzillaSearchPluginTest extends TestCase {
 		// MylarTaskListPlugin.getTaskListManager().setTaskList(t);
 		TaskListManager manager = MylarTaskListPlugin.getTaskListManager();
 		TaskCategory cat = new TaskCategory("Testing Category");
-		manager.addCategory(cat);
+		manager.getTaskList().addCategory(cat);
 		BugzillaTask bugTask1 = new BugzillaTask(bugPrefix + 94185, "<bugzilla info>", true);
-		manager.moveToCategory(cat, bugTask1);
+		manager.getTaskList().moveToCategory(cat, bugTask1);
 		// cat.addTask(bugTask1);
 		while (bugTask1.isCurrentlySynchronizing()) {
 			Thread.sleep(500);
 		}
 
 		BugzillaTask bugTask2 = new BugzillaTask(bugPrefix + 9583, "<bugzilla info>", true);
-		manager.moveToCategory(cat, bugTask2);
+		manager.getTaskList().moveToCategory(cat, bugTask2);
 		// cat.addTask(bugTask2);
 		while (bugTask2.isCurrentlySynchronizing()) {
 			Thread.sleep(500);
 		}
 		BugzillaTask bugTask3 = new BugzillaTask(bugPrefix + 3693, "<bugzilla info>", true);
-		manager.moveToCategory(cat, bugTask3);
+		manager.getTaskList().moveToCategory(cat, bugTask3);
 		// cat.addTask(bugTask3);
 		while (bugTask3.isCurrentlySynchronizing()) {
 			Thread.sleep(500);
@@ -343,7 +343,7 @@ public class BugzillaSearchPluginTest extends TestCase {
 		assertEquals("Results not the right size", 1, c.size());
 
 		MylarBugsPlugin.getBridge().removeFromLandmarksHash(astNodeType);
-		MylarTaskListPlugin.getTaskListManager().deleteCategory(cat);
+		MylarTaskListPlugin.getTaskListManager().getTaskList().deleteCategory(cat);
 	}
 
 }