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

diff --git a/analysis/org.eclipse.tracecompass.analysis.lami.core/src/org/eclipse/tracecompass/internal/provisional/analysis/lami/core/aspect/LamiTimestampAspect.java b/analysis/org.eclipse.tracecompass.analysis.lami.core/src/org/eclipse/tracecompass/internal/provisional/analysis/lami/core/aspect/LamiTimestampAspect.java
index 6f41e48977e015f01c77c216d9ab10b91315d922..31acda91fe4d73ea1151061fdc1e402f068b5fbb 100644 (file)
--- a/analysis/org.eclipse.tracecompass.analysis.lami.core/src/org/eclipse/tracecompass/internal/provisional/analysis/lami/core/aspect/LamiTimestampAspect.java
+++ b/analysis/org.eclipse.tracecompass.analysis.lami.core/src/org/eclipse/tracecompass/internal/provisional/analysis/lami/core/aspect/LamiTimestampAspect.java
@@ -61,11 +61,11 @@ public class LamiTimestampAspect extends LamiTableEntryAspect {
     }
 
     @Override
-    public @Nullable Double resolveDouble(@NonNull LamiTableEntry entry) {
+    public @Nullable Number resolveNumber(@NonNull LamiTableEntry entry) {
         LamiData data = entry.getValue(fColIndex);
         if (data instanceof LamiInteger) {
             LamiInteger range = (LamiInteger) data;
-            return Double.valueOf(range.getValue());
+            return Long.valueOf(range.getValue());
         }
         return null;
     }
@@ -73,13 +73,21 @@ public class LamiTimestampAspect extends LamiTableEntryAspect {
     @Override
     public Comparator<LamiTableEntry> getComparator() {
         return (o1, o2) -> {
-            Double dO1 = resolveDouble(o1);
-            Double dO2 = resolveDouble(o2);
-            if (dO1 == null || dO2 == null) {
+            Number d1 = resolveNumber(o1);
+            Number d2 = resolveNumber(o2);
+
+            if (d1 == null && d2 == null) {
                 return 0;
             }
+            if (d1 == null) {
+                return 1;
+            }
+
+            if (d2 == null) {
+                return -1;
+            }
 
-            return dO1.compareTo(dO2);
+            return Long.compare(d1.longValue(), d2.longValue());
         };
     }