analysis.lami: correctly handle Number (double, long etc.) type graphing

[deliverable/tracecompass.git] / analysis / org.eclipse.tracecompass.analysis.lami.core / src / org / eclipse / tracecompass / internal / provisional / analysis / lami / core / aspect / LamiMixedAspect.java

diff --git a/analysis/org.eclipse.tracecompass.analysis.lami.core/src/org/eclipse/tracecompass/internal/provisional/analysis/lami/core/aspect/LamiMixedAspect.java b/analysis/org.eclipse.tracecompass.analysis.lami.core/src/org/eclipse/tracecompass/internal/provisional/analysis/lami/core/aspect/LamiMixedAspect.java
index 07b745b31ded5b480b8672b97c4fb9dd5fdc4e45..ed61b96084810b8552340489306e3c22b95d691a 100644 (file)
--- a/analysis/org.eclipse.tracecompass.analysis.lami.core/src/org/eclipse/tracecompass/internal/provisional/analysis/lami/core/aspect/LamiMixedAspect.java
+++ b/analysis/org.eclipse.tracecompass.analysis.lami.core/src/org/eclipse/tracecompass/internal/provisional/analysis/lami/core/aspect/LamiMixedAspect.java
@@ -71,7 +71,7 @@ public class LamiMixedAspect extends LamiTableEntryAspect {
     }
 
     @Override
-    public @Nullable Double resolveDouble(LamiTableEntry entry) {
+    public @Nullable Number resolveNumber(LamiTableEntry entry) {
         return null;
     }
 
@@ -81,9 +81,16 @@ public class LamiMixedAspect extends LamiTableEntryAspect {
             String s1 = resolveString(o1);
             String s2 = resolveString(o2);
 
-            if (s1 == null || s2 == null) {
+            if (s1 == null && s2 == null) {
                 return 0;
             }
+            if (s1 == null) {
+                return 1;
+            }
+
+            if (s2 == null) {
+                return -1;
+            }
 
             return s1.compareTo(s2);
         };