From a4115405ef5641fdeed325e2b063bdf82c728770 Mon Sep 17 00:00:00 2001 From: Francois Chouinard Date: Thu, 8 Mar 2012 16:08:18 -0500 Subject: [PATCH] Fix some core.event API stuff --- .../core/tests/LttngTestPreparation.java | 2 +- .../core/tests/trace/LTTngExperimentTest.java | 4 +- .../control/LttngSyntheticEventProvider.java | 2 +- .../lttng/core/event/LttngEventContent.java | 6 +-- .../core/state/trace/StateTraceManager.java | 2 +- .../lttng/core/trace/LTTngExperiment.java | 14 +++---- .../lttng/core/trace/LTTngTrace.java | 6 +-- .../ui/views/controlflow/ControlFlowView.java | 12 +++--- .../lttng/ui/views/latency/LatencyView.java | 14 +++---- .../ui/views/resources/ResourcesView.java | 12 +++--- .../tests/component/TmfEventProviderTest.java | 10 ++--- .../core/tests/event/TmfTimeRangeTest.java | 34 +++++++-------- .../core/tests/event/TmfTimestampTest.java | 24 +++++------ .../tests/experiment/TmfExperimentTest.java | 12 +++--- .../TmfMultiTraceExperimentTest.java | 12 +++--- .../request/TmfCoalescedEventRequestTest.java | 6 +-- .../tests/request/TmfEventRequestTest.java | 22 +++++----- .../core/tests/trace/TmfCheckpointTest.java | 4 +- .../core/tests/trace/TmfExperimentTest.java | 10 ++--- .../tmf/core/tests/trace/TmfLocationTest.java | 2 +- .../tmf/core/tests/trace/TmfTraceTest.java | 6 +-- .../TmfAsyncSequenceDiagramEventTest.java | 4 +- .../TmfSyncSequenceDiagramEventTest.java | 2 +- .../tmf/stubs/event/TmfEventTypeStub.java | 2 +- .../tmf/stubs/trace/TmfEventParserStub.java | 2 +- .../linuxtools/tmf/core/event/ITmfEvent.java | 22 +++++++--- .../tmf/core/event/ITmfEventField.java | 14 ++++++- .../tmf/core/event/ITmfEventType.java | 12 ++++++ .../tmf/core/event/ITmfTimestamp.java | 16 +++++++ .../tmf/core/event/TmfEventField.java | 2 +- .../tmf/core/event/TmfTimeRange.java | 10 ++--- .../tmf/core/event/TmfTimestamp.java | 10 ++--- .../tmf/core/experiment/TmfExperiment.java | 42 +++++++++---------- .../request/TmfCoalescedEventRequest.java | 4 +- .../tmf/core/request/TmfEventRequest.java | 4 +- .../linuxtools/tmf/core/trace/TmfTrace.java | 10 ++--- .../TmfBaseColumnDataProviderTest.java | 6 +-- .../statistics/TmfBaseStatisticsDataTest.java | 6 +-- .../statistics/TmfStatisticsTreeNodeTest.java | 6 +-- .../TmfTreeContentProviderTest.java | 4 +- .../impl/TmfUml2SDSyncLoaderFindTest.java | 2 +- .../impl/TmfUml2SDSyncLoaderTimeTest.java | 4 +- .../uml2sd/trace/TmfUml2SDTestTrace.java | 2 +- .../tmf/ui/parsers/custom/CustomEvent.java | 4 +- .../ui/parsers/custom/CustomEventContent.java | 2 +- .../ui/parsers/custom/CustomEventType.java | 2 +- .../tmf/ui/parsers/custom/CustomTxtTrace.java | 2 +- .../tmf/ui/parsers/custom/CustomXmlTrace.java | 2 +- .../tmf/ui/viewers/events/TmfEventsTable.java | 2 +- .../tmf/ui/views/histogram/HistogramView.java | 4 +- .../tmf/ui/views/uml2sd/core/BasicFrame.java | 6 +-- .../uml2sd/impl/TmfUml2SDSyncLoader.java | 4 +- 52 files changed, 241 insertions(+), 189 deletions(-) diff --git a/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/LttngTestPreparation.java b/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/LttngTestPreparation.java index f886fa332b..41aa7a92db 100644 --- a/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/LttngTestPreparation.java +++ b/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/LttngTestPreparation.java @@ -77,7 +77,7 @@ public abstract class LttngTestPreparation extends TestCase { // create experiment and associate traces fTestExperiment = new TmfExperiment(LttngEvent.class, - expId, traces, TmfTimestamp.Zero, TmfExperiment.DEFAULT_BLOCK_SIZE, true); + expId, traces, TmfTimestamp.ZERO, TmfExperiment.DEFAULT_BLOCK_SIZE, true); // fTestExperiment.indexExperiment(waitForCompletion); // Set the current selected experiment as the test experiment diff --git a/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/trace/LTTngExperimentTest.java b/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/trace/LTTngExperimentTest.java index c1dd5b5bca..20c5da9662 100644 --- a/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/trace/LTTngExperimentTest.java +++ b/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/trace/LTTngExperimentTest.java @@ -75,7 +75,7 @@ public class LTTngExperimentTest extends TestCase { private synchronized static void setupExperiment() { if (fExperiment == null) { - fExperiment = new TmfExperiment(LttngEvent.class, EXPERIMENT, fTraces, TmfTimestamp.Zero, 1000, true); + fExperiment = new TmfExperiment(LttngEvent.class, EXPERIMENT, fTraces, TmfTimestamp.ZERO, 1000, true); } } @@ -102,7 +102,7 @@ public class LTTngExperimentTest extends TestCase { public void testBasicTmfExperimentConstructor() { assertEquals("GetId", EXPERIMENT, fExperiment.getName()); - assertEquals("GetEpoch", TmfTimestamp.Zero, fExperiment.getEpoch()); + assertEquals("GetEpoch", TmfTimestamp.ZERO, fExperiment.getEpoch()); assertEquals("GetNbEvents", NB_EVENTS, fExperiment.getNbEvents()); long nbTraceEvents = fExperiment.getTraces()[0].getNbEvents(); diff --git a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/control/LttngSyntheticEventProvider.java b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/control/LttngSyntheticEventProvider.java index f1b84e42f2..e7722e6938 100644 --- a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/control/LttngSyntheticEventProvider.java +++ b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/control/LttngSyntheticEventProvider.java @@ -91,7 +91,7 @@ public class LttngSyntheticEventProvider extends TmfEventProvider thisContent) { - super(ITmfEventField.ROOT_ID, null); + super(ITmfEventField.ROOT_FIELD_ID, null); fParentEvent = thisParent; fFieldsMap = thisContent; } diff --git a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/trace/StateTraceManager.java b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/trace/StateTraceManager.java index 8b57f793b8..aa1c0ee5bf 100644 --- a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/trace/StateTraceManager.java +++ b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/trace/StateTraceManager.java @@ -202,7 +202,7 @@ public class StateTraceManager extends LTTngTreeNode implements IStateTraceManag // The GUI can have time limits higher than this log, since GUI can // handle multiple logs. Ignore special null value of experiment time range. if ((eventTime.getValue() < 0) || - (!experimentRange.equals(TmfTimeRange.Null) && (eventTime.getValue() > experimentRange.getEndTime().getValue()))) { + (!experimentRange.equals(TmfTimeRange.NULL_RANGE) && (eventTime.getValue() > experimentRange.getEndTime().getValue()))) { return null; } 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 cd99f68f70..9eb3f036ff 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 @@ -54,7 +54,7 @@ public class LTTngExperiment extends TmfExperiment { * @param indexPageSize */ public LTTngExperiment(Class type, String id, ITmfTrace[] traces, ITmfTimestamp epoch, int indexPageSize) { - this(type, id, traces, TmfTimestamp.Zero, indexPageSize, false); + this(type, id, traces, TmfTimestamp.ZERO, indexPageSize, false); } public LTTngExperiment(Class type, String id, ITmfTrace[] traces, ITmfTimestamp epoch, int indexPageSize, boolean preIndexExperiment) { @@ -67,7 +67,7 @@ public class LTTngExperiment extends TmfExperiment { * @param traces */ public LTTngExperiment(Class type, String id, ITmfTrace[] traces) { - this(type, id, traces, TmfTimestamp.Zero, DEFAULT_INDEX_PAGE_SIZE); + this(type, id, traces, TmfTimestamp.ZERO, DEFAULT_INDEX_PAGE_SIZE); } /** @@ -77,7 +77,7 @@ public class LTTngExperiment extends TmfExperiment { * @param indexPageSize */ public LTTngExperiment(Class type, String id, ITmfTrace[] traces, int indexPageSize) { - this(type, id, traces, TmfTimestamp.Zero, indexPageSize); + this(type, id, traces, TmfTimestamp.ZERO, indexPageSize); } @SuppressWarnings("unchecked") @@ -138,7 +138,7 @@ public class LTTngExperiment extends TmfExperiment { return null; } int trace = TmfExperimentContext.NO_TRACE; - ITmfTimestamp timestamp = TmfTimestamp.BigCrunch; + ITmfTimestamp timestamp = TmfTimestamp.BIG_CRUNCH; if (eventArray.length == 1) { if (eventArray[0] != null) { timestamp = eventArray[0].getTimestamp(); @@ -189,7 +189,7 @@ public class LTTngExperiment extends TmfExperiment { protected void indexExperiment(final boolean waitForCompletion) { if (waitForCompletion) { TmfExperimentRangeUpdatedSignal signal = new TmfExperimentRangeUpdatedSignal(LTTngExperiment.this, LTTngExperiment.this, - TmfTimeRange.Eternity); + TmfTimeRange.ETERNITY); broadcast(signal); while (isIndexingBusy()) { try { @@ -220,7 +220,7 @@ public class LTTngExperiment extends TmfExperiment { @Override public void run() { while (!fExecutor.isShutdown()) { - final TmfEventRequest request = new TmfEventRequest(LttngEvent.class, TmfTimeRange.Eternity, 0, + final TmfEventRequest request = new TmfEventRequest(LttngEvent.class, TmfTimeRange.ETERNITY, 0, ExecutionType.FOREGROUND) { @Override public void handleCompleted() { @@ -253,7 +253,7 @@ public class LTTngExperiment extends TmfExperiment { try { sendRequest((ITmfDataRequest) request); request.waitForCompletion(); - if (timeRange != null && !timeRange.equals(TmfTimeRange.Null)) { + if (timeRange != null && !timeRange.equals(TmfTimeRange.NULL_RANGE)) { TmfExperimentRangeUpdatedSignal signal = new TmfExperimentRangeUpdatedSignal(LTTngExperiment.this, LTTngExperiment.this, timeRange); broadcast(signal); diff --git a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/trace/LTTngTrace.java b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/trace/LTTngTrace.java index 6dcd3af898..1c3ec8f7fc 100644 --- a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/trace/LTTngTrace.java +++ b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/trace/LTTngTrace.java @@ -194,8 +194,8 @@ public class LTTngTrace extends TmfTrace { // Set the time range of the trace TmfContext context = seekLocation(null); LttngEvent event = getNextEvent(context); - setEndTime(TmfTimestamp.BigBang); - final long startTime = event != null ? event.getTimestamp().getValue() : TmfTimestamp.BigBang.getValue(); + setEndTime(TmfTimestamp.BIG_BANG); + final long startTime = event != null ? event.getTimestamp().getValue() : TmfTimestamp.BIG_BANG.getValue(); fStreamingInterval = LTTNG_STREAMING_INTERVAL; final Thread thread = new Thread("Streaming Monitor for trace " + getName()) { //$NON-NLS-1$ @@ -209,7 +209,7 @@ public class LTTngTrace extends TmfTrace { TmfExperiment experiment = TmfExperiment.getCurrentExperiment(); if (experiment != null) { @SuppressWarnings("rawtypes") - final TmfEventRequest request = new TmfEventRequest(TmfEvent.class, TmfTimeRange.Eternity, 0, ExecutionType.FOREGROUND) { + final TmfEventRequest request = new TmfEventRequest(TmfEvent.class, TmfTimeRange.ETERNITY, 0, ExecutionType.FOREGROUND) { @Override public void handleCompleted() { updateJniTrace(); diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/controlflow/ControlFlowView.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/controlflow/ControlFlowView.java index 2a4c345fa1..132c94b047 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/controlflow/ControlFlowView.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/controlflow/ControlFlowView.java @@ -143,7 +143,7 @@ public class ControlFlowView extends AbsTimeUpdateView implements private ViewProcessFilter tableFilter = null; private ScrolledComposite scrollFrame = null; - private TmfTimeRange initTimeRange = TmfTimeRange.Null; + private TmfTimeRange initTimeRange = TmfTimeRange.NULL_RANGE; // private static SimpleDateFormat stimeformat = new SimpleDateFormat( // "yy/MM/dd HH:mm:ss"); @@ -555,7 +555,7 @@ public class ControlFlowView extends AbsTimeUpdateView implements if (experiment != null) { TmfTimeRange experimentTRange = experiment.getTimeRange(); - if (experimentTRange != TmfTimeRange.Null) { + if (experimentTRange != TmfTimeRange.NULL_RANGE) { // send request and received the adjusted time used TmfTimeRange adjustedTimeRange = initialExperimentDataRequest(this, experimentTRange); @@ -1047,8 +1047,8 @@ public class ControlFlowView extends AbsTimeUpdateView implements TmfTimeRange experimentTRange = signal.getExperiment() .getTimeRange(); - initTimeRange = TmfTimeRange.Null; - if (experimentTRange != TmfTimeRange.Null) { + initTimeRange = TmfTimeRange.NULL_RANGE; + if (experimentTRange != TmfTimeRange.NULL_RANGE) { // prepare time intervals in widget ModelUpdateInit(experimentTRange, experimentTRange, signal .getSource()); @@ -1062,10 +1062,10 @@ public class ControlFlowView extends AbsTimeUpdateView implements @TmfSignalHandler public void experimentRangeUpdated(TmfExperimentRangeUpdatedSignal signal) { - if (initTimeRange == TmfTimeRange.Null && signal.getExperiment().equals(TmfExperiment.getCurrentExperiment())) { + if (initTimeRange == TmfTimeRange.NULL_RANGE && signal.getExperiment().equals(TmfExperiment.getCurrentExperiment())) { TmfTimeRange experimentTRange = signal.getRange(); - if (experimentTRange != TmfTimeRange.Null) { + if (experimentTRange != TmfTimeRange.NULL_RANGE) { // prepare time intervals in widget ModelUpdateInit(experimentTRange, experimentTRange, signal.getSource()); diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/latency/LatencyView.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/latency/LatencyView.java index a9d54b850c..4bd35e11b3 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/latency/LatencyView.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/latency/LatencyView.java @@ -212,7 +212,7 @@ public class LatencyView extends TmfView implements IGraphModelListener { TmfTimeRange experimentTRange = experiment.getTimeRange(); - if (experimentTRange != TmfTimeRange.Null) { + if (experimentTRange != TmfTimeRange.NULL_RANGE) { TmfExperimentSelectedSignal signal = new TmfExperimentSelectedSignal(this, experiment); experimentSelected(signal); } @@ -240,10 +240,10 @@ public class LatencyView extends TmfView implements IGraphModelListener { // Update the trace reference fExperiment = (TmfExperiment) signal.getExperiment(); - fTimeRange = TmfTimeRange.Null; + fTimeRange = TmfTimeRange.NULL_RANGE; TmfTimeRange experimentTRange = fExperiment.getTimeRange(); - if (!experimentTRange.equals(TmfTimeRange.Null)) { + if (!experimentTRange.equals(TmfTimeRange.NULL_RANGE)) { fTimeRange = new TmfTimeRange(experimentTRange.getStartTime(), new TmfTimestamp(experimentTRange.getStartTime().getValue() + INITIAL_WINDOW_SPAN, experimentTRange.getStartTime().getScale(), experimentTRange.getStartTime().getPrecision())); fController.refreshModels(fExperiment, fTimeRange); @@ -252,10 +252,10 @@ public class LatencyView extends TmfView implements IGraphModelListener { } @TmfSignalHandler public void experimentRangeUpdated(TmfExperimentRangeUpdatedSignal signal) { - if (fTimeRange == TmfTimeRange.Null && signal.getExperiment().equals(fExperiment)) { + if (fTimeRange == TmfTimeRange.NULL_RANGE && signal.getExperiment().equals(fExperiment)) { TmfTimeRange experimentTRange = signal.getRange(); - if (experimentTRange != TmfTimeRange.Null) { + if (experimentTRange != TmfTimeRange.NULL_RANGE) { fTimeRange = new TmfTimeRange(experimentTRange.getStartTime(), new TmfTimestamp(experimentTRange.getStartTime().getValue() + INITIAL_WINDOW_SPAN, experimentTRange.getStartTime().getScale(), experimentTRange.getStartTime().getPrecision())); fController.refreshModels(fExperiment, fTimeRange); @@ -268,7 +268,7 @@ public class LatencyView extends TmfView implements IGraphModelListener { if (signal.getExperiment() != fExperiment) { return; } - fTimeRange = TmfTimeRange.Null; + fTimeRange = TmfTimeRange.NULL_RANGE; fExperiment = null; fController.clear(); } @@ -349,7 +349,7 @@ public class LatencyView extends TmfView implements IGraphModelListener { currentEventTime != Config.INVALID_EVENT_TIME) { // Queue update in the event request queue - TmfTimeRange timeRange = new TmfTimeRange(new TmfTimestamp(currentEventTime, Config.TIME_SCALE), TmfTimestamp.BigCrunch); + TmfTimeRange timeRange = new TmfTimeRange(new TmfTimestamp(currentEventTime, Config.TIME_SCALE), TmfTimestamp.BIG_CRUNCH); TmfEventRequest request = new TmfEventRequest(LttngEvent.class, timeRange, 0, 1, ExecutionType.FOREGROUND) { @Override public void handleCompleted() { diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/resources/ResourcesView.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/resources/ResourcesView.java index 062b566e26..92acea404e 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/resources/ResourcesView.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/resources/ResourcesView.java @@ -79,7 +79,7 @@ public class ResourcesView extends AbsTimeUpdateView implements private Action zoomFilter; private Composite top; - private TmfTimeRange initTimeRange = TmfTimeRange.Null; + private TmfTimeRange initTimeRange = TmfTimeRange.NULL_RANGE; // private static SimpleDateFormat stimeformat = new SimpleDateFormat( // "yy/MM/dd HH:mm:ss"); @@ -143,7 +143,7 @@ public class ResourcesView extends AbsTimeUpdateView implements TmfExperiment experiment = TmfExperiment.getCurrentExperiment(); if (experiment != null) { TmfTimeRange experimentTRange = experiment.getTimeRange(); - if (experimentTRange != TmfTimeRange.Null) { + if (experimentTRange != TmfTimeRange.NULL_RANGE) { long time0 = experimentTRange.getStartTime().getValue(); long time1 = experimentTRange.getEndTime().getValue(); ParamsUpdater paramUpdater = getParamsUpdater(); @@ -501,8 +501,8 @@ public class ResourcesView extends AbsTimeUpdateView implements if (signal != null) { TmfTimeRange experimentTRange = signal.getExperiment().getTimeRange(); - initTimeRange = TmfTimeRange.Null; - if (experimentTRange != TmfTimeRange.Null) { + initTimeRange = TmfTimeRange.NULL_RANGE; + if (experimentTRange != TmfTimeRange.NULL_RANGE) { // prepare time intervals in widget ModelUpdateInit(experimentTRange, experimentTRange, signal.getSource()); @@ -514,10 +514,10 @@ public class ResourcesView extends AbsTimeUpdateView implements @TmfSignalHandler public void experimentRangeUpdated(TmfExperimentRangeUpdatedSignal signal) { - if (initTimeRange == TmfTimeRange.Null && signal.getExperiment().equals(TmfExperiment.getCurrentExperiment())) { + if (initTimeRange == TmfTimeRange.NULL_RANGE && signal.getExperiment().equals(TmfExperiment.getCurrentExperiment())) { TmfTimeRange experimentTRange = signal.getRange(); - if (experimentTRange != TmfTimeRange.Null) { + if (experimentTRange != TmfTimeRange.NULL_RANGE) { // prepare time intervals in widget ModelUpdateInit(experimentTRange, experimentTRange, signal.getSource()); diff --git a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/component/TmfEventProviderTest.java b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/component/TmfEventProviderTest.java index 9f4402855a..3f9f6ed974 100644 --- a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/component/TmfEventProviderTest.java +++ b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/component/TmfEventProviderTest.java @@ -98,7 +98,7 @@ public class TmfEventProviderTest extends TestCase { TmfEventProviderStub.class); ITmfDataProvider provider = eventProviders[0]; - TmfTimeRange range = new TmfTimeRange(TmfTimestamp.BigBang, TmfTimestamp.BigCrunch); + TmfTimeRange range = new TmfTimeRange(TmfTimestamp.BIG_BANG, TmfTimestamp.BIG_CRUNCH); final TmfEventRequest request = new TmfEventRequest(TmfEvent.class, range, NB_EVENTS, BLOCK_SIZE) { @Override public void handleData(TmfEvent event) { @@ -140,7 +140,7 @@ public class TmfEventProviderTest extends TestCase { TmfEventProviderStub.class); ITmfDataProvider provider = eventProviders[0]; - TmfTimeRange range = new TmfTimeRange(TmfTimestamp.BigBang, TmfTimestamp.BigCrunch); + TmfTimeRange range = new TmfTimeRange(TmfTimestamp.BIG_BANG, TmfTimestamp.BIG_CRUNCH); // Create first request final TmfEventRequest request1 = new TmfEventRequest(TmfEvent.class, range, NB_EVENTS, BLOCK_SIZE) { @@ -271,7 +271,7 @@ public class TmfEventProviderTest extends TestCase { // The following tests are the same but for the size of the requested blocks // with regards to the size of the TmfSyntheticEventProviderStub block public void testGetSyntheticEvents_EqualBlockSizes() { - TmfTimeRange range = new TmfTimeRange(TmfTimestamp.BigBang, TmfTimestamp.BigCrunch); + TmfTimeRange range = new TmfTimeRange(TmfTimestamp.BIG_BANG, TmfTimestamp.BIG_CRUNCH); try { getSyntheticData(range, 1000, TmfSyntheticEventProviderStub.BLOCK_SIZE); } catch (InterruptedException e) { @@ -280,7 +280,7 @@ public class TmfEventProviderTest extends TestCase { } public void testGetSyntheticEvents_SmallerBlock() { - TmfTimeRange range = new TmfTimeRange(TmfTimestamp.BigBang, TmfTimestamp.BigCrunch); + TmfTimeRange range = new TmfTimeRange(TmfTimestamp.BIG_BANG, TmfTimestamp.BIG_CRUNCH); try { getSyntheticData(range, 1000, TmfSyntheticEventProviderStub.BLOCK_SIZE / 2); } catch (InterruptedException e) { @@ -289,7 +289,7 @@ public class TmfEventProviderTest extends TestCase { } public void testGetSyntheticEvents_LargerBlock() { - TmfTimeRange range = new TmfTimeRange(TmfTimestamp.BigBang, TmfTimestamp.BigCrunch); + TmfTimeRange range = new TmfTimeRange(TmfTimestamp.BIG_BANG, TmfTimestamp.BIG_CRUNCH); try { getSyntheticData(range, 1000, TmfSyntheticEventProviderStub.BLOCK_SIZE * 2); } catch (InterruptedException e) { diff --git a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfTimeRangeTest.java b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfTimeRangeTest.java index 720d0870fc..97a7bee490 100644 --- a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfTimeRangeTest.java +++ b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfTimeRangeTest.java @@ -60,14 +60,14 @@ public class TmfTimeRangeTest extends TestCase { public void testBadConstructor() throws Exception { try { - new TmfTimeRange(TmfTimestamp.BigBang, null); + new TmfTimeRange(TmfTimestamp.BIG_BANG, null); fail("TmfTimeRange: bad end time"); } catch (IllegalArgumentException e) { // Success } try { - new TmfTimeRange(null, TmfTimestamp.BigCrunch); + new TmfTimeRange(null, TmfTimestamp.BIG_CRUNCH); fail("TmfTimeRange: bad start time"); } catch (IllegalArgumentException e) { // Success @@ -76,25 +76,25 @@ public class TmfTimeRangeTest extends TestCase { public void testOpenRange1() throws Exception { ITmfTimestamp ts2 = new TmfTimestamp(12350); - TmfTimeRange range = new TmfTimeRange(TmfTimestamp.BigBang, ts2); + TmfTimeRange range = new TmfTimeRange(TmfTimestamp.BIG_BANG, ts2); - assertEquals("startTime", TmfTimestamp.BigBang, range.getStartTime()); + assertEquals("startTime", TmfTimestamp.BIG_BANG, range.getStartTime()); assertEquals("endTime", ts2, range.getEndTime()); } public void testOpenRange2() throws Exception { ITmfTimestamp ts1 = new TmfTimestamp(12345); - TmfTimeRange range = new TmfTimeRange(ts1, TmfTimestamp.BigCrunch); + TmfTimeRange range = new TmfTimeRange(ts1, TmfTimestamp.BIG_CRUNCH); assertEquals("startTime", ts1, range.getStartTime()); - assertEquals("endTime", TmfTimestamp.BigCrunch, range.getEndTime()); + assertEquals("endTime", TmfTimestamp.BIG_CRUNCH, range.getEndTime()); } public void testOpenRange3() throws Exception { - TmfTimeRange range = new TmfTimeRange(TmfTimestamp.BigBang, TmfTimestamp.BigCrunch); + TmfTimeRange range = new TmfTimeRange(TmfTimestamp.BIG_BANG, TmfTimestamp.BIG_CRUNCH); - assertEquals("startTime", TmfTimestamp.BigBang, range.getStartTime()); - assertEquals("endTime", TmfTimestamp.BigCrunch, range.getEndTime()); + assertEquals("startTime", TmfTimestamp.BIG_BANG, range.getStartTime()); + assertEquals("endTime", TmfTimestamp.BIG_CRUNCH, range.getEndTime()); } public void testCopyConstructor() throws Exception { @@ -106,11 +106,11 @@ public class TmfTimeRangeTest extends TestCase { assertEquals("startTime", ts1, range1.getStartTime()); assertEquals("endTime", ts2, range1.getEndTime()); - TmfTimeRange range2 = new TmfTimeRange(TmfTimestamp.BigBang, TmfTimestamp.BigCrunch); + TmfTimeRange range2 = new TmfTimeRange(TmfTimestamp.BIG_BANG, TmfTimestamp.BIG_CRUNCH); TmfTimeRange range3 = new TmfTimeRange(range2); - assertEquals("startTime", TmfTimestamp.BigBang, range3.getStartTime()); - assertEquals("endTime", TmfTimestamp.BigCrunch, range3.getEndTime()); + assertEquals("startTime", TmfTimestamp.BIG_BANG, range3.getStartTime()); + assertEquals("endTime", TmfTimestamp.BIG_CRUNCH, range3.getEndTime()); } public void testCopyConstructor2() throws Exception { @@ -150,7 +150,7 @@ public class TmfTimeRangeTest extends TestCase { ITmfTimestamp ts2 = new TmfTimestamp(12350); TmfTimeRange range1 = new TmfTimeRange(ts1, ts2); TmfTimeRange range1b = new TmfTimeRange(range1); - TmfTimeRange range2 = new TmfTimeRange(TmfTimestamp.BigBang, TmfTimestamp.BigCrunch); + TmfTimeRange range2 = new TmfTimeRange(TmfTimestamp.BIG_BANG, TmfTimestamp.BIG_CRUNCH); TmfTimeRange range2b = new TmfTimeRange(range2); assertTrue("hashCode", range1.hashCode() == range1b.hashCode()); @@ -167,7 +167,7 @@ public class TmfTimeRangeTest extends TestCase { ITmfTimestamp ts1 = new TmfTimestamp(12345); ITmfTimestamp ts2 = new TmfTimestamp(12350); TmfTimeRange range1 = new TmfTimeRange(ts1, ts2); - TmfTimeRange range2 = new TmfTimeRange(TmfTimestamp.BigBang, TmfTimestamp.BigCrunch); + TmfTimeRange range2 = new TmfTimeRange(TmfTimestamp.BIG_BANG, TmfTimestamp.BIG_CRUNCH); assertTrue("equals", range1.equals(range1)); assertTrue("equals", range2.equals(range2)); @@ -182,8 +182,8 @@ public class TmfTimeRangeTest extends TestCase { TmfTimeRange range1a = new TmfTimeRange(ts1, ts2); TmfTimeRange range1b = new TmfTimeRange(ts1, ts2); - TmfTimeRange range2a = new TmfTimeRange(TmfTimestamp.BigBang, TmfTimestamp.BigCrunch); - TmfTimeRange range2b = new TmfTimeRange(TmfTimestamp.BigBang, TmfTimestamp.BigCrunch); + TmfTimeRange range2a = new TmfTimeRange(TmfTimestamp.BIG_BANG, TmfTimestamp.BIG_CRUNCH); + TmfTimeRange range2b = new TmfTimeRange(TmfTimestamp.BIG_BANG, TmfTimestamp.BIG_CRUNCH); assertTrue("equals", range1a.equals(range1b)); assertTrue("equals", range1b.equals(range1a)); @@ -275,7 +275,7 @@ public class TmfTimeRangeTest extends TestCase { assertFalse("contains (low value)", range.contains(new TmfTimestamp(12340))); assertFalse("contains (high value)", range.contains(new TmfTimestamp(12351))); - assertTrue("contains (zero)", range.contains(TmfTimestamp.Zero)); + assertTrue("contains (zero)", range.contains(TmfTimestamp.ZERO)); } public void testContainsRange() throws Exception { diff --git a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfTimestampTest.java b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfTimestampTest.java index 6b7dcea332..0f6c96463b 100644 --- a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfTimestampTest.java +++ b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfTimestampTest.java @@ -106,24 +106,24 @@ public class TmfTimestampTest extends TestCase { } public void testCopyConstructorBigBang() throws Exception { - ITmfTimestamp ts = new TmfTimestamp(TmfTimestamp.BigBang); - assertEquals("getValue", TmfTimestamp.BigBang.getValue(), ts.getValue()); - assertEquals("getscale", TmfTimestamp.BigBang.getScale(), ts.getScale()); - assertEquals("getPrecision", TmfTimestamp.BigBang.getPrecision(), ts.getPrecision()); + ITmfTimestamp ts = new TmfTimestamp(TmfTimestamp.BIG_BANG); + assertEquals("getValue", TmfTimestamp.BIG_BANG.getValue(), ts.getValue()); + assertEquals("getscale", TmfTimestamp.BIG_BANG.getScale(), ts.getScale()); + assertEquals("getPrecision", TmfTimestamp.BIG_BANG.getPrecision(), ts.getPrecision()); } public void testCopyConstructorBigCrunch() throws Exception { - ITmfTimestamp ts = new TmfTimestamp(TmfTimestamp.BigCrunch); - assertEquals("getValue", TmfTimestamp.BigCrunch.getValue(), ts.getValue()); - assertEquals("getscale", TmfTimestamp.BigCrunch.getScale(), ts.getScale()); - assertEquals("getPrecision", TmfTimestamp.BigCrunch.getPrecision(), ts.getPrecision()); + ITmfTimestamp ts = new TmfTimestamp(TmfTimestamp.BIG_CRUNCH); + assertEquals("getValue", TmfTimestamp.BIG_CRUNCH.getValue(), ts.getValue()); + assertEquals("getscale", TmfTimestamp.BIG_CRUNCH.getScale(), ts.getScale()); + assertEquals("getPrecision", TmfTimestamp.BIG_CRUNCH.getPrecision(), ts.getPrecision()); } public void testCopyConstructorZero() throws Exception { - ITmfTimestamp ts = new TmfTimestamp(TmfTimestamp.Zero); - assertEquals("getValue", TmfTimestamp.Zero.getValue(), ts.getValue()); - assertEquals("getscale", TmfTimestamp.Zero.getScale(), ts.getScale()); - assertEquals("getPrecision", TmfTimestamp.Zero.getPrecision(), ts.getPrecision()); + ITmfTimestamp ts = new TmfTimestamp(TmfTimestamp.ZERO); + assertEquals("getValue", TmfTimestamp.ZERO.getValue(), ts.getValue()); + assertEquals("getscale", TmfTimestamp.ZERO.getScale(), ts.getScale()); + assertEquals("getPrecision", TmfTimestamp.ZERO.getPrecision(), ts.getPrecision()); } // ------------------------------------------------------------------------ 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 43647d5ff8..1208791ed2 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 @@ -79,7 +79,7 @@ public class TmfExperimentTest extends TestCase { @SuppressWarnings("unchecked") private synchronized static void setupExperiment() { if (fExperiment == null) { - fExperiment = new TmfExperiment(TmfEvent.class, EXPERIMENT, (ITmfTrace[]) fTraces, TmfTimestamp.Zero, 1000, true); + fExperiment = new TmfExperiment(TmfEvent.class, EXPERIMENT, (ITmfTrace[]) fTraces, TmfTimestamp.ZERO, 1000, true); } } @@ -106,7 +106,7 @@ public class TmfExperimentTest extends TestCase { public void testBasicTmfExperimentConstructor() { assertEquals("GetId", EXPERIMENT, fExperiment.getName()); - assertEquals("GetEpoch", TmfTimestamp.Zero, fExperiment.getEpoch()); + assertEquals("GetEpoch", TmfTimestamp.ZERO, fExperiment.getEpoch()); assertEquals("GetNbEvents", NB_EVENTS, fExperiment.getNbEvents()); long nbTraceEvents = fExperiment.getTraces()[0].getNbEvents(); @@ -563,7 +563,7 @@ public class TmfExperimentTest extends TestCase { final int nbEvents = 1000; final Vector requestedEvents = new Vector(); - TmfTimeRange range = new TmfTimeRange(TmfTimestamp.BigBang, TmfTimestamp.BigCrunch); + TmfTimeRange range = new TmfTimeRange(TmfTimestamp.BIG_BANG, TmfTimestamp.BIG_CRUNCH); final TmfEventRequest request = new TmfEventRequest(TmfEvent.class, range, nbEvents, blockSize) { @Override public void handleData(TmfEvent event) { @@ -591,7 +591,7 @@ public class TmfExperimentTest extends TestCase { final int nbEvents = 1000; final Vector requestedEvents = new Vector(); - TmfTimeRange range = new TmfTimeRange(TmfTimestamp.BigBang, TmfTimestamp.BigCrunch); + TmfTimeRange range = new TmfTimeRange(TmfTimestamp.BIG_BANG, TmfTimestamp.BIG_CRUNCH); final TmfEventRequest request = new TmfEventRequest(TmfEvent.class, range, nbEvents, blockSize) { @Override public void handleData(TmfEvent event) { @@ -620,7 +620,7 @@ public class TmfExperimentTest extends TestCase { final Vector requestedEvents = new Vector(); long nbExpectedEvents = NB_EVENTS; - TmfTimeRange range = new TmfTimeRange(TmfTimestamp.BigBang, TmfTimestamp.BigCrunch); + TmfTimeRange range = new TmfTimeRange(TmfTimestamp.BIG_BANG, TmfTimestamp.BIG_CRUNCH); final TmfEventRequest request = new TmfEventRequest(TmfEvent.class, range, nbEvents, blockSize) { @Override public void handleData(TmfEvent event) { @@ -652,7 +652,7 @@ public class TmfExperimentTest extends TestCase { final int blockSize = fDefaultBlockSize; final Vector requestedEvents = new Vector(); - TmfTimeRange range = new TmfTimeRange(TmfTimestamp.BigBang, TmfTimestamp.BigCrunch); + TmfTimeRange range = new TmfTimeRange(TmfTimestamp.BIG_BANG, TmfTimestamp.BIG_CRUNCH); final TmfEventRequest request = new TmfEventRequest(TmfEvent.class, range, nbEvents, blockSize) { int nbRead = 0; @Override 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 2760e9cc13..a317cf3f5c 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 @@ -85,7 +85,7 @@ public class TmfMultiTraceExperimentTest extends TestCase { private synchronized static void setupExperiment() { synchronized (TmfMultiTraceExperimentTest.class) { if (fExperiment == null) { - fExperiment = new TmfExperiment(TmfEvent.class, EXPERIMENT, (ITmfTrace[]) fTraces, TmfTimestamp.Zero, BLOCK_SIZE, true); + fExperiment = new TmfExperiment(TmfEvent.class, EXPERIMENT, (ITmfTrace[]) fTraces, TmfTimestamp.ZERO, BLOCK_SIZE, true); } } } @@ -113,7 +113,7 @@ public class TmfMultiTraceExperimentTest extends TestCase { public void testBasicTmfExperimentConstructor() { assertEquals("GetId", EXPERIMENT, fExperiment.getName()); - assertEquals("GetEpoch", TmfTimestamp.Zero, fExperiment.getEpoch()); + assertEquals("GetEpoch", TmfTimestamp.ZERO, fExperiment.getEpoch()); assertEquals("GetNbEvents", NB_EVENTS, fExperiment.getNbEvents()); TmfTimeRange timeRange = fExperiment.getTimeRange(); @@ -567,7 +567,7 @@ public class TmfMultiTraceExperimentTest extends TestCase { final int nbEvents = 1000; final Vector requestedEvents = new Vector(); - TmfTimeRange range = new TmfTimeRange(TmfTimestamp.BigBang, TmfTimestamp.BigCrunch); + TmfTimeRange range = new TmfTimeRange(TmfTimestamp.BIG_BANG, TmfTimestamp.BIG_CRUNCH); final TmfEventRequest request = new TmfEventRequest(TmfEvent.class, range, nbEvents, blockSize) { @Override public void handleData(TmfEvent event) { @@ -595,7 +595,7 @@ public class TmfMultiTraceExperimentTest extends TestCase { final int nbEvents = 1000; final Vector requestedEvents = new Vector(); - TmfTimeRange range = new TmfTimeRange(TmfTimestamp.BigBang, TmfTimestamp.BigCrunch); + TmfTimeRange range = new TmfTimeRange(TmfTimestamp.BIG_BANG, TmfTimestamp.BIG_CRUNCH); final TmfEventRequest request = new TmfEventRequest(TmfEvent.class, range, nbEvents, blockSize) { @Override public void handleData(TmfEvent event) { @@ -624,7 +624,7 @@ public class TmfMultiTraceExperimentTest extends TestCase { final Vector requestedEvents = new Vector(); long nbExpectedEvents = NB_EVENTS; - TmfTimeRange range = new TmfTimeRange(TmfTimestamp.BigBang, TmfTimestamp.BigCrunch); + TmfTimeRange range = new TmfTimeRange(TmfTimestamp.BIG_BANG, TmfTimestamp.BIG_CRUNCH); final TmfEventRequest request = new TmfEventRequest(TmfEvent.class, range, nbEvents, blockSize) { @Override public void handleData(TmfEvent event) { @@ -656,7 +656,7 @@ public class TmfMultiTraceExperimentTest extends TestCase { final int blockSize = BLOCK_SIZE; final Vector requestedEvents = new Vector(); - TmfTimeRange range = new TmfTimeRange(TmfTimestamp.BigBang, TmfTimestamp.BigCrunch); + TmfTimeRange range = new TmfTimeRange(TmfTimestamp.BIG_BANG, TmfTimestamp.BIG_CRUNCH); final TmfEventRequest request = new TmfEventRequest(TmfEvent.class, range, nbEvents, blockSize) { int nbRead = 0; @Override diff --git a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/request/TmfCoalescedEventRequestTest.java b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/request/TmfCoalescedEventRequestTest.java index c9dfe6867e..4803cd865e 100644 --- a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/request/TmfCoalescedEventRequestTest.java +++ b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/request/TmfCoalescedEventRequestTest.java @@ -49,8 +49,8 @@ public class TmfCoalescedEventRequestTest extends TestCase { // Variables // ------------------------------------------------------------------------ - private TmfTimeRange range1 = new TmfTimeRange(TmfTimeRange.Eternity); - private TmfTimeRange range2 = new TmfTimeRange(new TmfTimestamp(), TmfTimestamp.BigCrunch); + private TmfTimeRange range1 = new TmfTimeRange(TmfTimeRange.ETERNITY); + private TmfTimeRange range2 = new TmfTimeRange(new TmfTimestamp(), TmfTimestamp.BIG_CRUNCH); private TmfCoalescedEventRequest fRequest1; private TmfCoalescedEventRequest fRequest2; @@ -435,7 +435,7 @@ public class TmfCoalescedEventRequestTest extends TestCase { @TmfSignalHandler public void trigger(final TmfTestTriggerSignal signal) { - TmfTimeRange range = new TmfTimeRange(TmfTimestamp.BigBang, TmfTimestamp.BigCrunch); + TmfTimeRange range = new TmfTimeRange(TmfTimestamp.BIG_BANG, TmfTimestamp.BIG_CRUNCH); requestedEvents1 = new Vector(); request1 = new TmfEventRequest(TmfEvent.class, range, NB_EVENTS, BLOCK_SIZE) { diff --git a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/request/TmfEventRequestTest.java b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/request/TmfEventRequestTest.java index 3a00d9c5bd..5b5b688f1d 100644 --- a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/request/TmfEventRequestTest.java +++ b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/request/TmfEventRequestTest.java @@ -33,8 +33,8 @@ public class TmfEventRequestTest extends TestCase { // Variables // ------------------------------------------------------------------------ - private static TmfTimeRange range1 = new TmfTimeRange(TmfTimeRange.Eternity); - private static TmfTimeRange range2 = new TmfTimeRange(new TmfTimestamp(), TmfTimestamp.BigCrunch); + private static TmfTimeRange range1 = new TmfTimeRange(TmfTimeRange.ETERNITY); + private static TmfTimeRange range2 = new TmfTimeRange(new TmfTimestamp(), TmfTimestamp.BIG_CRUNCH); private static TmfEventRequest fRequest1; private static TmfEventRequest fRequest1b; @@ -73,7 +73,7 @@ public class TmfEventRequestTest extends TestCase { private TmfEventRequest setupTestRequest(final boolean[] flags) { - TmfEventRequest request = new TmfEventRequestStub(TmfEvent.class, new TmfTimeRange(TmfTimeRange.Eternity), 100, 200) { + TmfEventRequest request = new TmfEventRequestStub(TmfEvent.class, new TmfTimeRange(TmfTimeRange.ETERNITY), 100, 200) { @Override public void handleCompleted() { super.handleCompleted(); @@ -108,8 +108,8 @@ public class TmfEventRequestTest extends TestCase { assertEquals("getRequestId", fRequestCount++, request.getRequestId()); assertEquals("getDataType", TmfEvent.class, request.getDataType()); - assertEquals("StartTime", TmfTimestamp.BigBang, request.getRange().getStartTime()); - assertEquals("EndTime", TmfTimestamp.BigCrunch, request.getRange().getEndTime()); + assertEquals("StartTime", TmfTimestamp.BIG_BANG, request.getRange().getStartTime()); + assertEquals("EndTime", TmfTimestamp.BIG_CRUNCH, request.getRange().getEndTime()); assertEquals("getIndex", 0, request.getIndex()); assertEquals("getNbRequestedEvents", TmfDataRequest.ALL_DATA, request.getNbRequested()); @@ -122,14 +122,14 @@ public class TmfEventRequestTest extends TestCase { } public void testTmfEventRequestTimeRange() { - TmfTimeRange range = new TmfTimeRange(new TmfTimestamp(), TmfTimestamp.BigCrunch); + TmfTimeRange range = new TmfTimeRange(new TmfTimestamp(), TmfTimestamp.BIG_CRUNCH); TmfEventRequest request = new TmfEventRequestStub(TmfEvent.class, range); assertEquals("getRequestId", fRequestCount++, request.getRequestId()); assertEquals("getDataType", TmfEvent.class, request.getDataType()); assertEquals("StartTime", new TmfTimestamp(), request.getRange().getStartTime()); - assertEquals("EndTime", TmfTimestamp.BigCrunch, request.getRange().getEndTime()); + assertEquals("EndTime", TmfTimestamp.BIG_CRUNCH, request.getRange().getEndTime()); assertEquals("getIndex", 0, request.getIndex()); assertEquals("getNbRequestedEvents", TmfDataRequest.ALL_DATA, request.getNbRequested()); @@ -142,14 +142,14 @@ public class TmfEventRequestTest extends TestCase { } public void testTmfEventRequestTimeRangeNbRequested() { - TmfTimeRange range = new TmfTimeRange(new TmfTimestamp(), TmfTimestamp.BigCrunch); + TmfTimeRange range = new TmfTimeRange(new TmfTimestamp(), TmfTimestamp.BIG_CRUNCH); TmfEventRequest request = new TmfEventRequestStub(TmfEvent.class, range, 100); assertEquals("getRequestId", fRequestCount++, request.getRequestId()); assertEquals("getDataType", TmfEvent.class, request.getDataType()); assertEquals("StartTime", new TmfTimestamp(), request.getRange().getStartTime()); - assertEquals("EndTime", TmfTimestamp.BigCrunch, request.getRange().getEndTime()); + assertEquals("EndTime", TmfTimestamp.BIG_CRUNCH, request.getRange().getEndTime()); assertEquals("getIndex", 0, request.getIndex()); assertEquals("getNbRequestedEvents", 100, request.getNbRequested()); @@ -162,14 +162,14 @@ public class TmfEventRequestTest extends TestCase { } public void testTmfEventRequestTimeRangeNbRequestedBlocksize() { - TmfTimeRange range = new TmfTimeRange(new TmfTimestamp(), TmfTimestamp.BigCrunch); + TmfTimeRange range = new TmfTimeRange(new TmfTimestamp(), TmfTimestamp.BIG_CRUNCH); TmfEventRequest request = new TmfEventRequestStub(TmfEvent.class, range, 100, 200); assertEquals("getRequestId", fRequestCount++, request.getRequestId()); assertEquals("getDataType", TmfEvent.class, request.getDataType()); assertEquals("StartTime", new TmfTimestamp(), request.getRange().getStartTime()); - assertEquals("EndTime", TmfTimestamp.BigCrunch, request.getRange().getEndTime()); + assertEquals("EndTime", TmfTimestamp.BIG_CRUNCH, request.getRange().getEndTime()); assertEquals("getIndex", 0, request.getIndex()); assertEquals("getNbRequestedEvents", 100, request.getNbRequested()); diff --git a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/TmfCheckpointTest.java b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/TmfCheckpointTest.java index ed5f738664..2589e83ed4 100644 --- a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/TmfCheckpointTest.java +++ b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/TmfCheckpointTest.java @@ -32,8 +32,8 @@ public class TmfCheckpointTest extends TestCase { // ------------------------------------------------------------------------ ITmfTimestamp fTimestamp1 = new TmfTimestamp(); - ITmfTimestamp fTimestamp2 = TmfTimestamp.BigBang; - ITmfTimestamp fTimestamp3 = TmfTimestamp.BigCrunch; + ITmfTimestamp fTimestamp2 = TmfTimestamp.BIG_BANG; + ITmfTimestamp fTimestamp3 = TmfTimestamp.BIG_CRUNCH; Long aLong1 = 12345L; Long aLong2 = 23456L; 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 e6f57a0628..d466d5f6d8 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 @@ -105,7 +105,7 @@ public class TmfExperimentTest extends TestCase { public void testBasicTmfExperimentConstructor() { assertEquals("GetId", EXPERIMENT, fExperiment.getName()); - assertEquals("GetEpoch", TmfTimestamp.Zero, fExperiment.getEpoch()); + assertEquals("GetEpoch", TmfTimestamp.ZERO, fExperiment.getEpoch()); assertEquals("GetNbEvents", NB_EVENTS, fExperiment.getNbEvents()); TmfTimeRange timeRange = fExperiment.getTimeRange(); @@ -518,7 +518,7 @@ public class TmfExperimentTest extends TestCase { final int nbEvents = 1000; final Vector requestedEvents = new Vector(); - TmfTimeRange range = new TmfTimeRange(TmfTimestamp.BigBang, TmfTimestamp.BigCrunch); + TmfTimeRange range = new TmfTimeRange(TmfTimestamp.BIG_BANG, TmfTimestamp.BIG_CRUNCH); final TmfEventRequest request = new TmfEventRequest(TmfEvent.class, range, nbEvents, blockSize) { @Override public void handleData(TmfEvent event) { @@ -545,7 +545,7 @@ public class TmfExperimentTest extends TestCase { final int nbEvents = 1000; final Vector requestedEvents = new Vector(); - TmfTimeRange range = new TmfTimeRange(TmfTimestamp.BigBang, TmfTimestamp.BigCrunch); + TmfTimeRange range = new TmfTimeRange(TmfTimestamp.BIG_BANG, TmfTimestamp.BIG_CRUNCH); final TmfEventRequest request = new TmfEventRequest(TmfEvent.class, range, nbEvents, blockSize) { @Override public void handleData(TmfEvent event) { @@ -573,7 +573,7 @@ public class TmfExperimentTest extends TestCase { final Vector requestedEvents = new Vector(); long nbExpectedEvents = fExperiment.getNbEvents(); - TmfTimeRange range = new TmfTimeRange(TmfTimestamp.BigBang, TmfTimestamp.BigCrunch); + TmfTimeRange range = new TmfTimeRange(TmfTimestamp.BIG_BANG, TmfTimestamp.BIG_CRUNCH); final TmfEventRequest request = new TmfEventRequest(TmfEvent.class, range, nbEvents, blockSize) { @Override public void handleData(TmfEvent event) { @@ -604,7 +604,7 @@ public class TmfExperimentTest extends TestCase { final int blockSize = fDefaultBlockSize; final Vector requestedEvents = new Vector(); - TmfTimeRange range = new TmfTimeRange(TmfTimestamp.BigBang, TmfTimestamp.BigCrunch); + TmfTimeRange range = new TmfTimeRange(TmfTimestamp.BIG_BANG, TmfTimestamp.BIG_CRUNCH); final TmfEventRequest request = new TmfEventRequest(TmfEvent.class, range, nbEvents, blockSize) { int nbRead = 0; @Override diff --git a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/TmfLocationTest.java b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/TmfLocationTest.java index cafeed649f..4b1aac4f1b 100644 --- a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/TmfLocationTest.java +++ b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/TmfLocationTest.java @@ -98,7 +98,7 @@ public class TmfLocationTest extends TestCase { public void testSetLocation() { String aString2 = "some other location"; Long aLong2 = 1234567L; - TmfTimestamp aTimestamp2 = (TmfTimestamp) TmfTimestamp.BigBang; + TmfTimestamp aTimestamp2 = (TmfTimestamp) TmfTimestamp.BIG_BANG; fLocation1.setLocation(aString2); fLocation2.setLocation(aLong2); 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 1426a3be02..226c75c6db 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 @@ -706,7 +706,7 @@ public class TmfTraceTest extends TestCase { final int NB_EVENTS = 1000; final Vector requestedEvents = new Vector(); - TmfTimeRange range = new TmfTimeRange(TmfTimestamp.BigBang, TmfTimestamp.BigCrunch); + TmfTimeRange range = new TmfTimeRange(TmfTimestamp.BIG_BANG, TmfTimestamp.BIG_CRUNCH); final TmfEventRequest request = new TmfEventRequest(TmfEvent.class, range, NB_EVENTS, BLOCK_SIZE) { @Override public void handleData(TmfEvent event) { @@ -734,7 +734,7 @@ public class TmfTraceTest extends TestCase { final int BLOCK_SIZE = 1; final Vector requestedEvents = new Vector(); - TmfTimeRange range = new TmfTimeRange(TmfTimestamp.BigBang, TmfTimestamp.BigCrunch); + TmfTimeRange range = new TmfTimeRange(TmfTimestamp.BIG_BANG, TmfTimestamp.BIG_CRUNCH); final TmfEventRequest request = new TmfEventRequest(TmfEvent.class, range, NB_EVENTS, BLOCK_SIZE) { @Override public void handleData(TmfEvent event) { @@ -765,7 +765,7 @@ public class TmfTraceTest extends TestCase { public void testCancel() throws Exception { final Vector requestedEvents = new Vector(); - TmfTimeRange range = new TmfTimeRange(TmfTimestamp.BigBang, TmfTimestamp.BigCrunch); + TmfTimeRange range = new TmfTimeRange(TmfTimestamp.BIG_BANG, TmfTimestamp.BIG_CRUNCH); final TmfEventRequest request = new TmfEventRequest(TmfEvent.class, range, NB_EVENTS, BLOCK_SIZE) { int nbRead = 0; @Override diff --git a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/uml2sd/TmfAsyncSequenceDiagramEventTest.java b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/uml2sd/TmfAsyncSequenceDiagramEventTest.java index 73a2532311..7daf2544ad 100644 --- a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/uml2sd/TmfAsyncSequenceDiagramEventTest.java +++ b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/uml2sd/TmfAsyncSequenceDiagramEventTest.java @@ -42,10 +42,10 @@ public class TmfAsyncSequenceDiagramEventTest extends TestCase { public TmfAsyncSequenceDiagramEventTest() { - fContent1 = new TmfEventField(ITmfEventField.ROOT_ID, "Some content"); + fContent1 = new TmfEventField(ITmfEventField.ROOT_FIELD_ID, "Some content"); fEvent1 = new TmfEvent(null, fTimestamp1, fSource, fType, fContent1, fReference); - fContent2 = new TmfEventField(ITmfEventField.ROOT_ID, "Some other content"); + fContent2 = new TmfEventField(ITmfEventField.ROOT_FIELD_ID, "Some other content"); fEvent2 = new TmfEvent(null, fTimestamp2, fSource, fType, fContent2, fReference); } diff --git a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/uml2sd/TmfSyncSequenceDiagramEventTest.java b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/uml2sd/TmfSyncSequenceDiagramEventTest.java index f20f4a7266..66b40c6b5f 100644 --- a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/uml2sd/TmfSyncSequenceDiagramEventTest.java +++ b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/uml2sd/TmfSyncSequenceDiagramEventTest.java @@ -38,7 +38,7 @@ public class TmfSyncSequenceDiagramEventTest extends TestCase { private final TmfEventField fContent1; public TmfSyncSequenceDiagramEventTest () { - fContent1 = new TmfEventField(ITmfEventField.ROOT_ID, "Some content"); + fContent1 = new TmfEventField(ITmfEventField.ROOT_FIELD_ID, "Some content"); fEvent1 = new TmfEvent(null, fTimestamp1, fSource, fType, fContent1, fReference); } diff --git a/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/stubs/event/TmfEventTypeStub.java b/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/stubs/event/TmfEventTypeStub.java index b2844d75ae..f817d6112b 100644 --- a/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/stubs/event/TmfEventTypeStub.java +++ b/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/stubs/event/TmfEventTypeStub.java @@ -32,7 +32,7 @@ public class TmfEventTypeStub extends TmfEventType { private static final ITmfEventField[] FIELDS = new ITmfEventField[] { FIELD_1, FIELD_2, FIELD_3, FIELD_4, FIELD_5 }; - private static ITmfEventField ROOT = new TmfEventField(ITmfEventField.ROOT_ID, FIELDS); + private static ITmfEventField ROOT = new TmfEventField(ITmfEventField.ROOT_FIELD_ID, FIELDS); public TmfEventTypeStub() { super("UnitTest", "TmfEventTypeStub", ROOT); 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 d6d86faf1d..a6a8128984 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 @@ -106,7 +106,7 @@ public class TmfEventParserStub implements ITmfEventParser { } content.append("]"); - TmfEventField root = new TmfEventField(ITmfEventField.ROOT_ID, content.toString()); + TmfEventField root = new TmfEventField(ITmfEventField.ROOT_FIELD_ID, content.toString()); ITmfEvent event = new TmfEvent(eventStream, new TmfTimestamp(ts, -3, 0), // millisecs source, fTypes[typeIndex], root, reference.toString()); diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/ITmfEvent.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/ITmfEvent.java index 1cba08aef5..1a9b9e4910 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/ITmfEvent.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/ITmfEvent.java @@ -32,14 +32,22 @@ import org.eclipse.linuxtools.tmf.core.trace.ITmfTrace; */ public interface ITmfEvent extends Cloneable { + // ------------------------------------------------------------------------ + // Constants + // ------------------------------------------------------------------------ + /** * Pre-defined event attributes */ - public String EVENT_FIELD_TIMESTAMP = ":timestamp:"; //$NON-NLS-1$ - public String EVENT_FIELD_SOURCE = ":source:"; //$NON-NLS-1$ - public String EVENT_FIELD_TYPE = ":type:"; //$NON-NLS-1$ - public String EVENT_FIELD_CONTENT = ":content:"; //$NON-NLS-1$ - public String EVENT_FIELD_REFERENCE = ":reference:"; //$NON-NLS-1$ + public static final String EVENT_FIELD_TIMESTAMP = ":timestamp:"; //$NON-NLS-1$ + public static final String EVENT_FIELD_SOURCE = ":source:"; //$NON-NLS-1$ + public static final String EVENT_FIELD_TYPE = ":type:"; //$NON-NLS-1$ + public static final String EVENT_FIELD_CONTENT = ":content:"; //$NON-NLS-1$ + public static final String EVENT_FIELD_REFERENCE = ":reference:"; //$NON-NLS-1$ + + // ------------------------------------------------------------------------ + // Getters + // ------------------------------------------------------------------------ /** * @return the trace that 'owns' the event @@ -76,6 +84,10 @@ public interface ITmfEvent extends Cloneable { */ public String getReference(); + // ------------------------------------------------------------------------ + // Cloneable + // ------------------------------------------------------------------------ + /** * @return a clone of the data item */ diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/ITmfEventField.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/ITmfEventField.java index 38211763f7..41e1b837ee 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/ITmfEventField.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/ITmfEventField.java @@ -20,11 +20,19 @@ package org.eclipse.linuxtools.tmf.core.event; */ public interface ITmfEventField extends Cloneable { + // ------------------------------------------------------------------------ + // Constants + // ------------------------------------------------------------------------ + /** * The root field id (the main container) */ - public static final String ROOT_ID = ":root:"; //$NON-NLS-1$ + public static final String ROOT_FIELD_ID = ":root:"; //$NON-NLS-1$ + // ------------------------------------------------------------------------ + // Getters + // ------------------------------------------------------------------------ + /** * @return the field name */ @@ -60,6 +68,10 @@ public interface ITmfEventField extends Cloneable { */ public ITmfEventField getField(int index); + // ------------------------------------------------------------------------ + // Cloneable + // ------------------------------------------------------------------------ + /** * @return a clone of the event type */ diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/ITmfEventType.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/ITmfEventType.java index 8005c346a4..045b9f8ffb 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/ITmfEventType.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/ITmfEventType.java @@ -22,6 +22,10 @@ package org.eclipse.linuxtools.tmf.core.event; */ public interface ITmfEventType extends Cloneable { + // ------------------------------------------------------------------------ + // Constants + // ------------------------------------------------------------------------ + /** * The default event type content */ @@ -32,6 +36,10 @@ public interface ITmfEventType extends Cloneable { */ public static final String DEFAULT_TYPE_ID = "TmfType"; //$NON-NLS-1$ + // ------------------------------------------------------------------------ + // Getters + // ------------------------------------------------------------------------ + /** * @return the event type context */ @@ -58,6 +66,10 @@ public interface ITmfEventType extends Cloneable { */ public String getFieldName(int index); + // ------------------------------------------------------------------------ + // Cloneable + // ------------------------------------------------------------------------ + /** * @return a clone of the event content */ diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/ITmfTimestamp.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/ITmfTimestamp.java index 7e1c34976a..0c074dba50 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/ITmfTimestamp.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/ITmfTimestamp.java @@ -32,6 +32,10 @@ package org.eclipse.linuxtools.tmf.core.event; */ public interface ITmfTimestamp extends Cloneable, Comparable { + // ------------------------------------------------------------------------ + // Getters + // ------------------------------------------------------------------------ + /** * @return the timestamp value (magnitude) */ @@ -47,6 +51,10 @@ public interface ITmfTimestamp extends Cloneable, Comparable { */ public int getPrecision(); + // ------------------------------------------------------------------------ + // Operations + // ------------------------------------------------------------------------ + /** * Normalize (adjust scale and offset) of the timerstamp * @@ -73,11 +81,19 @@ public interface ITmfTimestamp extends Cloneable, Comparable { */ public ITmfTimestamp getDelta(ITmfTimestamp ts); + // ------------------------------------------------------------------------ + // Cloneable + // ------------------------------------------------------------------------ + /** * @return a clone of the timestamp */ public ITmfTimestamp clone(); + // ------------------------------------------------------------------------ + // Comparable + // ------------------------------------------------------------------------ + /* (non-Javadoc) * @see java.lang.Comparable#compareTo(java.lang.Object) */ diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfEventField.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfEventField.java index 7f71cc4552..598081cb16 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfEventField.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfEventField.java @@ -195,7 +195,7 @@ public class TmfEventField implements ITmfEventField { for (int i = 0; i < labels.length; i++) { fields[i] = new TmfEventField(labels[i], null); } - ITmfEventField rootField = new TmfEventField(ITmfEventField.ROOT_ID, fields); + ITmfEventField rootField = new TmfEventField(ITmfEventField.ROOT_FIELD_ID, fields); return rootField; } diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfTimeRange.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfTimeRange.java index 689f9370d6..4bc9fc4ec2 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfTimeRange.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfTimeRange.java @@ -27,14 +27,14 @@ public final class TmfTimeRange implements Cloneable { /** * The full possible time range */ - public static final TmfTimeRange Eternity = - new TmfTimeRange(TmfTimestamp.BigBang, TmfTimestamp.BigCrunch); + public static final TmfTimeRange ETERNITY = + new TmfTimeRange(TmfTimestamp.BIG_BANG, TmfTimestamp.BIG_CRUNCH); /** * The null time range */ - public static final TmfTimeRange Null = - new TmfTimeRange(TmfTimestamp.BigBang, TmfTimestamp.BigBang); + public static final TmfTimeRange NULL_RANGE = + new TmfTimeRange(TmfTimestamp.BIG_BANG, TmfTimestamp.BIG_BANG); // ------------------------------------------------------------------------ // Attributes @@ -111,7 +111,7 @@ public final class TmfTimeRange implements Cloneable { */ public boolean contains(ITmfTimestamp ts) { // Zero acts as a "universal donor" timestamp - if (ts.equals(TmfTimestamp.Zero)) + if (ts.equals(TmfTimestamp.ZERO)) return true; return (fStartTime.compareTo(ts, true) <= 0) && (fEndTime.compareTo(ts, true) >= 0); } diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfTimestamp.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfTimestamp.java index cf6d7ae0d2..a8392fdca6 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfTimestamp.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfTimestamp.java @@ -28,19 +28,19 @@ public class TmfTimestamp implements ITmfTimestamp { /** * The beginning of time */ - public static final ITmfTimestamp BigBang = + public static final ITmfTimestamp BIG_BANG = new TmfTimestamp(Long.MIN_VALUE, Integer.MAX_VALUE, 0); /** * The end of time */ - public static final ITmfTimestamp BigCrunch = + public static final ITmfTimestamp BIG_CRUNCH = new TmfTimestamp(Long.MAX_VALUE, Integer.MAX_VALUE, 0); /** * Zero */ - public static final ITmfTimestamp Zero = + public static final ITmfTimestamp ZERO = new TmfTimestamp(0, 0, 0); // ------------------------------------------------------------------------ @@ -217,9 +217,9 @@ public class TmfTimestamp implements ITmfTimestamp { // Check the corner cases (we can't use equals() because it uses compareTo()...) if (this == ts || (fValue == ts.getValue() && fScale == ts.getScale())) return 0; - if ((fValue == BigBang.getValue() && fScale == BigBang.getScale()) || (ts.getValue() == BigCrunch.getValue() && ts.getScale() == BigCrunch.getScale())) + if ((fValue == BIG_BANG.getValue() && fScale == BIG_BANG.getScale()) || (ts.getValue() == BIG_CRUNCH.getValue() && ts.getScale() == BIG_CRUNCH.getScale())) return -1; - if ((fValue == BigCrunch.getValue() && fScale == BigCrunch.getScale()) || (ts.getValue() == BigBang.getValue() && ts.getScale() == BigBang.getScale())) + if ((fValue == BIG_CRUNCH.getValue() && fScale == BIG_CRUNCH.getScale()) || (ts.getValue() == BIG_BANG.getValue() && ts.getScale() == BIG_BANG.getScale())) return 1; try { 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 03986e7055..14450d90aa 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 @@ -122,7 +122,7 @@ public class TmfExperiment extends TmfEventProvider impl * @param indexPageSize */ public TmfExperiment(Class type, String id, ITmfTrace[] traces, ITmfTimestamp epoch, int indexPageSize) { - this(type, id, traces, TmfTimestamp.Zero, indexPageSize, false); + this(type, id, traces, TmfTimestamp.ZERO, indexPageSize, false); } public TmfExperiment(Class type, String id, ITmfTrace[] traces, ITmfTimestamp epoch, int indexPageSize, boolean preIndexExperiment) { @@ -131,7 +131,7 @@ public class TmfExperiment extends TmfEventProvider impl fTraces = traces; fEpoch = epoch; fIndexPageSize = indexPageSize; - fTimeRange = TmfTimeRange.Null; + fTimeRange = TmfTimeRange.NULL_RANGE; if (preIndexExperiment) { indexExperiment(true); @@ -150,7 +150,7 @@ public class TmfExperiment extends TmfEventProvider impl * @param traces */ public TmfExperiment(Class type, String id, ITmfTrace[] traces) { - this(type, id, traces, TmfTimestamp.Zero, DEFAULT_INDEX_PAGE_SIZE); + this(type, id, traces, TmfTimestamp.ZERO, DEFAULT_INDEX_PAGE_SIZE); } /** @@ -160,7 +160,7 @@ public class TmfExperiment extends TmfEventProvider impl * @param indexPageSize */ public TmfExperiment(Class type, String id, ITmfTrace[] traces, int indexPageSize) { - this(type, id, traces, TmfTimestamp.Zero, indexPageSize); + this(type, id, traces, TmfTimestamp.ZERO, indexPageSize); } /** @@ -305,8 +305,8 @@ public class TmfExperiment extends TmfEventProvider impl * Update the global time range */ protected void updateTimeRange() { - ITmfTimestamp startTime = fTimeRange != TmfTimeRange.Null ? fTimeRange.getStartTime() : TmfTimestamp.BigCrunch; - ITmfTimestamp endTime = fTimeRange != TmfTimeRange.Null ? fTimeRange.getEndTime() : TmfTimestamp.BigBang; + ITmfTimestamp startTime = fTimeRange != TmfTimeRange.NULL_RANGE ? fTimeRange.getStartTime() : TmfTimestamp.BIG_CRUNCH; + ITmfTimestamp endTime = fTimeRange != TmfTimeRange.NULL_RANGE ? fTimeRange.getEndTime() : TmfTimestamp.BIG_BANG; for (ITmfTrace trace : fTraces) { ITmfTimestamp traceStartTime = trace.getStartTime(); @@ -328,7 +328,7 @@ public class TmfExperiment extends TmfEventProvider impl ITmfTimestamp timestamp = (request instanceof ITmfEventRequest) ? ((ITmfEventRequest) request).getRange().getStartTime() : null; - if (TmfTimestamp.BigBang.equals(timestamp) || request.getIndex() > 0) { + if (TmfTimestamp.BIG_BANG.equals(timestamp) || request.getIndex() > 0) { timestamp = null; // use request index } @@ -423,7 +423,7 @@ public class TmfExperiment extends TmfEventProvider impl // Tracer.trace("Ctx: seekEvent(TS) - start"); if (timestamp == null) { - timestamp = TmfTimestamp.BigBang; + timestamp = TmfTimestamp.BIG_BANG; } // First, find the right checkpoint @@ -587,7 +587,7 @@ public class TmfExperiment extends TmfEventProvider impl return null; } int trace = TmfExperimentContext.NO_TRACE; - ITmfTimestamp timestamp = TmfTimestamp.BigCrunch; + ITmfTimestamp timestamp = TmfTimestamp.BIG_CRUNCH; if (eventArray.length == 1) { if (eventArray[0] != null) { timestamp = eventArray[0].getTimestamp(); @@ -680,7 +680,7 @@ public class TmfExperiment extends TmfEventProvider impl // Scan the candidate events and identify the "next" trace to read from int trace = TmfExperimentContext.NO_TRACE; - ITmfTimestamp timestamp = TmfTimestamp.BigCrunch; + ITmfTimestamp timestamp = TmfTimestamp.BIG_CRUNCH; for (int i = 0; i < expContext.getTraces().length; i++) { ITmfEvent event = expContext.getEvents()[i]; if (event != null && event.getTimestamp() != null) { @@ -727,7 +727,7 @@ public class TmfExperiment extends TmfEventProvider impl if (event == null) { return; } - TmfTimeRange timeRange = new TmfTimeRange(event.getTimestamp().clone(), TmfTimestamp.BigCrunch); + TmfTimeRange timeRange = new TmfTimeRange(event.getTimestamp().clone(), TmfTimestamp.BIG_CRUNCH); final TmfExperimentRangeUpdatedSignal signal = new TmfExperimentRangeUpdatedSignal(this, this, timeRange); // Broadcast in separate thread to prevent deadlock @@ -748,8 +748,8 @@ public class TmfExperiment extends TmfEventProvider impl public void run() { while (!fExecutor.isShutdown()) { if (!isIndexingBusy()) { - ITmfTimestamp startTimestamp = TmfTimestamp.BigCrunch; - ITmfTimestamp endTimestamp = TmfTimestamp.BigBang; + ITmfTimestamp startTimestamp = TmfTimestamp.BIG_CRUNCH; + ITmfTimestamp endTimestamp = TmfTimestamp.BIG_BANG; for (ITmfTrace trace : fTraces) { if (trace.getStartTime().compareTo(startTimestamp) < 0) { startTimestamp = trace.getStartTime(); @@ -805,7 +805,7 @@ public class TmfExperiment extends TmfEventProvider impl private static final int DEFAULT_INDEX_PAGE_SIZE = 5000; protected int fIndexPageSize; protected boolean fIndexing = false; - protected TmfTimeRange fIndexingPendingRange = TmfTimeRange.Null; + protected TmfTimeRange fIndexingPendingRange = TmfTimeRange.NULL_RANGE; private Integer fEndSynchReference; @@ -827,7 +827,7 @@ public class TmfExperiment extends TmfEventProvider impl } protected void indexExperiment(boolean waitForCompletion) { - indexExperiment(waitForCompletion, 0, TmfTimeRange.Eternity); + indexExperiment(waitForCompletion, 0, TmfTimeRange.ETERNITY); } @SuppressWarnings("unchecked") @@ -864,8 +864,8 @@ public class TmfExperiment extends TmfEventProvider impl // long indexingStart = System.nanoTime(); - ITmfTimestamp startTime = (fTimeRange == TmfTimeRange.Null) ? null : fTimeRange.getStartTime(); - ITmfTimestamp lastTime = (fTimeRange == TmfTimeRange.Null) ? null : fTimeRange.getEndTime(); + ITmfTimestamp startTime = (fTimeRange == TmfTimeRange.NULL_RANGE) ? null : fTimeRange.getStartTime(); + ITmfTimestamp lastTime = (fTimeRange == TmfTimeRange.NULL_RANGE) ? null : fTimeRange.getEndTime(); long initialNbEvents = fNbEvents; @Override @@ -891,7 +891,7 @@ public class TmfExperiment extends TmfEventProvider impl public void handleSuccess() { // long indexingEnd = System.nanoTime(); - if (getRange() != TmfTimeRange.Eternity) { + if (getRange() != TmfTimeRange.ETERNITY) { lastTime = getRange().getEndTime(); } updateExperiment(); @@ -911,9 +911,9 @@ public class TmfExperiment extends TmfEventProvider impl super.handleCompleted(); synchronized (fCheckpoints) { fIndexing = false; - if (fIndexingPendingRange != TmfTimeRange.Null) { + if (fIndexingPendingRange != TmfTimeRange.NULL_RANGE) { indexExperiment(false, (int) fNbEvents, fIndexingPendingRange); - fIndexingPendingRange = TmfTimeRange.Null; + fIndexingPendingRange = TmfTimeRange.NULL_RANGE; } } } @@ -985,7 +985,7 @@ public class TmfExperiment extends TmfEventProvider impl if (trace == signal.getTrace()) { synchronized (fCheckpoints) { if (fIndexing) { - if (fIndexingPendingRange == TmfTimeRange.Null) { + if (fIndexingPendingRange == TmfTimeRange.NULL_RANGE) { fIndexingPendingRange = signal.getRange(); } else { ITmfTimestamp startTime = fIndexingPendingRange.getStartTime(); 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 1b05a72a65..588a802e50 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 @@ -37,11 +37,11 @@ public class TmfCoalescedEventRequest extends TmfCoalescedD * @param range */ public TmfCoalescedEventRequest(Class dataType) { - this(dataType, TmfTimeRange.Eternity, ALL_DATA, DEFAULT_BLOCK_SIZE, ExecutionType.FOREGROUND); + this(dataType, TmfTimeRange.ETERNITY, ALL_DATA, DEFAULT_BLOCK_SIZE, ExecutionType.FOREGROUND); } public TmfCoalescedEventRequest(Class dataType, ExecutionType execType) { - this(dataType, TmfTimeRange.Eternity, ALL_DATA, DEFAULT_BLOCK_SIZE, execType); + this(dataType, TmfTimeRange.ETERNITY, ALL_DATA, DEFAULT_BLOCK_SIZE, execType); } /** 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 d4d1a89de9..e8ff77ae0f 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 @@ -36,11 +36,11 @@ public abstract class TmfEventRequest extends TmfDataReques * @param range */ public TmfEventRequest(Class dataType) { - this(dataType, TmfTimeRange.Eternity, 0, ALL_DATA, DEFAULT_BLOCK_SIZE, ExecutionType.FOREGROUND); + this(dataType, TmfTimeRange.ETERNITY, 0, ALL_DATA, DEFAULT_BLOCK_SIZE, ExecutionType.FOREGROUND); } public TmfEventRequest(Class dataType, ExecutionType execType) { - this(dataType, TmfTimeRange.Eternity, 0, ALL_DATA, DEFAULT_BLOCK_SIZE, execType); + this(dataType, TmfTimeRange.ETERNITY, 0, ALL_DATA, DEFAULT_BLOCK_SIZE, execType); } /** 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 4996cd1be4..caa07fca9c 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 @@ -82,8 +82,8 @@ public abstract class TmfTrace extends TmfEventProvider protected long fNbEvents = 0; // The time span of the event stream - private ITmfTimestamp fStartTime = TmfTimestamp.BigCrunch; - private ITmfTimestamp fEndTime = TmfTimestamp.BigBang; + private ITmfTimestamp fStartTime = TmfTimestamp.BIG_CRUNCH; + private ITmfTimestamp fEndTime = TmfTimestamp.BIG_BANG; // The trace resource private IResource fResource; @@ -290,7 +290,7 @@ public abstract class TmfTrace extends TmfEventProvider @Override public ITmfContext armRequest(ITmfDataRequest request) { if (request instanceof ITmfEventRequest - && !TmfTimestamp.BigBang.equals(((ITmfEventRequest) request).getRange().getStartTime()) && request.getIndex() == 0) { + && !TmfTimestamp.BIG_BANG.equals(((ITmfEventRequest) request).getRange().getStartTime()) && request.getIndex() == 0) { ITmfContext context = seekEvent(((ITmfEventRequest) request).getRange().getStartTime()); ((ITmfEventRequest) request).setStartIndex((int) context.getRank()); return context; @@ -327,7 +327,7 @@ public abstract class TmfTrace extends TmfEventProvider ITmfTimestamp timestamp = ts; if (timestamp == null) { - timestamp = TmfTimestamp.BigBang; + timestamp = TmfTimestamp.BIG_BANG; } // First, find the right checkpoint @@ -495,7 +495,7 @@ public abstract class TmfTrace extends TmfEventProvider job.schedule(); fCheckpoints.clear(); - ITmfEventRequest request = new TmfEventRequest(ITmfEvent.class, TmfTimeRange.Eternity, TmfDataRequest.ALL_DATA, + ITmfEventRequest request = new TmfEventRequest(ITmfEvent.class, TmfTimeRange.ETERNITY, TmfDataRequest.ALL_DATA, fIndexPageSize, ITmfDataRequest.ExecutionType.BACKGROUND) { ITmfTimestamp startTime = null; diff --git a/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/statistics/TmfBaseColumnDataProviderTest.java b/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/statistics/TmfBaseColumnDataProviderTest.java index 84f373965b..b11845ed24 100644 --- a/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/statistics/TmfBaseColumnDataProviderTest.java +++ b/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/statistics/TmfBaseColumnDataProviderTest.java @@ -87,13 +87,13 @@ public class TmfBaseColumnDataProviderTest extends TestCase { fTestName = name; - fContent1 = new TmfEventField(ITmfEventField.ROOT_ID, "Some content"); + fContent1 = new TmfEventField(ITmfEventField.ROOT_FIELD_ID, "Some content"); fEvent1 = new TmfEvent(null, fTimestamp1, fSource, fType1, fContent1, fReference); - fContent2 = new TmfEventField(ITmfEventField.ROOT_ID, "Some other content"); + fContent2 = new TmfEventField(ITmfEventField.ROOT_FIELD_ID, "Some other content"); fEvent2 = new TmfEvent(null, fTimestamp2, fSource, fType2, fContent2, fReference); - fContent3 = new TmfEventField(ITmfEventField.ROOT_ID, "Some other different content"); + fContent3 = new TmfEventField(ITmfEventField.ROOT_FIELD_ID, "Some other different content"); fEvent3 = new TmfEvent(null, fTimestamp3, fSource, fType3, fContent3, fReference); fStatsData = new TmfBaseStatisticsTree(); diff --git a/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/statistics/TmfBaseStatisticsDataTest.java b/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/statistics/TmfBaseStatisticsDataTest.java index 4f7dcec53d..9ab73f4152 100755 --- a/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/statistics/TmfBaseStatisticsDataTest.java +++ b/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/statistics/TmfBaseStatisticsDataTest.java @@ -84,13 +84,13 @@ public class TmfBaseStatisticsDataTest extends TestCase { fTestName = name; - fContent1 = new TmfEventField(ITmfEventField.ROOT_ID, "Some content"); + fContent1 = new TmfEventField(ITmfEventField.ROOT_FIELD_ID, "Some content"); fEvent1 = new TmfEvent(null, fTimestamp1, fSource, fType1, fContent1, fReference); - fContent2 = new TmfEventField(ITmfEventField.ROOT_ID, "Some other content"); + fContent2 = new TmfEventField(ITmfEventField.ROOT_FIELD_ID, "Some other content"); fEvent2 = new TmfEvent(null, fTimestamp2, fSource, fType2, fContent2, fReference); - fContent3 = new TmfEventField(ITmfEventField.ROOT_ID, "Some other different content"); + fContent3 = new TmfEventField(ITmfEventField.ROOT_FIELD_ID, "Some other different content"); fEvent3 = new TmfEvent(null, fTimestamp3, fSource, fType3, fContent3, fReference); fStatsData = new TmfBaseStatisticsTree(); diff --git a/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/statistics/TmfStatisticsTreeNodeTest.java b/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/statistics/TmfStatisticsTreeNodeTest.java index 3793d5136a..c7bda0c63b 100755 --- a/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/statistics/TmfStatisticsTreeNodeTest.java +++ b/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/statistics/TmfStatisticsTreeNodeTest.java @@ -85,13 +85,13 @@ public class TmfStatisticsTreeNodeTest extends TestCase { fTestName = name; - fContent1 = new TmfEventField(ITmfEventField.ROOT_ID, "Some content"); + fContent1 = new TmfEventField(ITmfEventField.ROOT_FIELD_ID, "Some content"); fEvent1 = new TmfEvent(null, fTimestamp1, fSource, fType1, fContent1, fReference); - fContent2 = new TmfEventField(ITmfEventField.ROOT_ID, "Some other content"); + fContent2 = new TmfEventField(ITmfEventField.ROOT_FIELD_ID, "Some other content"); fEvent2 = new TmfEvent(null, fTimestamp2, fSource, fType2, fContent2, fReference); - fContent3 = new TmfEventField(ITmfEventField.ROOT_ID, "Some other different content"); + fContent3 = new TmfEventField(ITmfEventField.ROOT_FIELD_ID, "Some other different content"); fEvent3 = new TmfEvent(null, fTimestamp3, fSource, fType3, fContent3, fReference); fStatsData = new TmfBaseStatisticsTree(); diff --git a/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/statistics/TmfTreeContentProviderTest.java b/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/statistics/TmfTreeContentProviderTest.java index f50fb8ed4d..54d97688f5 100755 --- a/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/statistics/TmfTreeContentProviderTest.java +++ b/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/statistics/TmfTreeContentProviderTest.java @@ -84,10 +84,10 @@ public class TmfTreeContentProviderTest extends TestCase { fTestName = name; - fContent1 = new TmfEventField(ITmfEventField.ROOT_ID, "Some content"); + fContent1 = new TmfEventField(ITmfEventField.ROOT_FIELD_ID, "Some content"); fEvent1 = new TmfEvent(null, fTimestamp1, fSource, fType1, fContent1, fReference); - fContent2 = new TmfEventField(ITmfEventField.ROOT_ID, "Some other content"); + fContent2 = new TmfEventField(ITmfEventField.ROOT_FIELD_ID, "Some other content"); fEvent2 = new TmfEvent(null, fTimestamp2, fSource, fType2, fContent2, fReference); fStatsData = new TmfBaseStatisticsTree(); diff --git a/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/views/uml2sd/impl/TmfUml2SDSyncLoaderFindTest.java b/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/views/uml2sd/impl/TmfUml2SDSyncLoaderFindTest.java index a3727b343f..b30de8aac2 100644 --- a/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/views/uml2sd/impl/TmfUml2SDSyncLoaderFindTest.java +++ b/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/views/uml2sd/impl/TmfUml2SDSyncLoaderFindTest.java @@ -210,7 +210,7 @@ public class TmfUml2SDSyncLoaderFindTest extends TestCase { // set expected values fTmfComponent.setSource(fFacility.getLoader()); fTmfComponent.setCurrentTime(TC_004_TIME_VALUE); - fTmfComponent.setCurrentRange(new TmfTimeRange(TmfTimestamp.BigBang, TmfTimestamp.BigCrunch)); // not used + fTmfComponent.setCurrentRange(new TmfTimeRange(TmfTimestamp.BIG_BANG, TmfTimestamp.BIG_CRUNCH)); // not used fTmfComponent.setSignalReceived(false); diff --git a/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/views/uml2sd/impl/TmfUml2SDSyncLoaderTimeTest.java b/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/views/uml2sd/impl/TmfUml2SDSyncLoaderTimeTest.java index 92a5ec8617..cfbc458ce1 100644 --- a/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/views/uml2sd/impl/TmfUml2SDSyncLoaderTimeTest.java +++ b/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/views/uml2sd/impl/TmfUml2SDSyncLoaderTimeTest.java @@ -189,7 +189,7 @@ public class TmfUml2SDSyncLoaderTimeTest extends TestCase { * Verified Methods: loader.syncToTime(), loader.moveToMessage(), loader.moveToPage() * Expected result: Move to first page, focus on the beginning of the page, but no selection. */ - fFacility.getTrace().broadcast(new TmfTimeSynchSignal(this, TmfTimestamp.BigBang)); + fFacility.getTrace().broadcast(new TmfTimeSynchSignal(this, TmfTimestamp.BIG_BANG)); fFacility.getLoader().waitForCompletion(); fFacility.delay(IUml2SDTestConstants.GUI_REFESH_DELAY); assertEquals("synchToTime", TC_004_PAGE_VALUE, fFacility.getLoader().currentPage()); @@ -203,7 +203,7 @@ public class TmfUml2SDSyncLoaderTimeTest extends TestCase { * Verified Methods: loader.syncToTime(), loader.moveToMessage(), loader.moveToPage() * Expected result: Move to last page, focus on the end of the page, but no selection. */ - fFacility.getTrace().broadcast(new TmfTimeSynchSignal(this, TmfTimestamp.BigCrunch)); + fFacility.getTrace().broadcast(new TmfTimeSynchSignal(this, TmfTimestamp.BIG_CRUNCH)); fFacility.getLoader().waitForCompletion(); fFacility.delay(IUml2SDTestConstants.GUI_REFESH_DELAY); assertEquals("synchToTime", TC_005_PAGE_VALUE, fFacility.getLoader().currentPage()); 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 db31e1b9da..98b6e6dc23 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 @@ -71,7 +71,7 @@ public class TmfUml2SDTestTrace implements ITmfEventParser { fields[1] = new TmfEventField("receiver", receiver); fields[2] = new TmfEventField("signal", signal); - ITmfEventField tmfContent = new TmfEventField(ITmfEventField.ROOT_ID, content, fields); + ITmfEventField tmfContent = new TmfEventField(ITmfEventField.ROOT_FIELD_ID, content, fields); TmfEvent tmfEvent = new TmfEvent(eventStream, new TmfTimestamp(ts, -9), source, tmfEventType, tmfContent, reference); return tmfEvent; diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomEvent.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomEvent.java index 8225017ba6..35cf5aa95e 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomEvent.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomEvent.java @@ -74,10 +74,10 @@ public class CustomEvent extends TmfEvent { date = dateFormat.parse(timeStampString); setTimestamp(new TmfTimestamp(date.getTime(), TIMESTAMP_SCALE)); } catch (ParseException e) { - setTimestamp(TmfTimestamp.Zero); + setTimestamp(TmfTimestamp.ZERO); } } else { - setTimestamp(TmfTimestamp.Zero); + setTimestamp(TmfTimestamp.ZERO); } int i = 0; diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomEventContent.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomEventContent.java index c08c4e62b5..79b1340f28 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomEventContent.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomEventContent.java @@ -8,7 +8,7 @@ public class CustomEventContent extends TmfEventField { CustomEvent fParent; public CustomEventContent(CustomEvent parent, String content) { - super(ITmfEventField.ROOT_ID, content); + super(ITmfEventField.ROOT_FIELD_ID, content); fParent = parent; } diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomEventType.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomEventType.java index b6f2093aad..146d745fa7 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomEventType.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomEventType.java @@ -17,7 +17,7 @@ public abstract class CustomEventType extends TmfEventType { for (int i = 0; i < fields.length; i++) { fields[i] = new TmfEventField(definition.outputs.get(i).name, null); } - ITmfEventField rootField = new TmfEventField(ITmfEventField.ROOT_ID, fields); + ITmfEventField rootField = new TmfEventField(ITmfEventField.ROOT_FIELD_ID, fields); return rootField; } diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomTxtTrace.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomTxtTrace.java index 5b3e893ac6..63f4876e09 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomTxtTrace.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomTxtTrace.java @@ -309,7 +309,7 @@ public class CustomTxtTrace extends TmfTrace { } public CustomTxtEvent parseFirstLine(CustomTxtTraceContext context) { - CustomTxtEvent event = new CustomTxtEvent(fDefinition, this, (TmfTimestamp) TmfTimestamp.Zero, "", fEventType, ""); //$NON-NLS-1$ //$NON-NLS-2$ + CustomTxtEvent event = new CustomTxtEvent(fDefinition, this, (TmfTimestamp) TmfTimestamp.ZERO, "", fEventType, ""); //$NON-NLS-1$ //$NON-NLS-2$ event.processGroups(context.inputLine, context.firstLineMatcher); event.setContent(new CustomEventContent(event, context.firstLine)); return event; diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomXmlTrace.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomXmlTrace.java index c7acbd76fc..5db3458595 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomXmlTrace.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomXmlTrace.java @@ -365,7 +365,7 @@ public class CustomXmlTrace extends TmfTrace { } public CustomXmlEvent extractEvent(Element element, InputElement inputElement) { - CustomXmlEvent event = new CustomXmlEvent(fDefinition, this, TmfTimestamp.Zero, "", fEventType,""); //$NON-NLS-1$ //$NON-NLS-2$ + CustomXmlEvent event = new CustomXmlEvent(fDefinition, this, TmfTimestamp.ZERO, "", fEventType,""); //$NON-NLS-1$ //$NON-NLS-2$ event.setContent(new CustomEventContent(event, new String())); parseElement(element, event, inputElement); return event; diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/events/TmfEventsTable.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/events/TmfEventsTable.java index 1e0a476624..0f38332777 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/events/TmfEventsTable.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/events/TmfEventsTable.java @@ -1060,7 +1060,7 @@ public class TmfEventsTable extends TmfComponent implements IGotoMarker, IColorS if (nbRequested <= 0) { return; } - request = new TmfEventRequest(TmfEvent.class, TmfTimeRange.Eternity, (int) fFilterCheckCount, + request = new TmfEventRequest(TmfEvent.class, TmfTimeRange.ETERNITY, (int) fFilterCheckCount, nbRequested, fTrace.getCacheSize(), ExecutionType.BACKGROUND) { @Override public void handleData(TmfEvent event) { diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/histogram/HistogramView.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/histogram/HistogramView.java index 346399e4a6..088a04930f 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/histogram/HistogramView.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/histogram/HistogramView.java @@ -266,7 +266,7 @@ public class HistogramView extends TmfView { public void updateCurrentEventTime(long newTime) { if (fCurrentExperiment != null) { - TmfTimeRange timeRange = new TmfTimeRange(new TmfTimestamp(newTime, TIME_SCALE), TmfTimestamp.BigCrunch); + TmfTimeRange timeRange = new TmfTimeRange(new TmfTimestamp(newTime, TIME_SCALE), TmfTimestamp.BIG_CRUNCH); HistogramRequest request = new HistogramRequest(fTimeRangeHistogram.getDataModel(), timeRange, 0, 1, ExecutionType.FOREGROUND) { @Override public void handleData(ITmfEvent event) { @@ -430,7 +430,7 @@ public class HistogramView extends TmfView { fCurrentTimestamp = 0; TmfTimeRange timeRange = fCurrentExperiment.getTimeRange(); - if (timeRange != TmfTimeRange.Null) { + if (timeRange != TmfTimeRange.NULL_RANGE) { fExperimentStartTime = timeRange.getStartTime().getValue(); fExperimentEndTime = timeRange.getEndTime().getValue(); fCurrentTimestamp = fExperimentStartTime; diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/core/BasicFrame.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/core/BasicFrame.java index 1dc7f2dd0e..f2fd9df41c 100755 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/core/BasicFrame.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/core/BasicFrame.java @@ -457,18 +457,18 @@ public class BasicFrame extends GraphNode { ITmfTimestamp delta = m2.getTime().getDelta(m1.getTime()); if (computeMinMax) { minTime = delta.clone(); - if (minTime.compareTo(TmfTimestamp.Zero, false) < 0) { + if (minTime.compareTo(TmfTimestamp.ZERO, false) < 0) { minTime = new TmfTimestamp(0, m1.getTime().getScale(), m1.getTime().getPrecision()); } maxTime = minTime.clone(); computeMinMax = false; } - if ((delta.compareTo(minTime, true) < 0) && (delta.compareTo(TmfTimestamp.Zero, false) > 0)) { + if ((delta.compareTo(minTime, true) < 0) && (delta.compareTo(TmfTimestamp.ZERO, false) > 0)) { minTime = delta.clone(); } - if ((delta.compareTo(maxTime, true) > 0) && (delta.compareTo(TmfTimestamp.Zero, false) > 0)) { + if ((delta.compareTo(maxTime, true) > 0) && (delta.compareTo(TmfTimestamp.ZERO, false) > 0)) { maxTime = delta.clone(); } } diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/impl/TmfUml2SDSyncLoader.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/impl/TmfUml2SDSyncLoader.java index a6f41c70c0..9bf1fe98e0 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/impl/TmfUml2SDSyncLoader.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/impl/TmfUml2SDSyncLoader.java @@ -174,7 +174,7 @@ public class TmfUml2SDSyncLoader extends TmfComponent implements IUml2SDLoader, } // TmfTimeRange window = getInitTRange(fExperiment.getTimeRange()); - TmfTimeRange window = TmfTimeRange.Eternity; + TmfTimeRange window = TmfTimeRange.ETERNITY; fIndexRequest = new TmfEventRequest(TmfEvent.class, window, TmfDataRequest.ALL_DATA, DEFAULT_BLOCK_SIZE, ITmfDataRequest.ExecutionType.BACKGROUND) { @@ -959,7 +959,7 @@ public class TmfUml2SDSyncLoader extends TmfComponent implements IUml2SDLoader, */ protected void moveToPage(boolean notifyAll) { - TmfTimeRange window = TmfTimeRange.Eternity; + TmfTimeRange window = TmfTimeRange.ETERNITY; fLock.lock(); try { -- 2.34.1