commit e7c78b909d00563354ceb83b93cbddb50a696a31
author Matthew Khouzam <matthew.khouzam@ericsson.com> Mon Dec 11 20:16:46 2023 -0500
committer Matthew Khouzam <matthew.khouzam@ericsson.com> Tue Feb 06 11:51:58 2024 -0500
tree d32322a894fab34c55b69efca4e9e6e129d953de
parent 9ffef043df4bec26c308126495603df4142eb5a0

tmf: Simplify repeated checks by extracting values

Improves legibility too.

Change-Id: Ieab109177e214d4f2340429ac95479a63c813fdd
Signed-off-by: Matthew Khouzam <matthew.khouzam@ericsson.com>
Reviewed-on: https://git.eclipse.org/r/c/tracecompass/org.eclipse.tracecompass/+/205778
Tested-by: Trace Compass Bot <tracecompass-bot@eclipse.org>
Tested-by: Bernd Hufmann <bernd.hufmann@ericsson.com>
Reviewed-by: Bernd Hufmann <bernd.hufmann@ericsson.com>

analysis/org.eclipse.tracecompass.analysis.timing.core/src/org/eclipse/tracecompass/analysis/timing/core/segmentstore/SegmentStoreAnalysisModule.java

diff --git a/analysis/org.eclipse.tracecompass.analysis.timing.core/src/org/eclipse/tracecompass/analysis/timing/core/segmentstore/SegmentStoreAnalysisModule.java b/analysis/org.eclipse.tracecompass.analysis.timing.core/src/org/eclipse/tracecompass/analysis/timing/core/segmentstore/SegmentStoreAnalysisModule.java
index ff71f67..2790240 100644
--- a/analysis/org.eclipse.tracecompass.analysis.timing.core/src/org/eclipse/tracecompass/analysis/timing/core/segmentstore/SegmentStoreAnalysisModule.java
+++ b/analysis/org.eclipse.tracecompass.analysis.timing.core/src/org/eclipse/tracecompass/analysis/timing/core/segmentstore/SegmentStoreAnalysisModule.java
@@ -215,10 +215,11 @@
     @Override
     protected boolean buildAnalysisSegments(ISegmentStore<ISegment> segmentStore, IProgressMonitor monitor) throws TmfAnalysisException {
         try (ScopeLog scope = new ScopeLog(LOGGER, Level.FINER, "SegmentStoreAnalysisModule#buildAnalysisSegment")) { //$NON-NLS-1$
-            if (fProviders.size() == 0) {
+            int size = fProviders.size();
+            if (size == 0) {
                 return false;
             }
-            if (fProviders.size() == 1) {
+            if (size == 1) {
                 segmentStore.addAll(Objects.requireNonNull(fProviders.get(fProviders.keySet().iterator().next())).getSegmentStore());
             } else {
                 for (Entry<String, ISegmentStoreProvider> providerEntry : fProviders.entrySet()) {

tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/views/timegraph/BaseDataProviderTimeGraphView.java

diff --git a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/views/timegraph/BaseDataProviderTimeGraphView.java b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/views/timegraph/BaseDataProviderTimeGraphView.java
index 616deda..c0276c2 100644
--- a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/views/timegraph/BaseDataProviderTimeGraphView.java
+++ b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/views/timegraph/BaseDataProviderTimeGraphView.java
@@ -507,9 +507,10 @@
             if (prev != null) {
                 long prevEnd = prev.getTime() + prev.getDuration();
                 ViewFilterDialog viewFilterDialog = getViewFilterDialog();
-                if (prevEnd < event.getTime() && (viewFilterDialog == null || !viewFilterDialog.hasActiveSavedFilters())) {
+                long duration = event.getTime() - prevEnd;
+                if (duration > 0 && (viewFilterDialog == null || !viewFilterDialog.hasActiveSavedFilters())) {
                     // fill in the gap.
-                    TimeEvent timeEvent = new TimeEvent(entry, prevEnd, event.getTime() - prevEnd);
+                    TimeEvent timeEvent = new TimeEvent(entry, prevEnd, duration);
                     if (viewFilterDialog != null && viewFilterDialog.isFilterActive()) {
                         timeEvent.setProperty(CoreFilterProperty.DIMMED, true);
                     }