diff options
23 files changed, 153 insertions, 71 deletions
diff --git a/org.eclipse.search.tests/src/org/eclipse/search/tests/filesearch/AnnotationManagerTest.java b/org.eclipse.search.tests/src/org/eclipse/search/tests/filesearch/AnnotationManagerTest.java index ab2cc0e34ed..40e066eb79d 100644 --- a/org.eclipse.search.tests/src/org/eclipse/search/tests/filesearch/AnnotationManagerTest.java +++ b/org.eclipse.search.tests/src/org/eclipse/search/tests/filesearch/AnnotationManagerTest.java @@ -28,7 +28,6 @@ import org.eclipse.search.internal.ui.text.FileSearchQuery; import org.eclipse.search.internal.ui.text.FileSearchResult; import org.eclipse.search.tests.SearchTestPlugin; import org.eclipse.search.ui.NewSearchUI; -import org.eclipse.search.ui.SearchUI; import org.eclipse.search.ui.text.AbstractTextSearchResult; import org.eclipse.search.ui.text.Match; import org.eclipse.search2.internal.ui.InternalSearchUI; @@ -94,7 +93,7 @@ public class AnnotationManagerTest extends TestCase { HashSet positions= new HashSet(); for (Iterator iter= annotationModel.getAnnotationIterator(); iter.hasNext();) { Annotation annotation= (Annotation) iter.next(); - if (annotation.getType().equals(fAnnotationTypeLookup.getAnnotationType(SearchUI.SEARCH_MARKER, IMarker.SEVERITY_INFO))) { + if (annotation.getType().equals(fAnnotationTypeLookup.getAnnotationType(NewSearchUI.SEARCH_MARKER, IMarker.SEVERITY_INFO))) { positions.add(annotationModel.getPosition(annotation)); } } @@ -131,7 +130,7 @@ public class AnnotationManagerTest extends TestCase { int annotationCount= 0; for (Iterator annotations= annotationModel.getAnnotationIterator(); annotations.hasNext();) { Annotation annotation= (Annotation) annotations.next(); - if (annotation.getType().equals(fAnnotationTypeLookup.getAnnotationType(SearchUI.SEARCH_MARKER, IMarker.SEVERITY_INFO))) { + if (annotation.getType().equals(fAnnotationTypeLookup.getAnnotationType(NewSearchUI.SEARCH_MARKER, IMarker.SEVERITY_INFO))) { annotationCount++; } } @@ -154,7 +153,7 @@ public class AnnotationManagerTest extends TestCase { IDocument document= editor.getDocumentProvider().getDocument(editor.getEditorInput()); for (Iterator annotations= annotationModel.getAnnotationIterator(); annotations.hasNext();) { Annotation annotation= (Annotation) annotations.next(); - if (annotation.getType().equals(fAnnotationTypeLookup.getAnnotationType(SearchUI.SEARCH_MARKER, IMarker.SEVERITY_INFO))) { + if (annotation.getType().equals(fAnnotationTypeLookup.getAnnotationType(NewSearchUI.SEARCH_MARKER, IMarker.SEVERITY_INFO))) { Position p= annotationModel.getPosition(annotation); String text= document.get(p.getOffset(), p.getLength()); assertTrue(text.equalsIgnoreCase(fQuery2.getSearchString())); @@ -179,7 +178,7 @@ public class AnnotationManagerTest extends TestCase { IDocument document= editor.getDocumentProvider().getDocument(editor.getEditorInput()); for (Iterator annotations= annotationModel.getAnnotationIterator(); annotations.hasNext();) { Annotation annotation= (Annotation) annotations.next(); - if (annotation.getType().equals(fAnnotationTypeLookup.getAnnotationType(SearchUI.SEARCH_MARKER, IMarker.SEVERITY_INFO))) { + if (annotation.getType().equals(fAnnotationTypeLookup.getAnnotationType(NewSearchUI.SEARCH_MARKER, IMarker.SEVERITY_INFO))) { Position p= annotationModel.getPosition(annotation); String text= document.get(p.getOffset(), p.getLength()); assertTrue(text.equalsIgnoreCase(fQuery1.getSearchString())); diff --git a/org.eclipse.search.tests/src/org/eclipse/search/tests/filesearch/LineAnnotationManagerTest.java b/org.eclipse.search.tests/src/org/eclipse/search/tests/filesearch/LineAnnotationManagerTest.java index cf5014ab99d..61da7371f24 100644 --- a/org.eclipse.search.tests/src/org/eclipse/search/tests/filesearch/LineAnnotationManagerTest.java +++ b/org.eclipse.search.tests/src/org/eclipse/search/tests/filesearch/LineAnnotationManagerTest.java @@ -27,7 +27,6 @@ import org.eclipse.jface.text.source.IAnnotationModel; import org.eclipse.search.internal.core.text.TextSearchScope; import org.eclipse.search.tests.SearchTestPlugin; import org.eclipse.search.ui.NewSearchUI; -import org.eclipse.search.ui.SearchUI; import org.eclipse.search.ui.text.AbstractTextSearchResult; import org.eclipse.search.ui.text.Match; import org.eclipse.search2.internal.ui.InternalSearchUI; @@ -87,7 +86,7 @@ public class LineAnnotationManagerTest extends TestCase { HashSet positions= new HashSet(); for (Iterator iter= annotationModel.getAnnotationIterator(); iter.hasNext();) { Annotation annotation= (Annotation) iter.next(); - if (annotation.getType().equals(fAnnotationTypeLookup.getAnnotationType(SearchUI.SEARCH_MARKER, IMarker.SEVERITY_INFO))) { + if (annotation.getType().equals(fAnnotationTypeLookup.getAnnotationType(NewSearchUI.SEARCH_MARKER, IMarker.SEVERITY_INFO))) { positions.add(annotationModel.getPosition(annotation)); } } diff --git a/org.eclipse.search/new search/org/eclipse/search/ui/NewSearchUI.java b/org.eclipse.search/new search/org/eclipse/search/ui/NewSearchUI.java index 855ab5dbf5e..8cc8800128f 100644 --- a/org.eclipse.search/new search/org/eclipse/search/ui/NewSearchUI.java +++ b/org.eclipse.search/new search/org/eclipse/search/ui/NewSearchUI.java @@ -10,9 +10,12 @@ package org.eclipse.search.ui; import org.eclipse.core.runtime.IStatus; import org.eclipse.jface.dialogs.ErrorDialog; import org.eclipse.jface.operation.IRunnableContext; +import org.eclipse.search.internal.ui.OpenSearchDialogAction; import org.eclipse.search.internal.ui.SearchPlugin; +import org.eclipse.search.internal.ui.SearchPreferencePage; import org.eclipse.search2.internal.ui.InternalSearchUI; import org.eclipse.search2.internal.ui.SearchMessages; +import org.eclipse.ui.IWorkbenchWindow; /** * A facade for access to the new search UI facilities. * @@ -121,4 +124,86 @@ public class NewSearchUI { public static boolean isQueryRunning(ISearchQuery query) { return InternalSearchUI.getInstance().isQueryRunning(query); } + + + + /** + * Search Plug-in Id (value <code>"org.eclipse.search"</code>). + */ + public static final String PLUGIN_ID= "org.eclipse.search"; //$NON-NLS-1$ + + /** + * Search marker type (value <code>"org.eclipse.search.searchmarker"</code>). + * + * @see org.eclipse.core.resources.IMarker + */ + public static final String SEARCH_MARKER= PLUGIN_ID + ".searchmarker"; //$NON-NLS-1$ + + /** + * Id of the new Search view + * (value <code>"org.eclipse.search.ui.views.SearchView"</code>). + */ + public static final String SEARCH_VIEW_ID= "org.eclipse.search.ui.views.SearchView"; //$NON-NLS-1$ + + /** + * Id of the Search action set + * (value <code>"org.eclipse.search.searchActionSet"</code>). + */ + public static final String ACTION_SET_ID= PLUGIN_ID + ".searchActionSet"; //$NON-NLS-1$ + + + /** + * Opens the search dialog. + * If <code>pageId</code> is specified and a corresponding page + * is found then it is brought to top. + * + * @param pageId the page to select or <code>null</code> + * if the best fitting page should be selected + */ + public static void openSearchDialog(IWorkbenchWindow window, String pageId) { + new OpenSearchDialogAction(window, pageId).run(); + } + + /** + * Returns the preference whether editors should be reused + * when showing search results. + * + * The goto action can decide to use or ignore this preference. + * + * @return <code>true</code> if editors should be reused for showing search results + * @since 2.0 + */ + public static boolean reuseEditor() { + return SearchPreferencePage.isEditorReused(); + } + + /** + * Returns the preference whether a search engine is + * allowed to report potential matches or not. + * <p> + * Search engines which can report inexact matches must + * respect this preference i.e. they should not report + * inexact matches if this method returns <code>true</code> + * </p> + * @return <code>true</code> if search engine must not report inexact matches + * @since 2.1 + */ + public static boolean arePotentialMatchesIgnored() { + return SearchPreferencePage.arePotentialMatchesIgnored(); + } + + /** + * Returns the ID of the default perspective. + * <p> + * The perspective with this ID will be used to show the Search view. + * If no default perspective is set then the Search view will + * appear in the current perspective. + * </p> + * @return the ID of the default perspective <code>null</code> if no default perspective is set + * @since 2.1 + */ + public static String getDefaultPerspectiveId() { + return SearchPreferencePage.getDefaultPerspectiveId(); + } + }
\ No newline at end of file diff --git a/org.eclipse.search/new search/org/eclipse/search2/internal/ui/InternalSearchUI.java b/org.eclipse.search/new search/org/eclipse/search2/internal/ui/InternalSearchUI.java index 41d49aa6ba1..0c128cc42d3 100644 --- a/org.eclipse.search/new search/org/eclipse/search2/internal/ui/InternalSearchUI.java +++ b/org.eclipse.search/new search/org/eclipse/search2/internal/ui/InternalSearchUI.java @@ -30,7 +30,7 @@ import org.eclipse.search.internal.ui.util.ExceptionHandler; import org.eclipse.search.ui.IQueryListener; import org.eclipse.search.ui.ISearchQuery; import org.eclipse.search.ui.ISearchResultViewPart; -import org.eclipse.search.ui.SearchUI; +import org.eclipse.search.ui.NewSearchUI; import org.eclipse.search2.internal.ui.text.PositionTracker; import org.eclipse.ui.IWorkbenchPage; import org.eclipse.ui.IWorkbenchPartSite; @@ -126,7 +126,7 @@ public class InternalSearchUI { } public ISearchResultViewPart getSearchView() { - return (ISearchResultViewPart) SearchPlugin.getActivePage().findView(SearchUI.SEARCH_VIEW_ID); + return (ISearchResultViewPart) SearchPlugin.getActivePage().findView(NewSearchUI.SEARCH_VIEW_ID); } public boolean runSearchInBackground(ISearchQuery query) { @@ -243,7 +243,7 @@ public class InternalSearchUI { } public ISearchResultViewPart activateSearchView() { - String defaultPerspectiveId= SearchUI.getDefaultPerspectiveId(); + String defaultPerspectiveId= NewSearchUI.getDefaultPerspectiveId(); if (defaultPerspectiveId != null) { IWorkbenchWindow window= window= SearchPlugin.getActiveWorkbenchWindow(); if (window != null && window.getShell() != null && !window.getShell().isDisposed()) { @@ -256,9 +256,9 @@ public class InternalSearchUI { } try { - ISearchResultViewPart viewPart= (ISearchResultViewPart) SearchPlugin.getActivePage().findView(SearchUI.SEARCH_VIEW_ID); + ISearchResultViewPart viewPart= (ISearchResultViewPart) SearchPlugin.getActivePage().findView(NewSearchUI.SEARCH_VIEW_ID); if (viewPart == null || SearchPreferencePage.isViewBroughtToFront()) { - viewPart= (ISearchResultViewPart) SearchPlugin.getActivePage().showView(SearchUI.SEARCH_VIEW_ID, null, IWorkbenchPage.VIEW_ACTIVATE); + viewPart= (ISearchResultViewPart) SearchPlugin.getActivePage().showView(NewSearchUI.SEARCH_VIEW_ID, null, IWorkbenchPage.VIEW_ACTIVATE); } return viewPart; } catch (PartInitException ex) { diff --git a/org.eclipse.search/new search/org/eclipse/search2/internal/ui/text/AnnotationHighlighter.java b/org.eclipse.search/new search/org/eclipse/search2/internal/ui/text/AnnotationHighlighter.java index 7dac7950c1e..fb2c8f0f520 100644 --- a/org.eclipse.search/new search/org/eclipse/search2/internal/ui/text/AnnotationHighlighter.java +++ b/org.eclipse.search/new search/org/eclipse/search2/internal/ui/text/AnnotationHighlighter.java @@ -30,7 +30,7 @@ import org.eclipse.jface.text.source.Annotation; import org.eclipse.jface.text.source.IAnnotationModel; import org.eclipse.jface.text.source.IAnnotationModelExtension; import org.eclipse.search.internal.ui.SearchPlugin; -import org.eclipse.search.ui.SearchUI; +import org.eclipse.search.ui.NewSearchUI; import org.eclipse.search.ui.text.Match; import org.eclipse.search2.internal.ui.InternalSearchUI; import org.eclipse.search2.internal.ui.SearchMessages; @@ -59,7 +59,7 @@ public class AnnotationHighlighter extends Highlighter { try { Position position= createPosition(matches[i]); if (position != null) { - Annotation annotation= new Annotation(fAnnotationTypeLookup.getAnnotationType(SearchUI.SEARCH_MARKER, IMarker.SEVERITY_INFO), true, null); + Annotation annotation= new Annotation(fAnnotationTypeLookup.getAnnotationType(NewSearchUI.SEARCH_MARKER, IMarker.SEVERITY_INFO), true, null); fMatchesToAnnotations.put(matches[i], annotation); map.put(annotation, position); } diff --git a/org.eclipse.search/new search/org/eclipse/search2/internal/ui/text/EditorAccessHighlighter.java b/org.eclipse.search/new search/org/eclipse/search2/internal/ui/text/EditorAccessHighlighter.java index 7b4c2f9996c..bcd87887bdf 100644 --- a/org.eclipse.search/new search/org/eclipse/search2/internal/ui/text/EditorAccessHighlighter.java +++ b/org.eclipse.search/new search/org/eclipse/search2/internal/ui/text/EditorAccessHighlighter.java @@ -30,7 +30,7 @@ import org.eclipse.jface.text.source.Annotation; import org.eclipse.jface.text.source.IAnnotationModel; import org.eclipse.jface.text.source.IAnnotationModelExtension; import org.eclipse.search.internal.ui.SearchPlugin; -import org.eclipse.search.ui.SearchUI; +import org.eclipse.search.ui.NewSearchUI; import org.eclipse.search.ui.text.ISearchEditorAccess; import org.eclipse.search.ui.text.Match; import org.eclipse.search2.internal.ui.InternalSearchUI; @@ -60,7 +60,7 @@ public class EditorAccessHighlighter extends Highlighter { if (position != null) { Map map= getMap(mapsByAnnotationModel, matches[i]); if (map != null) { - Annotation annotation= new Annotation(fAnnotationTypeLookup.getAnnotationType(SearchUI.SEARCH_MARKER, IMarker.SEVERITY_INFO), true, null); + Annotation annotation= new Annotation(fAnnotationTypeLookup.getAnnotationType(NewSearchUI.SEARCH_MARKER, IMarker.SEVERITY_INFO), true, null); fMatchesToAnnotations.put(matches[i], annotation); map.put(annotation, position); } diff --git a/org.eclipse.search/new search/org/eclipse/search2/internal/ui/text/MarkerHighlighter.java b/org.eclipse.search/new search/org/eclipse/search2/internal/ui/text/MarkerHighlighter.java index 69f1a8349d8..b845fceac98 100644 --- a/org.eclipse.search/new search/org/eclipse/search2/internal/ui/text/MarkerHighlighter.java +++ b/org.eclipse.search/new search/org/eclipse/search2/internal/ui/text/MarkerHighlighter.java @@ -23,7 +23,7 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.jface.text.Position; import org.eclipse.search.internal.ui.SearchPlugin; -import org.eclipse.search.ui.SearchUI; +import org.eclipse.search.ui.NewSearchUI; import org.eclipse.search.ui.text.Match; import org.eclipse.search2.internal.ui.InternalSearchUI; @@ -64,7 +64,7 @@ public class MarkerHighlighter extends Highlighter { // need to clone position, can't have it twice in a document. position= new Position(position.getOffset(), position.getLength()); } - IMarker marker= fFile.createMarker(SearchUI.SEARCH_MARKER); + IMarker marker= fFile.createMarker(NewSearchUI.SEARCH_MARKER); HashMap attributes= new HashMap(4); if (match.getBaseUnit() == Match.UNIT_CHARACTER) { attributes.put(IMarker.CHAR_START, new Integer(position.getOffset())); @@ -92,7 +92,7 @@ public class MarkerHighlighter extends Highlighter { public void removeAll() { try { - fFile.deleteMarkers(SearchUI.SEARCH_MARKER, true, IResource.DEPTH_INFINITE); + fFile.deleteMarkers(NewSearchUI.SEARCH_MARKER, true, IResource.DEPTH_INFINITE); fMatchesToAnnotations.clear(); } catch (CoreException e) { // just log the thing. There's nothing we can do anyway. diff --git a/org.eclipse.search/search/org/eclipse/search/internal/core/text/TextSearchEngine.java b/org.eclipse.search/search/org/eclipse/search/internal/core/text/TextSearchEngine.java index 0839a1fea0b..4afe6cda352 100644 --- a/org.eclipse.search/search/org/eclipse/search/internal/core/text/TextSearchEngine.java +++ b/org.eclipse.search/search/org/eclipse/search/internal/core/text/TextSearchEngine.java @@ -19,13 +19,10 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.MultiStatus; - import org.eclipse.jface.util.Assert; - -import org.eclipse.search.ui.SearchUI; - import org.eclipse.search.internal.core.ISearchScope; import org.eclipse.search.internal.ui.SearchMessages; +import org.eclipse.search.ui.NewSearchUI; public class TextSearchEngine { @@ -47,7 +44,7 @@ public class TextSearchEngine { openProjects.add(project); } String message= SearchMessages.getString("TextSearchEngine.statusMessage"); //$NON-NLS-1$ - MultiStatus status= new MultiStatus(SearchUI.PLUGIN_ID, IStatus.OK, message, null); + MultiStatus status= new MultiStatus(NewSearchUI.PLUGIN_ID, IStatus.OK, message, null); if (!openProjects.isEmpty()) { int amountOfWork= (new AmountOfWorkCalculator(status, visitDerived)).process(openProjects, scope); try { diff --git a/org.eclipse.search/search/org/eclipse/search/internal/core/text/TextSearchVisitor.java b/org.eclipse.search/search/org/eclipse/search/internal/core/text/TextSearchVisitor.java index acfd36e0a7e..334e345669c 100644 --- a/org.eclipse.search/search/org/eclipse/search/internal/core/text/TextSearchVisitor.java +++ b/org.eclipse.search/search/org/eclipse/search/internal/core/text/TextSearchVisitor.java @@ -34,7 +34,10 @@ import org.eclipse.core.runtime.MultiStatus; import org.eclipse.core.runtime.OperationCanceledException; import org.eclipse.core.runtime.Platform; import org.eclipse.core.runtime.Status; - +import org.eclipse.search.internal.core.ISearchScope; +import org.eclipse.search.internal.ui.SearchMessages; +import org.eclipse.search.internal.ui.SearchPlugin; +import org.eclipse.search.ui.NewSearchUI; import org.eclipse.ui.IEditorInput; import org.eclipse.ui.IEditorPart; import org.eclipse.ui.IEditorReference; @@ -44,12 +47,6 @@ import org.eclipse.ui.IWorkbenchPage; import org.eclipse.ui.IWorkbenchWindow; import org.eclipse.ui.texteditor.ITextEditor; -import org.eclipse.search.ui.SearchUI; - -import org.eclipse.search.internal.core.ISearchScope; -import org.eclipse.search.internal.ui.SearchMessages; -import org.eclipse.search.internal.ui.SearchPlugin; - /** * The visitor that does the actual work. */ @@ -163,7 +160,7 @@ public class TextSearchVisitor extends TypedResourceVisitor { } } catch (IOException e) { String message= SearchMessages.getFormattedString("TextSearchVisitor.error", file.getFullPath()); //$NON-NLS-1$ - throw new CoreException(new Status(IStatus.ERROR, SearchUI.PLUGIN_ID, Platform.PLUGIN_ERROR, message, e)); + throw new CoreException(new Status(IStatus.ERROR, NewSearchUI.PLUGIN_ID, Platform.PLUGIN_ERROR, message, e)); } finally { updateProgressMonitor(); diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/ISearchHelpContextIds.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/ISearchHelpContextIds.java index e956f778155..fd5862f9432 100644 --- a/org.eclipse.search/search/org/eclipse/search/internal/ui/ISearchHelpContextIds.java +++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/ISearchHelpContextIds.java @@ -10,11 +10,11 @@ *******************************************************************************/ package org.eclipse.search.internal.ui; -import org.eclipse.search.ui.SearchUI; +import org.eclipse.search.ui.NewSearchUI; public interface ISearchHelpContextIds { - public static final String PREFIX= SearchUI.PLUGIN_ID + "."; //$NON-NLS-1$ + public static final String PREFIX= NewSearchUI.PLUGIN_ID + "."; //$NON-NLS-1$ public static final String SEARCH_DIALOG= PREFIX + "search_dialog_context"; //$NON-NLS-1$ diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/OpenFileSearchPageAction.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/OpenFileSearchPageAction.java index 1c4f4ee5570..b26d703c6ad 100644 --- a/org.eclipse.search/search/org/eclipse/search/internal/ui/OpenFileSearchPageAction.java +++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/OpenFileSearchPageAction.java @@ -12,15 +12,12 @@ package org.eclipse.search.internal.ui; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; - import org.eclipse.jface.action.IAction; import org.eclipse.jface.viewers.ISelection; - +import org.eclipse.search.ui.NewSearchUI; import org.eclipse.ui.IWorkbenchWindow; import org.eclipse.ui.IWorkbenchWindowActionDelegate; -import org.eclipse.search.ui.SearchUI; - /** * Opens the Search Dialog. */ @@ -43,7 +40,7 @@ public class OpenFileSearchPageAction implements IWorkbenchWindowActionDelegate logErrorMessage("Could not open the search dialog - for some reason the window handle was null"); //$NON-NLS-1$ return; } - SearchUI.openSearchDialog(fWindow, TEXT_SEARCH_PAGE_ID); //$NON-NLS-1$ + NewSearchUI.openSearchDialog(fWindow, TEXT_SEARCH_PAGE_ID); //$NON-NLS-1$ } public void selectionChanged(IAction action, ISelection selection) { @@ -55,7 +52,7 @@ public class OpenFileSearchPageAction implements IWorkbenchWindowActionDelegate } public static void logErrorMessage(String message) { - IStatus status= new Status(IStatus.ERROR, SearchUI.PLUGIN_ID, IStatus.ERROR, message, null); + IStatus status= new Status(IStatus.ERROR, NewSearchUI.PLUGIN_ID, IStatus.ERROR, message, null); SearchPlugin.log(status); } } diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/ScopePart.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/ScopePart.java index 187cebc1c43..78294317731 100644 --- a/org.eclipse.search/search/org/eclipse/search/internal/ui/ScopePart.java +++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/ScopePart.java @@ -24,7 +24,7 @@ import org.eclipse.jface.window.Window; import org.eclipse.search.internal.ui.util.PixelConverter; import org.eclipse.search.internal.ui.util.SWTUtil; import org.eclipse.search.ui.ISearchPageContainer; -import org.eclipse.search.ui.SearchUI; +import org.eclipse.search.ui.NewSearchUI; import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionAdapter; import org.eclipse.swt.events.SelectionEvent; @@ -152,7 +152,7 @@ public class ScopePart { fScope= scope; if (fScope == ISearchPageContainer.SELECTED_PROJECTS_SCOPE) { if (!fCanSearchEnclosingProjects) { - SearchPlugin.log(new Status(IStatus.WARNING, SearchUI.PLUGIN_ID, IStatus.WARNING, "Enclosing projects scope set on search page that does not support it", null)); //$NON-NLS-1$ + SearchPlugin.log(new Status(IStatus.WARNING, NewSearchUI.PLUGIN_ID, IStatus.WARNING, "Enclosing projects scope set on search page that does not support it", null)); //$NON-NLS-1$ fScope= ISearchPageContainer.WORKSPACE_SCOPE; } else if (!fUseProject.isEnabled()) { fScope= ISearchPageContainer.WORKSPACE_SCOPE; diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchPlugin.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchPlugin.java index b78e0378d40..8b4d76e9b96 100644 --- a/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchPlugin.java +++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchPlugin.java @@ -35,6 +35,7 @@ import org.eclipse.search.internal.ui.util.ExceptionHandler; import org.eclipse.search.ui.IContextMenuConstants; import org.eclipse.search.ui.ISearchResultView; import org.eclipse.search.ui.ISearchResultViewEntry; +import org.eclipse.search.ui.NewSearchUI; import org.eclipse.search.ui.SearchUI; import org.eclipse.search2.internal.ui.InternalSearchUI; import org.eclipse.swt.widgets.Control; @@ -243,7 +244,7 @@ public class SearchPlugin extends AbstractUIPlugin { public List getSearchPageDescriptors() { if (fPageDescriptors == null) { IPluginRegistry registry= Platform.getPluginRegistry(); - IConfigurationElement[] elements= registry.getConfigurationElementsFor(SearchUI.PLUGIN_ID, SEARCH_PAGE_EXTENSION_POINT); + IConfigurationElement[] elements= registry.getConfigurationElementsFor(NewSearchUI.PLUGIN_ID, SEARCH_PAGE_EXTENSION_POINT); fPageDescriptors= createSearchPageDescriptors(elements); } return fPageDescriptors; @@ -337,7 +338,7 @@ public class SearchPlugin extends AbstractUIPlugin { } public static void log(Throwable e) { - log(new Status(IStatus.ERROR, SearchUI.PLUGIN_ID, INTERNAL_ERROR, SearchMessages.getString("SearchPlugin.internal_error"), e)); //$NON-NLS-1$ + log(new Status(IStatus.ERROR, NewSearchUI.PLUGIN_ID, INTERNAL_ERROR, SearchMessages.getString("SearchPlugin.internal_error"), e)); //$NON-NLS-1$ } public static String getID() { diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/text/EditorOpener.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/text/EditorOpener.java index e338686c939..6b014f0c1a2 100644 --- a/org.eclipse.search/search/org/eclipse/search/internal/ui/text/EditorOpener.java +++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/text/EditorOpener.java @@ -12,7 +12,7 @@ package org.eclipse.search.internal.ui.text; import org.eclipse.core.resources.IFile; import org.eclipse.search.internal.ui.SearchPlugin; -import org.eclipse.search.ui.SearchUI; +import org.eclipse.search.ui.NewSearchUI; import org.eclipse.search.ui.text.Match; import org.eclipse.ui.IEditorDescriptor; import org.eclipse.ui.IEditorPart; @@ -31,7 +31,7 @@ public class EditorOpener { IEditorPart open(Match match) throws PartInitException { IWorkbenchPage wbPage= SearchPlugin.getActivePage(); - if (SearchUI.reuseEditor()) + if (NewSearchUI.reuseEditor()) return showWithReuse(match, wbPage); else return showWithoutReuse(match, wbPage); 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 e7ed9048de8..aa5b34a8650 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 @@ -32,7 +32,7 @@ import org.eclipse.search.internal.ui.SearchPlugin; import org.eclipse.search.internal.ui.SearchPreferencePage; import org.eclipse.search.ui.IContextMenuConstants; import org.eclipse.search.ui.ISearchResultViewPart; -import org.eclipse.search.ui.SearchUI; +import org.eclipse.search.ui.NewSearchUI; import org.eclipse.search.ui.text.AbstractTextSearchResult; import org.eclipse.search.ui.text.AbstractTextSearchViewPage; import org.eclipse.search.ui.text.Match; @@ -120,7 +120,7 @@ public class FileSearchPage extends AbstractTextSearchViewPage implements IAdapt } private void showWithMarker(IEditorPart editor, IFile file, int offset, int length) throws PartInitException { try { - IMarker marker= file.createMarker(SearchUI.SEARCH_MARKER); + IMarker marker= file.createMarker(NewSearchUI.SEARCH_MARKER); HashMap attributes= new HashMap(4); attributes.put(IMarker.CHAR_START, new Integer(offset)); attributes.put(IMarker.CHAR_END, new Integer(offset + length)); diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/text/ReplaceDialog2.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/text/ReplaceDialog2.java index e6acc335f5d..f72a16419b0 100644 --- a/org.eclipse.search/search/org/eclipse/search/internal/ui/text/ReplaceDialog2.java +++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/text/ReplaceDialog2.java @@ -52,7 +52,7 @@ import org.eclipse.search.internal.ui.SearchMessages; import org.eclipse.search.internal.ui.SearchPlugin; import org.eclipse.search.internal.ui.util.ExceptionHandler; import org.eclipse.search.internal.ui.util.ExtendedDialogWindow; -import org.eclipse.search.ui.SearchUI; +import org.eclipse.search.ui.NewSearchUI; import org.eclipse.search.ui.text.Match; import org.eclipse.search2.internal.ui.InternalSearchUI; import org.eclipse.search2.internal.ui.text.PositionTracker; @@ -474,7 +474,7 @@ class ReplaceDialog2 extends ExtendedDialogWindow { try { selectEntry(marker); ITextEditor editor= null; - if (SearchUI.reuseEditor()) + if (NewSearchUI.reuseEditor()) editor= openEditorReuse(marker); else editor= openEditorNoReuse(marker); diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/util/ExceptionHandler.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/util/ExceptionHandler.java index 1cf4a324005..c40dde7f38a 100644 --- a/org.eclipse.search/search/org/eclipse/search/internal/ui/util/ExceptionHandler.java +++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/util/ExceptionHandler.java @@ -13,17 +13,15 @@ package org.eclipse.search.internal.ui.util; import java.io.StringWriter; import java.lang.reflect.InvocationTargetException; -import org.eclipse.swt.widgets.Shell; - import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; - -import org.eclipse.search.internal.ui.SearchMessages; -import org.eclipse.search.internal.ui.SearchPlugin; -import org.eclipse.search.ui.SearchUI; import org.eclipse.jface.dialogs.ErrorDialog; import org.eclipse.jface.dialogs.MessageDialog; +import org.eclipse.search.internal.ui.SearchMessages; +import org.eclipse.search.internal.ui.SearchPlugin; +import org.eclipse.search.ui.NewSearchUI; +import org.eclipse.swt.widgets.Shell; /** * The default exception handler shows an error dialog when one of its handle methods @@ -41,7 +39,7 @@ public class ExceptionHandler { * logged as an error with the error code <code>JavaStatusConstants.INTERNAL_ERROR</code>. */ public static void log(Throwable t, String message) { - SearchPlugin.log(new Status(IStatus.ERROR, SearchUI.PLUGIN_ID, IStatus.ERROR, message, t)); + SearchPlugin.log(new Status(IStatus.ERROR, NewSearchUI.PLUGIN_ID, IStatus.ERROR, message, t)); } /** diff --git a/org.eclipse.search/search/org/eclipse/search/ui/IActionGroupFactory.java b/org.eclipse.search/search/org/eclipse/search/ui/IActionGroupFactory.java index f22876e545b..86d9bd3ccd6 100644 --- a/org.eclipse.search/search/org/eclipse/search/ui/IActionGroupFactory.java +++ b/org.eclipse.search/search/org/eclipse/search/ui/IActionGroupFactory.java @@ -23,6 +23,8 @@ import org.eclipse.ui.actions.ActionGroup; * * Clients can implement this interface and pass an * instance to the search result view. + * @deprecated subclass <code>AbstractTextSearchViewPage</code> instead. + * @see org.eclipse.search.ui.text.AbstractTextSearchViewPage * * @see org.eclipse.ui.actions.ActionGroup * @see ISearchResultView#searchStarted diff --git a/org.eclipse.search/search/org/eclipse/search/ui/IContextMenuContributor.java b/org.eclipse.search/search/org/eclipse/search/ui/IContextMenuContributor.java index 96741e19566..a57692da426 100644 --- a/org.eclipse.search/search/org/eclipse/search/ui/IContextMenuContributor.java +++ b/org.eclipse.search/search/org/eclipse/search/ui/IContextMenuContributor.java @@ -20,6 +20,8 @@ import org.eclipse.jface.viewers.IInputSelectionProvider; * must implement this interface and pass an * instance of itself to the search result view. * + * @deprecated subclass <code>AbstractTextSearchViewPage</code> instead. + * @see org.eclipse.search.ui.text.AbstractTextSearchViewPage * @see ISearchResultView#searchStarted */ public interface IContextMenuContributor { diff --git a/org.eclipse.search/search/org/eclipse/search/ui/IGroupByKeyComputer.java b/org.eclipse.search/search/org/eclipse/search/ui/IGroupByKeyComputer.java index 776ff356334..d2a941b9245 100644 --- a/org.eclipse.search/search/org/eclipse/search/ui/IGroupByKeyComputer.java +++ b/org.eclipse.search/search/org/eclipse/search/ui/IGroupByKeyComputer.java @@ -15,6 +15,8 @@ import org.eclipse.core.resources.IMarker; /** * Computes the key by which the markers in the search result view * are grouped. + * @deprecated subclass <code>AbstractTextSearchResult</code> instead. + * @see org.eclipse.search.ui.text.AbstractTextSearchResult */ public interface IGroupByKeyComputer { diff --git a/org.eclipse.search/search/org/eclipse/search/ui/ISearchResultView.java b/org.eclipse.search/search/org/eclipse/search/ui/ISearchResultView.java index b8ae3133e01..4ad842540e7 100644 --- a/org.eclipse.search/search/org/eclipse/search/ui/ISearchResultView.java +++ b/org.eclipse.search/search/org/eclipse/search/ui/ISearchResultView.java @@ -33,6 +33,8 @@ import org.eclipse.ui.IViewPart; * <p> * This interface is not intended to be implemented by clients. * </p> + * @deprecated use <code>ISearchResultViewPart</code> instead. + * @see org.eclipse.search.ui.ISearchResultViewPart */ public interface ISearchResultView extends IViewPart { diff --git a/org.eclipse.search/search/org/eclipse/search/ui/ISearchResultViewEntry.java b/org.eclipse.search/search/org/eclipse/search/ui/ISearchResultViewEntry.java index 08a4c408fcc..8bc43004935 100644 --- a/org.eclipse.search/search/org/eclipse/search/ui/ISearchResultViewEntry.java +++ b/org.eclipse.search/search/org/eclipse/search/ui/ISearchResultViewEntry.java @@ -24,6 +24,9 @@ import org.eclipse.core.resources.IResource; * <p> * This interface is not intended to be implemented by clients. * </p> + * @deprecated use <code>AbstractTextSearchResult</code> and <code>Match</code> instead. + * @see org.eclipse.search.ui.text.AbstractTextSearchResult + * @see org.eclipse.search.ui.text.Match */ public interface ISearchResultViewEntry { diff --git a/org.eclipse.search/search/org/eclipse/search/ui/SearchUI.java b/org.eclipse.search/search/org/eclipse/search/ui/SearchUI.java index f217aacd042..ad862c686c7 100644 --- a/org.eclipse.search/search/org/eclipse/search/ui/SearchUI.java +++ b/org.eclipse.search/search/org/eclipse/search/ui/SearchUI.java @@ -10,14 +10,10 @@ *******************************************************************************/ package org.eclipse.search.ui; -import org.eclipse.swt.graphics.Image; - -import org.eclipse.ui.IWorkbenchWindow; - -import org.eclipse.search.internal.ui.OpenSearchDialogAction; import org.eclipse.search.internal.ui.SearchPlugin; import org.eclipse.search.internal.ui.SearchPluginImages; -import org.eclipse.search.internal.ui.SearchPreferencePage; +import org.eclipse.swt.graphics.Image; +import org.eclipse.ui.IWorkbenchWindow; /** * The central class for access to the Search Plug-in's User Interface. @@ -30,6 +26,8 @@ import org.eclipse.search.internal.ui.SearchPreferencePage; * window.</li> * </ul> * + * @deprecated use <code>NewSearchUI</code> instead. + * @see org.eclipse.search.ui.NewSearchUI * @see ISearchResultView */ public final class SearchUI { @@ -37,14 +35,14 @@ public final class SearchUI { /** * Search Plug-in Id (value <code>"org.eclipse.search"</code>). */ - public static final String PLUGIN_ID= "org.eclipse.search"; //$NON-NLS-1$ + public static final String PLUGIN_ID= NewSearchUI.PLUGIN_ID; /** * Search marker type (value <code>"org.eclipse.search.searchmarker"</code>). * * @see org.eclipse.core.resources.IMarker */ - public static final String SEARCH_MARKER= PLUGIN_ID + ".searchmarker"; //$NON-NLS-1$ + public static final String SEARCH_MARKER= NewSearchUI.SEARCH_MARKER; /** * Line marker attribute (value <code>"line"</code>) @@ -82,7 +80,7 @@ public final class SearchUI { * Id of the new Search view * (value <code>"org.eclipse.search.ui.views.SearchView"</code>). */ - public static final String SEARCH_VIEW_ID= "org.eclipse.search.ui.views.SearchView"; //$NON-NLS-1$ + public static final String SEARCH_VIEW_ID= NewSearchUI.SEARCH_VIEW_ID; /** * Id of the Search action set @@ -90,7 +88,7 @@ public final class SearchUI { * * @since 2.0 */ - public static final String ACTION_SET_ID= PLUGIN_ID + ".searchActionSet"; //$NON-NLS-1$ + public static final String ACTION_SET_ID= NewSearchUI.ACTION_SET_ID; /** * Activates the search result view in the active page of the @@ -113,7 +111,7 @@ public final class SearchUI { * @since 2.0 */ public static void openSearchDialog(IWorkbenchWindow window, String pageId) { - new OpenSearchDialogAction(window, pageId).run(); + NewSearchUI.openSearchDialog(window, pageId); } /** @@ -149,7 +147,7 @@ public final class SearchUI { * @since 2.0 */ public static boolean reuseEditor() { - return SearchPreferencePage.isEditorReused(); + return NewSearchUI.reuseEditor(); } /** @@ -164,7 +162,7 @@ public final class SearchUI { * @since 2.1 */ public static boolean arePotentialMatchesIgnored() { - return SearchPreferencePage.arePotentialMatchesIgnored(); + return NewSearchUI.arePotentialMatchesIgnored(); } /** @@ -178,7 +176,7 @@ public final class SearchUI { * @since 2.1 */ public static String getDefaultPerspectiveId() { - return SearchPreferencePage.getDefaultPerspectiveId(); + return NewSearchUI.getDefaultPerspectiveId(); } /** |