From 73c74de792cc26e953651fec53fbcb64d3125dfa Mon Sep 17 00:00:00 2001 From: Jean-Christian Kouame Date: Tue, 23 Feb 2016 18:37:16 -0500 Subject: [PATCH] analysis : Rename getResults() to getSegmentStore() This patch rename getResults to getSegmentStore() in AbstractSegmentStoreAnalysisModule Change-Id: I92a0b3a8149db8001c21cbd4e181ba1d37e5e3c2 Signed-off-by: Jean-Christian Kouame Reviewed-on: https://git.eclipse.org/r/67193 Reviewed-by: Genevieve Bastien Tested-by: Genevieve Bastien Reviewed-by: Hudson CI Reviewed-by: Matthew Khouzam --- .../SystemCallLatencyStatisticsAnalysisModule.java | 8 ++++---- .../AbstractSegmentStoreAnalysisModule.java | 6 +++--- .../density/AbstractSegmentStoreDensityViewer.java | 6 +++--- .../AbstractSegmentStoreScatterGraphViewer.java | 12 ++++++------ .../table/AbstractSegmentStoreTableViewer.java | 6 +++--- 5 files changed, 19 insertions(+), 19 deletions(-) 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 23835b5ca7..3dbc8f352f 100644 --- 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 store = latency.getResults(); + ISegmentStore 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 61fdd52ce5..32930e3159 100644 --- 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 getResults() { + public @Nullable ISegmentStore 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 266266b7df..f6e3b8c163 100644 --- 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 results = analysisModule.getResults(); - if (results == null) { + final ISegmentStore segStore = analysisModule.getSegmentStore(); + if (segStore == null) { return null; } - Iterator intersectingElements = results.getIntersectingElements(timeRange.getStartTime().getValue(), timeRange.getEndTime().getValue()).iterator(); + Iterator intersectingElements = segStore.getIntersectingElements(timeRange.getStartTime().getValue(), timeRange.getEndTime().getValue()).iterator(); if (durationRange.lower > Double.MIN_VALUE || durationRange.upper < Double.MAX_VALUE) { Predicate predicate = new Predicate() { 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 572516284b..98f4c0c572 100644 --- 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 results = module.getResults(); - if (results == null) { + final ISegmentStore 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 intersectingElements = results.getIntersectingElements(startTime, endTime); + final Iterable intersectingElements = segStore.getIntersectingElements(startTime, endTime); final List list = convertIterableToList(intersectingElements, statusMonitor); final List displayData = (!list.isEmpty()) ? compactList(startTime, list, statusMonitor) : list; @@ -399,11 +399,11 @@ public abstract class AbstractSegmentStoreScatterGraphViewer extends TmfCommonXL updateModel(null); return; } - ISegmentStore results = analysis.getResults(); + ISegmentStore 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 31baae4806..5bae6d2443 100644 --- 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 results = analysis.getResults(); + ISegmentStore 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 -- 2.34.1