diff options
author | Dani Megert | 2012-04-05 09:01:03 +0000 |
---|---|---|
committer | Dani Megert | 2012-04-05 09:01:03 +0000 |
commit | 266c1b8718ae1ad4a13c26f5cf0f0913250b1855 (patch) | |
tree | ddc45189a2d7db8853096c5cd42ca8d158c1f250 | |
parent | e414aee94b0ec1e061c130b1408256ba52c875df (diff) | |
download | eclipse.platform.text-I20120410-2037.tar.gz eclipse.platform.text-I20120410-2037.tar.xz eclipse.platform.text-I20120410-2037.zip |
Fixed bug 376147: 'Bring to front' preference no longer worksv20120405-0901N20120417-1633N20120417-1307N20120416-1918I20120419-1434I20120418-0248I20120417-1000I20120417-0800I20120417-0334I20120417-0255I20120417-0235I20120417-0211I20120417-0142I20120416-2327I20120416-1738I20120416-1719I20120416-1643I20120416-1623I20120416-1600I20120416-1508I20120411-2034I20120411-1737I20120411-0906I20120411-0258I20120410-2330I20120410-2037I20120410-1710I20120410-0633
-rw-r--r-- | org.eclipse.search/new search/org/eclipse/search2/internal/ui/SearchViewManager.java | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/org.eclipse.search/new search/org/eclipse/search2/internal/ui/SearchViewManager.java b/org.eclipse.search/new search/org/eclipse/search2/internal/ui/SearchViewManager.java index 6645088d92c..017c558c257 100644 --- a/org.eclipse.search/new search/org/eclipse/search2/internal/ui/SearchViewManager.java +++ b/org.eclipse.search/new search/org/eclipse/search2/internal/ui/SearchViewManager.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2011 IBM Corporation and others. + * Copyright (c) 2000, 2012 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -22,6 +22,7 @@ import org.eclipse.ui.PlatformUI; import org.eclipse.ui.WorkbenchException; import org.eclipse.search.internal.ui.SearchPlugin; +import org.eclipse.search.internal.ui.SearchPreferencePage; import org.eclipse.search.internal.ui.util.ExceptionHandler; import org.eclipse.search.ui.IQueryListener; import org.eclipse.search.ui.ISearchQuery; @@ -94,16 +95,18 @@ public class SearchViewManager { if (activePage != null) { try { ISearchResultViewPart viewPart= null; - if (!openInNew) + if (!openInNew) { viewPart= findLRUSearchResultView(activePage, avoidPinnedViews); + } String secondaryId= null; if (viewPart == null) { - if (activePage.findViewReference(NewSearchUI.SEARCH_VIEW_ID) != null) { + if (activePage.findViewReference(NewSearchUI.SEARCH_VIEW_ID) != null) secondaryId= String.valueOf(++fViewCount); // avoid a secondary ID because of bug 125315 - } - } else { + } else if (!SearchPreferencePage.isViewBroughtToFront()) + return viewPart; + else secondaryId= viewPart.getViewSite().getSecondaryId(); - } + return (ISearchResultViewPart) activePage.showView(NewSearchUI.SEARCH_VIEW_ID, secondaryId, IWorkbenchPage.VIEW_ACTIVATE); } catch (PartInitException ex) { ExceptionHandler.handle(ex, SearchMessages.Search_Error_openResultView_title, SearchMessages.Search_Error_openResultView_message); |