From 33bae81c5c1d186bafd3d459d199faa23eb7ed79 Mon Sep 17 00:00:00 2001 From: Eclipse Platform Bot Date: Mon, 22 Sep 2025 03:43:32 +0000 Subject: [PATCH 1/2] Perform clean code of bundles/org.eclipse.search --- .../search/ui/ISearchPageContainer.java | 2 +- .../org/eclipse/search/ui/NewSearchUI.java | 12 +- .../ui/text/AbstractTextSearchResult.java | 21 ++- .../ui/text/AbstractTextSearchViewPage.java | 134 +++++++++++------- .../search/ui/text/FileTextSearchScope.java | 4 +- .../org/eclipse/search/ui/text/Match.java | 3 +- .../eclipse/search/ui/text/MatchEvent.java | 5 +- .../internal/ui/CancelSearchAction.java | 2 +- .../search2/internal/ui/InternalSearchUI.java | 34 +++-- .../internal/ui/MatchFilterAction.java | 4 +- .../ui/MatchFilterSelectionAction.java | 2 +- .../ui/MatchFilterSelectionDialog.java | 10 +- .../search2/internal/ui/QueryManager.java | 5 +- .../internal/ui/RemoveAllSearchesAction.java | 3 +- .../internal/ui/SearchAgainAction.java | 6 +- .../ui/SearchHistoryDropDownAction.java | 16 ++- .../ui/SearchHistorySelectionDialog.java | 14 +- .../search2/internal/ui/SearchView.java | 46 +++--- .../internal/ui/SearchViewManager.java | 12 +- .../ui/ShowSearchHistoryDialogAction.java | 2 +- .../basic/views/RemoveAllMatchesAction.java | 3 +- .../ui/basic/views/RemoveMatchAction.java | 5 +- .../views/RemoveSelectedMatchesAction.java | 2 +- .../ui/basic/views/SetLayoutAction.java | 4 +- .../ui/basic/views/ShowNextResultAction.java | 2 +- .../basic/views/ShowPreviousResultAction.java | 2 +- .../ui/basic/views/TableViewerNavigator.java | 11 +- .../ui/basic/views/TreeViewerNavigator.java | 64 ++++++--- .../ui/text/AnnotationHighlighter.java | 21 ++- .../internal/ui/text/AnnotationManagers.java | 3 +- .../ui/text/EditorAccessHighlighter.java | 30 ++-- .../ui/text/EditorAnnotationManager.java | 49 ++++--- .../search2/internal/ui/text/Highlighter.java | 2 +- .../internal/ui/text/MarkerHighlighter.java | 9 +- .../internal/ui/text/PositionTracker.java | 48 ++++--- .../ui/text/WindowAnnotationManager.java | 18 ++- .../ui/text2/FindInFileActionDelegate.java | 3 +- .../ui/text2/FindInProjectActionDelegate.java | 3 +- .../internal/ui/text2/RetrieverAction.java | 30 ++-- .../internal/ui/CopyToClipboardAction.java | 25 ++-- .../internal/ui/OpenSearchDialogAction.java | 3 +- .../eclipse/search/internal/ui/ScopePart.java | 73 ++++++---- .../search/internal/ui/SearchDialog.java | 100 ++++++++----- .../internal/ui/SearchPageDescriptor.java | 56 +++++--- .../search/internal/ui/SearchPlugin.java | 15 +- .../internal/ui/SearchPreferencePage.java | 4 +- .../search/internal/ui/SorterDescriptor.java | 5 +- .../internal/ui/WorkingSetComparator.java | 2 +- .../search/internal/ui/text/EditorOpener.java | 12 +- .../internal/ui/text/FileLabelProvider.java | 17 ++- .../search/internal/ui/text/FileMatch.java | 2 +- .../internal/ui/text/FileSearchPage.java | 45 +++--- .../internal/ui/text/FileSearchQuery.java | 8 +- .../internal/ui/text/FileSearchResult.java | 14 +- .../ui/text/FileTableContentProvider.java | 15 +- .../ui/text/FileTreeContentProvider.java | 37 ++--- .../ui/text/NavigatorDragAdapter.java | 7 +- .../ui/text/NewTextSearchActionGroup.java | 22 +-- .../internal/ui/text/ReplaceRefactoring.java | 19 +-- .../internal/ui/text/SearchResultUpdater.java | 5 +- .../search/internal/ui/text/SortAction.java | 4 +- .../internal/ui/text/TextSearchPage.java | 50 ++++--- .../internal/ui/util/ExceptionHandler.java | 5 +- .../ui/util/ExtendedDialogWindow.java | 29 ++-- .../internal/ui/util/FileTypeEditor.java | 8 +- .../search/internal/ui/util/SWTUtil.java | 27 ++-- 66 files changed, 748 insertions(+), 507 deletions(-) diff --git a/bundles/org.eclipse.search/newsearch/org/eclipse/search/ui/ISearchPageContainer.java b/bundles/org.eclipse.search/newsearch/org/eclipse/search/ui/ISearchPageContainer.java index 9ccff0ad17b..54623153259 100644 --- a/bundles/org.eclipse.search/newsearch/org/eclipse/search/ui/ISearchPageContainer.java +++ b/bundles/org.eclipse.search/newsearch/org/eclipse/search/ui/ISearchPageContainer.java @@ -105,7 +105,7 @@ public interface ISearchPageContainer { * Sets the selected scope of this search page container. The scope is * WORKSPACE_SCOPE, SELECTED_PROJECTS_SCOPE, SELECTION_SCOPE, * OPENED_EDITORS_SCOPE or WORKING_SET_SCOPE. - * + * * @param scope * the newly selected scope * diff --git a/bundles/org.eclipse.search/newsearch/org/eclipse/search/ui/NewSearchUI.java b/bundles/org.eclipse.search/newsearch/org/eclipse/search/ui/NewSearchUI.java index 0c701aabb03..46300138055 100644 --- a/bundles/org.eclipse.search/newsearch/org/eclipse/search/ui/NewSearchUI.java +++ b/bundles/org.eclipse.search/newsearch/org/eclipse/search/ui/NewSearchUI.java @@ -71,13 +71,14 @@ public static void runQuery(ISearchQuery query) { if (query == null) { throw new IllegalArgumentException("query must not be null"); //$NON-NLS-1$ } - if (query.canRunInBackground()) + if (query.canRunInBackground()) { runQueryInBackground(query); - else { + } else { IStatus status= runQueryInForeground(null, query); if (status != null) { - if (!status.isOK()) + if (!status.isOK()) { SearchPlugin.log(status); + } if (status.getSeverity() == IStatus.ERROR) { ErrorDialog.openError(SearchPlugin.getActiveWorkbenchShell(), SearchMessages.NewSearchUI_error_title, SearchMessages.NewSearchUI_error_label, status); } @@ -131,10 +132,11 @@ public static void runQueryInBackground(ISearchQuery query, ISearchResultViewPar if (query == null) { throw new IllegalArgumentException("query must not be null"); //$NON-NLS-1$ } - if (query.canRunInBackground()) + if (query.canRunInBackground()) { InternalSearchUI.getInstance().runSearchInBackground(query, view); - else + } else { throw new IllegalArgumentException("Query can not be run in background"); //$NON-NLS-1$ + } } /** diff --git a/bundles/org.eclipse.search/newsearch/org/eclipse/search/ui/text/AbstractTextSearchResult.java b/bundles/org.eclipse.search/newsearch/org/eclipse/search/ui/text/AbstractTextSearchResult.java index 38575917f88..88b5a992d2e 100644 --- a/bundles/org.eclipse.search/newsearch/org/eclipse/search/ui/text/AbstractTextSearchResult.java +++ b/bundles/org.eclipse.search/newsearch/org/eclipse/search/ui/text/AbstractTextSearchResult.java @@ -118,8 +118,9 @@ public Enumeration getMatchSet(Object element) { * @param match the match to add */ public void addMatch(Match match) { - if (didAddMatch(match)) + if (didAddMatch(match)) { fireChange(getSearchResultEvent(match, MatchEvent.ADDED)); + } } /** @@ -137,8 +138,9 @@ public void addMatches(Match[] matches) { reallyAdded.add(match); } } - if (!reallyAdded.isEmpty()) + if (!reallyAdded.isEmpty()) { fireChange(getSearchResultEvent(reallyAdded, MatchEvent.ADDED)); + } } private MatchEvent getSearchResultEvent(Match match, int eventKind) { @@ -164,8 +166,9 @@ private boolean didAddMatch(Match match) { private static int compare(Match match2, Match match1) { int diff= match2.getOffset()-match1.getOffset(); - if (diff != 0) + if (diff != 0) { return diff; + } return match2.getLength()-match1.getLength(); } @@ -193,8 +196,9 @@ private void doRemoveAll() { * @param match the match to remove */ public void removeMatch(Match match) { - if (didRemoveMatch(match)) + if (didRemoveMatch(match)) { fireChange(getSearchResultEvent(match, MatchEvent.REMOVED)); + } } /** @@ -209,11 +213,13 @@ public void removeMatch(Match match) { public void removeMatches(Match[] matches) { Collection existing= new ArrayList<>(); for (Match match : matches) { - if (didRemoveMatch(match)) + if (didRemoveMatch(match)) { existing.add(match); // no duplicate matches at this point + } } - if (!existing.isEmpty()) + if (!existing.isEmpty()) { fireChange(getSearchResultEvent(existing, MatchEvent.REMOVED)); + } } @@ -340,8 +346,9 @@ public int getMatchCount(Object element) { return 0; } Set matches = fElementsToMatches.get(element); - if (matches != null) + if (matches != null) { return matches.size(); + } return 0; } diff --git a/bundles/org.eclipse.search/newsearch/org/eclipse/search/ui/text/AbstractTextSearchViewPage.java b/bundles/org.eclipse.search/newsearch/org/eclipse/search/ui/text/AbstractTextSearchViewPage.java index 3b4dabdbf06..a7bc5c94932 100644 --- a/bundles/org.eclipse.search/newsearch/org/eclipse/search/ui/text/AbstractTextSearchViewPage.java +++ b/bundles/org.eclipse.search/newsearch/org/eclipse/search/ui/text/AbstractTextSearchViewPage.java @@ -181,7 +181,7 @@ public boolean belongsTo(Object family) { } private class SelectionProviderAdapter implements ISelectionProvider, ISelectionChangedListener { - private ArrayList fListeners= new ArrayList<>(5); + private final ArrayList fListeners= new ArrayList<>(5); @Override public void addSelectionChangedListener(ISelectionChangedListener listener) { @@ -232,17 +232,17 @@ public void selectionChanged(SelectionChangedEvent event) { private final LinkedBlockingDeque fBatchedUpdates = new LinkedBlockingDeque<>(); private volatile boolean fBatchedClearAll; - private ISearchResultListener fListener; + private final ISearchResultListener fListener; private IQueryListener fQueryListener; private MenuManager fMenu; private AbstractTextSearchResult fInput; // Actions - private CopyToClipboardAction fCopyToClipboardAction; - private Action fRemoveSelectedMatches; - private Action fRemoveCurrentMatch; - private Action fRemoveAllResultsAction; - private Action fShowNextAction; - private Action fShowPreviousAction; + private final CopyToClipboardAction fCopyToClipboardAction; + private final Action fRemoveSelectedMatches; + private final Action fRemoveCurrentMatch; + private final Action fRemoveAllResultsAction; + private final Action fShowNextAction; + private final Action fShowPreviousAction; private ExpandAllAction fExpandAllAction; private CollapseAllAction fCollapseAllAction; @@ -254,7 +254,7 @@ public void selectionChanged(SelectionChangedEvent event) { private String fId; private final int fSupportedLayouts; private SelectionProviderAdapter fViewerAdapter; - private SelectAllAction fSelectAllAction; + private final SelectAllAction fSelectAllAction; private IAction[] fFilterActions; private Integer fElementLimit; @@ -263,7 +263,7 @@ public void selectionChanged(SelectionChangedEvent event) { * The editor opener. * @since 3.6 */ - private EditorOpener fEditorOpener= new EditorOpener(); + private final EditorOpener fEditorOpener= new EditorOpener(); /** * Flag (value 1) denoting flat list layout. @@ -310,10 +310,11 @@ protected AbstractTextSearchViewPage(int supportedLayouts) { } private void initLayout() { - if (supportsTreeLayout()) + if (supportsTreeLayout()) { fCurrentLayout = FLAG_LAYOUT_TREE; - else + } else { fCurrentLayout = FLAG_LAYOUT_FLAT; + } } /** @@ -355,8 +356,9 @@ protected IDialogSettings getSettings() { .getDialogSettingsProvider(FrameworkUtil.getBundle(AbstractTextSearchViewPage.class)) .getDialogSettings(); IDialogSettings settings = parent.getSection(getID()); - if (settings == null) + if (settings == null) { settings = parent.addNewSection(getID()); + } return settings; } @@ -373,8 +375,9 @@ public String getID() { @Override public String getLabel() { AbstractTextSearchResult result= getInput(); - if (result == null) + if (result == null) { return ""; //$NON-NLS-1$ + } return result.getLabel(); } @@ -529,10 +532,12 @@ protected void fillContextMenu(IMenuManager mgr) { mgr.appendToGroup(IContextMenuConstants.GROUP_SHOW, fShowNextAction); mgr.appendToGroup(IContextMenuConstants.GROUP_SHOW, fShowPreviousAction); mgr.appendToGroup(IContextMenuConstants.GROUP_EDIT, fCopyToClipboardAction); - if (getCurrentMatch() != null) + if (getCurrentMatch() != null) { mgr.appendToGroup(IContextMenuConstants.GROUP_REMOVE_MATCHES, fRemoveCurrentMatch); - if (canRemoveMatchesWith(getViewer().getSelection())) + } + if (canRemoveMatchesWith(getViewer().getSelection())) { mgr.appendToGroup(IContextMenuConstants.GROUP_REMOVE_MATCHES, fRemoveSelectedMatches); + } mgr.appendToGroup(IContextMenuConstants.GROUP_REMOVE_MATCHES, fRemoveAllResultsAction); } @@ -641,17 +646,19 @@ protected void postEnsureSelection() { private void updateBusyLabel() { AbstractTextSearchResult result = getInput(); boolean shouldShowBusy = result != null && NewSearchUI.isQueryRunning(result.getQuery()) && result.getMatchCount() == 0; - if (shouldShowBusy == fIsBusyShown) + if (shouldShowBusy == fIsBusyShown) { return; + } fIsBusyShown = shouldShowBusy; showBusyLabel(fIsBusyShown); } private void showBusyLabel(boolean shouldShowBusy) { - if (shouldShowBusy) + if (shouldShowBusy) { fPagebook.showPage(fBusyLabel); - else + } else { fPagebook.showPage(fViewerContainer); + } } /** @@ -679,10 +686,12 @@ public boolean isLayoutSupported(int layout) { public void setLayout(int layout) { Assert.isTrue(countBits(layout) == 1); Assert.isTrue(isLayoutSupported(layout)); - if (countBits(fSupportedLayouts) < 2) + if (countBits(fSupportedLayouts) < 2) { return; - if (fCurrentLayout == layout) + } + if (fCurrentLayout == layout) { return; + } fCurrentLayout = layout; ISelection selection = fViewer.getSelection(); disconnectViewer(); @@ -702,10 +711,12 @@ private void disposeViewer() { } private void updateLayoutActions() { - if (fFlatAction != null) + if (fFlatAction != null) { fFlatAction.setChecked(fCurrentLayout == fFlatAction.getLayout()); - if (fHierarchicalAction != null) + } + if (fHierarchicalAction != null) { fHierarchicalAction.setChecked(fCurrentLayout == fHierarchicalAction.getLayout()); + } } /** @@ -806,8 +817,9 @@ protected TableViewer createTableViewer(Composite parent) { @Override public void setFocus() { Control control = fViewer.getControl(); - if (control != null && !control.isDisposed()) + if (control != null && !control.isDisposed()) { control.setFocus(); + } } @Override @@ -817,8 +829,9 @@ public Control getControl() { @Override public void setInput(ISearchResult newSearch, Object viewState) { - if (newSearch != null && !(newSearch instanceof AbstractTextSearchResult)) + if (newSearch != null && !(newSearch instanceof AbstractTextSearchResult)) { return; // ignore + } AbstractTextSearchResult oldSearch= fInput; if (oldSearch != null) { @@ -834,10 +847,11 @@ public void setInput(ISearchResult newSearch, Object viewState) { fInput.addListener(fListener); connectViewer(fInput); - if (viewState instanceof ISelection) + if (viewState instanceof ISelection) { fViewer.setSelection((ISelection) viewState, true); - else + } else { navigateNext(true); + } updateBusyLabel(); turnOffDecoration(); @@ -926,8 +940,7 @@ private void showMatch(final Match match, final boolean activateEditor) { ISafeRunnable runnable = new ISafeRunnable() { @Override public void handleException(Throwable exception) { - if (exception instanceof PartInitException) { - PartInitException pie = (PartInitException) exception; + if (exception instanceof PartInitException pie) { ErrorDialog.openError(getSite().getShell(), SearchMessages.DefaultSearchViewPage_show_match, SearchMessages.DefaultSearchViewPage_error_no_editor, pie.getStatus()); } } @@ -1018,8 +1031,9 @@ public Match getCurrentMatch() { Object element = getFirstSelectedElement(); if (element != null) { Match[] matches = getDisplayedMatches(element); - if (fCurrentMatchIndex >= 0 && fCurrentMatchIndex < matches.length) + if (fCurrentMatchIndex >= 0 && fCurrentMatchIndex < matches.length) { return matches[fCurrentMatchIndex]; + } } return null; } @@ -1041,26 +1055,31 @@ public Match getCurrentMatch() { */ public Match[] getDisplayedMatches(Object element) { AbstractTextSearchResult result= getInput(); - if (result == null) + if (result == null) { return EMPTY_MATCH_ARRAY; + } Match[] matches= result.getMatches(element); - if (result.getActiveMatchFilters() == null) // default behaviour: filter state not used, all matches shown + if (result.getActiveMatchFilters() == null) { // default behaviour: filter state not used, all matches shown return matches; + } int count= 0; for (int i= 0; i < matches.length; i++) { - if (matches[i].isFiltered()) + if (matches[i].isFiltered()) { matches[i]= null; - else + } else { count++; + } } - if (count == matches.length) + if (count == matches.length) { return matches; + } Match[] filteredMatches= new Match[count]; for (int i= 0, k= 0; i < matches.length; i++) { - if (matches[i] != null) + if (matches[i] != null) { filteredMatches[k++]= matches[i]; + } } return filteredMatches; } @@ -1107,10 +1126,12 @@ public IRegion getCurrentMatchLocation(Match match) { */ public int getDisplayedMatchCount(Object element) { AbstractTextSearchResult result= getInput(); - if (result == null) + if (result == null) { return 0; - if (result.getActiveMatchFilters() == null) // default behaviour: filter state not used, all matches shown + } + if (result.getActiveMatchFilters() == null) { // default behaviour: filter state not used, all matches shown return result.getMatchCount(element); + } int count= 0; Match[] matches= result.getMatches(element); @@ -1124,16 +1145,18 @@ public int getDisplayedMatchCount(Object element) { private Object getFirstSelectedElement() { IStructuredSelection selection = fViewer.getStructuredSelection(); - if (selection.size() > 0) + if (selection.size() > 0) { return selection.getFirstElement(); + } return null; } @Override public void dispose() { AbstractTextSearchResult oldSearch = getInput(); - if (oldSearch != null) + if (oldSearch != null) { AnnotationManagers.removeSearchResult(getSite().getWorkbenchWindow(), oldSearch); + } super.dispose(); NewSearchUI.removeQueryListener(fQueryListener); openAndLinkWithEditorHelper.dispose(); @@ -1183,10 +1206,12 @@ protected void fillToolbar(IToolBarManager tbm) { } private void addLayoutActions(IMenuManager menuManager) { - if (fFlatAction != null) + if (fFlatAction != null) { menuManager.appendToGroup(IContextMenuConstants.GROUP_VIEWER_SETUP, fFlatAction); - if (fHierarchicalAction != null) + } + if (fHierarchicalAction != null) { menuManager.appendToGroup(IContextMenuConstants.GROUP_VIEWER_SETUP, fHierarchicalAction); + } } /** @@ -1294,15 +1319,17 @@ private void asyncExec(final Runnable runnable) { final Control control = getControl(); if (control != null && !control.isDisposed()) { Display currentDisplay = Display.getCurrent(); - if (currentDisplay == null || !currentDisplay.equals(control.getDisplay())) + if (currentDisplay == null || !currentDisplay.equals(control.getDisplay())) { // meaning we're not executing on the display thread of the // control control.getDisplay().asyncExec(() -> { - if (!control.isDisposed()) + if (!control.isDisposed()) { runnable.run(); + } }); - else + } else { runnable.run(); + } } } @@ -1316,8 +1343,9 @@ public void restoreState(IMemento memento) { try { fCurrentLayout = getSettings().getInt(KEY_LAYOUT); // workaround because the saved value may be 0 - if (fCurrentLayout == 0) + if (fCurrentLayout == 0) { initLayout(); + } } catch (NumberFormatException e) { // ignore, signals no value stored. } @@ -1326,8 +1354,9 @@ public void restoreState(IMemento memento) { if (layout != null) { fCurrentLayout = layout.intValue(); // workaround because the saved value may be 0 - if (fCurrentLayout == 0) + if (fCurrentLayout == 0) { initLayout(); + } } } } @@ -1352,8 +1381,9 @@ public void saveState(IMemento memento) { */ public void internalRemoveSelected() { AbstractTextSearchResult result = getInput(); - if (result == null) + if (result == null) { return; + } StructuredViewer viewer = getViewer(); IStructuredSelection selection = viewer.getStructuredSelection(); @@ -1419,15 +1449,15 @@ protected void handleOpen(OpenEvent event) { Viewer viewer= event.getViewer(); boolean hasCurrentMatch = showCurrentMatch(OpenStrategy.activateOnOpen()); ISelection sel= event.getSelection(); - if (viewer instanceof TreeViewer && sel instanceof IStructuredSelection) { - IStructuredSelection selection= (IStructuredSelection) sel; + if (viewer instanceof TreeViewer && sel instanceof IStructuredSelection selection) { TreeViewer tv = (TreeViewer) getViewer(); Object element = selection.getFirstElement(); if (element != null) { - if (!hasCurrentMatch && getDisplayedMatchCount(element) > 0) + if (!hasCurrentMatch && getDisplayedMatchCount(element) > 0) { gotoNextMatch(OpenStrategy.activateOnOpen()); - else + } else { tv.setExpandedState(element, !tv.getExpandedState(element)); + } } return; } else if (!hasCurrentMatch) { diff --git a/bundles/org.eclipse.search/newsearch/org/eclipse/search/ui/text/FileTextSearchScope.java b/bundles/org.eclipse.search/newsearch/org/eclipse/search/ui/text/FileTextSearchScope.java index 8ef9ea660fd..2eb1ad685e0 100644 --- a/bundles/org.eclipse.search/newsearch/org/eclipse/search/ui/text/FileTextSearchScope.java +++ b/bundles/org.eclipse.search/newsearch/org/eclipse/search/ui/text/FileTextSearchScope.java @@ -130,8 +130,8 @@ public static FileTextSearchScope newSearchScope(IWorkingSet[] workingSets, Stri private final ThreadLocal fPositiveFileNameMatcher; private final ThreadLocal fNegativeFileNameMatcher; - private boolean fVisitDerived; - private IWorkingSet[] fWorkingSets; + private final boolean fVisitDerived; + private final IWorkingSet[] fWorkingSets; private FileTextSearchScope(String description, IResource[] resources, IWorkingSet[] workingSets, String[] fileNamePatterns, boolean visitDerived) { fDescription= description; diff --git a/bundles/org.eclipse.search/newsearch/org/eclipse/search/ui/text/Match.java b/bundles/org.eclipse.search/newsearch/org/eclipse/search/ui/text/Match.java index aaf59767a4d..085cf34d0ce 100644 --- a/bundles/org.eclipse.search/newsearch/org/eclipse/search/ui/text/Match.java +++ b/bundles/org.eclipse.search/newsearch/org/eclipse/search/ui/text/Match.java @@ -134,8 +134,9 @@ public Object getElement() { * @return either UNIT_LINE or UNIT_CHARACTER; */ public int getBaseUnit() { - if ((fFlags & UNIT_LINE) != 0) + if ((fFlags & UNIT_LINE) != 0) { return UNIT_LINE; + } return UNIT_CHARACTER; } diff --git a/bundles/org.eclipse.search/newsearch/org/eclipse/search/ui/text/MatchEvent.java b/bundles/org.eclipse.search/newsearch/org/eclipse/search/ui/text/MatchEvent.java index b83d461059b..e7e75d3c2a3 100644 --- a/bundles/org.eclipse.search/newsearch/org/eclipse/search/ui/text/MatchEvent.java +++ b/bundles/org.eclipse.search/newsearch/org/eclipse/search/ui/text/MatchEvent.java @@ -65,10 +65,11 @@ public int getKind() { * @return the matches this event is about */ public Match[] getMatches() { - if (fMatches != null) + if (fMatches != null) { return fMatches; - else + } else { return fgEmtpyMatches; + } } /** diff --git a/bundles/org.eclipse.search/newsearch/org/eclipse/search2/internal/ui/CancelSearchAction.java b/bundles/org.eclipse.search/newsearch/org/eclipse/search2/internal/ui/CancelSearchAction.java index b4b7432b77d..d6e78f3cf20 100644 --- a/bundles/org.eclipse.search/newsearch/org/eclipse/search2/internal/ui/CancelSearchAction.java +++ b/bundles/org.eclipse.search/newsearch/org/eclipse/search2/internal/ui/CancelSearchAction.java @@ -20,7 +20,7 @@ public class CancelSearchAction extends Action { - private SearchView fView; + private final SearchView fView; public CancelSearchAction(SearchView view) { super(SearchMessages.CancelSearchAction_label); diff --git a/bundles/org.eclipse.search/newsearch/org/eclipse/search2/internal/ui/InternalSearchUI.java b/bundles/org.eclipse.search/newsearch/org/eclipse/search2/internal/ui/InternalSearchUI.java index 78c08005575..65783f47745 100644 --- a/bundles/org.eclipse.search/newsearch/org/eclipse/search2/internal/ui/InternalSearchUI.java +++ b/bundles/org.eclipse.search/newsearch/org/eclipse/search2/internal/ui/InternalSearchUI.java @@ -48,12 +48,12 @@ public class InternalSearchUI { private static InternalSearchUI fgInstance; // contains all running jobs - private HashMap fSearchJobs; + private final HashMap fSearchJobs; - private QueryManager fSearchResultsManager; - private PositionTracker fPositionTracker; + private final QueryManager fSearchResultsManager; + private final PositionTracker fPositionTracker; - private SearchViewManager fSearchViewManager; + private final SearchViewManager fSearchViewManager; public static final Object FAMILY_SEARCH = new Object(); @@ -72,7 +72,7 @@ public SearchJobRecord(ISearchQuery job) { private class InternalSearchJob extends Job { - private SearchJobRecord fSearchJobRecord; + private final SearchJobRecord fSearchJobRecord; public InternalSearchJob(SearchJobRecord sjr) { super(sjr.query.getLabel()); @@ -138,8 +138,9 @@ public InternalSearchUI() { * @return returns the shared instance. */ public static InternalSearchUI getInstance() { - if (fgInstance ==null) + if (fgInstance ==null) { fgInstance= new InternalSearchUI(); + } return fgInstance; } @@ -151,15 +152,17 @@ private IWorkbenchSiteProgressService getProgressService() { ISearchResultViewPart view= getSearchView(); if (view != null) { IWorkbenchPartSite site= view.getSite(); - if (site != null) + if (site != null) { return view.getSite().getAdapter(IWorkbenchSiteProgressService.class); + } } return null; } public boolean runSearchInBackground(ISearchQuery query, ISearchResultViewPart view) { - if (isQueryRunning(query)) + if (isQueryRunning(query)) { return false; + } // prepare view if (view == null) { @@ -209,8 +212,9 @@ public IStatus runSearchInForeground(IRunnableContext context, final ISearchQuer SearchJobRecord sjr= new SearchJobRecord(query); fSearchJobs.put(query, sjr); - if (context == null) + if (context == null) { context= new ProgressMonitorDialog(null); + } return doRunSearchInForeground(sjr, context); } @@ -247,16 +251,18 @@ private IStatus doRunSearchInForeground(final SearchJobRecord rec, IRunnableCont public static void shutdown() { InternalSearchUI instance= fgInstance; - if (instance != null) + if (instance != null) { instance.doShutdown(); + } } private void doShutdown() { Iterator jobRecs= fSearchJobs.values().iterator(); while (jobRecs.hasNext()) { SearchJobRecord element= jobRecs.next(); - if (element.job != null) + if (element.job != null) { element.job.cancel(); + } } fPositionTracker.dispose(); @@ -266,8 +272,9 @@ private void doShutdown() { public void cancelSearch(ISearchQuery job) { SearchJobRecord rec= fSearchJobs.get(job); - if (rec != null && rec.job != null) + if (rec != null && rec.job != null) { rec.job.cancel(); + } } @@ -338,8 +345,9 @@ public void removeAllQueries() { } public void showSearchResult(SearchView searchView, ISearchResult result, boolean openInNew) { - if (openInNew) + if (openInNew) { searchView= (SearchView)getSearchViewManager().activateSearchView(true, openInNew); + } showSearchResult(searchView, result); } diff --git a/bundles/org.eclipse.search/newsearch/org/eclipse/search2/internal/ui/MatchFilterAction.java b/bundles/org.eclipse.search/newsearch/org/eclipse/search2/internal/ui/MatchFilterAction.java index 9b7ed4466d5..75432ae8ace 100644 --- a/bundles/org.eclipse.search/newsearch/org/eclipse/search2/internal/ui/MatchFilterAction.java +++ b/bundles/org.eclipse.search/newsearch/org/eclipse/search2/internal/ui/MatchFilterAction.java @@ -27,8 +27,8 @@ public class MatchFilterAction extends Action implements IUpdate { - private MatchFilter fFilter; - private AbstractTextSearchViewPage fPage; + private final MatchFilter fFilter; + private final AbstractTextSearchViewPage fPage; public MatchFilterAction(AbstractTextSearchViewPage page, MatchFilter filter) { super(filter.getActionLabel(), IAction.AS_CHECK_BOX); diff --git a/bundles/org.eclipse.search/newsearch/org/eclipse/search2/internal/ui/MatchFilterSelectionAction.java b/bundles/org.eclipse.search/newsearch/org/eclipse/search2/internal/ui/MatchFilterSelectionAction.java index f9fabda301c..2192743d55e 100644 --- a/bundles/org.eclipse.search/newsearch/org/eclipse/search2/internal/ui/MatchFilterSelectionAction.java +++ b/bundles/org.eclipse.search/newsearch/org/eclipse/search2/internal/ui/MatchFilterSelectionAction.java @@ -28,7 +28,7 @@ public class MatchFilterSelectionAction extends Action { public static final String ACTION_ID= "MatchFilterSelectionAction"; //$NON-NLS-1$ - private AbstractTextSearchViewPage fPage; + private final AbstractTextSearchViewPage fPage; public MatchFilterSelectionAction(AbstractTextSearchViewPage page) { super(SearchMessages.MatchFilterSelectionAction_label); diff --git a/bundles/org.eclipse.search/newsearch/org/eclipse/search2/internal/ui/MatchFilterSelectionDialog.java b/bundles/org.eclipse.search/newsearch/org/eclipse/search2/internal/ui/MatchFilterSelectionDialog.java index cc8d74af1f5..1ff05620253 100644 --- a/bundles/org.eclipse.search/newsearch/org/eclipse/search2/internal/ui/MatchFilterSelectionDialog.java +++ b/bundles/org.eclipse.search/newsearch/org/eclipse/search2/internal/ui/MatchFilterSelectionDialog.java @@ -226,10 +226,11 @@ public void widgetSelected(SelectionEvent e) { private void performFilterListSelectionChanged() { Object selectedElement = fListViewer.getStructuredSelection().getFirstElement(); - if (selectedElement != null) + if (selectedElement != null) { fDescription.setText(((MatchFilter) selectedElement).getDescription()); - else + } else { fDescription.setText(""); //$NON-NLS-1$ + } } private void performFilterListCheckStateChanged() { @@ -257,10 +258,11 @@ private void performLimitTextModified() { } catch (NumberFormatException e) { } fLimitElementCount= value; - if (fLimitElementsCheckbox.getSelection() && value <= 0) + if (fLimitElementsCheckbox.getSelection() && value <= 0) { updateStatus(createStatus(IStatus.ERROR, SearchMessages.MatchFilterSelectionDialog_error_invalid_limit)); - else + } else { updateStatus(createStatus(IStatus.OK, "")); //$NON-NLS-1$ + } } private IStatus createStatus(int severity, String message) { diff --git a/bundles/org.eclipse.search/newsearch/org/eclipse/search2/internal/ui/QueryManager.java b/bundles/org.eclipse.search/newsearch/org/eclipse/search2/internal/ui/QueryManager.java index b61166e6081..6b46265b868 100644 --- a/bundles/org.eclipse.search/newsearch/org/eclipse/search2/internal/ui/QueryManager.java +++ b/bundles/org.eclipse.search/newsearch/org/eclipse/search2/internal/ui/QueryManager.java @@ -25,7 +25,7 @@ class QueryManager { private List fQueries; - private List fListeners; + private final List fListeners; public QueryManager() { super(); @@ -66,8 +66,9 @@ public void removeQuery(ISearchQuery query) { public void addQuery(ISearchQuery query) { synchronized (this) { - if (fQueries.contains(query)) + if (fQueries.contains(query)) { return; + } fQueries.add(0, query); } fireAdded(query); diff --git a/bundles/org.eclipse.search/newsearch/org/eclipse/search2/internal/ui/RemoveAllSearchesAction.java b/bundles/org.eclipse.search/newsearch/org/eclipse/search2/internal/ui/RemoveAllSearchesAction.java index 39b1bcd8c9c..4ceb1ec1235 100644 --- a/bundles/org.eclipse.search/newsearch/org/eclipse/search2/internal/ui/RemoveAllSearchesAction.java +++ b/bundles/org.eclipse.search/newsearch/org/eclipse/search2/internal/ui/RemoveAllSearchesAction.java @@ -59,8 +59,9 @@ public void run() { ISearchQuery[] queries= NewSearchUI.getQueries(); if (promptForConfirmation()) { for (ISearchQuery querie : queries) { - if (!NewSearchUI.isQueryRunning(querie)) + if (!NewSearchUI.isQueryRunning(querie)) { InternalSearchUI.getInstance().removeQuery(querie); + } } } } diff --git a/bundles/org.eclipse.search/newsearch/org/eclipse/search2/internal/ui/SearchAgainAction.java b/bundles/org.eclipse.search/newsearch/org/eclipse/search2/internal/ui/SearchAgainAction.java index 6decb38dce0..54134490bb2 100644 --- a/bundles/org.eclipse.search/newsearch/org/eclipse/search2/internal/ui/SearchAgainAction.java +++ b/bundles/org.eclipse.search/newsearch/org/eclipse/search2/internal/ui/SearchAgainAction.java @@ -28,7 +28,7 @@ class SearchAgainAction extends Action { - private SearchView fView; + private final SearchView fView; public SearchAgainAction(SearchView view) { setText(SearchMessages.SearchAgainAction_label); @@ -44,9 +44,9 @@ public void run() { ISearchQuery query= search.getQuery(); NewSearchUI.cancelQuery(query); if (query.canRerun()) { - if (query.canRunInBackground()) + if (query.canRunInBackground()) { NewSearchUI.runQueryInBackground(query, fView); - else { + } else { Shell shell= fView.getSite().getShell(); ProgressMonitorDialog pmd= new ProgressMonitorDialog(shell); IStatus status= NewSearchUI.runQueryInForeground(pmd, query, fView); diff --git a/bundles/org.eclipse.search/newsearch/org/eclipse/search2/internal/ui/SearchHistoryDropDownAction.java b/bundles/org.eclipse.search/newsearch/org/eclipse/search2/internal/ui/SearchHistoryDropDownAction.java index 71a311ee795..0d001850641 100644 --- a/bundles/org.eclipse.search/newsearch/org/eclipse/search2/internal/ui/SearchHistoryDropDownAction.java +++ b/bundles/org.eclipse.search/newsearch/org/eclipse/search2/internal/ui/SearchHistoryDropDownAction.java @@ -33,18 +33,20 @@ class SearchHistoryDropDownAction extends Action implements IMenuCreator { private class ShowSearchFromHistoryAction extends Action { - private ISearchResult fSearch; + private final ISearchResult fSearch; public ShowSearchFromHistoryAction(ISearchResult search) { super("", AS_RADIO_BUTTON); //$NON-NLS-1$ fSearch= search; String label= escapeAmp(search.getLabel()); - if (InternalSearchUI.getInstance().isQueryRunning(search.getQuery())) + if (InternalSearchUI.getInstance().isQueryRunning(search.getQuery())) { label= MessageFormat.format(SearchMessages.SearchDropDownAction_running_message, label); + } // fix for bug 38049 - if (label.indexOf('@') >= 0) + if (label.indexOf('@') >= 0) { label+= '@'; + } setText(label); setImageDescriptor(search.getImageDescriptor()); setToolTipText(search.getTooltip()); @@ -73,15 +75,16 @@ public void run() { } private void runIfChecked(boolean openNewSearchView) { - if (isChecked()) + if (isChecked()) { InternalSearchUI.getInstance().showSearchResult(fSearchView, fSearch, openNewSearchView); + } } } public static final int RESULTS_IN_DROP_DOWN= 10; private Menu fMenu; - private SearchView fSearchView; + private final SearchView fSearchView; public SearchHistoryDropDownAction(SearchView searchView) { setText(SearchMessages.SearchDropDownAction_label); @@ -102,8 +105,9 @@ public void dispose() { } void disposeMenu() { - if (fMenu != null) + if (fMenu != null) { fMenu.dispose(); + } } @Override diff --git a/bundles/org.eclipse.search/newsearch/org/eclipse/search2/internal/ui/SearchHistorySelectionDialog.java b/bundles/org.eclipse.search/newsearch/org/eclipse/search2/internal/ui/SearchHistorySelectionDialog.java index b27f4736605..a267ada329a 100644 --- a/bundles/org.eclipse.search/newsearch/org/eclipse/search2/internal/ui/SearchHistorySelectionDialog.java +++ b/bundles/org.eclipse.search/newsearch/org/eclipse/search2/internal/ui/SearchHistorySelectionDialog.java @@ -68,7 +68,7 @@ public class SearchHistorySelectionDialog extends SelectionDialog { private static final int REMOVE_ID= IDialogConstants.CLIENT_ID+1; private static final int WIDTH_IN_CHARACTERS= 55; - private List fInput; + private final List fInput; private final List fRemovedEntries; private TableViewer fViewer; @@ -193,8 +193,9 @@ public String getText(Object element) { public Image getImage(Object element) { ImageDescriptor imageDescriptor= ((ISearchResult)element).getImageDescriptor(); - if (imageDescriptor == null) + if (imageDescriptor == null) { return null; + } Image image= imageDescriptor.createImage(); fImages.add(image); @@ -205,8 +206,9 @@ public Image getImage(Object element) { @Override public void dispose() { Iterator iter= fImages.iterator(); - while (iter.hasNext()) + while (iter.hasNext()) { iter.next().dispose(); + } fImages= null; } @@ -270,8 +272,9 @@ public void create() { super.create(); List initialSelection= getInitialElementSelections(); - if (initialSelection != null) + if (initialSelection != null) { fViewer.setSelection(new StructuredSelection(initialSelection)); + } validateDialogState(); } @@ -405,8 +408,9 @@ protected void buttonPressed(int buttonId) { protected void okPressed() { // Build a list of selected children. ISelection selection= fViewer.getSelection(); - if (selection instanceof IStructuredSelection) + if (selection instanceof IStructuredSelection) { setResult(fViewer.getStructuredSelection().toList()); + } // remove queries for (ISearchResult result : fRemovedEntries) { diff --git a/bundles/org.eclipse.search/newsearch/org/eclipse/search2/internal/ui/SearchView.java b/bundles/org.eclipse.search/newsearch/org/eclipse/search2/internal/ui/SearchView.java index 7c1f2124d1a..6b695f8923c 100644 --- a/bundles/org.eclipse.search/newsearch/org/eclipse/search2/internal/ui/SearchView.java +++ b/bundles/org.eclipse.search/newsearch/org/eclipse/search2/internal/ui/SearchView.java @@ -93,10 +93,10 @@ public class SearchView extends PageBookView implements ISearchResultViewPart, I private static final String MEMENTO_KEY_IS_PINNED= "isPinned"; //$NON-NLS-1$ private static final String MEMENTO_KEY_LAST_ACTIVATION= "org.eclipse.search.lastActivation"; //$NON-NLS-1$ private static final String MEMENTO_KEY_RESTORE= "org.eclipse.search.restore"; //$NON-NLS-1$ - private HashMap fPartsToPages; - private HashMap fPagesToParts; - private HashMap fSearchViewStates; - private SearchPageRegistry fSearchViewPageService; + private final HashMap fPartsToPages; + private final HashMap fPagesToParts; + private final HashMap fSearchViewStates; + private final SearchPageRegistry fSearchViewPageService; private SearchHistoryDropDownAction fSearchesDropDownAction; private ISearchResult fCurrentSearch; private DummyPart fDefaultPart; @@ -255,8 +255,9 @@ public Control getControl() { @Override public void setFocus() { - if (fControl != null) + if (fControl != null) { fControl.setFocus(); + } } @Override @@ -439,14 +440,17 @@ private void updateHelpContextID(ISearchResultPage page) { String helpContextId= null; String pageId= null; - if (page != null) + if (page != null) { pageId= page.getID(); + } - if (pageId != null) + if (pageId != null) { helpContextId= fSearchViewPageService.getHelpContextId(pageId); + } - if (helpContextId == null) + if (helpContextId == null) { helpContextId= ISearchHelpContextIds.New_SEARCH_VIEW; + } PlatformUI.getWorkbench().getHelpSystem().setHelp(fPageContent.getParent(), helpContextId); } @@ -677,11 +681,13 @@ private String getShowInMenuLabel() { String keyBinding= null; IBindingService bindingService= PlatformUI.getWorkbench().getAdapter(IBindingService.class); - if (bindingService != null) + if (bindingService != null) { keyBinding= bindingService.getBestActiveBindingFormattedFor(IWorkbenchCommandConstants.NAVIGATE_SHOW_IN_QUICK_MENU); + } - if (keyBinding == null) + if (keyBinding == null) { keyBinding= ""; //$NON-NLS-1$ + } return NLS.bind(SearchMessages.SearchView_showIn_menu, keyBinding); } @@ -737,8 +743,9 @@ protected void initPage(IPageBookViewPage page) { private void showLatestSearch() { ISearchQuery[] queries= InternalSearchUI.getInstance().getSearchManager().getQueries(); - if (queries.length > 0) + if (queries.length > 0) { showSearchResult(queries[0].getSearchResult()); + } } /* @@ -748,17 +755,19 @@ private void showLatestSearch() { @Override public void setFocus() { IPage currentPage= getCurrentPage(); - if (currentPage != null) + if (currentPage != null) { currentPage.setFocus(); - else + } else { super.setFocus(); + } } @Override public ISearchResultPage getActivePage() { IPage page= getCurrentPage(); - if (page instanceof ISearchResultPage) + if (page instanceof ISearchResultPage) { return (ISearchResultPage) page; + } return null; } @@ -766,24 +775,27 @@ public IWorkbenchSiteProgressService getProgressService() { IWorkbenchSiteProgressService service = null; Object siteService = getSite().getAdapter(IWorkbenchSiteProgressService.class); - if(siteService != null) + if(siteService != null) { service = (IWorkbenchSiteProgressService) siteService; + } return service; } @Override public void showBusy(boolean busy) { super.showBusy(busy); - if (!busy) + if (!busy) { getProgressService().warnOfContentChange(); + } } @SuppressWarnings("unchecked") @Override public T getAdapter(Class adapter) { Object superAdapter= super.getAdapter(adapter); - if (superAdapter != null) + if (superAdapter != null) { return (T) superAdapter; + } if (adapter == IShowInSource.class) { return (T) (IShowInSource) () -> new ShowInContext(null, getSelectionProvider().getSelection()); } diff --git a/bundles/org.eclipse.search/newsearch/org/eclipse/search2/internal/ui/SearchViewManager.java b/bundles/org.eclipse.search/newsearch/org/eclipse/search2/internal/ui/SearchViewManager.java index 7b1aa6df7ba..f5fac629c8d 100644 --- a/bundles/org.eclipse.search/newsearch/org/eclipse/search2/internal/ui/SearchViewManager.java +++ b/bundles/org.eclipse.search/newsearch/org/eclipse/search2/internal/ui/SearchViewManager.java @@ -34,10 +34,10 @@ public class SearchViewManager { - private IQueryListener fNewQueryListener; + private final IQueryListener fNewQueryListener; private int fViewCount= 0; - private LinkedList fLRUSearchViews; + private final LinkedList fLRUSearchViews; public SearchViewManager(QueryManager queryManager) { @@ -103,12 +103,14 @@ public ISearchResultViewPart activateSearchView(boolean avoidPinnedViews, boolea } 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 if (!SearchPreferencePage.isViewBroughtToFront()) + } + } else if (!SearchPreferencePage.isViewBroughtToFront()) { return viewPart; - else + } else { secondaryId= viewPart.getViewSite().getSecondaryId(); + } return (ISearchResultViewPart) activePage.showView(NewSearchUI.SEARCH_VIEW_ID, secondaryId, IWorkbenchPage.VIEW_ACTIVATE); } catch (PartInitException ex) { diff --git a/bundles/org.eclipse.search/newsearch/org/eclipse/search2/internal/ui/ShowSearchHistoryDialogAction.java b/bundles/org.eclipse.search/newsearch/org/eclipse/search2/internal/ui/ShowSearchHistoryDialogAction.java index b59d767521a..49b9c1e3705 100644 --- a/bundles/org.eclipse.search/newsearch/org/eclipse/search2/internal/ui/ShowSearchHistoryDialogAction.java +++ b/bundles/org.eclipse.search/newsearch/org/eclipse/search2/internal/ui/ShowSearchHistoryDialogAction.java @@ -30,7 +30,7 @@ * This action will retarget to the active view. */ class ShowSearchHistoryDialogAction extends Action { - private SearchView fSearchView; + private final SearchView fSearchView; /* diff --git a/bundles/org.eclipse.search/newsearch/org/eclipse/search2/internal/ui/basic/views/RemoveAllMatchesAction.java b/bundles/org.eclipse.search/newsearch/org/eclipse/search2/internal/ui/basic/views/RemoveAllMatchesAction.java index b38cb4d97f2..0be34116c16 100644 --- a/bundles/org.eclipse.search/newsearch/org/eclipse/search2/internal/ui/basic/views/RemoveAllMatchesAction.java +++ b/bundles/org.eclipse.search/newsearch/org/eclipse/search2/internal/ui/basic/views/RemoveAllMatchesAction.java @@ -34,7 +34,8 @@ public RemoveAllMatchesAction(AbstractTextSearchViewPage page) { @Override public void run() { AbstractTextSearchResult search= fPage.getInput(); - if (search != null) + if (search != null) { search.removeAll(); + } } } diff --git a/bundles/org.eclipse.search/newsearch/org/eclipse/search2/internal/ui/basic/views/RemoveMatchAction.java b/bundles/org.eclipse.search/newsearch/org/eclipse/search2/internal/ui/basic/views/RemoveMatchAction.java index dcb4ebd1009..5f8e726b37d 100644 --- a/bundles/org.eclipse.search/newsearch/org/eclipse/search2/internal/ui/basic/views/RemoveMatchAction.java +++ b/bundles/org.eclipse.search/newsearch/org/eclipse/search2/internal/ui/basic/views/RemoveMatchAction.java @@ -24,7 +24,7 @@ public class RemoveMatchAction extends Action { - private AbstractTextSearchViewPage fPage; + private final AbstractTextSearchViewPage fPage; public RemoveMatchAction(AbstractTextSearchViewPage page) { fPage= page; @@ -37,8 +37,9 @@ public RemoveMatchAction(AbstractTextSearchViewPage page) { public void run() { Match match= fPage.getCurrentMatch(); AbstractTextSearchResult result= fPage.getInput(); - if (match != null && result != null) + if (match != null && result != null) { result.removeMatch(match); + } } } diff --git a/bundles/org.eclipse.search/newsearch/org/eclipse/search2/internal/ui/basic/views/RemoveSelectedMatchesAction.java b/bundles/org.eclipse.search/newsearch/org/eclipse/search2/internal/ui/basic/views/RemoveSelectedMatchesAction.java index a72c18604e9..0db2a81b657 100644 --- a/bundles/org.eclipse.search/newsearch/org/eclipse/search2/internal/ui/basic/views/RemoveSelectedMatchesAction.java +++ b/bundles/org.eclipse.search/newsearch/org/eclipse/search2/internal/ui/basic/views/RemoveSelectedMatchesAction.java @@ -22,7 +22,7 @@ public class RemoveSelectedMatchesAction extends Action { - private AbstractTextSearchViewPage fPage; + private final AbstractTextSearchViewPage fPage; public RemoveSelectedMatchesAction(AbstractTextSearchViewPage page) { fPage= page; diff --git a/bundles/org.eclipse.search/newsearch/org/eclipse/search2/internal/ui/basic/views/SetLayoutAction.java b/bundles/org.eclipse.search/newsearch/org/eclipse/search2/internal/ui/basic/views/SetLayoutAction.java index 3e8e0fbea87..c977c1430e3 100644 --- a/bundles/org.eclipse.search/newsearch/org/eclipse/search2/internal/ui/basic/views/SetLayoutAction.java +++ b/bundles/org.eclipse.search/newsearch/org/eclipse/search2/internal/ui/basic/views/SetLayoutAction.java @@ -20,8 +20,8 @@ public class SetLayoutAction extends Action { - private AbstractTextSearchViewPage fPage; - private int fLayout; + private final AbstractTextSearchViewPage fPage; + private final int fLayout; public SetLayoutAction(AbstractTextSearchViewPage page, String label, String tooltip, int layout) { super(label, IAction.AS_RADIO_BUTTON); diff --git a/bundles/org.eclipse.search/newsearch/org/eclipse/search2/internal/ui/basic/views/ShowNextResultAction.java b/bundles/org.eclipse.search/newsearch/org/eclipse/search2/internal/ui/basic/views/ShowNextResultAction.java index 92b22a19222..8a18ca298f4 100644 --- a/bundles/org.eclipse.search/newsearch/org/eclipse/search2/internal/ui/basic/views/ShowNextResultAction.java +++ b/bundles/org.eclipse.search/newsearch/org/eclipse/search2/internal/ui/basic/views/ShowNextResultAction.java @@ -22,7 +22,7 @@ public class ShowNextResultAction extends Action { - private AbstractTextSearchViewPage fPage; + private final AbstractTextSearchViewPage fPage; public ShowNextResultAction(AbstractTextSearchViewPage page) { super(SearchMessages.ShowNextResultAction_label); diff --git a/bundles/org.eclipse.search/newsearch/org/eclipse/search2/internal/ui/basic/views/ShowPreviousResultAction.java b/bundles/org.eclipse.search/newsearch/org/eclipse/search2/internal/ui/basic/views/ShowPreviousResultAction.java index 16cbb433b27..73f25b81972 100644 --- a/bundles/org.eclipse.search/newsearch/org/eclipse/search2/internal/ui/basic/views/ShowPreviousResultAction.java +++ b/bundles/org.eclipse.search/newsearch/org/eclipse/search2/internal/ui/basic/views/ShowPreviousResultAction.java @@ -22,7 +22,7 @@ public class ShowPreviousResultAction extends Action { - private AbstractTextSearchViewPage fPage; + private final AbstractTextSearchViewPage fPage; public ShowPreviousResultAction(AbstractTextSearchViewPage page) { super(SearchMessages.ShowPreviousResultAction_label); diff --git a/bundles/org.eclipse.search/newsearch/org/eclipse/search2/internal/ui/basic/views/TableViewerNavigator.java b/bundles/org.eclipse.search/newsearch/org/eclipse/search2/internal/ui/basic/views/TableViewerNavigator.java index 8f5b0317bb0..eb84b6cb185 100644 --- a/bundles/org.eclipse.search/newsearch/org/eclipse/search2/internal/ui/basic/views/TableViewerNavigator.java +++ b/bundles/org.eclipse.search/newsearch/org/eclipse/search2/internal/ui/basic/views/TableViewerNavigator.java @@ -18,26 +18,29 @@ import org.eclipse.jface.viewers.TableViewer; public class TableViewerNavigator implements INavigate { - private TableViewer fViewer; + private final TableViewer fViewer; public TableViewerNavigator(TableViewer viewer) { fViewer = viewer; } @Override public void navigateNext(boolean forward) { int itemCount = fViewer.getTable().getItemCount(); - if (itemCount == 0) + if (itemCount == 0) { return; + } int[] selection = fViewer.getTable().getSelectionIndices(); int nextIndex = 0; if (selection.length > 0) { if (forward) { nextIndex = selection[selection.length - 1] + 1; - if (nextIndex >= itemCount) + if (nextIndex >= itemCount) { nextIndex = 0; + } } else { nextIndex = selection[0] - 1; - if (nextIndex < 0) + if (nextIndex < 0) { nextIndex = itemCount - 1; + } } } fViewer.getTable().setSelection(nextIndex); diff --git a/bundles/org.eclipse.search/newsearch/org/eclipse/search2/internal/ui/basic/views/TreeViewerNavigator.java b/bundles/org.eclipse.search/newsearch/org/eclipse/search2/internal/ui/basic/views/TreeViewerNavigator.java index 2bdbe93b9fb..30625d9b0cf 100644 --- a/bundles/org.eclipse.search/newsearch/org/eclipse/search2/internal/ui/basic/views/TreeViewerNavigator.java +++ b/bundles/org.eclipse.search/newsearch/org/eclipse/search2/internal/ui/basic/views/TreeViewerNavigator.java @@ -23,8 +23,8 @@ import org.eclipse.search.ui.text.AbstractTextSearchViewPage; public class TreeViewerNavigator implements INavigate { - private TreeViewer fViewer; - private AbstractTextSearchViewPage fPage; + private final TreeViewer fViewer; + private final AbstractTextSearchViewPage fPage; public TreeViewerNavigator(AbstractTextSearchViewPage page, TreeViewer viewer) { fViewer= viewer; @@ -34,17 +34,20 @@ public TreeViewerNavigator(AbstractTextSearchViewPage page, TreeViewer viewer) { @Override public void navigateNext(boolean forward) { TreeItem currentItem= getCurrentItem(forward); - if (currentItem == null) + if (currentItem == null) { return; + } TreeItem nextItem= null; if (forward) { nextItem= getNextItemForward(currentItem); - if (nextItem == null) + if (nextItem == null) { nextItem= getFirstItem(); + } } else { nextItem= getNextItemBackward(currentItem); - if (nextItem == null) + if (nextItem == null) { nextItem= getLastItem(); + } } if (nextItem != null) { internalSetSelection(nextItem); @@ -53,22 +56,26 @@ public void navigateNext(boolean forward) { private TreeItem getFirstItem() { TreeItem[] roots= fViewer.getTree().getItems(); - if (roots.length == 0) + if (roots.length == 0) { return null; + } for (TreeItem root : roots) { - if (hasMatches(root)) + if (hasMatches(root)) { return root; + } TreeItem firstChild= getFirstChildWithMatches(roots[0]); - if (firstChild != null) + if (firstChild != null) { return firstChild; + } } return null; } private TreeItem getLastItem() { TreeItem[] roots= fViewer.getTree().getItems(); - if (roots.length == 0) + if (roots.length == 0) { return null; + } return getLastChildWithMatches(roots[roots.length-1]); } @@ -77,16 +84,19 @@ private TreeItem getNextItemBackward(TreeItem currentItem) { TreeItem previousSibling= getNextSibling(currentItem, false); if (previousSibling != null) { TreeItem lastChild= getLastChildWithMatches(previousSibling); - if (lastChild != null) + if (lastChild != null) { return lastChild; - if (hasMatches(previousSibling)) + } + if (hasMatches(previousSibling)) { return previousSibling; + } return null; } TreeItem parent= currentItem.getParentItem(); if (parent != null) { - if (hasMatches(parent)) + if (hasMatches(parent)) { return parent; + } return getNextItemBackward(parent); } return null; @@ -94,30 +104,35 @@ private TreeItem getNextItemBackward(TreeItem currentItem) { private TreeItem getLastChildWithMatches(TreeItem currentItem) { TreeItem[] children= getChildren(currentItem); - if (children.length == 0) + if (children.length == 0) { return currentItem; + } TreeItem recursiveChild= getLastChildWithMatches(children[children.length-1]); - if (recursiveChild == null) + if (recursiveChild == null) { return children[children.length-1]; + } return recursiveChild; } private TreeItem getNextItemForward(TreeItem currentItem) { TreeItem child= getFirstChildWithMatches(currentItem); - if (child != null) + if (child != null) { return child; + } TreeItem nextSibling= getNextSibling(currentItem, true); if (nextSibling != null) { - if (hasMatches(nextSibling)) + if (hasMatches(nextSibling)) { return nextSibling; + } return getFirstChildWithMatches(nextSibling); } TreeItem parent= currentItem.getParentItem(); while (parent != null) { nextSibling= getNextSibling(parent, true); if (nextSibling != null) { - if (hasMatches(nextSibling)) + if (hasMatches(nextSibling)) { return nextSibling; + } return getFirstChildWithMatches(nextSibling); } parent= parent.getParentItem(); @@ -127,12 +142,14 @@ private TreeItem getNextItemForward(TreeItem currentItem) { private TreeItem getFirstChildWithMatches(TreeItem item) { TreeItem[] children= getChildren(item); - if (children.length == 0) + if (children.length == 0) { return null; + } TreeItem child= children[0]; - if (hasMatches(child)) + if (hasMatches(child)) { return child; + } return getFirstChildWithMatches(child); } @@ -143,8 +160,9 @@ private TreeItem[] getChildren(TreeItem item) { private TreeItem getNextSibling(TreeItem currentItem, boolean forward) { TreeItem[] siblings= getSiblings(currentItem); - if (siblings.length < 2) + if (siblings.length < 2) { return null; + } int index= -1; for (int i= 0; i 0; } diff --git a/bundles/org.eclipse.search/newsearch/org/eclipse/search2/internal/ui/text/AnnotationHighlighter.java b/bundles/org.eclipse.search/newsearch/org/eclipse/search2/internal/ui/text/AnnotationHighlighter.java index e05258c6687..d596e5f7d2d 100644 --- a/bundles/org.eclipse.search/newsearch/org/eclipse/search2/internal/ui/text/AnnotationHighlighter.java +++ b/bundles/org.eclipse.search/newsearch/org/eclipse/search2/internal/ui/text/AnnotationHighlighter.java @@ -42,9 +42,9 @@ public class AnnotationHighlighter extends Highlighter { - private IAnnotationModel fModel; - private IDocument fDocument; - private Map fMatchesToAnnotations; + private final IAnnotationModel fModel; + private final IDocument fDocument; + private final Map fMatchesToAnnotations; public AnnotationHighlighter(IAnnotationModel model, IDocument document) { fModel= model; @@ -75,11 +75,12 @@ public void addHighlights(Match[] matches) { private Position createPosition(Match match) { Position position= InternalSearchUI.getInstance().getPositionTracker().getCurrentPosition(match); - if (position == null) + if (position == null) { position= new Position(match.getOffset(), match.getLength()); - else + } else { // need to clone position, can't have it twice in a document. // need to clone position, can't have it twice in a document. position= new Position(position.getOffset(), position.getLength()); + } if (match.getBaseUnit() == Match.UNIT_LINE) { if (fDocument != null) { try { @@ -116,8 +117,7 @@ public void removeAll() { } private void addAnnotations(Map annotationToPositionMap) { - if (fModel instanceof IAnnotationModelExtension) { - IAnnotationModelExtension ame= (IAnnotationModelExtension) fModel; + if (fModel instanceof IAnnotationModelExtension ame) { ame.replaceAnnotations(new Annotation[0], annotationToPositionMap); } else { Set> entrySet = annotationToPositionMap.entrySet(); @@ -135,8 +135,7 @@ private void addAnnotations(Map annotationToPositionMap) { * @see Annotation */ private void removeAnnotations(Collection annotations) { - if (fModel instanceof IAnnotationModelExtension) { - IAnnotationModelExtension ame= (IAnnotationModelExtension) fModel; + if (fModel instanceof IAnnotationModelExtension ame) { Annotation[] annotationArray= new Annotation[annotations.size()]; ame.replaceAnnotations(annotations.toArray(annotationArray), Collections.emptyMap()); } else { @@ -148,10 +147,10 @@ private void removeAnnotations(Collection annotations) { @Override protected void handleContentReplaced(IFileBuffer buffer) { - if (!(buffer instanceof ITextFileBuffer)) + if (!(buffer instanceof ITextFileBuffer textBuffer)) { return; + } - ITextFileBuffer textBuffer= (ITextFileBuffer) buffer; if (fDocument != null && fDocument.equals(textBuffer.getDocument())) { Set allMatches= fMatchesToAnnotations.keySet(); Match[] matchesCopy= allMatches.toArray(new Match[allMatches.size()]); diff --git a/bundles/org.eclipse.search/newsearch/org/eclipse/search2/internal/ui/text/AnnotationManagers.java b/bundles/org.eclipse.search/newsearch/org/eclipse/search2/internal/ui/text/AnnotationManagers.java index 9c52da827ee..d7c9c98ebd3 100644 --- a/bundles/org.eclipse.search/newsearch/org/eclipse/search2/internal/ui/text/AnnotationManagers.java +++ b/bundles/org.eclipse.search/newsearch/org/eclipse/search2/internal/ui/text/AnnotationManagers.java @@ -54,8 +54,9 @@ public void windowOpened(IWorkbenchWindow window) { private static void disposeAnnotationManager(IWorkbenchWindow window) { WindowAnnotationManager mgr = fgManagerMap.remove(window); - if (mgr != null) + if (mgr != null) { mgr.dispose(); + } } public static void addSearchResult(IWorkbenchWindow window, AbstractTextSearchResult newResult) { diff --git a/bundles/org.eclipse.search/newsearch/org/eclipse/search2/internal/ui/text/EditorAccessHighlighter.java b/bundles/org.eclipse.search/newsearch/org/eclipse/search2/internal/ui/text/EditorAccessHighlighter.java index 06e90816d96..62179afb4e7 100644 --- a/bundles/org.eclipse.search/newsearch/org/eclipse/search2/internal/ui/text/EditorAccessHighlighter.java +++ b/bundles/org.eclipse.search/newsearch/org/eclipse/search2/internal/ui/text/EditorAccessHighlighter.java @@ -42,8 +42,8 @@ public class EditorAccessHighlighter extends Highlighter { - private ISearchEditorAccess fEditorAcess; - private Map fMatchesToAnnotations; + private final ISearchEditorAccess fEditorAcess; + private final Map fMatchesToAnnotations; public EditorAccessHighlighter(ISearchEditorAccess editorAccess) { fEditorAcess= editorAccess; @@ -82,11 +82,12 @@ public void addHighlights(Match[] matches) { private Position createPosition(Match match) throws BadLocationException { Position position= InternalSearchUI.getInstance().getPositionTracker().getCurrentPosition(match); - if (position == null) + if (position == null) { position= new Position(match.getOffset(), match.getLength()); - else + } else { // need to clone position, can't have it twice in a document. // need to clone position, can't have it twice in a document. position= new Position(position.getOffset(), position.getLength()); + } if (match.getBaseUnit() == Match.UNIT_LINE) { IDocument doc= fEditorAcess.getDocument(match); if (doc != null) { @@ -101,8 +102,9 @@ private Position createPosition(Match match) throws BadLocationException { private Map getMap(Map> mapsByAnnotationModel, Match match) { IAnnotationModel model= fEditorAcess.getAnnotationModel(match); - if (model == null) + if (model == null) { return null; + } HashMap map= mapsByAnnotationModel.get(model); if (map == null) { map= new HashMap<>(); @@ -113,8 +115,9 @@ private Map getMap(Map getSet(Map> setsByAnnotationModel, Match match) { IAnnotationModel model= fEditorAcess.getAnnotationModel(match); - if (model == null) + if (model == null) { return null; + } HashSet set= setsByAnnotationModel.get(model); if (set == null) { set= new HashSet<>(); @@ -130,8 +133,9 @@ public void removeHighlights(Match[] matches) { Annotation annotation= fMatchesToAnnotations.remove(match); if (annotation != null) { Set annotations= getSet(setsByAnnotationModel, match); - if (annotations != null) + if (annotations != null) { annotations.add(annotation); + } } } @@ -142,8 +146,7 @@ public void removeHighlights(Match[] matches) { } private void addAnnotations(IAnnotationModel model, Map annotationToPositionMap) { - if (model instanceof IAnnotationModelExtension) { - IAnnotationModelExtension ame= (IAnnotationModelExtension) model; + if (model instanceof IAnnotationModelExtension ame) { ame.replaceAnnotations(new Annotation[0], annotationToPositionMap); } else { for (Entry entry : annotationToPositionMap.entrySet()) { @@ -160,8 +163,7 @@ private void addAnnotations(IAnnotationModel model, Map an * @see Annotation */ private void removeAnnotations(IAnnotationModel model, Set annotations) { - if (model instanceof IAnnotationModelExtension) { - IAnnotationModelExtension ame= (IAnnotationModelExtension) model; + if (model instanceof IAnnotationModelExtension ame) { Annotation[] annotationArray= new Annotation[annotations.size()]; ame.replaceAnnotations(annotations.toArray(annotationArray), Collections.emptyMap()); } else { @@ -180,14 +182,16 @@ public void removeAll() { @Override protected void handleContentReplaced(IFileBuffer buffer) { - if (!(buffer instanceof ITextFileBuffer)) + if (!(buffer instanceof ITextFileBuffer)) { return; + } IDocument document= null; ITextFileBuffer textBuffer= (ITextFileBuffer) buffer; for (Match match : fMatchesToAnnotations.keySet()) { document= fEditorAcess.getDocument(match); - if (document != null) + if (document != null) { break; + } } if (document != null && document.equals(textBuffer.getDocument())) { diff --git a/bundles/org.eclipse.search/newsearch/org/eclipse/search2/internal/ui/text/EditorAnnotationManager.java b/bundles/org.eclipse.search/newsearch/org/eclipse/search2/internal/ui/text/EditorAnnotationManager.java index 1d1ae961de3..fb7f9f22d10 100644 --- a/bundles/org.eclipse.search/newsearch/org/eclipse/search2/internal/ui/text/EditorAnnotationManager.java +++ b/bundles/org.eclipse.search/newsearch/org/eclipse/search2/internal/ui/text/EditorAnnotationManager.java @@ -45,8 +45,8 @@ public class EditorAnnotationManager implements ISearchResultListener { - private ArrayList fResults; - private IEditorPart fEditor; + private final ArrayList fResults; + private final IEditorPart fEditor; private Highlighter fHighlighter; // initialized lazy public static final int HIGHLLIGHTER_ANY= 0; @@ -71,8 +71,9 @@ public static final void debugSetHighlighterType(int type) { void dispose() { removeAllAnnotations(); - if (fHighlighter != null) + if (fHighlighter != null) { fHighlighter.dispose(); + } for (AbstractTextSearchResult result : fResults) { result.removeListener(this); @@ -121,10 +122,8 @@ public synchronized void removeSearchResult(AbstractTextSearchResult result) { @Override public synchronized void searchResultChanged(SearchResultEvent e) { ISearchResult searchResult= e.getSearchResult(); - if (searchResult instanceof AbstractTextSearchResult) { - AbstractTextSearchResult result= (AbstractTextSearchResult) searchResult; - if (e instanceof MatchEvent) { - MatchEvent me= (MatchEvent) e; + if (searchResult instanceof AbstractTextSearchResult result) { + if (e instanceof MatchEvent me) { Match[] matchesInEditor= getMatchesInEditor(me.getMatches(), result); if (matchesInEditor != null) { if (me.getKind() == MatchEvent.ADDED) { @@ -172,8 +171,9 @@ private Match[] getMatchesInEditor(Match[] matches, AbstractTextSearchResult res } private void removeAllAnnotations() { - if (fHighlighter != null) + if (fHighlighter != null) { fHighlighter.removeAll(); + } } private Highlighter createHighlighter() { @@ -182,16 +182,19 @@ private Highlighter createHighlighter() { return debugCreateHighlighter(editor); } ISearchEditorAccess access= editor.getAdapter(ISearchEditorAccess.class); - if (access != null) + if (access != null) { return new EditorAccessHighlighter(access); + } IAnnotationModel model= getAnnotationModel(editor); - if (model != null) + if (model != null) { return new AnnotationHighlighter(model, getDocument(editor)); + } IEditorInput input= editor.getEditorInput(); if (input instanceof IFileEditorInput) { IFile file= ((IFileEditorInput)input).getFile(); - if (file != null) + if (file != null) { return new MarkerHighlighter(file); + } } return new Highlighter(); // does nothing } @@ -199,31 +202,36 @@ private Highlighter createHighlighter() { private static Highlighter debugCreateHighlighter(IEditorPart editor) { if (fgHighlighterType == HIGHLIGHTER_ANNOTATION) { IAnnotationModel model= getAnnotationModel(editor); - if (model != null) + if (model != null) { return new AnnotationHighlighter(model, getDocument(editor)); + } } else if (fgHighlighterType == HIGHLIGHTER_MARKER) { IEditorInput input= editor.getEditorInput(); if (input instanceof IFileEditorInput) { IFile file= ((IFileEditorInput)input).getFile(); - if (file != null) + if (file != null) { return new MarkerHighlighter(file); + } } } else if (fgHighlighterType == HIGHLIGHTER_EDITOR_ACCESS) { ISearchEditorAccess access= editor.getAdapter(ISearchEditorAccess.class); - if (access != null) + if (access != null) { return new EditorAccessHighlighter(access); + } } return null; } private void addAnnotations(AbstractTextSearchResult result) { IEditorMatchAdapter matchAdapter= result.getEditorMatchAdapter(); - if (matchAdapter == null) + if (matchAdapter == null) { return; + } Match[] matches= matchAdapter.computeContainedMatches(result, fEditor); - if (matches == null || matches.length == 0) + if (matches == null || matches.length == 0) { return; + } addAnnotations(matches); } @@ -245,8 +253,9 @@ private void addAnnotations(Match[] matches) { } private void removeAnnotations(Match[] matches) { - if (fHighlighter != null) + if (fHighlighter != null) { fHighlighter.removeHighlights(matches); + } } private static IAnnotationModel getAnnotationModel(IWorkbenchPart part) { @@ -259,8 +268,9 @@ private static IAnnotationModel getAnnotationModel(IWorkbenchPart part) { } if (textEditor != null) { IDocumentProvider dp= textEditor.getDocumentProvider(); - if (dp != null) + if (dp != null) { model= dp.getAnnotationModel(textEditor.getEditorInput()); + } } } return model; @@ -276,8 +286,9 @@ private static IDocument getDocument(IWorkbenchPart part) { } if (textEditor != null) { IDocumentProvider dp= textEditor.getDocumentProvider(); - if (dp != null) + if (dp != null) { doc= dp.getDocument(textEditor.getEditorInput()); + } } } return doc; diff --git a/bundles/org.eclipse.search/newsearch/org/eclipse/search2/internal/ui/text/Highlighter.java b/bundles/org.eclipse.search/newsearch/org/eclipse/search2/internal/ui/text/Highlighter.java index f409feeb7f6..61c0f083d89 100644 --- a/bundles/org.eclipse.search/newsearch/org/eclipse/search2/internal/ui/text/Highlighter.java +++ b/bundles/org.eclipse.search/newsearch/org/eclipse/search2/internal/ui/text/Highlighter.java @@ -22,7 +22,7 @@ import org.eclipse.search.ui.text.Match; public class Highlighter { - private IFileBufferListener fBufferListener; + private final IFileBufferListener fBufferListener; public Highlighter() { fBufferListener= new IFileBufferListener() { diff --git a/bundles/org.eclipse.search/newsearch/org/eclipse/search2/internal/ui/text/MarkerHighlighter.java b/bundles/org.eclipse.search/newsearch/org/eclipse/search2/internal/ui/text/MarkerHighlighter.java index a69b95729d9..107c430fdb0 100644 --- a/bundles/org.eclipse.search/newsearch/org/eclipse/search2/internal/ui/text/MarkerHighlighter.java +++ b/bundles/org.eclipse.search/newsearch/org/eclipse/search2/internal/ui/text/MarkerHighlighter.java @@ -82,8 +82,9 @@ private void addHighlightsInternal(final Match[] matches, IProgressMonitor monit } IMarker marker; marker = createMarker(match); - if (marker != null) + if (marker != null) { fMatchesToAnnotations.put(match, marker); + } } }, fFile, IWorkspace.AVOID_UPDATE, null); } catch (CoreException e) { @@ -95,8 +96,9 @@ private void addHighlightsInternal(final Match[] matches, IProgressMonitor monit private IMarker createMarker(Match match) throws CoreException { Position position= InternalSearchUI.getInstance().getPositionTracker().getCurrentPosition(match); if (position == null) { - if (match.getOffset() < 0 || match.getLength() < 0) + if (match.getOffset() < 0 || match.getLength() < 0) { return null; + } position= new Position(match.getOffset(), match.getLength()); } else { // need to clone position, can't have it twice in a document. @@ -171,8 +173,9 @@ private void removeAllInternal() { @Override protected void handleContentReplaced(IFileBuffer buffer) { - if (!buffer.getLocation().equals(fFile.getFullPath())) + if (!buffer.getLocation().equals(fFile.getFullPath())) { return; + } if (fContentReplacedJob == null) { fContentReplacedJob = new MarkerHighlighterWorkspaceJob("Updating search highlights", fFile) { //$NON-NLS-1$ @Override diff --git a/bundles/org.eclipse.search/newsearch/org/eclipse/search2/internal/ui/text/PositionTracker.java b/bundles/org.eclipse.search/newsearch/org/eclipse/search2/internal/ui/text/PositionTracker.java index 05ecf2354a2..9b49b64e4dc 100644 --- a/bundles/org.eclipse.search/newsearch/org/eclipse/search2/internal/ui/text/PositionTracker.java +++ b/bundles/org.eclipse.search/newsearch/org/eclipse/search2/internal/ui/text/PositionTracker.java @@ -50,9 +50,9 @@ public class PositionTracker implements IQueryListener, ISearchResultListener, IFileBufferListener { - private Map fMatchesToPositions= new HashMap<>(); - private Map fMatchesToSearchResults= new HashMap<>(); - private Map> fFileBuffersToMatches= new HashMap<>(); + private final Map fMatchesToPositions= new HashMap<>(); + private final Map fMatchesToSearchResults= new HashMap<>(); + private final Map> fFileBuffersToMatches= new HashMap<>(); private interface IFileBufferMatchOperation { void run(ITextFileBuffer buffer, Match match); @@ -83,8 +83,7 @@ public void queryRemoved(ISearchQuery query) { // tracking matches --------------------------------------------------------------------- @Override public void searchResultChanged(SearchResultEvent e) { - if (e instanceof MatchEvent) { - MatchEvent evt= (MatchEvent)e; + if (e instanceof MatchEvent evt) { Match[] matches = evt.getMatches(); int kind = evt.getKind(); AbstractTextSearchResult result = (AbstractTextSearchResult) e.getSearchResult(); @@ -94,8 +93,7 @@ public void searchResultChanged(SearchResultEvent e) { updateMatch(match, fb, kind, result); } } - } else if (e instanceof RemoveAllEvent) { - RemoveAllEvent evt= (RemoveAllEvent)e; + } else if (e instanceof RemoveAllEvent evt) { ISearchResult result= evt.getSearchResult(); untrackAll((AbstractTextSearchResult)result); } @@ -135,8 +133,9 @@ private void untrackPosition(ITextFileBuffer fb, Match match) { private void trackPosition(AbstractTextSearchResult result, ITextFileBuffer fb, Match match) { int offset = match.getOffset(); int length = match.getLength(); - if (offset < 0 || length < 0) + if (offset < 0 || length < 0) { return; + } try { IDocument doc= fb.getDocument(); @@ -181,27 +180,32 @@ private void removeFileBufferMapping(ITextFileBuffer fb, Match match) { Set matches= fFileBuffersToMatches.get(fb); if (matches != null) { matches.remove(match); - if (matches.isEmpty()) + if (matches.isEmpty()) { fFileBuffersToMatches.remove(fb); + } } } private ITextFileBuffer getTrackedFileBuffer(AbstractTextSearchResult result, Object element) { IFileMatchAdapter adapter= result.getFileMatchAdapter(); - if (adapter == null) + if (adapter == null) { return null; + } IFile file= adapter.getFile(element); - if (file == null) + if (file == null) { return null; - if (!file.exists()) + } + if (!file.exists()) { return null; + } return FileBuffers.getTextFileBufferManager().getTextFileBuffer(file.getFullPath(), LocationKind.IFILE); } public Position getCurrentPosition(Match match) { Position pos= fMatchesToPositions.get(match); - if (pos == null) + if (pos == null) { return pos; + } AbstractTextSearchResult result= fMatchesToSearchResults.get(match); if (match.getBaseUnit() == Match.UNIT_LINE && result != null) { ITextFileBuffer fb= getTrackedFileBuffer(result, match.getElement()); @@ -238,22 +242,24 @@ public void dispose() { @Override public void bufferCreated(IFileBuffer buffer) { final int[] trackCount= new int[1]; - if (!(buffer instanceof ITextFileBuffer)) + if (!(buffer instanceof ITextFileBuffer)) { return; + } IPath location= buffer.getLocation(); - if (location == null) + if (location == null) { return; + } IFile file= FileBuffers.getWorkspaceFileAtLocation(location); - if (file == null) + if (file == null) { return; + } ISearchQuery[] queries= NewSearchUI.getQueries(); for (ISearchQuery query : queries) { ISearchResult result = query.getSearchResult(); - if (result instanceof AbstractTextSearchResult) { - AbstractTextSearchResult textResult = (AbstractTextSearchResult) result; + if (result instanceof AbstractTextSearchResult textResult) { IFileMatchAdapter adapter = textResult.getFileMatchAdapter(); if (adapter != null) { Match[] matches = adapter.computeContainedMatches(textResult, file); @@ -267,8 +273,9 @@ public void bufferCreated(IFileBuffer buffer) { } private void doForExistingMatchesIn(IFileBuffer buffer, IFileBufferMatchOperation operation) { - if (!(buffer instanceof ITextFileBuffer)) + if (!(buffer instanceof ITextFileBuffer)) { return; + } Set matches= fFileBuffersToMatches.get(buffer); if (matches != null) { Set matchSet= new HashSet<>(matches); @@ -311,8 +318,9 @@ public void stateChanging(IFileBuffer buffer) { @Override public void dirtyStateChanged(IFileBuffer buffer, boolean isDirty) { - if (isDirty) + if (isDirty) { return; + } final int[] trackCount= new int[1]; doForExistingMatchesIn(buffer, (textBuffer, match) -> { trackCount[0]++; diff --git a/bundles/org.eclipse.search/newsearch/org/eclipse/search2/internal/ui/text/WindowAnnotationManager.java b/bundles/org.eclipse.search/newsearch/org/eclipse/search2/internal/ui/text/WindowAnnotationManager.java index b012b490fd6..36cbdba8d2f 100644 --- a/bundles/org.eclipse.search/newsearch/org/eclipse/search2/internal/ui/text/WindowAnnotationManager.java +++ b/bundles/org.eclipse.search/newsearch/org/eclipse/search2/internal/ui/text/WindowAnnotationManager.java @@ -27,10 +27,10 @@ import org.eclipse.search.ui.text.AbstractTextSearchResult; public class WindowAnnotationManager { - private IWorkbenchWindow fWindow; + private final IWorkbenchWindow fWindow; private Map fAnnotationManagers; - private IPartListener2 fPartListener; - private ArrayList fSearchResults; + private final IPartListener2 fPartListener; + private final ArrayList fSearchResults; public WindowAnnotationManager(IWorkbenchWindow window) { fWindow = window; @@ -83,8 +83,9 @@ public void partInputChanged(IWorkbenchPartReference partRef) { } private void startHighlighting(IEditorPart editor) { - if (editor == null) + if (editor == null) { return; + } EditorAnnotationManager mgr= fAnnotationManagers.get(editor); if (mgr == null) { mgr= new EditorAnnotationManager(editor); @@ -94,8 +95,9 @@ private void startHighlighting(IEditorPart editor) { } private void updateHighlighting(IEditorPart editor) { - if (editor == null) + if (editor == null) { return; + } EditorAnnotationManager mgr= fAnnotationManagers.get(editor); if (mgr != null) { mgr.doEditorInputChanged(); @@ -117,11 +119,13 @@ private void initEditors() { } private void stopHighlighting(IEditorPart editor) { - if (editor == null) + if (editor == null) { return; + } EditorAnnotationManager mgr= fAnnotationManagers.remove(editor); - if (mgr != null) + if (mgr != null) { mgr.dispose(); + } } private IEditorPart getEditor(IWorkbenchPartReference partRef) { diff --git a/bundles/org.eclipse.search/newsearch/org/eclipse/search2/internal/ui/text2/FindInFileActionDelegate.java b/bundles/org.eclipse.search/newsearch/org/eclipse/search2/internal/ui/text2/FindInFileActionDelegate.java index 3dc26003001..84824d2b9e1 100644 --- a/bundles/org.eclipse.search/newsearch/org/eclipse/search2/internal/ui/text2/FindInFileActionDelegate.java +++ b/bundles/org.eclipse.search/newsearch/org/eclipse/search2/internal/ui/text2/FindInFileActionDelegate.java @@ -48,8 +48,7 @@ public void selectionChanged(IAction action, ISelection selection) { IWorkbenchPage page= getWorkbenchPage(); if (page != null) { IWorkbenchPart part= page.getActivePart(); - if (part instanceof IEditorPart) { - IEditorPart editor= (IEditorPart) part; + if (part instanceof IEditorPart editor) { if (editor.getEditorInput() instanceof IFileEditorInput) { fEditor= editor; } diff --git a/bundles/org.eclipse.search/newsearch/org/eclipse/search2/internal/ui/text2/FindInProjectActionDelegate.java b/bundles/org.eclipse.search/newsearch/org/eclipse/search2/internal/ui/text2/FindInProjectActionDelegate.java index ecac467743a..49e5a7e2e60 100644 --- a/bundles/org.eclipse.search/newsearch/org/eclipse/search2/internal/ui/text2/FindInProjectActionDelegate.java +++ b/bundles/org.eclipse.search/newsearch/org/eclipse/search2/internal/ui/text2/FindInProjectActionDelegate.java @@ -47,8 +47,7 @@ public void selectionChanged(IAction action, ISelection selection) { IWorkbenchPage page= getWorkbenchPage(); if (page != null) { IWorkbenchPart part= page.getActivePart(); - if (part instanceof IEditorPart) { - IEditorPart editor= (IEditorPart) part; + if (part instanceof IEditorPart editor) { if (editor.getEditorInput() instanceof IFileEditorInput) { fEditor= editor; } diff --git a/bundles/org.eclipse.search/newsearch/org/eclipse/search2/internal/ui/text2/RetrieverAction.java b/bundles/org.eclipse.search/newsearch/org/eclipse/search2/internal/ui/text2/RetrieverAction.java index 42662b0045b..667744260b4 100644 --- a/bundles/org.eclipse.search/newsearch/org/eclipse/search2/internal/ui/text2/RetrieverAction.java +++ b/bundles/org.eclipse.search/newsearch/org/eclipse/search2/internal/ui/text2/RetrieverAction.java @@ -154,46 +154,38 @@ final protected String extractSearchTextFromSelection(ISelection sel) { final protected String extractSearchTextFromWidget(Control control) { String sel= null; - if (control instanceof Combo) { - Combo combo= (Combo) control; + if (control instanceof Combo combo) { sel= combo.getText(); Point selection= combo.getSelection(); sel= sel.substring(selection.x, selection.y); } - if (control instanceof CCombo) { - CCombo combo= (CCombo) control; + if (control instanceof CCombo combo) { sel= combo.getText(); Point selection= combo.getSelection(); sel= sel.substring(selection.x, selection.y); } - else if (control instanceof Text) { - Text text= (Text) control; + else if (control instanceof Text text) { sel= text.getSelectionText(); } - else if (control instanceof FormText) { - FormText text= (FormText) control; + else if (control instanceof FormText text) { sel= text.getSelectionText(); } - else if (control instanceof StyledText) { - StyledText text= (StyledText) control; + else if (control instanceof StyledText text) { sel= text.getSelectionText(); } - else if (control instanceof Tree) { - Tree tree= (Tree) control; + else if (control instanceof Tree tree) { TreeItem[] s= tree.getSelection(); if (s.length > 0) { sel= s[0].getText(); } } - else if (control instanceof Table) { - Table tree= (Table) control; + else if (control instanceof Table tree) { TableItem[] s= tree.getSelection(); if (s.length > 0) { sel= s[0].getText(); } } - else if (control instanceof List) { - List list= (List) control; + else if (control instanceof List list) { String[] s= list.getSelection(); if (s.length > 0) { sel= s[0]; @@ -223,8 +215,7 @@ private ITextEditor getTextEditor(IEditorPart editor) { if (editor instanceof ITextEditor) { return (ITextEditor) editor; } else - if (editor instanceof FormEditor) { - FormEditor me= (FormEditor) editor; + if (editor instanceof FormEditor me) { editor= me.getActiveEditor(); if (editor instanceof ITextEditor) { return (ITextEditor) editor; @@ -317,8 +308,9 @@ protected String getSearchForString(IWorkbenchPage page) { } if (searchFor == null) { Control focus= page.getWorkbenchWindow().getShell().getDisplay().getFocusControl(); - if (focus != null) + if (focus != null) { searchFor= extractSearchTextFromWidget(focus); + } } } return searchFor == null ? "" : searchFor; //$NON-NLS-1$ diff --git a/bundles/org.eclipse.search/search/org/eclipse/search/internal/ui/CopyToClipboardAction.java b/bundles/org.eclipse.search/search/org/eclipse/search/internal/ui/CopyToClipboardAction.java index 72c2e2055c6..8fadd52020d 100644 --- a/bundles/org.eclipse.search/search/org/eclipse/search/internal/ui/CopyToClipboardAction.java +++ b/bundles/org.eclipse.search/search/org/eclipse/search/internal/ui/CopyToClipboardAction.java @@ -78,14 +78,12 @@ public void runWithEvent(Event event) { Shell shell= SearchPlugin.getActiveWorkbenchShell(); if (shell != null) { String sel= null; - if (event.widget instanceof Combo) { - Combo combo= (Combo) event.widget; + if (event.widget instanceof Combo combo) { sel= combo.getText(); Point selection= combo.getSelection(); sel= sel.substring(selection.x, selection.y); } - else if (event.widget instanceof Text) { - Text text= (Text) event.widget; + else if (event.widget instanceof Text text) { sel= text.getSelectionText(); } if (sel != null) { @@ -105,8 +103,9 @@ else if (event.widget instanceof Text) { @Override public void run() { Shell shell= SearchPlugin.getActiveWorkbenchShell(); - if (shell == null || fViewer == null) + if (shell == null || fViewer == null) { return; + } IBaseLabelProvider labelProvider= fViewer.getLabelProvider(); String lineDelim= System.lineSeparator(); @@ -125,12 +124,13 @@ public void run() { } private static String getText(IBaseLabelProvider labelProvider, Object object) { - if (labelProvider instanceof ILabelProvider) + if (labelProvider instanceof ILabelProvider) { return ((ILabelProvider)labelProvider).getText(object); - else if (labelProvider instanceof DelegatingStyledCellLabelProvider) + } else if (labelProvider instanceof DelegatingStyledCellLabelProvider) { return ((DelegatingStyledCellLabelProvider)labelProvider).getStyledStringProvider().getStyledText(object).toString(); - else + } else { return object.toString(); + } } private void copyToClipboard(String text, Shell shell) { @@ -145,8 +145,9 @@ private void copyToClipboard(String text, Shell shell) { private Iterator getSelection() { ISelection s= fViewer.getSelection(); - if (s instanceof IStructuredSelection) + if (s instanceof IStructuredSelection) { return ((IStructuredSelection)s).iterator(); + } return Collections.emptyList().iterator(); } @@ -154,12 +155,14 @@ private void copyToClipboard(Clipboard clipboard, String str, Shell shell) { try { clipboard.setContents(new String[] { str }, new Transfer[] { TextTransfer.getInstance() }); } catch (SWTError ex) { - if (ex.code != DND.ERROR_CANNOT_SET_CLIPBOARD) + if (ex.code != DND.ERROR_CANNOT_SET_CLIPBOARD) { throw ex; + } String title= SearchMessages.CopyToClipboardAction_error_title; String message= SearchMessages.CopyToClipboardAction_error_message; - if (MessageDialog.openQuestion(shell, title, message)) + if (MessageDialog.openQuestion(shell, title, message)) { copyToClipboard(clipboard, str, shell); + } } } } diff --git a/bundles/org.eclipse.search/search/org/eclipse/search/internal/ui/OpenSearchDialogAction.java b/bundles/org.eclipse.search/search/org/eclipse/search/internal/ui/OpenSearchDialogAction.java index 2b8a9e34a37..e00f7b60f82 100644 --- a/bundles/org.eclipse.search/search/org/eclipse/search/internal/ui/OpenSearchDialogAction.java +++ b/bundles/org.eclipse.search/search/org/eclipse/search/internal/ui/OpenSearchDialogAction.java @@ -66,8 +66,9 @@ public void selectionChanged(IAction action, ISelection selection) { } private IWorkbenchWindow getWorkbenchWindow() { - if (fWindow == null) + if (fWindow == null) { fWindow= SearchPlugin.getActiveWorkbenchWindow(); + } return fWindow; } diff --git a/bundles/org.eclipse.search/search/org/eclipse/search/internal/ui/ScopePart.java b/bundles/org.eclipse.search/search/org/eclipse/search/internal/ui/ScopePart.java index 58148f627dd..acbb41948c8 100644 --- a/bundles/org.eclipse.search/search/org/eclipse/search/internal/ui/ScopePart.java +++ b/bundles/org.eclipse.search/search/org/eclipse/search/internal/ui/ScopePart.java @@ -74,7 +74,7 @@ public class ScopePart { private static final String STORE_LRU_WORKING_SET_NAME= "lastUsedWorkingSetName"; //$NON-NLS-1$ private static final String STORE_LRU_WORKING_SET_NAMES= "lastUsedWorkingSetNames"; //$NON-NLS-1$ - private IDialogSettings fSettingsStore; + private final IDialogSettings fSettingsStore; private Group fPart; // Scope radio buttons @@ -85,20 +85,20 @@ public class ScopePart { private Button fUseOpenedEditors; private int fScope; - private boolean fCanSearchEnclosingProjects; - private boolean fCanSearchOpenedEditors; + private final boolean fCanSearchEnclosingProjects; + private final boolean fCanSearchOpenedEditors; private Text fWorkingSetText; private IWorkingSet[] fWorkingSets; // Reference to its search page container (can be null) - private SearchDialog fSearchDialog; + private final SearchDialog fSearchDialog; private boolean fActiveEditorCanProvideScopeSelection; /** * Returns a new scope part with workspace as initial scope. The part is not * yet created. - * + * * @param searchDialog * The parent container * @param searchEnclosingProjects @@ -125,7 +125,7 @@ private static int getStoredScope(IDialogSettings settingsStore, boolean canSear } catch (NumberFormatException ex) { scope= ISearchPageContainer.WORKSPACE_SCOPE; } - if (scope != ISearchPageContainer.WORKING_SET_SCOPE + if (scope != ISearchPageContainer.WORKING_SET_SCOPE && scope != ISearchPageContainer.SELECTION_SCOPE && scope != ISearchPageContainer.SELECTED_PROJECTS_SCOPE && scope != ISearchPageContainer.OPENED_EDITORS_SCOPE @@ -185,8 +185,9 @@ private IWorkingSet[] getStoredWorkingSets() { } public static List selectedResourcesFromContainer(ISearchPageContainer container) { - if (container == null) + if (container == null) { return Collections.emptyList(); + } ISelection selection = container.getSelection(); List resources = new ArrayList<>(); if (!(selection instanceof IStructuredSelection) || selection.isEmpty()) { @@ -198,8 +199,7 @@ public static List selectedResourcesFromContainer(ISearchPageContaine Iterator iter = ((IStructuredSelection) selection).iterator(); while (iter.hasNext()) { Object curr = iter.next(); - if (curr instanceof IWorkingSet) { - IWorkingSet workingSet = (IWorkingSet) curr; + if (curr instanceof IWorkingSet workingSet) { if (workingSet.isAggregateWorkingSet() && workingSet.isEmpty()) { continue; } @@ -212,8 +212,9 @@ public static List selectedResourcesFromContainer(ISearchPageContaine } } else if (curr instanceof LineElement) { IResource resource = ((LineElement) curr).getParent(); - if (resource != null && resource.isAccessible()) + if (resource != null && resource.isAccessible()) { resources.add(resource); + } } else if (curr instanceof IAdaptable) { IResource resource = ((IAdaptable) curr).getAdapter(IResource.class); if (resource != null && resource.isAccessible()) { @@ -267,23 +268,27 @@ public static List selectedResourcesFromEditors() { private String getSelectedResurcesButtonText() { int size = selectedResourcesFromContainer(fSearchDialog).size(); if (size == 1) { - if (fSearchDialog.getActiveEditor() != null) + if (fSearchDialog.getActiveEditor() != null) { return SearchMessages.ScopePart_selectedResourcesScope_text_editor; + } return NLS.bind(SearchMessages.ScopePart_selectedResourcesScope_text_singular, fSearchDialog.getWorkbenchWindow().getActivePage().getActivePart().getTitle()); } - if (size > 1) + if (size > 1) { return NLS.bind(SearchMessages.ScopePart_selectedResourcesScope_text_plural, Integer.valueOf(size), fSearchDialog.getWorkbenchWindow().getActivePage().getActivePart().getTitle()); + } return SearchMessages.ScopePart_selectedResourcesScope_text; } private String getEnclosingProjectsButtonText() { int size = fSearchDialog.getEnclosingProjectNames().length; - if (size == 1) + if (size == 1) { return SearchMessages.ScopePart_enclosingProjectsScope_text_singular; - if (size > 1) + } + if (size > 1) { return NLS.bind(SearchMessages.ScopePart_enclosingProjectsScope_text_plural, Integer.valueOf(size)); + } return SearchMessages.ScopePart_enclosingProjectsScope_text; } @@ -364,8 +369,9 @@ private void updateSearchPageContainerActionPerformedEnablement() { * - if there is no working set selected */ public IWorkingSet[] getSelectedWorkingSets() { - if (getSelectedScope() == ISearchPageContainer.WORKING_SET_SCOPE) + if (getSelectedScope() == ISearchPageContainer.WORKING_SET_SCOPE) { return fWorkingSets; + } return null; } @@ -383,16 +389,19 @@ public void setSelectedWorkingSets(IWorkingSet[] workingSets) { for (IWorkingSet workingSet2 : workingSets) { String name= workingSet2.getName(); IWorkingSet workingSet= PlatformUI.getWorkbench().getWorkingSetManager().getWorkingSet(name); - if (workingSet != null) + if (workingSet != null) { existingWorkingSets.add(workingSet); + } } - if (!existingWorkingSets.isEmpty()) + if (!existingWorkingSets.isEmpty()) { fWorkingSets= existingWorkingSets.toArray(new IWorkingSet[existingWorkingSets.size()]); + } saveState(); - if (fWorkingSetText != null) + if (fWorkingSetText != null) { fWorkingSetText.setText(toString(fWorkingSets)); + } } /** @@ -450,8 +459,9 @@ public Composite createPart(Composite parent) { gd.horizontalSpan= 2; gd.horizontalIndent= 8; fUseProject.setLayoutData(gd); - if (!fCanSearchEnclosingProjects) + if (!fCanSearchEnclosingProjects) { fUseProject.setVisible(false); + } fUseOpenedEditors = new Button(fPart, SWT.RADIO); fUseOpenedEditors.setData(Integer.valueOf(ISearchPageContainer.OPENED_EDITORS_SCOPE)); @@ -509,8 +519,9 @@ public void widgetSelected(SelectionEvent e) { setSelectedScope(fScope); // Set initial working set - if (fWorkingSets != null) + if (fWorkingSets != null) { fWorkingSetText.setText(toString(fWorkingSets)); + } return fPart; } @@ -529,10 +540,10 @@ private boolean canSearchInSelection() { private void handleScopeChanged(SelectionEvent e) { Object source= e.getSource(); - if (source instanceof Button) { - Button button= (Button) source; - if (button.getSelection()) + if (source instanceof Button button) { + if (button.getSelection()) { setSelectedScope(((Integer) button.getData()).intValue()); + } } } @@ -540,8 +551,9 @@ private boolean handleChooseWorkingSet() { IWorkingSetManager workingSetManager= PlatformUI.getWorkbench().getWorkingSetManager(); IWorkingSetSelectionDialog dialog= workingSetManager.createWorkingSetSelectionDialog(fUseSelection.getShell(), true); - if (fWorkingSets != null) + if (fWorkingSets != null) { dialog.setSelection(fWorkingSets); + } if (dialog.open() == Window.OK) { Object[] result= dialog.getSelection(); if (result.length > 0) { @@ -550,8 +562,9 @@ private boolean handleChooseWorkingSet() { } fWorkingSetText.setText(""); //$NON-NLS-1$ fWorkingSets= null; - if (fScope == ISearchPageContainer.WORKING_SET_SCOPE) + if (fScope == ISearchPageContainer.WORKING_SET_SCOPE) { setSelectedScope(ISearchPageContainer.WORKSPACE_SCOPE); + } return false; } if (fWorkingSets != null) { @@ -559,8 +572,9 @@ private boolean handleChooseWorkingSet() { int i= 0; while (i < fWorkingSets.length) { IWorkingSet workingSet= fWorkingSets[i]; - if (!workingSet.isAggregateWorkingSet() && workingSetManager.getWorkingSet(workingSet.getName()) == null) + if (!workingSet.isAggregateWorkingSet() && workingSetManager.getWorkingSet(workingSet.getName()) == null) { break; + } i++; } if (i < fWorkingSets.length) { @@ -573,8 +587,9 @@ private boolean handleChooseWorkingSet() { } void setVisible(boolean state) { - if (state) + if (state) { fPart.layout(); + } fPart.setVisible(state); } @@ -585,9 +600,9 @@ public static String toString(IWorkingSet[] workingSets) { boolean firstFound= false; for (IWorkingSet workingSet : workingSets) { String workingSetName= workingSet.getLabel(); - if (firstFound) + if (firstFound) { result= Messages.format(SearchMessages.ScopePart_workingSetConcatenation, new String[] { result, workingSetName }); - else { + } else { result= workingSetName; firstFound= true; } diff --git a/bundles/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchDialog.java b/bundles/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchDialog.java index 3d2b82912dd..3c2107f78dc 100644 --- a/bundles/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchDialog.java +++ b/bundles/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchDialog.java @@ -105,8 +105,9 @@ public class SearchDialog extends ExtendedDialogWindow private class TabFolderLayout extends Layout { @Override protected Point computeSize(Composite composite, int wHint, int hHint, boolean flushCache) { - if (wHint != SWT.DEFAULT && hHint != SWT.DEFAULT) + if (wHint != SWT.DEFAULT && hHint != SWT.DEFAULT) { return new Point(wHint, hHint); + } int x= 0; int y= 0; @@ -121,10 +122,12 @@ protected Point computeSize(Composite composite, int wHint, int hHint, boolean f x= Math.max(x, minSize.x); y= Math.max(y, minSize.y); - if (wHint != SWT.DEFAULT) + if (wHint != SWT.DEFAULT) { x= wHint; - if (hHint != SWT.DEFAULT) + } + if (hHint != SWT.DEFAULT) { y= hHint; + } return new Point(x, y); } @Override @@ -147,7 +150,7 @@ protected void layout(Composite composite, boolean flushCache) { private String fInitialPageId; private int fCurrentIndex; - private List fDescriptors; + private final List fDescriptors; private Point fMinSize; private ScopePart[] fScopeParts; private boolean fLastEnableState; @@ -206,8 +209,7 @@ public static String[] evaluateEnclosingProject(ISelection selection, IEditorPar HashSet res= new HashSet<>(); for (Iterator iter= ((IStructuredSelection) selection).iterator(); iter.hasNext();) { Object curr= iter.next(); - if (curr instanceof IWorkingSet) { - IWorkingSet workingSet= (IWorkingSet) curr; + if (curr instanceof IWorkingSet workingSet) { if (workingSet.isAggregateWorkingSet() && workingSet.isEmpty()) { IProject[] projects= ResourcesPlugin.getWorkspace().getRoot().getProjects(); for (IProject proj : projects) { @@ -271,16 +273,19 @@ public ISelection getSelection() { public IEditorPart getActiveEditor() { IWorkbenchPage activePage= fWorkbenchWindow.getActivePage(); - if (activePage == null) + if (activePage == null) { return null; + } IWorkbenchPart activePart= activePage.getActivePart(); - if (activePart == null) + if (activePart == null) { return null; + } IEditorPart activeEditor= activePage.getActiveEditor(); - if (activeEditor == activePart ) + if (activeEditor == activePart ) { return activeEditor; + } return null; } @@ -306,19 +311,22 @@ private void handleCustomizePressed() { ILabelProvider labelProvider= new LabelProvider() { @Override public String getText(Object element) { - if (element instanceof SearchPageDescriptor) + if (element instanceof SearchPageDescriptor) { return LegacyActionTools.removeMnemonics(((SearchPageDescriptor)element).getLabel()); + } return null; } @Override public Image getImage(Object element) { if (element instanceof SearchPageDescriptor) { ImageDescriptor imageDesc= ((SearchPageDescriptor)element).getImage(); - if (imageDesc == null) + if (imageDesc == null) { return null; + } Image image= imageDesc.createImage(); - if (image != null) + if (image != null) { createdImages.add(image); + } return image; } return null; @@ -365,8 +373,9 @@ public void widgetSelected(SelectionEvent e) { private List filterByActivities(List input) { ArrayList filteredList= new ArrayList<>(input.size()); for (SearchPageDescriptor descriptor : input) { - if (!WorkbenchActivityHelper.filterItem(descriptor)) + if (!WorkbenchActivityHelper.filterItem(descriptor)) { filteredList.add(descriptor); + } } return filteredList; @@ -376,8 +385,9 @@ private void destroyImages(List images) { Iterator iter= images.iterator(); while (iter.hasNext()) { Image image= iter.next(); - if (image != null && !image.isDisposed()) + if (image != null && !image.isDisposed()) { image.dispose(); + } } } @@ -411,20 +421,23 @@ protected Control createPageArea(Composite parent) { for (int i= 0; i < numPages; i++) { SearchPageDescriptor descriptor= getDescriptorAt(i); - if (WorkbenchActivityHelper.filterItem(descriptor)) + if (WorkbenchActivityHelper.filterItem(descriptor)) { continue; + } final CTabItem item = new CTabItem(folder, SWT.NONE); item.setData("descriptor", descriptor); //$NON-NLS-1$ item.setText(descriptor.getLabel()); item.addDisposeListener(e -> { item.setData("descriptor", null); //$NON-NLS-1$ - if (item.getImage() != null) + if (item.getImage() != null) { item.getImage().dispose(); + } }); ImageDescriptor imageDesc= descriptor.getImage(); - if (imageDesc != null) + if (imageDesc != null) { item.setImage(imageDesc.createImage()); + } if (i == fCurrentIndex) { Control pageControl= createPageControl(folder, descriptor); @@ -514,18 +527,21 @@ private SearchPageDescriptor getDescriptorAt(int index) { } private Point getMinSize() { - if (fMinSize != null) + if (fMinSize != null) { return fMinSize; + } int x= 0; int y= 0; int length= fDescriptors.size(); for (int i= 0; i < length; i++) { Point size= getDescriptorAt(i).getPreferredSize(); - if (size.x != SWT.DEFAULT) + if (size.x != SWT.DEFAULT) { x= Math.max(x, size.x); - if (size.y != SWT.DEFAULT) + } + if (size.y != SWT.DEFAULT) { y= Math.max(y, size.y); + } } fMinSize= new Point(x, y); @@ -562,8 +578,9 @@ private void turnToPage(SelectionEvent event) { if (fCurrentPage != null) { fCurrentPage.setVisible(true); Control pageControl= fCurrentPage.getControl(); - if (pageControl instanceof Composite) + if (pageControl instanceof Composite) { ((Composite)pageControl).layout(false, true); + } } fReplaceButton.setVisible(fCurrentPage instanceof IReplacePage); notifyPageChanged(); @@ -572,19 +589,22 @@ private void turnToPage(SelectionEvent event) { private int getPreferredPageIndex() { Object element= null; ISelection selection= getSelection(); - if (selection instanceof IStructuredSelection) + if (selection instanceof IStructuredSelection) { element= ((IStructuredSelection) selection).getFirstElement(); + } - if (element == null) + if (element == null) { element= getActiveEditorInput(); + } int result= 0; int level= ISearchPageScoreComputer.LOWEST; int size= fDescriptors.size(); for (int i= 0; i < size; i++) { SearchPageDescriptor descriptor= fDescriptors.get(i); - if (fInitialPageId != null && fInitialPageId.equals(descriptor.getId())) + if (fInitialPageId != null && fInitialPageId.equals(descriptor.getId())) { return i; + } int newLevel= descriptor.computeScore(element); if (newLevel > level) { @@ -608,9 +628,10 @@ public IRunnableContext getRunnableContext() { */ @Override public int getSelectedScope() { - if (fScopeParts[fCurrentIndex] == null) + if (fScopeParts[fCurrentIndex] == null) { // safe code - should not happen return ISearchPageContainer.WORKSPACE_SCOPE; + } return fScopeParts[fCurrentIndex].getSelectedScope(); } @@ -620,9 +641,10 @@ public int getSelectedScope() { */ @Override public IWorkingSet[] getSelectedWorkingSets() { - if (fScopeParts[fCurrentIndex] == null) + if (fScopeParts[fCurrentIndex] == null) { // safe code - should not happen return null; + } return fScopeParts[fCurrentIndex].getSelectedWorkingSets(); } @@ -645,8 +667,9 @@ public String[] getSelectedProjectNames() { */ @Override public void setSelectedScope(int scope) { - if (fScopeParts[fCurrentIndex] != null) + if (fScopeParts[fCurrentIndex] != null) { fScopeParts[fCurrentIndex].setSelectedScope(scope); + } } /* @@ -655,23 +678,26 @@ public void setSelectedScope(int scope) { */ @Override public void setActiveEditorCanProvideScopeSelection(boolean state) { - if (fScopeParts[fCurrentIndex] != null) + if (fScopeParts[fCurrentIndex] != null) { fScopeParts[fCurrentIndex].setActiveEditorCanProvideScopeSelection(state); + } } @Override public IEditorInput getActiveEditorInput() { IEditorPart editor= getActiveEditor(); - if (editor == null) + if (editor == null) { return null; + } // Handle multi-page editors if (editor instanceof MultiPageEditorPart) { Object page= ((MultiPageEditorPart)editor).getSelectedPage(); - if (page instanceof IEditorPart) + if (page instanceof IEditorPart) { editor= (IEditorPart)page; - else + } else { return null; + } } return editor.getEditorInput(); @@ -690,8 +716,9 @@ public boolean hasValidScope() { */ @Override public void setSelectedWorkingSets(IWorkingSet[] workingSets) { - if (fScopeParts[fCurrentIndex] != null) + if (fScopeParts[fCurrentIndex] != null) { fScopeParts[fCurrentIndex].setSelectedWorkingSets(workingSets); + } } /* @@ -782,15 +809,18 @@ public void handleException(Throwable ex) { } private void resizeDialogIfNeeded(Point oldSize, Point newSize) { - if (oldSize == null || newSize == null) + if (oldSize == null || newSize == null) { return; + } Shell shell= getShell(); Point shellSize= shell.getSize(); if (mustResize(oldSize, newSize)) { - if (newSize.x > oldSize.x) + if (newSize.x > oldSize.x) { shellSize.x+= (newSize.x-oldSize.x); - if (newSize.y > oldSize.y) + } + if (newSize.y > oldSize.y) { shellSize.y+= (newSize.y-oldSize.y); + } shell.setSize(shellSize); shell.layout(true); } diff --git a/bundles/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchPageDescriptor.java b/bundles/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchPageDescriptor.java index 8bc61bf9397..e341bab1f77 100644 --- a/bundles/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchPageDescriptor.java +++ b/bundles/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchPageDescriptor.java @@ -85,7 +85,7 @@ public ExtensionScorePair(String extension, int score) { } } - private IConfigurationElement fElement; + private final IConfigurationElement fElement; private List fExtensionScorePairs; private int fWildcardScore= ISearchPageScoreComputer.UNKNOWN; private ISearchPage fCreatedPage; @@ -141,8 +141,9 @@ public String getId() { */ public ImageDescriptor getImage() { String imageName= fElement.getAttribute(ICON_ATTRIBUTE); - if (imageName == null) + if (imageName == null) { return null; + } Bundle bundle = Platform.getBundle(getPluginId()); return SearchPluginImages.createImageDescriptor(bundle, IPath.fromOSString(imageName), true); } @@ -192,7 +193,7 @@ public boolean canSearchInProjects() { * returns false. * * This attribute is optional and defaults to false. - * + * * @return Returns if the page can handle searches in opened editors */ public boolean canSearchInOpenedEditors() { @@ -226,13 +227,14 @@ public Point getPreferredSize() { public int getTabPosition() { int position= Integer.MAX_VALUE / 2; String str= fElement.getAttribute(TAB_POSITION_ATTRIBUTE); - if (str != null) + if (str != null) { try { position= Integer.parseInt(str); } catch (NumberFormatException ex) { ExceptionHandler.log(ex, SearchMessages.Search_Error_createSearchPage_message); // position is Integer.MAX_VALUE; } + } return position; } @@ -252,8 +254,9 @@ public String getSearchViewHelpContextId() { static void setEnabled(Object[] enabledDescriptors) { fgEnabledPageIds= new ArrayList<>(5); for (Object enabledDescriptor : enabledDescriptors) { - if (enabledDescriptor instanceof SearchPageDescriptor) + if (enabledDescriptor instanceof SearchPageDescriptor) { fgEnabledPageIds.add(((SearchPageDescriptor)enabledDescriptor).getId()); + } } storeEnabledPageIds(); } @@ -263,29 +266,33 @@ private static List getEnabledPageIds() { List descriptors= SearchPlugin.getDefault().getSearchPageDescriptors(); String[] enabledPageIds= getDialogSettings().getArray(STORE_ENABLED_PAGE_IDS); - if (enabledPageIds == null) + if (enabledPageIds == null) { fgEnabledPageIds= new ArrayList<>(descriptors.size()); - else + } else { fgEnabledPageIds= new ArrayList<>(Arrays.asList(enabledPageIds)); + } List processedPageIds; String[] processedPageIdsArr= getDialogSettings().getArray(STORE_PROCESSED_PAGE_IDS); - if (processedPageIdsArr == null) + if (processedPageIdsArr == null) { processedPageIds= new ArrayList<>(descriptors.size()); - else + } else { processedPageIds= new ArrayList<>(Arrays.asList(processedPageIdsArr)); + } // Enable pages based on contribution Iterator iter= descriptors.iterator(); while (iter.hasNext()) { SearchPageDescriptor desc= iter.next(); - if (processedPageIds.contains(desc.getId())) + if (processedPageIds.contains(desc.getId())) { continue; + } processedPageIds.add(desc.getId()); - if (desc.isInitiallyEnabled()) + if (desc.isInitiallyEnabled()) { fgEnabledPageIds.add(desc.getId()); + } } getDialogSettings().put(STORE_PROCESSED_PAGE_IDS, processedPageIds.toArray(new String[processedPageIds.size()])); @@ -302,9 +309,10 @@ private static IDialogSettings getDialogSettings() { IDialogSettings settings = PlatformUI .getDialogSettingsProvider(FrameworkUtil.getBundle(SearchPageDescriptor.class)).getDialogSettings(); IDialogSettings section= settings.getSection(SECTION_ID); - if (section == null) + if (section == null) { // create new section section= settings.addNewSection(SECTION_ID); + } return section; } @@ -312,8 +320,9 @@ private static IDialogSettings getDialogSettings() { public int compareTo(SearchPageDescriptor o) { int myPos= getTabPosition(); int objsPos= o.getTabPosition(); - if (myPos == Integer.MAX_VALUE && objsPos == Integer.MAX_VALUE || myPos == objsPos) + if (myPos == Integer.MAX_VALUE && objsPos == Integer.MAX_VALUE || myPos == objsPos) { return getLabel().compareTo(o.getLabel()); + } return myPos - objsPos; } @@ -330,33 +339,39 @@ public int computeScore(Object element) { int score= ISearchPageScoreComputer.UNKNOWN; ISearchPageScoreComputer tester= ((IAdaptable)element).getAdapter(ISearchPageScoreComputer.class); - if (tester != null) + if (tester != null) { score= tester.computeScore(getId(), element); + } IResource resource= ((IAdaptable)element).getAdapter(IResource.class); if (resource != null && resource.getType() == IResource.FILE) { String extension= resource.getFileExtension(); - if (extension != null) + if (extension != null) { score= Math.max(score, getScoreForFileExtension(extension)); + } } - if (score != ISearchPageScoreComputer.UNKNOWN) + if (score != ISearchPageScoreComputer.UNKNOWN) { return score; + } } - if (fWildcardScore != ISearchPageScoreComputer.UNKNOWN) + if (fWildcardScore != ISearchPageScoreComputer.UNKNOWN) { return fWildcardScore; + } return ISearchPageScoreComputer.LOWEST; } private int getScoreForFileExtension(String extension) { - if (fExtensionScorePairs == null) + if (fExtensionScorePairs == null) { readExtensionScorePairs(); + } int size= fExtensionScorePairs.size(); for (int i= 0; i < size; i++) { ExtensionScorePair p= fExtensionScorePairs.get(i); - if (extension.equals(p.extension)) + if (extension.equals(p.extension)) { return p.score; + } } return ISearchPageScoreComputer.UNKNOWN; @@ -365,8 +380,9 @@ private int getScoreForFileExtension(String extension) { private void readExtensionScorePairs() { fExtensionScorePairs= new ArrayList<>(3); String content= fElement.getAttribute(EXTENSIONS_ATTRIBUTE); - if (content == null) + if (content == null) { return; + } StringTokenizer tokenizer= new StringTokenizer(content, ","); //$NON-NLS-1$ while (tokenizer.hasMoreElements()) { String token= tokenizer.nextToken().trim(); diff --git a/bundles/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchPlugin.java b/bundles/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchPlugin.java index a76ea833d78..8bf18660a44 100644 --- a/bundles/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchPlugin.java +++ b/bundles/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchPlugin.java @@ -129,8 +129,9 @@ private static class WindowRef { private static void setActiveWorkbenchWindow(WindowRef windowRef) { windowRef.window= null; Display display= Display.getCurrent(); - if (display == null) + if (display == null) { return; + } Control shell= display.getActiveShell(); while (shell != null) { Object data= shell.getData(); @@ -155,8 +156,9 @@ private static void setActiveWorkbenchWindow(WindowRef windowRef) { */ public static Shell getActiveWorkbenchShell() { IWorkbenchWindow window= getActiveWorkbenchWindow(); - if (window != null) + if (window != null) { return window.getShell(); + } return null; } @@ -231,8 +233,9 @@ public List getEnabledSearchPageDescriptors(String pageId) List enabledDescriptors= new ArrayList<>(5); while (iter.hasNext()) { SearchPageDescriptor desc= iter.next(); - if (desc.isEnabled() || desc.getId().equals(pageId)) + if (desc.isEnabled() || desc.getId().equals(pageId)) { enabledDescriptors.add(desc); + } } return enabledDescriptors; } @@ -285,8 +288,9 @@ public TextSearchQueryProviderRegistry getTextSearchQueryProviderRegistry() { private List createSorterDescriptors(IConfigurationElement[] elements) { List result= new ArrayList<>(5); for (IConfigurationElement element : elements) { - if (SorterDescriptor.SORTER_TAG.equals(element.getName())) + if (SorterDescriptor.SORTER_TAG.equals(element.getName())) { result.add(new SorterDescriptor(element)); + } } return result; } @@ -325,8 +329,9 @@ public static String getID() { */ @Deprecated public static void createStandardGroups(IMenuManager menu) { - if (!menu.isEmpty()) + if (!menu.isEmpty()) { return; + } menu.add(new Separator(IContextMenuConstants.GROUP_NEW)); menu.add(new GroupMarker(IContextMenuConstants.GROUP_GOTO)); menu.add(new GroupMarker(IContextMenuConstants.GROUP_OPEN)); diff --git a/bundles/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchPreferencePage.java b/bundles/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchPreferencePage.java index 12520185c78..bc446172f2d 100644 --- a/bundles/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchPreferencePage.java +++ b/bundles/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchPreferencePage.java @@ -215,9 +215,9 @@ public static String getDefaultPerspectiveId() { handleDeletedPerspectives(); IPreferenceStore store= SearchPlugin.getDefault().getPreferenceStore(); String id= store.getString(DEFAULT_PERSPECTIVE); - if (id == null || id.isEmpty() || id.equals(NO_DEFAULT_PERSPECTIVE)) + if (id == null || id.isEmpty() || id.equals(NO_DEFAULT_PERSPECTIVE)) { return null; - else if (PlatformUI.getWorkbench().getPerspectiveRegistry().findPerspectiveWithId(id) == null) { + } else if (PlatformUI.getWorkbench().getPerspectiveRegistry().findPerspectiveWithId(id) == null) { store.putValue(DEFAULT_PERSPECTIVE, id); return null; } diff --git a/bundles/org.eclipse.search/search/org/eclipse/search/internal/ui/SorterDescriptor.java b/bundles/org.eclipse.search/search/org/eclipse/search/internal/ui/SorterDescriptor.java index 12bc41c1174..616276a3036 100644 --- a/bundles/org.eclipse.search/search/org/eclipse/search/internal/ui/SorterDescriptor.java +++ b/bundles/org.eclipse.search/search/org/eclipse/search/internal/ui/SorterDescriptor.java @@ -38,7 +38,7 @@ class SorterDescriptor { private final static String LABEL_ATTRIBUTE= "label"; //$NON-NLS-1$ private final static String TOOLTIP_ATTRIBUTE= "tooltip"; //$NON-NLS-1$ - private IConfigurationElement fElement; + private final IConfigurationElement fElement; /** * Creates a new sorter node with the given configuration element. @@ -81,8 +81,9 @@ public String getId() { */ public ImageDescriptor getImage() { String imageName= fElement.getAttribute(ICON_ATTRIBUTE); - if (imageName == null) + if (imageName == null) { return null; + } Bundle bundle = Platform.getBundle(fElement.getContributor().getName()); return SearchPluginImages.createImageDescriptor(bundle, IPath.fromOSString(imageName), true); } diff --git a/bundles/org.eclipse.search/search/org/eclipse/search/internal/ui/WorkingSetComparator.java b/bundles/org.eclipse.search/search/org/eclipse/search/internal/ui/WorkingSetComparator.java index b9b0b049043..2128eb6d86c 100644 --- a/bundles/org.eclipse.search/search/org/eclipse/search/internal/ui/WorkingSetComparator.java +++ b/bundles/org.eclipse.search/search/org/eclipse/search/internal/ui/WorkingSetComparator.java @@ -20,7 +20,7 @@ public class WorkingSetComparator implements Comparator { - private Collator fCollator= Collator.getInstance(); + private final Collator fCollator= Collator.getInstance(); @Override public int compare(IWorkingSet o1, IWorkingSet o2) { diff --git a/bundles/org.eclipse.search/search/org/eclipse/search/internal/ui/text/EditorOpener.java b/bundles/org.eclipse.search/search/org/eclipse/search/internal/ui/text/EditorOpener.java index 1474bad016b..33306db9c86 100644 --- a/bundles/org.eclipse.search/search/org/eclipse/search/internal/ui/text/EditorOpener.java +++ b/bundles/org.eclipse.search/search/org/eclipse/search/internal/ui/text/EditorOpener.java @@ -42,8 +42,9 @@ public class EditorOpener { private IEditorReference fReusedEditor; public IEditorPart open(IWorkbenchPage wbPage, IFile file, boolean activate) throws PartInitException { - if (NewSearchUI.reuseEditor()) + if (NewSearchUI.reuseEditor()) { return showWithReuse(file, wbPage, getEditorID(file), activate); + } return showWithoutReuse(file, wbPage, getEditorID(file), activate); } @@ -63,8 +64,7 @@ public IEditorPart openAndSelect(IWorkbenchPage wbPage, IFile file, int offset, editor= showWithoutReuse(file, wbPage, editorId, activate); } - if (editor instanceof ITextEditor) { - ITextEditor textEditor= (ITextEditor) editor; + if (editor instanceof ITextEditor textEditor) { textEditor.selectAndReveal(offset, length); } else if (editor != null) { showWithMarker(editor, file, offset, length); @@ -79,9 +79,10 @@ private IEditorPart showWithoutReuse(IFile file, IWorkbenchPage wbPage, String e private String getEditorID(IFile file) throws PartInitException { IEditorDescriptor desc = IDE.getEditorDescriptor(file, true, true); - if (desc == null) + if (desc == null) { return PlatformUI.getWorkbench().getEditorRegistry().findEditor(IEditorRegistry.SYSTEM_EXTERNAL_EDITOR_ID) .getId(); + } return desc.getId(); } @@ -139,12 +140,13 @@ private void showWithMarker(IEditorPart editor, IFile file, int offset, int leng } catch (CoreException e) { throw new PartInitException(SearchMessages.FileSearchPage_error_marker, e); } finally { - if (marker != null) + if (marker != null) { try { marker.delete(); } catch (CoreException e) { // ignore } + } } } diff --git a/bundles/org.eclipse.search/search/org/eclipse/search/internal/ui/text/FileLabelProvider.java b/bundles/org.eclipse.search/search/org/eclipse/search/internal/ui/text/FileLabelProvider.java index ac2e8644824..ab655c55ab8 100644 --- a/bundles/org.eclipse.search/search/org/eclipse/search/internal/ui/text/FileLabelProvider.java +++ b/bundles/org.eclipse.search/search/org/eclipse/search/internal/ui/text/FileLabelProvider.java @@ -80,13 +80,14 @@ public String getText(Object object) { @Override public StyledString getStyledText(Object element) { - if (element instanceof LineElement) + if (element instanceof LineElement) { return getLineElementLabel((LineElement) element); + } - if (!(element instanceof IResource)) + if (!(element instanceof IResource resource)) { return new StyledString(); + } - IResource resource= (IResource) element; if (!resource.exists()) { StyledString str = new StyledString(SearchMessages.FileLabelProvider_removed_resource_label); return getColoredLabelWithCounts(resource, str); @@ -213,12 +214,14 @@ private int evaluateLineStart(Match[] matches, String lineContent, int lineOffse private StyledString getColoredLabelWithCounts(Object element, StyledString coloredName) { AbstractTextSearchResult result= fPage.getInput(); - if (result == null) + if (result == null) { return coloredName; + } int matchCount= result.getMatchCount(element); - if (matchCount <= 1) + if (matchCount <= 1) { return coloredName; + } String countInfo= Messages.format(SearchMessages.FileLabelProvider_count_format, Integer.valueOf(matchCount)); coloredName.append(' ').append(countInfo, StyledString.COUNTER_STYLER); @@ -230,10 +233,10 @@ public Image getImage(Object element) { if (element instanceof LineElement) { return fLineMatchImage; } - if (!(element instanceof IResource)) + if (!(element instanceof IResource resource)) { return null; + } - IResource resource= (IResource)element; Image image= fLabelProvider.getImage(resource); return image; } diff --git a/bundles/org.eclipse.search/search/org/eclipse/search/internal/ui/text/FileMatch.java b/bundles/org.eclipse.search/search/org/eclipse/search/internal/ui/text/FileMatch.java index 41cff64c3d3..85a32e88230 100644 --- a/bundles/org.eclipse.search/search/org/eclipse/search/internal/ui/text/FileMatch.java +++ b/bundles/org.eclipse.search/search/org/eclipse/search/internal/ui/text/FileMatch.java @@ -25,7 +25,7 @@ import org.eclipse.search.ui.text.Match; public class FileMatch extends Match { - private LineElement fLineElement; + private final LineElement fLineElement; private Region fOriginalLocation; public FileMatch(IFile element) { diff --git a/bundles/org.eclipse.search/search/org/eclipse/search/internal/ui/text/FileSearchPage.java b/bundles/org.eclipse.search/search/org/eclipse/search/internal/ui/text/FileSearchPage.java index 0c7e04c2dd7..c894ae2581d 100644 --- a/bundles/org.eclipse.search/search/org/eclipse/search/internal/ui/text/FileSearchPage.java +++ b/bundles/org.eclipse.search/search/org/eclipse/search/internal/ui/text/FileSearchPage.java @@ -111,18 +111,18 @@ public int compare(Viewer viewer, Object e1, Object e2) { return cat1 - cat2; } - if (e1 instanceof LineElement && e2 instanceof LineElement) { - LineElement m1= (LineElement) e1; - LineElement m2= (LineElement) e2; + if (e1 instanceof LineElement m1 && e2 instanceof LineElement m2) { return m1.getOffset() - m2.getOffset(); } String name1= fLabelProvider.getText(e1); String name2= fLabelProvider.getText(e2); - if (name1 == null) + if (name1 == null) { name1 = "";//$NON-NLS-1$ - if (name2 == null) + } + if (name2 == null) { name2 = "";//$NON-NLS-1$ + } int result= getComparator().compare(name1, name2); return result; } @@ -136,8 +136,8 @@ public int compare(Viewer viewer, Object e1, Object e2) { private ActionGroup fActionGroup; private IFileSearchContentProvider fContentProvider; private int fCurrentSortOrder; - private SortAction fSortByNameAction; - private SortAction fSortByPathAction; + private final SortAction fSortByNameAction; + private final SortAction fSortByPathAction; private static final String[] SHOW_IN_TARGETS = new String[] { IPageLayout.ID_PROJECT_EXPLORER }; @@ -266,9 +266,7 @@ protected void handleOpen(OpenEvent event) { return; } Viewer viewer = event.getViewer(); - if (viewer instanceof TreeViewer) { - TreeViewer treeViewer = (TreeViewer) viewer; - + if (viewer instanceof TreeViewer treeViewer) { if (treeViewer.getExpandedState(firstElement)) { autoExpand(treeViewer, firstElement); } @@ -314,8 +312,9 @@ protected void fillContextMenu(IMenuManager mgr) { } private void addSortActions(IMenuManager mgr) { - if (getLayout() != FLAG_LAYOUT_FLAT) + if (getLayout() != FLAG_LAYOUT_FLAT) { return; + } MenuManager sortMenu= new MenuManager(SearchMessages.FileSearchPage_sort_by_label); sortMenu.add(fSortByNameAction); sortMenu.add(fSortByPathAction); @@ -347,14 +346,16 @@ public void dispose() { @Override protected void elementsChanged(Object[] objects) { - if (fContentProvider != null) + if (fContentProvider != null) { fContentProvider.elementsChanged(objects); + } } @Override protected void clear() { - if (fContentProvider != null) + if (fContentProvider != null) { fContentProvider.clear(); + } } public void setSortOrder(int sortOrder) { @@ -380,12 +381,14 @@ public void restoreState(IMemento memento) { } if (memento != null) { Integer value= memento.getInteger(KEY_SORTING); - if (value != null) + if (value != null) { fCurrentSortOrder= value.intValue(); + } value= memento.getInteger(KEY_LIMIT); - if (value != null) + if (value != null) { elementLimit= value.intValue(); + } } setElementLimit(Integer.valueOf(elementLimit)); } @@ -405,8 +408,9 @@ public T getAdapter(Class adapter) { if (adapter == IShowInSource.class) { ISelectionProvider selectionProvider= getSite().getSelectionProvider(); - if (selectionProvider == null) + if (selectionProvider == null) { return null; + } ISelection selection= selectionProvider.getSelection(); if (selection instanceof IStructuredSelection) { @@ -415,8 +419,9 @@ public T getAdapter(Class adapter) { Iterator iter= structuredSelection.iterator(); while (iter.hasNext()) { Object element= iter.next(); - if (element instanceof LineElement) + if (element instanceof LineElement) { element= ((LineElement)element).getParent(); + } newSelection.add(element); } @@ -522,8 +527,7 @@ private int getMatchCount(TableViewer viewer) { @Override public int getDisplayedMatchCount(Object element) { if (showLineMatches()) { - if (element instanceof LineElement) { - LineElement lineEntry= (LineElement) element; + if (element instanceof LineElement lineEntry) { IResource res = lineEntry.getParent(); if (super.getDisplayedMatchCount(res) > 0) { return lineEntry.getNumberOfMatches(getInput()); @@ -537,8 +541,7 @@ public int getDisplayedMatchCount(Object element) { @Override public Match[] getDisplayedMatches(Object element) { if (showLineMatches()) { - if (element instanceof LineElement) { - LineElement lineEntry= (LineElement) element; + if (element instanceof LineElement lineEntry) { IResource res = lineEntry.getParent(); if (super.getDisplayedMatchCount(res) > 0) { return lineEntry.getMatches(getInput()); diff --git a/bundles/org.eclipse.search/search/org/eclipse/search/internal/ui/text/FileSearchQuery.java b/bundles/org.eclipse.search/search/org/eclipse/search/internal/ui/text/FileSearchQuery.java index 27c49d413b1..16416f74bf5 100644 --- a/bundles/org.eclipse.search/search/org/eclipse/search/internal/ui/text/FileSearchQuery.java +++ b/bundles/org.eclipse.search/search/org/eclipse/search/internal/ui/text/FileSearchQuery.java @@ -73,8 +73,9 @@ public boolean canRunInParallel() { @Override public boolean acceptFile(IFile file) throws CoreException { - if (fIsLightweightAutoRefresh && !file.exists()) + if (fIsLightweightAutoRefresh && !file.exists()) { return false; + } if (fIsFileSearchOnly) { fResult.addMatch(new FileMatch(file)); @@ -201,7 +202,7 @@ private void flushMatches() { private final boolean fIsCaseSensitive; private final boolean fIsWholeWord; private FileSearchResult fResult; - private boolean fSearchInBinaries; + private final boolean fSearchInBinaries; public FileSearchQuery(String searchText, boolean isRegEx, boolean isCaseSensitive, FileTextSearchScope scope) { @@ -239,8 +240,9 @@ public IStatus run(final IProgressMonitor monitor) { private boolean isScopeAllFileTypes() { String[] fileNamePatterns= fScope.getFileNamePatterns(); - if (fileNamePatterns == null) + if (fileNamePatterns == null) { return true; + } for (String fileNamePattern : fileNamePatterns) { if ("*".equals(fileNamePattern)) { //$NON-NLS-1$ return true; diff --git a/bundles/org.eclipse.search/search/org/eclipse/search/internal/ui/text/FileSearchResult.java b/bundles/org.eclipse.search/search/org/eclipse/search/internal/ui/text/FileSearchResult.java index 0961aab0830..b20dabdbaf9 100644 --- a/bundles/org.eclipse.search/search/org/eclipse/search/internal/ui/text/FileSearchResult.java +++ b/bundles/org.eclipse.search/search/org/eclipse/search/internal/ui/text/FileSearchResult.java @@ -37,7 +37,7 @@ public class FileSearchResult extends AbstractTextSearchResult implements IEditorMatchAdapter, IFileMatchAdapter { private final Match[] EMPTY_ARR= new Match[0]; - private FileSearchQuery fQuery; + private final FileSearchQuery fQuery; public FileSearchResult(FileSearchQuery job) { fQuery= job; @@ -117,8 +117,9 @@ private static MatchFilter[] decodeFiltersString(String encodedString) { private static MatchFilter findMatchFilter(String id) { for (MatchFilter matchFilter : ALL_MATCH_FILTERS) { - if (matchFilter.getID().equals(id)) + if (matchFilter.getID().equals(id)) { return matchFilter; + } } return null; } @@ -130,16 +131,16 @@ public Match[] computeContainedMatches(AbstractTextSearchResult result, IFile fi @Override public IFile getFile(Object element) { - if (element instanceof IFile) + if (element instanceof IFile) { return (IFile)element; + } return null; } @Override public boolean isShownInEditor(Match match, IEditorPart editor) { IEditorInput ei= editor.getEditorInput(); - if (ei instanceof IFileEditorInput) { - IFileEditorInput fi= (IFileEditorInput) ei; + if (ei instanceof IFileEditorInput fi) { return match.getElement().equals(fi.getFile()); } return false; @@ -148,8 +149,7 @@ public boolean isShownInEditor(Match match, IEditorPart editor) { @Override public Match[] computeContainedMatches(AbstractTextSearchResult result, IEditorPart editor) { IEditorInput ei= editor.getEditorInput(); - if (ei instanceof IFileEditorInput) { - IFileEditorInput fi= (IFileEditorInput) ei; + if (ei instanceof IFileEditorInput fi) { return getMatches(fi.getFile()); } return EMPTY_ARR; diff --git a/bundles/org.eclipse.search/search/org/eclipse/search/internal/ui/text/FileTableContentProvider.java b/bundles/org.eclipse.search/search/org/eclipse/search/internal/ui/text/FileTableContentProvider.java index d00767127aa..7fa82cd49f5 100644 --- a/bundles/org.eclipse.search/search/org/eclipse/search/internal/ui/text/FileTableContentProvider.java +++ b/bundles/org.eclipse.search/search/org/eclipse/search/internal/ui/text/FileTableContentProvider.java @@ -27,7 +27,7 @@ public class FileTableContentProvider implements IStructuredContentProvider, IFi private final Object[] EMPTY_ARR= new Object[0]; - private FileSearchPage fPage; + private final FileSearchPage fPage; public FileTableContentProvider(FileSearchPage page) { fPage= page; @@ -53,8 +53,7 @@ public int getLeafCount(Object parentElement) { @Override public Object[] getElements(Object inputElement) { - if (inputElement instanceof FileSearchResult) { - FileSearchResult fileSearchResult = (FileSearchResult) inputElement; + if (inputElement instanceof FileSearchResult fileSearchResult) { int elementLimit= getElementLimit(); Object[] elements = fileSearchResult.getElements(); if (elementLimit != -1 && elements.length > elementLimit) { @@ -88,14 +87,16 @@ public void elementsChanged(Object[] updatedElements) { boolean tableLimited= elementLimit != -1; for (Object updatedElement : updatedElements) { if (fPage.getDisplayedMatchCount(updatedElement) > 0) { - if (viewer.contains(updatedElement)) + if (viewer.contains(updatedElement)) { viewer.update(updatedElement, null); - else { - if (!tableLimited || viewer.getTable().getItemCount() < elementLimit) + } else { + if (!tableLimited || viewer.getTable().getItemCount() < elementLimit) { viewer.add(updatedElement); + } } - } else + } else { viewer.remove(updatedElement); + } } } diff --git a/bundles/org.eclipse.search/search/org/eclipse/search/internal/ui/text/FileTreeContentProvider.java b/bundles/org.eclipse.search/search/org/eclipse/search/internal/ui/text/FileTreeContentProvider.java index 1dfa6cf15c8..dc9e000cd91 100644 --- a/bundles/org.eclipse.search/search/org/eclipse/search/internal/ui/text/FileTreeContentProvider.java +++ b/bundles/org.eclipse.search/search/org/eclipse/search/internal/ui/text/FileTreeContentProvider.java @@ -47,8 +47,8 @@ public class FileTreeContentProvider implements ITreeContentProvider, IFileSearc private final Object[] EMPTY_ARR= new Object[0]; private AbstractTextSearchResult fResult; - private FileSearchPage fPage; - private AbstractTreeViewer fTreeViewer; + private final FileSearchPage fPage; + private final AbstractTreeViewer fTreeViewer; private Map> fChildrenMap; FileTreeContentProvider(FileSearchPage page, AbstractTreeViewer viewer) { @@ -104,19 +104,22 @@ private void insert(Object child, boolean refreshViewer) { Object parent= getParent(child); while (parent != null) { if (insertChild(parent, child)) { - if (refreshViewer) + if (refreshViewer) { fTreeViewer.add(parent, child); + } } else { - if (refreshViewer) + if (refreshViewer) { fTreeViewer.update(parent, null); + } return; } child= parent; parent= getParent(child); } if (insertChild(fResult, child)) { - if (refreshViewer) + if (refreshViewer) { fTreeViewer.add(fResult, child); + } } } @@ -147,8 +150,9 @@ private void remove(Object element, boolean refreshViewer) { // precondition here: fResult.getMatchCount(child) <= 0 if (hasChildren(element)) { - if (refreshViewer) + if (refreshViewer) { fTreeViewer.refresh(element); + } } else { if (!hasMatches(element)) { fChildrenMap.remove(element); @@ -158,8 +162,9 @@ private void remove(Object element, boolean refreshViewer) { remove(parent, refreshViewer); } else { removeFromSiblings(element, fResult); - if (refreshViewer) + if (refreshViewer) { fTreeViewer.refresh(); + } } } else { if (refreshViewer) { @@ -170,8 +175,7 @@ private void remove(Object element, boolean refreshViewer) { } private boolean hasMatches(Object element) { - if (element instanceof LineElement) { - LineElement lineElement= (LineElement) element; + if (element instanceof LineElement lineElement) { IResource resource = lineElement.getParent(); if (hasMatches(resource)) { return lineElement.hasMatches(fResult); @@ -206,8 +210,9 @@ private void removeFromSiblings(Object element, Object parent) { @Override public Object[] getChildren(Object parentElement) { Set children= fChildrenMap.get(parentElement); - if (children == null) + if (children == null) { return EMPTY_ARR; + } int elementLimit = getElementLimit(); if (elementLimit != -1 && elementLimit < children.size()) { @@ -297,7 +302,7 @@ public synchronized void elementsChanged(Object[] updatedElements) { } try { for (Object updatedElement : updatedElements) { - if (!(updatedElement instanceof LineElement)) { + if (!(updatedElement instanceof LineElement lineElement)) { // change events to elements are reported in file search. // ask the page to determine if element is filtered. if (getMatchCount(updatedElement) > 0) { @@ -308,7 +313,6 @@ public synchronized void elementsChanged(Object[] updatedElements) { } else { // change events to line elements are reported in text // search - LineElement lineElement = (LineElement) updatedElement; boolean hasMatches = lineMatches.contains(lineElement); if (hasMatches) { if (singleElement && hasChild(lineElement.getParent(), lineElement)) { @@ -341,18 +345,17 @@ public void clear() { @Override public Object getParent(Object element) { - if (element instanceof IProject) + if (element instanceof IProject) { return null; - if (element instanceof IResource) { - IResource resource = (IResource) element; + } + if (element instanceof IResource resource) { return resource.getParent(); } if (element instanceof LineElement) { return ((LineElement) element).getParent(); } - if (element instanceof FileMatch) { - FileMatch match= (FileMatch) element; + if (element instanceof FileMatch match) { return match.getLineElement(); } return null; diff --git a/bundles/org.eclipse.search/search/org/eclipse/search/internal/ui/text/NavigatorDragAdapter.java b/bundles/org.eclipse.search/search/org/eclipse/search/internal/ui/text/NavigatorDragAdapter.java index 82ace029737..e400fb78a82 100644 --- a/bundles/org.eclipse.search/search/org/eclipse/search/internal/ui/text/NavigatorDragAdapter.java +++ b/bundles/org.eclipse.search/search/org/eclipse/search/internal/ui/text/NavigatorDragAdapter.java @@ -210,15 +210,12 @@ private IResource[] getSelectedResources(int resourceTypes) { List resources = new ArrayList<>(); ISelection selection = selectionProvider.getSelection(); - if (!(selection instanceof IStructuredSelection) || selection.isEmpty()) { + if (!(selection instanceof IStructuredSelection structuredSelection) || selection.isEmpty()) { return null; } - IStructuredSelection structuredSelection = (IStructuredSelection) selection; - // loop through list and look for matching items for (Object obj : structuredSelection) { - if (obj instanceof IResource) { - IResource res = (IResource) obj; + if (obj instanceof IResource res) { if ((res.getType() & resourceTypes) == res.getType()) { resources.add(res); } diff --git a/bundles/org.eclipse.search/search/org/eclipse/search/internal/ui/text/NewTextSearchActionGroup.java b/bundles/org.eclipse.search/search/org/eclipse/search/internal/ui/text/NewTextSearchActionGroup.java index 197bf43b15c..2d11bcd69e0 100644 --- a/bundles/org.eclipse.search/search/org/eclipse/search/internal/ui/text/NewTextSearchActionGroup.java +++ b/bundles/org.eclipse.search/search/org/eclipse/search/internal/ui/text/NewTextSearchActionGroup.java @@ -47,10 +47,10 @@ */ public class NewTextSearchActionGroup extends ActionGroup { - private ISelectionProvider fSelectionProvider; - private IWorkbenchPage fPage; - private OpenFileAction fOpenAction; - private PropertyDialogAction fOpenPropertiesDialog; + private final ISelectionProvider fSelectionProvider; + private final IWorkbenchPage fPage; + private final OpenFileAction fOpenAction; + private final PropertyDialogAction fOpenPropertiesDialog; public NewTextSearchActionGroup(IViewPart part) { Assert.isNotNull(part); @@ -61,10 +61,11 @@ public NewTextSearchActionGroup(IViewPart part) { fOpenAction= new OpenFileAction(fPage); ISelection selection= fSelectionProvider.getSelection(); - if (selection instanceof IStructuredSelection) + if (selection instanceof IStructuredSelection) { fOpenPropertiesDialog.selectionChanged((IStructuredSelection)selection); - else + } else { fOpenPropertiesDialog.selectionChanged(selection); + } } @@ -75,15 +76,17 @@ public void fillContextMenu(IMenuManager menu) { ISelection selection= getContext().getSelection(); if (selection instanceof IStructuredSelection) { addOpenWithMenu(menu, (IStructuredSelection) selection); - if (fOpenPropertiesDialog != null && fOpenPropertiesDialog.isEnabled() && fOpenPropertiesDialog.isApplicableForSelection((IStructuredSelection) selection)) + if (fOpenPropertiesDialog != null && fOpenPropertiesDialog.isEnabled() && fOpenPropertiesDialog.isApplicableForSelection((IStructuredSelection) selection)) { menu.appendToGroup(IContextMenuConstants.GROUP_PROPERTIES, fOpenPropertiesDialog); + } } } private void addOpenWithMenu(IMenuManager menu, IStructuredSelection selection) { - if (selection == null) + if (selection == null) { return; + } fOpenAction.selectionChanged(selection); if (fOpenAction.isEnabled()) { @@ -95,8 +98,9 @@ private void addOpenWithMenu(IMenuManager menu, IStructuredSelection selection) } Object o= selection.getFirstElement(); - if (!(o instanceof IAdaptable)) + if (!(o instanceof IAdaptable)) { return; + } // Create menu IMenuManager submenu= new MenuManager(SearchMessages.OpenWithMenu_label); diff --git a/bundles/org.eclipse.search/search/org/eclipse/search/internal/ui/text/ReplaceRefactoring.java b/bundles/org.eclipse.search/search/org/eclipse/search/internal/ui/text/ReplaceRefactoring.java index 8d8dcb952cb..22285cba153 100644 --- a/bundles/org.eclipse.search/search/org/eclipse/search/internal/ui/text/ReplaceRefactoring.java +++ b/bundles/org.eclipse.search/search/org/eclipse/search/internal/ui/text/ReplaceRefactoring.java @@ -90,7 +90,7 @@ public static class SearchResultUpdateChange extends Change { private MatchGroup[] fMatchGroups; private Match[] fMatches; - private Map> fIgnoredMatches; + private final Map> fIgnoredMatches; private final FileSearchResult fResult; private final boolean fIsRemove; @@ -133,16 +133,18 @@ private Match[] getMatches() { FileMatch match= curr.match; matches.add(match); - if (fIgnoredMatches == null) + if (fIgnoredMatches == null) { continue; + } // Add matches that we removed before starting the refactoring IFile file= match.getFile(); URI uri= file.getLocationURI(); if (uri != null) { ArrayList ignoredMatches= fIgnoredMatches.get(uri); - if (ignoredMatches != null) + if (ignoredMatches != null) { matches.addAll(ignoredMatches); + } } } } @@ -236,16 +238,14 @@ public RefactoringStatus checkInitialConditions(IProgressMonitor pm) throws Core private void collectMatches(Object object, SubMonitor progress) throws CoreException { progress.checkCanceled(); - if (object instanceof LineElement) { - LineElement lineElement= (LineElement) object; + if (object instanceof LineElement lineElement) { FileMatch[] matches= lineElement.getMatches(fResult); for (FileMatch fileMatch : matches) { if (isMatchToBeIncluded(fileMatch)) { getBucket(fileMatch.getFile()).add(fileMatch); } } - } else if (object instanceof IContainer) { - IContainer container= (IContainer) object; + } else if (object instanceof IContainer container) { IResource[] members= container.members(); for (IResource member : members) { collectMatches(member, progress); @@ -353,7 +353,7 @@ public RefactoringStatus checkFinalConditions(IProgressMonitor pm) throws CoreEx Collection allFilesSet= fMatches.keySet(); IFile[] allFiles= allFilesSet.toArray(new IFile[allFilesSet.size()]); Arrays.sort(allFiles, new Comparator() { - private Collator fCollator= Collator.getInstance(); + private final Collator fCollator= Collator.getInstance(); @Override public int compare(IFile o1, IFile o2) { String p1= o1.getFullPath().toString(); @@ -411,8 +411,9 @@ private void checkFilesToBeChanged(IFile[] filesToBeChanged, RefactoringStatus r ArrayList readOnly= new ArrayList<>(); for (IFile file : filesToBeChanged) { pm.checkCanceled(); - if (file.isReadOnly()) + if (file.isReadOnly()) { readOnly.add(file); + } } IFile[] readOnlyFiles= readOnly.toArray(new IFile[readOnly.size()]); diff --git a/bundles/org.eclipse.search/search/org/eclipse/search/internal/ui/text/SearchResultUpdater.java b/bundles/org.eclipse.search/search/org/eclipse/search/internal/ui/text/SearchResultUpdater.java index 063302948c0..d148d514850 100644 --- a/bundles/org.eclipse.search/search/org/eclipse/search/internal/ui/text/SearchResultUpdater.java +++ b/bundles/org.eclipse.search/search/org/eclipse/search/internal/ui/text/SearchResultUpdater.java @@ -30,7 +30,7 @@ import org.eclipse.search.ui.text.Match; public class SearchResultUpdater implements IResourceChangeListener, IQueryListener { - private AbstractTextSearchResult fResult; + private final AbstractTextSearchResult fResult; public SearchResultUpdater(AbstractTextSearchResult result) { fResult= result; @@ -39,8 +39,9 @@ public SearchResultUpdater(AbstractTextSearchResult result) { @Override public void resourceChanged(IResourceChangeEvent event) { IResourceDelta delta= event.getDelta(); - if (delta != null) + if (delta != null) { handleDelta(delta); + } } @SuppressWarnings("incomplete-switch") diff --git a/bundles/org.eclipse.search/search/org/eclipse/search/internal/ui/text/SortAction.java b/bundles/org.eclipse.search/search/org/eclipse/search/internal/ui/text/SortAction.java index 30d7fb05302..b3d11832149 100644 --- a/bundles/org.eclipse.search/search/org/eclipse/search/internal/ui/text/SortAction.java +++ b/bundles/org.eclipse.search/search/org/eclipse/search/internal/ui/text/SortAction.java @@ -16,8 +16,8 @@ import org.eclipse.jface.action.Action; public class SortAction extends Action { - private int fSortOrder; - private FileSearchPage fPage; + private final int fSortOrder; + private final FileSearchPage fPage; public SortAction(String label, FileSearchPage page, int sortOrder) { super(label); diff --git a/bundles/org.eclipse.search/search/org/eclipse/search/internal/ui/text/TextSearchPage.java b/bundles/org.eclipse.search/search/org/eclipse/search/internal/ui/text/TextSearchPage.java index 8ea2e10b37f..a8a9bcd7b7e 100644 --- a/bundles/org.eclipse.search/search/org/eclipse/search/internal/ui/text/TextSearchPage.java +++ b/bundles/org.eclipse.search/search/org/eclipse/search/internal/ui/text/TextSearchPage.java @@ -112,7 +112,7 @@ public class TextSearchPage extends DialogPage implements ISearchPage, IReplaceP */ private static final String STORE_EXTENSIONS= "EXTENSIONS"; //$NON-NLS-1$ - private List fPreviousSearchPatterns= new ArrayList<>(HISTORY_SIZE); + private final List fPreviousSearchPatterns= new ArrayList<>(HISTORY_SIZE); private boolean fFirstTime= true; private boolean fIsCaseSensitive; @@ -297,8 +297,7 @@ public boolean performReplace() { ISearchResultViewPart view= NewSearchUI.activateSearchResultView(); if (view != null) { ISearchResultPage page= view.getActivePage(); - if (page instanceof FileSearchPage) { - FileSearchPage filePage= (FileSearchPage) page; + if (page instanceof FileSearchPage filePage) { new ReplaceAction(filePage.getSite().getShell(), (FileSearchResult)filePage.getInput(), null).run(); } } @@ -396,8 +395,9 @@ private String[] getPreviousExtensionsOldStyle() { for (int i= 0; i < size; i++) { SearchPatternData data= fPreviousSearchPatterns.get(i); String text= FileTypeEditor.typesToString(data.fileNamePatterns); - if (!extensions.contains(text)) + if (!extensions.contains(text)) { extensions.add(text); + } } return extensions.toArray(new String[extensions.size()]); } @@ -405,8 +405,9 @@ private String[] getPreviousExtensionsOldStyle() { private String[] getPreviousSearchPatterns() { int size= fPreviousSearchPatterns.size(); String [] patterns= new String[size]; - for (int i= 0; i < size; i++) + for (int i= 0; i < size; i++) { patterns[i]= fPreviousSearchPatterns.get(i).textPattern; + } return patterns; } @@ -591,12 +592,14 @@ public void widgetSelected(SelectionEvent e) { private void handleWidgetSelected() { int selectionIndex= fPattern.getSelectionIndex(); - if (selectionIndex < 0 || selectionIndex >= fPreviousSearchPatterns.size()) + if (selectionIndex < 0 || selectionIndex >= fPreviousSearchPatterns.size()) { return; + } SearchPatternData patternData= fPreviousSearchPatterns.get(selectionIndex); - if (!fPattern.getText().equals(patternData.textPattern)) + if (!fPattern.getText().equals(patternData.textPattern)) { return; + } fIsCaseSensitiveCheckbox.setSelection(patternData.isCaseSensitive); fIsRegExSearch= patternData.isRegExSearch; fIsRegExCheckbox.setSelection(fIsRegExSearch); @@ -606,10 +609,11 @@ private void handleWidgetSelected() { fPattern.setText(patternData.textPattern); fPatterFieldContentAssist.setEnabled(fIsRegExSearch); fFileTypeEditor.setFileTypes(patternData.fileNamePatterns); - if (patternData.workingSets != null) + if (patternData.workingSets != null) { getContainer().setSelectedWorkingSets(patternData.workingSets); - else + } else { getContainer().setSelectedScope(patternData.scope); + } } private boolean initializePatternControl() { @@ -617,19 +621,21 @@ private boolean initializePatternControl() { if (selection instanceof ITextSelection && !selection.isEmpty() && ((ITextSelection)selection).getLength() > 0) { String text= ((ITextSelection) selection).getText(); if (text != null) { - if (fIsRegExSearch) + if (fIsRegExSearch) { fPattern.setText(FindReplaceDocumentAdapter.escapeForRegExPattern(text)); - else + } else { fPattern.setText(insertEscapeChars(text)); + } if (fPreviousExtensions.length > 0) { fExtensions.setText(fPreviousExtensions[0]); } else { String extension= getExtensionFromEditor(); - if (extension != null) + if (extension != null) { fExtensions.setText(extension); - else + } else { fExtensions.setText("*"); //$NON-NLS-1$ + } } return true; } @@ -645,8 +651,9 @@ private boolean initializePatternControl() { // } private String insertEscapeChars(String text) { - if (text == null || text.equals("")) //$NON-NLS-1$ + if (text == null || text.equals("")) { //$NON-NLS-1$ return ""; //$NON-NLS-1$ + } StringBuilder sbIn= new StringBuilder(text); BufferedReader reader= new BufferedReader(new StringReader(text)); int lengthOfFirstLine= 0; @@ -659,8 +666,9 @@ private String insertEscapeChars(String text) { int i= 0; while (i < lengthOfFirstLine) { char ch= sbIn.charAt(i); - if (ch == '*' || ch == '?' || ch == '\\') + if (ch == '*' || ch == '?' || ch == '\\') { sbOut.append("\\"); //$NON-NLS-1$ + } sbOut.append(ch); i++; } @@ -673,8 +681,9 @@ private String getExtensionFromEditor() { Object elem= ep.getEditorInput(); if (elem instanceof IFileEditorInput) { String extension= ((IFileEditorInput)elem).getFile().getFileExtension(); - if (extension == null) + if (extension == null) { return ((IFileEditorInput)elem).getFile().getName(); + } return "*." + extension; //$NON-NLS-1$ } } @@ -813,14 +822,16 @@ private void readConfiguration() { if (extensionsSettings != null) { for (int i= 0; i < HISTORY_SIZE; i++) { String extension= extensionsSettings.get(Integer.toString(i)); - if (extension == null) + if (extension == null) { break; + } previousExtensions.add(extension); } fPreviousExtensions= new String[previousExtensions.size()]; previousExtensions.toArray(fPreviousExtensions); - } else + } else { fPreviousExtensions= getPreviousExtensionsOldStyle(); + } } @@ -851,8 +862,9 @@ private void writeConfiguration() { int j= 1; for (int i= 0; i < length; i++) { String extension= fExtensions.getItem(i); - if (extensions.add(extension)) + if (extensions.add(extension)) { extensionsSettings.put(Integer.toString(j++), extension); + } } } diff --git a/bundles/org.eclipse.search/search/org/eclipse/search/internal/ui/util/ExceptionHandler.java b/bundles/org.eclipse.search/search/org/eclipse/search/internal/ui/util/ExceptionHandler.java index bbbf3ad3abd..4f5200b3758 100644 --- a/bundles/org.eclipse.search/search/org/eclipse/search/internal/ui/util/ExceptionHandler.java +++ b/bundles/org.eclipse.search/search/org/eclipse/search/internal/ui/util/ExceptionHandler.java @@ -140,10 +140,11 @@ private void displayMessageDialog(String exceptionMessage, Shell shell, String t msg.write(message); msg.write("\n\n"); //$NON-NLS-1$ } - if (exceptionMessage == null || exceptionMessage.isEmpty()) + if (exceptionMessage == null || exceptionMessage.isEmpty()) { msg.write(SearchMessages.ExceptionDialog_seeErrorLogMessage); - else + } else { msg.write(exceptionMessage); + } MessageDialog.openError(shell, title, msg.toString()); } } diff --git a/bundles/org.eclipse.search/search/org/eclipse/search/internal/ui/util/ExtendedDialogWindow.java b/bundles/org.eclipse.search/search/org/eclipse/search/internal/ui/util/ExtendedDialogWindow.java index 274273336aa..39bb68d8a28 100644 --- a/bundles/org.eclipse.search/search/org/eclipse/search/internal/ui/util/ExtendedDialogWindow.java +++ b/bundles/org.eclipse.search/search/org/eclipse/search/internal/ui/util/ExtendedDialogWindow.java @@ -49,7 +49,7 @@ public abstract class ExtendedDialogWindow extends TrayDialog implements IRunnab private Control fContents; private Button fCancelButton; - private List