NEW - bug 315513: [performance] reduce memory footprint

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

2 files changed, 10 insertions, 2 deletions

diff --git a/org.eclipse.mylyn.tasks.search/src/org/eclipse/mylyn/internal/tasks/ui/search/SearchResultContentProvider.java b/org.eclipse.mylyn.tasks.search/src/org/eclipse/mylyn/internal/tasks/ui/search/SearchResultContentProvider.java
index 98cb03481..977b8c046 100644
--- a/org.eclipse.mylyn.tasks.search/src/org/eclipse/mylyn/internal/tasks/ui/search/SearchResultContentProvider.java
+++ b/org.eclipse.mylyn.tasks.search/src/org/eclipse/mylyn/internal/tasks/ui/search/SearchResultContentProvider.java
@@ -18,6 +18,7 @@ import org.eclipse.jface.viewers.Viewer;
  * @author Rob Elves (moved into task.ui)
  * @see org.eclipse.jface.viewers.IContentProvider
  */
+// TODO e3.5 merge into SearchResultTreeContentProvider
 public abstract class SearchResultContentProvider implements ITreeContentProvider {
 
 	/** An empty array of objects */
@@ -33,6 +34,8 @@ public abstract class SearchResultContentProvider implements ITreeContentProvide
 	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
 		if (newInput instanceof RepositorySearchResult) {
 			initialize((RepositorySearchResult) newInput);
+		} else {
+			searchResult = null;
 		}
 	}
 
diff --git a/org.eclipse.mylyn.tasks.search/src/org/eclipse/mylyn/internal/tasks/ui/search/SearchResultTreeContentProvider.java b/org.eclipse.mylyn.tasks.search/src/org/eclipse/mylyn/internal/tasks/ui/search/SearchResultTreeContentProvider.java
index 0afc59d6f..343a4b5aa 100644
--- a/org.eclipse.mylyn.tasks.search/src/org/eclipse/mylyn/internal/tasks/ui/search/SearchResultTreeContentProvider.java
+++ b/org.eclipse.mylyn.tasks.search/src/org/eclipse/mylyn/internal/tasks/ui/search/SearchResultTreeContentProvider.java
@@ -54,6 +54,9 @@ public class SearchResultTreeContentProvider extends SearchResultContentProvider
 			searchResult = (RepositorySearchResult) newInput;
 			clear();
 			elementsChanged(searchResult.getElements());
+		} else {
+			searchResult = null;
+			clear();
 		}
 	}
 
@@ -111,13 +114,15 @@ public class SearchResultTreeContentProvider extends SearchResultContentProvider
 				if (task.isCompleted()) {
 					completeIncomplete = completeState.get(Messages.SearchResultTreeContentProvider_Complete);
 					if (completeIncomplete == null) {
-						completeIncomplete = new TaskGroup("group-complete", Messages.SearchResultTreeContentProvider_Complete, GroupBy.COMPLETION.name()); //$NON-NLS-1$
+						completeIncomplete = new TaskGroup(
+								"group-complete", Messages.SearchResultTreeContentProvider_Complete, GroupBy.COMPLETION.name()); //$NON-NLS-1$
 						completeState.put(Messages.SearchResultTreeContentProvider_Complete, completeIncomplete);
 					}
 				} else {
 					completeIncomplete = completeState.get(Messages.SearchResultTreeContentProvider_Incomplete);
 					if (completeIncomplete == null) {
-						completeIncomplete = new TaskGroup("group-incomplete", Messages.SearchResultTreeContentProvider_Incomplete, GroupBy.COMPLETION.name()); //$NON-NLS-1$
+						completeIncomplete = new TaskGroup(
+								"group-incomplete", Messages.SearchResultTreeContentProvider_Incomplete, GroupBy.COMPLETION.name()); //$NON-NLS-1$
 						completeState.put(Messages.SearchResultTreeContentProvider_Incomplete, completeIncomplete);
 					}
 				}