analysis : Rename getResults() to getSegmentStore()

This patch rename getResults to getSegmentStore() in
AbstractSegmentStoreAnalysisModule

Change-Id: I92a0b3a8149db8001c21cbd4e181ba1d37e5e3c2
Signed-off-by: Jean-Christian Kouame <jean-christian.kouame@ericsson.com>
Reviewed-on: https://git.eclipse.org/r/67193
Reviewed-by: Genevieve Bastien <gbastien+lttng@versatic.net>
Tested-by: Genevieve Bastien <gbastien+lttng@versatic.net>
Reviewed-by: Hudson CI
Reviewed-by: Matthew Khouzam <matthew.khouzam@ericsson.com>

diff --git a/analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/internal/analysis/os/linux/core/latency/statistics/SystemCallLatencyStatisticsAnalysisModule.java b/analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/internal/analysis/os/linux/core/latency/statistics/SystemCallLatencyStatisticsAnalysisModule.java
index 23835b5ca7d21e59f4f31d9d59d012e5070a398b..3dbc8f352f5cf5eecbd009c1effbcd21423ed049 100644 (file)
--- a/analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/internal/analysis/os/linux/core/latency/statistics/SystemCallLatencyStatisticsAnalysisModule.java
+++ b/analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/internal/analysis/os/linux/core/latency/statistics/SystemCallLatencyStatisticsAnalysisModule.java
@@ -70,17 +70,17 @@ public class SystemCallLatencyStatisticsAnalysisModule extends TmfAbstractAnalys
         }
         latency.waitForCompletion();
 
-        ISegmentStore<ISegment> store = latency.getResults();
+        ISegmentStore<ISegment> segStore = latency.getSegmentStore();
 
