NEW - bug 207602: [performance] assigning projects to workings sets very slow

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

1 files changed, 14 insertions, 13 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 6f0d56c47..ae24bbf05 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
@@ -698,7 +698,7 @@ public class TaskListView extends ViewPart implements IPropertyChangeListener {
 		}
 
 		filterWorkingSet = new TaskWorkingSetFilter(TasksUiPlugin.getTaskListManager().getTaskList());
-		filterWorkingSet.setCurrentWorkingSet(getSite().getPage().getAggregateWorkingSet());
+		filterWorkingSet.updateWorkingSet(getSite().getPage().getAggregateWorkingSet());
 		addFilter(filterWorkingSet);
 		addFilter(filterPriority);
 		if (TasksUiPlugin.getDefault().getPreferenceStore().contains(TasksUiPreferenceConstants.FILTER_COMPLETE_MODE)) {
@@ -1643,7 +1643,19 @@ public class TaskListView extends ViewPart implements IPropertyChangeListener {
 		if (IWorkingSetManager.CHANGE_WORKING_SET_CONTENT_CHANGE.equals(property)
 				|| IWorkingSetManager.CHANGE_WORKING_SET_REMOVE.equals(property)) {
 			if (getSite() != null && getSite().getPage() != null) {
-				filterWorkingSet.setCurrentWorkingSet(getSite().getPage().getAggregateWorkingSet());
+				if (filterWorkingSet.updateWorkingSet(getSite().getPage().getAggregateWorkingSet())) {
+					try {
+						getViewer().getControl().setRedraw(false);
+						// XXX why is this needed?
+						//getViewer().collapseAll();
+						getViewer().refresh();
+						if (isFocusedMode()) {
+							getViewer().expandAll();
+						}
+					} finally {
+						getViewer().getControl().setRedraw(true);
+					}
+				}
 			}
 
 			PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable() {
@@ -1652,17 +1664,6 @@ public class TaskListView extends ViewPart implements IPropertyChangeListener {
 				}
 			});
 		}
-
-		try {
-			getViewer().getControl().setRedraw(false);
-			getViewer().collapseAll();
-			getViewer().refresh();
-			if (isFocusedMode()) {
-				getViewer().expandAll();
-			}
-		} finally {
-			getViewer().getControl().setRedraw(true);
-		}
 	}
 
 	public void setLinkWithEditor(boolean linkWithEditor) {