ResourceComparator initialization method

[simantics/interop.git] / org.simantics.interop / src / org / simantics / interop / utils / TableUtils.java

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 debe73262169f9c2dda8c3afb514e339d52126d7..aaf87cdf50c18a23b52450b983aabb975277c0d5 100644 (file)
--- a/org.simantics.interop/src/org/simantics/interop/utils/TableUtils.java
+++ b/org.simantics.interop/src/org/simantics/interop/utils/TableUtils.java
@@ -14,7 +14,6 @@ public class TableUtils {
        public static TableViewerColumn addColumn(final TableViewer viewer, String text, boolean resize, boolean sort, int width) {\r
                final TableViewerColumn twc = new TableViewerColumn(viewer, SWT.NONE);\r
                final TableColumn tc = twc.getColumn();\r
-               //final TableColumn tc = new TableColumn(viewer.getTable(), SWT.NONE);\r
                tc.setText(text);\r
                tc.setResizable(resize);\r
                tc.setWidth(width);\r
@@ -22,8 +21,13 @@ public class TableUtils {
                        tc.addSelectionListener(new SelectionAdapter() {\r
                                @Override\r
                                public void widgetSelected(SelectionEvent e) {\r
-                                       StringColumnComparator comparator = (StringColumnComparator)viewer.getComparator();\r
-                                       //TableColumn tc = twc.getColumn();\r
+                                       StringColumnComparator comparator = null;\r
+                                       if (viewer.getComparator() instanceof StringColumnComparator) {\r
+                                               comparator = (StringColumnComparator)viewer.getComparator();\r
+                                       } else {\r
+                                               comparator = new StringColumnComparator();\r
+                                               viewer.setComparator(comparator);\r
+                                       }\r
                                        TableColumn tcs[] = viewer.getTable().getColumns();\r
                                        int index = -1;\r
                                        for (int i = 0; i <tcs.length; i++) {\r