|
53 | 53 | import org.eclipse.tracecompass.tmf.core.model.timegraph.TimeGraphModel; |
54 | 54 | import org.eclipse.tracecompass.tmf.core.model.timegraph.TimeGraphRowModel; |
55 | 55 | import org.eclipse.tracecompass.tmf.core.model.timegraph.TimeGraphState; |
56 | | -import org.eclipse.tracecompass.tmf.core.model.tree.ITmfTreeDataModel; |
57 | 56 | import org.eclipse.tracecompass.tmf.core.model.tree.TmfTreeModel; |
58 | 57 | import org.eclipse.tracecompass.tmf.core.presentation.IPaletteProvider; |
59 | 58 | import org.eclipse.tracecompass.tmf.core.presentation.RGBAColor; |
@@ -149,20 +148,17 @@ public class StateSystemDataProvider extends AbstractTmfTraceDataProvider implem |
149 | 148 | } |
150 | 149 |
|
151 | 150 | private static final Comparator<ITimeGraphEntryModel> NAME_COMPARATOR = (a, b) -> { |
152 | | - if (a instanceof TimeGraphEntryModel && b instanceof TimeGraphEntryModel) { |
153 | | - ITmfTreeDataModel aModel = a; |
154 | | - ITmfTreeDataModel bModel = b; |
155 | | - if (aModel instanceof TraceEntryModel && bModel instanceof TraceEntryModel) { |
156 | | - ITmfTrace ta = ((TraceEntryModel) aModel).getTrace(); |
157 | | - ITmfTrace tb = ((TraceEntryModel) bModel).getTrace(); |
| 151 | + if (a instanceof TraceEntryModel && b instanceof TraceEntryModel) { |
| 152 | + ITmfTrace ta = ((TraceEntryModel) a).getTrace(); |
| 153 | + ITmfTrace tb = ((TraceEntryModel) b).getTrace(); |
158 | 154 | // Puts the experiment entries at the top of the list |
159 | 155 | if (ta instanceof TmfExperiment && !(tb instanceof TmfExperiment)) { |
160 | 156 | return -1; |
161 | 157 | } else if (!(ta instanceof TmfExperiment) && (tb instanceof TmfExperiment)) { |
162 | 158 | return 1; |
163 | 159 | } |
164 | 160 | } |
165 | | - } |
| 161 | + |
166 | 162 | try { |
167 | 163 | return Long.compare(Long.parseLong(a.getName()), Long.parseLong(b.getName())); |
168 | 164 | } catch (NumberFormatException e) { |
|
0 commit comments