Revert "Use ViewerComparator instead of deprecated ViewerSorter"

This reverts commit e338800b3f8f9e0266aa25053db0f5761b853785.

Bug: 513876
Change-Id: I6278fcfa8e372d1bcf0cbef33812734dff022820
Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>

9 files changed, 19 insertions, 19 deletions

diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/commit/CommitEditorPage.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/commit/CommitEditorPage.java
index d5984ffc17..4312c5af1c 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/commit/CommitEditorPage.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/commit/CommitEditorPage.java
@@ -47,7 +47,7 @@ import org.eclipse.jface.resource.LocalResourceManager;
 import org.eclipse.jface.util.IPropertyChangeListener;
 import org.eclipse.jface.viewers.ArrayContentProvider;
 import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.ViewerComparator;
+import org.eclipse.jface.viewers.ViewerSorter;
 import org.eclipse.jgit.annotations.NonNull;
 import org.eclipse.jgit.lib.Constants;
 import org.eclipse.jgit.lib.ObjectId;
@@ -474,7 +474,7 @@ public class CommitEditorPage extends FormPage
 		GridDataFactory.fillDefaults().grab(true, true).hint(SWT.DEFAULT, 50)
 				.applyTo(control);
 		addToFocusTracking(control);
-		branchViewer.setComparator(new ViewerComparator());
+		branchViewer.setSorter(new ViewerSorter());
 		branchViewer.setLabelProvider(new GitLabelProvider() {
 
 			@Override
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/commit/NotesBlock.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/commit/NotesBlock.java
index c727212897..6a335c0475 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/commit/NotesBlock.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/commit/NotesBlock.java
@@ -19,7 +19,7 @@ import org.eclipse.jface.viewers.ArrayContentProvider;
 import org.eclipse.jface.viewers.ISelectionChangedListener;
 import org.eclipse.jface.viewers.SelectionChangedEvent;
 import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.ViewerComparator;
+import org.eclipse.jface.viewers.ViewerSorter;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Table;
@@ -86,7 +86,7 @@ public class NotesBlock extends MasterDetailsBlock {
 		Table refsTable = toolkit.createTable(refsArea, SWT.H_SCROLL
 				| SWT.V_SCROLL | SWT.SINGLE);
 		refsViewer = new TableViewer(refsTable);
-		refsViewer.setComparator(new ViewerComparator());
+		refsViewer.setSorter(new ViewerSorter());
 		refsTable.setData(FormToolkit.KEY_DRAW_BORDER, FormToolkit.TREE_BORDER);
 		GridDataFactory.fillDefaults().grab(true, true).applyTo(refsTable);
 		refsViewer.setContentProvider(ArrayContentProvider.getInstance());
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/RevertFailureDialog.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/RevertFailureDialog.java
index ac848f8a83..f3a701dba8 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/RevertFailureDialog.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/RevertFailureDialog.java
@@ -30,7 +30,7 @@ import org.eclipse.jface.viewers.DelegatingStyledCellLabelProvider;
 import org.eclipse.jface.viewers.DelegatingStyledCellLabelProvider.IStyledLabelProvider;
 import org.eclipse.jface.viewers.StyledString;
 import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.jface.viewers.ViewerComparator;
+import org.eclipse.jface.viewers.ViewerSorter;
 import org.eclipse.jgit.api.MergeResult;
 import org.eclipse.jgit.merge.ResolveMerger.MergeFailureReason;
 import org.eclipse.jgit.revwalk.RevCommit;
@@ -212,7 +212,7 @@ public class RevertFailureDialog extends MessageDialog {
 		};
 		viewer.setLabelProvider(new DelegatingStyledCellLabelProvider(
 				styleProvider));
-		viewer.setComparator(new ViewerComparator());
+		viewer.setSorter(new ViewerSorter());
 
 		Map<MergeFailureReason, RevertFailure> failures = new HashMap<>();
 		for (Entry<String, MergeFailureReason> reason : reasons.entrySet()) {
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/fetch/FetchResultTable.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/fetch/FetchResultTable.java
index 2f34f2e2c3..78a4a69320 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/fetch/FetchResultTable.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/fetch/FetchResultTable.java
@@ -36,7 +36,7 @@ import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.StyledString;
 import org.eclipse.jface.viewers.TreeViewer;
 import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerComparator;
+import org.eclipse.jface.viewers.ViewerSorter;
 import org.eclipse.jgit.lib.Constants;
 import org.eclipse.jgit.lib.ObjectId;
 import org.eclipse.jgit.lib.ObjectReader;
@@ -296,7 +296,7 @@ class FetchResultTable {
 			}
 
 		});
-		treeViewer.setComparator(new ViewerComparator() {
+		treeViewer.setSorter(new ViewerSorter() {
 
 			@Override
 			public int compare(Viewer viewer, Object e1, Object e2) {
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/push/PushResultTable.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/push/PushResultTable.java
index b1413cfefc..b10beeac56 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/push/PushResultTable.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/push/PushResultTable.java
@@ -34,7 +34,7 @@ import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.StyledString;
 import org.eclipse.jface.viewers.TreeViewer;
 import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerComparator;
+import org.eclipse.jface.viewers.ViewerSorter;
 import org.eclipse.jgit.lib.ObjectReader;
 import org.eclipse.jgit.lib.Repository;
 import org.eclipse.jgit.transport.RemoteRefUpdate;
@@ -144,7 +144,7 @@ class PushResultTable {
 
 		};
 
-		treeViewer.setComparator(new ViewerComparator() {
+		treeViewer.setSorter(new ViewerSorter() {
 
 			@Override
 			public int compare(Viewer viewer, Object e1, Object e2) {
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/tree/RepositoriesViewSorter.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/tree/RepositoriesViewSorter.java
index 90825e2b00..382eb073c6 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/tree/RepositoriesViewSorter.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/tree/RepositoriesViewSorter.java
@@ -13,12 +13,12 @@ package org.eclipse.egit.ui.internal.repository.tree;
 import java.text.Collator;
 
 import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerComparator;
 
 /**
  * Sorter for the Git Repositories View.
  */
-public class RepositoriesViewSorter extends ViewerComparator {
+public class RepositoriesViewSorter extends
+		org.eclipse.jface.viewers.ViewerSorter {
 
 	/**
 	 * Default constructor
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/search/CommitSearchResultsPage.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/search/CommitSearchResultsPage.java
index 4fd5c295af..cf31c2ee43 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/search/CommitSearchResultsPage.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/search/CommitSearchResultsPage.java
@@ -20,7 +20,7 @@ import org.eclipse.jface.viewers.StructuredViewer;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.jface.viewers.TreeViewer;
 import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerComparator;
+import org.eclipse.jface.viewers.ViewerSorter;
 import org.eclipse.jgit.lib.PersonIdent;
 import org.eclipse.jgit.lib.Repository;
 import org.eclipse.search.ui.text.AbstractTextSearchViewPage;
@@ -33,7 +33,7 @@ import org.eclipse.ui.model.WorkbenchContentProvider;
  */
 public class CommitSearchResultsPage extends AbstractTextSearchViewPage {
 
-	private static class CommitSorter extends ViewerComparator {
+	private static class CommitSorter extends ViewerSorter {
 
 		@Override
 		public int compare(Viewer viewer, Object e1, Object e2) {
@@ -70,7 +70,7 @@ public class CommitSearchResultsPage extends AbstractTextSearchViewPage {
 	}
 
 	private void configureViewer(StructuredViewer viewer) {
-		viewer.setComparator(new CommitSorter());
+		viewer.setSorter(new CommitSorter());
 		viewer.setContentProvider(new WorkbenchContentProvider() {
 
 			@Override
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/sharing/ExistingOrNewPage.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/sharing/ExistingOrNewPage.java
index 4e3162ad6f..5e18a56a20 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/sharing/ExistingOrNewPage.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/sharing/ExistingOrNewPage.java
@@ -45,7 +45,7 @@ import org.eclipse.jface.viewers.ICheckStateListener;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.ViewerComparator;
+import org.eclipse.jface.viewers.ViewerSorter;
 import org.eclipse.jface.window.Window;
 import org.eclipse.jface.wizard.WizardDialog;
 import org.eclipse.jface.wizard.WizardPage;
@@ -164,7 +164,7 @@ class ExistingOrNewPage extends WizardPage {
 		v.setInput(new Object());
 		// the default ViewerSorter seems to do the right thing
 		// i.e. sort as String
-		v.setComparator(new ViewerComparator());
+		v.setSorter(new ViewerSorter());
 
 		existingRepoCombo.addSelectionListener(new SelectionAdapter() {
 			@Override
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/synchronize/mapping/GitChangeSetSorter.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/synchronize/mapping/GitChangeSetSorter.java
index 1cea7e0dc5..a87eded888 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/synchronize/mapping/GitChangeSetSorter.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/synchronize/mapping/GitChangeSetSorter.java
@@ -15,7 +15,7 @@ import org.eclipse.egit.ui.internal.synchronize.model.GitModelCommit;
 import org.eclipse.egit.ui.internal.synchronize.model.GitModelTree;
 import org.eclipse.egit.ui.internal.synchronize.model.GitModelWorkingTree;
 import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerComparator;
+import org.eclipse.jface.viewers.ViewerSorter;
 
 /**
  * Ensure proper ordering of nodes in Git Change Set.
@@ -29,7 +29,7 @@ import org.eclipse.jface.viewers.ViewerComparator;
  * alphabetical order.
  *
  */
-public class GitChangeSetSorter extends ViewerComparator {
+public class GitChangeSetSorter extends ViewerSorter {
 
 	@Override
 	public int compare(Viewer viewer, Object e1, Object e2) {