tmf: Keep usage of ViewerSorter in navigatorContent extension point

Reverting the change to TmfViewerSorter from commit e707a55.

Platform UI doesn't support ViewerComparator in the
org.eclipse.ui.navigator.navigatorContent extension point in the
navigatorContent/commonSorter element (refer to Bug 484248).

This causes a ClassCastException and prevents the TMF project model
elements from being sorted properly.

Change-Id: I3d63032763dc435b594c3f9e8df04d0cb6b38609
Signed-off-by: Patrick Tasse <patrick.tasse@gmail.com>
Reviewed-on: https://git.eclipse.org/r/62640
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.ui/.settings/org.eclipse.jdt.core.prefs b/tmf/org.eclipse.tracecompass.tmf.ui/.settings/org.eclipse.jdt.core.prefs
index 52a46d4a29c20a88b1aec13e795ce83faee11988..5519fa703f38a20da196a7167315e8dd7f66539d 100644 (file)
--- a/tmf/org.eclipse.tracecompass.tmf.ui/.settings/org.eclipse.jdt.core.prefs
+++ b/tmf/org.eclipse.tracecompass.tmf.ui/.settings/org.eclipse.jdt.core.prefs
@@ -29,7 +29,7 @@ org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
 org.eclipse.jdt.core.compiler.problem.comparingIdentical=error
 org.eclipse.jdt.core.compiler.problem.deadCode=error
-org.eclipse.jdt.core.compiler.problem.deprecation=error
+org.eclipse.jdt.core.compiler.problem.deprecation=warning
 org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
 org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
 org.eclipse.jdt.core.compiler.problem.discouragedReference=warning

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 20c42f3b72b8437b88d7f4b4817212d191ff0d11..b2db4e6586e53c2b64573588794883fff1b0ba32 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,13 @@
 
 package org.eclipse.tracecompass.tmf.ui.project.model;
 
-import org.eclipse.jface.viewers.ViewerComparator;
+import org.eclipse.jface.viewers.ViewerSorter;
 
 /**
  * Viewer sorter for TMF project model elements
  */
-public class TmfViewerSorter extends ViewerComparator {
+//TODO: Follow-up with Bug 484248
+public class TmfViewerSorter extends ViewerSorter {
 
     @Override
     public int category(Object element) {