| commit | 8253bfb80f6510e5d1c7e2e757af04dd11343cac | [log] [tgz] |
|---|---|---|
| author | Markus Keller <markus_keller@ch.ibm.com> | Tue Mar 07 19:56:18 2017 +0100 |
| committer | Dani Megert <Daniel_Megert@ch.ibm.com> | Wed Mar 08 13:53:48 2017 -0400 |
| tree | 76fa0c62dae8ee5ad24e0e7ec2639fcebd7b53b8 | |
| parent | dad356880b62128e58665dd3e641e51ab61e03c0 [diff] |
Bug 513274: Real "Unlikely argument type" problem in Search Change-Id: If4355d1fb5d59fa8f76d37f84b743e891e2ec611
diff --git a/org.eclipse.search/new search/org/eclipse/search2/internal/ui/InternalSearchUI.java b/org.eclipse.search/new search/org/eclipse/search2/internal/ui/InternalSearchUI.java index 99ac201..70a539c 100644 --- a/org.eclipse.search/new search/org/eclipse/search2/internal/ui/InternalSearchUI.java +++ b/org.eclipse.search/new search/org/eclipse/search2/internal/ui/InternalSearchUI.java
@@ -114,7 +114,7 @@ private void searchJobFinished(SearchJobRecord record) { record.isRunning= false; - fSearchJobs.remove(record); + fSearchJobs.remove(record.query); getSearchManager().queryFinished(record.query); }
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 8e74e8a..f43f976 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
@@ -37,7 +37,7 @@ private static final int NUMBER_LIST_REUSE= 10; - // map from IResource to Item | List<Item> + /** map from IResource to {@code Item | List<Item>} **/ private HashMap<IResource, Object> fResourceToItem; private Stack<List<Item>> fReuseLists; @@ -122,6 +122,7 @@ * @param element element to remove * @param item The item used for the element */ + @SuppressWarnings("unlikely-arg-type") public void removeFromMap(Object element, Item item) { IResource resource= ((ISearchResultViewEntry)element).getResource(); if (resource != null) {