Using Collator and changed sort label

5 files changed, 9 insertions, 11 deletions

diff --git a/org.eclipse.search/plugin.properties b/org.eclipse.search/plugin.properties
index 6cec3bbf9c5..083b379f8b7 100644
--- a/org.eclipse.search/plugin.properties
+++ b/org.eclipse.search/plugin.properties
@@ -17,12 +17,10 @@ searchResultViewName = Search
 OpenSearchDialogAction.label = &Search...@Ctrl+H

 OpenSearchDialogAction.tooltip = Search

 

-MatchSorter.label = by &Match

-MatchSorter.tooltip = by Match

-ResourcenameSorter.label = by &Resource Name

-ResourcenameSorter.tooltip = by Resource Name

-ResourcePathSorter.label = by Resource &Path

-ResourcePathSorter.tooltip = by Resource Path

+ResourcenameSorter.label = &Name

+ResourcenameSorter.tooltip = Sort by Resource Name

+ResourcePathSorter.label = &Path

+ResourcePathSorter.tooltip = Sort by Resource Path

 

 CopyToClipboardAction.label = Copy to Clip&board

 CopyToClipboardAction.tooltip = Copy to Clipboard

diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchMessages.properties b/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchMessages.properties
index 1d9e1f3c421..4a83df97d27 100644
--- a/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchMessages.properties
+++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchMessages.properties
@@ -92,8 +92,8 @@ TextSearchEngine.scanning= Scanning...
 TextSearchVisitor.error= Error reading file during search: {0}

 TextSearchVisitor.canceled= Operation Canceled

 

-SortDropDownAction.label= S&ort

-SortDropDownAction.tooltip= Sort

+SortDropDownAction.label= S&ort By

+SortDropDownAction.tooltip= Sort By

 

 ShowOtherSearchesAction.label= &Other...

 ShowOtherSearchesAction.tooltip= Open Other Searches Dialog

diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/text/ResourcePathSorter.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/text/ResourcePathSorter.java
index 89196fc265f..5c8f4cf76d2 100644
--- a/org.eclipse.search/search/org/eclipse/search/internal/ui/text/ResourcePathSorter.java
+++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/text/ResourcePathSorter.java
@@ -32,7 +32,7 @@ public class ResourcePathSorter extends ViewerSorter {
 			name1= ""; //$NON-NLS-1$

 		if (name2 == null)

 			name2= ""; //$NON-NLS-1$

-		return name1.toLowerCase().compareTo(name2.toLowerCase());

+		return getCollator().compare(name1, name2);

 	}

 

 	/*

diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/text/ResourcenameSorter.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/text/ResourcenameSorter.java
index dda6b25eb83..52ac0934fb8 100644
--- a/org.eclipse.search/search/org/eclipse/search/internal/ui/text/ResourcenameSorter.java
+++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/text/ResourcenameSorter.java
@@ -32,7 +32,7 @@ public class ResourcenameSorter extends ViewerSorter {
 			name1= ""; //$NON-NLS-1$

 		if (name2 == null)

 			name2= ""; //$NON-NLS-1$

-		return name1.toLowerCase().compareTo(name2.toLowerCase());

+		return getCollator().compare(name1, name2);

 	}

 

 	/*

diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/util/FileLabelProvider.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/util/FileLabelProvider.java
index cdded196d62..bc98bad18f9 100644
--- a/org.eclipse.search/search/org/eclipse/search/internal/ui/util/FileLabelProvider.java
+++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/util/FileLabelProvider.java
@@ -41,7 +41,7 @@ public class FileLabelProvider extends LabelProvider {
 		if (!(element instanceof ISearchResultViewEntry))

 			return ""; //$NON-NLS-1$

 		IResource resource= ((ISearchResultViewEntry) element).getResource();

-		// PR 1G47GDO

+

 		if (resource == null)

 			return SearchMessages.getString("SearchResultView.removed_resource"); //$NON-NLS-1$