diff options
| author | Markus Keller | 2017-03-07 18:56:18 +0000 |
|---|---|---|
| committer | Dani Megert | 2017-03-08 17:53:48 +0000 |
| commit | 8253bfb80f6510e5d1c7e2e757af04dd11343cac (patch) | |
| tree | 76fa0c62dae8ee5ad24e0e7ec2639fcebd7b53b8 | |
| parent | dad356880b62128e58665dd3e641e51ab61e03c0 (diff) | |
| download | eclipse.platform.text-8253bfb80f6510e5d1c7e2e757af04dd11343cac.tar.gz eclipse.platform.text-8253bfb80f6510e5d1c7e2e757af04dd11343cac.tar.xz eclipse.platform.text-8253bfb80f6510e5d1c7e2e757af04dd11343cac.zip | |
Bug 513274: Real "Unlikely argument type" problem in SearchY20170309-1000S4_7_0_M6I20170311-2000I20170310-2000I20170308-2000
Change-Id: If4355d1fb5d59fa8f76d37f84b743e891e2ec611
| -rw-r--r-- | org.eclipse.search/new search/org/eclipse/search2/internal/ui/InternalSearchUI.java | 2 | ||||
| -rw-r--r-- | org.eclipse.search/search/org/eclipse/search/internal/ui/ResourceToItemsMapper.java | 3 |
2 files changed, 3 insertions, 2 deletions
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 99ac2018bee..70a539cb5cb 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 @@ public class InternalSearchUI { 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 8e74e8a6e9e..f43f97603ae 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 @@ class ResourceToItemsMapper { 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 @@ class ResourceToItemsMapper { * @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) { |