Support for sorting in table viewers

7 files changed, 79 insertions, 10 deletions

diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/utils/TableViewerComparator.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/utils/TableViewerComparator.java
index cd27e1ef..7e11cc6f 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/utils/TableViewerComparator.java
+++ b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/utils/TableViewerComparator.java
@@ -19,49 +19,55 @@
 package com.gluster.storage.management.console.utils;
 
 import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerSorter;
+import org.eclipse.jface.viewers.ViewerComparator;
 import org.eclipse.swt.SWT;
 
 /**
- *
+ * Comparator for sorting contents of a table viewer
  */
-public class TableViewerComparator extends ViewerSorter {
-	private int propertyIndex;
+public class TableViewerComparator extends ViewerComparator {
+	private int column = -1;
 	private static final int ASCENDING = 0;
 	private static final int DESCENDING = 1;
+	private static final int NONE = -1;
 	private int direction = DESCENDING;
 
 	public TableViewerComparator() {
-		this(ASCENDING);
+		this(NONE);
 	}
 
 	public TableViewerComparator(int direction) {
-		this.propertyIndex = 0;
 		this.direction = direction;
 	}
 
 	public int getDirection() {
-		return direction == DESCENDING ? SWT.DOWN : SWT.UP;
+		return direction == DESCENDING ? SWT.DOWN : (direction == ASCENDING ? SWT.UP : SWT.NONE);
 	}
 
 	public void setColumn(int column) {
-		if (column == this.propertyIndex) {
+		if (column == this.column) {
 			// Same column as last sort; toggle the direction
 			direction = 1 - direction;
 		} else {
-			// New column; do an ascending sort
-			this.propertyIndex = column;
+			// first column selection or new column; do an ascending sort
 			direction = ASCENDING;
+			this.column = column;
 		}
 	}
 
 	@Override
 	public int compare(Viewer viewer, Object e1, Object e2) {
+		if(direction == NONE) {
+			// no sorting
+			return 0;
+		}
+		
 		int result = super.compare(viewer, e1, e2);
 		// If descending order, flip the direction
 		if (direction == DESCENDING) {
 			result = -result;
 		}
+		
 		return result;
 	}
 }
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/pages/AbstractTableViewerPage.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/pages/AbstractTableViewerPage.java
index 06b9ed95..c80740f3 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/pages/AbstractTableViewerPage.java
+++ b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/pages/AbstractTableViewerPage.java
@@ -28,17 +28,21 @@ import org.eclipse.jface.viewers.IDoubleClickListener;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.jface.viewers.ViewerComparator;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.DisposeEvent;
 import org.eclipse.swt.events.DisposeListener;
 import org.eclipse.swt.events.PaintEvent;
 import org.eclipse.swt.events.PaintListener;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.layout.FillLayout;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Table;
+import org.eclipse.swt.widgets.TableColumn;
 import org.eclipse.swt.widgets.Text;
 import org.eclipse.ui.ISelectionListener;
 import org.eclipse.ui.IWorkbenchPart;
@@ -49,6 +53,7 @@ import org.eclipse.ui.forms.widgets.Hyperlink;
 
 import com.gluster.storage.management.console.GlusterDataModelManager;
 import com.gluster.storage.management.console.utils.GUIHelper;
+import com.gluster.storage.management.console.utils.TableViewerComparator;
 import com.gluster.storage.management.core.model.ClusterListener;
 
 public abstract class AbstractTableViewerPage<T> extends Composite implements ISelectionListener {
@@ -223,8 +228,32 @@ public abstract class AbstractTableViewerPage<T> extends Composite implements IS
 
 		// Create a case insensitive filter for the table viewer using the filter text field
 		guiHelper.createFilter(tableViewer, filterText, false);
+		
+		tableViewer.setComparator(createViewerComparator());
+		for (int columnIndex = 0; columnIndex < tableViewer.getTable().getColumnCount(); columnIndex++) {
+			TableColumn column = tableViewer.getTable().getColumn(columnIndex); 
+			column.addSelectionListener(getColumnSelectionAdapter(column, columnIndex));
+		}
+	}
+
+	private SelectionAdapter getColumnSelectionAdapter(final TableColumn column, final int columnIndex) {
+		return new SelectionAdapter() {
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				ViewerComparator viewerComparator = tableViewer.getComparator();
+				if(viewerComparator instanceof TableViewerComparator) {
+					TableViewerComparator comparator = (TableViewerComparator)viewerComparator;
+					comparator.setColumn(columnIndex);
+					tableViewer.getTable().setSortDirection(comparator.getDirection());
+					tableViewer.getTable().setSortColumn(column);
+					tableViewer.refresh();
+				}
+			}
+		};
 	}
 	
+	protected abstract ViewerComparator createViewerComparator();
+
 	/* (non-Javadoc)
 	 * @see org.eclipse.ui.ISelectionListener#selectionChanged(org.eclipse.ui.IWorkbenchPart, org.eclipse.jface.viewers.ISelection)
 	 */
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/pages/BricksPage.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/pages/BricksPage.java
index 5d526c32..674074c3 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/pages/BricksPage.java
+++ b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/pages/BricksPage.java
@@ -25,6 +25,7 @@ import java.util.Map;
 import org.eclipse.jface.viewers.ArrayContentProvider;
 import org.eclipse.jface.viewers.IContentProvider;
 import org.eclipse.jface.viewers.ITableLabelProvider;
+import org.eclipse.jface.viewers.ViewerComparator;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Table;
@@ -114,4 +115,9 @@ public class BricksPage extends AbstractTableViewerPage<Brick> {
 	protected List<Brick> getAllEntities() {
 		return bricks;
 	}
+
+	@Override
+	protected ViewerComparator createViewerComparator() {
+		return null;
+	}
 }
\ No newline at end of file
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/pages/GlusterServersPage.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/pages/GlusterServersPage.java
index 8be17b24..3ef05a2a 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/pages/GlusterServersPage.java
+++ b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/pages/GlusterServersPage.java
@@ -24,6 +24,7 @@ import org.eclipse.jface.layout.TableColumnLayout;
 import org.eclipse.jface.viewers.ColumnWeightData;
 import org.eclipse.jface.viewers.IBaseLabelProvider;
 import org.eclipse.jface.viewers.IContentProvider;
+import org.eclipse.jface.viewers.ViewerComparator;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Table;
@@ -32,6 +33,7 @@ import org.eclipse.ui.IWorkbenchSite;
 
 import com.gluster.storage.management.console.EntityGroupContentProvider;
 import com.gluster.storage.management.console.GlusterServerTableLabelProvider;
+import com.gluster.storage.management.console.utils.TableViewerComparator;
 import com.gluster.storage.management.core.constants.CoreConstants;
 import com.gluster.storage.management.core.model.ClusterListener;
 import com.gluster.storage.management.core.model.DefaultClusterListener;
@@ -54,6 +56,11 @@ public class GlusterServersPage extends AbstractTableViewerPage<GlusterServer> {
 		super(site, parent, style, true, true, servers);
 		this.glusterServers = servers.getEntities();
 	}
+	
+	@Override
+	protected ViewerComparator createViewerComparator() {
+		return new TableViewerComparator();
+	}
 
 	@Override
 	protected ClusterListener createClusterListener() {
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/pages/ServersPage.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/pages/ServersPage.java
index 99945b31..d97827c6 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/pages/ServersPage.java
+++ b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/pages/ServersPage.java
@@ -24,6 +24,7 @@ import org.eclipse.jface.layout.TableColumnLayout;
 import org.eclipse.jface.viewers.ColumnWeightData;
 import org.eclipse.jface.viewers.IBaseLabelProvider;
 import org.eclipse.jface.viewers.IContentProvider;
+import org.eclipse.jface.viewers.ViewerComparator;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Table;
@@ -128,4 +129,10 @@ public class ServersPage extends AbstractTableViewerPage<Server> {
 		TableColumnLayout tableColumnLayout = (TableColumnLayout) table.getParent().getLayout();
 		tableColumnLayout.setColumnData(column, new ColumnWeightData(weight));
 	}
+
+	@Override
+	protected ViewerComparator createViewerComparator() {
+		// TODO Auto-generated method stub
+		return null;
+	}
 }
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/pages/TasksPage.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/pages/TasksPage.java
index d54b501d..c166af0f 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/pages/TasksPage.java
+++ b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/pages/TasksPage.java
@@ -27,6 +27,7 @@ import org.eclipse.jface.viewers.IBaseLabelProvider;
 import org.eclipse.jface.viewers.IContentProvider;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.viewers.ViewerComparator;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Table;
@@ -141,4 +142,10 @@ public class TasksPage extends AbstractTableViewerPage<TaskInfo> {
 			}
 		}	
 	}
+
+	@Override
+	protected ViewerComparator createViewerComparator() {
+		// TODO Auto-generated method stub
+		return null;
+	}
 }
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/pages/VolumesPage.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/pages/VolumesPage.java
index 01d3e7b0..484f91b0 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/pages/VolumesPage.java
+++ b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/pages/VolumesPage.java
@@ -24,6 +24,7 @@ import org.eclipse.jface.layout.TableColumnLayout;
 import org.eclipse.jface.viewers.ColumnWeightData;
 import org.eclipse.jface.viewers.IBaseLabelProvider;
 import org.eclipse.jface.viewers.IContentProvider;
+import org.eclipse.jface.viewers.ViewerComparator;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Table;
@@ -125,4 +126,10 @@ public class VolumesPage extends AbstractTableViewerPage<Volume> {
 	protected List<Volume> getAllEntities() {
 		return volumes;
 	}
+
+	@Override
+	protected ViewerComparator createViewerComparator() {
+		// TODO Auto-generated method stub
+		return null;
+	}
 }