diff --git a/bundles/org.eclipse.search/META-INF/MANIFEST.MF b/bundles/org.eclipse.search/META-INF/MANIFEST.MF index 831eb9da3a8..73ffbc268a5 100644 --- a/bundles/org.eclipse.search/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.search/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.search; singleton:=true -Bundle-Version: 3.17.100.qualifier +Bundle-Version: 3.17.200.qualifier Bundle-Activator: org.eclipse.search.internal.ui.SearchPlugin Bundle-ActivationPolicy: lazy Bundle-Vendor: %providerName diff --git a/bundles/org.eclipse.search/newsearch/org/eclipse/search/ui/text/AbstractTextSearchResult.java b/bundles/org.eclipse.search/newsearch/org/eclipse/search/ui/text/AbstractTextSearchResult.java index 8d01b6bb65b..07ee6385ea1 100644 --- a/bundles/org.eclipse.search/newsearch/org/eclipse/search/ui/text/AbstractTextSearchResult.java +++ b/bundles/org.eclipse.search/newsearch/org/eclipse/search/ui/text/AbstractTextSearchResult.java @@ -44,7 +44,6 @@ public abstract class AbstractTextSearchResult implements ISearchResult { private final ConcurrentMap> fElementsToMatches; private final List fListeners; - private final MatchEvent fMatchEvent; private final AtomicInteger matchCount; private MatchFilter[] fMatchFilters; @@ -55,7 +54,6 @@ public abstract class AbstractTextSearchResult implements ISearchResult { protected AbstractTextSearchResult() { fElementsToMatches= new ConcurrentHashMap<>(); fListeners= new ArrayList<>(); - fMatchEvent= new MatchEvent(this); matchCount = new AtomicInteger(0); fMatchFilters= null; // filtering disabled by default } @@ -145,12 +143,14 @@ public void addMatches(Match[] matches) { } private MatchEvent getSearchResultEvent(Match match, int eventKind) { + MatchEvent fMatchEvent = new MatchEvent(this); fMatchEvent.setKind(eventKind); fMatchEvent.setMatch(match); return fMatchEvent; } private MatchEvent getSearchResultEvent(Collection matches, int eventKind) { + MatchEvent fMatchEvent = new MatchEvent(this); fMatchEvent.setKind(eventKind); Match[] matchArray= matches.toArray(new Match[matches.size()]); fMatchEvent.setMatches(matchArray);