summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTomasz Zarna2013-02-04 07:45:44 (EST)
committer Gerrit Code Review @ Eclipse.org2013-04-17 11:21:57 (EDT)
commitdee2ca6edb3f2fbc83571e5a97b43541abc7f13f (patch)
treede2f3796efd0db56a89d45f11a017999613411a3
parent3753dc5331fa8767fa2e0e3768802bbcef0a15c8 (diff)
downloadeclipse.platform.team-dee2ca6edb3f2fbc83571e5a97b43541abc7f13f.zip
eclipse.platform.team-dee2ca6edb3f2fbc83571e5a97b43541abc7f13f.tar.gz
eclipse.platform.team-dee2ca6edb3f2fbc83571e5a97b43541abc7f13f.tar.bz2
Replace deprecated ResourceSorter with ResourceComparatorrefs/changes/46/10146/2
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ResourceModelSorter.java8
1 files 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 c334e5c..c9f9a1e 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, 2006 IBM Corporation and others.
+ * Copyright (c) 2000, 2013 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.ResourceSorter;
+import org.eclipse.ui.views.navigator.ResourceComparator;
/**
* Sorter for use by Common Navigator
*/
-public class ResourceModelSorter extends ResourceSorter {
+public class ResourceModelSorter extends ResourceComparator {
public ResourceModelSorter() {
super(NAME);
@@ -29,7 +29,7 @@ public class ResourceModelSorter extends ResourceSorter {
if (getLayout().equals(IPreferenceIds.COMPRESSED_LAYOUT)
&& r1 instanceof IFolder
&& r2 instanceof IFolder) {
- return collator.compare(r1.getProjectRelativePath().toString(), r2.getProjectRelativePath().toString());
+ return r1.getProjectRelativePath().toString().compareTo(r2.getProjectRelativePath().toString());
}
return super.compareNames(r1, r2);
}