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

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

5 files changed, 22 insertions, 22 deletions

diff --git a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/BugzillaTaskTest.java b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/BugzillaTaskTest.java
index ceb7426e2..e7058a2aa 100644
--- a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/BugzillaTaskTest.java
+++ b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/BugzillaTaskTest.java
@@ -24,9 +24,9 @@ import org.eclipse.mylyn.internal.bugzilla.core.BugzillaTask;
 import org.eclipse.mylyn.internal.bugzilla.core.BugzillaTaskDataHandler;
 import org.eclipse.mylyn.internal.bugzilla.core.IBugzillaConstants;
 import org.eclipse.mylyn.tasks.core.AbstractRepositoryConnector;
+import org.eclipse.mylyn.tasks.core.AbstractRepositoryTask;
 import org.eclipse.mylyn.tasks.core.RepositoryTaskAttribute;
 import org.eclipse.mylyn.tasks.core.RepositoryTaskData;
-import org.eclipse.mylyn.tasks.core.Task;
 import org.eclipse.mylyn.tasks.core.TaskComment;
 import org.eclipse.mylyn.tasks.core.TaskRepository;
 import org.eclipse.mylyn.tasks.ui.TasksUiPlugin;
@@ -53,7 +53,7 @@ public class BugzillaTaskTest extends TestCase {
 	public void testCompletionDate() throws Exception {
 		BugzillaTask task = new BugzillaTask("repo", "1", "summary");
 		RepositoryTaskData taskData = new RepositoryTaskData(new BugzillaAttributeFactory(),
-				BugzillaCorePlugin.REPOSITORY_KIND, IBugzillaConstants.ECLIPSE_BUGZILLA_URL, "1", Task.DEFAULT_TASK_KIND);
+				BugzillaCorePlugin.REPOSITORY_KIND, IBugzillaConstants.ECLIPSE_BUGZILLA_URL, "1", AbstractRepositoryTask.DEFAULT_TASK_KIND);
 				
 		//XXX rewrite test
 		
diff --git a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/DuplicateDetetionTest.java b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/DuplicateDetetionTest.java
index 1e4ed64dd..fc191281d 100644
--- a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/DuplicateDetetionTest.java
+++ b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/DuplicateDetetionTest.java
@@ -17,8 +17,8 @@ import org.eclipse.mylyn.internal.bugzilla.core.BugzillaAttributeFactory;
 import org.eclipse.mylyn.internal.bugzilla.core.BugzillaCorePlugin;
 import org.eclipse.mylyn.internal.bugzilla.core.IBugzillaConstants;
 import org.eclipse.mylyn.internal.bugzilla.ui.editor.NewBugzillaTaskEditor;
+import org.eclipse.mylyn.tasks.core.AbstractRepositoryTask;
 import org.eclipse.mylyn.tasks.core.RepositoryTaskData;
-import org.eclipse.mylyn.tasks.core.Task;
 import org.eclipse.mylyn.tasks.core.TaskRepository;
 import org.eclipse.mylyn.tasks.ui.TasksUiPlugin;
 import org.eclipse.mylyn.tasks.ui.TasksUiUtil;
@@ -47,7 +47,7 @@ public class DuplicateDetetionTest extends TestCase {
 		String stackTrace = "java.lang.NullPointerException\nat jeff.testing.stack.trace.functionality(jeff.java:481)";
 
 		RepositoryTaskData model = new RepositoryTaskData(new BugzillaAttributeFactory(), BugzillaCorePlugin.REPOSITORY_KIND, repository.getUrl(), TasksUiPlugin.getDefault()
-				.getTaskDataManager().getNewRepositoryTaskId(), Task.DEFAULT_TASK_KIND);
+				.getTaskDataManager().getNewRepositoryTaskId(), AbstractRepositoryTask.DEFAULT_TASK_KIND);
 		model.setDescription(stackTrace);
 		model.setNew(true);
 		IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
@@ -65,7 +65,7 @@ public class DuplicateDetetionTest extends TestCase {
 	public void testNoStackTrace() throws Exception {
 		String fakeStackTrace = "this is not really a stacktrace";
 		RepositoryTaskData model = new RepositoryTaskData(new BugzillaAttributeFactory(), BugzillaCorePlugin.REPOSITORY_KIND, repository.getUrl(), TasksUiPlugin.getDefault()
-				.getTaskDataManager().getNewRepositoryTaskId(), Task.DEFAULT_TASK_KIND);
+				.getTaskDataManager().getNewRepositoryTaskId(), AbstractRepositoryTask.DEFAULT_TASK_KIND);
 		model.setDescription(fakeStackTrace);
 		model.setNew(true);
 		IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
@@ -86,7 +86,7 @@ public class DuplicateDetetionTest extends TestCase {
 		String extraText = "\nExtra text that isnt' part of the stack trace java:";
 
 		RepositoryTaskData model = new RepositoryTaskData(new BugzillaAttributeFactory(), BugzillaCorePlugin.REPOSITORY_KIND, repository.getUrl(), TasksUiPlugin.getDefault()
-				.getTaskDataManager().getNewRepositoryTaskId(), Task.DEFAULT_TASK_KIND);
+				.getTaskDataManager().getNewRepositoryTaskId(), AbstractRepositoryTask.DEFAULT_TASK_KIND);
 
 		model.setDescription(extraText + "\n" + stackTrace + "\n");
 		model.setNew(true);
@@ -116,7 +116,7 @@ public class DuplicateDetetionTest extends TestCase {
 		"at org.eclipse.jdt.internal.core.JavaElement\n.getURLContents(JavaElement.java:734)";
 
 		RepositoryTaskData model = new RepositoryTaskData(new BugzillaAttributeFactory(), BugzillaCorePlugin.REPOSITORY_KIND, repository.getUrl(), TasksUiPlugin.getDefault()
-				.getTaskDataManager().getNewRepositoryTaskId(), Task.DEFAULT_TASK_KIND);
+				.getTaskDataManager().getNewRepositoryTaskId(), AbstractRepositoryTask.DEFAULT_TASK_KIND);
 
 		model.setDescription(stackTrace);
 		model.setNew(true);
@@ -145,7 +145,7 @@ public class DuplicateDetetionTest extends TestCase {
 		"     at org.eclipse.jdt.internal.core.JavaElement.getURLContents(JavaElement.java:734)";
 
 		RepositoryTaskData model = new RepositoryTaskData(new BugzillaAttributeFactory(), BugzillaCorePlugin.REPOSITORY_KIND, repository.getUrl(), TasksUiPlugin.getDefault()
-				.getTaskDataManager().getNewRepositoryTaskId(), Task.DEFAULT_TASK_KIND);
+				.getTaskDataManager().getNewRepositoryTaskId(), AbstractRepositoryTask.DEFAULT_TASK_KIND);
 
 		model.setDescription(stackTrace);
 		model.setNew(true);
@@ -170,7 +170,7 @@ public class DuplicateDetetionTest extends TestCase {
 		"	   at gnu.java.lang.MainThread.run() (/usr/lib/libgcj.so.6.0.0)";
 		
 		RepositoryTaskData model = new RepositoryTaskData(new BugzillaAttributeFactory(), BugzillaCorePlugin.REPOSITORY_KIND, repository.getUrl(), TasksUiPlugin.getDefault()
-				.getTaskDataManager().getNewRepositoryTaskId(), Task.DEFAULT_TASK_KIND);
+				.getTaskDataManager().getNewRepositoryTaskId(), AbstractRepositoryTask.DEFAULT_TASK_KIND);
 
 		model.setDescription(stackTrace);
 		model.setNew(true);
@@ -194,7 +194,7 @@ public class DuplicateDetetionTest extends TestCase {
 		"	at java.lang.reflect.Method.Invoke (Method.java)";
 		
 		RepositoryTaskData model = new RepositoryTaskData(new BugzillaAttributeFactory(), BugzillaCorePlugin.REPOSITORY_KIND, repository.getUrl(), TasksUiPlugin.getDefault()
-				.getTaskDataManager().getNewRepositoryTaskId(), Task.DEFAULT_TASK_KIND);
+				.getTaskDataManager().getNewRepositoryTaskId(), AbstractRepositoryTask.DEFAULT_TASK_KIND);
 
 		model.setDescription(stackTrace);
 		model.setNew(true);
@@ -220,7 +220,7 @@ public class DuplicateDetetionTest extends TestCase {
 		"	at java/util/logging/LogManager.readConfiguration(L:555)";
 	    
 		RepositoryTaskData model = new RepositoryTaskData(new BugzillaAttributeFactory(), BugzillaCorePlugin.REPOSITORY_KIND, repository.getUrl(), TasksUiPlugin.getDefault()
-				.getTaskDataManager().getNewRepositoryTaskId(), Task.DEFAULT_TASK_KIND);
+				.getTaskDataManager().getNewRepositoryTaskId(), AbstractRepositoryTask.DEFAULT_TASK_KIND);
 
 		model.setDescription(stackTrace);
 		model.setNew(true);
@@ -245,7 +245,7 @@ public class DuplicateDetetionTest extends TestCase {
 		"	   at java.lang.VirtualMachine.main (VirtualMachine.java:108)";
 		
 		RepositoryTaskData model = new RepositoryTaskData(new BugzillaAttributeFactory(), BugzillaCorePlugin.REPOSITORY_KIND, repository.getUrl(), TasksUiPlugin.getDefault()
-				.getTaskDataManager().getNewRepositoryTaskId(), Task.DEFAULT_TASK_KIND);
+				.getTaskDataManager().getNewRepositoryTaskId(), AbstractRepositoryTask.DEFAULT_TASK_KIND);
 
 		model.setDescription(stackTrace);
 		model.setNew(true);
diff --git a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/NewBugWizardTest.java b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/NewBugWizardTest.java
index 8de857346..e018945cf 100644
--- a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/NewBugWizardTest.java
+++ b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/NewBugWizardTest.java
@@ -19,8 +19,8 @@ import org.eclipse.mylyn.internal.bugzilla.core.BugzillaCorePlugin;
 import org.eclipse.mylyn.internal.bugzilla.core.BugzillaReportElement;
 import org.eclipse.mylyn.internal.bugzilla.core.BugzillaRepositoryConnector;
 import org.eclipse.mylyn.internal.bugzilla.core.IBugzillaConstants;
+import org.eclipse.mylyn.tasks.core.AbstractRepositoryTask;
 import org.eclipse.mylyn.tasks.core.RepositoryTaskData;
-import org.eclipse.mylyn.tasks.core.Task;
 import org.eclipse.mylyn.tasks.core.TaskRepository;
 
 /**
@@ -32,7 +32,7 @@ public class NewBugWizardTest extends TestCase {
 	public void testPlatformOptions() throws Exception {
 
 		
-		RepositoryTaskData newReport = new RepositoryTaskData(new BugzillaAttributeFactory(), BugzillaCorePlugin.REPOSITORY_KIND, IBugzillaConstants.TEST_BUGZILLA_220_URL, "1", Task.DEFAULT_TASK_KIND);
+		RepositoryTaskData newReport = new RepositoryTaskData(new BugzillaAttributeFactory(), BugzillaCorePlugin.REPOSITORY_KIND, IBugzillaConstants.TEST_BUGZILLA_220_URL, "1", AbstractRepositoryTask.DEFAULT_TASK_KIND);
 
 		TaskRepository repository = new TaskRepository(BugzillaCorePlugin.REPOSITORY_KIND,
 				IBugzillaConstants.TEST_BUGZILLA_220_URL);
diff --git a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/TaskEditorTest.java b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/TaskEditorTest.java
index f3656cb67..1f2320d06 100644
--- a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/TaskEditorTest.java
+++ b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/TaskEditorTest.java
@@ -14,8 +14,8 @@ import org.eclipse.mylyn.internal.bugzilla.core.BugzillaAttributeFactory;
 import org.eclipse.mylyn.internal.bugzilla.core.BugzillaCorePlugin;
 import org.eclipse.mylyn.internal.bugzilla.core.BugzillaRepositoryConnector;
 import org.eclipse.mylyn.internal.bugzilla.core.IBugzillaConstants;
+import org.eclipse.mylyn.tasks.core.AbstractRepositoryTask;
 import org.eclipse.mylyn.tasks.core.RepositoryTaskData;
-import org.eclipse.mylyn.tasks.core.Task;
 import org.eclipse.mylyn.tasks.core.TaskRepository;
 import org.eclipse.mylyn.tasks.ui.TasksUiPlugin;
 import org.eclipse.mylyn.tasks.ui.TasksUiUtil;
@@ -59,7 +59,7 @@ public class TaskEditorTest extends TestCase {
 
 		RepositoryTaskData model = new RepositoryTaskData(new BugzillaAttributeFactory(),
 				BugzillaCorePlugin.REPOSITORY_KIND, repository.getUrl(), TasksUiPlugin.getDefault()
-						.getTaskDataManager().getNewRepositoryTaskId(), Task.DEFAULT_TASK_KIND);
+						.getTaskDataManager().getNewRepositoryTaskId(), AbstractRepositoryTask.DEFAULT_TASK_KIND);
 		model.setNew(true);
 		BugzillaRepositoryConnector.setupNewBugAttributes(repository, model);
 		NewTaskEditorInput editorInput = new NewTaskEditorInput(repository, model);
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 8b9d92ff1..5c02ede84 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
@@ -46,9 +46,9 @@ public class TaskListNotificationManagerTest extends TestCase {
 
 		Date now = new Date();
 
-		ITask task0 = new LocalTask("t0", "t0 - test 0");
-		ITask task1 = new LocalTask("t1", "t1 - test 1");
-		ITask task2 = new LocalTask("t2", "t2 - test 2");
+		ITask task0 = new LocalTask("0", "t0 - test 0");
+		ITask task1 = new LocalTask("1", "t1 - test 1");
+		ITask task2 = new LocalTask("2", "t2 - test 2");
 
 		task0.setScheduledForDate(new Date(now.getTime() - 2000));
 		task1.setScheduledForDate(new Date(now.getTime() - 2000));
@@ -61,13 +61,13 @@ public class TaskListNotificationManagerTest extends TestCase {
 		TaskListNotificationManager notificationManager = TasksUiPlugin.getDefault().getTaskListNotificationManager();
 		notificationManager.collectNotifications();
 
-		task0 = TasksUiPlugin.getTaskListManager().getTaskList().getTask("t0");
+		task0 = TasksUiPlugin.getTaskListManager().getTaskList().getTask("local-0");
 		assertNotNull(task0);
 		assertTrue(task0.hasBeenReminded());
-		task1 = TasksUiPlugin.getTaskListManager().getTaskList().getTask("t1");
+		task1 = TasksUiPlugin.getTaskListManager().getTaskList().getTask("local-1");
 		assertNotNull(task1);
 		assertTrue(task1.hasBeenReminded());
-		task2 = TasksUiPlugin.getTaskListManager().getTaskList().getTask("t2");
+		task2 = TasksUiPlugin.getTaskListManager().getTaskList().getTask("local-2");
 		assertNotNull(task2);
 		assertTrue(task2.hasBeenReminded());