From: Mathieu Baudier <mbaudier@argeo.org>
Date: Tue, 14 Nov 2017 12:01:25 +0000 (+0100)
Subject: Adapt to Eclipse 4
X-Git-Tag: argeo-commons-2.1.70~27
X-Git-Url: https://git.argeo.org/?p=lgpl%2Fargeo-commons.git;a=commitdiff_plain;h=e7b05d237d09d176a627d26816717fb9f59c6011

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 8db5d4fe8..65d688af6 100644
--- 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);
 	}
 }