diff options
| author | Markus Keller | 2010-10-12 11:00:40 +0000 |
|---|---|---|
| committer | Markus Keller | 2010-10-12 11:00:40 +0000 |
| commit | 7781680961a5059eed7da8359d9fc7314f48c8b4 (patch) | |
| tree | 495eb5dd811eaa36be1e4b3e50b4941dc456f616 /org.eclipse.search | |
| parent | fba7f245132b1dba2b9812c451448f9683004261 (diff) | |
| download | eclipse.platform.text-7781680961a5059eed7da8359d9fc7314f48c8b4.tar.gz eclipse.platform.text-7781680961a5059eed7da8359d9fc7314f48c8b4.tar.xz eclipse.platform.text-7781680961a5059eed7da8359d9fc7314f48c8b4.zip | |
reverted Bug 324385: [search] Double-click in Search results pages should always toggle expansion
Diffstat (limited to 'org.eclipse.search')
| -rw-r--r-- | org.eclipse.search/new search/org/eclipse/search/ui/text/AbstractTextSearchViewPage.java | 3 | ||||
| -rw-r--r-- | org.eclipse.search/search/org/eclipse/search/internal/ui/text/FileSearchPage.java | 5 |
2 files changed, 2 insertions, 6 deletions
diff --git a/org.eclipse.search/new search/org/eclipse/search/ui/text/AbstractTextSearchViewPage.java b/org.eclipse.search/new search/org/eclipse/search/ui/text/AbstractTextSearchViewPage.java index 122f3f4cc9c..fe95d5d73e8 100644 --- a/org.eclipse.search/new search/org/eclipse/search/ui/text/AbstractTextSearchViewPage.java +++ b/org.eclipse.search/new search/org/eclipse/search/ui/text/AbstractTextSearchViewPage.java @@ -1426,9 +1426,10 @@ public abstract class AbstractTextSearchViewPage extends Page implements ISearch TreeViewer tv = (TreeViewer) getViewer(); Object element = selection.getFirstElement(); if (element != null) { - tv.setExpandedState(element, !tv.getExpandedState(element)); if (!hasCurrentMatch && getDisplayedMatchCount(element) > 0) gotoNextMatch(OpenStrategy.activateOnOpen()); + else + tv.setExpandedState(element, !tv.getExpandedState(element)); } return; } else if (!hasCurrentMatch) { diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/text/FileSearchPage.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/text/FileSearchPage.java index 5290175c84b..4a10d52c554 100644 --- a/org.eclipse.search/search/org/eclipse/search/internal/ui/text/FileSearchPage.java +++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/text/FileSearchPage.java @@ -186,11 +186,6 @@ public class FileSearchPage extends AbstractTextSearchViewPage implements IAdapt Object firstElement= ((IStructuredSelection)event.getSelection()).getFirstElement(); if (firstElement instanceof IFile) { if (getDisplayedMatchCount(firstElement) == 0) { - Viewer viewer= event.getViewer(); - if (viewer instanceof TreeViewer) { - TreeViewer tv = (TreeViewer) getViewer(); - tv.setExpandedState(firstElement, !tv.getExpandedState(firstElement)); - } try { open(getSite().getPage(), (IFile)firstElement, false); } catch (PartInitException e) { |