RESOLVED - bug 193866: mysterious Misc category in Task List view

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

5 files changed, 8 insertions, 4 deletions

diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/UnfiledCategory.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/UnfiledCategory.java
index 670b3011d..0217afa14 100644
--- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/UnfiledCategory.java
+++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/UnfiledCategory.java
@@ -18,7 +18,7 @@ import org.eclipse.mylyn.tasks.core.AbstractTask.PriorityLevel;
  */
 public class UnfiledCategory extends AbstractTaskCategory {
 
-	public static final String LABEL = "Misc";
+	public static final String LABEL = "Uncategorized";
 
 	public static final String HANDLE = "uncategorized";
 
diff --git a/org.eclipse.mylyn.tasks.ui/icons/etool16/category-archive.gif b/org.eclipse.mylyn.tasks.ui/icons/etool16/category-archive.gif
index 69000c9a9..36c1f658f 100644
--- a/org.eclipse.mylyn.tasks.ui/icons/etool16/category-archive.gif
+++ b/org.eclipse.mylyn.tasks.ui/icons/etool16/category-archive.gif
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskElementLabelProvider.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskElementLabelProvider.java
index 7f07884df..fd3801885 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskElementLabelProvider.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskElementLabelProvider.java
@@ -83,7 +83,7 @@ public class TaskElementLabelProvider extends LabelProvider implements IColorPro
 
 	private CompositeImageDescriptor getImageDescriptor(Object object) {
 		CompositeImageDescriptor compositeDescriptor = new CompositeImageDescriptor();
-		if (object instanceof TaskArchive) {
+		if (object instanceof TaskArchive || object instanceof UnfiledCategory) {
 			compositeDescriptor.icon = TasksUiImages.CATEGORY_ARCHIVE;
 			return compositeDescriptor;
 		} else if (object instanceof TaskCategory || object instanceof UnfiledCategory) {
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListDropAdapter.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListDropAdapter.java
index 0ca6f2982..04edff34e 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListDropAdapter.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListDropAdapter.java
@@ -25,6 +25,7 @@ import org.eclipse.jface.viewers.ViewerDropAdapter;
 import org.eclipse.mylyn.context.core.ContextCorePlugin;
 import org.eclipse.mylyn.internal.tasks.core.ScheduledTaskContainer;
 import org.eclipse.mylyn.internal.tasks.core.TaskCategory;
+import org.eclipse.mylyn.internal.tasks.core.UnfiledCategory;
 import org.eclipse.mylyn.internal.tasks.ui.ITasksUiConstants;
 import org.eclipse.mylyn.internal.tasks.ui.RetrieveTitleFromUrlJob;
 import org.eclipse.mylyn.internal.tasks.ui.TaskTransfer;
@@ -108,7 +109,9 @@ public class TaskListDropAdapter extends ViewerDropAdapter {
 		}
 
 		for (AbstractTask task : tasksToMove) {
-			if (currentTarget instanceof TaskCategory) {
+			if (currentTarget instanceof UnfiledCategory) {
+				TasksUiPlugin.getTaskListManager().getTaskList().moveToContainer(task, (UnfiledCategory)currentTarget);
+			} else if (currentTarget instanceof TaskCategory) {
 				TasksUiPlugin.getTaskListManager().getTaskList().moveToContainer(task, (TaskCategory) currentTarget);
 			} else if (currentTarget instanceof AbstractTask) {
 				AbstractTask targetTask = (AbstractTask) currentTarget;
@@ -257,7 +260,7 @@ public class TaskListDropAdapter extends ViewerDropAdapter {
 				return true;
 			}
 		} else if (selectedObject != null && !(selectedObject instanceof AbstractRepositoryQuery)) {
-			if (getCurrentTarget() instanceof TaskCategory) {
+			if (getCurrentTarget() instanceof TaskCategory || getCurrentTarget() instanceof UnfiledCategory) {
 				return true;
 			} else if (getCurrentTarget() instanceof AbstractTaskContainer
 					&& (getCurrentLocation() == ViewerDropAdapter.LOCATION_AFTER || getCurrentLocation() == ViewerDropAdapter.LOCATION_BEFORE)) {
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListView.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListView.java
index a8428dc4c..dde7f2968 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListView.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListView.java
@@ -463,6 +463,7 @@ public class TaskListView extends ViewPart implements IPropertyChangeListener {
 												task.getHandleIdentifier()));
 								containers.addAll(task.getParentContainers());
 								containers.add(TasksUiPlugin.getTaskListManager().getTaskList().getArchiveContainer());
+								containers.add(TasksUiPlugin.getTaskListManager().getTaskList().getDefaultCategory());
 								for (AbstractTaskContainer container : containers) {
 									refresh(container);
 								}