Move rememberLastUsedPage button to SearchPreferencePage

To make the setting intuitive, this change moves the
rememberLastUsedPage button from Customize area to search preference
page. User can go to system preference to decide if the last used page
of search should be remembered.

Bug: 568786
Change-Id: Id6cdbba9b36cdf6eeba839b67d5beb1fa952a58b
Signed-off-by: Chenhui Xu <chenhui.xu@vogella.com>

4 files changed, 16 insertions, 21 deletions

diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchDialog.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchDialog.java
index a9bccded9f1..b4d0407d5f0 100644
--- a/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchDialog.java
+++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchDialog.java
@@ -94,7 +94,6 @@ public class SearchDialog extends ExtendedDialogWindow implements ISearchPageCon
 	// Dialog store id constants
 	private static final String DIALOG_NAME= "SearchDialog"; //$NON-NLS-1$
 	private static final String STORE_PREVIOUS_PAGE= "PREVIOUS_PAGE"; //$NON-NLS-1$
-	private static final String STORE_IS_OPEN_PREVIOUS_PAGE= "IS_OPEN_PREVIOUS_PAGE"; //$NON-NLS-1$
 
 
 	private class TabFolderLayout extends Layout {
@@ -165,9 +164,8 @@ public class SearchDialog extends ExtendedDialogWindow implements ISearchPageCon
 
 		fDescriptors= filterByActivities(SearchPlugin.getDefault().getEnabledSearchPageDescriptors(pageId));
 		fInitialPageId= pageId;
-
-		if (fInitialPageId == null && fDialogSettings.getBoolean(STORE_IS_OPEN_PREVIOUS_PAGE)) {
-			fInitialPageId= fDialogSettings.get(STORE_PREVIOUS_PAGE);
+		if (fInitialPageId == null && SearchPreferencePage.rememberLastUsedPage()) {
+			fInitialPageId = fDialogSettings.get(STORE_PREVIOUS_PAGE);
 		}
 
 		fPageChangeListeners= null;
@@ -335,7 +333,6 @@ public class SearchDialog extends ExtendedDialogWindow implements ISearchPageCon
 
 		ListSelectionDialog dialog = new ListSelectionDialog(getShell(), input, ArrayContentProvider.getInstance(),
 				labelProvider, message) {
-			Button fLastUsedPageButton;
 
 			@Override
 			public void create() {
@@ -353,20 +350,7 @@ public class SearchDialog extends ExtendedDialogWindow implements ISearchPageCon
 				this.getButton(IDialogConstants.DESELECT_ALL_ID).addSelectionListener(listener);
 			}
 
-			@Override
-			protected Control createDialogArea(Composite parent) {
-				Composite control= (Composite)super.createDialogArea(parent);
-				fLastUsedPageButton= new Button(control, SWT.CHECK);
-				fLastUsedPageButton.setText(SearchMessages.SearchPageSelectionDialog_rememberLastUsedPage_message);
-				fLastUsedPageButton.setSelection(fDialogSettings.getBoolean(STORE_IS_OPEN_PREVIOUS_PAGE));
-				return control;
-			}
 
-			@Override
-			protected void okPressed() {
-				fDialogSettings.put(STORE_IS_OPEN_PREVIOUS_PAGE, fLastUsedPageButton.getSelection());
-				super.okPressed();
-			}
 		};
 		dialog.setTitle(SearchMessages.SearchPageSelectionDialog_title);
 		dialog.setInitialSelections(SearchPlugin.getDefault().getEnabledSearchPageDescriptors(fInitialPageId).toArray());
diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchMessages.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchMessages.java
index 090407b3325..e29d18ae7c6 100644
--- a/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchMessages.java
+++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchMessages.java
@@ -68,7 +68,6 @@ public final class SearchMessages extends NLS {
 	public static String SearchDialog_noSearchExtension;
 	public static String SearchPageSelectionDialog_title;
 	public static String SearchPageSelectionDialog_message;
-	public static String SearchPageSelectionDialog_rememberLastUsedPage_message;
 	public static String SearchManager_resourceChangedWarning;
 	public static String SearchManager_resourceChanged;
 	public static String SearchManager_resourceDeleted;
@@ -200,6 +199,7 @@ public final class SearchMessages extends NLS {
 	public static String SearchPreferencePage_defaultPerspective;
 	public static String SearchPreferencePage_defaultPerspective_none;
 	public static String SearchPreferencePage_ignorePotentialMatches;
+	public static String SearchPreferencePage_rememberLastUsedPage;
 	public static String ReplaceAction_label_all;
 	public static String ReplaceAction_label_selected;
 	public static String SelectAllAction_label;
diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchMessages.properties b/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchMessages.properties
index 925672bdce1..3e6b4fe44cc 100644
--- a/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchMessages.properties
+++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchMessages.properties
@@ -206,8 +206,6 @@ CopyToClipboardAction_error_message= There was a problem when accessing the syst
 
 ExceptionDialog_seeErrorLogMessage= See error log for details
 
-SearchPageSelectionDialog_rememberLastUsedPage_message=&Remember last used page
-
 SearchPreferencePage_emphasizePotentialMatches= &Emphasize potential matches
 SearchPreferencePage_potentialMatchFgColor= &Foreground color for potential matches:
 SearchPreferencePage_reuseEditor= &Reuse editors to show matches
@@ -216,6 +214,7 @@ SearchPreferencePage_defaultPerspective= Default &perspective for the Search vie
 SearchPreferencePage_textSearchEngine=Text Search Engine to be used:
 SearchPreferencePage_defaultPerspective_none= None
 SearchPreferencePage_ignorePotentialMatches= &Ignore potential matches
+SearchPreferencePage_rememberLastUsedPage= &Remember last used page in the Search dialog
 
 ReplaceAction_label_all= Re&place All...
 ReplaceAction_title_all=Replace Text Matches
diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchPreferencePage.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchPreferencePage.java
index e88d75c3cac..051ffed250c 100644
--- a/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchPreferencePage.java
+++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchPreferencePage.java
@@ -46,6 +46,7 @@ public class SearchPreferencePage extends FieldEditorPreferencePage implements I
 
 
 	public static final String IGNORE_POTENTIAL_MATCHES= "org.eclipse.search.potentialMatch.ignore"; //$NON-NLS-1$
+	public static final String REMEMBER_LAST_USED_PAGE = "org.eclipse.search.potentialMatch.remember"; //$NON-NLS-1$
 	public static final String EMPHASIZE_POTENTIAL_MATCHES= "org.eclipse.search.potentialMatch.emphasize"; //$NON-NLS-1$
 	public static final String POTENTIAL_MATCH_FG_COLOR= "org.eclipse.search.potentialMatch.fgColor"; //$NON-NLS-1$
 	public static final String REUSE_EDITOR= "org.eclipse.search.reuseEditor"; //$NON-NLS-1$
@@ -59,6 +60,7 @@ public class SearchPreferencePage extends FieldEditorPreferencePage implements I
 	private ColorFieldEditor fColorEditor;
 	private BooleanFieldEditor fEmphasizedCheckbox;
 	private BooleanFieldEditor fIgnorePotentialMatchesCheckbox;
+	private BooleanFieldEditor fRememberLastUsedPageCheckbox;
 
 
 	private static class PerspectiveDescriptorComparator implements Comparator<IPerspectiveDescriptor> {
@@ -81,6 +83,7 @@ public class SearchPreferencePage extends FieldEditorPreferencePage implements I
 		RGB gray= new RGB(85, 85, 85);
 		store.setDefault(EMPHASIZE_POTENTIAL_MATCHES, true);
 		store.setDefault(IGNORE_POTENTIAL_MATCHES, false);
+		store.setDefault(REMEMBER_LAST_USED_PAGE, false);
 		PreferenceConverter.setDefault(store, POTENTIAL_MATCH_FG_COLOR, gray);
 		store.setDefault(REUSE_EDITOR, true);
 		store.setDefault(BRING_VIEW_TO_FRONT, true);
@@ -108,6 +111,10 @@ public class SearchPreferencePage extends FieldEditorPreferencePage implements I
 			getFieldEditorParent());
 		addField(fIgnorePotentialMatchesCheckbox);
 
+		fRememberLastUsedPageCheckbox = new BooleanFieldEditor(REMEMBER_LAST_USED_PAGE,
+				SearchMessages.SearchPreferencePage_rememberLastUsedPage, getFieldEditorParent());
+		addField(fRememberLastUsedPageCheckbox);
+
 		fEmphasizedCheckbox= new BooleanFieldEditor(
 			EMPHASIZE_POTENTIAL_MATCHES,
 			SearchMessages.SearchPreferencePage_emphasizePotentialMatches,
@@ -232,6 +239,11 @@ public class SearchPreferencePage extends FieldEditorPreferencePage implements I
 		return store.getBoolean(IGNORE_POTENTIAL_MATCHES);
 	}
 
+	public static boolean rememberLastUsedPage() {
+		IPreferenceStore store = SearchPlugin.getDefault().getPreferenceStore();
+		return store.getBoolean(REMEMBER_LAST_USED_PAGE);
+	}
+
 	public static boolean arePotentialMatchesEmphasized() {
 		IPreferenceStore store= SearchPlugin.getDefault().getPreferenceStore();
 		return store.getBoolean(EMPHASIZE_POTENTIAL_MATCHES);