Cherrypick 673a0deab1b798e881edb5e0b0853f9d880fa665

' fix for #3230 '
Picked to resolve breaking auto-merging following commit

ummisco.gama.ui.navigator/src/ummisco/gama/ui/navigator/NavigatorSearchControl.java

@@ -156,7 +156,11 @@ private boolean internalSelect(final VirtualContent<?> element, final boolean co
 
 	/** The tree viewer. */
 	CommonViewer treeViewer;
-
+
+	/** List of expanded elements at the start of a search
+	 * used internally to restore the state before search**/
+	private Object[] expandedElementsBeforeSearch = null;
+
 	/** The filter. */
 	final NamePatternFilter filter = new NamePatternFilter();
 
@@ -268,6 +272,9 @@ public IStatus runInUIThread(final IProgressMonitor monitor) {
 	 * Do search.
 	 */
 	public void doSearch() {
+		if(expandedElementsBeforeSearch == null) {
+			expandedElementsBeforeSearch = treeViewer.getExpandedElements();
+		}
 		treeViewer.getControl().setRedraw(false);
 		filter.reset();
 		if (!Arrays.asList(treeViewer.getFilters()).contains(filter)) {
@@ -289,6 +296,11 @@ public void resetSearch() {
 		} else {
 			treeViewer.refresh(false);
 		}
+		if(expandedElementsBeforeSearch != null) {
+			treeViewer.collapseAll();
+			treeViewer.setExpandedElements(expandedElementsBeforeSearch);
+			expandedElementsBeforeSearch = null;
+		}
 		treeViewer.getControl().setRedraw(true);
 	}