Replace usage of ViewerSorter with ViewerComparator

The former has been deprecated in 4.6, it's now recommended to use
ViewerComparator and .setComparator() instead.

Change-Id: Ib7b447a74756b2b4524924f76b93ec0d64f71ed1
Signed-off-by: Alexandre Montplaisir <alexmonthy@efficios.com>
Reviewed-on: https://git.eclipse.org/r/62262
Reviewed-by: Hudson CI
Reviewed-by: Marc-Andre Laperle <marc-andre.laperle@ericsson.com>
Tested-by: Marc-Andre Laperle <marc-andre.laperle@ericsson.com>

diff --git a/tmf/org.eclipse.tracecompass.tmf.remote.ui/src/org/eclipse/tracecompass/internal/tmf/remote/ui/wizards/fetch/RemoteFetchLogWizardRemotePage.java b/tmf/org.eclipse.tracecompass.tmf.remote.ui/src/org/eclipse/tracecompass/internal/tmf/remote/ui/wizards/fetch/RemoteFetchLogWizardRemotePage.java
index 1bf8797095cf4ae466c2010181b5a8a3e6a55e7c..8ca83c21b9c0d4438ab9debed27bb04a38e4d4f5 100644 (file)
--- a/tmf/org.eclipse.tracecompass.tmf.remote.ui/src/org/eclipse/tracecompass/internal/tmf/remote/ui/wizards/fetch/RemoteFetchLogWizardRemotePage.java
+++ b/tmf/org.eclipse.tracecompass.tmf.remote.ui/src/org/eclipse/tracecompass/internal/tmf/remote/ui/wizards/fetch/RemoteFetchLogWizardRemotePage.java
@@ -32,7 +32,7 @@ import org.eclipse.jdt.annotation.Nullable;
 import org.eclipse.jface.operation.IRunnableWithProgress;
 import org.eclipse.jface.viewers.CheckboxTreeViewer;
 import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.ViewerSorter;
+import org.eclipse.jface.viewers.ViewerComparator;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CCombo;
 import org.eclipse.swt.events.SelectionAdapter;
@@ -236,7 +236,7 @@ public class RemoteFetchLogWizardRemotePage extends AbstractTracePackageWizardPa
                 return super.getImage(element);
             }
         });
