Attachment #199804 for bug #33710

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

Lines 89-95 import org.eclipse.search.ui.ISearchPageScoreComputer; Link Here

(-)search/org/eclipse/search/internal/ui/SearchDialog.java (-1 / +20 lines)
89		89
90		90
91	public class SearchDialog extends ExtendedDialogWindow implements ISearchPageContainer, IPageChangeProvider {	91	public class SearchDialog extends ExtendedDialogWindow implements ISearchPageContainer, IPageChangeProvider {
92		92
		93	/**
		94	* The id of the last search page that was opened in the search dialog
		95	*/
		96	public static final String PREVIOUS_SEARCH_PAGE = "org.eclipse.search.previousSearchPageId"; //$NON-NLS-1$
		97
93	private class TabFolderLayout extends Layout {	98	private class TabFolderLayout extends Layout {
94	protected Point computeSize(Composite composite, int wHint, int hHint, boolean flushCache) {	99	protected Point computeSize(Composite composite, int wHint, int hHint, boolean flushCache) {
95	if (wHint != SWT.DEFAULT && hHint != SWT.DEFAULT)	100	if (wHint != SWT.DEFAULT && hHint != SWT.DEFAULT)
Lines 154-159 public class SearchDialog extends ExtendedDialogWindow implements ISearchPageCon Link Here
154		159
155	fDescriptors= filterByActivities(SearchPlugin.getDefault().getEnabledSearchPageDescriptors(pageId));	160	fDescriptors= filterByActivities(SearchPlugin.getDefault().getEnabledSearchPageDescriptors(pageId));
156	fInitialPageId= pageId;	161	fInitialPageId= pageId;
		162	boolean useLastUsedSearchPage= SearchPlugin.getDefault().getPreferenceStore().getBoolean(SearchPreferencePage.USE_LAST_USED_SEARCHPAGE);
		163	// if fInitialPageId != null then a specific search page shall be opened directly
		164	// In this case do not consider the preference at all
		165	if (fInitialPageId == null && useLastUsedSearchPage) {
		166	String lastPageId = SearchPlugin.getDefault().getPreferenceStore().getString(PREVIOUS_SEARCH_PAGE);
		167	fInitialPageId = lastPageId;
		168	}
		169
157	fPageChangeListeners= null;	170	fPageChangeListeners= null;
158	setUseEmbeddedProgressMonitorPart(false);	171	setUseEmbeddedProgressMonitorPart(false);
159	}	172	}
Lines 774-779 public class SearchDialog extends ExtendedDialogWindow implements ISearchPageCon Link Here
774	* @see org.eclipse.jface.dialogs.Dialog#close()	787	* @see org.eclipse.jface.dialogs.Dialog#close()
775	*/	788	*/
776	public boolean close() {	789	public boolean close() {
		790	// Store used search page id
		791	if (fDescriptors.size() > 0) {
		792	SearchPageDescriptor descr = (SearchPageDescriptor)fDescriptors.get(fCurrentIndex);
		793	String pageId = descr.getId();
		794	SearchPlugin.getDefault().getPreferenceStore().setValue(PREVIOUS_SEARCH_PAGE, pageId);
		795	}
777	for (int i= 0; i < fDescriptors.size(); i++) {	796	for (int i= 0; i < fDescriptors.size(); i++) {
778	SearchPageDescriptor desc= (SearchPageDescriptor) fDescriptors.get(i);	797	SearchPageDescriptor desc= (SearchPageDescriptor) fDescriptors.get(i);
779	desc.dispose();	798	desc.dispose();

Lines 185-190 public final class SearchMessages extends NLS { Link Here

(-)search/org/eclipse/search/internal/ui/SearchMessages.java (+1 lines)
185	public static String SearchPreferencePage_defaultPerspective;	185	public static String SearchPreferencePage_defaultPerspective;
186	public static String SearchPreferencePage_defaultPerspective_none;	186	public static String SearchPreferencePage_defaultPerspective_none;
187	public static String SearchPreferencePage_ignorePotentialMatches;	187	public static String SearchPreferencePage_ignorePotentialMatches;
		188	public static String SearchPreferencePage_useLastUsedSearchPage;
188	public static String ReplaceAction_label_all;	189	public static String ReplaceAction_label_all;
189	public static String ReplaceAction_label_selected;	190	public static String ReplaceAction_label_selected;
190	public static String SelectAllAction_label;	191	public static String SelectAllAction_label;

Lines 199-204 SearchPreferencePage_defaultPerspective= Default &perspective for the Search vie Link Here

(-)search/org/eclipse/search/internal/ui/SearchMessages.properties (+1 lines)
199	SearchPreferencePage_textSearchEngine=Text Search Engine to be used:	199	SearchPreferencePage_textSearchEngine=Text Search Engine to be used:
200	SearchPreferencePage_defaultPerspective_none= None	200	SearchPreferencePage_defaultPerspective_none= None
201	SearchPreferencePage_ignorePotentialMatches= &Ignore potential matches	201	SearchPreferencePage_ignorePotentialMatches= &Ignore potential matches
		202	SearchPreferencePage_useLastUsedSearchPage= &Focus on last used search page
202		203
203	ReplaceAction_label_all= Re&place All...	204	ReplaceAction_label_all= Re&place All...
204	ReplaceAction_title_all=Replace Text Matches	205	ReplaceAction_title_all=Replace Text Matches

Lines 53-58 public class SearchPreferencePage extends FieldEditorPreferencePage implements I Link Here

(-)search/org/eclipse/search/internal/ui/SearchPreferencePage.java (+7 lines)
53	public static final String TEXT_SEARCH_ENGINE = "org.eclipse.search.textSearchEngine"; //$NON-NLS-1$	53	public static final String TEXT_SEARCH_ENGINE = "org.eclipse.search.textSearchEngine"; //$NON-NLS-1$
54	public static final String TEXT_SEARCH_QUERY_PROVIDER = "org.eclipse.search.textSearchQueryProvider"; //$NON-NLS-1$	54	public static final String TEXT_SEARCH_QUERY_PROVIDER = "org.eclipse.search.textSearchQueryProvider"; //$NON-NLS-1$
55	public static final String LIMIT_HISTORY= "org.eclipse.search.limitHistory"; //$NON-NLS-1$	55	public static final String LIMIT_HISTORY= "org.eclipse.search.limitHistory"; //$NON-NLS-1$
		56	/**
		57	* Preference switch. If <code>true</code> then the last used search page is opened when the search dialog is opened
		58	* instead of the page that is calculated to fit best the current selection/editor/...
		59	*/
		60	public static final String USE_LAST_USED_SEARCHPAGE= "org.eclipse.search.useLastUsedSearchPage"; //$NON-NLS-1$
56		61
57	private ColorFieldEditor fColorEditor;	62	private ColorFieldEditor fColorEditor;
58	private BooleanFieldEditor fEmphasizedCheckbox;	63	private BooleanFieldEditor fEmphasizedCheckbox;
Lines 91-96 public class SearchPreferencePage extends FieldEditorPreferencePage implements I Link Here
91	store.setDefault(TEXT_SEARCH_ENGINE, ""); //default search engine is empty string //$NON-NLS-1$	96	store.setDefault(TEXT_SEARCH_ENGINE, ""); //default search engine is empty string //$NON-NLS-1$
92	store.setDefault(TEXT_SEARCH_QUERY_PROVIDER, ""); // default query provider is empty string //$NON-NLS-1$	97	store.setDefault(TEXT_SEARCH_QUERY_PROVIDER, ""); // default query provider is empty string //$NON-NLS-1$
93	store.setDefault(LIMIT_HISTORY, 10);	98	store.setDefault(LIMIT_HISTORY, 10);
		99	store.setDefault(USE_LAST_USED_SEARCHPAGE, false);
94	}	100	}
95		101
96		102
Lines 102-107 public class SearchPreferencePage extends FieldEditorPreferencePage implements I Link Here
102	protected void createFieldEditors() {	108	protected void createFieldEditors() {
103	addField(new BooleanFieldEditor(REUSE_EDITOR, SearchMessages.SearchPreferencePage_reuseEditor, getFieldEditorParent()));	109	addField(new BooleanFieldEditor(REUSE_EDITOR, SearchMessages.SearchPreferencePage_reuseEditor, getFieldEditorParent()));
104	addField(new BooleanFieldEditor(BRING_VIEW_TO_FRONT, SearchMessages.SearchPreferencePage_bringToFront, getFieldEditorParent()));	110	addField(new BooleanFieldEditor(BRING_VIEW_TO_FRONT, SearchMessages.SearchPreferencePage_bringToFront, getFieldEditorParent()));
		111	addField(new BooleanFieldEditor(USE_LAST_USED_SEARCHPAGE, SearchMessages.SearchPreferencePage_useLastUsedSearchPage, getFieldEditorParent()));
105		112
106	fIgnorePotentialMatchesCheckbox= new BooleanFieldEditor(	113	fIgnorePotentialMatchesCheckbox= new BooleanFieldEditor(
107	IGNORE_POTENTIAL_MATCHES,	114	IGNORE_POTENTIAL_MATCHES,

Return to bug 33710