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 / LamiIRQTypeAspect.java

diff --git a/analysis/org.eclipse.tracecompass.analysis.lami.core/src/org/eclipse/tracecompass/internal/provisional/analysis/lami/core/aspect/LamiIRQTypeAspect.java b/analysis/org.eclipse.tracecompass.analysis.lami.core/src/org/eclipse/tracecompass/internal/provisional/analysis/lami/core/aspect/LamiIRQTypeAspect.java
index dbd6fcb63ff2935cc3b5db2cc0904e72efcfd25f..375e7ee600e8862013d3be55f61d9c708c5bc5f5 100644 (file)
--- a/analysis/org.eclipse.tracecompass.analysis.lami.core/src/org/eclipse/tracecompass/internal/provisional/analysis/lami/core/aspect/LamiIRQTypeAspect.java
+++ b/analysis/org.eclipse.tracecompass.analysis.lami.core/src/org/eclipse/tracecompass/internal/provisional/analysis/lami/core/aspect/LamiIRQTypeAspect.java
@@ -70,7 +70,7 @@ public class LamiIRQTypeAspect extends LamiTableEntryAspect {
     }
 
     @Override
-    public @Nullable Double resolveDouble(LamiTableEntry entry) {
+    public @Nullable Number resolveNumber(LamiTableEntry entry) {
         return null;
     }
 
@@ -80,9 +80,16 @@ public class LamiIRQTypeAspect 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);
         };