diff options
Diffstat (limited to 'org.eclipse.search/search/org/eclipse/search/internal/ui')
33 files changed, 348 insertions, 354 deletions
diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/CopyToClipboardAction.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/CopyToClipboardAction.java index 696ad75105d..31b56c3278a 100644 --- a/org.eclipse.search/search/org/eclipse/search/internal/ui/CopyToClipboardAction.java +++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/CopyToClipboardAction.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2014 IBM Corporation and others. + * Copyright (c) 2000, 2015 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -109,7 +109,7 @@ public class CopyToClipboardAction extends Action { IBaseLabelProvider labelProvider= fViewer.getLabelProvider(); String lineDelim= System.getProperty("line.separator"); //$NON-NLS-1$ StringBuffer buf= new StringBuffer(); - Iterator iter= getSelection(); + Iterator<?> iter= getSelection(); while (iter.hasNext()) { if (buf.length() > 0) { buf.append(lineDelim); @@ -141,11 +141,11 @@ public class CopyToClipboardAction extends Action { } } - private Iterator getSelection() { + private Iterator<?> getSelection() { ISelection s= fViewer.getSelection(); if (s instanceof IStructuredSelection) return ((IStructuredSelection)s).iterator(); - return Collections.EMPTY_LIST.iterator(); + return Collections.emptyList().iterator(); } private void copyToClipboard(Clipboard clipboard, String str, Shell shell) { diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/OpenSearchDialogPageAction.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/OpenSearchDialogPageAction.java index 8740ee84117..068992c47ac 100644 --- a/org.eclipse.search/search/org/eclipse/search/internal/ui/OpenSearchDialogPageAction.java +++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/OpenSearchDialogPageAction.java @@ -75,10 +75,10 @@ public class OpenSearchDialogPageAction implements IWorkbenchWindowPulldownDeleg } private void fillMenu(final Menu localMenu) { - List pageDescriptors= SearchPlugin.getDefault().getSearchPageDescriptors(); + List<SearchPageDescriptor> pageDescriptors= SearchPlugin.getDefault().getSearchPageDescriptors(); int accelerator= 1; - for (Iterator iter= pageDescriptors.iterator(); iter.hasNext();) { - SearchPageDescriptor desc= (SearchPageDescriptor) iter.next(); + for (Iterator<SearchPageDescriptor> iter= pageDescriptors.iterator(); iter.hasNext();) { + SearchPageDescriptor desc= iter.next(); if (!WorkbenchActivityHelper.filterItem(desc) && desc.isEnabled()) { SearchPageAction action= new SearchPageAction(fWorkbenchWindow, desc); addToMenu(localMenu, action, accelerator++); diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/RemovePotentialMatchesAction.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/RemovePotentialMatchesAction.java index e30dfd45a52..0d1622be627 100644 --- a/org.eclipse.search/search/org/eclipse/search/internal/ui/RemovePotentialMatchesAction.java +++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/RemovePotentialMatchesAction.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2010 IBM Corporation and others. + * Copyright (c) 2000, 2015 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -78,18 +78,18 @@ class RemovePotentialMatchesAction extends Action { if (size <= 0) return null; - ArrayList markers= new ArrayList(size * 3); - Iterator iter= selection.iterator(); + ArrayList<IMarker> markers= new ArrayList<>(size * 3); + Iterator<?> iter= selection.iterator(); while (iter.hasNext()) { SearchResultViewEntry entry= (SearchResultViewEntry)iter.next(); - Iterator entryIter= entry.getMarkers().iterator(); + Iterator<IMarker> entryIter= entry.getMarkers().iterator(); while (entryIter.hasNext()) { - IMarker marker= (IMarker)entryIter.next(); + IMarker marker= entryIter.next(); if (marker.getAttribute(SearchUI.POTENTIAL_MATCH, false)) markers.add(marker); } } - return (IMarker[])markers.toArray(new IMarker[markers.size()]); + return markers.toArray(new IMarker[markers.size()]); } private boolean usePluralLabel() { @@ -104,12 +104,12 @@ class RemovePotentialMatchesAction extends Action { return false; int markerCount= 0; - Iterator iter= selection.iterator(); + Iterator<?> iter= selection.iterator(); while (iter.hasNext()) { SearchResultViewEntry entry= (SearchResultViewEntry)iter.next(); - Iterator entryIter= entry.getMarkers().iterator(); + Iterator<IMarker> entryIter= entry.getMarkers().iterator(); while (entryIter.hasNext()) { - IMarker marker= (IMarker)entryIter.next(); + IMarker marker= entryIter.next(); if (marker.getAttribute(SearchUI.POTENTIAL_MATCH, false)) { markerCount++; } diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/RemoveResultAction.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/RemoveResultAction.java index c60a0aaa4af..996f7bc994f 100644 --- a/org.eclipse.search/search/org/eclipse/search/internal/ui/RemoveResultAction.java +++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/RemoveResultAction.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2010 IBM Corporation and others. + * Copyright (c) 2000, 2015 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -73,15 +73,15 @@ class RemoveResultAction extends Action { int size= selection.size(); if (size <= 0) return null; - ArrayList markers= new ArrayList(size * 3); + ArrayList<IMarker> markers= new ArrayList<>(size * 3); int markerCount= 0; - Iterator iter= selection.iterator(); + Iterator<?> iter= selection.iterator(); while (iter.hasNext()) { SearchResultViewEntry entry= (SearchResultViewEntry)iter.next(); markerCount += entry.getMatchCount(); markers.addAll(entry.getMarkers()); } - return (IMarker[])markers.toArray(new IMarker[markerCount]); + return markers.toArray(new IMarker[markerCount]); } private boolean usePluralLabel() { diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/ResourceToItemsMapper.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/ResourceToItemsMapper.java index 0546843fff7..8e74e8a6e9e 100644 --- a/org.eclipse.search/search/org/eclipse/search/internal/ui/ResourceToItemsMapper.java +++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/ResourceToItemsMapper.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2008 IBM Corporation and others. + * Copyright (c) 2000, 2015 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -37,15 +37,15 @@ class ResourceToItemsMapper { private static final int NUMBER_LIST_REUSE= 10; - // map from resource to item - private HashMap fResourceToItem; - private Stack fReuseLists; + // map from IResource to Item | List<Item> + private HashMap<IResource, Object> fResourceToItem; + private Stack<List<Item>> fReuseLists; private ContentViewer fContentViewer; public ResourceToItemsMapper(ContentViewer viewer) { - fResourceToItem= new HashMap(); - fReuseLists= new Stack(); + fResourceToItem= new HashMap<>(); + fReuseLists= new Stack<>(); fContentViewer= viewer; } @@ -61,9 +61,10 @@ class ResourceToItemsMapper { } else if (obj instanceof Item) { updateItem((Item) obj); } else { // List of Items - List list= (List) obj; + @SuppressWarnings("unchecked") + List<Item> list= (List<Item>) obj; for (int k= 0; k < list.size(); k++) { - updateItem((Item) list.get(k)); + updateItem(list.get(k)); } } } @@ -101,13 +102,14 @@ class ResourceToItemsMapper { fResourceToItem.put(resource, item); } else if (existingMapping instanceof Item) { if (existingMapping != item) { - List list= getNewList(); - list.add(existingMapping); + List<Item> list= getNewList(); + list.add((Item) existingMapping); list.add(item); fResourceToItem.put(resource, list); } } else { // List - List list= (List) existingMapping; + @SuppressWarnings("unchecked") + List<Item> list= (List<Item>) existingMapping; if (!list.contains(item)) { list.add(item); } @@ -129,7 +131,8 @@ class ResourceToItemsMapper { } else if (existingMapping instanceof Item) { fResourceToItem.remove(resource); } else { // List - List list= (List) existingMapping; + @SuppressWarnings("unchecked") + List<Item> list= (List<Item>) existingMapping; list.remove(item); if (list.isEmpty()) { fResourceToItem.remove(list); @@ -139,14 +142,14 @@ class ResourceToItemsMapper { } } - private List getNewList() { + private List<Item> getNewList() { if (!fReuseLists.isEmpty()) { - return (List) fReuseLists.pop(); + return fReuseLists.pop(); } - return new ArrayList(2); + return new ArrayList<>(2); } - private void releaseList(List list) { + private void releaseList(List<Item> list) { if (fReuseLists.size() < NUMBER_LIST_REUSE) { fReuseLists.push(list); } diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/ScopePart.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/ScopePart.java index 279e9710635..5596d58cb8a 100644 --- a/org.eclipse.search/search/org/eclipse/search/internal/ui/ScopePart.java +++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/ScopePart.java @@ -125,7 +125,7 @@ public class ScopePart { IWorkingSetManager workingSetManager= PlatformUI.getWorkbench().getWorkingSetManager(); if (lruWorkingSetNames != null) { - Set existingWorkingSets= new HashSet(lruWorkingSetNames.length); + Set<IWorkingSet> existingWorkingSets= new HashSet<>(lruWorkingSetNames.length); for (int i= 0; i < lruWorkingSetNames.length; i++) { IWorkingSet workingSet= getWorkingSet(workingSetManager, lruWorkingSetNames[i]); if (workingSet != null) { @@ -133,7 +133,7 @@ public class ScopePart { } } if (!existingWorkingSets.isEmpty()) { - return (IWorkingSet[]) existingWorkingSets.toArray(new IWorkingSet[existingWorkingSets.size()]); + return existingWorkingSets.toArray(new IWorkingSet[existingWorkingSets.size()]); } } else { // Backward compatibility @@ -230,7 +230,7 @@ public class ScopePart { Assert.isNotNull(workingSets); setSelectedScope(ISearchPageContainer.WORKING_SET_SCOPE); fWorkingSets= null; - Set existingWorkingSets= new HashSet(workingSets.length); + Set<IWorkingSet> existingWorkingSets= new HashSet<>(workingSets.length); for (int i= 0; i < workingSets.length; i++) { String name= workingSets[i].getName(); IWorkingSet workingSet= PlatformUI.getWorkbench().getWorkingSetManager().getWorkingSet(name); @@ -238,7 +238,7 @@ public class ScopePart { existingWorkingSets.add(workingSet); } if (!existingWorkingSets.isEmpty()) - fWorkingSets= (IWorkingSet[]) existingWorkingSets.toArray(new IWorkingSet[existingWorkingSets.size()]); + fWorkingSets= existingWorkingSets.toArray(new IWorkingSet[existingWorkingSets.size()]); saveState(); diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/Search.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/Search.java index e9c4d970b20..2796e550555 100644 --- a/org.eclipse.search/search/org/eclipse/search/internal/ui/Search.java +++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/Search.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2008 IBM Corporation and others. + * Copyright (c) 2000, 2015 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -42,7 +42,7 @@ public class Search extends Object { private ImageDescriptor fImageDescriptor; private ILabelProvider fLabelProvider; private ISelection fSelection; - private ArrayList fResults; + private ArrayList<SearchResultViewEntry> fResults; private IAction fGotoMarkerAction; private IContextMenuContributor fContextMenuContributor; private IActionGroupFactory fActionGroupFactory; @@ -125,15 +125,15 @@ public class Search extends Object { int getItemCount() { int count= 0; - Iterator iter= getResults().iterator(); + Iterator<SearchResultViewEntry> iter= getResults().iterator(); while (iter.hasNext()) count += ((ISearchResultViewEntry)iter.next()).getMatchCount(); return count; } - List getResults() { + List<SearchResultViewEntry> getResults() { if (fResults == null) - return new ArrayList(); + return new ArrayList<>(); return fResults; } @@ -161,9 +161,9 @@ public class Search extends Object { } void backupMarkers() { - Iterator iter= getResults().iterator(); + Iterator<SearchResultViewEntry> iter= getResults().iterator(); while (iter.hasNext()) { - ((SearchResultViewEntry)iter.next()).backupMarkers(); + iter.next().backupMarkers(); } } @@ -195,7 +195,7 @@ public class Search extends Object { fResults= null; } - void setResults(ArrayList results) { + void setResults(ArrayList<SearchResultViewEntry> results) { Assert.isNotNull(results); fResults= results; } diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchDialog.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchDialog.java index dabc2c4ac46..bde9ccc084d 100644 --- a/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchDialog.java +++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchDialog.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2013 IBM Corporation and others. + * Copyright (c) 2000, 2015 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -143,7 +143,7 @@ public class SearchDialog extends ExtendedDialogWindow implements ISearchPageCon private String fInitialPageId; private int fCurrentIndex; - private List fDescriptors; + private List<SearchPageDescriptor> fDescriptors; private Point fMinSize; private ScopePart[] fScopeParts; private boolean fLastEnableState; @@ -197,8 +197,8 @@ public class SearchDialog extends ExtendedDialogWindow implements ISearchPageCon return new String[] { name }; } } else if (selection instanceof IStructuredSelection) { - HashSet res= new HashSet(); - for (Iterator iter= ((IStructuredSelection) selection).iterator(); iter.hasNext();) { + HashSet<String> res= new HashSet<>(); + for (Iterator<?> iter= ((IStructuredSelection) selection).iterator(); iter.hasNext();) { Object curr= iter.next(); if (curr instanceof IWorkingSet) { IWorkingSet workingSet= (IWorkingSet) curr; @@ -227,7 +227,7 @@ public class SearchDialog extends ExtendedDialogWindow implements ISearchPageCon } } if (!res.isEmpty()) { - return (String[]) res.toArray(new String[res.size()]); + return res.toArray(new String[res.size()]); } } return new String[0]; @@ -307,10 +307,10 @@ public class SearchDialog extends ExtendedDialogWindow implements ISearchPageCon } private void handleCustomizePressed() { - List input= SearchPlugin.getDefault().getSearchPageDescriptors(); + List<SearchPageDescriptor> input= SearchPlugin.getDefault().getSearchPageDescriptors(); input= filterByActivities(input); - final ArrayList createdImages= new ArrayList(input.size()); + final ArrayList<Image> createdImages= new ArrayList<>(input.size()); ILabelProvider labelProvider= new LabelProvider() { @Override public String getText(Object element) { @@ -393,10 +393,10 @@ public class SearchDialog extends ExtendedDialogWindow implements ISearchPageCon destroyImages(createdImages); } - private List filterByActivities(List input) { - ArrayList filteredList= new ArrayList(input.size()); - for (Iterator descriptors= input.iterator(); descriptors.hasNext();) { - SearchPageDescriptor descriptor= (SearchPageDescriptor) descriptors.next(); + private List<SearchPageDescriptor> filterByActivities(List<SearchPageDescriptor> input) { + ArrayList<SearchPageDescriptor> filteredList= new ArrayList<>(input.size()); + for (Iterator<SearchPageDescriptor> descriptors= input.iterator(); descriptors.hasNext();) { + SearchPageDescriptor descriptor= descriptors.next(); if (!WorkbenchActivityHelper.filterItem(descriptor)) filteredList.add(descriptor); @@ -404,10 +404,10 @@ public class SearchDialog extends ExtendedDialogWindow implements ISearchPageCon return filteredList; } - private void destroyImages(List images) { - Iterator iter= images.iterator(); + private void destroyImages(List<Image> images) { + Iterator<Image> iter= images.iterator(); while (iter.hasNext()) { - Image image= (Image)iter.next(); + Image image= iter.next(); if (image != null && !image.isDisposed()) image.dispose(); } @@ -544,7 +544,7 @@ public class SearchDialog extends ExtendedDialogWindow implements ISearchPageCon } private SearchPageDescriptor getDescriptorAt(int index) { - return (SearchPageDescriptor) fDescriptors.get(index); + return fDescriptors.get(index); } private Point getMinSize() { @@ -616,7 +616,7 @@ public class SearchDialog extends ExtendedDialogWindow implements ISearchPageCon int level= ISearchPageScoreComputer.LOWEST; int size= fDescriptors.size(); for (int i= 0; i < size; i++) { - SearchPageDescriptor descriptor= (SearchPageDescriptor) fDescriptors.get(i); + SearchPageDescriptor descriptor= fDescriptors.get(i); if (fInitialPageId != null && fInitialPageId.equals(descriptor.getId())) return i; @@ -834,7 +834,7 @@ public class SearchDialog extends ExtendedDialogWindow implements ISearchPageCon @Override public boolean close() { for (int i= 0; i < fDescriptors.size(); i++) { - SearchPageDescriptor desc= (SearchPageDescriptor) fDescriptors.get(i); + SearchPageDescriptor desc= fDescriptors.get(i); desc.dispose(); } return super.close(); diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchDropDownAction.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchDropDownAction.java index 1fe05775b1c..ac1fe2f1b6f 100644 --- a/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchDropDownAction.java +++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchDropDownAction.java @@ -59,11 +59,11 @@ class SearchDropDownAction extends Action implements IMenuCreator { fMenu= new Menu(parent); boolean checkedOne= false; - Iterator iter= SearchManager.getDefault().getPreviousSearches().iterator(); + Iterator<Search> iter= SearchManager.getDefault().getPreviousSearches().iterator(); Search selected= SearchManager.getDefault().getCurrentSearch(); int i= 0; while (iter.hasNext() && i++ < RESULTS_IN_DROP_DOWN) { - Search search= (Search)iter.next(); + Search search= iter.next(); ShowSearchAction action= new ShowSearchAction(search); action.setChecked(search.equals(selected)); if (search.equals(selected)) diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchManager.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchManager.java index 253bf416ebc..0eb749fcc08 100644 --- a/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchManager.java +++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchManager.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2009 IBM Corporation and others. + * Copyright (c) 2000, 2015 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -58,8 +58,8 @@ public class SearchManager implements IResourceChangeListener { SearchPlugin.getWorkspace().addResourceChangeListener(this); } - private HashSet fListeners= new HashSet(); - private LinkedList fPreviousSearches= new LinkedList(); + private HashSet<SearchResultViewer> fListeners= new HashSet<>(); + private LinkedList<Search> fPreviousSearches= new LinkedList<>(); private boolean fIsRemoveAll= false; public static synchronized SearchManager getDefault() { @@ -76,17 +76,17 @@ public class SearchManager implements IResourceChangeListener { * Returns the list with previous searches (ISearch). * @return previous searches */ - LinkedList getPreviousSearches() { + LinkedList<Search> getPreviousSearches() { return fPreviousSearches; } /** * Returns the list with current (last) results * @return the current results */ - ArrayList getCurrentResults() { + ArrayList<SearchResultViewEntry> getCurrentResults() { if (fCurrentSearch == null) - return new ArrayList(0); - return (ArrayList)fCurrentSearch.getResults(); + return new ArrayList<>(0); + return (ArrayList<SearchResultViewEntry>)fCurrentSearch.getResults(); } public Search getCurrentSearch() { @@ -118,13 +118,13 @@ public class SearchManager implements IResourceChangeListener { } // clear searches - fPreviousSearches= new LinkedList(); + fPreviousSearches= new LinkedList<>(); fCurrentSearch= null; // update viewers - Iterator iter= fListeners.iterator(); + Iterator<SearchResultViewer> iter= fListeners.iterator(); while (iter.hasNext()) { - SearchResultViewer viewer= (SearchResultViewer)iter.next(); + SearchResultViewer viewer= iter.next(); handleAllSearchesRemoved(viewer); } } @@ -177,15 +177,15 @@ public class SearchManager implements IResourceChangeListener { monitor.worked(10); // add search markers - Iterator iter= getCurrentResults().iterator(); - ArrayList emptyEntries= new ArrayList(10); + Iterator<SearchResultViewEntry> iter= getCurrentResults().iterator(); + ArrayList<SearchResultViewEntry> emptyEntries= new ArrayList<>(10); boolean filesChanged= false; boolean filesDeleted= false; IGroupByKeyComputer groupByKeyComputer= getCurrentSearch().getGroupByKeyComputer(); while (iter.hasNext()) { monitor.worked(1); - SearchResultViewEntry entry= (SearchResultViewEntry)iter.next(); - Iterator attrPerMarkerIter= entry.getAttributesPerMarker().iterator(); + SearchResultViewEntry entry= iter.next(); + Iterator<Map<String, Object>> attrPerMarkerIter= entry.getAttributesPerMarker().iterator(); entry.clearMarkerList(); if (entry.getResource() == null || !entry.getResource().exists()) { emptyEntries.add(entry); @@ -201,7 +201,7 @@ public class SearchManager implements IResourceChangeListener { continue; } try { - newMarker.setAttributes((Map)attrPerMarkerIter.next()); + newMarker.setAttributes(attrPerMarkerIter.next()); if (groupByKeyComputer !=null && groupByKeyComputer.computeGroupByKey(newMarker) == null) { filesDeleted= true; newMarker.delete(); @@ -246,11 +246,11 @@ public class SearchManager implements IResourceChangeListener { } // update viewers - iter= fListeners.iterator(); + Iterator<SearchResultViewer> iter2= fListeners.iterator(); if (display != null && !display.isDisposed()) { final Viewer visibleViewer= ((SearchResultView)SearchUI.getSearchResultView()).getViewer(); - while (iter.hasNext()) { - final SearchResultViewer viewer= (SearchResultViewer)iter.next(); + while (iter2.hasNext()) { + final SearchResultViewer viewer= iter2.next(); display.syncExec(new Runnable() { @Override public void run() { @@ -296,12 +296,12 @@ public class SearchManager implements IResourceChangeListener { SearchPlugin.getWorkspace().removeResourceChangeListener(this); // Clear the viewers - Iterator iter= fListeners.iterator(); + Iterator<SearchResultViewer> iter= fListeners.iterator(); Display display= getDisplay(); if (display != null && !display.isDisposed()) { final Viewer visibleViewer= ((SearchResultView)SearchUI.getSearchResultView()).getViewer(); while (iter.hasNext()) { - final SearchResultViewer viewer= (SearchResultViewer)iter.next(); + final SearchResultViewer viewer= iter.next(); display.syncExec(new Runnable() { @Override public void run() { @@ -330,7 +330,7 @@ public class SearchManager implements IResourceChangeListener { } } - void searchFinished(ArrayList results) { + void searchFinished(ArrayList<SearchResultViewEntry> results) { Assert.isNotNull(results); getCurrentSearch().setResults(results); @@ -369,9 +369,9 @@ public class SearchManager implements IResourceChangeListener { return; } - Iterator iter= fListeners.iterator(); + Iterator<SearchResultViewer> iter= fListeners.iterator(); while (iter.hasNext()) - ((SearchResultViewer)iter.next()).getControl().setRedraw(false); + iter.next().getControl().setRedraw(false); for (int i=0; i < markerDeltas.length; i++) { handleSearchMarkerChanged(markerDeltas[i]); @@ -379,7 +379,7 @@ public class SearchManager implements IResourceChangeListener { iter= fListeners.iterator(); while (iter.hasNext()) - ((SearchResultViewer)iter.next()).getControl().setRedraw(true); + iter.next().getControl().setRedraw(true); } @@ -395,15 +395,15 @@ public class SearchManager implements IResourceChangeListener { private void handleRemoveAll() { if (fCurrentSearch != null) fCurrentSearch.removeResults(); - Iterator iter= fListeners.iterator(); + Iterator<SearchResultViewer> iter= fListeners.iterator(); while (iter.hasNext()) - ((SearchResultViewer)iter.next()).handleRemoveAll(); + iter.next().handleRemoveAll(); } private void handleNewSearchResult() { - Iterator iter= fListeners.iterator(); + Iterator<SearchResultViewer> iter= fListeners.iterator(); while (iter.hasNext()) { - SearchResultViewer viewer= (SearchResultViewer)iter.next(); + SearchResultViewer viewer= iter.next(); viewer.setInput(getCurrentResults()); } } @@ -423,14 +423,14 @@ public class SearchManager implements IResourceChangeListener { entry.remove(marker); if (entry.getMatchCount() == 0) { getCurrentResults().remove(entry); - Iterator iter= fListeners.iterator(); + Iterator<SearchResultViewer> iter= fListeners.iterator(); while (iter.hasNext()) - ((SearchResultViewer)iter.next()).handleRemoveMatch(entry); + iter.next().handleRemoveMatch(entry); } else { - Iterator iter= fListeners.iterator(); + Iterator<SearchResultViewer> iter= fListeners.iterator(); while (iter.hasNext()) - ((SearchResultViewer)iter.next()).handleUpdateMatch(entry, true); + iter.next().handleUpdateMatch(entry, true); } } } @@ -438,16 +438,16 @@ public class SearchManager implements IResourceChangeListener { private void handleUpdateMatch(IMarker marker) { SearchResultViewEntry entry= findEntry(marker); if (entry != null) { - Iterator iter= fListeners.iterator(); + Iterator<SearchResultViewer> iter= fListeners.iterator(); while (iter.hasNext()) - ((SearchResultViewer)iter.next()).handleUpdateMatch(entry, false); + iter.next().handleUpdateMatch(entry, false); } } private SearchResultViewEntry findEntry(IMarker marker) { - Iterator entries= getCurrentResults().iterator(); + Iterator<SearchResultViewEntry> entries= getCurrentResults().iterator(); while (entries.hasNext()) { - SearchResultViewEntry entry= (SearchResultViewEntry)entries.next(); + SearchResultViewEntry entry= entries.next(); if (entry.contains(marker)) return entry; } @@ -479,9 +479,9 @@ public class SearchManager implements IResourceChangeListener { if (getCurrentSearch() != null) { handleSearchMarkersChanged(markerDeltas); // update title and actions - Iterator iter= fListeners.iterator(); + Iterator<SearchResultViewer> iter= fListeners.iterator(); while (iter.hasNext()) { - SearchResultViewer viewer= (SearchResultViewer)iter.next(); + SearchResultViewer viewer= iter.next(); viewer.enableActions(); viewer.updateTitle(); } @@ -495,7 +495,7 @@ public class SearchManager implements IResourceChangeListener { * @return the display */ private Display getDisplay() { - Iterator iter= fListeners.iterator(); + Iterator<SearchResultViewer> iter= fListeners.iterator(); while (iter.hasNext()) { Control control= ((Viewer)iter.next()).getControl(); if (control != null && !control.isDisposed()) { diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchPageDescriptor.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchPageDescriptor.java index 36c2dfa2300..3c59e8b5d72 100644 --- a/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchPageDescriptor.java +++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchPageDescriptor.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2011 IBM Corporation and others. + * Copyright (c) 2000, 2015 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -47,7 +47,7 @@ import org.eclipse.search.ui.ISearchPageScoreComputer; /** * Proxy that represents a search page. */ -class SearchPageDescriptor implements IPluginContribution, Comparable { +class SearchPageDescriptor implements IPluginContribution, Comparable<SearchPageDescriptor> { public final static String PAGE_TAG= "page"; //$NON-NLS-1$ private final static String ID_ATTRIBUTE= "id"; //$NON-NLS-1$ @@ -69,7 +69,7 @@ class SearchPageDescriptor implements IPluginContribution, Comparable { private final static String STORE_ENABLED_PAGE_IDS= SECTION_ID + ".enabledPageIds"; //$NON-NLS-1$ private final static String STORE_PROCESSED_PAGE_IDS= SECTION_ID + ".processedPageIds"; //$NON-NLS-1$ - private static List fgEnabledPageIds; + private static List<String> fgEnabledPageIds; private static class ExtensionScorePair { public String extension; @@ -81,7 +81,7 @@ class SearchPageDescriptor implements IPluginContribution, Comparable { } private IConfigurationElement fElement; - private List fExtensionScorePairs; + private List<ExtensionScorePair> fExtensionScorePairs; private int fWildcardScore= ISearchPageScoreComputer.UNKNOWN; private ISearchPage fCreatedPage; @@ -232,7 +232,7 @@ class SearchPageDescriptor implements IPluginContribution, Comparable { } static void setEnabled(Object[] enabledDescriptors) { - fgEnabledPageIds= new ArrayList(5); + fgEnabledPageIds= new ArrayList<>(5); for (int i= 0; i < enabledDescriptors.length; i++) { if (enabledDescriptors[i] instanceof SearchPageDescriptor) fgEnabledPageIds.add(((SearchPageDescriptor)enabledDescriptors[i]).getId()); @@ -240,28 +240,28 @@ class SearchPageDescriptor implements IPluginContribution, Comparable { storeEnabledPageIds(); } - private static List getEnabledPageIds() { + private static List<String> getEnabledPageIds() { if (fgEnabledPageIds == null) { - List descriptors= SearchPlugin.getDefault().getSearchPageDescriptors(); + List<SearchPageDescriptor> descriptors= SearchPlugin.getDefault().getSearchPageDescriptors(); String[] enabledPageIds= getDialogSettings().getArray(STORE_ENABLED_PAGE_IDS); if (enabledPageIds == null) - fgEnabledPageIds= new ArrayList(descriptors.size()); + fgEnabledPageIds= new ArrayList<>(descriptors.size()); else - fgEnabledPageIds= new ArrayList(Arrays.asList(enabledPageIds)); + fgEnabledPageIds= new ArrayList<>(Arrays.asList(enabledPageIds)); - List processedPageIds; + List<String> processedPageIds; String[] processedPageIdsArr= getDialogSettings().getArray(STORE_PROCESSED_PAGE_IDS); if (processedPageIdsArr == null) - processedPageIds= new ArrayList(descriptors.size()); + processedPageIds= new ArrayList<>(descriptors.size()); else - processedPageIds= new ArrayList(Arrays.asList(processedPageIdsArr)); + processedPageIds= new ArrayList<>(Arrays.asList(processedPageIdsArr)); // Enable pages based on contribution - Iterator iter= descriptors.iterator(); + Iterator<SearchPageDescriptor> iter= descriptors.iterator(); while (iter.hasNext()) { - SearchPageDescriptor desc= (SearchPageDescriptor)iter.next(); + SearchPageDescriptor desc= iter.next(); if (processedPageIds.contains(desc.getId())) continue; @@ -270,14 +270,14 @@ class SearchPageDescriptor implements IPluginContribution, Comparable { fgEnabledPageIds.add(desc.getId()); } - getDialogSettings().put(STORE_PROCESSED_PAGE_IDS, (String[])processedPageIds.toArray(new String[processedPageIds.size()])); + getDialogSettings().put(STORE_PROCESSED_PAGE_IDS, processedPageIds.toArray(new String[processedPageIds.size()])); storeEnabledPageIds(); } return fgEnabledPageIds; } private static void storeEnabledPageIds() { - getDialogSettings().put(STORE_ENABLED_PAGE_IDS, (String[])fgEnabledPageIds.toArray(new String[fgEnabledPageIds.size()])); + getDialogSettings().put(STORE_ENABLED_PAGE_IDS, fgEnabledPageIds.toArray(new String[fgEnabledPageIds.size()])); } private static IDialogSettings getDialogSettings() { @@ -289,15 +289,12 @@ class SearchPageDescriptor implements IPluginContribution, Comparable { return section; } - /* - * Implements a method from IComparable - */ @Override - public int compareTo(Object o) { + public int compareTo(SearchPageDescriptor o) { int myPos= getTabPosition(); - int objsPos= ((SearchPageDescriptor)o).getTabPosition(); + int objsPos= o.getTabPosition(); if (myPos == Integer.MAX_VALUE && objsPos == Integer.MAX_VALUE || myPos == objsPos) - return getLabel().compareTo(((SearchPageDescriptor)o).getLabel()); + return getLabel().compareTo(o.getLabel()); return myPos - objsPos; } @@ -338,7 +335,7 @@ class SearchPageDescriptor implements IPluginContribution, Comparable { int size= fExtensionScorePairs.size(); for (int i= 0; i < size; i++) { - ExtensionScorePair p= (ExtensionScorePair)fExtensionScorePairs.get(i); + ExtensionScorePair p= fExtensionScorePairs.get(i); if (extension.equals(p.extension)) return p.score; } @@ -347,7 +344,7 @@ class SearchPageDescriptor implements IPluginContribution, Comparable { } private void readExtensionScorePairs() { - fExtensionScorePairs= new ArrayList(3); + fExtensionScorePairs= new ArrayList<>(3); String content= fElement.getAttribute(EXTENSIONS_ATTRIBUTE); if (content == null) return; diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchPlugin.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchPlugin.java index 538a67eccfc..3702c32cb06 100644 --- a/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchPlugin.java +++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchPlugin.java @@ -85,8 +85,8 @@ public class SearchPlugin extends AbstractUIPlugin { private static SearchPlugin fgSearchPlugin; - private List fPageDescriptors; - private List fSorterDescriptors; + private List<SearchPageDescriptor> fPageDescriptors; + private List<SorterDescriptor> fSorterDescriptors; private TextSearchEngineRegistry fTextSearchEngineRegistry; private TextSearchQueryProviderRegistry fTextSearchQueryProviderRegistry; @@ -226,7 +226,7 @@ public class SearchPlugin extends AbstractUIPlugin { /** * @return Returns all search pages contributed to the workbench. */ - public List getSearchPageDescriptors() { + public List<SearchPageDescriptor> getSearchPageDescriptors() { if (fPageDescriptors == null) { IConfigurationElement[] elements= Platform.getExtensionRegistry().getConfigurationElementsFor(NewSearchUI.PLUGIN_ID, SEARCH_PAGE_EXTENSION_POINT); fPageDescriptors= createSearchPageDescriptors(elements); @@ -238,11 +238,11 @@ public class SearchPlugin extends AbstractUIPlugin { * @param pageId the page id or <code>null</code> * @return all descriptors of the enabled search pages, plus the descriptor for the given page id */ - public List getEnabledSearchPageDescriptors(String pageId) { - Iterator iter= getSearchPageDescriptors().iterator(); - List enabledDescriptors= new ArrayList(5); + public List<SearchPageDescriptor> getEnabledSearchPageDescriptors(String pageId) { + Iterator<SearchPageDescriptor> iter= getSearchPageDescriptors().iterator(); + List<SearchPageDescriptor> enabledDescriptors= new ArrayList<>(5); while (iter.hasNext()) { - SearchPageDescriptor desc= (SearchPageDescriptor)iter.next(); + SearchPageDescriptor desc= iter.next(); if (desc.isEnabled() || desc.getId().equals(pageId)) enabledDescriptors.add(desc); } @@ -261,9 +261,9 @@ public class SearchPlugin extends AbstractUIPlugin { Search currentSearch= SearchManager.getDefault().getCurrentSearch(); if (currentSearch != null) { String pageId= currentSearch.getPageId(); - Iterator iter= getSearchPageDescriptors().iterator(); + Iterator<SearchPageDescriptor> iter= getSearchPageDescriptors().iterator(); while (iter.hasNext()) { - SearchPageDescriptor desc= (SearchPageDescriptor)iter.next(); + SearchPageDescriptor desc= iter.next(); if (desc.getId().equals(pageId)) { String helpId= desc.getSearchViewHelpContextId(); if (helpId == null) @@ -280,8 +280,8 @@ public class SearchPlugin extends AbstractUIPlugin { * @param elements the configuration elements * @return the created SearchPageDescriptor */ - private List createSearchPageDescriptors(IConfigurationElement[] elements) { - List result= new ArrayList(5); + private List<SearchPageDescriptor> createSearchPageDescriptors(IConfigurationElement[] elements) { + List<SearchPageDescriptor> result= new ArrayList<>(5); for (int i= 0; i < elements.length; i++) { IConfigurationElement element= elements[i]; if (SearchPageDescriptor.PAGE_TAG.equals(element.getName())) { @@ -296,7 +296,7 @@ public class SearchPlugin extends AbstractUIPlugin { /** * @return Returns all sorters contributed to the workbench. */ - public List getSorterDescriptors() { + public List<SorterDescriptor> getSorterDescriptors() { if (fSorterDescriptors == null) { IConfigurationElement[] elements= Platform.getExtensionRegistry().getConfigurationElementsFor(NewSearchUI.PLUGIN_ID, SORTER_EXTENSION_POINT); fSorterDescriptors= createSorterDescriptors(elements); @@ -324,8 +324,8 @@ public class SearchPlugin extends AbstractUIPlugin { * @param elements the configuration elements * @return the created SorterDescriptor */ - private List createSorterDescriptors(IConfigurationElement[] elements) { - List result= new ArrayList(5); + private List<SorterDescriptor> createSorterDescriptors(IConfigurationElement[] elements) { + List<SorterDescriptor> result= new ArrayList<>(5); for (int i= 0; i < elements.length; i++) { IConfigurationElement element= elements[i]; if (SorterDescriptor.SORTER_TAG.equals(element.getName())) diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchPreferencePage.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchPreferencePage.java index 01c47faadfb..716c1321b24 100644 --- a/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchPreferencePage.java +++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchPreferencePage.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2008 IBM Corporation and others. + * Copyright (c) 2000, 2015 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -59,15 +59,12 @@ public class SearchPreferencePage extends FieldEditorPreferencePage implements I private BooleanFieldEditor fIgnorePotentialMatchesCheckbox; - private static class PerspectiveDescriptorComparator implements Comparator { + private static class PerspectiveDescriptorComparator implements Comparator<IPerspectiveDescriptor> { @Override - public int compare(Object o1, Object o2) { - if (o1 instanceof IPerspectiveDescriptor && o2 instanceof IPerspectiveDescriptor) { - String id1= ((IPerspectiveDescriptor)o1).getLabel(); - String id2= ((IPerspectiveDescriptor)o2).getLabel(); - return Collator.getInstance().compare(id1, id2); - } - return 0; + public int compare(IPerspectiveDescriptor o1, IPerspectiveDescriptor o2) { + String id1= o1.getLabel(); + String id2= o2.getLabel(); + return Collator.getInstance().compare(id1, id2); } } diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchResultView.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchResultView.java index 953f26e6984..f05bdcf7259 100644 --- a/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchResultView.java +++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchResultView.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2008 IBM Corporation and others. + * Copyright (c) 2000, 2015 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -57,10 +57,10 @@ import org.eclipse.search.ui.ISearchResultView; public class SearchResultView extends ViewPart implements ISearchResultView { - private static Map fgLabelProviders= new HashMap(5); + private static Map<String, ILabelProvider> fgLabelProviders= new HashMap<>(5); private SearchResultViewer fViewer; - private Map fResponse; + private Map<Object, SearchResultViewEntry> fResponse; private IMemento fMemento; private IPropertyChangeListener fPropertyChangeListener; private CellEditorActionHandler fCellEditorActionHandler; @@ -183,7 +183,7 @@ public class SearchResultView extends ViewPart implements ISearchResultView { ILabelProvider getLabelProvider(String pageId) { if (pageId != null) - return (ILabelProvider)fgLabelProviders.get(pageId); + return fgLabelProviders.get(pageId); return null; } @@ -245,10 +245,10 @@ public class SearchResultView extends ViewPart implements ISearchResultView { Assert.isNotNull(pluralLabelPattern); Assert.isNotNull(gotoAction); - fResponse= new HashMap(500); + fResponse= new HashMap<>(500); setGotoMarkerAction(gotoAction); - ILabelProvider oldLabelProvider= (ILabelProvider)fgLabelProviders.get(pageId); + ILabelProvider oldLabelProvider= fgLabelProviders.get(pageId); if (oldLabelProvider != null) oldLabelProvider.dispose(); fgLabelProviders.put(pageId, labelProvider); @@ -301,10 +301,10 @@ public class SearchResultView extends ViewPart implements ISearchResultView { Assert.isNotNull(pluralLabelPattern); Assert.isNotNull(gotoAction); - fResponse= new HashMap(500); + fResponse= new HashMap<>(500); setGotoMarkerAction(gotoAction); - ILabelProvider oldLabelProvider= (ILabelProvider)fgLabelProviders.get(pageId); + ILabelProvider oldLabelProvider= fgLabelProviders.get(pageId); if (oldLabelProvider != null) oldLabelProvider.dispose(); fgLabelProviders.put(pageId, labelProvider); @@ -327,7 +327,7 @@ public class SearchResultView extends ViewPart implements ISearchResultView { */ @Override public void addMatch(String description, Object groupByKey, IResource resource, IMarker marker) { - SearchResultViewEntry entry= (SearchResultViewEntry)fResponse.get(groupByKey); + SearchResultViewEntry entry= fResponse.get(groupByKey); if (entry == null) { entry= new SearchResultViewEntry(groupByKey, resource); fResponse.put(groupByKey, entry); @@ -341,7 +341,7 @@ public class SearchResultView extends ViewPart implements ISearchResultView { */ @Override public void searchFinished() { - SearchManager.getDefault().searchFinished(new ArrayList(fResponse.values())); + SearchManager.getDefault().searchFinished(new ArrayList<>(fResponse.values())); fResponse= null; } } diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchResultViewEntry.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchResultViewEntry.java index 5e73850e8a2..485f60bd8e1 100644 --- a/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchResultViewEntry.java +++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchResultViewEntry.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2008 IBM Corporation and others. + * Copyright (c) 2000, 2015 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -34,8 +34,8 @@ public class SearchResultViewEntry extends PlatformObject implements ISearchResu private Object fGroupByKey= null; private IResource fResource= null; private IMarker fMarker= null; - private ArrayList fMarkers= null; - private ArrayList fAttributes; + private ArrayList<IMarker> fMarkers= null; + private ArrayList<Map<String, Object>> fAttributes; private int fSelectedMarkerIndex; private long fModificationStamp= IResource.NULL_STAMP; private String fMarkerType; @@ -77,9 +77,9 @@ public class SearchResultViewEntry extends PlatformObject implements ISearchResu return false; } - List getAttributesPerMarker() { + List<Map<String, Object>> getAttributesPerMarker() { if (fAttributes == null) - return new ArrayList(0); + return new ArrayList<>(0); return fAttributes; } @@ -109,7 +109,7 @@ public class SearchResultViewEntry extends PlatformObject implements ISearchResu return; } if (fMarkers == null) { - fMarkers= new ArrayList(10); + fMarkers= new ArrayList<>(10); addByStartpos(fMarkers, fMarker); } addByStartpos(fMarkers, marker); @@ -125,15 +125,15 @@ public class SearchResultViewEntry extends PlatformObject implements ISearchResu if (fMarkers == null && fMarker == null) return null; if (fMarkers != null && fSelectedMarkerIndex >= 0) - return (IMarker)fMarkers.get(fSelectedMarkerIndex); + return fMarkers.get(fSelectedMarkerIndex); return fMarker; } - public List getMarkers() { + public List<IMarker> getMarkers() { if (fMarkers == null && fMarker == null) - return new ArrayList(0); + return new ArrayList<>(0); else if (fMarkers == null && fMarker != null) { - List markers= new ArrayList(1); + List<IMarker> markers= new ArrayList<>(1); markers.add(fMarker); return markers; } @@ -165,7 +165,7 @@ public class SearchResultViewEntry extends PlatformObject implements ISearchResu else { fMarkers.remove(marker); if (fMarkers.size() == 1) { - fMarker= (IMarker)fMarkers.get(0); + fMarker= fMarkers.get(0); fMarkers= null; } } @@ -174,12 +174,12 @@ public class SearchResultViewEntry extends PlatformObject implements ISearchResu void backupMarkers() { if (fResource != null) fModificationStamp= fResource.getModificationStamp(); - List markers= getMarkers(); - fAttributes= new ArrayList(markers.size()); - Iterator iter= markers.iterator(); + List<IMarker> markers= getMarkers(); + fAttributes= new ArrayList<>(markers.size()); + Iterator<IMarker> iter= markers.iterator(); while (iter.hasNext()) { - IMarker marker= (IMarker)iter.next(); - Map attributes= null; + IMarker marker= iter.next(); + Map<String, Object> attributes= null; try { attributes= marker.getAttributes(); } catch (CoreException ex) { @@ -190,11 +190,11 @@ public class SearchResultViewEntry extends PlatformObject implements ISearchResu } } - private void addByStartpos(ArrayList markers, IMarker marker) { + private void addByStartpos(ArrayList<IMarker> markers, IMarker marker) { int startPos= marker.getAttribute(IMarker.CHAR_START, -1); int i= 0; int markerCount= markers.size(); - while (i < markerCount && startPos >= ((IMarker)markers.get(i)).getAttribute(IMarker.CHAR_START, -1)) + while (i < markerCount && startPos >= markers.get(i).getAttribute(IMarker.CHAR_START, -1)) i++; markers.add(i, marker); if (i == 0) @@ -202,7 +202,7 @@ public class SearchResultViewEntry extends PlatformObject implements ISearchResu } @Override - public Object getAdapter(Class adapter) { + public <T> T getAdapter(Class<T> adapter) { return super.getAdapter(adapter); } } diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchResultViewEntryAdapterFactory.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchResultViewEntryAdapterFactory.java index 7151156a8bd..b122d1628b9 100644 --- a/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchResultViewEntryAdapterFactory.java +++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchResultViewEntryAdapterFactory.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2008 IBM Corporation and others. + * Copyright (c) 2000, 2015 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -27,23 +27,24 @@ import org.eclipse.search.ui.ISearchResultViewEntry; @Deprecated public class SearchResultViewEntryAdapterFactory implements IAdapterFactory { - private static Class[] PROPERTIES= new Class[] { + private static Class<?>[] PROPERTIES= new Class[] { IResource.class, IMarker.class, }; @Override - public Class[] getAdapterList() { + public Class<?>[] getAdapterList() { return PROPERTIES; } + @SuppressWarnings("unchecked") @Override - public Object getAdapter(Object element, Class key) { + public <T> T getAdapter(Object element, Class<T> key) { ISearchResultViewEntry entry= (ISearchResultViewEntry) element; if (IMarker.class.equals(key)) { - return entry.getSelectedMarker(); + return (T) entry.getSelectedMarker(); } if (IResource.class.equals(key)) { IResource resource= entry.getResource(); @@ -54,7 +55,7 @@ public class SearchResultViewEntryAdapterFactory implements IAdapterFactory { */ int type= resource.getType(); if (type != IResource.PROJECT && type != IResource.ROOT) - return resource; + return (T) resource; } return null; } diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchResultViewer.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchResultViewer.java index aa53a3c97bb..4af2237ee0f 100644 --- a/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchResultViewer.java +++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchResultViewer.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2008 IBM Corporation and others. + * Copyright (c) 2000, 2015 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -347,7 +347,7 @@ public class SearchResultViewer extends TableViewer { if (getSelectedEntriesCount() == 0) return false; - Iterator iter= Collections.EMPTY_LIST.iterator(); + Iterator<?> iter= Collections.emptyList().iterator(); ISelection selection= getSelection(); if (selection instanceof IStructuredSelection) iter= ((IStructuredSelection)selection).iterator(); @@ -677,7 +677,7 @@ public class SearchResultViewer extends TableViewer { protected void handleLabelProviderChanged(LabelProviderChangedEvent event) { Object[] changed= event.getElements(); if (changed != null && !fResourceToItemsMapper.isEmpty()) { - ArrayList others= new ArrayList(changed.length); + ArrayList<Object> others= new ArrayList<>(changed.length); for (int i= 0; i < changed.length; i++) { Object curr= changed[i]; if (curr instanceof IResource) diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/SelectAllAction.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/SelectAllAction.java index 1b4be53d703..1e497535be0 100644 --- a/org.eclipse.search/search/org/eclipse/search/internal/ui/SelectAllAction.java +++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/SelectAllAction.java @@ -44,7 +44,7 @@ public class SelectAllAction extends Action { fViewer= viewer; } - private void collectExpandedAndVisible(TreeItem[] items, List result) { + private void collectExpandedAndVisible(TreeItem[] items, List<TreeItem> result) { for (int i= 0; i < items.length; i++) { TreeItem item= items[i]; result.add(item); @@ -63,10 +63,10 @@ public class SelectAllAction extends Action { return; } if (fViewer instanceof TreeViewer) { - ArrayList allVisible= new ArrayList(); + ArrayList<TreeItem> allVisible= new ArrayList<>(); Tree tree= ((TreeViewer) fViewer).getTree(); collectExpandedAndVisible(tree.getItems(), allVisible); - tree.setSelection((TreeItem[]) allVisible.toArray(new TreeItem[allVisible.size()])); + tree.setSelection(allVisible.toArray(new TreeItem[allVisible.size()])); } else if (fViewer instanceof TableViewer) { ((TableViewer) fViewer).getTable().selectAll(); // force viewer selection change diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/ShowSearchesAction.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/ShowSearchesAction.java index 10ee4dd15e5..4c504e5e774 100644 --- a/org.eclipse.search/search/org/eclipse/search/internal/ui/ShowSearchesAction.java +++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/ShowSearchesAction.java @@ -36,7 +36,7 @@ class ShowSearchesAction extends Action { private static final class SearchesLabelProvider extends LabelProvider { - private ArrayList fImages= new ArrayList(); + private ArrayList<Image> fImages= new ArrayList<>(); @Override public String getText(Object element) { @@ -61,9 +61,9 @@ class ShowSearchesAction extends Action { @Override public void dispose() { - Iterator iter= fImages.iterator(); + Iterator<Image> iter= fImages.iterator(); while (iter.hasNext()) - ((Image)iter.next()).dispose(); + iter.next().dispose(); fImages= null; } @@ -85,7 +85,7 @@ class ShowSearchesAction extends Action { } public void run(boolean showAll) { - Iterator iter= SearchManager.getDefault().getPreviousSearches().iterator(); + Iterator<Search> iter= SearchManager.getDefault().getPreviousSearches().iterator(); int cutOffSize; if (showAll) cutOffSize= 0; @@ -94,10 +94,10 @@ class ShowSearchesAction extends Action { int size= SearchManager.getDefault().getPreviousSearches().size() - cutOffSize; Search selectedSearch= SearchManager.getDefault().getCurrentSearch(); Action selectedAction = null; - ArrayList input= new ArrayList(size); + ArrayList<Action> input= new ArrayList<>(size); int i= 0; while (iter.hasNext()) { - Search search= (Search)iter.next(); + Search search= iter.next(); if (i++ < cutOffSize) continue; Action action= new ShowSearchAction(search); @@ -132,7 +132,7 @@ class ShowSearchesAction extends Action { dlg.setInitialSelections(selected); } if (dlg.open() == Window.OK) { - List result= Arrays.asList(dlg.getResult()); + List<Object> result= Arrays.asList(dlg.getResult()); if (result != null && result.size() == 1) { ((ShowSearchAction)result.get(0)).run(); } diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/SortDropDownAction.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/SortDropDownAction.java index 8e973814622..0130c9cc70c 100644 --- a/org.eclipse.search/search/org/eclipse/search/internal/ui/SortDropDownAction.java +++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/SortDropDownAction.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2008 IBM Corporation and others. + * Copyright (c) 2000, 2015 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -13,6 +13,7 @@ package org.eclipse.search.internal.ui; import java.util.HashMap; import java.util.Iterator; import java.util.Map; +import java.util.Map.Entry; import org.eclipse.swt.custom.BusyIndicator; import org.eclipse.swt.widgets.Control; @@ -40,12 +41,12 @@ class SortDropDownAction extends Action implements IMenuCreator { private static final String TAG_PAGE_ID= "pageId"; //$NON-NLS-1$ private static final String TAG_SORTER_ID= "sorterId"; //$NON-NLS-1$ - private static Map fgLastCheckedForType= new HashMap(5); + private static Map<String, SorterDescriptor> fgLastCheckedForType= new HashMap<>(5); private SearchResultViewer fViewer; private String fPageId; private Menu fMenu; - private Map fLastCheckedForType; + private Map<String, SorterDescriptor> fLastCheckedForType; public SortDropDownAction(SearchResultViewer viewer) { super(SearchMessages.SortDropDownAction_label); @@ -53,7 +54,7 @@ class SortDropDownAction extends Action implements IMenuCreator { fViewer= viewer; setToolTipText(SearchMessages.SortDropDownAction_tooltip); setMenuCreator(this); - fLastCheckedForType= new HashMap(5); + fLastCheckedForType= new HashMap<>(5); } @Override @@ -70,9 +71,9 @@ class SortDropDownAction extends Action implements IMenuCreator { void setPageId(String pageId) { fPageId= pageId; - SorterDescriptor sorterDesc= (SorterDescriptor)fLastCheckedForType.get(pageId); + SorterDescriptor sorterDesc= fLastCheckedForType.get(pageId); if (sorterDesc == null) - sorterDesc= (SorterDescriptor)fgLastCheckedForType.get(pageId); + sorterDesc= fgLastCheckedForType.get(pageId); if (sorterDesc == null) sorterDesc= findSorter(fPageId); if (sorterDesc != null) { @@ -90,7 +91,7 @@ class SortDropDownAction extends Action implements IMenuCreator { fMenu= new Menu(parent); - Iterator iter= SearchPlugin.getDefault().getSorterDescriptors().iterator(); + Iterator<SorterDescriptor> iter= SearchPlugin.getDefault().getSorterDescriptors().iterator(); while (iter.hasNext()) { Object value= fLastCheckedForType.get(fPageId); final String checkedId; @@ -99,7 +100,7 @@ class SortDropDownAction extends Action implements IMenuCreator { else checkedId= ""; //$NON-NLS-1$ - final SorterDescriptor sorterDesc= (SorterDescriptor) iter.next(); + final SorterDescriptor sorterDesc= iter.next(); if (!sorterDesc.getPageId().equals(fPageId) && !sorterDesc.getPageId().equals("*")) //$NON-NLS-1$ continue; final ViewerSorter sorter= sorterDesc.createObject(); @@ -139,9 +140,9 @@ class SortDropDownAction extends Action implements IMenuCreator { } private SorterDescriptor findSorter(String pageId) { - Iterator iter= SearchPlugin.getDefault().getSorterDescriptors().iterator(); + Iterator<SorterDescriptor> iter= SearchPlugin.getDefault().getSorterDescriptors().iterator(); while (iter.hasNext()) { - SorterDescriptor sorterDesc= (SorterDescriptor)iter.next(); + SorterDescriptor sorterDesc= iter.next(); if (sorterDesc.getPageId().equals(pageId) || sorterDesc.getPageId().equals("*")) //$NON-NLS-1$ return sorterDesc; } @@ -149,9 +150,9 @@ class SortDropDownAction extends Action implements IMenuCreator { } private SorterDescriptor getSorter(String sorterId) { - Iterator iter= SearchPlugin.getDefault().getSorterDescriptors().iterator(); + Iterator<SorterDescriptor> iter= SearchPlugin.getDefault().getSorterDescriptors().iterator(); while (iter.hasNext()) { - SorterDescriptor sorterDesc= (SorterDescriptor)iter.next(); + SorterDescriptor sorterDesc= iter.next(); if (sorterDesc.getId().equals(sorterId)) return sorterDesc; } @@ -184,7 +185,7 @@ class SortDropDownAction extends Action implements IMenuCreator { restoreState(memento, fgLastCheckedForType, TAG_DEFAULT_SORTERS); } - private void restoreState(IMemento memento, Map map, String mapName) { + private void restoreState(IMemento memento, Map<String, SorterDescriptor> map, String mapName) { memento= memento.getChild(mapName); if (memento == null) return; @@ -203,22 +204,22 @@ class SortDropDownAction extends Action implements IMenuCreator { saveState(memento, fLastCheckedForType, TAG_SORTERS); } - private void saveState(IMemento memento, Map map, String mapName) { - Iterator iter= map.entrySet().iterator(); + private void saveState(IMemento memento, Map<String, SorterDescriptor> map, String mapName) { + Iterator<Entry<String, SorterDescriptor>> iter= map.entrySet().iterator(); memento= memento.createChild(mapName); while (iter.hasNext()) { IMemento mementoElement= memento.createChild(TAG_ELEMENT); - Map.Entry entry= (Map.Entry)iter.next(); - mementoElement.putString(TAG_PAGE_ID, (String)entry.getKey()); - mementoElement.putString(TAG_SORTER_ID, ((SorterDescriptor)entry.getValue()).getId()); + Entry<String, SorterDescriptor> entry= iter.next(); + mementoElement.putString(TAG_PAGE_ID, entry.getKey()); + mementoElement.putString(TAG_SORTER_ID, entry.getValue().getId()); } } int getSorterCount() { int count= 0; - Iterator iter= SearchPlugin.getDefault().getSorterDescriptors().iterator(); + Iterator<SorterDescriptor> iter= SearchPlugin.getDefault().getSorterDescriptors().iterator(); while (iter.hasNext()) { - SorterDescriptor sorterDesc= (SorterDescriptor)iter.next(); + SorterDescriptor sorterDesc= iter.next(); if (sorterDesc.getPageId().equals(fPageId) || sorterDesc.getPageId().equals("*")) //$NON-NLS-1$ count++; } diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/WorkingSetComparator.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/WorkingSetComparator.java index 9fbc46976b7..075c3511a60 100644 --- a/org.eclipse.search/search/org/eclipse/search/internal/ui/WorkingSetComparator.java +++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/WorkingSetComparator.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2008 IBM Corporation and others. + * Copyright (c) 2000, 2015 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -16,21 +16,14 @@ import com.ibm.icu.text.Collator; import org.eclipse.ui.IWorkingSet; -public class WorkingSetComparator implements Comparator { +public class WorkingSetComparator implements Comparator<IWorkingSet> { private Collator fCollator= Collator.getInstance(); @Override - public int compare(Object o1, Object o2) { - String name1= null; - String name2= null; - - if (o1 instanceof IWorkingSet) - name1= ((IWorkingSet)o1).getLabel(); - - if (o2 instanceof IWorkingSet) - name2= ((IWorkingSet)o2).getLabel(); - + public int compare(IWorkingSet o1, IWorkingSet o2) { + String name1= o1.getLabel(); + String name2= o2.getLabel(); return fCollator.compare(name1, name2); } } diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/text/EditorOpener.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/text/EditorOpener.java index 8b0744b8259..f907e685d61 100644 --- a/org.eclipse.search/search/org/eclipse/search/internal/ui/text/EditorOpener.java +++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/text/EditorOpener.java @@ -127,7 +127,7 @@ public class EditorOpener { IMarker marker= null; try { marker= file.createMarker(NewSearchUI.SEARCH_MARKER); - HashMap attributes= new HashMap(4); + HashMap<String, Integer> attributes= new HashMap<>(4); attributes.put(IMarker.CHAR_START, new Integer(offset)); attributes.put(IMarker.CHAR_END, new Integer(offset + length)); marker.setAttributes(attributes); diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/text/FileLabelProvider.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/text/FileLabelProvider.java index 6d90937d259..797e7f7a278 100644 --- a/org.eclipse.search/search/org/eclipse/search/internal/ui/text/FileLabelProvider.java +++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/text/FileLabelProvider.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2009 IBM Corporation and others. + * Copyright (c) 2000, 2015 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -21,11 +21,11 @@ import org.eclipse.swt.graphics.Image; import org.eclipse.core.resources.IResource; +import org.eclipse.jface.viewers.DelegatingStyledCellLabelProvider.IStyledLabelProvider; import org.eclipse.jface.viewers.ILabelProviderListener; import org.eclipse.jface.viewers.LabelProvider; import org.eclipse.jface.viewers.StyledCellLabelProvider; import org.eclipse.jface.viewers.StyledString; -import org.eclipse.jface.viewers.DelegatingStyledCellLabelProvider.IStyledLabelProvider; import org.eclipse.ui.model.WorkbenchLabelProvider; @@ -48,7 +48,7 @@ public class FileLabelProvider extends LabelProvider implements IStyledLabelProv private final WorkbenchLabelProvider fLabelProvider; private final AbstractTextSearchViewPage fPage; - private final Comparator fMatchComparator; + private final Comparator<FileMatch> fMatchComparator; private final Image fLineMatchImage; @@ -59,10 +59,10 @@ public class FileLabelProvider extends LabelProvider implements IStyledLabelProv fOrder= orderFlag; fPage= page; fLineMatchImage= SearchPluginImages.get(SearchPluginImages.IMG_OBJ_TEXT_SEARCH_LINE); - fMatchComparator= new Comparator() { + fMatchComparator= new Comparator<FileMatch>() { @Override - public int compare(Object o1, Object o2) { - return ((FileMatch) o1).getOriginalOffset() - ((FileMatch) o2).getOriginalOffset(); + public int compare(FileMatch o1, FileMatch o2) { + return o1.getOriginalOffset() - o2.getOriginalOffset(); } }; } @@ -116,7 +116,7 @@ public class FileLabelProvider extends LabelProvider implements IStyledLabelProv StyledString str= new StyledString(lineNumberString, StyledString.QUALIFIER_STYLER); - Match[] matches= lineElement.getMatches(fPage.getInput()); + FileMatch[] matches= lineElement.getMatches(fPage.getInput()); Arrays.sort(matches, fMatchComparator); String content= lineElement.getContents(); @@ -127,7 +127,7 @@ public class FileLabelProvider extends LabelProvider implements IStyledLabelProv int charsToCut= getCharsToCut(length, matches); // number of characters to leave away if the line is too long for (int i= 0; i < matches.length; i++) { - FileMatch match= (FileMatch) matches[i]; + FileMatch match= matches[i]; int start= Math.max(match.getOriginalOffset() - lineElement.getOffset(), 0); // append gap between last match and the new one if (pos < start) { diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/text/FileSearchPage.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/text/FileSearchPage.java index a40dcf2e78e..55d54928f5b 100644 --- a/org.eclipse.search/search/org/eclipse/search/internal/ui/text/FileSearchPage.java +++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/text/FileSearchPage.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2011 IBM Corporation and others. + * Copyright (c) 2000, 2015 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -104,7 +104,9 @@ public class FileSearchPage extends AbstractTextSearchViewPage implements IAdapt name1 = "";//$NON-NLS-1$ if (name2 == null) name2 = "";//$NON-NLS-1$ - return getComparator().compare(name1, name2); + @SuppressWarnings("unchecked") + int result= getComparator().compare(name1, name2); + return result; } } @@ -308,10 +310,11 @@ public class FileSearchPage extends AbstractTextSearchViewPage implements IAdapt memento.putInteger(KEY_LIMIT, getElementLimit().intValue()); } + @SuppressWarnings("unchecked") @Override - public Object getAdapter(Class adapter) { + public <T> T getAdapter(Class<T> adapter) { if (IShowInTargetList.class.equals(adapter)) { - return SHOW_IN_TARGET_LIST; + return (T) SHOW_IN_TARGET_LIST; } if (adapter == IShowInSource.class) { @@ -322,8 +325,8 @@ public class FileSearchPage extends AbstractTextSearchViewPage implements IAdapt ISelection selection= selectionProvider.getSelection(); if (selection instanceof IStructuredSelection) { IStructuredSelection structuredSelection= ((StructuredSelection)selection); - final Set newSelection= new HashSet(structuredSelection.size()); - Iterator iter= structuredSelection.iterator(); + final Set<Object> newSelection= new HashSet<>(structuredSelection.size()); + Iterator<?> iter= structuredSelection.iterator(); while (iter.hasNext()) { Object element= iter.next(); if (element instanceof LineElement) @@ -331,10 +334,10 @@ public class FileSearchPage extends AbstractTextSearchViewPage implements IAdapt newSelection.add(element); } - return new IShowInSource() { + return (T) new IShowInSource() { @Override public ShowInContext getShowInContext() { - return new ShowInContext(null, new StructuredSelection(new ArrayList(newSelection))); + return new ShowInContext(null, new StructuredSelection(new ArrayList<>(newSelection))); } }; } @@ -395,7 +398,7 @@ public class FileSearchPage extends AbstractTextSearchViewPage implements IAdapt } @Override - protected void evaluateChangedElements(Match[] matches, Set changedElements) { + protected void evaluateChangedElements(Match[] matches, Set<Object> changedElements) { if (showLineMatches()) { for (int i = 0; i < matches.length; i++) { changedElements.add(((FileMatch) matches[i]).getLineElement()); diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/text/FileSearchQuery.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/text/FileSearchQuery.java index 04328300593..1b47a288596 100644 --- a/org.eclipse.search/search/org/eclipse/search/internal/ui/text/FileSearchQuery.java +++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/text/FileSearchQuery.java @@ -52,7 +52,7 @@ public class FileSearchQuery implements ISearchQuery { private final boolean fSearchInBinaries; private final boolean fIsLightweightAutoRefresh; - private Map fCachedMatches; // map of IFile -> ArrayList of FileMatches + private Map<IFile, ArrayList<FileMatch>> fCachedMatches; private Object fLock= new Object(); private TextSearchResultCollector(AbstractTextSearchResult result, boolean isFileSearchOnly, boolean searchInBinaries) { @@ -89,7 +89,7 @@ public class FileSearchQuery implements ISearchQuery { @Override public boolean acceptPatternMatch(TextSearchMatchAccess matchRequestor) throws CoreException { - ArrayList matches; + ArrayList<FileMatch> matches; synchronized(fLock) { // fCachedMatches is set to null when the caller invokes endReporting(), // indicating that no further results are desired/expected, so discard @@ -97,7 +97,7 @@ public class FileSearchQuery implements ISearchQuery { if (fCachedMatches == null) { return false; } - matches= (ArrayList) fCachedMatches.get(matchRequestor.getFile()); + matches= fCachedMatches.get(matchRequestor.getFile()); } int matchOffset= matchRequestor.getMatchOffset(); @@ -120,9 +120,9 @@ public class FileSearchQuery implements ISearchQuery { if (fCachedMatches == null) { return false; } - matches= (ArrayList) fCachedMatches.get(matchRequestor.getFile()); + matches= fCachedMatches.get(matchRequestor.getFile()); if (matches == null) { - matches= new ArrayList(); + matches= new ArrayList<>(); fCachedMatches.put(matchRequestor.getFile(), matches); } matches.add(fileMatch); @@ -131,13 +131,13 @@ public class FileSearchQuery implements ISearchQuery { return true; } - private LineElement getLineElement(int offset, TextSearchMatchAccess matchRequestor, ArrayList matches) { + private LineElement getLineElement(int offset, TextSearchMatchAccess matchRequestor, ArrayList<FileMatch> matches) { int lineNumber= 1; int lineStart= 0; if (matches != null) { // match on same line as last? - FileMatch last= (FileMatch) matches.get(matches.size() - 1); + FileMatch last= matches.get(matches.size() - 1); LineElement lineElement= last.getLineElement(); if (lineElement.contains(offset)) { return lineElement; @@ -188,7 +188,7 @@ public class FileSearchQuery implements ISearchQuery { @Override public void beginReporting() { - fCachedMatches= new HashMap(); + fCachedMatches= new HashMap<>(); } @Override @@ -202,10 +202,10 @@ public class FileSearchQuery implements ISearchQuery { private void flushMatches() { synchronized (fLock) { if (fCachedMatches != null && !fCachedMatches.isEmpty()) { - Iterator it = fCachedMatches.values().iterator(); + Iterator<ArrayList<FileMatch>> it = fCachedMatches.values().iterator(); while(it.hasNext()) { - ArrayList matches= (ArrayList) it.next(); - fResult.addMatches((Match[]) matches.toArray(new Match[matches.size()])); + ArrayList<FileMatch> matches= it.next(); + fResult.addMatches(matches.toArray(new Match[matches.size()])); } fCachedMatches.clear(); } diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/text/FileTreeContentProvider.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/text/FileTreeContentProvider.java index d891cd5e2e7..8ee249cb20e 100644 --- a/org.eclipse.search/search/org/eclipse/search/internal/ui/text/FileTreeContentProvider.java +++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/text/FileTreeContentProvider.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2008 IBM Corporation and others. + * Copyright (c) 2000, 2015 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -36,7 +36,7 @@ public class FileTreeContentProvider implements ITreeContentProvider, IFileSearc private AbstractTextSearchResult fResult; private FileSearchPage fPage; private AbstractTreeViewer fTreeViewer; - private Map fChildrenMap; + private Map<Object, Set<Object>> fChildrenMap; FileTreeContentProvider(FileSearchPage page, AbstractTreeViewer viewer) { fPage= page; @@ -73,7 +73,7 @@ public class FileTreeContentProvider implements ITreeContentProvider, IFileSearc private synchronized void initialize(AbstractTextSearchResult result) { fResult= result; - fChildrenMap= new HashMap(); + fChildrenMap= new HashMap<>(); boolean showLineMatches= !((FileSearchQuery) fResult.getQuery()).isFileNameSearch(); if (result != null) { @@ -120,16 +120,16 @@ public class FileTreeContentProvider implements ITreeContentProvider, IFileSearc */ private boolean insertChild(Object parent, Object child) { - Set children= (Set) fChildrenMap.get(parent); + Set<Object> children= fChildrenMap.get(parent); if (children == null) { - children= new HashSet(); + children= new HashSet<>(); fChildrenMap.put(parent, children); } return children.add(child); } private boolean hasChild(Object parent, Object child) { - Set children= (Set) fChildrenMap.get(parent); + Set<Object> children= fChildrenMap.get(parent); return children != null && children.contains(child); } @@ -170,7 +170,7 @@ public class FileTreeContentProvider implements ITreeContentProvider, IFileSearc private void removeFromSiblings(Object element, Object parent) { - Set siblings= (Set) fChildrenMap.get(parent); + Set<Object> siblings= fChildrenMap.get(parent); if (siblings != null) { siblings.remove(element); } @@ -178,7 +178,7 @@ public class FileTreeContentProvider implements ITreeContentProvider, IFileSearc @Override public Object[] getChildren(Object parentElement) { - Set children= (Set) fChildrenMap.get(parentElement); + Set<Object> children= fChildrenMap.get(parentElement); if (children == null) return EMPTY_ARR; return children.toArray(); diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/text/LineElement.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/text/LineElement.java index 7d0e0c1019e..cb9c0d2ff16 100644 --- a/org.eclipse.search/search/org/eclipse/search/internal/ui/text/LineElement.java +++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/text/LineElement.java @@ -62,7 +62,7 @@ public class LineElement { } public FileMatch[] getMatches(AbstractTextSearchResult result) { - ArrayList res= new ArrayList(); + ArrayList<FileMatch> res= new ArrayList<>(); Match[] matches= result.getMatches(fParent); for (int i= 0; i < matches.length; i++) { FileMatch curr= (FileMatch) matches[i]; @@ -70,7 +70,7 @@ public class LineElement { res.add(curr); } } - return (FileMatch[]) res.toArray(new FileMatch[res.size()]); + return res.toArray(new FileMatch[res.size()]); } public int getNumberOfMatches(AbstractTextSearchResult result) { diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/text/ReplaceConfigurationPage.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/text/ReplaceConfigurationPage.java index 838c4a6828e..ee0710c580a 100644 --- a/org.eclipse.search/search/org/eclipse/search/internal/ui/text/ReplaceConfigurationPage.java +++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/text/ReplaceConfigurationPage.java @@ -196,7 +196,7 @@ public class ReplaceConfigurationPage extends UserInputWizardPage { private void storeSettings() { String[] items= fTextField.getItems(); - ArrayList history= new ArrayList(); + ArrayList<String> history= new ArrayList<>(); history.add(fTextField.getText()); int historySize= Math.min(items.length, 6); for (int i= 0; i < historySize; i++) { @@ -206,7 +206,7 @@ public class ReplaceConfigurationPage extends UserInputWizardPage { } } IDialogSettings settings= SearchPlugin.getDefault().getDialogSettings().addNewSection(SETTINGS_GROUP); - settings.put(SETTINGS_REPLACE_WITH, (String[]) history.toArray(new String[history.size()])); + settings.put(SETTINGS_REPLACE_WITH, history.toArray(new String[history.size()])); } diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/text/ReplaceRefactoring.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/text/ReplaceRefactoring.java index 67bde0296be..c8d7bcee13c 100644 --- a/org.eclipse.search/search/org/eclipse/search/internal/ui/text/ReplaceRefactoring.java +++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/text/ReplaceRefactoring.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2011 IBM Corporation and others. + * Copyright (c) 2007, 2015 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -19,6 +19,7 @@ import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; import java.util.Map; +import java.util.Set; import java.util.regex.Matcher; import java.util.regex.Pattern; import java.util.regex.PatternSyntaxException; @@ -87,16 +88,16 @@ public class ReplaceRefactoring extends Refactoring { private MatchGroup[] fMatchGroups; private Match[] fMatches; - private Map/*<URI,ArrayList<Match>*/ fIgnoredMatches; + private Map<URI, ArrayList<FileMatch>> fIgnoredMatches; private final FileSearchResult fResult; private final boolean fIsRemove; - public SearchResultUpdateChange(FileSearchResult result, MatchGroup[] matchGroups, Map ignoredMatches) { + public SearchResultUpdateChange(FileSearchResult result, MatchGroup[] matchGroups, Map<URI, ArrayList<FileMatch>> ignoredMatches) { this(result, null, ignoredMatches, true); fMatchGroups= matchGroups; } - private SearchResultUpdateChange(FileSearchResult result, Match[] matches, Map ignoredMatches, boolean isRemove) { + private SearchResultUpdateChange(FileSearchResult result, Match[] matches, Map<URI, ArrayList<FileMatch>> ignoredMatches, boolean isRemove) { fResult= result; fMatches= matches; fIgnoredMatches= ignoredMatches; @@ -124,7 +125,7 @@ public class ReplaceRefactoring extends Refactoring { private Match[] getMatches() { if (fMatches == null) { - ArrayList matches= new ArrayList(); + ArrayList<FileMatch> matches= new ArrayList<>(); for (int i= 0; i < fMatchGroups.length; i++) { MatchGroup curr= fMatchGroups[i]; if (curr.group.isEnabled()) { @@ -138,13 +139,13 @@ public class ReplaceRefactoring extends Refactoring { IFile file= match.getFile(); URI uri= file.getLocationURI(); if (uri != null) { - ArrayList ignoredMatches= (ArrayList)fIgnoredMatches.get(uri); + ArrayList<FileMatch> ignoredMatches= fIgnoredMatches.get(uri); if (ignoredMatches != null) matches.addAll(ignoredMatches); } } } - fMatches= (Match[]) matches.toArray(new Match[matches.size()]); + fMatches= matches.toArray(new Match[matches.size()]); fMatchGroups= null; } return fMatches; @@ -168,13 +169,13 @@ public class ReplaceRefactoring extends Refactoring { private final FileSearchResult fResult; private final Object[] fSelection; - private final HashMap/*<IFile,Set<Match>*/ fMatches; + private final HashMap<IFile, Set<FileMatch>> fMatches; /** Map that keeps already collected locations. */ - private final Map/*<URI,IFile>*/fAlreadyCollected; + private final Map<URI, IFile> fAlreadyCollected; /** Map that keeps ignored matches (can be null). */ - private Map/*<URI,ArrayList<Match>*/ fIgnoredMatches; + private Map<URI, ArrayList<FileMatch>> fIgnoredMatches; private String fReplaceString; @@ -186,8 +187,8 @@ public class ReplaceRefactoring extends Refactoring { fResult= result; fSelection= selection; - fMatches= new HashMap(); - fAlreadyCollected= new HashMap(selection != null ? selection.length : result.getElements().length); + fMatches= new HashMap<>(); + fAlreadyCollected= new HashMap<>(selection != null ? selection.length : result.getElements().length); fReplaceString= null; } @@ -244,7 +245,7 @@ public class ReplaceRefactoring extends Refactoring { } else if (object instanceof IFile) { Match[] matches= fResult.getMatches(object); if (matches.length > 0) { - Collection bucket= null; + Collection<FileMatch> bucket= null; for (int i= 0; i < matches.length; i++) { FileMatch fileMatch= (FileMatch) matches[i]; if (isMatchToBeIncluded(fileMatch)) { @@ -264,8 +265,8 @@ public class ReplaceRefactoring extends Refactoring { public int getNumberOfMatches() { int count= 0; - for (Iterator iterator= fMatches.values().iterator(); iterator.hasNext();) { - Collection bucket= (Collection) iterator.next(); + for (Iterator<Set<FileMatch>> iterator= fMatches.values().iterator(); iterator.hasNext();) { + Set<FileMatch> bucket= iterator.next(); count += bucket.size(); } return count; @@ -289,17 +290,17 @@ public class ReplaceRefactoring extends Refactoring { if (uri == null) return true; - for (Iterator iter= fAlreadyCollected.keySet().iterator(); iter.hasNext();) { - if (URIUtil.equals((URI)iter.next(), uri)) { + for (Iterator<URI> iter= fAlreadyCollected.keySet().iterator(); iter.hasNext();) { + if (URIUtil.equals(iter.next(), uri)) { if (file.equals(fAlreadyCollected.get(uri))) return true; // another FileMatch for an IFile which already had matches if (fIgnoredMatches == null) - fIgnoredMatches= new HashMap(); + fIgnoredMatches= new HashMap<>(); - ArrayList matches= (ArrayList)fIgnoredMatches.get(uri); + ArrayList<FileMatch> matches= fIgnoredMatches.get(uri); if (matches == null) { - matches= new ArrayList(); + matches= new ArrayList<>(); fIgnoredMatches.put(uri, matches); } matches.add(match); @@ -312,13 +313,13 @@ public class ReplaceRefactoring extends Refactoring { return true; } - private Collection getBucket(IFile file) { - Collection col= (Collection) fMatches.get(file); - if (col == null) { - col= new HashSet(); - fMatches.put(file, col); + private Set<FileMatch> getBucket(IFile file) { + Set<FileMatch> set= fMatches.get(file); + if (set == null) { + set= new HashSet<>(); + fMatches.put(file, set); } - return col; + return set; } @Override @@ -335,14 +336,14 @@ public class ReplaceRefactoring extends Refactoring { RefactoringStatus resultingStatus= new RefactoringStatus(); - Collection allFilesSet= fMatches.keySet(); - IFile[] allFiles= (IFile[]) allFilesSet.toArray(new IFile[allFilesSet.size()]); - Arrays.sort(allFiles, new Comparator() { + Collection<IFile> allFilesSet= fMatches.keySet(); + IFile[] allFiles= allFilesSet.toArray(new IFile[allFilesSet.size()]); + Arrays.sort(allFiles, new Comparator<IFile>() { private Collator fCollator= Collator.getInstance(); @Override - public int compare(Object o1, Object o2) { - String p1= ((IFile) o1).getFullPath().toString(); - String p2= ((IFile) o2).getFullPath().toString(); + public int compare(IFile o1, IFile o2) { + String p1= o1.getFullPath().toString(); + String p2= o2.getFullPath().toString(); return fCollator.compare(p1, p2); } }); @@ -354,12 +355,12 @@ public class ReplaceRefactoring extends Refactoring { CompositeChange compositeChange= new CompositeChange(SearchMessages.ReplaceRefactoring_composite_change_name); compositeChange.markAsSynthetic(); - ArrayList matchGroups= new ArrayList(); + ArrayList<MatchGroup> matchGroups= new ArrayList<>(); boolean hasChanges= false; try { for (int i= 0; i < allFiles.length; i++) { IFile file= allFiles[i]; - Collection bucket= (Collection) fMatches.get(file); + Set<FileMatch> bucket= fMatches.get(file); if (!bucket.isEmpty()) { try { TextChange change= createFileChange(file, pattern, bucket, resultingStatus, matchGroups); @@ -381,20 +382,20 @@ public class ReplaceRefactoring extends Refactoring { return RefactoringStatus.createFatalErrorStatus(SearchMessages.ReplaceRefactoring_error_no_changes); } - compositeChange.add(new SearchResultUpdateChange(fResult, (MatchGroup[])matchGroups.toArray(new MatchGroup[matchGroups.size()]), fIgnoredMatches)); + compositeChange.add(new SearchResultUpdateChange(fResult, matchGroups.toArray(new MatchGroup[matchGroups.size()]), fIgnoredMatches)); fChange= compositeChange; return resultingStatus; } private void checkFilesToBeChanged(IFile[] filesToBeChanged, RefactoringStatus resultingStatus) throws CoreException { - ArrayList readOnly= new ArrayList(); + ArrayList<IFile> readOnly= new ArrayList<>(); for (int i= 0; i < filesToBeChanged.length; i++) { IFile file= filesToBeChanged[i]; if (file.isReadOnly()) readOnly.add(file); } - IFile[] readOnlyFiles= (IFile[]) readOnly.toArray(new IFile[readOnly.size()]); + IFile[] readOnlyFiles= readOnly.toArray(new IFile[readOnly.size()]); IStatus status= ResourcesPlugin.getWorkspace().validateEdit(readOnlyFiles, getValidationContext()); if (status.getSeverity() == IStatus.CANCEL) { @@ -407,7 +408,7 @@ public class ReplaceRefactoring extends Refactoring { resultingStatus.merge(ResourceChangeChecker.checkFilesToBeChanged(filesToBeChanged, null)); } - private TextChange createFileChange(IFile file, Pattern pattern, Collection/*FileMatch*/ matches, RefactoringStatus resultingStatus, Collection matchGroups) throws PatternSyntaxException, CoreException { + private TextChange createFileChange(IFile file, Pattern pattern, Set<FileMatch> matches, RefactoringStatus resultingStatus, Collection<MatchGroup> matchGroups) throws PatternSyntaxException, CoreException { PositionTracker tracker= InternalSearchUI.getInstance().getPositionTracker(); TextFileChange change= new TextFileChange(Messages.format(SearchMessages.ReplaceRefactoring_group_label_change_for_file, file.getName()), file); @@ -424,8 +425,8 @@ public class ReplaceRefactoring extends Refactoring { IDocument document= textFileBuffer.getDocument(); String lineDelimiter= TextUtilities.getDefaultLineDelimiter(document); - for (Iterator iterator= matches.iterator(); iterator.hasNext();) { - FileMatch match= (FileMatch) iterator.next(); + for (Iterator<FileMatch> iterator= matches.iterator(); iterator.hasNext();) { + FileMatch match= iterator.next(); int offset= match.getOffset(); int length= match.getLength(); Position currentPosition= tracker.getCurrentPosition(match); diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/text/TextSearchPage.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/text/TextSearchPage.java index 039f1128bfb..5d81904ee4f 100644 --- a/org.eclipse.search/search/org/eclipse/search/internal/ui/text/TextSearchPage.java +++ b/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 List<SearchPatternData> fPreviousSearchPatterns= new ArrayList<>(HISTORY_SIZE); private boolean fFirstTime= true; private boolean fIsCaseSensitive; @@ -336,10 +336,10 @@ public class TextSearchPage extends DialogPage implements ISearchPage, IReplaceP } private FileTextSearchScope getSelectedResourcesScope() { - HashSet resources= new HashSet(); + HashSet<IResource> resources= new HashSet<>(); ISelection sel= getContainer().getSelection(); if (sel instanceof IStructuredSelection && !sel.isEmpty()) { - Iterator iter= ((IStructuredSelection) sel).iterator(); + Iterator<?> iter= ((IStructuredSelection) sel).iterator(); while (iter.hasNext()) { Object curr= iter.next(); if (curr instanceof IWorkingSet) { @@ -368,7 +368,7 @@ public class TextSearchPage extends DialogPage implements ISearchPage, IReplaceP } else if (getContainer().getActiveEditorInput() != null) { resources.add(getContainer().getActiveEditorInput().getAdapter(IFile.class)); } - IResource[] arr= (IResource[]) resources.toArray(new IResource[resources.size()]); + IResource[] arr= resources.toArray(new IResource[resources.size()]); return FileTextSearchScope.newSearchScope(arr, getExtensions(), fSearchDerived); } @@ -389,8 +389,8 @@ public class TextSearchPage extends DialogPage implements ISearchPage, IReplaceP private SearchPatternData findInPrevious(String pattern) { - for (Iterator iter= fPreviousSearchPatterns.iterator(); iter.hasNext();) { - SearchPatternData element= (SearchPatternData) iter.next(); + for (Iterator<SearchPatternData> iter= fPreviousSearchPatterns.iterator(); iter.hasNext();) { + SearchPatternData element= iter.next(); if (pattern.equals(element.textPattern)) { return element; } @@ -421,22 +421,22 @@ public class TextSearchPage extends DialogPage implements ISearchPage, IReplaceP } private String[] getPreviousExtensionsOldStyle() { - List extensions= new ArrayList(fPreviousSearchPatterns.size()); + List<String> extensions= new ArrayList<>(fPreviousSearchPatterns.size()); int size= fPreviousSearchPatterns.size(); for (int i= 0; i < size; i++) { - SearchPatternData data= (SearchPatternData)fPreviousSearchPatterns.get(i); + SearchPatternData data= fPreviousSearchPatterns.get(i); String text= FileTypeEditor.typesToString(data.fileNamePatterns); if (!extensions.contains(text)) extensions.add(text); } - return (String[])extensions.toArray(new String[extensions.size()]); + return extensions.toArray(new String[extensions.size()]); } private String[] getPreviousSearchPatterns() { int size= fPreviousSearchPatterns.size(); String [] patterns= new String[size]; for (int i= 0; i < size; i++) - patterns[i]= ((SearchPatternData) fPreviousSearchPatterns.get(i)).textPattern; + patterns[i]= fPreviousSearchPatterns.get(i).textPattern; return patterns; } @@ -632,7 +632,7 @@ public class TextSearchPage extends DialogPage implements ISearchPage, IReplaceP if (selectionIndex < 0 || selectionIndex >= fPreviousSearchPatterns.size()) return; - SearchPatternData patternData= (SearchPatternData) fPreviousSearchPatterns.get(selectionIndex); + SearchPatternData patternData= fPreviousSearchPatterns.get(selectionIndex); if (!fPattern.getText().equals(patternData.textPattern)) return; fIsCaseSensitiveCheckbox.setSelection(patternData.isCaseSensitive); @@ -852,7 +852,7 @@ public class TextSearchPage extends DialogPage implements ISearchPage, IReplaceP // ignore } - Set previousExtensions= new LinkedHashSet(HISTORY_SIZE); + Set<String> previousExtensions= new LinkedHashSet<>(HISTORY_SIZE); IDialogSettings extensionsSettings= s.getSection(STORE_EXTENSIONS); if (extensionsSettings != null) { for (int i= 0; i < HISTORY_SIZE; i++) { @@ -883,13 +883,13 @@ public class TextSearchPage extends DialogPage implements ISearchPage, IReplaceP s.put(STORE_HISTORY_SIZE, historySize); for (int i= 0; i < historySize; i++) { IDialogSettings histSettings= s.addNewSection(STORE_HISTORY + i); - SearchPatternData data= ((SearchPatternData) fPreviousSearchPatterns.get(i)); + SearchPatternData data= fPreviousSearchPatterns.get(i); data.store(histSettings); } IDialogSettings extensionsSettings= s.addNewSection(STORE_EXTENSIONS); extensionsSettings.put(Integer.toString(0), fExtensions.getText()); - Set extensions= new HashSet(HISTORY_SIZE); + Set<String> extensions= new HashSet<>(HISTORY_SIZE); extensions.add(fExtensions.getText()); int length= Math.min(fExtensions.getItemCount(), HISTORY_SIZE - 1); int j= 1; diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/util/ExtendedDialogWindow.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/util/ExtendedDialogWindow.java index c479282aaa0..70819f64665 100644 --- a/org.eclipse.search/search/org/eclipse/search/internal/ui/util/ExtendedDialogWindow.java +++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/util/ExtendedDialogWindow.java @@ -47,7 +47,7 @@ public abstract class ExtendedDialogWindow extends TrayDialog implements IRunnab private Control fContents; private Button fCancelButton; - private List fActionButtons; + private List<Button> fActionButtons; // The number of long running operation executed from the dialog. private long fActiveRunningOperations; @@ -60,7 +60,7 @@ public abstract class ExtendedDialogWindow extends TrayDialog implements IRunnab public ExtendedDialogWindow(Shell shell) { super(shell); - fActionButtons= new ArrayList(); + fActionButtons= new ArrayList<>(); } @Override @@ -174,8 +174,8 @@ public abstract class ExtendedDialogWindow extends TrayDialog implements IRunnab * @param state The new state */ public void setPerformActionEnabled(boolean state) { - for (Iterator buttons = fActionButtons.iterator(); buttons.hasNext(); ) { - Button element = (Button) buttons.next(); + for (Iterator<Button> buttons = fActionButtons.iterator(); buttons.hasNext(); ) { + Button element = buttons.next(); element.setEnabled(state); } } @@ -211,7 +211,7 @@ public abstract class ExtendedDialogWindow extends TrayDialog implements IRunnab * @return The saved UI state. */ protected synchronized Object aboutToStart(boolean enableCancelButton) { - HashMap savedState= null; + HashMap<Object, Object> savedState= null; Shell shell= getShell(); if (shell != null) { Display d= shell.getDisplay(); @@ -257,7 +257,8 @@ public abstract class ExtendedDialogWindow extends TrayDialog implements IRunnab fProgressMonitorPart.removeFromCancelComponent(fCancelButton); } - HashMap state= (HashMap)savedState; + @SuppressWarnings("unchecked") + HashMap<Object, Object> state= (HashMap<Object, Object>)savedState; restoreUIState(state); setDisplayCursor(shell.getDisplay(), null); @@ -276,10 +277,10 @@ public abstract class ExtendedDialogWindow extends TrayDialog implements IRunnab //---- UI state save and restoring --------------------------------------------- - private void restoreUIState(HashMap state) { + private void restoreUIState(HashMap<Object, Object> state) { restoreEnableState(fCancelButton, state); - for (Iterator actionButtons = fActionButtons.iterator(); actionButtons.hasNext(); ) { - Button button = (Button) actionButtons.next(); + for (Iterator<Button> actionButtons = fActionButtons.iterator(); actionButtons.hasNext(); ) { + Button button = actionButtons.next(); restoreEnableState(button, state); } ControlEnableState pageState= (ControlEnableState)state.get("tabForm"); //$NON-NLS-1$ @@ -289,7 +290,7 @@ public abstract class ExtendedDialogWindow extends TrayDialog implements IRunnab /* * Restores the enable state of the given control. */ - protected void restoreEnableState(Control w, HashMap h) { + protected void restoreEnableState(Control w, HashMap<Object, Object> h) { if (!w.isDisposed()) { Boolean b= (Boolean)h.get(w); if (b != null) @@ -297,11 +298,11 @@ public abstract class ExtendedDialogWindow extends TrayDialog implements IRunnab } } - private HashMap saveUIState(boolean keepCancelEnabled) { - HashMap savedState= new HashMap(10); + private HashMap<Object, Object> saveUIState(boolean keepCancelEnabled) { + HashMap<Object, Object> savedState= new HashMap<>(10); saveEnableStateAndSet(fCancelButton, savedState, keepCancelEnabled); - for (Iterator actionButtons = fActionButtons.iterator(); actionButtons.hasNext(); ) { - Button button = (Button) actionButtons.next(); + for (Iterator<Button> actionButtons = fActionButtons.iterator(); actionButtons.hasNext(); ) { + Button button = actionButtons.next(); saveEnableStateAndSet(button, savedState, false); } savedState.put("tabForm", ControlEnableState.disable(fContents)); //$NON-NLS-1$ @@ -309,7 +310,7 @@ public abstract class ExtendedDialogWindow extends TrayDialog implements IRunnab return savedState; } - private void saveEnableStateAndSet(Control w, HashMap h, boolean enabled) { + private void saveEnableStateAndSet(Control w, HashMap<Object, Object> h, boolean enabled) { if (!w.isDisposed()) { h.put(w, Boolean.valueOf(w.isEnabled())); w.setEnabled(enabled); diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/util/FileLabelProvider.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/util/FileLabelProvider.java index 9c7418971d8..91bae8fe13a 100644 --- a/org.eclipse.search/search/org/eclipse/search/internal/ui/util/FileLabelProvider.java +++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/util/FileLabelProvider.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2008 IBM Corporation and others. + * Copyright (c) 2000, 2015 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -45,7 +45,7 @@ public class FileLabelProvider extends LabelProvider { private ILabelDecorator fDecorator; private int fOrder; - private String[] fArgs= new String[2]; + private Object[] fArgs= new String[2]; public FileLabelProvider(int orderFlag) { fDecorator= PlatformUI.getWorkbench().getDecoratorManager().getLabelDecorator(); diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/util/FileTypeEditor.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/util/FileTypeEditor.java index e5fb3e9cacc..f8cd8e8928e 100644 --- a/org.eclipse.search/search/org/eclipse/search/internal/ui/util/FileTypeEditor.java +++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/util/FileTypeEditor.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2008 IBM Corporation and others. + * Copyright (c) 2000, 2015 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -38,11 +38,8 @@ public class FileTypeEditor extends SelectionAdapter implements DisposeListener private final static String TYPE_DELIMITER= SearchMessages.FileTypeEditor_typeDelimiter; public final static String FILE_PATTERN_NEGATOR= "!"; //$NON-NLS-1$ - private static final Comparator FILE_TYPES_COMPARATOR= new Comparator() { + private static final Comparator<String> FILE_TYPES_COMPARATOR= new Comparator<String>() { @Override - public int compare(Object o1, Object o2) { - return compare((String) o1, (String) o2); - } public int compare(String fp1, String fp2) { boolean isNegative1= fp1.startsWith(FILE_PATTERN_NEGATOR); boolean isNegative2= fp2.startsWith(FILE_PATTERN_NEGATOR); @@ -78,14 +75,14 @@ public class FileTypeEditor extends SelectionAdapter implements DisposeListener } public String[] getFileTypes() { - Set result= new HashSet(); + Set<String> result= new HashSet<>(); StringTokenizer tokenizer= new StringTokenizer(fTextField.getText(), TYPE_DELIMITER); while (tokenizer.hasMoreTokens()) { String currentExtension= tokenizer.nextToken().trim(); result.add(currentExtension); } - return (String[]) result.toArray(new String[result.size()]); + return result.toArray(new String[result.size()]); } public void setFileTypes(String[] types) { @@ -96,7 +93,7 @@ public class FileTypeEditor extends SelectionAdapter implements DisposeListener TypeFilteringDialog dialog= new TypeFilteringDialog(fTextField.getShell(), Arrays.asList(getFileTypes())); if (dialog.open() == Window.OK) { Object[] result= dialog.getResult(); - HashSet patterns= new HashSet(); + HashSet<String> patterns= new HashSet<>(); boolean starIncluded= false; for (int i= 0; i < result.length; i++) { String curr= result[i].toString(); @@ -109,7 +106,7 @@ public class FileTypeEditor extends SelectionAdapter implements DisposeListener if (patterns.isEmpty() && starIncluded) { // remove star when other file extensions active patterns.add("*"); //$NON-NLS-1$ } - String[] filePatterns= (String[]) patterns.toArray(new String[patterns.size()]); + String[] filePatterns= patterns.toArray(new String[patterns.size()]); Arrays.sort(filePatterns); setFileTypes(filePatterns); } |