-        if (store != null) {
+        if (segStore != null) {
 
-            boolean result = calculateTotalManual(store, monitor);
+            boolean result = calculateTotalManual(segStore, monitor);
 
             if (!result) {
                 return false;
             }
 
-            result = calculateTotalPerSyscall(store, monitor);
+            result = calculateTotalPerSyscall(segStore, monitor);
             if (!result) {
                 return false;
             }

diff --git a/analysis/org.eclipse.tracecompass.analysis.timing.core/src/org/eclipse/tracecompass/analysis/timing/core/segmentstore/AbstractSegmentStoreAnalysisModule.java b/analysis/org.eclipse.tracecompass.analysis.timing.core/src/org/eclipse/tracecompass/analysis/timing/core/segmentstore/AbstractSegmentStoreAnalysisModule.java
index 61fdd52ce57738787ad78b5c1d51fea511772149..32930e3159a644f2a1d31a37bf83668b34a1799c 100644 (file)
--- a/analysis/org.eclipse.tracecompass.analysis.timing.core/src/org/eclipse/tracecompass/analysis/timing/core/segmentstore/AbstractSegmentStoreAnalysisModule.java
+++ b/analysis/org.eclipse.tracecompass.analysis.timing.core/src/org/eclipse/tracecompass/analysis/timing/core/segmentstore/AbstractSegmentStoreAnalysisModule.java
@@ -133,11 +133,11 @@ public abstract class AbstractSegmentStoreAnalysisModule extends TmfAbstractAnal
     protected abstract Object[] readObject(ObjectInputStream ois) throws ClassNotFoundException, IOException;
 
     /**
-     * Returns the result in a from the analysis in a ISegmentStore
+     * Returns the segment store built by this analysis
      *
-     * @return Results from the analysis in a ISegmentStore
+     * @return The segment store
      */
-    public @Nullable ISegmentStore<ISegment> getResults() {
+    public @Nullable ISegmentStore<ISegment> getSegmentStore() {
         return fSegmentStore;
     }
 

diff --git a/analysis/org.eclipse.tracecompass.analysis.timing.ui/src/org/eclipse/tracecompass/analysis/timing/ui/views/segmentstore/density/AbstractSegmentStoreDensityViewer.java b/analysis/org.eclipse.tracecompass.analysis.timing.ui/src/org/eclipse/tracecompass/analysis/timing/ui/views/segmentstore/density/AbstractSegmentStoreDensityViewer.java
index 266266b7dfd6fbdc5d551a574169f4549db4945c..f6e3b8c16333e0982ced204320665ca608c1b294 100644 (file)
--- a/analysis/org.eclipse.tracecompass.analysis.timing.ui/src/org/eclipse/tracecompass/analysis/timing/ui/views/segmentstore/density/AbstractSegmentStoreDensityViewer.java
+++ b/analysis/org.eclipse.tracecompass.analysis.timing.ui/src/org/eclipse/tracecompass/analysis/timing/ui/views/segmentstore/density/AbstractSegmentStoreDensityViewer.java
@@ -210,12 +210,12 @@ public abstract class AbstractSegmentStoreDensityViewer extends TmfViewer {
         if (analysisModule == null) {
             return null;
         }
-        final ISegmentStore<ISegment> results = analysisModule.getResults();
-        if (results == null) {
+        final ISegmentStore<ISegment> segStore = analysisModule.getSegmentStore();
+        if (segStore == null) {
             return null;
         }
 
-        Iterator<ISegment> intersectingElements = results.getIntersectingElements(timeRange.getStartTime().getValue(), timeRange.getEndTime().getValue()).iterator();
+        Iterator<ISegment> intersectingElements = segStore.getIntersectingElements(timeRange.getStartTime().getValue(), timeRange.getEndTime().getValue()).iterator();
 
         if (durationRange.lower > Double.MIN_VALUE || durationRange.upper < Double.MAX_VALUE) {
             Predicate<? super ISegment> predicate = new Predicate<ISegment>() {

diff --git a/analysis/org.eclipse.tracecompass.analysis.timing.ui/src/org/eclipse/tracecompass/analysis/timing/ui/views/segmentstore/scatter/AbstractSegmentStoreScatterGraphViewer.java b/analysis/org.eclipse.tracecompass.analysis.timing.ui/src/org/eclipse/tracecompass/analysis/timing/ui/views/segmentstore/scatter/AbstractSegmentStoreScatterGraphViewer.java
index 572516284b06df52cc668b898b7b6e034e6f7346..98f4c0c5726ec415b57c874a80b4ec7e46b43de3 100644 (file)
--- a/analysis/org.eclipse.tracecompass.analysis.timing.ui/src/org/eclipse/tracecompass/analysis/timing/ui/views/segmentstore/scatter/AbstractSegmentStoreScatterGraphViewer.java
+++ b/analysis/org.eclipse.tracecompass.analysis.timing.ui/src/org/eclipse/tracecompass/analysis/timing/ui/views/segmentstore/scatter/AbstractSegmentStoreScatterGraphViewer.java
@@ -97,8 +97,8 @@ public abstract class AbstractSegmentStoreScatterGraphViewer extends TmfCommonXL
                 return new Status(IStatus.WARNING, Activator.PLUGIN_ID, "Analysis module not available"); //$NON-NLS-1$
             }
 
-            final ISegmentStore<ISegment> results = module.getResults();
-            if (results == null) {
+            final ISegmentStore<ISegment> segStore = module.getSegmentStore();
+            if (segStore == null) {
                 setWindowRange(startTimeInNanos, endTimeInNanos);
                 redraw(statusMonitor, startTimeInNanos, startTimeInNanos, Collections.EMPTY_LIST);
                 return new Status(IStatus.INFO, Activator.PLUGIN_ID, "Analysis module does not have results"); //$NON-NLS-1$
@@ -108,7 +108,7 @@ public abstract class AbstractSegmentStoreScatterGraphViewer extends TmfCommonXL
             final long endTime = fCurrentRange.getEndTime().getValue();
             fPixelStart = startTime;
             fPixelSize = (endTime - startTime) / MAX_POINTS;
-            final Iterable<ISegment> intersectingElements = results.getIntersectingElements(startTime, endTime);
+            final Iterable<ISegment> intersectingElements = segStore.getIntersectingElements(startTime, endTime);
 
             final List<ISegment> list = convertIterableToList(intersectingElements, statusMonitor);
             final List<ISegment> displayData = (!list.isEmpty()) ? compactList(startTime, list, statusMonitor) : list;
@@ -399,11 +399,11 @@ public abstract class AbstractSegmentStoreScatterGraphViewer extends TmfCommonXL
             updateModel(null);
             return;
         }
-        ISegmentStore<ISegment> results = analysis.getResults();
+        ISegmentStore<ISegment> segStore = analysis.getSegmentStore();
         // If results are not null, then analysis is completed and model can be
         // updated
-        if (results != null) {
-            updateModel(results);
+        if (segStore != null) {
+            updateModel(segStore);
             setAnalysisModule(analysis);
             return;
         }

diff --git a/analysis/org.eclipse.tracecompass.analysis.timing.ui/src/org/eclipse/tracecompass/analysis/timing/ui/views/segmentstore/table/AbstractSegmentStoreTableViewer.java b/analysis/org.eclipse.tracecompass.analysis.timing.ui/src/org/eclipse/tracecompass/analysis/timing/ui/views/segmentstore/table/AbstractSegmentStoreTableViewer.java
index 31baae480682fea97631c80f1aec1b5d2852f526..5bae6d2443b708c3c29b7945d6bf449a13a0bbc1 100644 (file)
--- a/analysis/org.eclipse.tracecompass.analysis.timing.ui/src/org/eclipse/tracecompass/analysis/timing/ui/views/segmentstore/table/AbstractSegmentStoreTableViewer.java
+++ b/analysis/org.eclipse.tracecompass.analysis.timing.ui/src/org/eclipse/tracecompass/analysis/timing/ui/views/segmentstore/table/AbstractSegmentStoreTableViewer.java
@@ -246,11 +246,11 @@ public abstract class AbstractSegmentStoreTableViewer extends TmfSimpleTableView
 
         createAnalysisColumns();
 
-        ISegmentStore<ISegment> results = analysis.getResults();
+        ISegmentStore<ISegment> segStore = analysis.getSegmentStore();
         // If results are not null, then analysis is completed and model can be
         // updated
-        if (results != null) {
-            updateModel(results);
+        if (segStore != null) {
+            updateModel(segStore);
             return;
         }
         // If results are null, then add completion listener and run analysis