From 7898bb212d23351b7f7a1e80652f37101db917f7 Mon Sep 17 00:00:00 2001 From: Alexandre Montplaisir Date: Thu, 27 Sep 2012 14:57:11 -0400 Subject: [PATCH] tmf: Expose getStateSystem() up to ITmfTrace The default implementation in TmfTrace will not provide any state system for now, sub-classes need to specify their own. Change-Id: I9239ac69c5ae20cea1bbe54b34260e829bd84465 Signed-off-by: Alexandre Montplaisir Reviewed-on: https://git.eclipse.org/r/7965 --- .../linuxtools/tmf/core/ctfadaptor/CtfTmfTrace.java | 4 +--- .../linuxtools/tmf/core/trace/ITmfTrace.java | 7 +++++++ .../eclipse/linuxtools/tmf/core/trace/TmfTrace.java | 13 +++++++++++++ 3 files changed, 21 insertions(+), 3 deletions(-) diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/ctfadaptor/CtfTmfTrace.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/ctfadaptor/CtfTmfTrace.java index 0cd83b23b6..b8a36b3ab5 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/ctfadaptor/CtfTmfTrace.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/ctfadaptor/CtfTmfTrace.java @@ -281,11 +281,9 @@ public class CtfTmfTrace extends TmfTrace implements ITmfEventParser { } /** - * Method getStateSystem. - * - * @return IStateSystemQuerier * @since 2.0 */ + @Override public ITmfStateSystem getStateSystem() { return this.ss; } diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/ITmfTrace.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/ITmfTrace.java index ec087bea23..e6b862de58 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/ITmfTrace.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/ITmfTrace.java @@ -20,6 +20,7 @@ import org.eclipse.linuxtools.tmf.core.event.ITmfEvent; import org.eclipse.linuxtools.tmf.core.event.ITmfTimestamp; import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange; import org.eclipse.linuxtools.tmf.core.exceptions.TmfTraceException; +import org.eclipse.linuxtools.tmf.core.statesystem.ITmfStateSystem; /** * The event stream structure in TMF. In its basic form, a trace has: @@ -171,6 +172,12 @@ public interface ITmfTrace extends ITmfDataProvider { */ public int getCacheSize(); + /** + * @return The state system that is associated with this trace + * @since 2.0 + */ + public ITmfStateSystem getStateSystem(); + // ------------------------------------------------------------------------ // Trace characteristics getters // ------------------------------------------------------------------------ diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/TmfTrace.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/TmfTrace.java index 66a3e15777..dcbf0dbc7c 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/TmfTrace.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/TmfTrace.java @@ -25,6 +25,7 @@ import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp; import org.eclipse.linuxtools.tmf.core.exceptions.TmfTraceException; import org.eclipse.linuxtools.tmf.core.request.ITmfDataRequest; import org.eclipse.linuxtools.tmf.core.request.ITmfEventRequest; +import org.eclipse.linuxtools.tmf.core.statesystem.ITmfStateSystem; /** * Abstract implementation of ITmfTrace. @@ -313,6 +314,18 @@ public abstract class TmfTrace extends TmfEventProvider implements ITmfTrace { return fParser; } + /** + * @since 2.0 + */ + @Override + public ITmfStateSystem getStateSystem() { + /* + * By default, no state system is used. Sub-classes can specify their + * own behaviour. + */ + return null; + } + // ------------------------------------------------------------------------ // ITmfTrace - Trace characteristics getters // ------------------------------------------------------------------------ -- 2.34.1