Progress on: Bug 119556: fix task list drag and drop

https://bugs.eclipse.org/bugs/show_bug.cgi?id=119556
Completed: re-dragging a task to a category should not re-add it

3 files changed, 13 insertions, 11 deletions

diff --git a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/actions/CreateBugzillaTaskAction.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/actions/CreateBugzillaTaskAction.java
index bb9faa031..7c706dbdb 100644
--- a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/actions/CreateBugzillaTaskAction.java
+++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/actions/CreateBugzillaTaskAction.java
@@ -78,7 +78,7 @@ public class CreateBugzillaTaskAction extends Action implements IViewActionDeleg
 	    		"<bugzilla info>", true, true);				
 	    Object selectedObject = ((IStructuredSelection)TaskListView.getDefault().getViewer().getSelection()).getFirstElement();
     	
-	    ITaskHandler taskHandler = MylarTaskListPlugin.getDefault().getTaskHandlerForElement(newTask);
+	    ITaskHandler taskHandler = MylarTaskListPlugin.getDefault().getHandlerForElement(newTask);
 	    if(taskHandler != null){
 	    	ITask addedTask = taskHandler.taskAdded(newTask);
 	    	if(addedTask instanceof BugzillaTask){
@@ -93,10 +93,11 @@ public class CreateBugzillaTaskAction extends Action implements IViewActionDeleg
     	} else {
     		((BugzillaTask)newTask).scheduleDownloadReport();
     	}
-	    if (selectedObject instanceof TaskCategory){
-	        ((TaskCategory)selectedObject).addTask(newTask);
+	    if (selectedObject instanceof TaskCategory) {
+	    	MylarTaskListPlugin.getTaskListManager().moveToCategory(((TaskCategory)selectedObject), newTask);
+//	        ((TaskCategory)selectedObject).addTask(newTask);
 	    } else { 
-	        MylarTaskListPlugin.getTaskListManager().addRootTask(newTask);
+	        MylarTaskListPlugin.getTaskListManager().moveToRoot(newTask);
 	    }
 	    BugzillaUiPlugin.getDefault().getBugzillaTaskListManager().addToBugzillaTaskRegistry((BugzillaTask)newTask);
 //	    
diff --git a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/actions/CreateNewBugzillaTaskAction.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/actions/CreateNewBugzillaTaskAction.java
index 9f770f199..7fbe8b15a 100644
--- a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/actions/CreateNewBugzillaTaskAction.java
+++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/actions/CreateNewBugzillaTaskAction.java
@@ -91,7 +91,7 @@ public class CreateNewBugzillaTaskAction extends Action implements IViewActionDe
 		    if(TaskListView.getDefault() != null)
 		    	selectedObject = ((IStructuredSelection)TaskListView.getDefault().getViewer().getSelection()).getFirstElement();
 	    	
-		    ITaskHandler taskHandler = MylarTaskListPlugin.getDefault().getTaskHandlerForElement(newTask);
+		    ITaskHandler taskHandler = MylarTaskListPlugin.getDefault().getHandlerForElement(newTask);
 		    if(taskHandler != null){
 		    	ITask addedTask = taskHandler.taskAdded(newTask);
 		    	if(addedTask instanceof BugzillaTask){
@@ -102,10 +102,11 @@ public class CreateNewBugzillaTaskAction extends Action implements IViewActionDe
 		    	}
 	    	}
 		    
-		    if (selectedObject instanceof TaskCategory){
-		        ((TaskCategory)selectedObject).addTask(newTask);
+		    if (selectedObject instanceof TaskCategory) {
+		    	MylarTaskListPlugin.getTaskListManager().moveToCategory(((TaskCategory)selectedObject), newTask);
+//		        ((TaskCategory)selectedObject).addTask(newTask);
 		    } else { 
-		        MylarTaskListPlugin.getTaskListManager().addRootTask(newTask);
+		        MylarTaskListPlugin.getTaskListManager().moveToRoot(newTask);
 		    }
 		    BugzillaUiPlugin.getDefault().getBugzillaTaskListManager().addToBugzillaTaskRegistry((BugzillaTask)newTask);
 		    newTask.openTaskInEditor(false);
diff --git a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/tasklist/BugzillaQueryCategory.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/tasklist/BugzillaQueryCategory.java
index 3ac44058d..b12a1ac88 100644
--- a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/tasklist/BugzillaQueryCategory.java
+++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/tasklist/BugzillaQueryCategory.java
@@ -33,8 +33,8 @@ import org.eclipse.mylar.bugzilla.ui.search.BugzillaResultCollector;
 import org.eclipse.mylar.bugzilla.ui.tasklist.BugzillaCategorySearchOperation.ICategorySearchListener;
 import org.eclipse.mylar.tasklist.IQuery;
 import org.eclipse.mylar.tasklist.IQueryHit;
-import org.eclipse.mylar.tasklist.ITaskListElement;
 import org.eclipse.mylar.tasklist.MylarTaskListPlugin;
+import org.eclipse.mylar.tasklist.ui.ITaskListElement;
 import org.eclipse.mylar.tasklist.ui.TaskListImages;
 import org.eclipse.mylar.tasklist.ui.views.TaskListView;
 import org.eclipse.swt.graphics.Color;
@@ -189,9 +189,9 @@ public class BugzillaQueryCategory implements IQuery {
 	}
 
 	public String getPriority() {
-		String highestPriority = "P5";
+		String highestPriority = MylarTaskListPlugin.PriorityLevel.P5.toString();
 		if (hits.isEmpty()) {
-			return "P1";
+			return MylarTaskListPlugin.PriorityLevel.P1.toString();
 		}
 		for (IQueryHit hit : hits) {
 			if (highestPriority.compareTo(hit.getPriority()) > 0) {