From 15e131be4da7ee8268e7462a7c965c4d6bb21fc4 Mon Sep 17 00:00:00 2001
From: Dani Megert
Date: Thu, 18 Apr 2013 10:48:32 +0200
Subject: Revert "Replace deprecated ResourceSorter with ResourceComparator"

This reverts commit dee2ca6edb3f2fbc83571e5a97b43541abc7f13f.
---
 .../org/eclipse/team/internal/ui/mapping/ResourceModelSorter.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ResourceModelSorter.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ResourceModelSorter.java
index c9f9a1ed5..c334e5cc0 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ResourceModelSorter.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ResourceModelSorter.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2013 IBM Corporation and others.
+ * Copyright (c) 2000, 2006 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -14,12 +14,12 @@ import org.eclipse.core.resources.IFolder;
 import org.eclipse.core.resources.IResource;
 import org.eclipse.team.internal.ui.IPreferenceIds;
 import org.eclipse.team.internal.ui.TeamUIPlugin;
-import org.eclipse.ui.views.navigator.ResourceComparator;
+import org.eclipse.ui.views.navigator.ResourceSorter;
 
 /**
  * Sorter for use by Common Navigator
  */
-public class ResourceModelSorter extends ResourceComparator {
+public class ResourceModelSorter extends ResourceSorter {
 
 	public ResourceModelSorter() {
 		super(NAME);
@@ -29,7 +29,7 @@ public class ResourceModelSorter extends ResourceComparator {
 		if (getLayout().equals(IPreferenceIds.COMPRESSED_LAYOUT)
 				&& r1 instanceof IFolder
 				&& r2 instanceof IFolder) {	
-			return r1.getProjectRelativePath().toString().compareTo(r2.getProjectRelativePath().toString());
+			return collator.compare(r1.getProjectRelativePath().toString(), r2.getProjectRelativePath().toString());
 		}
 		return super.compareNames(r1, r2);
 	}
-- 
cgit v1.2.3