RESOLVED - bug 162880: Mark Complete vs. Incomplete Icons are misleading

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

1 files changed, 15 insertions, 15 deletions

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 f96d325e9..353b5b877 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
@@ -1052,11 +1052,6 @@ public class TaskListView extends ViewPart {
 		}
 		openWithBrowser.selectionChanged((StructuredSelection) getViewer().getSelection());
 
-		manager.add(new Separator(ID_SEPARATOR_NEW));
-		manager.add(new Separator());
-
-		Map<String, List<IDynamicSubMenuContributor>> dynamicMenuMap = TasksUiPlugin.getDefault().getDynamicMenuMap();
-
 		ITask task = null;
 		if ((element instanceof ITask) || (element instanceof AbstractQueryHit)) {
 			if (element instanceof AbstractQueryHit) {
@@ -1065,9 +1060,24 @@ public class TaskListView extends ViewPart {
 				task = (ITask) element;
 			}
 		}
+		
+		manager.add(new Separator(ID_SEPARATOR_NEW));
+		manager.add(new Separator());
+
+		Map<String, List<IDynamicSubMenuContributor>> dynamicMenuMap = TasksUiPlugin.getDefault().getDynamicMenuMap();
 
 		addAction(openAction, manager, element);
 		addAction(openWithBrowser, manager, element);
+		if (task != null) {
+			if (task.isActive()) {
+				manager.add(deactivateAction);
+			} else {
+				manager.add(activateAction);
+			}
+		} else if (element instanceof AbstractQueryHit) {
+			manager.add(activateAction);
+		}
+		
 		manager.add(new Separator());
 
 		for (String menuPath : dynamicMenuMap.keySet()) {
@@ -1100,16 +1110,6 @@ public class TaskListView extends ViewPart {
 		manager.add(new Separator(ID_SEPARATOR_REPOSITORY));
 		manager.add(new Separator(ID_SEPARATOR_CONTEXT));
 
-		if (task != null) {
-			if (task.isActive()) {
-				manager.add(deactivateAction);
-			} else {
-				manager.add(activateAction);
-			}
-		} else if (element instanceof AbstractQueryHit) {
-			manager.add(activateAction);
-		}
-
 		if (element instanceof ITask || element instanceof AbstractQueryHit) {
 			for (String menuPath : dynamicMenuMap.keySet()) {
 				if (ID_SEPARATOR_CONTEXT.equals(menuPath)) {