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

Patch for Andrew Niefer

Browse source 
core:
- fix bug 44026 by checking scope before reporting match in 
MatchLocator.report
ui:
-bug44032 - deleting/moving files breaks search
        * modified src/org/eclipse/cdt/ui/CSearchResultLabelProvider 
getText to return empty string instead of null
-bug43130 - Selected resources is disabled but selected
        * src/org/eclipse/cdt/internal/ui/search/CSearchPage
This commit is contained in:
John Camelon 2003-10-01 21:33:23 +00:00
parent e63b06fc5f
commit 77fbc604e7
5 changed files with 23 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
core/org.eclipse.cdt.core/search/ChangeLog
View file

@ -1,3 +1,6 @@
2003-10-01 Andrew Niefer
- fix bug 44026 by checking scope before reporting match in MatchLocator.report
2003-10-01 Andrew Niefer 2003-10-01 Andrew Niefer
- fix BasicSearchMatch.equals() for bug43988 - fix BasicSearchMatch.equals() for bug43988

4
core/org.eclipse.cdt.core/search/org/eclipse/cdt/internal/core/search/matching/MatchLocator.java
View file

@ -441,6 +441,10 @@ public class MatchLocator implements ISourceElementRequestor, ICSearchConstants
protected void report( ISourceElementCallbackDelegate node, int accuracyLevel ){ protected void report( ISourceElementCallbackDelegate node, int accuracyLevel ){
try { try {
if( currentResource != null && !searchScope.encloses(currentResource.getFullPath().toOSString() ) ){
return;
}
int offset = 0; int offset = 0;
int end = 0; int end = 0;

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

@ -1,3 +1,9 @@
2003-10-01 Andrew Niefer
-bug44032 - deleting/moving files breaks search
* modified src/org/eclipse/cdt/ui/CSearchResultLabelProvider getText to return empty string instead of null
-bug43130 - Selected resources is disabled but selected
* src/org/eclipse/cdt/internal/ui/search/CSearchPage
2003-10-01 Alain Magloire 2003-10-01 Alain Magloire
Fix PR 44013, not defining a resource. Fix PR 44013, not defining a resource.

11
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchPage.java
View file

@ -86,14 +86,17 @@ public class CSearchPage extends DialogPage implements ISearchPage, ICSearchCons
String scopeDescription = ""; //$NON-NLS-1$ String scopeDescription = ""; //$NON-NLS-1$
switch( getContainer().getSelectedScope() ) { switch( getContainer().getSelectedScope() ) {
case ISearchPageContainer.SELECTION_SCOPE:
if( fStructuredSelection != null && fStructuredSelection.iterator().hasNext() ){
scopeDescription = CSearchMessages.getString("SelectionScope"); //$NON-NLS-1$
scope = CSearchScopeFactory.getInstance().createCSearchScope(fStructuredSelection);
break;
}
/* else fall through to workspace scope */
case ISearchPageContainer.WORKSPACE_SCOPE: case ISearchPageContainer.WORKSPACE_SCOPE:
scopeDescription = CSearchMessages.getString("WorkspaceScope"); //$NON-NLS-1$ scopeDescription = CSearchMessages.getString("WorkspaceScope"); //$NON-NLS-1$
scope = SearchEngine.createWorkspaceScope(); scope = SearchEngine.createWorkspaceScope();
break; break;
case ISearchPageContainer.SELECTION_SCOPE:
scopeDescription = CSearchMessages.getString("SelectionScope"); //$NON-NLS-1$
scope = CSearchScopeFactory.getInstance().createCSearchScope(fStructuredSelection);
break;
case ISearchPageContainer.WORKING_SET_SCOPE: case ISearchPageContainer.WORKING_SET_SCOPE:
IWorkingSet[] workingSets= getContainer().getSelectedWorkingSets(); IWorkingSet[] workingSets= getContainer().getSelectedWorkingSets();
// should not happen - just to be sure // should not happen - just to be sure

6
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CSearchResultLabelProvider.java
View file

@ -120,18 +120,18 @@ public class CSearchResultLabelProvider extends LabelProvider {
try { try {
match = (IMatch) marker.getAttribute(CSearchResultCollector.IMATCH); match = (IMatch) marker.getAttribute(CSearchResultCollector.IMATCH);
} catch (CoreException e) { } catch (CoreException e) {
return null; return "";
} }
} else if( element instanceof IMatch ){ } else if( element instanceof IMatch ){
match = (IMatch) element; match = (IMatch) element;
} }
if( match == null ) if( match == null )
return null; return "";
IResource resource = match.getResource(); IResource resource = match.getResource();
String result = null; String result = "";
String path = (resource != null ) ? resource.getFullPath().toString() : ""; String path = (resource != null ) ? resource.getFullPath().toString() : "";
switch( getOrder() ){ switch( getOrder() ){