RESOLVED - bug 338499: support hiding of queries

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

7 files changed, 17 insertions, 12 deletions

diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TasksUiPlugin.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TasksUiPlugin.java
index 4ca0e2b10..bdf405d1e 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TasksUiPlugin.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TasksUiPlugin.java
@@ -958,6 +958,7 @@ public class TasksUiPlugin extends AbstractUIPlugin {
 		store.setDefault(ITasksUiPreferenceConstants.BACKUP_MAXFILES, 20);
 		store.setDefault(ITasksUiPreferenceConstants.BACKUP_LAST, 0f);
 
+		store.setDefault(ITasksUiPreferenceConstants.FILTER_HIDDEN, true);
 		store.setDefault(ITasksUiPreferenceConstants.FILTER_ARCHIVE_MODE, true);
 		store.setDefault(ITasksUiPreferenceConstants.ACTIVATE_MULTIPLE, false);
 		store.setValue(ITasksUiPreferenceConstants.ACTIVATE_MULTIPLE, false);
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/HideQueryAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/HideQueryAction.java
index a5adfa5c0..137582e8c 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/HideQueryAction.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/HideQueryAction.java
@@ -47,10 +47,12 @@ public class HideQueryAction extends BaseSelectionListenerAction {
 			if (element instanceof IRepositoryQuery) {
 				hidden &= Boolean.parseBoolean((((IRepositoryQuery) element).getAttribute(ITasksCoreConstants.ATTRIBUTE_HIDDEN)));
 			} else {
+				System.err.println(element);
 				return false;
 			}
 		}
 		setChecked(hidden);
+		System.err.println(true);
 		return true;
 	}
 
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/RepositoryElementActionGroup.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/RepositoryElementActionGroup.java
index b07080b6d..694bc393d 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/RepositoryElementActionGroup.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/RepositoryElementActionGroup.java
@@ -100,8 +100,6 @@ public class RepositoryElementActionGroup {
 
 	private final AutoUpdateQueryAction autoUpdateAction;
 
-	protected final HideQueryAction hideQueryAction;
-
 	private final NewSubTaskAction newSubTaskAction;
 
 	private final CloneTaskAction cloneTaskAction;
@@ -133,10 +131,9 @@ public class RepositoryElementActionGroup {
 		showInTaskListAction = add(new ShowInTaskListAction());
 
 		autoUpdateAction = add(new AutoUpdateQueryAction());
-		hideQueryAction = add(new HideQueryAction());
 	}
 
-	private <T extends ISelectionChangedListener> T add(T action) {
+	protected <T extends ISelectionChangedListener> T add(T action) {
 		actions.add(action);
 		return action;
 	}
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/ShowAllQueriesAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/ShowAllQueriesAction.java
index abd1c18ed..0ab2bb6c7 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/ShowAllQueriesAction.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/ShowAllQueriesAction.java
@@ -23,7 +23,9 @@ public class ShowAllQueriesAction extends Action {
 	public ShowAllQueriesAction() {
 		setText("Show All Queries");
 		setToolTipText("Show All Queries Including Hidden Queries");
-		setChecked(!TasksUiPlugin.getDefault().getPreferenceStore().contains(ITasksUiPreferenceConstants.FILTER_HIDDEN));
+		setChecked(!TasksUiPlugin.getDefault()
+				.getPreferenceStore()
+				.getBoolean(ITasksUiPreferenceConstants.FILTER_HIDDEN));
 	}
 
 	@Override
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/ShowNonMatchingSubtasksAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/ShowNonMatchingSubtasksAction.java
index 3018dfea5..a0e25b58d 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/ShowNonMatchingSubtasksAction.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/ShowNonMatchingSubtasksAction.java
@@ -25,7 +25,7 @@ public class ShowNonMatchingSubtasksAction extends Action {
 		setToolTipText("Show Non Matching Subtasks");
 		setChecked(!TasksUiPlugin.getDefault()
 				.getPreferenceStore()
-				.contains(ITasksUiPreferenceConstants.FILTER_NON_MATCHING));
+				.getBoolean(ITasksUiPreferenceConstants.FILTER_NON_MATCHING));
 	}
 
 	@Override
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/TaskListViewActionGroup.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/TaskListViewActionGroup.java
index c978add7f..9b1fd1b79 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/TaskListViewActionGroup.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/TaskListViewActionGroup.java
@@ -12,6 +12,7 @@
 package org.eclipse.mylyn.internal.tasks.ui.actions;
 
 import org.eclipse.jface.action.IMenuManager;
+import org.eclipse.jface.action.Separator;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.mylyn.internal.tasks.ui.views.PresentationFilter;
 import org.eclipse.mylyn.internal.tasks.ui.views.TaskListView;
@@ -34,20 +35,21 @@ public class TaskListViewActionGroup extends RepositoryElementActionGroup {
 
 	private final DrillDownAdapter drillDownAdapter;
 
+	private final HideQueryAction hideQueryAction;
+
 	public TaskListViewActionGroup(TaskListView view, DrillDownAdapter drillDownAdapter) {
 		this.view = view;
 		this.drillDownAdapter = drillDownAdapter;
 
 		goIntoAction = new GoIntoAction();
 		goUpAction = new GoUpAction(drillDownAdapter);
-		renameAction = new RenameAction(view);
-		view.getViewer().addSelectionChangedListener(renameAction);
+		renameAction = add(new RenameAction(view));
+		hideQueryAction = add(new HideQueryAction());
 
 		setSelectionProvider(view.getViewer());
 	}
 
 	public void dispose() {
-		view.getViewer().removeSelectionChangedListener(renameAction);
 		setSelectionProvider(null);
 	}
 
@@ -64,7 +66,8 @@ public class TaskListViewActionGroup extends RepositoryElementActionGroup {
 		super.fillContextMenu(manager);
 
 		if (hideQueryAction.isEnabled() && !PresentationFilter.getInstance().isFilterHiddenQueries()) {
-			manager.appendToGroup(ID_SEPARATOR_NAVIGATE, hideQueryAction);
+			manager.appendToGroup(ID_SEPARATOR_REPOSITORY, new Separator());
+			manager.appendToGroup(ID_SEPARATOR_REPOSITORY, hideQueryAction);
 		}
 
 		updateDrillDownActions();
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/PresentationFilter.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/PresentationFilter.java
index edefb61db..263b55830 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/PresentationFilter.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/PresentationFilter.java
@@ -93,10 +93,10 @@ public class PresentationFilter extends AbstractTaskListFilter {
 	public void updateSettings() {
 		setFilterHiddenQueries(TasksUiPlugin.getDefault()
 				.getPreferenceStore()
-				.contains(ITasksUiPreferenceConstants.FILTER_HIDDEN));
+				.getBoolean(ITasksUiPreferenceConstants.FILTER_HIDDEN));
 		setFilterNonMatching(TasksUiPlugin.getDefault()
 				.getPreferenceStore()
-				.contains(ITasksUiPreferenceConstants.FILTER_NON_MATCHING));
+				.getBoolean(ITasksUiPreferenceConstants.FILTER_NON_MATCHING));
 	}
 
 	private boolean isQueryVisible(Object element) {