From 36dd544ce67d41b641d34ea6c9e862d5ec590717 Mon Sep 17 00:00:00 2001 From: Matthew Khouzam Date: Fri, 25 Jan 2013 11:42:04 -0500 Subject: [PATCH] [TMF] Allow custom iterators by making the traces the iterator factories Change-Id: Ib744ad63228a1c070f38d4710936481420739d06 Signed-off-by: Matthew Khouzam Reviewed-on: https://git.eclipse.org/r/9931 Tested-by: Hudson CI Reviewed-by: Alexandre Montplaisir IP-Clean: Alexandre Montplaisir --- .../tmf/core/ctfadaptor/CtfIteratorManager.java | 2 +- .../linuxtools/tmf/core/ctfadaptor/CtfTmfTrace.java | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/ctfadaptor/CtfIteratorManager.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/ctfadaptor/CtfIteratorManager.java index 1a66af7b5c..db14b396c2 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/ctfadaptor/CtfIteratorManager.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/ctfadaptor/CtfIteratorManager.java @@ -136,7 +136,7 @@ class CtfTraceManager { /* * if we're not full yet, just add an element. */ - retVal = new CtfIterator(fTrace); + retVal = fTrace.createIterator(); addElement(context, retVal); } else { 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 e1b11e80fc..c1c5c0e35f 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 @@ -332,4 +332,13 @@ public class CtfTmfTrace extends TmfTrace implements ITmfEventParser { private static CtfIterator getIterator(CtfTmfTrace trace, CtfTmfLightweightContext context) { return CtfIteratorManager.getIterator(trace, context); } + + /** + * Get an iterator to the trace + * + * @return an iterator to the trace + */ + public CtfIterator createIterator(){ + return new CtfIterator(this); + } } -- 2.34.1