X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.interop%2Fsrc%2Forg%2Fsimantics%2Finterop%2Futils%2FTableUtils.java;h=aaf87cdf50c18a23b52450b983aabb975277c0d5;hb=cd86a96617eaacfd9893bf98c09681be44072365;hp=f373bc2f3cafb34715f9dc08a8d123e75f5ef49a;hpb=90da95ffa8af19abd3850df4662c0e2cb307284e;p=simantics%2Finterop.git

diff --git a/org.simantics.interop/src/org/simantics/interop/utils/TableUtils.java b/org.simantics.interop/src/org/simantics/interop/utils/TableUtils.java
index f373bc2..aaf87cd 100644
--- a/org.simantics.interop/src/org/simantics/interop/utils/TableUtils.java
+++ b/org.simantics.interop/src/org/simantics/interop/utils/TableUtils.java
@@ -2,16 +2,18 @@ package org.simantics.interop.utils;
 
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.jface.viewers.TableViewerColumn;
+import org.eclipse.jface.viewers.TreeViewer;
+import org.eclipse.jface.viewers.TreeViewerColumn;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.widgets.TableColumn;
+import org.eclipse.swt.widgets.TreeColumn;
 
 public class TableUtils {
 	public static TableViewerColumn addColumn(final TableViewer viewer, String text, boolean resize, boolean sort, int width) {
 		final TableViewerColumn twc = new TableViewerColumn(viewer, SWT.NONE);
 		final TableColumn tc = twc.getColumn();
-		//final TableColumn tc = new TableColumn(viewer.getTable(), SWT.NONE);
 		tc.setText(text);
 		tc.setResizable(resize);
 		tc.setWidth(width);
@@ -19,8 +21,13 @@ public class TableUtils {
 			tc.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					StringColumnComparator comparator = (StringColumnComparator)viewer.getComparator();
-					//TableColumn tc = twc.getColumn();
+					StringColumnComparator comparator = null;
+					if (viewer.getComparator() instanceof StringColumnComparator) {
+						comparator = (StringColumnComparator)viewer.getComparator();
+					} else {
+						comparator = new StringColumnComparator();
+						viewer.setComparator(comparator);
+					}
 					TableColumn tcs[] = viewer.getTable().getColumns();
 					int index = -1;
 					for (int i = 0; i <tcs.length; i++) {
@@ -48,4 +55,13 @@ public class TableUtils {
 		}
 		return twc;
 	}
+	
+	public static TreeViewerColumn addColumn(final TreeViewer viewer, String text, boolean resize, int width) {
+		final TreeViewerColumn tvc = new TreeViewerColumn(viewer, SWT.NONE);
+		TreeColumn tc = tvc.getColumn();
+		tc.setResizable(resize);
+		tc.setText(text);
+		tc.setWidth(width);
+		return tvc;
+	}
 }