mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-29 19:45:01 +02:00
Code Issues Wiki Activity

Fix for 60772: NPE cancelling Selection Search in Working Set

Browse source
This commit is contained in:
Bogdan Gheorghe 2004-06-07 14:30:19 +00:00
parent 66026fcc9e
commit 2dfa4fa8a1
2 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
core/org.eclipse.cdt.ui/ChangeLog
View file

@ -1,7 +1,7 @@
2004-06-07 Alain Magloire 2004-06-07 Bogdan Gheorghe
Fix for Bug 60772
Fix PR 64328 * src/org/eclipse/cdt/internal/ui/search/actions/FindAction.java
* src/org/eclipse/cdt/internal/ui/poreferences/PreferencesMessages.properties
2004-06-06 Bogdan Gheorghe 2004-06-06 Bogdan Gheorghe
Changed MouseClickListener to use Parser KeywordSets Changed MouseClickListener to use Parser KeywordSets

8
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/FindAction.java
View file

@ -54,6 +54,10 @@ public abstract class FindAction extends SelectionParseAction {
protected CSearchQuery createSearchQuery(String pattern, SearchFor searchFor) { protected CSearchQuery createSearchQuery(String pattern, SearchFor searchFor) {
CSearchQuery op = null; CSearchQuery op = null;
ICSearchScope scope = getScope(); ICSearchScope scope = getScope();
if (scope == null)
return null;
String scopeDescription = getScopeDescription(); String scopeDescription = getScopeDescription();
//Create a case sensitive search operation - limited by the node //Create a case sensitive search operation - limited by the node
@ -159,6 +163,10 @@ public abstract class FindAction extends SelectionParseAction {
} }
CSearchQuery job = createSearchQuery(node); CSearchQuery job = createSearchQuery(node);
if (job == null)
return;
NewSearchUI.activateSearchResultView(); NewSearchUI.activateSearchResultView();
NewSearchUI.runQuery(job); NewSearchUI.runQuery(job);