move to comparator

2 files changed, 13 insertions, 14 deletions

diff --git a/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/launchConfigurations/ExternalToolsBuilderTab.java b/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/launchConfigurations/ExternalToolsBuilderTab.java
index 013bbcea1..1b202ea4a 100644
--- a/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/launchConfigurations/ExternalToolsBuilderTab.java
+++ b/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/launchConfigurations/ExternalToolsBuilderTab.java
@@ -55,7 +55,7 @@ import org.eclipse.ui.externaltools.internal.model.IExternalToolsHelpContextIds;
 import org.eclipse.ui.ide.IDE;
 import org.eclipse.ui.model.WorkbenchContentProvider;
 import org.eclipse.ui.model.WorkbenchLabelProvider;
-import org.eclipse.ui.views.navigator.ResourceSorter;
+import org.eclipse.ui.views.navigator.ResourceComparator;
 
 public class ExternalToolsBuilderTab extends AbstractLaunchConfigurationTab {
 
@@ -231,7 +231,7 @@ public class ExternalToolsBuilderTab extends AbstractLaunchConfigurationTab {
                 dialog.setTitle(ExternalToolsLaunchConfigurationMessages.ExternalToolsBuilderTab_24); 
                 dialog.setMessage(ExternalToolsLaunchConfigurationMessages.ExternalToolsBuilderTab_25); 
                 dialog.setInput(ResourcesPlugin.getWorkspace().getRoot()); 
-                dialog.setSorter(new ResourceSorter(ResourceSorter.NAME));
+                dialog.setComparator(new ResourceComparator(ResourceComparator.NAME));
                 int buttonId = dialog.open();
                 if (buttonId == IDialogConstants.OK_ID) {
                     IResource resource = (IResource) dialog.getFirstResult();
diff --git a/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/ui/TreeAndListGroup.java b/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/ui/TreeAndListGroup.java
index 167223e59..3a9545a5c 100644
--- a/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/ui/TreeAndListGroup.java
+++ b/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/ui/TreeAndListGroup.java
@@ -27,14 +27,14 @@ import org.eclipse.jface.viewers.SelectionChangedEvent;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.jface.viewers.ViewerSorter;
+import org.eclipse.jface.viewers.ViewerComparator;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Table;
 import org.eclipse.swt.widgets.Tree;
-import org.eclipse.ui.views.navigator.ResourceSorter;
+import org.eclipse.ui.views.navigator.ResourceComparator;
 
 /**
  * This class was derived from org.eclipse.ui.internal.misc.CheckboxTreeAndListGroup
@@ -176,7 +176,7 @@ public class TreeAndListGroup implements ISelectionChangedListener {
 		listViewer.getTable().setFont(parent.getFont());
 		listViewer.setContentProvider(listContentProvider);
 		listViewer.setLabelProvider(listLabelProvider);
-		listViewer.setSorter(new ResourceSorter(ResourceSorter.NAME));
+		listViewer.setComparator(new ResourceComparator(ResourceComparator.NAME));
 		listViewer.addSelectionChangedListener(new ISelectionChangedListener() {
 			public void selectionChanged(SelectionChangedEvent event) {
 				notifySelectionListeners(event);
@@ -204,7 +204,7 @@ public class TreeAndListGroup implements ISelectionChangedListener {
 		treeViewer = new TreeViewer(tree);
 		treeViewer.setContentProvider(treeContentProvider);
 		treeViewer.setLabelProvider(treeLabelProvider);
-		treeViewer.setSorter(new ResourceSorter(ResourceSorter.NAME));
+        treeViewer.setComparator(new ResourceComparator(ResourceComparator.NAME));
 		treeViewer.addSelectionChangedListener(this);
 	}
 	
@@ -276,8 +276,8 @@ public class TreeAndListGroup implements ISelectionChangedListener {
 	/**
 	 *	Set the sorter that is to be applied to self's list viewer
 	 */
-	public void setListSorter(ViewerSorter sorter) {
-		listViewer.setSorter(sorter);
+	public void setListSorter(ViewerComparator comparator) {
+		listViewer.setComparator(comparator);
 	}
 	/**
 	 * Set the root of the widget to be new Root. Regenerate all of the tables and lists from this
@@ -285,7 +285,7 @@ public class TreeAndListGroup implements ISelectionChangedListener {
 	 * @param newRoot
 	 */
 	public void setRoot(Object newRoot) {
-		this.root = newRoot;
+		root = newRoot;
 		initialize();
 	}
 
@@ -300,17 +300,16 @@ public class TreeAndListGroup implements ISelectionChangedListener {
 		treeViewer.setLabelProvider(labelProvider);
 	}
 	/**
-	 *	Set the sorter that is to be applied to self's tree viewer
+	 *	Set the comparator that is to be applied to self's tree viewer
 	 */
-	public void setTreeSorter(ViewerSorter sorter) {
-		treeViewer.setSorter(sorter);
+	public void setTreeComparator(ViewerComparator comparator) {
+		treeViewer.setComparator(comparator);
 	}
 
 	/**
 	 * Set the focus on to the list widget.
 	 */
 	public void setFocus() {
-
-		this.treeViewer.getTree().setFocus();
+		treeViewer.getTree().setFocus();
 	}
 }