X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=org.argeo.eclipse.ui%2Fsrc%2Forg%2Fargeo%2Feclipse%2Fui%2FColumnViewerComparator.java;h=f13378aaf1232e004c8f7116947b470e586d4122;hb=5ec9d72c96b13bf18d702bf01dc2c03b0aee43a4;hp=8db5d4fe815101f1605d39dd923c404f8158add8;hpb=e61dd9dda88354091625cca85aa7c96d196688b3;p=lgpl%2Fargeo-commons.git 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..f13378aaf 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 @@ -15,8 +15,6 @@ */ package org.argeo.eclipse.ui; -import java.util.Comparator; - import org.eclipse.jface.viewers.ColumnViewer; import org.eclipse.jface.viewers.TableViewerColumn; import org.eclipse.jface.viewers.Viewer; @@ -26,7 +24,7 @@ import org.eclipse.swt.events.SelectionAdapter; import org.eclipse.swt.events.SelectionEvent; /** Generic column viewer sorter */ -public class ColumnViewerComparator extends ViewerComparator { +public class ColumnViewerComparator extends ViewerComparator { private static final long serialVersionUID = -2266218906355859909L; public static final int ASC = 1; @@ -41,9 +39,8 @@ public class ColumnViewerComparator extends ViewerComparator { private ColumnViewer viewer; - public ColumnViewerComparator(TableViewerColumn column, - Comparator comparator) { - super(comparator); + public ColumnViewerComparator(TableViewerColumn column) { + super(null); this.column = column; this.viewer = column.getViewer(); this.column.getColumn().addSelectionListener(new SelectionAdapter() { @@ -93,8 +90,7 @@ public class ColumnViewerComparator extends ViewerComparator { } } - @SuppressWarnings("unchecked") public int compare(Viewer viewer, Object e1, Object e2) { - return direction * getComparator().compare((T) e1, (T) e2); + return direction * super.compare(viewer, e1, e2); } }