-        elementViewer.setSorter(new ViewerSorter() {
+        elementViewer.setComparator(new ViewerComparator() {
             @Override
             public int category(Object element) {
                 if (element instanceof TracePackageTraceElement) {

diff --git a/tmf/org.eclipse.tracecompass.tmf.ui.tests/widgetStubs/org/eclipse/tracecompass/tmf/ui/widgets/timegraph/test/stub/views/TsfTraceAnalysisView.java b/tmf/org.eclipse.tracecompass.tmf.ui.tests/widgetStubs/org/eclipse/tracecompass/tmf/ui/widgets/timegraph/test/stub/views/TsfTraceAnalysisView.java
index e7b482e6ba7832f02b4a189c8a67c3a880680d57..dfb53eb9b8709e75fcc83c6e14aff320e240b55f 100644 (file)
--- a/tmf/org.eclipse.tracecompass.tmf.ui.tests/widgetStubs/org/eclipse/tracecompass/tmf/ui/widgets/timegraph/test/stub/views/TsfTraceAnalysisView.java
+++ b/tmf/org.eclipse.tracecompass.tmf.ui.tests/widgetStubs/org/eclipse/tracecompass/tmf/ui/widgets/timegraph/test/stub/views/TsfTraceAnalysisView.java
@@ -32,7 +32,7 @@ import org.eclipse.jface.viewers.ITreeContentProvider;
 import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.jface.viewers.TreeViewer;
 import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerSorter;
+import org.eclipse.jface.viewers.ViewerComparator;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.SashForm;
 import org.eclipse.swt.graphics.Image;
@@ -243,9 +243,6 @@ public class TsfTraceAnalysisView extends ViewPart implements
         }
     }
 
-    static class NameSorter extends ViewerSorter {
-    }
-
     // ========================================================================
     // Methods
     // ========================================================================
@@ -268,7 +265,7 @@ public class TsfTraceAnalysisView extends ViewPart implements
         drillDownAdapter = new DrillDownAdapter(viewer);
         viewer.setContentProvider(new ViewContentProvider());
         viewer.setLabelProvider(new ViewLabelProvider());
-        viewer.setSorter(new NameSorter());
+        viewer.setComparator(new ViewerComparator());
         viewer.setInput(getViewSite());
 
         sashForm.setWeights(new int[] { 5, 1 });

diff --git a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/project/model/TmfViewerSorter.java b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/project/model/TmfViewerSorter.java
index c578f4477482aa0620c3fc927bbb6867a85fbc34..20c42f3b72b8437b88d7f4b4817212d191ff0d11 100644 (file)
--- a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/project/model/TmfViewerSorter.java
+++ b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/project/model/TmfViewerSorter.java
@@ -12,12 +12,12 @@
 
 package org.eclipse.tracecompass.tmf.ui.project.model;
 
-import org.eclipse.jface.viewers.ViewerSorter;
+import org.eclipse.jface.viewers.ViewerComparator;
 
 /**
  * Viewer sorter for TMF project model elements
  */
-public class TmfViewerSorter extends ViewerSorter {
+public class TmfViewerSorter extends ViewerComparator {
 
     @Override
     public int category(Object element) {

diff --git a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/project/wizards/SelectRootNodeWizardPage.java b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/project/wizards/SelectRootNodeWizardPage.java
index 8c6635f9826e1e719a961815ef4b4c17ada01c16..fc384d04763ccfd8011d9a5a2bc050fd9dc3b644 100644 (file)
--- a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/project/wizards/SelectRootNodeWizardPage.java
+++ b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/project/wizards/SelectRootNodeWizardPage.java
@@ -22,7 +22,7 @@ import org.eclipse.jface.viewers.ColumnLabelProvider;
 import org.eclipse.jface.viewers.ICheckStateListener;
 import org.eclipse.jface.viewers.TreeViewer;
 import org.eclipse.jface.viewers.TreeViewerColumn;
-import org.eclipse.jface.viewers.ViewerSorter;
+import org.eclipse.jface.viewers.ViewerComparator;
 import org.eclipse.jface.wizard.WizardPage;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.Image;
@@ -115,7 +115,7 @@ public class SelectRootNodeWizardPage extends WizardPage {
         fCheckboxTreeViewer.setContentProvider(fContentProvider);
         fLabelProvider = new TmfNavigatorLabelProvider();
         fCheckboxTreeViewer.setLabelProvider(fLabelProvider);
-        fCheckboxTreeViewer.setSorter(new ViewerSorter());
+        fCheckboxTreeViewer.setComparator(new ViewerComparator());
 
         final Tree tree = fCheckboxTreeViewer.getTree();
         GridData gd = new GridData(SWT.FILL, SWT.FILL, true, true);

diff --git a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/project/wizards/SelectTracesWizardPage.java b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/project/wizards/SelectTracesWizardPage.java
index 1bb99ccfb4ff7d68f0a7aa87e3826bc438fc3eb3..6395e052dee125280d6ff78b125b5b4d55861d89 100644 (file)
--- a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/project/wizards/SelectTracesWizardPage.java
+++ b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/project/wizards/SelectTracesWizardPage.java
@@ -42,7 +42,7 @@ import org.eclipse.jface.viewers.ColumnLabelProvider;
 import org.eclipse.jface.viewers.ICheckStateListener;
 import org.eclipse.jface.viewers.TreeViewer;
 import org.eclipse.jface.viewers.TreeViewerColumn;
-import org.eclipse.jface.viewers.ViewerSorter;
+import org.eclipse.jface.viewers.ViewerComparator;
 import org.eclipse.jface.wizard.WizardPage;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;
@@ -193,7 +193,7 @@ public class SelectTracesWizardPage extends WizardPage {
         fCheckboxTreeViewer.setContentProvider(fContentProvider);
         fLabelProvider = new TmfNavigatorLabelProvider();
         fCheckboxTreeViewer.setLabelProvider(fLabelProvider);
-        fCheckboxTreeViewer.setSorter(new ViewerSorter());
+        fCheckboxTreeViewer.setComparator(new ViewerComparator());
 
         final Tree tree = fCheckboxTreeViewer.getTree();
         GridData gd = new GridData(SWT.FILL, SWT.FILL, true, true);