projects
/
deliverable
/
tracecompass.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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
/
LamiIRQNumberAspect.java
diff --git
a/analysis/org.eclipse.tracecompass.analysis.lami.core/src/org/eclipse/tracecompass/internal/provisional/analysis/lami/core/aspect/LamiIRQNumberAspect.java
b/analysis/org.eclipse.tracecompass.analysis.lami.core/src/org/eclipse/tracecompass/internal/provisional/analysis/lami/core/aspect/LamiIRQNumberAspect.java
index 81da9b361d7b936959def4b75b9d081a4c804747..88a97991067a50cc2a41ae63335a7b216631d1a3 100644
(file)
--- a/
analysis/org.eclipse.tracecompass.analysis.lami.core/src/org/eclipse/tracecompass/internal/provisional/analysis/lami/core/aspect/LamiIRQNumberAspect.java
+++ b/
analysis/org.eclipse.tracecompass.analysis.lami.core/src/org/eclipse/tracecompass/internal/provisional/analysis/lami/core/aspect/LamiIRQNumberAspect.java
@@
-61,10
+61,10
@@
public class LamiIRQNumberAspect extends LamiTableEntryAspect {
}
@Override
}
@Override
- public @Nullable
Double resolveDouble
(LamiTableEntry entry) {
+ public @Nullable
Number resolveNumber
(LamiTableEntry entry) {
LamiData data = entry.getValue(fColIndex);
if (data instanceof LamiIRQ) {
LamiData data = entry.getValue(fColIndex);
if (data instanceof LamiIRQ) {
- return
Double.valueOf
(((LamiIRQ) data).getNumber());
+ return (((LamiIRQ) data).getNumber());
}
return null;
}
return null;
@@
-73,13
+73,21
@@
public class LamiIRQNumberAspect extends LamiTableEntryAspect {
@Override
public Comparator<LamiTableEntry> getComparator() {
return (o1, o2) -> {
@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;
}
return 0;
}
+ if (d1 == null) {
+ return 1;
+ }
+
+ if (d2 == null) {
+ return -1;
+ }
- return
dO1.compareTo(dO2
);
+ return
Integer.compare(d1.intValue(), d2.intValue()
);
};
}
};
}
This page took
0.025939 seconds
and
5
git commands to generate.