mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-23 06:32:10 +02:00
Code Issues Wiki Activity

Patch for Andrew Niefer

Browse source 
Search filtering was broken, it would have become more obvious when 
searching larger projects with includes.

core:
-modify BasicSearchMatch.equals()

tests:
modified OtherPatternTests.testBug42911() and renamed it 
testBug42911_43988
This commit is contained in:
John Camelon 2003-10-01 19:55:04 +00:00
parent 0d05a8342d
commit 93a1b87c76
4 changed files with 31 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,3 +1,6 @@
2003-10-01 Andrew Niefer
modified OtherPatternTests.testBug42911() and renamed it testBug42911_43988
2003-10-01 Andrew Niefer
added testBug43450 to ManagedBuildTests.java
added a user include to plugin.xml

7
core/org.eclipse.cdt.core.tests/search/org/eclipse/cdt/core/search/tests/OtherPatternTests.java
View file

@ -330,7 +330,7 @@ public class OtherPatternTests extends BaseSearchTest {
assertEquals( matches.size(), 4 );
}
public void testBug42911(){
public void testBug42911_43988(){
BasicSearchMatch match1 = new BasicSearchMatch();
BasicSearchMatch match2 = new BasicSearchMatch();
@ -344,5 +344,10 @@ public class OtherPatternTests extends BaseSearchTest {
assertFalse( match1.equals( match2 ) );
assertFalse( match2.equals( match1 ) );
match2.setName( "IWasSaying" );
match2.setParentName( "boo" );
match2.setReturnType( "urns" );
assertTrue( match1.equals( match2 ) );
}
}

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

@ -1,3 +1,6 @@
2003-10-01 Andrew Niefer
- fix BasicSearchMatch.equals() for bug43988
2003-09-30 Bogdan Gheorghe
- changed logging in JobManager to use new ICLogConstants

21
core/org.eclipse.cdt.core/search/org/eclipse/cdt/core/search/BasicSearchMatch.java
View file

@ -67,17 +67,26 @@ public class BasicSearchMatch implements IMatch, Comparable {
if( type != match.getElementType() || visibility != match.getVisibility() )
return false;
if( ( name != null && match.getName() != null && !name.equals( match.getName() ) )
|| name != match.getName() )
if( name != null && match.getName() != null){
if( !name.equals( match.getName() ) )
return false;
} else if( name != match.getName() ){
return false;
}
if( ( parentName != null && match.getParentName() != null && !parentName.equals( match.getParentName() ) )
|| parentName != match.getParentName() )
if( parentName != null && match.getParentName() != null){
if( !parentName.equals( match.getParentName() ) )
return false;
} else if( parentName != match.getParentName() ){
return false;
}
if( ( returnType != null && match.getReturnType() != null && !returnType.equals( match.getReturnType() ) )
|| returnType != match.getReturnType() )
if( returnType != null && match.getReturnType() != null){
if( !returnType.equals( match.getReturnType() ) )
return false;
} else if( returnType != match.getReturnType() ){
return false;
}
IPath thisPath = getLocation();
IPath matchPath = match.getLocation();