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

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

2 files changed, 8 insertions, 7 deletions

diff --git a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/TaskListNotificationManagerTest.java b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/TaskListNotificationManagerTest.java
index 85dbd4627..8b9d92ff1 100644
--- a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/TaskListNotificationManagerTest.java
+++ b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/TaskListNotificationManagerTest.java
@@ -17,12 +17,12 @@ import junit.framework.TestCase;
 
 import org.eclipse.mylyn.internal.bugzilla.core.BugzillaRepositoryQuery;
 import org.eclipse.mylyn.internal.bugzilla.core.BugzillaTask;
+import org.eclipse.mylyn.internal.tasks.core.LocalTask;
 import org.eclipse.mylyn.internal.tasks.ui.ITaskListNotification;
 import org.eclipse.mylyn.internal.tasks.ui.TaskListNotificationIncoming;
 import org.eclipse.mylyn.internal.tasks.ui.TaskListNotificationManager;
 import org.eclipse.mylyn.tasks.core.AbstractRepositoryTask;
 import org.eclipse.mylyn.tasks.core.ITask;
-import org.eclipse.mylyn.tasks.core.Task;
 import org.eclipse.mylyn.tasks.core.TaskRepository;
 import org.eclipse.mylyn.tasks.core.AbstractRepositoryTask.RepositoryTaskSyncState;
 import org.eclipse.mylyn.tasks.ui.TasksUiPlugin;
@@ -46,9 +46,9 @@ public class TaskListNotificationManagerTest extends TestCase {
 
 		Date now = new Date();
 
-		ITask task0 = new Task("t0", "t0 - test 0");
-		ITask task1 = new Task("t1", "t1 - test 1");
-		ITask task2 = new Task("t2", "t2 - test 2");
+		ITask task0 = new LocalTask("t0", "t0 - test 0");
+		ITask task1 = new LocalTask("t1", "t1 - test 1");
+		ITask task2 = new LocalTask("t2", "t2 - test 2");
 
 		task0.setScheduledForDate(new Date(now.getTime() - 2000));
 		task1.setScheduledForDate(new Date(now.getTime() - 2000));
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 dc3f007c7..6e91075e2 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
@@ -23,6 +23,7 @@ import org.eclipse.mylyn.internal.bugzilla.core.BugzillaRepositoryQuery;
 import org.eclipse.mylyn.internal.bugzilla.core.BugzillaTask;
 import org.eclipse.mylyn.internal.bugzilla.core.IBugzillaConstants;
 import org.eclipse.mylyn.internal.bugzilla.ui.tasklist.BugzillaTaskExternalizer;
+import org.eclipse.mylyn.internal.tasks.core.LocalTask;
 import org.eclipse.mylyn.tasks.core.ITask;
 import org.eclipse.mylyn.tasks.core.ITaskListExternalizer;
 import org.eclipse.mylyn.tasks.core.Task;
@@ -59,7 +60,7 @@ public class TaskListStandaloneTest extends TestCase {
 	}
 	
 	public void testDueDateExternalization() {
-		ITask task = new Task("1", "task 1");
+		ITask task = new LocalTask("1", "task 1");
 		Date dueDate = new Date();
 		task.setDueDate(dueDate);
 		manager.getTaskList().moveToRoot(task);
@@ -76,7 +77,7 @@ public class TaskListStandaloneTest extends TestCase {
 	}
 
 	public void testPastReminder() {
-		ITask task = new Task("1", "1");
+		ITask task = new LocalTask("1", "1");
 		long now = new Date().getTime();
 		task.setScheduledForDate(new Date(now - 1000));
 		assertTrue(task.isPastReminder());
@@ -92,7 +93,7 @@ public class TaskListStandaloneTest extends TestCase {
 	public void testDates() {
 		Date start = Calendar.getInstance().getTime();
 		Date creation = new Date();
-		Task task = new Task("1", "task 1");
+		Task task = new LocalTask("1", "task 1");
 
 		manager.getTaskList().moveToRoot(task);
 		assertDatesCloseEnough(task.getCreationDate(), start);