NEW - bug 166609: [api] improve task externalization API

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

6 files changed, 15 insertions, 15 deletions

diff --git a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/AbstractBugzillaTest.java b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/AbstractBugzillaTest.java
index a04747799..7308dd0d1 100644
--- a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/AbstractBugzillaTest.java
+++ b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/AbstractBugzillaTest.java
@@ -114,7 +114,7 @@ public abstract class AbstractBugzillaTest extends TestCase {
 		BugzillaTask task = (BugzillaTask) connector.createTaskFromExistingId(repository, taskNumber, new NullProgressMonitor());
 		TasksUiPlugin.getSynchronizationManager().setTaskRead(task, true);
 		assertNotNull(task);
-		TasksUiPlugin.getTaskListManager().getTaskList().moveToContainer(TasksUiPlugin.getTaskListManager().getTaskList().getDefaultCategory(), task);
+		TasksUiPlugin.getTaskListManager().getTaskList().moveToContainer(task, TasksUiPlugin.getTaskListManager().getTaskList().getDefaultCategory());
 		
 		return task;
 	}
diff --git a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/BugzillaRepositoryConnectorTest.java b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/BugzillaRepositoryConnectorTest.java
index c115df90d..2c4f2a587 100644
--- a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/BugzillaRepositoryConnectorTest.java
+++ b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/BugzillaRepositoryConnectorTest.java
@@ -190,7 +190,7 @@ public class BugzillaRepositoryConnectorTest extends AbstractBugzillaTest {
 				task.getHandleIdentifier());
 		assertNotNull(taskData);
 
-		TasksUiPlugin.getTaskListManager().getTaskList().moveToContainer(TasksUiPlugin.getTaskListManager().getTaskList().getDefaultCategory(), task);
+		TasksUiPlugin.getTaskListManager().getTaskList().moveToContainer(task, TasksUiPlugin.getTaskListManager().getTaskList().getDefaultCategory());
 		int numComments = taskData.getComments().size();
 
 		// Modify it
