Getters for specific class UpdateOps

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

diff --git a/org.simantics.interop/src/org/simantics/interop/utils/StringColumnComparator.java b/org.simantics.interop/src/org/simantics/interop/utils/StringColumnComparator.java
index e2a338a8c2e963088d991d4d810706c84ec25403..b79e4a7e473175ab3afc43020da577b6440ebab7 100644 (file)
--- a/org.simantics.interop/src/org/simantics/interop/utils/StringColumnComparator.java
+++ b/org.simantics.interop/src/org/simantics/interop/utils/StringColumnComparator.java
@@ -28,60 +28,61 @@ public class StringColumnComparator extends ViewerComparator {
                }\r
        }\r
        \r
-       @SuppressWarnings("unchecked")\r
        @Override\r
        public int compare(Viewer viewer, Object e1, Object e2) {\r
                \r
+               int rc = 0;\r
                \r
                int cat1 = category(e1);\r
         int cat2 = category(e2);\r
 \r
         if (cat1 != cat2) {\r
-                       return cat1 - cat2;\r
-               }\r
+                       rc =  cat1 - cat2;\r
+               } else {\r
        \r
-        String name1 = null;\r
-        String name2 = null;\r
-        \r
-        \r
-        \r
-        if (viewer == null || !(viewer instanceof ContentViewer)) {\r
-            name1 = e1.toString();\r
-            name2 = e2.toString();\r
-        } else {\r
-            IBaseLabelProvider prov = ((ContentViewer) viewer).getLabelProvider();\r
-            if (viewer instanceof TableViewer && ((TableViewer)viewer).getLabelProvider(propertyIndex) != null) {\r
-               CellLabelProvider clp = ((TableViewer)viewer).getLabelProvider(propertyIndex);\r
-               if (clp instanceof ILabelProvider) {\r
-                       ILabelProvider ilb = (ILabelProvider)clp;\r
-                       name1 = ilb.getText(e1);\r
-                       name2 = ilb.getText(e2);\r
-               }\r
-            }\r
-            if (name1 == null) {\r
-                   if (prov instanceof ITableLabelProvider) {\r
-                       ITableLabelProvider lprov = (ITableLabelProvider) prov;\r
-                       name1 = lprov.getColumnText(e1,propertyIndex);\r
-                       name2 = lprov.getColumnText(e2,propertyIndex);\r
-                   } else if (prov instanceof ILabelProvider) {\r
-                       ILabelProvider lprov = (ILabelProvider) prov;\r
-                       name1 = lprov.getText(e1);\r
-                       name2 = lprov.getText(e2);\r
-                   } else {\r
-                       name1 = e1.toString();\r
-                       name2 = e2.toString();\r
+               String name1 = null;\r
+               String name2 = null;\r
+               \r
+               \r
+               \r
+               if (viewer == null || !(viewer instanceof ContentViewer)) {\r
+                   name1 = e1.toString();\r
+                   name2 = e2.toString();\r
+               } else {\r
+                   IBaseLabelProvider prov = ((ContentViewer) viewer).getLabelProvider();\r
+                   if (viewer instanceof TableViewer && ((TableViewer)viewer).getLabelProvider(propertyIndex) != null) {\r
+                       CellLabelProvider clp = ((TableViewer)viewer).getLabelProvider(propertyIndex);\r
+                       if (clp instanceof ILabelProvider) {\r
+                               ILabelProvider ilb = (ILabelProvider)clp;\r
+                               name1 = ilb.getText(e1);\r
+                               name2 = ilb.getText(e2);\r
+                       }\r
                    }\r
-            }\r
-        }\r
-        if (name1 == null) {\r
-                       name1 = "";//$NON-NLS-1$\r
-               }\r
-        if (name2 == null) {\r
-                       name2 = "";//$NON-NLS-1$\r
+                   if (name1 == null) {\r
+                           if (prov instanceof ITableLabelProvider) {\r
+                               ITableLabelProvider lprov = (ITableLabelProvider) prov;\r
+                               name1 = lprov.getColumnText(e1,propertyIndex);\r
+                               name2 = lprov.getColumnText(e2,propertyIndex);\r
+                           } else if (prov instanceof ILabelProvider) {\r
+                               ILabelProvider lprov = (ILabelProvider) prov;\r
+                               name1 = lprov.getText(e1);\r
+                               name2 = lprov.getText(e2);\r
+                           } else {\r
+                               name1 = e1.toString();\r
+                               name2 = e2.toString();\r
+                           }\r
+                   }\r
+               }\r
+               if (name1 == null) {\r
+                               name1 = "";//$NON-NLS-1$\r
+                       }\r
+               if (name2 == null) {\r
+                               name2 = "";//$NON-NLS-1$\r
+                       }\r
+       \r
+               // use the comparator to compare the strings\r
+               rc = getComparator().compare(name1, name2);\r
                }\r
-\r
-        // use the comparator to compare the strings\r
-        int rc = getComparator().compare(name1, name2);\r
                if (direction != DESCENDING)\r
                        rc = -rc;\r
                return rc;\r