Attachment 132726 Details for Bug 210800 – patch

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

[patch] patch

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

on 2009-04-22 04:26:29 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Steffen Pingel

Created: 2009-04-22 04:26:29 EDT

Size: 7.91 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.mylyn.tasks.ui
>Index: src/org/eclipse/mylyn/internal/tasks/ui/views/WorkweekProgressBar.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/WorkweekProgressBar.java,v
>retrieving revision 1.13
>diff -u -r1.13 WorkweekProgressBar.java
>--- src/org/eclipse/mylyn/internal/tasks/ui/views/WorkweekProgressBar.java	13 Jan 2009 07:07:36 -0000	1.13
>+++ src/org/eclipse/mylyn/internal/tasks/ui/views/WorkweekProgressBar.java	22 Apr 2009 08:26:48 -0000
>@@ -28,7 +28,7 @@
> import org.eclipse.ui.themes.IThemeManager;
> 
> /**
>- * Derived from JUnitProgressBar
>+ * Derived from JUnitProgressBar.
>  * 
>  * @author Mik Kersten
>  */
>Index: src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListFilteredTree.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListFilteredTree.java,v
>retrieving revision 1.108
>diff -u -r1.108 TaskListFilteredTree.java
>--- src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListFilteredTree.java	7 Dec 2008 02:50:32 -0000	1.108
>+++ src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListFilteredTree.java	22 Apr 2009 08:26:48 -0000
>@@ -13,6 +13,7 @@
> 
> import java.text.MessageFormat;
> import java.util.ArrayList;
>+import java.util.Iterator;
> import java.util.List;
> import java.util.Set;
> 
>@@ -22,6 +23,8 @@
> import org.eclipse.jface.action.MenuManager;
> import org.eclipse.jface.action.Separator;
> import org.eclipse.jface.layout.TreeColumnLayout;
>+import org.eclipse.jface.util.IPropertyChangeListener;
>+import org.eclipse.jface.util.PropertyChangeEvent;
> import org.eclipse.jface.viewers.ISelection;
> import org.eclipse.jface.viewers.ISelectionChangedListener;
> import org.eclipse.jface.viewers.ISelectionProvider;
>@@ -37,6 +40,7 @@
> import org.eclipse.mylyn.internal.tasks.ui.TaskHistoryDropDown;
> import org.eclipse.mylyn.internal.tasks.ui.TaskHyperlink;
> import org.eclipse.mylyn.internal.tasks.ui.TaskSearchPage;
>+import org.eclipse.mylyn.internal.tasks.ui.TaskWorkingSetFilter;
> import org.eclipse.mylyn.internal.tasks.ui.TasksUiPlugin;
> import org.eclipse.mylyn.internal.tasks.ui.actions.ActivateTaskDialogAction;
> import org.eclipse.mylyn.internal.tasks.ui.actions.CopyTaskDetailsAction;
>@@ -62,6 +66,7 @@
> import org.eclipse.swt.widgets.Display;
> import org.eclipse.swt.widgets.Menu;
> import org.eclipse.ui.IWorkingSet;
>+import org.eclipse.ui.IWorkingSetManager;
> import org.eclipse.ui.PlatformUI;
> import org.eclipse.ui.dialogs.PatternFilter;
> import org.eclipse.ui.forms.events.HyperlinkEvent;
>@@ -103,6 +108,14 @@
> 
> 	private ITaskListChangeListener changeListener;
> 
>+	private TaskListChangeAdapter taskProgressBarChangeListener;
>+
>+	private TaskActivityAdapter taskProgressBarActivityListener;
>+
>+	private IPropertyChangeListener taskProgressBarWorkingSetListener;
>+
>+	private TaskWorkingSetFilter workingSetFilter;
>+
> 	public TaskListFilteredTree(Composite parent, int treeStyle, PatternFilter filter) {
> 		super(parent, treeStyle, filter);
> 		hookContextMenu();
>@@ -113,6 +126,17 @@
> 		if (changeListener != null) {
> 			TasksUiInternal.getTaskList().removeChangeListener(changeListener);
> 		}
>+		if (taskProgressBarChangeListener != null) {
>+			TasksUiInternal.getTaskList().removeChangeListener(taskProgressBarChangeListener);
>+		}
>+		if (taskProgressBarActivityListener != null) {
>+			TasksUi.getTaskActivityManager().removeActivityListener(taskProgressBarActivityListener);
>+		}
>+		if (taskProgressBarWorkingSetListener != null) {
>+			PlatformUI.getWorkbench().getWorkingSetManager().addPropertyChangeListener(
>+					taskProgressBarWorkingSetListener);
>+		}
>+
> 		super.dispose();
> 		taskListToolTip.dispose();
> 	}
>@@ -156,7 +180,7 @@
> 		taskProgressBar.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
> 		updateTaskProgressBar();
> 
>-		TasksUiInternal.getTaskList().addChangeListener(new TaskListChangeAdapter() {
>+		taskProgressBarChangeListener = new TaskListChangeAdapter() {
> 
> 			@Override
> 			public void containersChanged(Set<TaskContainerDelta> containers) {
>@@ -167,16 +191,29 @@
> 					}
> 				}
> 			}
>-		});
>+		};
>+		TasksUiInternal.getTaskList().addChangeListener(taskProgressBarChangeListener);
> 
>-		TasksUiPlugin.getTaskActivityManager().addActivityListener(new TaskActivityAdapter() {
>+		taskProgressBarActivityListener = new TaskActivityAdapter() {
> 
> 			@Override
> 			public void activityReset() {
> 				updateTaskProgressBar();
> 			}
> 
>-		});
>+		};
>+		TasksUiPlugin.getTaskActivityManager().addActivityListener(taskProgressBarActivityListener);
>+
>+		taskProgressBarWorkingSetListener = new IPropertyChangeListener() {
>+			public void propertyChange(PropertyChangeEvent event) {
>+				String property = event.getProperty();
>+				if (IWorkingSetManager.CHANGE_WORKING_SET_CONTENT_CHANGE.equals(property)
>+						|| IWorkingSetManager.CHANGE_WORKING_SET_REMOVE.equals(property)) {
>+					updateTaskProgressBar();
>+				}
>+			}
>+		};
>+		PlatformUI.getWorkbench().getWorkingSetManager().addPropertyChangeListener(taskProgressBarWorkingSetListener);
> 
> 		return progressComposite;
> 	}
>@@ -220,6 +257,14 @@
> 		}
> 
> 		Set<ITask> tasksThisWeek = TasksUiPlugin.getTaskActivityManager().getScheduledForADayThisWeek();
>+		if (workingSetFilter != null) {
>+			for (Iterator<ITask> it = tasksThisWeek.iterator(); it.hasNext();) {
>+				ITask task = it.next();
>+				if (!workingSetFilter.select(task)) {
>+					it.remove();
>+				}
>+			}
>+		}
> 
> 		totalTasks = tasksThisWeek.size();
> 		completeTime = 0;
>@@ -560,4 +605,12 @@
> 		return (text != null) ? text.trim() : null;
> 	}
> 
>+	public TaskWorkingSetFilter getWorkingSetFilter() {
>+		return workingSetFilter;
>+	}
>+
>+	public void setWorkingSetFilter(TaskWorkingSetFilter workingSetFilter) {
>+		this.workingSetFilter = workingSetFilter;
>+	}
>+
> }
>Index: src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListView.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListView.java,v
>retrieving revision 1.310
>diff -u -r1.310 TaskListView.java
>--- src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListView.java	22 Apr 2009 07:24:10 -0000	1.310
>+++ src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListView.java	22 Apr 2009 08:26:48 -0000
>@@ -299,7 +299,8 @@
> 	/**
> 	 * @deprecated Use {@link ITasksUiConstants#ID_VIEW_TASK_LIST} instead
> 	 */
>-	public static final String ID = ITasksUiConstants.ID_VIEW_TASK_LIST; //$NON-NLS-1$
>+	@Deprecated
>+	public static final String ID = ITasksUiConstants.ID_VIEW_TASK_LIST;
> 
> 	public static final String LABEL_VIEW = Messages.TaskListView_Task_List;
> 
>@@ -868,6 +869,7 @@
> 
> 		filterWorkingSet = new TaskWorkingSetFilter();
> 		filterWorkingSet.updateWorkingSet(getSite().getPage().getAggregateWorkingSet());
>+		filteredTree.setWorkingSetFilter(filterWorkingSet);
> 		addFilter(filterWorkingSet);
> 		addFilter(filterPriority);
> 		if (TasksUiPlugin.getDefault().getPreferenceStore().contains(ITasksUiPreferenceConstants.FILTER_COMPLETE_MODE)) {
>Index: src/org/eclipse/mylyn/internal/tasks/ui/TaskWorkingSetFilter.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskWorkingSetFilter.java,v
>retrieving revision 1.34
>diff -u -r1.34 TaskWorkingSetFilter.java
>--- src/org/eclipse/mylyn/internal/tasks/ui/TaskWorkingSetFilter.java	13 Jan 2009 07:07:36 -0000	1.34
>+++ src/org/eclipse/mylyn/internal/tasks/ui/TaskWorkingSetFilter.java	22 Apr 2009 08:26:48 -0000
>@@ -68,6 +68,15 @@
> 		return true;
> 	}
> 
>+	public boolean select(ITask task) {
>+		for (IRepositoryElement query : ((AbstractTask) task).getParentContainers()) {
>+			if (isContainedInWorkingSet(query)) {
>+				return true;
>+			}
>+		}
>+		return false;
>+	}
>+
> 	@Override
> 	public boolean applyToFilteredText() {
> 		return true;

Actions: View | Diff

Attachments on bug 210800: 132726 | 132727