From 72f1e62a51b4abd5026692352c5a4b103cc440c6 Mon Sep 17 00:00:00 2001 From: Francois Chouinard Date: Tue, 28 Feb 2012 16:57:27 -0500 Subject: [PATCH] Change ITmfTrace to ITmfTrace --- .../core/tests/trace/LTTngTextTraceTest.java | 14 ++++---- .../lttng/core/trace/LTTngExperiment.java | 12 +++---- .../lttng/stubs/LTTngEventParserStub.java | 20 +++++++----- .../lttng/stubs/LTTngTraceStub.java | 8 ++--- .../ui/views/statistics/StatisticsView.java | 4 +-- .../tests/experiment/TmfExperimentTest.java | 25 ++++++++------- .../TmfMultiTraceExperimentTest.java | 25 ++++++++------- .../core/tests/trace/TmfExperimentTest.java | 25 ++++++++------- .../tmf/core/tests/trace/TmfTraceTest.java | 25 ++++++++------- .../tmf/stubs/trace/TmfEventParserStub.java | 7 ++-- .../tmf/stubs/trace/TmfTraceStub.java | 9 +++--- .../eclipse/linuxtools/tmf/core/Tracer.java | 4 +-- .../tmf/core/component/ITmfDataProvider.java | 4 +-- .../tmf/core/component/TmfDataProvider.java | 4 +-- .../tmf/core/component/TmfEventProvider.java | 4 +-- .../core/component/TmfProviderManager.java | 32 +++++++++---------- .../linuxtools/tmf/core/event/TmfEvent.java | 26 +++++++-------- .../tmf/core/experiment/TmfExperiment.java | 30 ++++++++--------- .../core/experiment/TmfExperimentContext.java | 8 ++--- .../tmf/core/parser/ITmfEventParser.java | 6 ++-- .../tmf/core/request/ITmfDataRequest.java | 4 +-- .../tmf/core/request/ITmfEventRequest.java | 4 +-- .../core/request/TmfCoalescedDataRequest.java | 4 +-- .../request/TmfCoalescedEventRequest.java | 4 +-- .../tmf/core/request/TmfDataRequest.java | 4 +-- .../tmf/core/request/TmfEventRequest.java | 4 +-- .../signal/TmfExperimentDisposedSignal.java | 6 ++-- .../TmfExperimentRangeUpdatedSignal.java | 8 ++--- .../signal/TmfExperimentSelectedSignal.java | 6 ++-- .../signal/TmfExperimentUpdatedSignal.java | 8 ++--- .../linuxtools/tmf/core/trace/ITmfTrace.java | 8 ++--- .../linuxtools/tmf/core/trace/TmfTrace.java | 18 +++++------ .../views/uml2sd/impl/Uml2SDTestFacility.java | 2 +- .../uml2sd/trace/TmfUml2SDTestTrace.java | 4 +-- .../ui/views/colors/ColorSettingsManager.java | 6 ++-- .../views/statistics/TmfStatisticsView.java | 18 +++++------ .../model/AbsTmfStatisticsTree.java | 6 ++-- .../model/TmfBaseStatisticsTree.java | 10 +++--- .../TimeChartDecorationProvider.java | 6 ++-- .../ui/views/timechart/TimeChartEvent.java | 4 +-- .../tmf/ui/views/timechart/TimeChartView.java | 6 ++-- .../tmf/ui/widgets/TmfRawEventViewer.java | 6 ++-- 42 files changed, 224 insertions(+), 214 deletions(-) diff --git a/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/trace/LTTngTextTraceTest.java b/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/trace/LTTngTextTraceTest.java index 36dcfae303..500b33d069 100644 --- a/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/trace/LTTngTextTraceTest.java +++ b/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/trace/LTTngTextTraceTest.java @@ -9,7 +9,7 @@ import org.eclipse.core.runtime.FileLocator; import org.eclipse.core.runtime.Path; import org.eclipse.linuxtools.lttng.core.tests.LTTngCoreTestPlugin; import org.eclipse.linuxtools.lttng.core.trace.LTTngTextTrace; -import org.eclipse.linuxtools.tmf.core.event.TmfEvent; +import org.eclipse.linuxtools.tmf.core.event.ITmfEvent; import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp; import org.eclipse.linuxtools.tmf.core.trace.TmfContext; import org.eclipse.linuxtools.tmf.core.trace.TmfLocation; @@ -110,7 +110,7 @@ public class LTTngTextTraceTest extends TestCase { } */ public void testGetNextEvent() { - TmfEvent tmpEvent = null; + ITmfEvent tmpEvent = null; LTTngTextTrace testStream1 = prepareStreamToTest(); TmfContext tmpContext = new TmfContext(null, 0); @@ -127,7 +127,7 @@ public class LTTngTextTraceTest extends TestCase { } public void testParseEvent() { - TmfEvent tmpEvent = null; + ITmfEvent tmpEvent = null; LTTngTextTrace testStream1 = prepareStreamToTest(); TmfContext tmpContext = new TmfContext(null, 0); @@ -144,7 +144,7 @@ public class LTTngTextTraceTest extends TestCase { } public void testSeekEventTimestamp() { - TmfEvent tmpEvent = null; + ITmfEvent tmpEvent = null; TmfContext tmpContext = new TmfContext(null, 0); LTTngTextTrace testStream1 = prepareStreamToTest(); @@ -175,7 +175,7 @@ public class LTTngTextTraceTest extends TestCase { } public void testSeekEventIndex() { - TmfEvent tmpEvent = null; + ITmfEvent tmpEvent = null; TmfContext tmpContext = new TmfContext(null, 0); LTTngTextTrace testStream1 = prepareStreamToTest(); @@ -206,7 +206,7 @@ public class LTTngTextTraceTest extends TestCase { } public void testSeekLocation() { - TmfEvent tmpEvent = null; + ITmfEvent tmpEvent = null; TmfContext tmpContext = new TmfContext(null, 0); LTTngTextTrace testStream1 = prepareStreamToTest(); @@ -238,7 +238,7 @@ public class LTTngTextTraceTest extends TestCase { @SuppressWarnings("unchecked") public void testGetter() { - TmfEvent tmpEvent = null; + ITmfEvent tmpEvent = null; LTTngTextTrace testStream1 = prepareStreamToTest(); TmfContext tmpContext = new TmfContext(null, 0); diff --git a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/trace/LTTngExperiment.java b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/trace/LTTngExperiment.java index e108d9e6f2..cd99f68f70 100644 --- a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/trace/LTTngExperiment.java +++ b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/trace/LTTngExperiment.java @@ -16,8 +16,8 @@ import org.eclipse.linuxtools.lttng.core.event.LttngEvent; import org.eclipse.linuxtools.lttng.core.event.LttngTimestamp; import org.eclipse.linuxtools.lttng.core.tracecontrol.utility.LiveTraceManager; import org.eclipse.linuxtools.lttng.jni.JniTrace; +import org.eclipse.linuxtools.tmf.core.event.ITmfEvent; import org.eclipse.linuxtools.tmf.core.event.ITmfTimestamp; -import org.eclipse.linuxtools.tmf.core.event.TmfEvent; import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange; import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp; import org.eclipse.linuxtools.tmf.core.experiment.TmfExperiment; @@ -38,7 +38,7 @@ import org.eclipse.linuxtools.tmf.core.trace.TmfContext; * Temporary class to resolve a basic incompatibility between TMF and LTTng. *

*/ -public class LTTngExperiment extends TmfExperiment { +public class LTTngExperiment extends TmfExperiment { private static final int DEFAULT_INDEX_PAGE_SIZE = 50000; @@ -108,7 +108,7 @@ public class LTTngExperiment extends TmfExperiment { // ------------------------------------------------------------------------ @Override - public synchronized TmfEvent getNextEvent(TmfContext context) { + public synchronized ITmfEvent getNextEvent(TmfContext context) { // Validate the context if (!(context instanceof TmfExperimentContext)) { @@ -133,7 +133,7 @@ public class LTTngExperiment extends TmfExperiment { } // Scan the candidate events and identify the "next" trace to read from - TmfEvent eventArray[] = expContext.getEvents(); + ITmfEvent eventArray[] = expContext.getEvents(); if (eventArray == null) { return null; } @@ -146,7 +146,7 @@ public class LTTngExperiment extends TmfExperiment { } } else { for (int i = 0; i < eventArray.length; i++) { - TmfEvent event = eventArray[i]; + ITmfEvent event = eventArray[i]; if (event != null && event.getTimestamp() != null) { ITmfTimestamp otherTS = event.getTimestamp(); if (otherTS.compareTo(timestamp, true) < 0) { @@ -158,7 +158,7 @@ public class LTTngExperiment extends TmfExperiment { } // Update the experiment context and set the "next" event - TmfEvent event = null; + ITmfEvent event = null; if (trace != TmfExperimentContext.NO_TRACE) { // updateIndex(expContext, timestamp); diff --git a/org.eclipse.linuxtools.lttng.ui.tests/stubs/org/eclipse/linuxtools/lttng/stubs/LTTngEventParserStub.java b/org.eclipse.linuxtools.lttng.ui.tests/stubs/org/eclipse/linuxtools/lttng/stubs/LTTngEventParserStub.java index cdbccbd11f..19cdb761f9 100644 --- a/org.eclipse.linuxtools.lttng.ui.tests/stubs/org/eclipse/linuxtools/lttng/stubs/LTTngEventParserStub.java +++ b/org.eclipse.linuxtools.lttng.ui.tests/stubs/org/eclipse/linuxtools/lttng/stubs/LTTngEventParserStub.java @@ -14,7 +14,8 @@ package org.eclipse.linuxtools.lttng.stubs; import java.io.IOException; -import org.eclipse.linuxtools.tmf.core.event.TmfEvent; +import org.eclipse.linuxtools.lttng.core.event.LttngEvent; +import org.eclipse.linuxtools.tmf.core.event.ITmfEvent; import org.eclipse.linuxtools.tmf.core.parser.ITmfEventParser; import org.eclipse.linuxtools.tmf.core.trace.ITmfTrace; import org.eclipse.linuxtools.tmf.core.trace.TmfContext; @@ -24,14 +25,17 @@ import org.eclipse.linuxtools.tmf.core.trace.TmfContext; *

* TODO: Implement me. Please. */ -public class LTTngEventParserStub implements ITmfEventParser { +public class LTTngEventParserStub implements ITmfEventParser { - @Override - public TmfEvent parseNextEvent(ITmfTrace stream, TmfContext context) - throws IOException { - // TODO Auto-generated method stub - return null; - } + /* (non-Javadoc) + * @see org.eclipse.linuxtools.tmf.core.parser.ITmfEventParser#parseNextEvent(org.eclipse.linuxtools.tmf.core.trace.ITmfTrace, org.eclipse.linuxtools.tmf.core.trace.TmfContext) + */ + @Override + public ITmfEvent parseNextEvent(ITmfTrace stream, TmfContext context) + throws IOException { + // TODO Auto-generated method stub + return null; + } // // ======================================================================== // // Attributes diff --git a/org.eclipse.linuxtools.lttng.ui.tests/stubs/org/eclipse/linuxtools/lttng/stubs/LTTngTraceStub.java b/org.eclipse.linuxtools.lttng.ui.tests/stubs/org/eclipse/linuxtools/lttng/stubs/LTTngTraceStub.java index 63b096b1d1..34545326de 100644 --- a/org.eclipse.linuxtools.lttng.ui.tests/stubs/org/eclipse/linuxtools/lttng/stubs/LTTngTraceStub.java +++ b/org.eclipse.linuxtools.lttng.ui.tests/stubs/org/eclipse/linuxtools/lttng/stubs/LTTngTraceStub.java @@ -17,7 +17,7 @@ import java.io.IOException; import java.io.RandomAccessFile; import org.eclipse.linuxtools.lttng.core.event.LttngEvent; -import org.eclipse.linuxtools.tmf.core.event.TmfEvent; +import org.eclipse.linuxtools.tmf.core.event.ITmfEvent; import org.eclipse.linuxtools.tmf.core.parser.ITmfEventParser; import org.eclipse.linuxtools.tmf.core.trace.ITmfLocation; import org.eclipse.linuxtools.tmf.core.trace.ITmfTrace; @@ -41,7 +41,7 @@ public class LTTngTraceStub extends TmfTrace { private final RandomAccessFile fTrace; // The associated event parser - private final ITmfEventParser fParser; + private final ITmfEventParser fParser; // ======================================================================== // Constructors @@ -145,10 +145,10 @@ public class LTTngTraceStub extends TmfTrace { * @see org.eclipse.linuxtools.tmf.trace.ITmfTrace#parseEvent() */ @Override - public TmfEvent parseEvent(TmfContext context) { + public ITmfEvent parseEvent(TmfContext context) { try { // paserNextEvent updates the context - TmfEvent event = fParser.parseNextEvent(this, context); + LttngEvent event = (LttngEvent) fParser.parseNextEvent(this, context); // if (event != null) { // context.setTimestamp(event.getTimestamp()); // } diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/StatisticsView.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/StatisticsView.java index 9354df9d07..946739ea81 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/StatisticsView.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/StatisticsView.java @@ -41,7 +41,7 @@ import org.eclipse.linuxtools.lttng.ui.views.statistics.evProcessor.StatsTimeCou import org.eclipse.linuxtools.lttng.ui.views.statistics.model.KernelStatisticsData; import org.eclipse.linuxtools.lttng.ui.views.statistics.model.StatisticsTreeNode; import org.eclipse.linuxtools.lttng.ui.views.statistics.model.StatisticsTreeRootFactory; -import org.eclipse.linuxtools.tmf.core.event.TmfEvent; +import org.eclipse.linuxtools.tmf.core.event.ITmfEvent; import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange; import org.eclipse.linuxtools.tmf.core.experiment.TmfExperiment; import org.eclipse.linuxtools.tmf.core.request.ITmfDataRequest.ExecutionType; @@ -661,7 +661,7 @@ public class StatisticsView extends AbsTimeUpdateView { * @param signal */ @TmfSignalHandler - public void experimentSelected(TmfExperimentSelectedSignal signal) { + public void experimentSelected(TmfExperimentSelectedSignal signal) { if (signal != null) { TmfExperiment experiment = signal.getExperiment(); String experimentName = experiment.getName(); diff --git a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/experiment/TmfExperimentTest.java b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/experiment/TmfExperimentTest.java index 2b2b12eb35..43647d5ff8 100644 --- a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/experiment/TmfExperimentTest.java +++ b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/experiment/TmfExperimentTest.java @@ -22,6 +22,7 @@ import junit.framework.TestCase; import org.eclipse.core.runtime.FileLocator; import org.eclipse.core.runtime.Path; +import org.eclipse.linuxtools.tmf.core.event.ITmfEvent; import org.eclipse.linuxtools.tmf.core.event.TmfEvent; import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange; import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp; @@ -130,7 +131,7 @@ public class TmfExperimentTest extends TestCase { for (int i = 0; i < checkpoints.size(); i++) { TmfCheckpoint checkpoint = checkpoints.get(i); TmfExperimentContext context = fExperiment.seekLocation(checkpoint.getLocation()); - TmfEvent event = fExperiment.parseEvent(context); + ITmfEvent event = fExperiment.parseEvent(context); assertEquals("Event rank", i * pageSize, context.getRank()); assertTrue("Timestamp", (checkpoint.getTimestamp().compareTo(event.getTimestamp(), false) == 0)); } @@ -146,7 +147,7 @@ public class TmfExperimentTest extends TestCase { TmfContext context = fExperiment.seekLocation(null); assertEquals("Event rank", 0, context.getRank()); - TmfEvent event = fExperiment.parseEvent(context); + ITmfEvent event = fExperiment.parseEvent(context); assertEquals("Event timestamp", 1, event.getTimestamp().getValue()); assertEquals("Event rank", 0, context.getRank()); @@ -200,7 +201,7 @@ public class TmfExperimentTest extends TestCase { TmfContext context = fExperiment.seekLocation(tmpContext.getLocation()); assertEquals("Event rank", 9, context.getRank()); - TmfEvent event = fExperiment.parseEvent(context); + ITmfEvent event = fExperiment.parseEvent(context); assertEquals("Event timestamp", 10, event.getTimestamp().getValue()); assertEquals("Event rank", 9, context.getRank()); @@ -255,7 +256,7 @@ public class TmfExperimentTest extends TestCase { TmfContext context = fExperiment.seekLocation(tmpContext.getLocation()); assertEquals("Event rank", 0, context.getRank()); - TmfEvent event = fExperiment.parseEvent(context); + ITmfEvent event = fExperiment.parseEvent(context); assertEquals("Event timestamp", 1, event.getTimestamp().getValue()); assertEquals("Event rank", 0, context.getRank()); @@ -279,7 +280,7 @@ public class TmfExperimentTest extends TestCase { TmfContext context = fExperiment.seekEvent(new TmfTimestamp(1, SCALE, 0)); assertEquals("Event rank", 0, context.getRank()); - TmfEvent event = fExperiment.parseEvent(context); + ITmfEvent event = fExperiment.parseEvent(context); assertEquals("Event timestamp", 1, event.getTimestamp().getValue()); assertEquals("Event rank", 0, context.getRank()); @@ -318,7 +319,7 @@ public class TmfExperimentTest extends TestCase { TmfContext context = fExperiment.seekEvent(new TmfTimestamp(2, SCALE, 0)); assertEquals("Event rank", 1, context.getRank()); - TmfEvent event = fExperiment.parseEvent(context); + ITmfEvent event = fExperiment.parseEvent(context); assertEquals("Event timestamp", 2, event.getTimestamp().getValue()); assertEquals("Event rank", 1, context.getRank()); @@ -381,7 +382,7 @@ public class TmfExperimentTest extends TestCase { TmfContext context = fExperiment.seekEvent(new TmfTimestamp(-1, SCALE, 0)); assertEquals("Event rank", 0, context.getRank()); - TmfEvent event = fExperiment.parseEvent(context); + ITmfEvent event = fExperiment.parseEvent(context); assertEquals("Event timestamp", 1, event.getTimestamp().getValue()); assertEquals("Event rank", 0, context.getRank()); @@ -405,7 +406,7 @@ public class TmfExperimentTest extends TestCase { TmfContext context = fExperiment.seekEvent(0); assertEquals("Event rank", 0, context.getRank()); - TmfEvent event = fExperiment.parseEvent(context); + ITmfEvent event = fExperiment.parseEvent(context); assertEquals("Event timestamp", 1, event.getTimestamp().getValue()); assertEquals("Event rank", 0, context.getRank()); @@ -444,7 +445,7 @@ public class TmfExperimentTest extends TestCase { TmfContext context = fExperiment.seekEvent(9); assertEquals("Event rank", 9, context.getRank()); - TmfEvent event = fExperiment.parseEvent(context); + ITmfEvent event = fExperiment.parseEvent(context); assertEquals("Event timestamp", 10, event.getTimestamp().getValue()); assertEquals("Event rank", 9, context.getRank()); @@ -495,7 +496,7 @@ public class TmfExperimentTest extends TestCase { TmfContext context = fExperiment.seekEvent(-1); assertEquals("Event rank", 0, context.getRank()); - TmfEvent event = fExperiment.parseEvent(context); + ITmfEvent event = fExperiment.parseEvent(context); assertEquals("Event timestamp", 1, event.getTimestamp().getValue()); assertEquals("Event rank", 0, context.getRank()); @@ -522,7 +523,7 @@ public class TmfExperimentTest extends TestCase { TmfContext context = fExperiment.seekEvent(new TmfTimestamp(0, SCALE, 0)); // Read NB_EVENTS - TmfEvent event = null;; + ITmfEvent event = null;; for (int i = 0; i < NB_READS; i++) { event = fExperiment.getNextEvent(context); assertEquals("Event timestamp", i + 1, event.getTimestamp().getValue()); @@ -543,7 +544,7 @@ public class TmfExperimentTest extends TestCase { // On lower bound, returns the first event (ts = 0) TmfContext context = fExperiment.seekEvent(new TmfTimestamp(0, SCALE, 0)); - TmfEvent event = fExperiment.getNextEvent(context); + ITmfEvent event = fExperiment.getNextEvent(context); assertEquals("Event timestamp", 1, event.getTimestamp().getValue()); for (int i = 2; i < 20; i++) { diff --git a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/experiment/TmfMultiTraceExperimentTest.java b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/experiment/TmfMultiTraceExperimentTest.java index d246a9e9ef..2760e9cc13 100644 --- a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/experiment/TmfMultiTraceExperimentTest.java +++ b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/experiment/TmfMultiTraceExperimentTest.java @@ -22,6 +22,7 @@ import junit.framework.TestCase; import org.eclipse.core.runtime.FileLocator; import org.eclipse.core.runtime.Path; +import org.eclipse.linuxtools.tmf.core.event.ITmfEvent; import org.eclipse.linuxtools.tmf.core.event.TmfEvent; import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange; import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp; @@ -134,7 +135,7 @@ public class TmfMultiTraceExperimentTest extends TestCase { for (int i = 0; i < checkpoints.size(); i++) { TmfCheckpoint checkpoint = checkpoints.get(i); TmfExperimentContext context = fExperiment.seekLocation(checkpoint.getLocation()); - TmfEvent event = fExperiment.parseEvent(context); + ITmfEvent event = fExperiment.parseEvent(context); assertEquals("Event rank", context.getRank(), i * pageSize); assertTrue("Timestamp", (checkpoint.getTimestamp().compareTo(event.getTimestamp(), false) == 0)); } @@ -150,7 +151,7 @@ public class TmfMultiTraceExperimentTest extends TestCase { TmfContext context = fExperiment.seekLocation(null); assertEquals("Event rank", 0, context.getRank()); - TmfEvent event = fExperiment.parseEvent(context); + ITmfEvent event = fExperiment.parseEvent(context); assertEquals("Event timestamp", 1, event.getTimestamp().getValue()); assertEquals("Event rank", 0, context.getRank()); @@ -204,7 +205,7 @@ public class TmfMultiTraceExperimentTest extends TestCase { TmfContext context = fExperiment.seekLocation(tmpContext.getLocation()); assertEquals("Event rank", 9, context.getRank()); - TmfEvent event = fExperiment.parseEvent(context); + ITmfEvent event = fExperiment.parseEvent(context); assertEquals("Event timestamp", 10, event.getTimestamp().getValue()); assertEquals("Event rank", 9, context.getRank()); @@ -259,7 +260,7 @@ public class TmfMultiTraceExperimentTest extends TestCase { TmfContext context = fExperiment.seekLocation(tmpContext.getLocation()); assertEquals("Event rank", 0, context.getRank()); - TmfEvent event = fExperiment.parseEvent(context); + ITmfEvent event = fExperiment.parseEvent(context); assertEquals("Event timestamp", 1, event.getTimestamp().getValue()); assertEquals("Event rank", 0, context.getRank()); @@ -283,7 +284,7 @@ public class TmfMultiTraceExperimentTest extends TestCase { TmfContext context = fExperiment.seekEvent(new TmfTimestamp(1, SCALE, 0)); assertEquals("Event rank", 0, context.getRank()); - TmfEvent event = fExperiment.parseEvent(context); + ITmfEvent event = fExperiment.parseEvent(context); assertEquals("Event timestamp", 1, event.getTimestamp().getValue()); assertEquals("Event rank", 0, context.getRank()); @@ -322,7 +323,7 @@ public class TmfMultiTraceExperimentTest extends TestCase { TmfContext context = fExperiment.seekEvent(new TmfTimestamp(2, SCALE, 0)); assertEquals("Event rank", 1, context.getRank()); - TmfEvent event = fExperiment.parseEvent(context); + ITmfEvent event = fExperiment.parseEvent(context); assertEquals("Event timestamp", 2, event.getTimestamp().getValue()); assertEquals("Event rank", 1, context.getRank()); @@ -385,7 +386,7 @@ public class TmfMultiTraceExperimentTest extends TestCase { TmfContext context = fExperiment.seekEvent(new TmfTimestamp(-1, SCALE, 0)); assertEquals("Event rank", 0, context.getRank()); - TmfEvent event = fExperiment.parseEvent(context); + ITmfEvent event = fExperiment.parseEvent(context); assertEquals("Event timestamp", 1, event.getTimestamp().getValue()); assertEquals("Event rank", 0, context.getRank()); @@ -409,7 +410,7 @@ public class TmfMultiTraceExperimentTest extends TestCase { TmfContext context = fExperiment.seekEvent(0); assertEquals("Event rank", 0, context.getRank()); - TmfEvent event = fExperiment.parseEvent(context); + ITmfEvent event = fExperiment.parseEvent(context); assertEquals("Event timestamp", 1, event.getTimestamp().getValue()); assertEquals("Event rank", 0, context.getRank()); @@ -448,7 +449,7 @@ public class TmfMultiTraceExperimentTest extends TestCase { TmfContext context = fExperiment.seekEvent(9); assertEquals("Event rank", 9, context.getRank()); - TmfEvent event = fExperiment.parseEvent(context); + ITmfEvent event = fExperiment.parseEvent(context); assertEquals("Event timestamp", 10, event.getTimestamp().getValue()); assertEquals("Event rank", 9, context.getRank()); @@ -499,7 +500,7 @@ public class TmfMultiTraceExperimentTest extends TestCase { TmfContext context = fExperiment.seekEvent(-1); assertEquals("Event rank", 0, context.getRank()); - TmfEvent event = fExperiment.parseEvent(context); + ITmfEvent event = fExperiment.parseEvent(context); assertEquals("Event timestamp", 1, event.getTimestamp().getValue()); assertEquals("Event rank", 0, context.getRank()); @@ -526,7 +527,7 @@ public class TmfMultiTraceExperimentTest extends TestCase { TmfContext context = fExperiment.seekEvent(new TmfTimestamp(0, SCALE, 0)); // Read NB_EVENTS - TmfEvent event = null;; + ITmfEvent event = null;; for (int i = 0; i < NB_READS; i++) { event = fExperiment.getNextEvent(context); assertEquals("Event timestamp", i + 1, event.getTimestamp().getValue()); @@ -547,7 +548,7 @@ public class TmfMultiTraceExperimentTest extends TestCase { // On lower bound, returns the first event (ts = 0) TmfContext context = fExperiment.seekEvent(new TmfTimestamp(0, SCALE, 0)); - TmfEvent event = fExperiment.getNextEvent(context); + ITmfEvent event = fExperiment.getNextEvent(context); assertEquals("Event timestamp", 1, event.getTimestamp().getValue()); for (int i = 2; i < 20; i++) { diff --git a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/TmfExperimentTest.java b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/TmfExperimentTest.java index e269f9a45e..e6f57a0628 100644 --- a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/TmfExperimentTest.java +++ b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/TmfExperimentTest.java @@ -22,6 +22,7 @@ import junit.framework.TestCase; import org.eclipse.core.runtime.FileLocator; import org.eclipse.core.runtime.Path; +import org.eclipse.linuxtools.tmf.core.event.ITmfEvent; import org.eclipse.linuxtools.tmf.core.event.TmfEvent; import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange; import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp; @@ -127,7 +128,7 @@ public class TmfExperimentTest extends TestCase { for (int i = 0; i < checkpoints.size(); i++) { TmfCheckpoint checkpoint = checkpoints.get(i); TmfExperimentContext context = fExperiment.seekLocation(checkpoint.getLocation()); - TmfEvent event = fExperiment.parseEvent(context); + ITmfEvent event = fExperiment.parseEvent(context); // assertEquals("Event rank", context.getRank(), i * pageSize); assertTrue("Timestamp", (checkpoint.getTimestamp().compareTo(event.getTimestamp(), false) == 0)); } @@ -142,7 +143,7 @@ public class TmfExperimentTest extends TestCase { // On lower bound, returns the first event (ts = 0) TmfContext context = fExperiment.seekEvent(new TmfTimestamp(0, SCALE, 0)); - TmfEvent event = fExperiment.parseEvent(context); + ITmfEvent event = fExperiment.parseEvent(context); assertEquals("Event timestamp", 1, event.getTimestamp().getValue()); event = fExperiment.parseEvent(context); @@ -171,7 +172,7 @@ public class TmfExperimentTest extends TestCase { // On lower bound, returns the first event (ts = 0) TmfContext context = fExperiment.seekEvent(new TmfTimestamp(0, SCALE, 0)); - TmfEvent event = fExperiment.getNextEvent(context); + ITmfEvent event = fExperiment.getNextEvent(context); assertEquals("Event timestamp", 1, event.getTimestamp().getValue()); for (int i = 2; i < 20; i++) { @@ -190,7 +191,7 @@ public class TmfExperimentTest extends TestCase { // Position trace at event rank 0 TmfContext context = fExperiment.seekLocation(null); // assertEquals("Event rank", 0, context.getRank()); - TmfEvent event = fExperiment.parseEvent(context); + ITmfEvent event = fExperiment.parseEvent(context); assertEquals("Event timestamp", 1, event.getTimestamp().getValue()); // assertEquals("Event rank", 0, context.getRank()); event = fExperiment.getNextEvent(context); @@ -226,7 +227,7 @@ public class TmfExperimentTest extends TestCase { TmfContext tmpContext = fExperiment.seekEvent(new TmfTimestamp(10, SCALE, 0)); TmfContext context = fExperiment.seekLocation(tmpContext.getLocation().clone()); // assertEquals("Event rank", 9, context.getRank()); - TmfEvent event = fExperiment.parseEvent(context); + ITmfEvent event = fExperiment.parseEvent(context); assertEquals("Event timestamp", 10, event.getTimestamp().getValue()); // assertEquals("Event rank", 9, context.getRank()); event = fExperiment.getNextEvent(context); @@ -273,7 +274,7 @@ public class TmfExperimentTest extends TestCase { TmfContext tmpContext = fExperiment.seekLocation(null); TmfContext context = fExperiment.seekLocation(tmpContext.getLocation().clone()); // assertEquals("Event rank", 0, context.getRank()); - TmfEvent event = fExperiment.parseEvent(context); + ITmfEvent event = fExperiment.parseEvent(context); assertEquals("Event timestamp", 1, event.getTimestamp().getValue()); // assertEquals("Event rank", 0, context.getRank()); event = fExperiment.getNextEvent(context); @@ -301,7 +302,7 @@ public class TmfExperimentTest extends TestCase { // Position trace at event rank 0 TmfContext context = fExperiment.seekEvent(new TmfTimestamp(1, SCALE, 0)); assertEquals("Event rank", 0, context.getRank()); - TmfEvent event = fExperiment.parseEvent(context); + ITmfEvent event = fExperiment.parseEvent(context); assertEquals("Event timestamp", 1, event.getTimestamp().getValue()); assertEquals("Event rank", 0, context.getRank()); event = fExperiment.getNextEvent(context); @@ -334,7 +335,7 @@ public class TmfExperimentTest extends TestCase { // Position trace at event rank 1 TmfContext context = fExperiment.seekEvent(new TmfTimestamp(2, SCALE, 0)); assertEquals("Event rank", 1, context.getRank()); - TmfEvent event = fExperiment.parseEvent(context); + ITmfEvent event = fExperiment.parseEvent(context); assertEquals("Event timestamp", 2, event.getTimestamp().getValue()); assertEquals("Event rank", 1, context.getRank()); event = fExperiment.getNextEvent(context); @@ -387,7 +388,7 @@ public class TmfExperimentTest extends TestCase { // Position trace at beginning TmfContext context = fExperiment.seekEvent(new TmfTimestamp(-1, SCALE, 0)); assertEquals("Event rank", 0, context.getRank()); - TmfEvent event = fExperiment.parseEvent(context); + ITmfEvent event = fExperiment.parseEvent(context); assertEquals("Event timestamp", 1, event.getTimestamp().getValue()); assertEquals("Event rank", 0, context.getRank()); event = fExperiment.getNextEvent(context); @@ -414,7 +415,7 @@ public class TmfExperimentTest extends TestCase { // On lower bound, returns the first event (ts = 1) TmfContext context = fExperiment.seekEvent(0); assertEquals("Event rank", 0, context.getRank()); - TmfEvent event = fExperiment.parseEvent(context); + ITmfEvent event = fExperiment.parseEvent(context); assertEquals("Event timestamp", 1, event.getTimestamp().getValue()); assertEquals("Event rank", 0, context.getRank()); event = fExperiment.getNextEvent(context); @@ -447,7 +448,7 @@ public class TmfExperimentTest extends TestCase { // Position trace at event rank 9 TmfContext context = fExperiment.seekEvent(9); assertEquals("Event rank", 9, context.getRank()); - TmfEvent event = fExperiment.parseEvent(context); + ITmfEvent event = fExperiment.parseEvent(context); assertEquals("Event timestamp", 10, event.getTimestamp().getValue()); assertEquals("Event rank", 9, context.getRank()); event = fExperiment.getNextEvent(context); @@ -490,7 +491,7 @@ public class TmfExperimentTest extends TestCase { // Position trace at beginning TmfContext context = fExperiment.seekEvent(-1); assertEquals("Event rank", 0, context.getRank()); - TmfEvent event = fExperiment.parseEvent(context); + ITmfEvent event = fExperiment.parseEvent(context); assertEquals("Event timestamp", 1, event.getTimestamp().getValue()); assertEquals("Event rank", 0, context.getRank()); event = fExperiment.getNextEvent(context); diff --git a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/TmfTraceTest.java b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/TmfTraceTest.java index 695eadba54..1426a3be02 100644 --- a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/TmfTraceTest.java +++ b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/TmfTraceTest.java @@ -24,6 +24,7 @@ import org.eclipse.core.runtime.FileLocator; import org.eclipse.core.runtime.Path; import org.eclipse.linuxtools.tmf.core.component.ITmfDataProvider; import org.eclipse.linuxtools.tmf.core.component.TmfProviderManager; +import org.eclipse.linuxtools.tmf.core.event.ITmfEvent; import org.eclipse.linuxtools.tmf.core.event.TmfEvent; import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange; import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp; @@ -230,7 +231,7 @@ public class TmfTraceTest extends TestCase { for (int i = 0; i < checkpoints.size(); i++) { TmfCheckpoint checkpoint = checkpoints.get(i); TmfContext context = new TmfContext(checkpoint.getLocation(), i * pageSize); - TmfEvent event = fTrace.parseEvent(context); + ITmfEvent event = fTrace.parseEvent(context); assertTrue(context.getRank() == i * pageSize); assertTrue((checkpoint.getTimestamp().compareTo(event.getTimestamp(), false) == 0)); } @@ -248,7 +249,7 @@ public class TmfTraceTest extends TestCase { TmfContext context = fTrace.seekEvent(new TmfTimestamp(0, SCALE, 0)); TmfContext svContext = new TmfContext(context); - TmfEvent event = fTrace.parseEvent(context); + ITmfEvent event = fTrace.parseEvent(context); assertEquals("Event timestamp", 1, event.getTimestamp().getValue()); assertEquals("Event rank", 0, context.getRank()); assertTrue("parseEvent", context.equals(svContext)); @@ -293,7 +294,7 @@ public class TmfTraceTest extends TestCase { TmfContext context = fTrace.seekEvent(new TmfTimestamp(0, SCALE, 0)); // Read NB_EVENTS - TmfEvent event; + ITmfEvent event; for (int i = 0; i < NB_READS; i++) { event = fTrace.getNextEvent(context); assertEquals("Event timestamp", i + 1, event.getTimestamp().getValue()); @@ -315,7 +316,7 @@ public class TmfTraceTest extends TestCase { // Position trace at event rank 0 TmfContext context = fTrace.seekLocation(null); - TmfEvent event = fTrace.parseEvent(context); + ITmfEvent event = fTrace.parseEvent(context); assertEquals("Event timestamp", 1, event.getTimestamp().getValue()); assertEquals("Event rank", 0, context.getRank()); @@ -364,7 +365,7 @@ public class TmfTraceTest extends TestCase { TmfContext context = fTrace.seekLocation(tmpContext.getLocation()); assertEquals("Event rank", ITmfContext.UNKNOWN_RANK, context.getRank()); - TmfEvent event = fTrace.parseEvent(context); + ITmfEvent event = fTrace.parseEvent(context); assertEquals("Event timestamp", 10, event.getTimestamp().getValue()); assertEquals("Event rank", ITmfContext.UNKNOWN_RANK, context.getRank()); @@ -419,7 +420,7 @@ public class TmfTraceTest extends TestCase { TmfContext context = fTrace.seekLocation(tmpContext.getLocation()); assertEquals("Event rank", ITmfContext.UNKNOWN_RANK, context.getRank()); - TmfEvent event = fTrace.parseEvent(context); + ITmfEvent event = fTrace.parseEvent(context); assertEquals("Event timestamp", 1, event.getTimestamp().getValue()); assertEquals("Event rank", ITmfContext.UNKNOWN_RANK, context.getRank()); @@ -451,7 +452,7 @@ public class TmfTraceTest extends TestCase { TmfContext context = fTrace.seekEvent(new TmfTimestamp(1, SCALE, 0)); assertEquals("Event rank", 0, context.getRank()); - TmfEvent event = fTrace.parseEvent(context); + ITmfEvent event = fTrace.parseEvent(context); assertEquals("Event timestamp", 1, event.getTimestamp().getValue()); assertEquals("Event rank", 0, context.getRank()); @@ -490,7 +491,7 @@ public class TmfTraceTest extends TestCase { TmfContext context = fTrace.seekEvent(new TmfTimestamp(2, SCALE, 0)); assertEquals("Event rank", 1, context.getRank()); - TmfEvent event = fTrace.parseEvent(context); + ITmfEvent event = fTrace.parseEvent(context); assertEquals("Event timestamp", 2, event.getTimestamp().getValue()); assertEquals("Event rank", 1, context.getRank()); @@ -553,7 +554,7 @@ public class TmfTraceTest extends TestCase { TmfContext context = fTrace.seekEvent(new TmfTimestamp(-1, SCALE, 0)); assertEquals("Event rank", 0, context.getRank()); - TmfEvent event = fTrace.parseEvent(context); + ITmfEvent event = fTrace.parseEvent(context); assertEquals("Event timestamp", 1, event.getTimestamp().getValue()); assertEquals("Event rank", 0, context.getRank()); @@ -584,7 +585,7 @@ public class TmfTraceTest extends TestCase { TmfContext context = fTrace.seekEvent(0); assertEquals("Event rank", 0, context.getRank()); - TmfEvent event = fTrace.parseEvent(context); + ITmfEvent event = fTrace.parseEvent(context); assertEquals("Event timestamp", 1, event.getTimestamp().getValue()); assertEquals("Event rank", 0, context.getRank()); @@ -623,7 +624,7 @@ public class TmfTraceTest extends TestCase { TmfContext context = fTrace.seekEvent(9); assertEquals("Event rank", 9, context.getRank()); - TmfEvent event = fTrace.parseEvent(context); + ITmfEvent event = fTrace.parseEvent(context); assertEquals("Event timestamp", 10, event.getTimestamp().getValue()); assertEquals("Event rank", 9, context.getRank()); @@ -674,7 +675,7 @@ public class TmfTraceTest extends TestCase { TmfContext context = fTrace.seekEvent(-1); assertEquals("Event rank", 0, context.getRank()); - TmfEvent event = fTrace.parseEvent(context); + ITmfEvent event = fTrace.parseEvent(context); assertEquals("Event timestamp", 1, event.getTimestamp().getValue()); assertEquals("Event rank", 0, context.getRank()); diff --git a/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/stubs/trace/TmfEventParserStub.java b/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/stubs/trace/TmfEventParserStub.java index 19a82b6df2..d6d86faf1d 100644 --- a/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/stubs/trace/TmfEventParserStub.java +++ b/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/stubs/trace/TmfEventParserStub.java @@ -17,6 +17,7 @@ import java.io.IOException; import java.io.RandomAccessFile; import java.util.Vector; +import org.eclipse.linuxtools.tmf.core.event.ITmfEvent; import org.eclipse.linuxtools.tmf.core.event.ITmfEventField; import org.eclipse.linuxtools.tmf.core.event.TmfEvent; import org.eclipse.linuxtools.tmf.core.event.TmfEventField; @@ -33,7 +34,7 @@ import org.eclipse.linuxtools.tmf.core.trace.TmfLocation; * TODO: Implement me. Please. */ @SuppressWarnings("nls") -public class TmfEventParserStub implements ITmfEventParser { +public class TmfEventParserStub implements ITmfEventParser { // ------------------------------------------------------------------------ // Attributes @@ -67,7 +68,7 @@ public class TmfEventParserStub implements ITmfEventParser { static final String typePrefix = "Type-"; @Override @SuppressWarnings("unchecked") - public TmfEvent parseNextEvent(ITmfTrace eventStream, TmfContext context) throws IOException { + public ITmfEvent parseNextEvent(ITmfTrace eventStream, TmfContext context) throws IOException { if (! (eventStream instanceof TmfTraceStub)) { return null; @@ -106,7 +107,7 @@ public class TmfEventParserStub implements ITmfEventParser { content.append("]"); TmfEventField root = new TmfEventField(ITmfEventField.ROOT_ID, content.toString()); - TmfEvent event = new TmfEvent(eventStream, + ITmfEvent event = new TmfEvent(eventStream, new TmfTimestamp(ts, -3, 0), // millisecs source, fTypes[typeIndex], root, reference.toString()); return event; diff --git a/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/stubs/trace/TmfTraceStub.java b/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/stubs/trace/TmfTraceStub.java index 7605a684cf..df3c312067 100644 --- a/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/stubs/trace/TmfTraceStub.java +++ b/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/stubs/trace/TmfTraceStub.java @@ -17,6 +17,7 @@ import java.io.IOException; import java.io.RandomAccessFile; import java.util.concurrent.locks.ReentrantLock; +import org.eclipse.linuxtools.tmf.core.event.ITmfEvent; import org.eclipse.linuxtools.tmf.core.event.ITmfTimestamp; import org.eclipse.linuxtools.tmf.core.event.TmfEvent; import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange; @@ -44,7 +45,7 @@ public class TmfTraceStub extends TmfTrace { private RandomAccessFile fTrace; // The associated event parser - private ITmfEventParser fParser; + private ITmfEventParser fParser; // The synchronization lock private ReentrantLock fLock = new ReentrantLock(); @@ -99,7 +100,7 @@ public class TmfTraceStub extends TmfTrace { * @param parser * @throws FileNotFoundException */ - public TmfTraceStub(String filename, int cacheSize, boolean waitForCompletion, ITmfEventParser parser) throws FileNotFoundException { + public TmfTraceStub(String filename, int cacheSize, boolean waitForCompletion, ITmfEventParser parser) throws FileNotFoundException { super(filename, TmfEvent.class, filename, cacheSize, false); fTrace = new RandomAccessFile(filename, "r"); fParser = parser; @@ -222,12 +223,12 @@ public class TmfTraceStub extends TmfTrace { } @Override - public TmfEvent parseEvent(TmfContext context) { + public ITmfEvent parseEvent(TmfContext context) { fLock.lock(); try { // parseNextEvent will update the context if (fTrace != null) { - TmfEvent event = fParser.parseNextEvent(this, context.clone()); + ITmfEvent event = fParser.parseNextEvent(this, context.clone()); return event; } } diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/Tracer.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/Tracer.java index b2f02fa90c..6736fa7262 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/Tracer.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/Tracer.java @@ -7,7 +7,7 @@ import java.io.IOException; import org.eclipse.core.runtime.Platform; import org.eclipse.linuxtools.tmf.core.component.ITmfComponent; import org.eclipse.linuxtools.tmf.core.component.ITmfDataProvider; -import org.eclipse.linuxtools.tmf.core.event.TmfEvent; +import org.eclipse.linuxtools.tmf.core.event.ITmfEvent; import org.eclipse.linuxtools.tmf.core.request.ITmfDataRequest; import org.eclipse.linuxtools.tmf.core.request.ITmfEventRequest; import org.eclipse.linuxtools.tmf.core.signal.TmfSignal; @@ -171,7 +171,7 @@ public class Tracer { trace(message); } - public static void traceEvent(ITmfDataProvider provider, ITmfDataRequest request, TmfEvent data) { + public static void traceEvent(ITmfDataProvider provider, ITmfDataRequest request, ITmfEvent data) { String message = ("[EVT] Provider=" + provider.toString() + ", Req=" + request.getRequestId() + ", Event=" + data .toString()); trace(message); diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/component/ITmfDataProvider.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/component/ITmfDataProvider.java index 68b1780491..f979d6426b 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/component/ITmfDataProvider.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/component/ITmfDataProvider.java @@ -12,7 +12,7 @@ package org.eclipse.linuxtools.tmf.core.component; -import org.eclipse.linuxtools.tmf.core.event.TmfEvent; +import org.eclipse.linuxtools.tmf.core.event.ITmfEvent; import org.eclipse.linuxtools.tmf.core.request.ITmfDataRequest; /** @@ -20,7 +20,7 @@ import org.eclipse.linuxtools.tmf.core.request.ITmfDataRequest; *

* TODO: Implement me. Please. */ -public interface ITmfDataProvider { +public interface ITmfDataProvider { /** * Queues the request for processing. diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/component/TmfDataProvider.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/component/TmfDataProvider.java index d76f32886b..87369d5190 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/component/TmfDataProvider.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/component/TmfDataProvider.java @@ -18,7 +18,7 @@ import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.SynchronousQueue; import org.eclipse.linuxtools.tmf.core.Tracer; -import org.eclipse.linuxtools.tmf.core.event.TmfEvent; +import org.eclipse.linuxtools.tmf.core.event.ITmfEvent; import org.eclipse.linuxtools.tmf.core.request.ITmfDataRequest; import org.eclipse.linuxtools.tmf.core.request.ITmfDataRequest.ExecutionType; import org.eclipse.linuxtools.tmf.core.request.TmfCoalescedDataRequest; @@ -42,7 +42,7 @@ import org.eclipse.linuxtools.tmf.core.trace.ITmfContext; *

* TODO: Add support for providing multiple data types. */ -public abstract class TmfDataProvider extends TmfComponent implements ITmfDataProvider { +public abstract class TmfDataProvider extends TmfComponent implements ITmfDataProvider { // ------------------------------------------------------------------------ // Constants diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/component/TmfEventProvider.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/component/TmfEventProvider.java index f07e485dd4..67b62eee0d 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/component/TmfEventProvider.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/component/TmfEventProvider.java @@ -13,8 +13,8 @@ package org.eclipse.linuxtools.tmf.core.component; import org.eclipse.linuxtools.tmf.core.Tracer; +import org.eclipse.linuxtools.tmf.core.event.ITmfEvent; import org.eclipse.linuxtools.tmf.core.event.ITmfTimestamp; -import org.eclipse.linuxtools.tmf.core.event.TmfEvent; import org.eclipse.linuxtools.tmf.core.request.ITmfDataRequest; import org.eclipse.linuxtools.tmf.core.request.ITmfDataRequest.ExecutionType; import org.eclipse.linuxtools.tmf.core.request.ITmfEventRequest; @@ -25,7 +25,7 @@ import org.eclipse.linuxtools.tmf.core.request.TmfEventRequest; * TmfEventProvider *

*/ -public abstract class TmfEventProvider extends TmfDataProvider { +public abstract class TmfEventProvider extends TmfDataProvider { // ------------------------------------------------------------------------ // Constructors diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/component/TmfProviderManager.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/component/TmfProviderManager.java index cc7c3cbe45..e7f4bd6213 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/component/TmfProviderManager.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/component/TmfProviderManager.java @@ -17,7 +17,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.eclipse.linuxtools.tmf.core.event.TmfEvent; +import org.eclipse.linuxtools.tmf.core.event.ITmfEvent; /** * TmfProviderManager.java @@ -36,8 +36,8 @@ public class TmfProviderManager { // Keeps track of the providers for each event type // ------------------------------------------------------------------------ - private static Map, List>> fProviders = - new HashMap, List>>(); + private static Map, List>> fProviders = + new HashMap, List>>(); /** * Registers [provider] as a provider of [eventType] @@ -45,9 +45,9 @@ public class TmfProviderManager { * @param eventType * @param provider */ - public static void register(Class eventType, TmfDataProvider provider) { + public static void register(Class eventType, TmfDataProvider provider) { if (fProviders.get(eventType) == null) - fProviders.put(eventType, new ArrayList>()); + fProviders.put(eventType, new ArrayList>()); fProviders.get(eventType).add(provider); } @@ -57,8 +57,8 @@ public class TmfProviderManager { * @param dataClass * @param provider */ - public static void deregister(Class dataClass, TmfDataProvider provider) { - List> list = fProviders.get(dataClass); + public static void deregister(Class dataClass, TmfDataProvider provider) { + List> list = fProviders.get(dataClass); if (list != null) { list.remove(provider); if (list.size() == 0) @@ -73,11 +73,11 @@ public class TmfProviderManager { * @return */ @SuppressWarnings("unchecked") - public static TmfDataProvider[] getProviders(Class dataClass) { - List> list = fProviders.get(dataClass); + public static TmfDataProvider[] getProviders(Class dataClass) { + List> list = fProviders.get(dataClass); if (list == null) - list = new ArrayList>(); - TmfDataProvider[] result = new TmfDataProvider[list.size()]; + list = new ArrayList>(); + TmfDataProvider[] result = new TmfDataProvider[list.size()]; return list.toArray(result); } @@ -89,20 +89,20 @@ public class TmfProviderManager { * @return */ @SuppressWarnings("unchecked") - public static TmfDataProvider[] getProviders(Class dataClass, Class> providerClass) { + public static TmfDataProvider[] getProviders(Class dataClass, Class> providerClass) { if (providerClass == null) { return getProviders(dataClass); } - TmfDataProvider[] list = getProviders(dataClass); - List> result = new ArrayList>(); + TmfDataProvider[] list = getProviders(dataClass); + List> result = new ArrayList>(); if (list != null) { - for (TmfDataProvider provider : list) { + for (TmfDataProvider provider : list) { if (provider.getClass() == providerClass) { result.add(provider); } } } - TmfDataProvider[] array = new TmfDataProvider[result.size()]; + TmfDataProvider[] array = new TmfDataProvider[result.size()]; return result.toArray(array); } diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfEvent.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfEvent.java index 1842105963..5cbac392cb 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfEvent.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfEvent.java @@ -33,7 +33,7 @@ public class TmfEvent implements ITmfEvent { /** * The trace containing the event */ - protected ITmfTrace fTrace; + protected ITmfTrace fTrace; /** * The event rank within the trace @@ -93,7 +93,7 @@ public class TmfEvent implements ITmfEvent { * @param type the event content (payload) * @param reference the event reference */ - public TmfEvent(ITmfTrace trace, long rank, ITmfTimestamp timestamp, String source, + public TmfEvent(ITmfTrace trace, long rank, ITmfTimestamp timestamp, String source, ITmfEventType type, ITmfEventField content, String reference) { fTrace = trace; @@ -108,7 +108,7 @@ public class TmfEvent implements ITmfEvent { /** * Constructor - no rank */ - public TmfEvent(ITmfTrace trace, ITmfTimestamp timestamp, String source, + public TmfEvent(ITmfTrace trace, ITmfTimestamp timestamp, String source, ITmfEventType type, ITmfEventField content, String reference) { this(trace, -1, timestamp, source, type, content, reference); @@ -117,7 +117,7 @@ public class TmfEvent implements ITmfEvent { /** * Constructor - no rank, no content */ - public TmfEvent(ITmfTrace trace, ITmfTimestamp timestamp, String source, + public TmfEvent(ITmfTrace trace, ITmfTimestamp timestamp, String source, ITmfEventType type, String reference) { this(trace, -1, timestamp, source, type, null, reference); @@ -136,16 +136,16 @@ public class TmfEvent implements ITmfEvent { * * @param event the original event */ - public TmfEvent(TmfEvent event) { + public TmfEvent(ITmfEvent event) { if (event == null) throw new IllegalArgumentException(); - fTrace = event.fTrace; - fRank = event.fRank; - fTimestamp = event.fTimestamp; - fSource = event.fSource; - fType = event.fType; - fContent = event.fContent; - fReference = event.fReference; + fTrace = event.getTrace(); + fRank = event.getRank(); + fTimestamp = event.getTimestamp(); + fSource = event.getSource(); + fType = event.getType(); + fContent = event.getContent(); + fReference = event.getReference(); } // ------------------------------------------------------------------------ @@ -156,7 +156,7 @@ public class TmfEvent implements ITmfEvent { * @see org.eclipse.linuxtools.tmf.core.event.ITmfEvent#getTrace() */ @Override - public ITmfTrace getTrace() { + public ITmfTrace getTrace() { return fTrace; } diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/experiment/TmfExperiment.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/experiment/TmfExperiment.java index d6a6f82a03..592246607f 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/experiment/TmfExperiment.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/experiment/TmfExperiment.java @@ -22,8 +22,8 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.jobs.Job; import org.eclipse.linuxtools.tmf.core.component.TmfEventProvider; +import org.eclipse.linuxtools.tmf.core.event.ITmfEvent; import org.eclipse.linuxtools.tmf.core.event.ITmfTimestamp; -import org.eclipse.linuxtools.tmf.core.event.TmfEvent; import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange; import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp; import org.eclipse.linuxtools.tmf.core.request.ITmfDataRequest; @@ -50,7 +50,7 @@ import org.eclipse.linuxtools.tmf.core.trace.TmfContext; * TmfExperiment presents a time-ordered, unified view of a set of TmfTraces that are part of a tracing experiment. *

*/ -public class TmfExperiment extends TmfEventProvider implements ITmfTrace { +public class TmfExperiment extends TmfEventProvider implements ITmfTrace { // ------------------------------------------------------------------------ // Attributes @@ -293,7 +293,7 @@ public class TmfExperiment extends TmfEventProvider imple */ public ITmfTimestamp getTimestamp(int index) { TmfExperimentContext context = seekEvent(index); - TmfEvent event = getNextEvent(context); + ITmfEvent event = getNextEvent(context); return (event != null) ? event.getTimestamp() : null; } @@ -453,7 +453,7 @@ public class TmfExperiment extends TmfEventProvider imple context.setRank((long) index * fIndexPageSize); // And locate the event - TmfEvent event = parseEvent(context); + ITmfEvent event = parseEvent(context); while (event != null && event.getTimestamp().compareTo(timestamp, false) < 0) { getNextEvent(context); event = parseEvent(context); @@ -495,7 +495,7 @@ public class TmfExperiment extends TmfEventProvider imple context.setRank((long) index * fIndexPageSize); // And locate the event - TmfEvent event = parseEvent(context); + ITmfEvent event = parseEvent(context); long pos = context.getRank(); while (event != null && pos++ < rank) { getNextEvent(context); @@ -557,7 +557,7 @@ public class TmfExperiment extends TmfEventProvider imple // } @Override - public synchronized TmfEvent getNextEvent(TmfContext context) { + public synchronized ITmfEvent getNextEvent(TmfContext context) { // Validate the context if (!(context instanceof TmfExperimentContext)) { @@ -582,7 +582,7 @@ public class TmfExperiment extends TmfEventProvider imple } // Scan the candidate events and identify the "next" trace to read from - TmfEvent eventArray[] = expContext.getEvents(); + ITmfEvent eventArray[] = expContext.getEvents(); if (eventArray == null) { return null; } @@ -595,7 +595,7 @@ public class TmfExperiment extends TmfEventProvider imple } } else { for (int i = 0; i < eventArray.length; i++) { - TmfEvent event = eventArray[i]; + ITmfEvent event = eventArray[i]; if (event != null && event.getTimestamp() != null) { ITmfTimestamp otherTS = event.getTimestamp(); if (otherTS.compareTo(timestamp, true) < 0) { @@ -606,7 +606,7 @@ public class TmfExperiment extends TmfEventProvider imple } } // Update the experiment context and set the "next" event - TmfEvent event = null; + ITmfEvent event = null; if (trace != TmfExperimentContext.NO_TRACE) { updateIndex(expContext, timestamp); @@ -655,7 +655,7 @@ public class TmfExperiment extends TmfEventProvider imple * @see org.eclipse.linuxtools.tmf.trace.ITmfTrace#parseEvent(org.eclipse.linuxtools .tmf.trace.TmfContext) */ @Override - public TmfEvent parseEvent(TmfContext context) { + public ITmfEvent parseEvent(TmfContext context) { // Validate the context if (!(context instanceof TmfExperimentContext)) { @@ -682,7 +682,7 @@ public class TmfExperiment extends TmfEventProvider imple int trace = TmfExperimentContext.NO_TRACE; ITmfTimestamp timestamp = TmfTimestamp.BigCrunch; for (int i = 0; i < expContext.getTraces().length; i++) { - TmfEvent event = expContext.getEvents()[i]; + ITmfEvent event = expContext.getEvents()[i]; if (event != null && event.getTimestamp() != null) { ITmfTimestamp otherTS = event.getTimestamp(); if (otherTS.compareTo(timestamp, true) < 0) { @@ -692,7 +692,7 @@ public class TmfExperiment extends TmfEventProvider imple } } - TmfEvent event = null; + ITmfEvent event = null; if (trace != TmfExperimentContext.NO_TRACE) { event = expContext.getEvents()[trace]; } @@ -723,7 +723,7 @@ public class TmfExperiment extends TmfEventProvider imple if (getStreamingInterval() == 0) { TmfContext context = seekLocation(null); - TmfEvent event = getNext(context); + ITmfEvent event = getNext(context); if (event == null) { return; } @@ -859,7 +859,7 @@ public class TmfExperiment extends TmfEventProvider imple // fEventLog = openLogFile("TraceEvent.log"); // System.out.println(System.currentTimeMillis() + ": Experiment indexing started"); - ITmfEventRequest request = new TmfEventRequest(TmfEvent.class, timeRange, index, TmfDataRequest.ALL_DATA, + ITmfEventRequest request = new TmfEventRequest(ITmfEvent.class, timeRange, index, TmfDataRequest.ALL_DATA, fIndexPageSize, ITmfDataRequest.ExecutionType.BACKGROUND) { // PATA FOREGROUND // long indexingStart = System.nanoTime(); @@ -874,7 +874,7 @@ public class TmfExperiment extends TmfEventProvider imple } @Override - public void handleData(TmfEvent event) { + public void handleData(ITmfEvent event) { super.handleData(event); if (event != null) { ITmfTimestamp ts = event.getTimestamp(); diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/experiment/TmfExperimentContext.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/experiment/TmfExperimentContext.java index d8c978d9b0..0dbc2836cd 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/experiment/TmfExperimentContext.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/experiment/TmfExperimentContext.java @@ -12,7 +12,7 @@ package org.eclipse.linuxtools.tmf.core.experiment; -import org.eclipse.linuxtools.tmf.core.event.TmfEvent; +import org.eclipse.linuxtools.tmf.core.event.ITmfEvent; import org.eclipse.linuxtools.tmf.core.trace.ITmfLocation; import org.eclipse.linuxtools.tmf.core.trace.ITmfTrace; import org.eclipse.linuxtools.tmf.core.trace.TmfContext; @@ -45,7 +45,7 @@ public class TmfExperimentContext extends TmfContext { private ITmfTrace[] fTraces = new ITmfTrace[0]; private TmfContext[] fContexts; - private TmfEvent[] fEvents; + private ITmfEvent[] fEvents; private int lastTraceRead; // ------------------------------------------------------------------------ @@ -56,7 +56,7 @@ public class TmfExperimentContext extends TmfContext { super(); fTraces = traces; fContexts = contexts; - fEvents = new TmfEvent[fTraces.length]; + fEvents = new ITmfEvent[fTraces.length]; ITmfLocation[] locations = new ITmfLocation[fTraces.length]; long[] ranks = new long[fTraces.length]; @@ -106,7 +106,7 @@ public class TmfExperimentContext extends TmfContext { return fContexts; } - public TmfEvent[] getEvents() { + public ITmfEvent[] getEvents() { return fEvents; } diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/parser/ITmfEventParser.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/parser/ITmfEventParser.java index 910db144c4..6c955d97cd 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/parser/ITmfEventParser.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/parser/ITmfEventParser.java @@ -14,7 +14,7 @@ package org.eclipse.linuxtools.tmf.core.parser; import java.io.IOException; -import org.eclipse.linuxtools.tmf.core.event.TmfEvent; +import org.eclipse.linuxtools.tmf.core.event.ITmfEvent; import org.eclipse.linuxtools.tmf.core.trace.ITmfTrace; import org.eclipse.linuxtools.tmf.core.trace.TmfContext; @@ -23,11 +23,11 @@ import org.eclipse.linuxtools.tmf.core.trace.TmfContext; *

* TODO: Implement me. Please. */ -public interface ITmfEventParser { +public interface ITmfEventParser { /** * @return * @throws IOException */ - public TmfEvent parseNextEvent(ITmfTrace stream, TmfContext context) throws IOException; + public ITmfEvent parseNextEvent(ITmfTrace stream, TmfContext context) throws IOException; } diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/request/ITmfDataRequest.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/request/ITmfDataRequest.java index 7ed4d61507..acf5c26b2d 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/request/ITmfDataRequest.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/request/ITmfDataRequest.java @@ -12,14 +12,14 @@ package org.eclipse.linuxtools.tmf.core.request; -import org.eclipse.linuxtools.tmf.core.event.TmfEvent; +import org.eclipse.linuxtools.tmf.core.event.ITmfEvent; /** * ITmfDataRequest *

* TODO: Implement me. Please. */ -public interface ITmfDataRequest { +public interface ITmfDataRequest { // ------------------------------------------------------------------------ // Constants diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/request/ITmfEventRequest.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/request/ITmfEventRequest.java index 9014380c02..4a192c30d4 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/request/ITmfEventRequest.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/request/ITmfEventRequest.java @@ -12,7 +12,7 @@ package org.eclipse.linuxtools.tmf.core.request; -import org.eclipse.linuxtools.tmf.core.event.TmfEvent; +import org.eclipse.linuxtools.tmf.core.event.ITmfEvent; import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange; /** @@ -20,7 +20,7 @@ import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange; *

* TODO: Implement me. Please. */ -public interface ITmfEventRequest extends ITmfDataRequest { +public interface ITmfEventRequest extends ITmfDataRequest { /** * @return the requested time range diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/request/TmfCoalescedDataRequest.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/request/TmfCoalescedDataRequest.java index ea8d49a51b..9b015522e7 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/request/TmfCoalescedDataRequest.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/request/TmfCoalescedDataRequest.java @@ -14,14 +14,14 @@ package org.eclipse.linuxtools.tmf.core.request; import java.util.Vector; -import org.eclipse.linuxtools.tmf.core.event.TmfEvent; +import org.eclipse.linuxtools.tmf.core.event.ITmfEvent; /** * TmfCoalescedDataRequest *

* TODO: Implement me. Please. */ -public class TmfCoalescedDataRequest extends TmfDataRequest { +public class TmfCoalescedDataRequest extends TmfDataRequest { // ------------------------------------------------------------------------ // Attributes diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/request/TmfCoalescedEventRequest.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/request/TmfCoalescedEventRequest.java index b90def9d8d..1b05a72a65 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/request/TmfCoalescedEventRequest.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/request/TmfCoalescedEventRequest.java @@ -12,8 +12,8 @@ package org.eclipse.linuxtools.tmf.core.request; +import org.eclipse.linuxtools.tmf.core.event.ITmfEvent; import org.eclipse.linuxtools.tmf.core.event.ITmfTimestamp; -import org.eclipse.linuxtools.tmf.core.event.TmfEvent; import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange; /** @@ -21,7 +21,7 @@ import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange; *

* TODO: Implement me. Please. */ -public class TmfCoalescedEventRequest extends TmfCoalescedDataRequest implements ITmfEventRequest { +public class TmfCoalescedEventRequest extends TmfCoalescedDataRequest implements ITmfEventRequest { // ------------------------------------------------------------------------ // Attributes diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/request/TmfDataRequest.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/request/TmfDataRequest.java index 96bdc62d24..a31e276b61 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/request/TmfDataRequest.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/request/TmfDataRequest.java @@ -15,7 +15,7 @@ package org.eclipse.linuxtools.tmf.core.request; import java.util.concurrent.CountDownLatch; import org.eclipse.linuxtools.tmf.core.Tracer; -import org.eclipse.linuxtools.tmf.core.event.TmfEvent; +import org.eclipse.linuxtools.tmf.core.event.ITmfEvent; /** * TmfDataRequest @@ -69,7 +69,7 @@ import org.eclipse.linuxtools.tmf.core.event.TmfEvent; * * TODO: Implement request failures (codes, etc...) */ -public abstract class TmfDataRequest implements ITmfDataRequest { +public abstract class TmfDataRequest implements ITmfDataRequest { // ------------------------------------------------------------------------ // Constants diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/request/TmfEventRequest.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/request/TmfEventRequest.java index e34f39b52e..d4d1a89de9 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/request/TmfEventRequest.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/request/TmfEventRequest.java @@ -12,7 +12,7 @@ package org.eclipse.linuxtools.tmf.core.request; -import org.eclipse.linuxtools.tmf.core.event.TmfEvent; +import org.eclipse.linuxtools.tmf.core.event.ITmfEvent; import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange; /** @@ -20,7 +20,7 @@ import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange; *

* Implement me. Please. */ -public abstract class TmfEventRequest extends TmfDataRequest implements ITmfEventRequest { +public abstract class TmfEventRequest extends TmfDataRequest implements ITmfEventRequest { // ------------------------------------------------------------------------ // Attributes diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/signal/TmfExperimentDisposedSignal.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/signal/TmfExperimentDisposedSignal.java index efa66b3399..59e392cd1a 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/signal/TmfExperimentDisposedSignal.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/signal/TmfExperimentDisposedSignal.java @@ -12,7 +12,7 @@ package org.eclipse.linuxtools.tmf.core.signal; -import org.eclipse.linuxtools.tmf.core.event.TmfEvent; +import org.eclipse.linuxtools.tmf.core.event.ITmfEvent; import org.eclipse.linuxtools.tmf.core.experiment.TmfExperiment; /** @@ -20,7 +20,7 @@ import org.eclipse.linuxtools.tmf.core.experiment.TmfExperiment; *

* TODO: Implement me. Please. */ -public class TmfExperimentDisposedSignal extends TmfSignal { +public class TmfExperimentDisposedSignal extends TmfSignal { private final TmfExperiment fExperiment; @@ -29,7 +29,7 @@ public class TmfExperimentDisposedSignal extends TmfSignal { fExperiment = experiment; } - public TmfExperiment getExperiment() { + public TmfExperiment getExperiment() { return fExperiment; } diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/signal/TmfExperimentRangeUpdatedSignal.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/signal/TmfExperimentRangeUpdatedSignal.java index cb08b29d77..433d1f1eeb 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/signal/TmfExperimentRangeUpdatedSignal.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/signal/TmfExperimentRangeUpdatedSignal.java @@ -12,7 +12,7 @@ package org.eclipse.linuxtools.tmf.core.signal; -import org.eclipse.linuxtools.tmf.core.event.TmfEvent; +import org.eclipse.linuxtools.tmf.core.event.ITmfEvent; import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange; import org.eclipse.linuxtools.tmf.core.experiment.TmfExperiment; @@ -22,16 +22,16 @@ import org.eclipse.linuxtools.tmf.core.experiment.TmfExperiment; */ public class TmfExperimentRangeUpdatedSignal extends TmfSignal { - private final TmfExperiment fExperiment; + private final TmfExperiment fExperiment; private final TmfTimeRange fTimeRange; - public TmfExperimentRangeUpdatedSignal(Object source, TmfExperiment experiment, TmfTimeRange range) { // , ITmfTrace trace) { + public TmfExperimentRangeUpdatedSignal(Object source, TmfExperiment experiment, TmfTimeRange range) { // , ITmfTrace trace) { super(source); fExperiment = experiment; fTimeRange = range; } - public TmfExperiment getExperiment() { + public TmfExperiment getExperiment() { return fExperiment; } diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/signal/TmfExperimentSelectedSignal.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/signal/TmfExperimentSelectedSignal.java index a476d768b7..406b192dfc 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/signal/TmfExperimentSelectedSignal.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/signal/TmfExperimentSelectedSignal.java @@ -12,7 +12,7 @@ package org.eclipse.linuxtools.tmf.core.signal; -import org.eclipse.linuxtools.tmf.core.event.TmfEvent; +import org.eclipse.linuxtools.tmf.core.event.ITmfEvent; import org.eclipse.linuxtools.tmf.core.experiment.TmfExperiment; /** @@ -20,7 +20,7 @@ import org.eclipse.linuxtools.tmf.core.experiment.TmfExperiment; *

* TODO: Implement me. Please. */ -public class TmfExperimentSelectedSignal extends TmfSignal { +public class TmfExperimentSelectedSignal extends TmfSignal { private final TmfExperiment fExperiment; @@ -29,7 +29,7 @@ public class TmfExperimentSelectedSignal extends TmfSignal { fExperiment = experiment; } - public TmfExperiment getExperiment() { + public TmfExperiment getExperiment() { return fExperiment; } diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/signal/TmfExperimentUpdatedSignal.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/signal/TmfExperimentUpdatedSignal.java index 738a88ff19..6a763a487d 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/signal/TmfExperimentUpdatedSignal.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/signal/TmfExperimentUpdatedSignal.java @@ -12,7 +12,7 @@ package org.eclipse.linuxtools.tmf.core.signal; -import org.eclipse.linuxtools.tmf.core.event.TmfEvent; +import org.eclipse.linuxtools.tmf.core.event.ITmfEvent; import org.eclipse.linuxtools.tmf.core.experiment.TmfExperiment; /** @@ -22,16 +22,16 @@ import org.eclipse.linuxtools.tmf.core.experiment.TmfExperiment; */ public class TmfExperimentUpdatedSignal extends TmfSignal { - private final TmfExperiment fExperiment; + private final TmfExperiment fExperiment; // private final ITmfTrace fTrace; - public TmfExperimentUpdatedSignal(Object source, TmfExperiment experiment) { // , ITmfTrace trace) { + public TmfExperimentUpdatedSignal(Object source, TmfExperiment experiment) { // , ITmfTrace trace) { super(source); fExperiment = experiment; // fTrace = trace; } - public TmfExperiment getExperiment() { + public TmfExperiment getExperiment() { return fExperiment; } 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 92fbf713bb..c79e215600 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 @@ -16,15 +16,15 @@ import java.io.FileNotFoundException; import org.eclipse.core.resources.IProject; import org.eclipse.linuxtools.tmf.core.component.ITmfComponent; +import org.eclipse.linuxtools.tmf.core.event.ITmfEvent; import org.eclipse.linuxtools.tmf.core.event.ITmfTimestamp; -import org.eclipse.linuxtools.tmf.core.event.TmfEvent; import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange; /** * ITmfTrace *

*/ -public interface ITmfTrace extends ITmfComponent { +public interface ITmfTrace extends ITmfComponent { // initTrace variants public void initTrace(String name, String path, Class eventType) throws FileNotFoundException; @@ -128,13 +128,13 @@ public interface ITmfTrace extends ITmfComponent { * * @return the next event in the stream */ - public TmfEvent getNextEvent(TmfContext context); + public ITmfEvent getNextEvent(TmfContext context); /** * Return the event pointed by the supplied context (or null if no event left) and *does not* update the context. * * @return the next event in the stream */ - public TmfEvent parseEvent(TmfContext context); + public ITmfEvent parseEvent(TmfContext context); } 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 256789ab51..c0da9149f9 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,8 +25,8 @@ import org.eclipse.core.runtime.Path; import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.jobs.Job; import org.eclipse.linuxtools.tmf.core.component.TmfEventProvider; +import org.eclipse.linuxtools.tmf.core.event.ITmfEvent; import org.eclipse.linuxtools.tmf.core.event.ITmfTimestamp; -import org.eclipse.linuxtools.tmf.core.event.TmfEvent; import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange; import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp; import org.eclipse.linuxtools.tmf.core.request.ITmfDataRequest; @@ -52,7 +52,7 @@ import org.eclipse.linuxtools.tmf.core.signal.TmfTraceUpdatedSignal; * * TODO: Add support for live streaming (notifications, incremental indexing, ...) */ -public abstract class TmfTrace extends TmfEventProvider implements ITmfTrace, Cloneable { +public abstract class TmfTrace extends TmfEventProvider implements ITmfTrace, Cloneable { // ------------------------------------------------------------------------ // Constants @@ -356,7 +356,7 @@ public abstract class TmfTrace extends TmfEventProvider i // And locate the event TmfContext nextEventContext = context.clone(); // Must use clone() to get the right subtype... - TmfEvent event = getNextEvent(nextEventContext); + ITmfEvent event = getNextEvent(nextEventContext); while (event != null && event.getTimestamp().compareTo(timestamp, false) < 0) { context.setLocation(nextEventContext.getLocation().clone()); context.updateRank(1); @@ -391,7 +391,7 @@ public abstract class TmfTrace extends TmfEventProvider i context.setRank(pos); if (pos < rank) { - TmfEvent event = getNextEvent(context); + ITmfEvent event = getNextEvent(context); while (event != null && ++pos < rank) { event = getNextEvent(context); } @@ -407,9 +407,9 @@ public abstract class TmfTrace extends TmfEventProvider i * linuxtools.tmf.trace.ITmfTrace.TraceContext) */ @Override - public synchronized TmfEvent getNextEvent(TmfContext context) { + public synchronized ITmfEvent getNextEvent(TmfContext context) { // parseEvent() does not update the context - TmfEvent event = parseEvent(context); + ITmfEvent event = parseEvent(context); if (event != null) { updateIndex(context, context.getRank(), event.getTimestamp()); context.setLocation(getCurrentLocation()); @@ -447,7 +447,7 @@ public abstract class TmfTrace extends TmfEventProvider i * * @param event */ - protected void processEvent(TmfEvent event) { + protected void processEvent(ITmfEvent event) { // Do nothing by default } @@ -494,14 +494,14 @@ public abstract class TmfTrace extends TmfEventProvider i job.schedule(); fCheckpoints.clear(); - ITmfEventRequest request = new TmfEventRequest(TmfEvent.class, TmfTimeRange.Eternity, TmfDataRequest.ALL_DATA, + ITmfEventRequest request = new TmfEventRequest(ITmfEvent.class, TmfTimeRange.Eternity, TmfDataRequest.ALL_DATA, fIndexPageSize, ITmfDataRequest.ExecutionType.BACKGROUND) { ITmfTimestamp startTime = null; ITmfTimestamp lastTime = null; @Override - public void handleData(TmfEvent event) { + public void handleData(ITmfEvent event) { super.handleData(event); if (event != null) { ITmfTimestamp ts = event.getTimestamp(); diff --git a/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/views/uml2sd/impl/Uml2SDTestFacility.java b/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/views/uml2sd/impl/Uml2SDTestFacility.java index 7bcfc3fbd1..94ad56ef6e 100644 --- a/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/views/uml2sd/impl/Uml2SDTestFacility.java +++ b/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/views/uml2sd/impl/Uml2SDTestFacility.java @@ -106,7 +106,7 @@ public class Uml2SDTestFacility { } - private TmfTraceStub setupTrace(ITmfEventParser parser) { + private TmfTraceStub setupTrace(ITmfEventParser parser) { try { // Create test trace object diff --git a/org.eclipse.linuxtools.tmf.ui.tests/widgetStubs/org/eclipse/linuxtools/tmf/ui/tests/uml2sd/trace/TmfUml2SDTestTrace.java b/org.eclipse.linuxtools.tmf.ui.tests/widgetStubs/org/eclipse/linuxtools/tmf/ui/tests/uml2sd/trace/TmfUml2SDTestTrace.java index f8f0aec3aa..15ae4737f5 100644 --- a/org.eclipse.linuxtools.tmf.ui.tests/widgetStubs/org/eclipse/linuxtools/tmf/ui/tests/uml2sd/trace/TmfUml2SDTestTrace.java +++ b/org.eclipse.linuxtools.tmf.ui.tests/widgetStubs/org/eclipse/linuxtools/tmf/ui/tests/uml2sd/trace/TmfUml2SDTestTrace.java @@ -26,11 +26,11 @@ import org.eclipse.linuxtools.tmf.core.trace.TmfContext; import org.eclipse.linuxtools.tmf.core.trace.TmfLocation; import org.eclipse.linuxtools.tmf.stubs.trace.TmfTraceStub; -public class TmfUml2SDTestTrace implements ITmfEventParser { +public class TmfUml2SDTestTrace implements ITmfEventParser { @Override @SuppressWarnings({ "unchecked", "nls" }) - public TmfEvent parseNextEvent(ITmfTrace eventStream, TmfContext context) throws IOException { + public TmfEvent parseNextEvent(ITmfTrace eventStream, TmfContext context) throws IOException { if (! (eventStream instanceof TmfTraceStub)) { return null; } diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/colors/ColorSettingsManager.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/colors/ColorSettingsManager.java index 94c8b5e87c..01a0af5dd7 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/colors/ColorSettingsManager.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/colors/ColorSettingsManager.java @@ -14,7 +14,7 @@ package org.eclipse.linuxtools.tmf.ui.views.colors; import java.util.ArrayList; -import org.eclipse.linuxtools.tmf.core.event.TmfEvent; +import org.eclipse.linuxtools.tmf.core.event.ITmfEvent; import org.eclipse.linuxtools.tmf.ui.TmfUiPlugin; import org.eclipse.linuxtools.tmf.ui.viewers.timeAnalysis.widgets.TraceColorScheme; import org.eclipse.swt.SWT; @@ -45,7 +45,7 @@ public class ColorSettingsManager { fireColorSettingsChanged(); } - public static ColorSetting getColorSetting(TmfEvent event) { + public static ColorSetting getColorSetting(ITmfEvent event) { for (int i = 0; i < fColorSettings.length; i++) { ColorSetting colorSetting = fColorSettings[i]; if (colorSetting.getFilter() != null && colorSetting.getFilter().matches(event)) { @@ -55,7 +55,7 @@ public class ColorSettingsManager { return DEFAULT_COLOR_SETTING; } - public static int getColorSettingPriority(TmfEvent event) { + public static int getColorSettingPriority(ITmfEvent event) { for (int i = 0; i < fColorSettings.length; i++) { ColorSetting colorSetting = fColorSettings[i]; if (colorSetting.getFilter() != null && colorSetting.getFilter().matches(event)) { diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/statistics/TmfStatisticsView.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/statistics/TmfStatisticsView.java index f2e22bacb3..4418963f61 100755 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/statistics/TmfStatisticsView.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/statistics/TmfStatisticsView.java @@ -19,14 +19,14 @@ import org.eclipse.jface.viewers.TreeViewer; import org.eclipse.jface.viewers.TreeViewerColumn; import org.eclipse.jface.viewers.Viewer; import org.eclipse.jface.viewers.ViewerComparator; -import org.eclipse.linuxtools.tmf.core.event.TmfEvent; +import org.eclipse.linuxtools.tmf.core.event.ITmfEvent; import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange; import org.eclipse.linuxtools.tmf.core.experiment.TmfExperiment; import org.eclipse.linuxtools.tmf.core.request.ITmfDataRequest; +import org.eclipse.linuxtools.tmf.core.request.ITmfDataRequest.ExecutionType; import org.eclipse.linuxtools.tmf.core.request.ITmfEventRequest; import org.eclipse.linuxtools.tmf.core.request.TmfDataRequest; import org.eclipse.linuxtools.tmf.core.request.TmfEventRequest; -import org.eclipse.linuxtools.tmf.core.request.ITmfDataRequest.ExecutionType; import org.eclipse.linuxtools.tmf.core.signal.TmfExperimentDisposedSignal; import org.eclipse.linuxtools.tmf.core.signal.TmfExperimentRangeUpdatedSignal; import org.eclipse.linuxtools.tmf.core.signal.TmfExperimentSelectedSignal; @@ -79,7 +79,7 @@ public class TmfStatisticsView extends TmfView { // The actual tree to display protected TreeViewer fTreeViewer; // Stores the request to the experiment - protected ITmfEventRequest fRequest = null; + protected ITmfEventRequest fRequest = null; // Update synchronization parameters (used for streaming) protected boolean fStatisticsUpdateBusy = false; @@ -286,7 +286,7 @@ public class TmfStatisticsView extends TmfView { * @param signal */ @TmfSignalHandler - public void experimentDisposed(TmfExperimentDisposedSignal signal) { + public void experimentDisposed(TmfExperimentDisposedSignal signal) { if (signal.getExperiment() != TmfExperiment.getCurrentExperiment()) { return; } @@ -301,7 +301,7 @@ public class TmfStatisticsView extends TmfView { * contains the information about the selection. */ @TmfSignalHandler - public void experimentSelected(TmfExperimentSelectedSignal signal) { + public void experimentSelected(TmfExperimentSelectedSignal signal) { if (signal != null) { TmfExperiment experiment = signal.getExperiment(); String experimentName = experiment.getName(); @@ -368,7 +368,7 @@ public class TmfStatisticsView extends TmfView { @SuppressWarnings("unchecked") @TmfSignalHandler public void experimentRangeUpdated(TmfExperimentRangeUpdatedSignal signal) { - TmfExperiment experiment = (TmfExperiment) signal.getExperiment(); + TmfExperiment experiment = (TmfExperiment) signal.getExperiment(); // validate if (! experiment.equals(TmfExperiment.getCurrentExperiment())) { return; @@ -473,10 +473,10 @@ public class TmfStatisticsView extends TmfView { } // Preparation of the event request - fRequest = new TmfEventRequest(TmfEvent.class, timeRange, index, TmfDataRequest.ALL_DATA, getIndexPageSize(), ExecutionType.BACKGROUND) { + fRequest = new TmfEventRequest(ITmfEvent.class, timeRange, index, TmfDataRequest.ALL_DATA, getIndexPageSize(), ExecutionType.BACKGROUND) { @Override - public void handleData(TmfEvent data) { + public void handleData(ITmfEvent data) { super.handleData(data); if (data != null) { AbsTmfStatisticsTree statisticsData = TmfStatisticsTreeRootFactory.getStatTree(getTreeID(experiment.getName())); @@ -519,7 +519,7 @@ public class TmfStatisticsView extends TmfView { modelIncomplete(experiment.getName()); } }; - ((TmfExperiment) experiment).sendRequest((ITmfDataRequest) fRequest); + ((TmfExperiment) experiment).sendRequest((ITmfDataRequest) fRequest); waitCursor(true); } } diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/statistics/model/AbsTmfStatisticsTree.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/statistics/model/AbsTmfStatisticsTree.java index 58b18d2156..76f754f8de 100755 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/statistics/model/AbsTmfStatisticsTree.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/statistics/model/AbsTmfStatisticsTree.java @@ -17,7 +17,7 @@ import java.util.HashMap; import java.util.Map; import java.util.Set; -import org.eclipse.linuxtools.tmf.core.event.TmfEvent; +import org.eclipse.linuxtools.tmf.core.event.ITmfEvent; import org.eclipse.linuxtools.tmf.core.util.TmfFixedArray; import org.eclipse.linuxtools.tmf.ui.views.statistics.ITmfExtraEventInfo; @@ -160,7 +160,7 @@ public abstract class AbsTmfStatisticsTree { * @param values * Values desired. */ - public abstract void increase(TmfEvent event, ITmfExtraEventInfo extraInfo, int values); + public abstract void increase(ITmfEvent event, ITmfExtraEventInfo extraInfo, int values); /** *

Register an event.

@@ -172,7 +172,7 @@ public abstract class AbsTmfStatisticsTree { * @param extraInfo * Extra information to pass along with the event. */ - public abstract void registerEvent(TmfEvent event, ITmfExtraEventInfo extraInfo); + public abstract void registerEvent(ITmfEvent event, ITmfExtraEventInfo extraInfo); /** *

Register that a new node was created.

diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/statistics/model/TmfBaseStatisticsTree.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/statistics/model/TmfBaseStatisticsTree.java index debac476fd..81c9d501af 100755 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/statistics/model/TmfBaseStatisticsTree.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/statistics/model/TmfBaseStatisticsTree.java @@ -18,7 +18,7 @@ import java.util.LinkedList; import java.util.Map; import java.util.Set; -import org.eclipse.linuxtools.tmf.core.event.TmfEvent; +import org.eclipse.linuxtools.tmf.core.event.ITmfEvent; import org.eclipse.linuxtools.tmf.core.util.TmfFixedArray; import org.eclipse.linuxtools.tmf.ui.views.statistics.ITmfExtraEventInfo; @@ -141,7 +141,7 @@ public class TmfBaseStatisticsTree extends AbsTmfStatisticsTree { * @return Array of FixedArray representing the paths. */ @SuppressWarnings({ "rawtypes", "unchecked" }) - protected TmfFixedArray[] getTypePaths(TmfEvent event, ITmfExtraEventInfo extraInfo) { + protected TmfFixedArray[] getTypePaths(ITmfEvent event, ITmfExtraEventInfo extraInfo) { String trace = extraInfo.getTraceName(); // String type = event.getType().getTypeId(); // Add too much // informations @@ -162,7 +162,7 @@ public class TmfBaseStatisticsTree extends AbsTmfStatisticsTree { * @return Array of FixedArray representing the paths. */ @SuppressWarnings({ "rawtypes", "unchecked" }) - protected TmfFixedArray[] getNormalPaths(TmfEvent event, ITmfExtraEventInfo extraInfo) { + protected TmfFixedArray[] getNormalPaths(ITmfEvent event, ITmfExtraEventInfo extraInfo) { String trace = extraInfo.getTraceName(); TmfFixedArray[] paths = { new TmfFixedArray(trace) }; @@ -174,7 +174,7 @@ public class TmfBaseStatisticsTree extends AbsTmfStatisticsTree { * @see org.eclipse.linuxtools.tmf.ui.views.statistics.model.TmfStatisticsData#increase(org.eclipse.linuxtools.tmf.event.TmfEvent, org.eclipse.linuxtools.tmf.ui.views.statistics.ITmfEventInfo, int) */ @Override - public void increase(TmfEvent event, ITmfExtraEventInfo extraInfo, int values) { + public void increase(ITmfEvent event, ITmfExtraEventInfo extraInfo, int values) { // Do nothing } @@ -183,7 +183,7 @@ public class TmfBaseStatisticsTree extends AbsTmfStatisticsTree { * @see org.eclipse.linuxtools.tmf.ui.views.statistics.model.TmfStatisticsData#registerEvent(org.eclipse.linuxtools.tmf.event.TmfEvent, org.eclipse.linuxtools.tmf.ui.views.statistics.ITmfEventInfo) */ @Override - public void registerEvent(TmfEvent event, ITmfExtraEventInfo extraInfo) { + public void registerEvent(ITmfEvent event, ITmfExtraEventInfo extraInfo) { TmfFixedArray[] paths = getNormalPaths(event, extraInfo); for (TmfFixedArray path : paths) ++(getOrCreate(path).getValue().nbEvents); diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/timechart/TimeChartDecorationProvider.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/timechart/TimeChartDecorationProvider.java index e7f8d0a9ee..70ad76cf8b 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/timechart/TimeChartDecorationProvider.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/timechart/TimeChartDecorationProvider.java @@ -18,7 +18,7 @@ import java.util.Set; import org.eclipse.core.resources.IMarker; import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.CoreException; -import org.eclipse.linuxtools.tmf.core.event.TmfEvent; +import org.eclipse.linuxtools.tmf.core.event.ITmfEvent; import org.eclipse.linuxtools.tmf.core.filter.ITmfFilter; public class TimeChartDecorationProvider { @@ -60,7 +60,7 @@ public class TimeChartDecorationProvider { fFilterFilter = filter; } - public boolean isVisible(TmfEvent event) { + public boolean isVisible(ITmfEvent event) { if (fFilterFilter != null) { return fFilterFilter.matches(event); } @@ -71,7 +71,7 @@ public class TimeChartDecorationProvider { fSearchFilter = filter; } - public boolean isSearchMatch(TmfEvent event) { + public boolean isSearchMatch(ITmfEvent event) { if (fSearchFilter != null) { return fSearchFilter.matches(event); } diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/timechart/TimeChartEvent.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/timechart/TimeChartEvent.java index 74c321b61d..2c27264ca9 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/timechart/TimeChartEvent.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/timechart/TimeChartEvent.java @@ -15,7 +15,7 @@ package org.eclipse.linuxtools.tmf.ui.views.timechart; import java.util.ArrayList; import java.util.Iterator; -import org.eclipse.linuxtools.tmf.core.event.TmfEvent; +import org.eclipse.linuxtools.tmf.core.event.ITmfEvent; import org.eclipse.linuxtools.tmf.ui.viewers.timeAnalysis.model.ITimeEvent; import org.eclipse.linuxtools.tmf.ui.viewers.timeAnalysis.model.ITmfTimeAnalysisEntry; import org.eclipse.linuxtools.tmf.ui.views.colors.ColorSettingsManager; @@ -38,7 +38,7 @@ public class TimeChartEvent implements ITimeEvent { private TimeChartAnalysisEntry fItemizedEntry; private boolean fItemizing; - public TimeChartEvent(TimeChartAnalysisEntry parentEntry, TmfEvent event, long rank, TimeChartDecorationProvider decorationProvider) { + public TimeChartEvent(TimeChartAnalysisEntry parentEntry, ITmfEvent event, long rank, TimeChartDecorationProvider decorationProvider) { fParentEntry = parentEntry; fTime = event.getTimestamp().normalize(0, TIMESTAMP_SCALE).getValue(); fDuration = 0; diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/timechart/TimeChartView.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/timechart/TimeChartView.java index 6bf9125204..f0b76f7e3c 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/timechart/TimeChartView.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/timechart/TimeChartView.java @@ -24,7 +24,7 @@ import org.eclipse.core.resources.IResourceChangeEvent; import org.eclipse.core.resources.IResourceChangeListener; import org.eclipse.core.resources.IResourceDelta; import org.eclipse.core.resources.ResourcesPlugin; -import org.eclipse.linuxtools.tmf.core.event.TmfEvent; +import org.eclipse.linuxtools.tmf.core.event.ITmfEvent; import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp; import org.eclipse.linuxtools.tmf.core.filter.ITmfFilter; import org.eclipse.linuxtools.tmf.core.signal.TmfSignalHandler; @@ -179,7 +179,7 @@ public class TimeChartView extends TmfView implements ITmfTimeScaleSelectionList } while (true) { long rank = context.getRank(); - TmfEvent event = trace.getNextEvent(context); + ITmfEvent event = trace.getNextEvent(context); if (event == null) { done = true; break; @@ -447,7 +447,7 @@ public class TimeChartView extends TmfView implements ITmfTimeScaleSelectionList if (interrupted) return; long rank = fContext.getRank(); - TmfEvent event = trace.getNextEvent(fContext); + ITmfEvent event = trace.getNextEvent(fContext); if (event == null) { break; } diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/widgets/TmfRawEventViewer.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/widgets/TmfRawEventViewer.java index 1d084c0e28..fa97d19366 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/widgets/TmfRawEventViewer.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/widgets/TmfRawEventViewer.java @@ -14,7 +14,7 @@ package org.eclipse.linuxtools.tmf.ui.widgets; import java.util.ArrayList; -import org.eclipse.linuxtools.tmf.core.event.TmfEvent; +import org.eclipse.linuxtools.tmf.core.event.ITmfEvent; import org.eclipse.linuxtools.tmf.core.trace.ITmfLocation; import org.eclipse.linuxtools.tmf.core.trace.ITmfTrace; import org.eclipse.linuxtools.tmf.core.trace.TmfContext; @@ -388,7 +388,7 @@ public class TmfRawEventViewer extends Composite implements ControlListener, Sel long rank = 0; while (!context.getLocation().equals(endLocation)) { location = context.getLocation().clone(); - TmfEvent event = fTrace.getNextEvent(context); + ITmfEvent event = fTrace.getNextEvent(context); if (event == null) { break; } @@ -434,7 +434,7 @@ public class TmfRawEventViewer extends Composite implements ControlListener, Sel } long rank = fBottomContext.getRank(); ITmfLocation location = fBottomContext.getLocation() != null ? fBottomContext.getLocation().clone() : null; - TmfEvent event = fTrace.getNextEvent(fBottomContext); + ITmfEvent event = fTrace.getNextEvent(fBottomContext); if (event == null) { break; } -- 2.34.1