From 2c1e95c730538a8f2546f86f481fa4764f677381 Mon Sep 17 00:00:00 2001
From: Andrew Niefer <aniefer@ca.ibm.com>
Date: Fri, 20 Feb 2004 15:31:33 +0000
Subject: [PATCH] bug 52567 - cdt NPE prevents java search from working

---
 core/org.eclipse.cdt.ui/ChangeLog                           | 5 +++++
 core/org.eclipse.cdt.ui/plugin.xml                          | 6 +++---
 .../org/eclipse/cdt/internal/ui/search/PathNameSorter.java  | 6 ++++++
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/core/org.eclipse.cdt.ui/ChangeLog b/core/org.eclipse.cdt.ui/ChangeLog
index a8d17c63d64..705d66068fa 100644
--- a/core/org.eclipse.cdt.ui/ChangeLog
+++ b/core/org.eclipse.cdt.ui/ChangeLog
@@ -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
 
 	Remove deprecated Eclipse-2.0 api calls
diff --git a/core/org.eclipse.cdt.ui/plugin.xml b/core/org.eclipse.cdt.ui/plugin.xml
index 47d14f34506..6af11e5bd12 100644
--- a/core/org.eclipse.cdt.ui/plugin.xml
+++ b/core/org.eclipse.cdt.ui/plugin.xml
@@ -456,7 +456,7 @@
             icon="icons/full/clcl16/search_sortmatch.gif"
             tooltip="%ElementNameSorter.tooltip"
             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
             pageId="org.eclipse.cdt.ui.CSearchPage"
@@ -464,7 +464,7 @@
             icon="icons/full/clcl16/search_sortmatch.gif"
             tooltip="%ParentNameSorter.tooltip"
             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
             pageId="org.eclipse.cdt.ui.CSearchPage"
@@ -472,7 +472,7 @@
             icon="icons/full/clcl16/search_sortmatch.gif"
             tooltip="%PathNameSorter.tooltip"
             class="org.eclipse.cdt.internal.ui.search.PathNameSorter"
-            id="org.eclipse.search.internal.ui.PathNameSorter">
+            id="org.eclipse.cdt.search.internal.ui.PathNameSorter">
       </sorter>
    </extension>
    <extension
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/PathNameSorter.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/PathNameSorter.java
index ea55a52dc75..79216ae4364 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/PathNameSorter.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/PathNameSorter.java
@@ -48,6 +48,9 @@ public class PathNameSorter extends ViewerSorter {
 				match1 = (IMatch)entry1.getSelectedMarker().getAttribute( CSearchResultCollector.IMATCH );
 			} catch (CoreException e) {
 			}
+			if( match1 == null ){
+				return 0;
+			}
 			name1 = match1.getLocation().toString();
 		}
 		if( e2 instanceof ISearchResultViewEntry ) {
@@ -56,6 +59,9 @@ public class PathNameSorter extends ViewerSorter {
 				match2 = (IMatch)entry2.getSelectedMarker().getAttribute( CSearchResultCollector.IMATCH );
 			} catch (CoreException e) {
 			}
+			if( match2 == null ){
+				return 0;
+			}
 			//name2 = _labelProvider.getText( e2 );
 			name2 = match2.getLocation().toString();
 		}