Attachment 190244 Details for Bug 338499 – second pass

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] second pass

clipboard.txt (text/plain), 21.80 KB, created by Steffen Pingel

on 2011-03-03 03:21:39 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Steffen Pingel

Created: 2011-03-03 03:21:39 EST

Size: 21.80 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.mylyn.tasks.core
>Index: src/org/eclipse/mylyn/internal/tasks/core/AbstractTask.java
>===================================================================
>RCS file: /cvsroot/mylyn/org.eclipse.mylyn.tasks/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/AbstractTask.java,v
>retrieving revision 1.40
>diff -u -r1.40 AbstractTask.java
>--- src/org/eclipse/mylyn/internal/tasks/core/AbstractTask.java	22 Jul 2010 23:33:40 -0000	1.40
>+++ src/org/eclipse/mylyn/internal/tasks/core/AbstractTask.java	3 Mar 2011 08:21:28 -0000
>@@ -13,9 +13,9 @@
> 
> import java.util.Collections;
> import java.util.Date;
>-import java.util.HashSet;
> import java.util.Map;
> import java.util.Set;
>+import java.util.concurrent.CopyOnWriteArraySet;
> 
> import org.eclipse.core.runtime.Assert;
> import org.eclipse.core.runtime.IStatus;
>@@ -52,7 +52,7 @@
> 
> 	private boolean reminded = false;
> 
>-	private final Set<AbstractTaskContainer> containers = new HashSet<AbstractTaskContainer>();
>+	private final Set<AbstractTaskContainer> containers = new CopyOnWriteArraySet<AbstractTaskContainer>();
> 
> 	// ************ Synch ****************
> 
>@@ -317,7 +317,8 @@
> 	}
> 
> 	public Set<AbstractTaskContainer> getParentContainers() {
>-		return new HashSet<AbstractTaskContainer>(containers);
>+		//return new HashSet<AbstractTaskContainer>(containers);
>+		return containers;
> 	}
> 
> 	@Override
>Index: src/org/eclipse/mylyn/internal/tasks/core/ITasksCoreConstants.java
>===================================================================
>RCS file: /cvsroot/mylyn/org.eclipse.mylyn.tasks/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/ITasksCoreConstants.java,v
>retrieving revision 1.24
>diff -u -r1.24 ITasksCoreConstants.java
>--- src/org/eclipse/mylyn/internal/tasks/core/ITasksCoreConstants.java	1 Mar 2011 09:08:47 -0000	1.24
>+++ src/org/eclipse/mylyn/internal/tasks/core/ITasksCoreConstants.java	3 Mar 2011 08:21:28 -0000
>@@ -59,6 +59,8 @@
> 
> 	public static final String ATTRIBUTE_OUTGOING_NEW_CONNECTOR_KIND = "outgoingNewConnectorKind"; //$NON-NLS-1$
> 
>+	public static final String ATTRIBUTE_HIDDEN = "task.common.hidden"; //$NON-NLS-1$
>+
> 	public static final String ATTRIBUTE_TASK_EXTENDED_TOOLTIP = "task.common.extended.tooltip"; //$NON-NLS-1$
> 
> 	public static final String ATTRIBUTE_TASK_SUPPRESS_INCOMING = "task.common.suppress.incoming"; //$NON-NLS-1$
>#P org.eclipse.mylyn.tasks.ui
>Index: src/org/eclipse/mylyn/internal/tasks/ui/AbstractTaskListFilter.java
>===================================================================
>RCS file: /cvsroot/mylyn/org.eclipse.mylyn.tasks/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/AbstractTaskListFilter.java,v
>retrieving revision 1.24
>diff -u -r1.24 AbstractTaskListFilter.java
>--- src/org/eclipse/mylyn/internal/tasks/ui/AbstractTaskListFilter.java	2 Mar 2011 23:13:15 -0000	1.24
>+++ src/org/eclipse/mylyn/internal/tasks/ui/AbstractTaskListFilter.java	3 Mar 2011 08:21:29 -0000
>@@ -15,6 +15,7 @@
> 
> import org.eclipse.mylyn.internal.tasks.core.ITasksCoreConstants;
> import org.eclipse.mylyn.internal.tasks.ui.util.TasksUiInternal;
>+import org.eclipse.mylyn.internal.tasks.ui.views.PresentationFilter;
> import org.eclipse.mylyn.tasks.core.ITask;
> import org.eclipse.mylyn.tasks.core.ITaskContainer;
> 
>@@ -52,8 +53,12 @@
> 			return false;
> 		}
> 
>+		if (!PresentationFilter.getInstance().select(null, container)) {
>+			return false;
>+		}
>+
> 		for (ITask task : children) {
>-			if (task != null) {
>+			if (task != null && PresentationFilter.getInstance().select(container, task)) {
> 				ITask containedRepositoryTask = task;
> 				if (TasksUiInternal.shouldShowIncoming(containedRepositoryTask)) {
> 					return true;
>Index: src/org/eclipse/mylyn/internal/tasks/ui/ITasksUiPreferenceConstants.java
>===================================================================
>RCS file: /cvsroot/mylyn/org.eclipse.mylyn.tasks/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/ITasksUiPreferenceConstants.java,v
>retrieving revision 1.19
>diff -u -r1.19 ITasksUiPreferenceConstants.java
>--- src/org/eclipse/mylyn/internal/tasks/ui/ITasksUiPreferenceConstants.java	13 Jul 2010 20:32:16 -0000	1.19
>+++ src/org/eclipse/mylyn/internal/tasks/ui/ITasksUiPreferenceConstants.java	3 Mar 2011 08:21:29 -0000
>@@ -44,6 +44,10 @@
> 
> 	public static final String FILTER_COMPLETE_MODE = "org.eclipse.mylyn.tasks.ui.filters.complete"; //$NON-NLS-1$
> 
>+	public static final String FILTER_HIDDEN = "org.eclipse.mylyn.tasks.ui.filters.hidden"; //$NON-NLS-1$
>+
>+	public static final String FILTER_NON_MATCHING = "org.eclipse.mylyn.tasks.ui.filters.nonmatching"; //$NON-NLS-1$
>+
> 	public static final String FILTER_PRIORITY = "org.eclipse.mylyn.tasks.ui.filters.priority"; //$NON-NLS-1$
> 
> 	public static final String GROUP_SUBTASKS = "org.eclipse.mylyn.tasks.ui.group.subtasks"; //$NON-NLS-1$
>Index: src/org/eclipse/mylyn/internal/tasks/ui/actions/FilterHiddenQueriesAction.java
>===================================================================
>RCS file: src/org/eclipse/mylyn/internal/tasks/ui/actions/FilterHiddenQueriesAction.java
>diff -N src/org/eclipse/mylyn/internal/tasks/ui/actions/FilterHiddenQueriesAction.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/mylyn/internal/tasks/ui/actions/FilterHiddenQueriesAction.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,36 @@
>+/*******************************************************************************
>+ * Copyright (c) 2004, 2008 Tasktop Technologies and others.
>+ * All rights reserved. This program and the accompanying materials
>+ * are made available under the terms of the Eclipse Public License v1.0
>+ * which accompanies this distribution, and is available at
>+ * http://www.eclipse.org/legal/epl-v10.html
>+ *
>+ * Contributors:
>+ *     Tasktop Technologies - initial API and implementation
>+ *******************************************************************************/
>+
>+package org.eclipse.mylyn.internal.tasks.ui.actions;
>+
>+import org.eclipse.jface.action.Action;
>+import org.eclipse.mylyn.internal.tasks.ui.ITasksUiPreferenceConstants;
>+import org.eclipse.mylyn.internal.tasks.ui.TasksUiPlugin;
>+
>+/**
>+ * @author Mik Kersten
>+ */
>+public class FilterHiddenQueriesAction extends Action {
>+
>+	public FilterHiddenQueriesAction() {
>+		setText("Hide Managed Queries");
>+		setToolTipText("Hide Managed Queries");
>+		setChecked(TasksUiPlugin.getDefault().getPreferenceStore().contains(ITasksUiPreferenceConstants.FILTER_HIDDEN));
>+	}
>+
>+	@Override
>+	public void run() {
>+		TasksUiPlugin.getDefault()
>+				.getPreferenceStore()
>+				.setValue(ITasksUiPreferenceConstants.FILTER_HIDDEN, isChecked());
>+	}
>+
>+}
>Index: src/org/eclipse/mylyn/internal/tasks/ui/actions/FilterNonMatchingSubtasksAction.java
>===================================================================
>RCS file: src/org/eclipse/mylyn/internal/tasks/ui/actions/FilterNonMatchingSubtasksAction.java
>diff -N src/org/eclipse/mylyn/internal/tasks/ui/actions/FilterNonMatchingSubtasksAction.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/mylyn/internal/tasks/ui/actions/FilterNonMatchingSubtasksAction.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,38 @@
>+/*******************************************************************************
>+ * Copyright (c) 2004, 2008 Tasktop Technologies and others.
>+ * All rights reserved. This program and the accompanying materials
>+ * are made available under the terms of the Eclipse Public License v1.0
>+ * which accompanies this distribution, and is available at
>+ * http://www.eclipse.org/legal/epl-v10.html
>+ *
>+ * Contributors:
>+ *     Tasktop Technologies - initial API and implementation
>+ *******************************************************************************/
>+
>+package org.eclipse.mylyn.internal.tasks.ui.actions;
>+
>+import org.eclipse.jface.action.Action;
>+import org.eclipse.mylyn.internal.tasks.ui.ITasksUiPreferenceConstants;
>+import org.eclipse.mylyn.internal.tasks.ui.TasksUiPlugin;
>+
>+/**
>+ * @author Mik Kersten
>+ */
>+public class FilterNonMatchingSubtasksAction extends Action {
>+
>+	public FilterNonMatchingSubtasksAction() {
>+		setText("Hide Non Matching Subtasks");
>+		setToolTipText("Hide Non Matching Subtasks");
>+		setChecked(TasksUiPlugin.getDefault()
>+				.getPreferenceStore()
>+				.contains(ITasksUiPreferenceConstants.FILTER_NON_MATCHING));
>+	}
>+
>+	@Override
>+	public void run() {
>+		TasksUiPlugin.getDefault()
>+				.getPreferenceStore()
>+				.setValue(ITasksUiPreferenceConstants.FILTER_NON_MATCHING, isChecked());
>+	}
>+
>+}
>Index: src/org/eclipse/mylyn/internal/tasks/ui/actions/HideQueryAction.java
>===================================================================
>RCS file: src/org/eclipse/mylyn/internal/tasks/ui/actions/HideQueryAction.java
>diff -N src/org/eclipse/mylyn/internal/tasks/ui/actions/HideQueryAction.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/mylyn/internal/tasks/ui/actions/HideQueryAction.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,72 @@
>+/*******************************************************************************
>+ * Copyright (c) 2004, 2009 Tasktop Technologies and others.
>+ * All rights reserved. This program and the accompanying materials
>+ * are made available under the terms of the Eclipse Public License v1.0
>+ * which accompanies this distribution, and is available at
>+ * http://www.eclipse.org/legal/epl-v10.html
>+ *
>+ * Contributors:
>+ *     Tasktop Technologies - initial API and implementation
>+ *******************************************************************************/
>+
>+package org.eclipse.mylyn.internal.tasks.ui.actions;
>+
>+import java.util.Collections;
>+
>+import org.eclipse.core.runtime.CoreException;
>+import org.eclipse.core.runtime.IProgressMonitor;
>+import org.eclipse.core.runtime.IStatus;
>+import org.eclipse.core.runtime.Status;
>+import org.eclipse.jface.viewers.IStructuredSelection;
>+import org.eclipse.mylyn.commons.core.StatusHandler;
>+import org.eclipse.mylyn.internal.tasks.core.ITaskListRunnable;
>+import org.eclipse.mylyn.internal.tasks.core.ITasksCoreConstants;
>+import org.eclipse.mylyn.internal.tasks.ui.TasksUiPlugin;
>+import org.eclipse.mylyn.tasks.core.IRepositoryElement;
>+import org.eclipse.mylyn.tasks.core.IRepositoryQuery;
>+import org.eclipse.ui.actions.BaseSelectionListenerAction;
>+
>+/**
>+ * @author Steffen Pingel
>+ */
>+public class HideQueryAction extends BaseSelectionListenerAction {
>+
>+	public HideQueryAction() {
>+		super("Hidden");
>+		setChecked(false);
>+		setEnabled(false);
>+	}
>+
>+	@Override
>+	protected boolean updateSelection(IStructuredSelection selection) {
>+		if (selection.size() == 1) {
>+			Object element = selection.getFirstElement();
>+			if (element instanceof IRepositoryQuery) {
>+				setChecked(Boolean.parseBoolean((((IRepositoryQuery) element).getAttribute(ITasksCoreConstants.ATTRIBUTE_HIDDEN))));
>+				return true;
>+			}
>+		}
>+		setChecked(false);
>+		return false;
>+	}
>+
>+	@Override
>+	public void run() {
>+		final Object element = getStructuredSelection().getFirstElement();
>+		if (element instanceof IRepositoryQuery) {
>+			try {
>+				final IRepositoryQuery query = ((IRepositoryQuery) element);
>+				TasksUiPlugin.getTaskList().run(new ITaskListRunnable() {
>+					public void execute(IProgressMonitor monitor) throws CoreException {
>+						query.setAttribute(ITasksCoreConstants.ATTRIBUTE_HIDDEN, Boolean.toString(isChecked()));
>+					}
>+				});
>+				TasksUiPlugin.getTaskList().notifyElementsChanged(Collections.singleton((IRepositoryElement) query));
>+			} catch (CoreException e) {
>+				StatusHandler.log(new Status(IStatus.ERROR, TasksUiPlugin.ID_PLUGIN,
>+						"Failed to set hidden status for query", e)); //$NON-NLS-1$
>+			}
>+		}
>+	}
>+
>+}
>Index: src/org/eclipse/mylyn/internal/tasks/ui/actions/RepositoryElementActionGroup.java
>===================================================================
>RCS file: /cvsroot/mylyn/org.eclipse.mylyn.tasks/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/RepositoryElementActionGroup.java,v
>retrieving revision 1.15
>diff -u -r1.15 RepositoryElementActionGroup.java
>--- src/org/eclipse/mylyn/internal/tasks/ui/actions/RepositoryElementActionGroup.java	25 Aug 2010 17:28:39 -0000	1.15
>+++ src/org/eclipse/mylyn/internal/tasks/ui/actions/RepositoryElementActionGroup.java	3 Mar 2011 08:21:29 -0000
>@@ -100,6 +100,8 @@
> 
> 	private final AutoUpdateQueryAction autoUpdateAction;
> 
>+	protected final HideQueryAction hideQueryAction;
>+
> 	private final NewSubTaskAction newSubTaskAction;
> 
> 	private final CloneTaskAction cloneTaskAction;
>@@ -131,6 +133,7 @@
> 		showInTaskListAction = add(new ShowInTaskListAction());
> 
> 		autoUpdateAction = add(new AutoUpdateQueryAction());
>+		hideQueryAction = add(new HideQueryAction());
> 	}
> 
> 	private <T extends ISelectionChangedListener> T add(T action) {
>Index: src/org/eclipse/mylyn/internal/tasks/ui/actions/TaskListViewActionGroup.java
>===================================================================
>RCS file: /cvsroot/mylyn/org.eclipse.mylyn.tasks/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/TaskListViewActionGroup.java,v
>retrieving revision 1.5
>diff -u -r1.5 TaskListViewActionGroup.java
>--- src/org/eclipse/mylyn/internal/tasks/ui/actions/TaskListViewActionGroup.java	8 Jun 2010 23:10:08 -0000	1.5
>+++ src/org/eclipse/mylyn/internal/tasks/ui/actions/TaskListViewActionGroup.java	3 Mar 2011 08:21:29 -0000
>@@ -13,6 +13,7 @@
> 
> import org.eclipse.jface.action.IMenuManager;
> import org.eclipse.jface.viewers.IStructuredSelection;
>+import org.eclipse.mylyn.internal.tasks.ui.views.PresentationFilter;
> import org.eclipse.mylyn.internal.tasks.ui.views.TaskListView;
> import org.eclipse.mylyn.tasks.core.ITask;
> import org.eclipse.mylyn.tasks.core.ITaskContainer;
>@@ -62,6 +63,10 @@
> 	public void fillContextMenu(final IMenuManager manager) {
> 		super.fillContextMenu(manager);
> 
>+		if (hideQueryAction.isEnabled() && !PresentationFilter.getInstance().isFilterHiddenQueries()) {
>+			manager.appendToGroup(ID_SEPARATOR_NAVIGATE, hideQueryAction);
>+		}
>+
> 		updateDrillDownActions();
> 
> 		Object element = ((IStructuredSelection) view.getViewer().getSelection()).getFirstElement();
>Index: src/org/eclipse/mylyn/internal/tasks/ui/views/PresentationFilter.java
>===================================================================
>RCS file: src/org/eclipse/mylyn/internal/tasks/ui/views/PresentationFilter.java
>diff -N src/org/eclipse/mylyn/internal/tasks/ui/views/PresentationFilter.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/mylyn/internal/tasks/ui/views/PresentationFilter.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,81 @@
>+/*******************************************************************************
>+ * Copyright (c) 2011 Tasktop Technologies and others.
>+ * All rights reserved. This program and the accompanying materials
>+ * are made available under the terms of the Eclipse Public License v1.0
>+ * which accompanies this distribution, and is available at
>+ * http://www.eclipse.org/legal/epl-v10.html
>+ *
>+ * Contributors:
>+ *     Tasktop Technologies - initial API and implementation
>+ *******************************************************************************/
>+
>+package org.eclipse.mylyn.internal.tasks.ui.views;
>+
>+import org.eclipse.mylyn.internal.tasks.core.AbstractTask;
>+import org.eclipse.mylyn.internal.tasks.core.AbstractTaskContainer;
>+import org.eclipse.mylyn.internal.tasks.core.ITasksCoreConstants;
>+import org.eclipse.mylyn.internal.tasks.ui.AbstractTaskListFilter;
>+import org.eclipse.mylyn.tasks.core.IRepositoryQuery;
>+import org.eclipse.mylyn.tasks.core.ITask;
>+
>+/**
>+ * @author Steffen Pingel
>+ */
>+public class PresentationFilter extends AbstractTaskListFilter {
>+
>+	private static PresentationFilter instance = new PresentationFilter();
>+
>+	private boolean filterHiddenQueries;
>+
>+	private boolean filterSubtasks;
>+
>+	private PresentationFilter() {
>+		setFilterHiddenQueries(true);
>+		setFilterSubtasks(true);
>+	}
>+
>+	public static PresentationFilter getInstance() {
>+		return instance;
>+	}
>+
>+	public boolean isFilterSubtasks() {
>+		return filterSubtasks;
>+	}
>+
>+	public boolean isFilterHiddenQueries() {
>+		return filterHiddenQueries;
>+	}
>+
>+	public void setFilterHiddenQueries(boolean enabled) {
>+		this.filterHiddenQueries = enabled;
>+	}
>+
>+	public void setFilterSubtasks(boolean filterSubtasks) {
>+		this.filterSubtasks = filterSubtasks;
>+	}
>+
>+	@Override
>+	public boolean select(Object parent, Object element) {
>+		// filter hidden queries
>+		if (element instanceof IRepositoryQuery) {
>+			if (!filterHiddenQueries) {
>+				return true;
>+			}
>+			return !Boolean.parseBoolean(((IRepositoryQuery) element).getAttribute(ITasksCoreConstants.ATTRIBUTE_HIDDEN));
>+		}
>+		// filter sub-tasks not connected to queries or categories
>+		if (element instanceof AbstractTask) {
>+			if (!filterSubtasks) {
>+				return true;
>+			}
>+			for (AbstractTaskContainer container : ((AbstractTask) element).getParentContainers()) {
>+				if (!(container instanceof ITask)) {
>+					return true;
>+				}
>+			}
>+			return false;
>+		}
>+		return true;
>+	}
>+
>+}
>Index: src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListInterestFilter.java
>===================================================================
>RCS file: /cvsroot/mylyn/org.eclipse.mylyn.tasks/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListInterestFilter.java,v
>retrieving revision 1.14
>diff -u -r1.14 TaskListInterestFilter.java
>--- src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListInterestFilter.java	2 Mar 2011 23:13:15 -0000	1.14
>+++ src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListInterestFilter.java	3 Mar 2011 08:21:30 -0000
>@@ -47,17 +47,8 @@
> 				return isDateRangeInteresting(dateRangeTaskContainer);
> 			}
> 			if (child instanceof ITask) {
>-				AbstractTask task = null;
>-				if (child instanceof ITask) {
>-					task = (AbstractTask) child;
>-				}
>-				if (task != null) {
>-					if (isInteresting(parent, task)) {
>-						return true;
>-					} else {
>-						return false;
>-					}
>-				}
>+				AbstractTask task = (AbstractTask) child;
>+				return isInteresting(parent, task);
> 			} else if (child instanceof ITaskContainer) {
> 				Collection<ITask> children = ((ITaskContainer) child).getChildren();
> 				// Always display empty containers
>@@ -102,7 +93,9 @@
> 	}
> 
> 	public boolean shouldAlwaysShow(Object parent, AbstractTask task, int depth) {
>-
>+		if (!PresentationFilter.getInstance().select(parent, task)) {
>+			return false;
>+		}
> 		return task.isActive() || TasksUiPlugin.getTaskActivityManager().isCompletedToday(task)
> 				|| hasChanges(parent, task)
> 				|| hasInterestingSubTasks(parent, task, depth)
>@@ -182,7 +175,7 @@
> 		}
> 		if (task instanceof ITaskContainer) {
> 			for (ITask child : ((ITaskContainer) task).getChildren()) {
>-				if (hasChangesHelper(parent, child)) {
>+				if (PresentationFilter.getInstance().select(task, child) && hasChangesHelper(parent, child)) {
> 					return true;
> 				}
> 			}
>Index: src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListView.java
>===================================================================
>RCS file: /cvsroot/mylyn/org.eclipse.mylyn.tasks/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListView.java,v
>retrieving revision 1.354
>diff -u -r1.354 TaskListView.java
>--- src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListView.java	1 Mar 2011 05:44:01 -0000	1.354
>+++ src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListView.java	3 Mar 2011 08:21:30 -0000
>@@ -84,6 +84,8 @@
> import org.eclipse.mylyn.internal.tasks.ui.actions.CollapseAllAction;
> import org.eclipse.mylyn.internal.tasks.ui.actions.ExpandAllAction;
> import org.eclipse.mylyn.internal.tasks.ui.actions.FilterCompletedTasksAction;
>+import org.eclipse.mylyn.internal.tasks.ui.actions.FilterHiddenQueriesAction;
>+import org.eclipse.mylyn.internal.tasks.ui.actions.FilterNonMatchingSubtasksAction;
> import org.eclipse.mylyn.internal.tasks.ui.actions.GoUpAction;
> import org.eclipse.mylyn.internal.tasks.ui.actions.GroupSubTasksAction;
> import org.eclipse.mylyn.internal.tasks.ui.actions.LinkWithEditorAction;
>@@ -380,6 +382,8 @@
> 
> 	private final TaskArchiveFilter filterArchive = new TaskArchiveFilter();
> 
>+	private final PresentationFilter filterPresentation = PresentationFilter.getInstance();
>+
> 	private TaskWorkingSetFilter filterWorkingSet;
> 
> 	private final Set<AbstractTaskListFilter> filters = new HashSet<AbstractTaskListFilter>();
>@@ -536,6 +540,11 @@
> 					|| event.getProperty().equals(ITasksUiPreferenceConstants.OVERLAYS_INCOMING_TIGHT)) {
> 				refreshJob.refresh();
> 			}
>+			if (event.getProperty().equals(ITasksUiPreferenceConstants.FILTER_HIDDEN)
>+					|| event.getProperty().equals(ITasksUiPreferenceConstants.FILTER_NON_MATCHING)) {
>+				updatePresentationFilter();
>+				refreshJob.refresh();
>+			}
> 		}
> 	};
> 
>@@ -670,10 +679,9 @@
> 		if (TasksUiPlugin.getDefault().getPreferenceStore().contains(ITasksUiPreferenceConstants.FILTER_COMPLETE_MODE)) {
> 			addFilter(filterComplete);
> 		}
>-
>-		//if (TasksUiPlugin.getDefault().getPreferenceStore().contains(TasksUiPreferenceConstants.FILTER_ARCHIVE_MODE)) {
>+		updatePresentationFilter();
>+		addFilter(filterPresentation);
> 		addFilter(filterArchive);
>-		//}
> 
> 		// Restore "link with editor" value; by default true
> 		boolean linkValue = true;
>@@ -689,6 +697,15 @@
> 		getViewer().refresh();
> 	}
> 
>+	public void updatePresentationFilter() {
>+		filterPresentation.setFilterHiddenQueries(TasksUiPlugin.getDefault()
>+				.getPreferenceStore()
>+				.contains(ITasksUiPreferenceConstants.FILTER_HIDDEN));
>+		filterPresentation.setFilterSubtasks(TasksUiPlugin.getDefault()
>+				.getPreferenceStore()
>+				.contains(ITasksUiPreferenceConstants.FILTER_NON_MATCHING));
>+	}
>+
> 	/**
> 	 * Public for testing only.
> 	 */
>@@ -1198,6 +1215,8 @@
> 		manager.add(sortDialogAction);
> 		manager.add(filterOnPriorityAction);
> 		manager.add(filterCompleteTask);
>+		manager.add(new FilterHiddenQueriesAction());
>+		manager.add(new FilterNonMatchingSubtasksAction());
> 		manager.add(filterSubTasksAction);
> 
> 		manager.add(new Separator(ID_SEPARATOR_SEARCH));
>@@ -1346,6 +1365,7 @@
> 		filters.clear();
> 		filters.add(filterArchive);
> 		filters.add(filterWorkingSet);
>+		filters.add(filterPresentation);
> 	}
> 
> 	public void removeFilter(AbstractTaskListFilter filter) {

Actions: View | Diff

Attachments on bug 338499: 190242 | 190243 | 190244 | 190337 | 190338 | 190339 | 190340 | 190347