Adapt to Eclipse 4

diff --git a/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/ColumnViewerComparator.java b/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/ColumnViewerComparator.java
index 8db5d4fe815101f1605d39dd923c404f8158add8..65d688af613edf1dc60fbc847e28af180c0de811 100644 (file)
--- a/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/ColumnViewerComparator.java
+++ b/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/ColumnViewerComparator.java
@@ -41,9 +41,8 @@ public class ColumnViewerComparator<T> extends ViewerComparator {
 
        private ColumnViewer viewer;
 
-       public ColumnViewerComparator(TableViewerColumn column,
-                       Comparator<T> comparator) {
-               super(comparator);
+       public ColumnViewerComparator(TableViewerColumn column, Comparator<T> comparator) {
+               super((Comparator<? super String>) comparator);
                this.column = column;
                this.viewer = column.getViewer();
                this.column.getColumn().addSelectionListener(new SelectionAdapter() {
@@ -95,6 +94,7 @@ public class ColumnViewerComparator<T> extends ViewerComparator {
 
        @SuppressWarnings("unchecked")
        public int compare(Viewer viewer, Object e1, Object e2) {
-               return direction * getComparator().compare((T) e1, (T) e2);
+               // return direction * getComparator().compare((T) e1, (T) e2);
+               return direction * super.compare(viewer, e1, e2);
        }
 }