diff --git a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/BugzillaTaskListManagerTest.java b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/BugzillaTaskListManagerTest.java
index 036f1af12..ce77d839a 100644
--- a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/BugzillaTaskListManagerTest.java
+++ b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/BugzillaTaskListManagerTest.java
@@ -92,7 +92,7 @@ public class BugzillaTaskListManagerTest extends TestCase {
 	public void testRepositoryTaskExternalization() {
 		BugzillaTask repositoryTask = new BugzillaTask("repo", "1", "label");
 		repositoryTask.setKind("kind");
-		manager.getTaskList().moveToContainer(TasksUiPlugin.getTaskListManager().getTaskList().getDefaultCategory(), repositoryTask);
+		manager.getTaskList().moveToContainer(repositoryTask, TasksUiPlugin.getTaskListManager().getTaskList().getDefaultCategory());
 		manager.saveTaskList();
 
 		manager.resetTaskList();
@@ -177,7 +177,7 @@ public class BugzillaTaskListManagerTest extends TestCase {
 		// manager.setTaskList(list);
 		manager.readExistingOrCreateNewList();
 
-		assertEquals(allRootTasks.size(), manager.getTaskList().getDefaultCategory().getChildren());
+		assertEquals(allRootTasks.size(), manager.getTaskList().getDefaultCategory().getChildren().size());
 		assertEquals(allCategories, manager.getTaskList().getCategories());
 		assertEquals(allRoots.size(), manager.getTaskList().getRootElements().size());
 		assertEquals(allTasks.size(), manager.getTaskList().getAllTasks().size());
diff --git a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/RepositoryTaskHandleTest.java b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/RepositoryTaskHandleTest.java
index 16d4775ba..f08b2344e 100644
--- a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/RepositoryTaskHandleTest.java
+++ b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/RepositoryTaskHandleTest.java
@@ -57,7 +57,7 @@ public class RepositoryTaskHandleTest extends TestCase {
 		BugzillaTask bugTask = new BugzillaTask(repository, id, "label 124");
 		assertEquals(repository, bugTask.getRepositoryUrl());
 
-		manager.getTaskList().moveToContainer(TasksUiPlugin.getTaskListManager().getTaskList().getDefaultCategory(), bugTask);
+		manager.getTaskList().moveToContainer(bugTask, TasksUiPlugin.getTaskListManager().getTaskList().getDefaultCategory());
 		manager.saveTaskList();
 		manager.resetTaskList();
 		manager.readExistingOrCreateNewList();
diff --git a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/TaskListStandaloneTest.java b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/TaskListStandaloneTest.java
index d96e82a62..925c70570 100644
--- a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/TaskListStandaloneTest.java
+++ b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/TaskListStandaloneTest.java
@@ -59,7 +59,7 @@ public class TaskListStandaloneTest extends TestCase {
 		AbstractTask task = new LocalTask("1", "task 1");
 		Date dueDate = new Date();
 		task.setDueDate(dueDate);
-		manager.getTaskList().moveToContainer(manager.getTaskList().getDefaultCategory(), task);
+		manager.getTaskList().moveToContainer(task, manager.getTaskList().getDefaultCategory());
 		assertEquals(1, manager.getTaskList().getAllTasks().size());
 
 		manager.saveTaskList();
@@ -91,7 +91,7 @@ public class TaskListStandaloneTest extends TestCase {
 		Date creation = new Date();
 		AbstractTask task = new LocalTask("1", "task 1");
 
-		manager.getTaskList().moveToContainer(manager.getTaskList().getDefaultCategory(), task);
+		manager.getTaskList().moveToContainer(task, manager.getTaskList().getDefaultCategory());
 		assertDatesCloseEnough(task.getCreationDate(), start);
 
 		task.setCompleted(true);
diff --git a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/TaskReportGeneratorTest.java b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/TaskReportGeneratorTest.java
index 9e9acd4ff..a02c39f95 100644
--- a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/TaskReportGeneratorTest.java
+++ b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/TaskReportGeneratorTest.java
@@ -56,7 +56,7 @@ public class TaskReportGeneratorTest extends TestCase {
 
 	public void testCompletedTasksRetrieved() throws InvocationTargetException, InterruptedException {
 		AbstractTask task1 = manager.createNewLocalTask("task 1");
-		manager.getTaskList().moveToContainer(manager.getTaskList().getDefaultCategory(), task1);
+		manager.getTaskList().moveToContainer(task1, manager.getTaskList().getDefaultCategory());
 
 		CompletedTaskCollector collector = new CompletedTaskCollector(new Date(0));
 		TaskReportGenerator generator = new TaskReportGenerator(manager.getTaskList());
@@ -72,7 +72,7 @@ public class TaskReportGeneratorTest extends TestCase {
 	
 	public void testCompletedTasksDateBoundsRetrieved() throws InvocationTargetException, InterruptedException {
 		AbstractTask task1 = manager.createNewLocalTask("task 1");
-		manager.getTaskList().moveToContainer(manager.getTaskList().getDefaultCategory(), task1);
+		manager.getTaskList().moveToContainer(task1, manager.getTaskList().getDefaultCategory());
 		task1.setCompleted(true);
 		Thread.sleep(1000);
 		long now = new Date().getTime();
@@ -94,7 +94,7 @@ public class TaskReportGeneratorTest extends TestCase {
 	public void testCompletedBugzillaTasksRetrieved() throws InvocationTargetException, InterruptedException {
 		BugzillaTask task1 = new BugzillaTask("repo", "1",
 				"bugzillatask 1");
-		manager.getTaskList().moveToContainer(manager.getTaskList().getDefaultCategory(), task1);
+		manager.getTaskList().moveToContainer(task1, manager.getTaskList().getDefaultCategory());
 
 		CompletedTaskCollector collector = new CompletedTaskCollector(new Date(0));
 		TaskReportGenerator generator = new TaskReportGenerator(manager.getTaskList());
@@ -110,7 +110,7 @@ public class TaskReportGeneratorTest extends TestCase {
 
 	public void testCompletedTasksInCategoryRetrieved() throws InvocationTargetException, InterruptedException {
 		AbstractTask task1 = manager.createNewLocalTask("task 1");
-		manager.getTaskList().moveToContainer(manager.getTaskList().getDefaultCategory(), task1);
+		manager.getTaskList().moveToContainer(task1, manager.getTaskList().getDefaultCategory());
 		task1.setCompleted(true);
 		TaskCategory cat1 = new TaskCategory("TaskReportGeneratorTest Category");
 		manager.getTaskList().addCategory(cat1);
@@ -124,7 +124,7 @@ public class TaskReportGeneratorTest extends TestCase {
 		generator.run(new NullProgressMonitor());
 		assertEquals(0, generator.getAllCollectedTasks().size());
 
-		manager.getTaskList().moveToContainer(cat1, task1);
+		manager.getTaskList().moveToContainer(task1, cat1);
 
 		generator.run(new NullProgressMonitor());
 		assertEquals(1, generator.getAllCollectedTasks().size());
@@ -133,7 +133,7 @@ public class TaskReportGeneratorTest extends TestCase {
 
 	public void testCompletedBugzillaTasksInCategoryRetrieved() throws InvocationTargetException, InterruptedException {
 		BugzillaTask task1 = new BugzillaTask("repo", "1", "task 1");
-		manager.getTaskList().moveToContainer(TasksUiPlugin.getTaskListManager().getTaskList().getDefaultCategory(), task1);
+		manager.getTaskList().moveToContainer(task1, TasksUiPlugin.getTaskListManager().getTaskList().getDefaultCategory());
 		task1.setCompleted(true);
 		TaskCategory cat1 = new TaskCategory("TaskReportGeneratorTest Category");
 		manager.getTaskList().addCategory(cat1);
@@ -147,7 +147,7 @@ public class TaskReportGeneratorTest extends TestCase {
 		generator.run(new NullProgressMonitor());
 		assertEquals(0, generator.getAllCollectedTasks().size());
 
-		manager.getTaskList().moveToContainer(cat1, task1);
+		manager.getTaskList().moveToContainer(task1, cat1);
 
 		generator.run(new NullProgressMonitor());
 		assertEquals(1, generator.getAllCollectedTasks().size());
@@ -156,7 +156,7 @@ public class TaskReportGeneratorTest extends TestCase {
 
 	public void testCompletedBugzillaTasksInQueryRetrieved() throws InvocationTargetException, InterruptedException {
 		BugzillaTask task1 = new BugzillaTask("repo", "1", "task 1");
-		manager.getTaskList().moveToContainer(TasksUiPlugin.getTaskListManager().getTaskList().getDefaultCategory(), task1);
+		manager.getTaskList().moveToContainer(task1, TasksUiPlugin.getTaskListManager().getTaskList().getDefaultCategory());
 		task1.setCompleted(false);
 
 		BugzillaRepositoryQuery bugQuery = new BugzillaRepositoryQuery("repositoryUrl", "queryUrl",