Attachment #227716 for bug #33710

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

Lines 11-14 Link Here

(-)a/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchDialog.java (-35 / +86 lines)
11	* o Search dialog not respecting activity enablement	11	* o Search dialog not respecting activity enablement
12	* (see https://bugs.eclipse.org/bugs/show_bug.cgi?id=45729)	12	* (see https://bugs.eclipse.org/bugs/show_bug.cgi?id=45729)
		13	* Marco Descher <marco@descher.at> - http://bugs.eclipse.org/33710
13	*******************************************************************************/	14	*******************************************************************************/
14	package org.eclipse.search.internal.ui;	15	package org.eclipse.search.internal.ui;
Lines 52-55 Link Here
52		53
53	import org.eclipse.jface.action.LegacyActionTools;	54	import org.eclipse.jface.action.LegacyActionTools;
		55	import org.eclipse.jface.dialogs.DialogSettings;
54	import org.eclipse.jface.dialogs.IDialogConstants;	56	import org.eclipse.jface.dialogs.IDialogConstants;
55	import org.eclipse.jface.dialogs.IDialogSettings;	57	import org.eclipse.jface.dialogs.IDialogSettings;
Lines 91-94 Link Here
91	public class SearchDialog extends ExtendedDialogWindow implements ISearchPageContainer, IPageChangeProvider {	93	public class SearchDialog extends ExtendedDialogWindow implements ISearchPageContainer, IPageChangeProvider {
92		94
		95	/**
		96	* The id of the last search page that was opened in the search dialog, used as key in
		97	* {@link DialogSettings}
		98	*/
		99	public static final String PREVIOUS_SEARCH_PAGE= "PreviousSearchPageId_SearchDialog"; //$NON-NLS-1$
		100
		101	public static final String SEARCH_TAB_OPENS_LAST_USED_PAGE= "SearchTabSelectionMode_LastUsedPage"; //$NON-NLS-1$
		102
93	private class TabFolderLayout extends Layout {	103	private class TabFolderLayout extends Layout {
94	protected Point computeSize(Composite composite, int wHint, int hHint, boolean flushCache) {	104	protected Point computeSize(Composite composite, int wHint, int hHint, boolean flushCache) {
Lines 115-118 Link Here
115	return new Point(x, y);	125	return new Point(x, y);
116	}	126	}
		127
117	protected void layout(Composite composite, boolean flushCache) {	128	protected void layout(Composite composite, boolean flushCache) {
118	Rectangle rect= composite.getClientArea();	129	Rectangle rect= composite.getClientArea();
Lines 127-149 Link Here
127		138
128	private static final int SEARCH_ID= IDialogConstants.CLIENT_ID + 1;	139	private static final int SEARCH_ID= IDialogConstants.CLIENT_ID + 1;
		140
129	private static final int REPLACE_ID= SEARCH_ID + 1;	141	private static final int REPLACE_ID= SEARCH_ID + 1;
		142
130	private static final int CUSTOMIZE_ID= REPLACE_ID + 1;	143	private static final int CUSTOMIZE_ID= REPLACE_ID + 1;
131		144
132	private ISearchPage fCurrentPage;	145	private ISearchPage fCurrentPage;
		146
133	private String fInitialPageId;	147	private String fInitialPageId;
		148
134	private int fCurrentIndex;	149	private int fCurrentIndex;
135		150
136	private List fDescriptors;	151	private List fDescriptors;
		152
137	private Point fMinSize;	153	private Point fMinSize;
		154
138	private ScopePart[] fScopeParts;	155	private ScopePart[] fScopeParts;
		156
139	private boolean fLastEnableState;	157	private boolean fLastEnableState;
		158
140	private Button fCustomizeButton;	159	private Button fCustomizeButton;
		160
141	private Button fReplaceButton;	161	private Button fReplaceButton;
		162
142	private ListenerList fPageChangeListeners;	163	private ListenerList fPageChangeListeners;
143		164
144	private final IWorkbenchWindow fWorkbenchWindow;	165	private final IWorkbenchWindow fWorkbenchWindow;
		166
145	private final ISelection fCurrentSelection;	167	private final ISelection fCurrentSelection;
		168
146	private final String[] fCurrentEnclosingProject;	169	private final String[] fCurrentEnclosingProject;
147		170
		171	private final IDialogSettings defaultDialogSettings= SearchPlugin.getDefault().getDialogSettings();
148		172
149	public SearchDialog(IWorkbenchWindow window, String pageId) {	173	public SearchDialog(IWorkbenchWindow window, String pageId) {
Lines 155-158 Link Here
155	fDescriptors= filterByActivities(SearchPlugin.getDefault().getEnabledSearchPageDescriptors(pageId));	179	fDescriptors= filterByActivities(SearchPlugin.getDefault().getEnabledSearchPageDescriptors(pageId));
156	fInitialPageId= pageId;	180	fInitialPageId= pageId;
		181
		182	if (fInitialPageId == null) {
		183	if (defaultDialogSettings.getBoolean(SEARCH_TAB_OPENS_LAST_USED_PAGE))
		184	fInitialPageId= defaultDialogSettings.get(PREVIOUS_SEARCH_PAGE);
		185	}
		186
157	fPageChangeListeners= null;	187	fPageChangeListeners= null;
158	setUseEmbeddedProgressMonitorPart(false);	188	setUseEmbeddedProgressMonitorPart(false);
Lines 160-166 Link Here
160		190
161	public static String evaluateEnclosingProject(IAdaptable adaptable) {	191	public static String evaluateEnclosingProject(IAdaptable adaptable) {
162	IProject project= (IProject) adaptable.getAdapter(IProject.class);	192	IProject project= (IProject)adaptable.getAdapter(IProject.class);
163	if (project == null) {	193	if (project == null) {
164	IResource resource= (IResource) adaptable.getAdapter(IResource.class);	194	IResource resource= (IResource)adaptable.getAdapter(IResource.class);
165	if (resource != null) {	195	if (resource != null) {
166	project= resource.getProject();	196	project= resource.getProject();
Lines 182-189 Link Here
182	} else if (selection instanceof IStructuredSelection) {	212	} else if (selection instanceof IStructuredSelection) {
183	HashSet res= new HashSet();	213	HashSet res= new HashSet();
184	for (Iterator iter= ((IStructuredSelection) selection).iterator(); iter.hasNext();) {	214	for (Iterator iter= ((IStructuredSelection)selection).iterator(); iter.hasNext();) {
185	Object curr= iter.next();	215	Object curr= iter.next();
186	if (curr instanceof IWorkingSet) {	216	if (curr instanceof IWorkingSet) {
187	IWorkingSet workingSet= (IWorkingSet) curr;	217	IWorkingSet workingSet= (IWorkingSet)curr;
188	if (workingSet.isAggregateWorkingSet() && workingSet.isEmpty()) {	218	if (workingSet.isAggregateWorkingSet() && workingSet.isEmpty()) {
189	IProject[] projects= ResourcesPlugin.getWorkspace().getRoot().getProjects();	219	IProject[] projects= ResourcesPlugin.getWorkspace().getRoot().getProjects();
Lines 204-208 Link Here
204	}	234	}
205	} else if (curr instanceof IAdaptable) {	235	} else if (curr instanceof IAdaptable) {
206	String name= evaluateEnclosingProject((IAdaptable) curr);	236	String name= evaluateEnclosingProject((IAdaptable)curr);
207	if (name != null) {	237	if (name != null) {
208	res.add(name);	238	res.add(name);
Lines 211-215 Link Here
211	}	241	}
212	if (!res.isEmpty()) {	242	if (!res.isEmpty()) {
213	return (String[]) res.toArray(new String[res.size()]);	243	return (String[])res.toArray(new String[res.size()]);
214	}	244	}
215	}	245	}
Lines 296-299 Link Here
296	return null;	326	return null;
297	}	327	}
		328
298	public Image getImage(Object element) {	329	public Image getImage(Object element) {
299	if (element instanceof SearchPageDescriptor) {	330	if (element instanceof SearchPageDescriptor) {
Lines 322-326 Link Here
322	}	353	}
323	});	354	});
324	SelectionListener listener = new SelectionAdapter() {	355	SelectionListener listener= new SelectionAdapter() {
325	public void widgetSelected(SelectionEvent e) {	356	public void widgetSelected(SelectionEvent e) {
326	okButton.setEnabled(viewer.getCheckedElements().length > 0);	357	okButton.setEnabled(viewer.getCheckedElements().length > 0);
Lines 329-332 Link Here
329	this.getButton(IDialogConstants.SELECT_ALL_ID).addSelectionListener(listener);	360	this.getButton(IDialogConstants.SELECT_ALL_ID).addSelectionListener(listener);
330	this.getButton(IDialogConstants.DESELECT_ALL_ID).addSelectionListener(listener);	361	this.getButton(IDialogConstants.DESELECT_ALL_ID).addSelectionListener(listener);
		362	}
		363
		364	protected Control createDialogArea(Composite parent) {
		365	Composite ret= (Composite)super.createDialogArea(parent);
		366
		367	final Button b= new Button(ret, SWT.CHECK);
		368	b.setText(SearchMessages.RememberLastUsedPage_message);
		369	b.setSelection(defaultDialogSettings.getBoolean(SEARCH_TAB_OPENS_LAST_USED_PAGE));
		370	b.addSelectionListener(new SelectionAdapter() {
		371	public void widgetSelected(SelectionEvent e) {
		372	defaultDialogSettings.put(SEARCH_TAB_OPENS_LAST_USED_PAGE, b.getSelection());
		373	}
		374	});
		375
		376	return ret;
331	}	377	}
332	};	378	};
Lines 352-358 Link Here
352	ArrayList filteredList= new ArrayList(input.size());	398	ArrayList filteredList= new ArrayList(input.size());
353	for (Iterator descriptors= input.iterator(); descriptors.hasNext();) {	399	for (Iterator descriptors= input.iterator(); descriptors.hasNext();) {
354	SearchPageDescriptor descriptor= (SearchPageDescriptor) descriptors.next();	400	SearchPageDescriptor descriptor= (SearchPageDescriptor)descriptors.next();
355	if (!WorkbenchActivityHelper.filterItem(descriptor))	401	if (!WorkbenchActivityHelper.filterItem(descriptor))
356	filteredList.add(descriptor);	402	filteredList.add(descriptor);
357		403
358	}	404	}
Lines 385-391 Link Here
385	composite.setFont(parent.getFont());	431	composite.setFont(parent.getFont());
386		432
387	GridLayout layout = new GridLayout();	433	GridLayout layout= new GridLayout();
388	layout.marginHeight = 0;	434	layout.marginHeight= 0;
389	layout.marginWidth = 0;	435	layout.marginWidth= 0;
390	composite.setLayout(layout);	436	composite.setLayout(layout);
391	composite.setLayoutData(new GridData(GridData.FILL_BOTH));	437	composite.setLayoutData(new GridData(GridData.FILL_BOTH));
Lines 399-403 Link Here
399	SearchPageDescriptor descriptor= getDescriptorAt(i);	445	SearchPageDescriptor descriptor= getDescriptorAt(i);
400	if (WorkbenchActivityHelper.filterItem(descriptor))	446	if (WorkbenchActivityHelper.filterItem(descriptor))
401	continue;	447	continue;
402		448
403	final TabItem item= new TabItem(folder, SWT.NONE);	449	final TabItem item= new TabItem(folder, SWT.NONE);
Lines 437-445 Link Here
437	Composite composite= new Composite(parent, SWT.NONE);	483	Composite composite= new Composite(parent, SWT.NONE);
438	GridLayout layout= new GridLayout();	484	GridLayout layout= new GridLayout();
439	layout.numColumns= 0; // create	485	layout.numColumns= 0; // create
440	layout.marginHeight = convertVerticalDLUsToPixels(IDialogConstants.VERTICAL_MARGIN);	486	layout.marginHeight= convertVerticalDLUsToPixels(IDialogConstants.VERTICAL_MARGIN);
441	layout.marginWidth = convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_MARGIN);	487	layout.marginWidth= convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_MARGIN);
442	layout.verticalSpacing = convertVerticalDLUsToPixels(IDialogConstants.VERTICAL_SPACING);	488	layout.verticalSpacing= convertVerticalDLUsToPixels(IDialogConstants.VERTICAL_SPACING);
443	layout.horizontalSpacing = convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_SPACING);	489	layout.horizontalSpacing= convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_SPACING);
444		490
445	composite.setLayout(layout);	491	composite.setLayout(layout);
Lines 447-453 Link Here
447		493
448	// create help control if needed	494	// create help control if needed
449	if (isHelpAvailable()) {	495	if (isHelpAvailable()) {
450	createHelpControl(composite);	496	createHelpControl(composite);
451	}	497	}
452	fCustomizeButton= createButton(composite, CUSTOMIZE_ID, SearchMessages.SearchDialog_customize, true);	498	fCustomizeButton= createButton(composite, CUSTOMIZE_ID, SearchMessages.SearchDialog_customize, true);
453		499
Lines 460-464 Link Here
460	Button searchButton= createActionButton(composite, SEARCH_ID, SearchMessages.SearchDialog_searchAction, true);	506	Button searchButton= createActionButton(composite, SEARCH_ID, SearchMessages.SearchDialog_searchAction, true);
461	searchButton.setEnabled(fDescriptors.size() > 0);	507	searchButton.setEnabled(fDescriptors.size() > 0);
462	super.createButtonsForButtonBar(composite); // cancel button	508	super.createButtonsForButtonBar(composite); // cancel button
463		509
464	return composite;	510	return composite;
Lines 495-499 Link Here
495		541
496	private SearchPageDescriptor getDescriptorAt(int index) {	542	private SearchPageDescriptor getDescriptorAt(int index) {
497	return (SearchPageDescriptor) fDescriptors.get(index);	543	return (SearchPageDescriptor)fDescriptors.get(index);
498	}	544	}
499		545
Lines 518-525 Link Here
518		564
519	private void turnToPage(SelectionEvent event) {	565	private void turnToPage(SelectionEvent event) {
520	final TabItem item= (TabItem) event.item;	566	final TabItem item= (TabItem)event.item;
521	TabFolder folder= item.getParent();	567	TabFolder folder= item.getParent();
522		568
523	SearchPageDescriptor descriptor= (SearchPageDescriptor) item.getData("descriptor"); //$NON-NLS-1$	569	SearchPageDescriptor descriptor= (SearchPageDescriptor)item.getData("descriptor"); //$NON-NLS-1$
		570
		571	defaultDialogSettings.put(PREVIOUS_SEARCH_PAGE, descriptor.getId());
524		572
525	if (item.getControl() == null) {	573	if (item.getControl() == null) {
Lines 556-560 Link Here
556	ISelection selection= getSelection();	604	ISelection selection= getSelection();
557	if (selection instanceof IStructuredSelection)	605	if (selection instanceof IStructuredSelection)
558	element= ((IStructuredSelection) selection).getFirstElement();	606	element= ((IStructuredSelection)selection).getFirstElement();
559		607
560	if (element == null)	608	if (element == null)
Lines 565-569 Link Here
565	int size= fDescriptors.size();	613	int size= fDescriptors.size();
566	for (int i= 0; i < size; i++) {	614	for (int i= 0; i < size; i++) {
567	SearchPageDescriptor descriptor= (SearchPageDescriptor) fDescriptors.get(i);	615	SearchPageDescriptor descriptor= (SearchPageDescriptor)fDescriptors.get(i);
568	if (fInitialPageId != null && fInitialPageId.equals(descriptor.getId()))	616	if (fInitialPageId != null && fInitialPageId.equals(descriptor.getId()))
569	return i;	617	return i;
Lines 711-719 Link Here
711	}	759	}
712	}	760	}
		761
713	public void handleException(Throwable ex) {	762	public void handleException(Throwable ex) {
714	if (ex instanceof CoreException) {	763	if (ex instanceof CoreException) {
715	ExceptionHandler.handle((CoreException) ex, getShell(), SearchMessages.Search_Error_createSearchPage_title, Messages.format(SearchMessages.Search_Error_createSearchPage_message, descriptor.getLabel()));	764	ExceptionHandler.handle((CoreException)ex, getShell(), SearchMessages.Search_Error_createSearchPage_title,
		765	Messages.format(SearchMessages.Search_Error_createSearchPage_message, descriptor.getLabel()));
716	} else {	766	} else {
717	ExceptionHandler.displayMessageDialog(ex, getShell(), SearchMessages.Search_Error_createSearchPage_title, Messages.format(SearchMessages.Search_Error_createSearchPage_message, descriptor.getLabel()));	767	ExceptionHandler.displayMessageDialog(ex, getShell(), SearchMessages.Search_Error_createSearchPage_title,
		768	Messages.format(SearchMessages.Search_Error_createSearchPage_message, descriptor.getLabel()));
718	}	769	}
719	}	770	}
Lines 755-767 Link Here
755	if (oldSize == null \|\| newSize == null)	806	if (oldSize == null \|\| newSize == null)
756	return;	807	return;
757	Shell shell= getShell();	808	Shell shell= getShell();
758	Point shellSize= shell.getSize();	809	Point shellSize= shell.getSize();
759	if (mustResize(oldSize, newSize)) {	810	if (mustResize(oldSize, newSize)) {
760	if (newSize.x > oldSize.x)	811	if (newSize.x > oldSize.x)
761	shellSize.x+= (newSize.x-oldSize.x);	812	shellSize.x+= (newSize.x - oldSize.x);
762	if (newSize.y > oldSize.y)	813	if (newSize.y > oldSize.y)
763	shellSize.y+= (newSize.y-oldSize.y);	814	shellSize.y+= (newSize.y - oldSize.y);
764	shell.setSize(shellSize);	815	shell.setSize(shellSize);
765	shell.layout(true);	816	shell.layout(true);
766	}	817	}
767	}	818	}
Lines 776-780 Link Here
776	public boolean close() {	827	public boolean close() {
777	for (int i= 0; i < fDescriptors.size(); i++) {	828	for (int i= 0; i < fDescriptors.size(); i++) {
778	SearchPageDescriptor desc= (SearchPageDescriptor) fDescriptors.get(i);	829	SearchPageDescriptor desc= (SearchPageDescriptor)fDescriptors.get(i);
779	desc.dispose();	830	desc.dispose();
780	}	831	}
Lines 812-816 Link Here
812	Object[] listeners= fPageChangeListeners.getListeners();	863	Object[] listeners= fPageChangeListeners.getListeners();
813	for (int i= 0; i < listeners.length; ++i) {	864	for (int i= 0; i < listeners.length; ++i) {
814	final IPageChangedListener l= (IPageChangedListener) listeners[i];	865	final IPageChangedListener l= (IPageChangedListener)listeners[i];
815	SafeRunner.run(new SafeRunnable() {	866	SafeRunner.run(new SafeRunnable() {
816	public void run() {	867	public void run() {





	public static String FileSearchPage_open_file_dialog_title;

	public static String FileSearchPage_open_file_failed;

	public static String FileTextSearchScope_scope_empty;

	public static String FileTextSearchScope_scope_single;

	public static String FileTextSearchScope_scope_double;

	public static String FileTextSearchScope_scope_multiple;

	public static String FileTextSearchScope_ws_scope_empty;

	public static String FileTextSearchScope_ws_scope_single;

	public static String FileTextSearchScope_ws_scope_double;

	public static String FileTextSearchScope_ws_scope_multiple;

	public static String ReplaceAction_description_operation;

	public static String ReplaceAction_title_all;

	public static String ReplaceAction_title_selected;

	public static String ReplaceConfigurationPage_description_many_in_many;

	public static String ReplaceConfigurationPage_description_many_in_one;

	public static String ReplaceConfigurationPage_description_one_in_one;

	public static String ReplaceConfigurationPage_isRegex_label;

	public static String ReplaceConfigurationPage_replace_label;

	public static String ReplaceConfigurationPage_with_label;

	public static String ReplaceRefactoring_composite_change_name;

	public static String ReplaceRefactoring_error_access_file;

	public static String ReplaceRefactoring_error_accessing_file_buffer;

	public static String ReplaceRefactoring_error_illegal_search_string;

	public static String ReplaceRefactoring_error_match_content_changed;

	public static String ReplaceRefactoring_error_no_changes;

	public static String ReplaceRefactoring_error_no_matches;

	public static String ReplaceRefactoring_error_no_replace_string;

	public static String ReplaceRefactoring_error_replacement_expression;

	public static String ReplaceRefactoring_group_label_change_for_file;

	public static String ReplaceRefactoring_group_label_match_replace;

	public static String ReplaceRefactoring_refactoring_name;

	public static String ReplaceRefactoring_result_update_name;

	public static String RememberLastUsedPage_message;

	public static String SearchDialog_title;

	public static String SearchDialog_searchAction;

	public static String SearchDialog_replaceAction;

	public static String SearchDialog_customize;

	public static String SearchDialog_noSearchExtension;

	public static String SearchPageSelectionDialog_title;

	public static String SearchPageSelectionDialog_message;

	public static String SearchManager_resourceChangedWarning;

	public static String SearchManager_resourceChanged;

	public static String SearchManager_resourceDeleted;

	public static String SearchManager_updating;

	public static String SearchResultView_title;

	public static String SearchResultView_titleWithDescription;

	public static String SearchResultView_matches;

	public static String SearchResultView_removed_resource;

	public static String SearchResultView_removeAllResults_text;

	public static String SearchResultView_removeAllResults_tooltip;

	public static String SearchResultView_removeAllSearches_text;

	public static String SearchResultView_removeAllSearches_tooltip;

	public static String SearchResultView_searchAgain_text;

	public static String SearchResultView_searchAgain_tooltip;

	public static String SearchResultView_previousSearches_text;

	public static String SearchResultView_previousSearches_tooltip;

	public static String SearchResultView_removeEntry_text;

	public static String SearchResultView_removeEntry_tooltip;

	public static String SearchResultView_removeEntries_text;

	public static String SearchResultView_removeEntries_tooltip;

	public static String SearchResultView_removeMatch_text;

	public static String SearchResultView_removeMatch_tooltip;

	public static String SearchResultView_gotoMarker_text;

	public static String SearchResultView_gotoMarker_tooltip;

	public static String SearchResultView_showNext_text;

	public static String SearchResultView_showNext_tooltip;

	public static String SearchResultView_showPrev_text;

	public static String SearchResultView_showPrev_tooltip;

	public static String SearchDialogClosingDialog_title;

	public static String SearchDialogClosingDialog_message;

	public static String SearchDialog_error_pageCreationFailed;

	public static String SearchPlugin_internal_error;

	public static String Search_Error_search_title;

	public static String Search_Error_search_message;

	public static String Search_Error_setDescription_title;

	public static String Search_Error_setDescription_message;

	public static String Search_Error_openResultView_title;

	public static String Search_Error_openResultView_message;

	public static String Search_Error_deleteMarkers_title;

	public static String Search_Error_deleteMarkers_message;

	public static String Search_Error_createMarker_title;

	public static String Search_Error_createMarker_message;

	public static String Search_Error_markerAttributeAccess_title;

	public static String Search_Error_markerAttributeAccess_message;

	public static String Search_Error_switchSearch_title;

	public static String Search_Error_switchSearch_message;

	public static String Search_Error_createSearchPage_title;

	public static String Search_Error_createSearchPage_message;

	public static String Search_Error_createSorter_title;

	public static String Search_Error_createSorter_message;

	public static String SearchPage_containingText_text;

	public static String SearchPage_containingText_hint;

	public static String SearchPage_browse;

	public static String SearchPage_fileNamePatterns_text;

	public static String SearchPage_fileNamePatterns_hint;

	public static String SearchPage_caseSensitive;

	public static String SearchPage_regularExpression;

	public static String TextSearchEngine_statusMessage;

	public static String TextSearchPage_replace_querycreationproblem_message;

	public static String TextSearchPage_replace_runproblem_message;

	public static String TextSearchPage_searchDerived_label;

	public static String TextSearchVisitor_filesearch_task_label;

	public static String TextSearchVisitor_patterntoocomplex0;

	public static String TextSearchVisitor_progress_updating_job;

	public static String TextSearchVisitor_scanning;

	public static String TextSearchVisitor_error;

	public static String TextSearchVisitor_canceled;

	public static String TextSearchVisitor_textsearch_task_label;

	public static String TextSearchVisitor_unsupportedcharset;

	public static String TextSearchVisitor_illegalcharset;

	public static String SortDropDownAction_label;

	public static String SortDropDownAction_tooltip;

	public static String ShowOtherSearchesAction_label;

	public static String ShowOtherSearchesAction_tooltip;

	public static String OtherSearchesDialog_title;

	public static String OtherSearchesDialog_message;

	public static String PatternConstructor_error_escape_sequence;

	public static String PatternConstructor_error_hex_escape_sequence;

	public static String PatternConstructor_error_line_delim_position;

	public static String PatternConstructor_error_unicode_escape_sequence;

	public static String PreviousSearchesDialog_title;

	public static String PreviousSearchesDialog_message;

	public static String TextSearchPage_replace_searchproblems_title;

	public static String TextSearchPage_replace_searchproblems_message;

	public static String FileSearchQuery_label;

	public static String FileSearchQuery_pluralPattern;

	public static String FileSearchQuery_singularLabel;

	public static String FileSearchQuery_singularLabel_fileNameSearch;

	public static String FileSearchQuery_pluralPattern_fileNameSearch;

	public static String OpenSearchDialogAction_label;

	public static String OpenSearchDialogAction_tooltip;

	public static String FileTypeEditor_typeDelimiter;

	public static String FileLabelProvider_dashSeparated;

	public static String FileLabelProvider_count_format;

	public static String FileLabelProvider_line_number;

	public static String FileLabelProvider_removed_resource_label;

	public static String FileSearchPage_sort_name_label;

	public static String FileSearchPage_sort_path_label;

	public static String FileSearchPage_error_marker;

	public static String FileSearchPage_sort_by_label;

	public static String FileSearchPage_limited_format_files;

	public static String FileSearchPage_limited_format_matches;

	public static String WorkspaceScope;

	public static String ScopePart_group_text;

	public static String ScopePart_selectedResourcesScope_text;

	public static String ScopePart_enclosingProjectsScope_text;

	public static String ScopePart_workingSetChooseButton_text;

	public static String ScopePart_workingSetText_accessible_label;

	public static String ScopePart_workingSetScope_text;

	public static String ScopePart_workspaceScope_text;

	public static String ScopePart_workingSetConcatenation;

	public static String CopyToClipboardAction_label;

	public static String CopyToClipboardAction_tooltip;

	public static String CopyToClipboardAction_error_title;

	public static String CopyToClipboardAction_error_message;

	public static String ExceptionDialog_seeErrorLogMessage;

	public static String SearchPreferencePage_emphasizePotentialMatches;

	public static String SearchPreferencePage_potentialMatchFgColor;

	public static String SearchPreferencePage_reuseEditor;

	public static String SearchPreferencePage_bringToFront;

	public static String SearchPreferencePage_defaultPerspective;

	public static String SearchPreferencePage_defaultPerspective_none;

	public static String SearchPreferencePage_ignorePotentialMatches;

	public static String ReplaceAction_label_all;

	public static String ReplaceAction_label_selected;

	public static String SelectAllAction_label;

	public static String SelectAllAction_tooltip;

	public static String RemovePotentialMatchesAction_removePotentialMatch_text;

	public static String RemovePotentialMatchesAction_removePotentialMatch_tooltip;

	public static String RemovePotentialMatchesAction_removePotentialMatches_text;

	public static String RemovePotentialMatchesAction_removePotentialMatches_tooltip;

	public static String RemovePotentialMatchesAction_dialog_title;

	public static String RemovePotentialMatchesAction_dialog_message;

	public static String OpenWithMenu_label;
	static {


//	public static String ReplaceDialog2_nomatches_error;
	public static String SearchPreferencePage_textSearchEngine;

	public static String TextSearchEngineRegistry_defaulttextsearch_label;

	public static String FileSearchQuery_singularPatternWithFileExt;

	public static String FileSearchQuery_pluralPatternWithFileExt;
}

Lines 201-204 Link Here

(-)a/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchMessages.properties (+2 lines)
201	SearchPreferencePage_ignorePotentialMatches= &Ignore potential matches	201	SearchPreferencePage_ignorePotentialMatches= &Ignore potential matches
202		202
		203	RememberLastUsedPage_message=&Remember last used page
		204
203	ReplaceAction_label_all= Re&place All...	205	ReplaceAction_label_all= Re&place All...
204	ReplaceAction_title_all=Replace Text Matches	206	ReplaceAction_title_all=Replace Text Matches

Return to bug 33710