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

bug 52567 - cdt NPE prevents java search from working

Browse source
This commit is contained in:
Andrew Niefer 2004-02-20 15:31:33 +00:00
parent 92b0174888
commit 2c1e95c730
3 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,3 +1,8 @@
2003-02-20 Andrew Niefer
bug 52567
change the extension IDs for the C Search sorters to avoid conflict with the JDT
check for nulls in PathNameSorter.compare
2004-02-18 Alain Magloire 2004-02-18 Alain Magloire
Remove deprecated Eclipse-2.0 api calls Remove deprecated Eclipse-2.0 api calls

6
core/org.eclipse.cdt.ui/plugin.xml
View file

@ -456,7 +456,7 @@
icon="icons/full/clcl16/search_sortmatch.gif" icon="icons/full/clcl16/search_sortmatch.gif"
tooltip="%ElementNameSorter.tooltip" tooltip="%ElementNameSorter.tooltip"
class="org.eclipse.cdt.internal.ui.search.ElementNameSorter" class="org.eclipse.cdt.internal.ui.search.ElementNameSorter"
id="org.eclipse.search.internal.ui.ElementNameSorter"> id="org.eclipse.cdt.search.internal.ui.ElementNameSorter">
</sorter> </sorter>
<sorter <sorter
pageId="org.eclipse.cdt.ui.CSearchPage" pageId="org.eclipse.cdt.ui.CSearchPage"
@ -464,7 +464,7 @@
icon="icons/full/clcl16/search_sortmatch.gif" icon="icons/full/clcl16/search_sortmatch.gif"
tooltip="%ParentNameSorter.tooltip" tooltip="%ParentNameSorter.tooltip"
class="org.eclipse.cdt.internal.ui.search.ParentNameSorter" class="org.eclipse.cdt.internal.ui.search.ParentNameSorter"
id="org.eclipse.search.internal.ui.ParentNameSorter"> id="org.eclipse.cdt.search.internal.ui.ParentNameSorter">
</sorter> </sorter>
<sorter <sorter
pageId="org.eclipse.cdt.ui.CSearchPage" pageId="org.eclipse.cdt.ui.CSearchPage"
@ -472,7 +472,7 @@
icon="icons/full/clcl16/search_sortmatch.gif" icon="icons/full/clcl16/search_sortmatch.gif"
tooltip="%PathNameSorter.tooltip" tooltip="%PathNameSorter.tooltip"
class="org.eclipse.cdt.internal.ui.search.PathNameSorter" class="org.eclipse.cdt.internal.ui.search.PathNameSorter"
id="org.eclipse.search.internal.ui.PathNameSorter"> id="org.eclipse.cdt.search.internal.ui.PathNameSorter">
</sorter> </sorter>
</extension> </extension>
<extension <extension

6
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/PathNameSorter.java
View file

@ -48,6 +48,9 @@ public class PathNameSorter extends ViewerSorter {
match1 = (IMatch)entry1.getSelectedMarker().getAttribute( CSearchResultCollector.IMATCH ); match1 = (IMatch)entry1.getSelectedMarker().getAttribute( CSearchResultCollector.IMATCH );
} catch (CoreException e) { } catch (CoreException e) {
} }
if( match1 == null ){
return 0;
}
name1 = match1.getLocation().toString(); name1 = match1.getLocation().toString();
} }
if( e2 instanceof ISearchResultViewEntry ) { if( e2 instanceof ISearchResultViewEntry ) {
@ -56,6 +59,9 @@ public class PathNameSorter extends ViewerSorter {
match2 = (IMatch)entry2.getSelectedMarker().getAttribute( CSearchResultCollector.IMATCH ); match2 = (IMatch)entry2.getSelectedMarker().getAttribute( CSearchResultCollector.IMATCH );
} catch (CoreException e) { } catch (CoreException e) {
} }
if( match2 == null ){
return 0;
}
//name2 = _labelProvider.getText( e2 ); //name2 = _labelProvider.getText( e2 );
name2 = match2.getLocation().toString(); name2 = match2.getLocation().toString();
} }