From a3db843673ea10a9737c80dce596836cf2128d28 Mon Sep 17 00:00:00 2001 From: Alexandre Montplaisir Date: Wed, 17 Jul 2013 17:33:35 -0400 Subject: [PATCH] tmf: Clean up tmf.core.trace package Move some notions out of this packages and into their own: - tmf.core.trace.indexer (for the ITmfTraceIndexer interface) - tmf.core.trace.indexer.checkpoint (for the checkpoint indexer) - tmf.core.trace.location (for ITmfLocation and its gang) This will prepare the grounds for the upcoming on-disk B-tree indexer. Change-Id: I48bee4b30ddd17d32f4d7373e6391c248a9687e9 Signed-off-by: Alexandre Montplaisir Reviewed-on: https://git.eclipse.org/r/14634 Tested-by: Hudson CI --- .../gdbtrace/core/trace/GdbTrace.java | 4 +-- .../tmf/core/tests/AllTmfCoreTests.java | 2 ++ .../tmf/core/tests/trace/AllTests.java | 9 +----- .../tmf/core/tests/trace/TmfContextTest.java | 5 ++-- .../core/tests/trace/TmfExperimentTest.java | 4 +-- .../trace/TmfMultiTraceExperimentTest.java | 2 +- .../tmf/core/tests/trace/TmfTraceTest.java | 4 +-- .../trace/indexer/checkpoint/AllTests.java | 28 +++++++++++++++++++ .../checkpoint}/TmfCheckpointIndexTest.java | 6 ++-- .../checkpoint}/TmfCheckpointIndexTest2.java | 6 ++-- .../checkpoint}/TmfCheckpointTest.java | 8 +++--- .../TmfExperimentCheckpointIndexTest.java | 6 ++-- .../core/tests/trace/location/AllTests.java | 27 ++++++++++++++++++ .../trace/{ => location}/TmfLocationTest.java | 8 +++--- .../{ => location}/TmfStringLocation.java | 4 +-- .../tests/stubs/trace/TmfEmptyTraceStub.java | 2 +- .../tmf/tests/stubs/trace/TmfIndexerStub.java | 4 +-- .../tmf/tests/stubs/trace/TmfTraceStub.java | 6 ++-- .../META-INF/MANIFEST.MF | 3 ++ .../tmf/core/trace/TmfExperimentLocation.java | 2 +- .../tmf/core/trace/TmfLocationArray.java | 2 +- .../tmf/core/ctfadaptor/CtfIterator.java | 3 +- .../tmf/core/ctfadaptor/CtfLocation.java | 2 +- .../tmf/core/ctfadaptor/CtfTmfContext.java | 8 +++++- .../tmf/core/ctfadaptor/CtfTmfTrace.java | 7 ++++- .../tmf/core/trace/ITmfContext.java | 4 +++ .../linuxtools/tmf/core/trace/ITmfTrace.java | 5 ++++ .../linuxtools/tmf/core/trace/TmfContext.java | 10 +++++++ .../tmf/core/trace/TmfExperiment.java | 11 ++++++++ .../linuxtools/tmf/core/trace/TmfTrace.java | 5 ++++ .../trace/{ => indexer}/ITmfTraceIndexer.java | 10 ++++--- .../checkpoint}/ITmfCheckpoint.java | 11 ++++---- .../checkpoint}/TmfCheckpoint.java | 11 ++++---- .../checkpoint}/TmfCheckpointIndexer.java | 14 ++++++---- .../trace/{ => location}/ITmfLocation.java | 4 +-- .../trace/{ => location}/TmfLocation.java | 4 +-- .../trace/{ => location}/TmfLongLocation.java | 5 ++-- .../{ => location}/TmfTimestampLocation.java | 4 +-- .../tmf/ui/parsers/custom/CustomTxtTrace.java | 6 ++-- .../parsers/custom/CustomTxtTraceContext.java | 2 +- .../tmf/ui/parsers/custom/CustomXmlTrace.java | 10 +++---- .../parsers/custom/CustomXmlTraceContext.java | 2 +- .../tmf/ui/viewers/events/TmfEventsTable.java | 2 +- .../widgets/rawviewer/TmfRawEventViewer.java | 2 +- 44 files changed, 197 insertions(+), 87 deletions(-) create mode 100644 org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/indexer/checkpoint/AllTests.java rename org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/{ => indexer/checkpoint}/TmfCheckpointIndexTest.java (97%) rename org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/{ => indexer/checkpoint}/TmfCheckpointIndexTest2.java (97%) rename org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/{ => indexer/checkpoint}/TmfCheckpointTest.java (97%) rename org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/{ => indexer/checkpoint}/TmfExperimentCheckpointIndexTest.java (97%) create mode 100644 org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/location/AllTests.java rename org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/{ => location}/TmfLocationTest.java (97%) rename org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/{ => location}/TmfStringLocation.java (89%) rename org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/{ => indexer}/ITmfTraceIndexer.java (95%) rename org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/{ => indexer/checkpoint}/ITmfCheckpoint.java (91%) rename org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/{ => indexer/checkpoint}/TmfCheckpoint.java (96%) rename org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/{ => indexer/checkpoint}/TmfCheckpointIndexer.java (97%) rename org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/{ => location}/ITmfLocation.java (94%) rename org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/{ => location}/TmfLocation.java (97%) rename org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/{ => location}/TmfLongLocation.java (94%) rename org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/{ => location}/TmfTimestampLocation.java (94%) diff --git a/org.eclipse.linuxtools.gdbtrace.core/src/org/eclipse/linuxtools/internal/gdbtrace/core/trace/GdbTrace.java b/org.eclipse.linuxtools.gdbtrace.core/src/org/eclipse/linuxtools/internal/gdbtrace/core/trace/GdbTrace.java index 9f49f3b68d..431930c33d 100644 --- a/org.eclipse.linuxtools.gdbtrace.core/src/org/eclipse/linuxtools/internal/gdbtrace/core/trace/GdbTrace.java +++ b/org.eclipse.linuxtools.gdbtrace.core/src/org/eclipse/linuxtools/internal/gdbtrace/core/trace/GdbTrace.java @@ -31,10 +31,10 @@ import org.eclipse.linuxtools.tmf.core.exceptions.TmfTraceException; import org.eclipse.linuxtools.tmf.core.timestamp.ITmfTimestamp; import org.eclipse.linuxtools.tmf.core.trace.ITmfContext; import org.eclipse.linuxtools.tmf.core.trace.ITmfEventParser; -import org.eclipse.linuxtools.tmf.core.trace.ITmfLocation; import org.eclipse.linuxtools.tmf.core.trace.TmfContext; -import org.eclipse.linuxtools.tmf.core.trace.TmfLongLocation; import org.eclipse.linuxtools.tmf.core.trace.TmfTrace; +import org.eclipse.linuxtools.tmf.core.trace.location.ITmfLocation; +import org.eclipse.linuxtools.tmf.core.trace.location.TmfLongLocation; /** * GDB Tracepoint extension of TmfTrace. This class implements the necessary diff --git a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/AllTmfCoreTests.java b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/AllTmfCoreTests.java index 7723e75a80..56ea7f2826 100644 --- a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/AllTmfCoreTests.java +++ b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/AllTmfCoreTests.java @@ -30,6 +30,8 @@ import org.junit.runners.Suite; org.eclipse.linuxtools.tmf.core.tests.statesystem.AllTests.class, org.eclipse.linuxtools.tmf.core.tests.statistics.AllTests.class, org.eclipse.linuxtools.tmf.core.tests.trace.AllTests.class, + org.eclipse.linuxtools.tmf.core.tests.trace.indexer.checkpoint.AllTests.class, + org.eclipse.linuxtools.tmf.core.tests.trace.location.AllTests.class, org.eclipse.linuxtools.tmf.core.tests.uml2sd.AllTests.class, org.eclipse.linuxtools.tmf.core.tests.util.AllTests.class }) diff --git a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/AllTests.java b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/AllTests.java index 52eb7f0000..8317efe92b 100644 --- a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/AllTests.java +++ b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/AllTests.java @@ -22,17 +22,10 @@ import org.junit.runners.Suite; */ @RunWith(Suite.class) @Suite.SuiteClasses({ - TmfCheckpointIndexTest.class, - TmfCheckpointIndexTest2.class, - TmfCheckpointTest.class, TmfContextTest.class, - TmfExperimentCheckpointIndexTest.class, TmfExperimentTest.class, - TmfLocationTest.class, TmfMultiTraceExperimentTest.class, TmfTraceManagerTest.class, TmfTraceTest.class }) -public class AllTests { - -} \ No newline at end of file +public class AllTests {} \ No newline at end of file diff --git a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/TmfContextTest.java b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/TmfContextTest.java index 17be19fe84..2703894525 100644 --- a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/TmfContextTest.java +++ b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/TmfContextTest.java @@ -20,11 +20,12 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; +import org.eclipse.linuxtools.tmf.core.tests.trace.location.TmfStringLocation; import org.eclipse.linuxtools.tmf.core.timestamp.TmfTimestamp; import org.eclipse.linuxtools.tmf.core.trace.ITmfContext; import org.eclipse.linuxtools.tmf.core.trace.TmfContext; -import org.eclipse.linuxtools.tmf.core.trace.TmfLongLocation; -import org.eclipse.linuxtools.tmf.core.trace.TmfTimestampLocation; +import org.eclipse.linuxtools.tmf.core.trace.location.TmfLongLocation; +import org.eclipse.linuxtools.tmf.core.trace.location.TmfTimestampLocation; import org.junit.Test; /** 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 3792321f59..23e7327c8b 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 @@ -42,10 +42,10 @@ import org.eclipse.linuxtools.tmf.core.tests.TmfCoreTestPlugin; import org.eclipse.linuxtools.tmf.core.timestamp.TmfTimeRange; import org.eclipse.linuxtools.tmf.core.timestamp.TmfTimestamp; import org.eclipse.linuxtools.tmf.core.trace.ITmfContext; -import org.eclipse.linuxtools.tmf.core.trace.ITmfLocation; import org.eclipse.linuxtools.tmf.core.trace.ITmfTrace; import org.eclipse.linuxtools.tmf.core.trace.TmfExperiment; -import org.eclipse.linuxtools.tmf.core.trace.TmfLongLocation; +import org.eclipse.linuxtools.tmf.core.trace.location.ITmfLocation; +import org.eclipse.linuxtools.tmf.core.trace.location.TmfLongLocation; import org.eclipse.linuxtools.tmf.tests.stubs.trace.TmfExperimentStub; import org.eclipse.linuxtools.tmf.tests.stubs.trace.TmfTraceStub; import org.junit.Before; diff --git a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/TmfMultiTraceExperimentTest.java b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/TmfMultiTraceExperimentTest.java index e04ff345d6..e497747249 100644 --- a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/TmfMultiTraceExperimentTest.java +++ b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/TmfMultiTraceExperimentTest.java @@ -39,8 +39,8 @@ import org.eclipse.linuxtools.tmf.core.timestamp.ITmfTimestamp; import org.eclipse.linuxtools.tmf.core.timestamp.TmfTimeRange; import org.eclipse.linuxtools.tmf.core.timestamp.TmfTimestamp; import org.eclipse.linuxtools.tmf.core.trace.ITmfContext; -import org.eclipse.linuxtools.tmf.core.trace.ITmfLocation; import org.eclipse.linuxtools.tmf.core.trace.ITmfTrace; +import org.eclipse.linuxtools.tmf.core.trace.location.ITmfLocation; import org.eclipse.linuxtools.tmf.tests.stubs.trace.TmfExperimentStub; import org.eclipse.linuxtools.tmf.tests.stubs.trace.TmfTraceStub; import org.junit.AfterClass; 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 c5303c17ec..6547f0f637 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 @@ -43,10 +43,10 @@ import org.eclipse.linuxtools.tmf.core.timestamp.ITmfTimestamp; import org.eclipse.linuxtools.tmf.core.timestamp.TmfTimeRange; import org.eclipse.linuxtools.tmf.core.timestamp.TmfTimestamp; import org.eclipse.linuxtools.tmf.core.trace.ITmfContext; -import org.eclipse.linuxtools.tmf.core.trace.ITmfLocation; import org.eclipse.linuxtools.tmf.core.trace.ITmfTrace; -import org.eclipse.linuxtools.tmf.core.trace.TmfCheckpointIndexer; import org.eclipse.linuxtools.tmf.core.trace.TmfContext; +import org.eclipse.linuxtools.tmf.core.trace.indexer.checkpoint.TmfCheckpointIndexer; +import org.eclipse.linuxtools.tmf.core.trace.location.ITmfLocation; import org.eclipse.linuxtools.tmf.tests.stubs.trace.TmfTraceStub; import org.junit.After; import org.junit.Before; diff --git a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/indexer/checkpoint/AllTests.java b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/indexer/checkpoint/AllTests.java new file mode 100644 index 0000000000..0c5856ac8b --- /dev/null +++ b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/indexer/checkpoint/AllTests.java @@ -0,0 +1,28 @@ +/******************************************************************************* + * Copyright (c) 2013 Ericsson + * + * All rights reserved. This program and the accompanying materials are + * made available under the terms of the Eclipse Public License v1.0 which + * accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Alexandre Montplaisir - Initial API and implementation + *******************************************************************************/ + +package org.eclipse.linuxtools.tmf.core.tests.trace.indexer.checkpoint; + +import org.junit.runner.RunWith; +import org.junit.runners.Suite; + +/** + * Test suite for org.eclipse.linuxtools.tmf.core.trace.indexer.checkpoint + */ +@RunWith(Suite.class) +@Suite.SuiteClasses({ + TmfCheckpointIndexTest.class, + TmfCheckpointIndexTest2.class, + TmfCheckpointTest.class, + TmfExperimentCheckpointIndexTest.class, +}) +public class AllTests {} \ No newline at end of file diff --git a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/TmfCheckpointIndexTest.java b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/indexer/checkpoint/TmfCheckpointIndexTest.java similarity index 97% rename from org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/TmfCheckpointIndexTest.java rename to org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/indexer/checkpoint/TmfCheckpointIndexTest.java index c727241a7b..1cd80db103 100644 --- a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/TmfCheckpointIndexTest.java +++ b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/indexer/checkpoint/TmfCheckpointIndexTest.java @@ -12,7 +12,7 @@ * Alexandre Montplaisir - Port to JUnit4 *******************************************************************************/ -package org.eclipse.linuxtools.tmf.core.tests.trace; +package org.eclipse.linuxtools.tmf.core.tests.trace.indexer.checkpoint; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -29,10 +29,10 @@ import org.eclipse.linuxtools.tmf.core.event.ITmfEvent; import org.eclipse.linuxtools.tmf.core.exceptions.TmfTraceException; import org.eclipse.linuxtools.tmf.core.tests.TmfCoreTestPlugin; import org.eclipse.linuxtools.tmf.core.timestamp.TmfTimestamp; -import org.eclipse.linuxtools.tmf.core.trace.ITmfCheckpoint; import org.eclipse.linuxtools.tmf.core.trace.ITmfTrace; -import org.eclipse.linuxtools.tmf.core.trace.TmfCheckpointIndexer; import org.eclipse.linuxtools.tmf.core.trace.TmfContext; +import org.eclipse.linuxtools.tmf.core.trace.indexer.checkpoint.TmfCheckpointIndexer; +import org.eclipse.linuxtools.tmf.core.trace.indexer.checkpoint.ITmfCheckpoint; import org.eclipse.linuxtools.tmf.tests.stubs.trace.TmfEmptyTraceStub; import org.eclipse.linuxtools.tmf.tests.stubs.trace.TmfTraceStub; import org.junit.After; diff --git a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/TmfCheckpointIndexTest2.java b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/indexer/checkpoint/TmfCheckpointIndexTest2.java similarity index 97% rename from org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/TmfCheckpointIndexTest2.java rename to org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/indexer/checkpoint/TmfCheckpointIndexTest2.java index fd150ca45a..4d1460339e 100644 --- a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/TmfCheckpointIndexTest2.java +++ b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/indexer/checkpoint/TmfCheckpointIndexTest2.java @@ -11,7 +11,7 @@ * Alexandre Montplaisir - Port to JUnit4 *******************************************************************************/ -package org.eclipse.linuxtools.tmf.core.tests.trace; +package org.eclipse.linuxtools.tmf.core.tests.trace.indexer.checkpoint; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; @@ -29,9 +29,9 @@ import org.eclipse.linuxtools.tmf.core.event.ITmfEvent; import org.eclipse.linuxtools.tmf.core.exceptions.TmfTraceException; import org.eclipse.linuxtools.tmf.core.tests.TmfCoreTestPlugin; import org.eclipse.linuxtools.tmf.core.timestamp.TmfTimestamp; -import org.eclipse.linuxtools.tmf.core.trace.ITmfCheckpoint; import org.eclipse.linuxtools.tmf.core.trace.ITmfContext; -import org.eclipse.linuxtools.tmf.core.trace.TmfCheckpointIndexer; +import org.eclipse.linuxtools.tmf.core.trace.indexer.checkpoint.TmfCheckpointIndexer; +import org.eclipse.linuxtools.tmf.core.trace.indexer.checkpoint.ITmfCheckpoint; import org.eclipse.linuxtools.tmf.tests.stubs.trace.TmfEmptyTraceStub; import org.eclipse.linuxtools.tmf.tests.stubs.trace.TmfTraceStub; import org.junit.After; 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/indexer/checkpoint/TmfCheckpointTest.java similarity index 97% rename from org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/TmfCheckpointTest.java rename to org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/indexer/checkpoint/TmfCheckpointTest.java index ce862927df..cb0871cd1f 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/indexer/checkpoint/TmfCheckpointTest.java @@ -13,7 +13,7 @@ * Patrick Tasse - Updated for location in checkpoint *******************************************************************************/ -package org.eclipse.linuxtools.tmf.core.tests.trace; +package org.eclipse.linuxtools.tmf.core.tests.trace.indexer.checkpoint; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -22,9 +22,9 @@ import static org.junit.Assert.fail; import org.eclipse.linuxtools.tmf.core.timestamp.ITmfTimestamp; import org.eclipse.linuxtools.tmf.core.timestamp.TmfTimestamp; -import org.eclipse.linuxtools.tmf.core.trace.ITmfLocation; -import org.eclipse.linuxtools.tmf.core.trace.TmfCheckpoint; -import org.eclipse.linuxtools.tmf.core.trace.TmfLongLocation; +import org.eclipse.linuxtools.tmf.core.trace.indexer.checkpoint.TmfCheckpoint; +import org.eclipse.linuxtools.tmf.core.trace.location.ITmfLocation; +import org.eclipse.linuxtools.tmf.core.trace.location.TmfLongLocation; import org.junit.Test; /** diff --git a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/TmfExperimentCheckpointIndexTest.java b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/indexer/checkpoint/TmfExperimentCheckpointIndexTest.java similarity index 97% rename from org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/TmfExperimentCheckpointIndexTest.java rename to org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/indexer/checkpoint/TmfExperimentCheckpointIndexTest.java index 1ca14b0d58..3352aea5b9 100644 --- a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/TmfExperimentCheckpointIndexTest.java +++ b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/indexer/checkpoint/TmfExperimentCheckpointIndexTest.java @@ -12,7 +12,7 @@ * Patrick Tasse - Updated for ranks in experiment location *******************************************************************************/ -package org.eclipse.linuxtools.tmf.core.tests.trace; +package org.eclipse.linuxtools.tmf.core.tests.trace.indexer.checkpoint; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -30,10 +30,10 @@ import org.eclipse.linuxtools.tmf.core.exceptions.TmfTraceException; import org.eclipse.linuxtools.tmf.core.tests.TmfCoreTestPlugin; import org.eclipse.linuxtools.tmf.core.timestamp.TmfTimeRange; import org.eclipse.linuxtools.tmf.core.timestamp.TmfTimestamp; -import org.eclipse.linuxtools.tmf.core.trace.ITmfCheckpoint; import org.eclipse.linuxtools.tmf.core.trace.ITmfContext; -import org.eclipse.linuxtools.tmf.core.trace.ITmfLocation; import org.eclipse.linuxtools.tmf.core.trace.ITmfTrace; +import org.eclipse.linuxtools.tmf.core.trace.indexer.checkpoint.ITmfCheckpoint; +import org.eclipse.linuxtools.tmf.core.trace.location.ITmfLocation; import org.eclipse.linuxtools.tmf.tests.stubs.trace.TmfExperimentStub; import org.eclipse.linuxtools.tmf.tests.stubs.trace.TmfTraceStub; import org.junit.After; diff --git a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/location/AllTests.java b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/location/AllTests.java new file mode 100644 index 0000000000..3593f4caaa --- /dev/null +++ b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/location/AllTests.java @@ -0,0 +1,27 @@ +/******************************************************************************* + * Copyright (c) 2009, 2013 Ericsson + * + * All rights reserved. This program and the accompanying materials are + * made available under the terms of the Eclipse Public License v1.0 which + * accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Francois Chouinard - Initial API and implementation + * Francois Chouinard - Adjusted for new Trace Model + * Alexandre Montplaisir - Port to JUnit4 + *******************************************************************************/ + +package org.eclipse.linuxtools.tmf.core.tests.trace.location; + +import org.junit.runner.RunWith; +import org.junit.runners.Suite; + +/** + * Test suite for org.eclipse.linuxtools.tmf.core.trace.location + */ +@RunWith(Suite.class) +@Suite.SuiteClasses({ + TmfLocationTest.class, +}) +public class AllTests {} \ No newline at end of file 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/location/TmfLocationTest.java similarity index 97% rename from org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/TmfLocationTest.java rename to org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/location/TmfLocationTest.java index 82ff2679e8..a7c51d1c90 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/location/TmfLocationTest.java @@ -12,7 +12,7 @@ * Patrick Tasse - Add tests for TmfExperimentLocation *******************************************************************************/ -package org.eclipse.linuxtools.tmf.core.tests.trace; +package org.eclipse.linuxtools.tmf.core.tests.trace.location; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -22,9 +22,9 @@ import static org.junit.Assert.assertTrue; import org.eclipse.linuxtools.internal.tmf.core.trace.TmfExperimentLocation; import org.eclipse.linuxtools.internal.tmf.core.trace.TmfLocationArray; import org.eclipse.linuxtools.tmf.core.timestamp.TmfTimestamp; -import org.eclipse.linuxtools.tmf.core.trace.ITmfLocation; -import org.eclipse.linuxtools.tmf.core.trace.TmfLongLocation; -import org.eclipse.linuxtools.tmf.core.trace.TmfTimestampLocation; +import org.eclipse.linuxtools.tmf.core.trace.location.ITmfLocation; +import org.eclipse.linuxtools.tmf.core.trace.location.TmfLongLocation; +import org.eclipse.linuxtools.tmf.core.trace.location.TmfTimestampLocation; import org.junit.Before; import org.junit.Test; diff --git a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/TmfStringLocation.java b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/location/TmfStringLocation.java similarity index 89% rename from org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/TmfStringLocation.java rename to org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/location/TmfStringLocation.java index aa707fb431..fad258f498 100644 --- a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/TmfStringLocation.java +++ b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/location/TmfStringLocation.java @@ -10,9 +10,9 @@ * Francois Chouinard - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.tmf.core.tests.trace; +package org.eclipse.linuxtools.tmf.core.tests.trace.location; -import org.eclipse.linuxtools.tmf.core.trace.TmfLocation; +import org.eclipse.linuxtools.tmf.core.trace.location.TmfLocation; /** * TmfStringLocation diff --git a/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/trace/TmfEmptyTraceStub.java b/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/trace/TmfEmptyTraceStub.java index 9c9e321071..3a5df51e06 100644 --- a/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/trace/TmfEmptyTraceStub.java +++ b/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/trace/TmfEmptyTraceStub.java @@ -14,8 +14,8 @@ package org.eclipse.linuxtools.tmf.tests.stubs.trace; import org.eclipse.linuxtools.tmf.core.event.ITmfEvent; import org.eclipse.linuxtools.tmf.core.trace.ITmfContext; -import org.eclipse.linuxtools.tmf.core.trace.ITmfLocation; import org.eclipse.linuxtools.tmf.core.trace.TmfContext; +import org.eclipse.linuxtools.tmf.core.trace.location.ITmfLocation; /** * TmfEmptyTraceStub diff --git a/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/trace/TmfIndexerStub.java b/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/trace/TmfIndexerStub.java index 1812d938f3..a633f36b0a 100644 --- a/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/trace/TmfIndexerStub.java +++ b/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/trace/TmfIndexerStub.java @@ -14,9 +14,9 @@ package org.eclipse.linuxtools.tmf.tests.stubs.trace; import java.util.List; -import org.eclipse.linuxtools.tmf.core.trace.ITmfCheckpoint; import org.eclipse.linuxtools.tmf.core.trace.ITmfTrace; -import org.eclipse.linuxtools.tmf.core.trace.TmfCheckpointIndexer; +import org.eclipse.linuxtools.tmf.core.trace.indexer.checkpoint.TmfCheckpointIndexer; +import org.eclipse.linuxtools.tmf.core.trace.indexer.checkpoint.ITmfCheckpoint; /** * TmfIndexerStub diff --git a/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/trace/TmfTraceStub.java b/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/trace/TmfTraceStub.java index bac3cf0e54..8b7b430fca 100644 --- a/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/trace/TmfTraceStub.java +++ b/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/trace/TmfTraceStub.java @@ -29,12 +29,12 @@ import org.eclipse.linuxtools.tmf.core.timestamp.ITmfTimestamp; import org.eclipse.linuxtools.tmf.core.timestamp.TmfTimeRange; import org.eclipse.linuxtools.tmf.core.trace.ITmfContext; import org.eclipse.linuxtools.tmf.core.trace.ITmfEventParser; -import org.eclipse.linuxtools.tmf.core.trace.ITmfLocation; import org.eclipse.linuxtools.tmf.core.trace.ITmfTrace; -import org.eclipse.linuxtools.tmf.core.trace.ITmfTraceIndexer; import org.eclipse.linuxtools.tmf.core.trace.TmfContext; -import org.eclipse.linuxtools.tmf.core.trace.TmfLongLocation; import org.eclipse.linuxtools.tmf.core.trace.TmfTrace; +import org.eclipse.linuxtools.tmf.core.trace.indexer.ITmfTraceIndexer; +import org.eclipse.linuxtools.tmf.core.trace.location.ITmfLocation; +import org.eclipse.linuxtools.tmf.core.trace.location.TmfLongLocation; /** * TmfTraceStub diff --git a/org.eclipse.linuxtools.tmf.core/META-INF/MANIFEST.MF b/org.eclipse.linuxtools.tmf.core/META-INF/MANIFEST.MF index 0e3c67c948..4364e38caa 100644 --- a/org.eclipse.linuxtools.tmf.core/META-INF/MANIFEST.MF +++ b/org.eclipse.linuxtools.tmf.core/META-INF/MANIFEST.MF @@ -38,5 +38,8 @@ Export-Package: org.eclipse.linuxtools.internal.tmf.core;x-friends:="org.eclipse org.eclipse.linuxtools.tmf.core.statistics, org.eclipse.linuxtools.tmf.core.timestamp, org.eclipse.linuxtools.tmf.core.trace, + org.eclipse.linuxtools.tmf.core.trace.indexer, + org.eclipse.linuxtools.tmf.core.trace.indexer.checkpoint, + org.eclipse.linuxtools.tmf.core.trace.location, org.eclipse.linuxtools.tmf.core.uml2sd, org.eclipse.linuxtools.tmf.core.util diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/internal/tmf/core/trace/TmfExperimentLocation.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/internal/tmf/core/trace/TmfExperimentLocation.java index 459493b315..bbd7b650df 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/internal/tmf/core/trace/TmfExperimentLocation.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/internal/tmf/core/trace/TmfExperimentLocation.java @@ -14,7 +14,7 @@ package org.eclipse.linuxtools.internal.tmf.core.trace; -import org.eclipse.linuxtools.tmf.core.trace.ITmfLocation; +import org.eclipse.linuxtools.tmf.core.trace.location.ITmfLocation; /** diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/internal/tmf/core/trace/TmfLocationArray.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/internal/tmf/core/trace/TmfLocationArray.java index 13deef2d00..d0f5c38b6e 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/internal/tmf/core/trace/TmfLocationArray.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/internal/tmf/core/trace/TmfLocationArray.java @@ -16,7 +16,7 @@ package org.eclipse.linuxtools.internal.tmf.core.trace; import java.util.Arrays; -import org.eclipse.linuxtools.tmf.core.trace.ITmfLocation; +import org.eclipse.linuxtools.tmf.core.trace.location.ITmfLocation; /** diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/ctfadaptor/CtfIterator.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/ctfadaptor/CtfIterator.java index 8311e7acb8..9635d55a68 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/ctfadaptor/CtfIterator.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/ctfadaptor/CtfIterator.java @@ -13,7 +13,7 @@ package org.eclipse.linuxtools.tmf.core.ctfadaptor; import org.eclipse.linuxtools.ctf.core.trace.CTFTraceReader; import org.eclipse.linuxtools.ctf.core.trace.StreamInputReader; import org.eclipse.linuxtools.tmf.core.trace.ITmfContext; -import org.eclipse.linuxtools.tmf.core.trace.ITmfLocation; +import org.eclipse.linuxtools.tmf.core.trace.location.ITmfLocation; /** * The CTF trace reader iterator. @@ -202,6 +202,7 @@ public class CtfIterator extends CTFTraceReader implements ITmfContext, /** * Method setLocation. * @param location ITmfLocation + * @since 3.0 */ @Override public void setLocation(final ITmfLocation location) { diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/ctfadaptor/CtfLocation.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/ctfadaptor/CtfLocation.java index 6cb87d918f..b310f822c8 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/ctfadaptor/CtfLocation.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/ctfadaptor/CtfLocation.java @@ -13,7 +13,7 @@ package org.eclipse.linuxtools.tmf.core.ctfadaptor; import org.eclipse.linuxtools.tmf.core.timestamp.ITmfTimestamp; -import org.eclipse.linuxtools.tmf.core.trace.TmfLocation; +import org.eclipse.linuxtools.tmf.core.trace.location.TmfLocation; /** * The nugget of information that is unique to a location in a CTF trace. diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/ctfadaptor/CtfTmfContext.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/ctfadaptor/CtfTmfContext.java index b1ef6d7955..50278cbba4 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/ctfadaptor/CtfTmfContext.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/ctfadaptor/CtfTmfContext.java @@ -12,7 +12,7 @@ package org.eclipse.linuxtools.tmf.core.ctfadaptor; import org.eclipse.linuxtools.tmf.core.trace.ITmfContext; -import org.eclipse.linuxtools.tmf.core.trace.ITmfLocation; +import org.eclipse.linuxtools.tmf.core.trace.location.ITmfLocation; /** * Lightweight Context for CtfTmf traces. Should only use 3 references, 1 ref to @@ -58,6 +58,9 @@ public class CtfTmfContext implements ITmfContext { return curRank; } + /** + * @since 3.0 + */ @Override public ITmfLocation getLocation() { return curLocation; @@ -68,6 +71,9 @@ public class CtfTmfContext implements ITmfContext { return curRank != CtfLocation.INVALID_LOCATION.getTimestamp(); } + /** + * @since 3.0 + */ @Override public void setLocation(ITmfLocation location) { curLocation = (CtfLocation) location; diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/ctfadaptor/CtfTmfTrace.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/ctfadaptor/CtfTmfTrace.java index 89151ee3db..844052beb2 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/ctfadaptor/CtfTmfTrace.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/ctfadaptor/CtfTmfTrace.java @@ -33,9 +33,9 @@ import org.eclipse.linuxtools.tmf.core.timestamp.ITmfTimestamp; import org.eclipse.linuxtools.tmf.core.timestamp.TmfTimestamp; import org.eclipse.linuxtools.tmf.core.trace.ITmfContext; import org.eclipse.linuxtools.tmf.core.trace.ITmfEventParser; -import org.eclipse.linuxtools.tmf.core.trace.ITmfLocation; import org.eclipse.linuxtools.tmf.core.trace.ITmfTraceProperties; import org.eclipse.linuxtools.tmf.core.trace.TmfTrace; +import org.eclipse.linuxtools.tmf.core.trace.location.ITmfLocation; /** * The CTf trace handler @@ -173,12 +173,16 @@ public class CtfTmfTrace extends TmfTrace * * @return null, since the trace has no knowledge of the current location * @see org.eclipse.linuxtools.tmf.core.trace.ITmfTrace#getCurrentLocation() + * @since 3.0 */ @Override public ITmfLocation getCurrentLocation() { return null; } + /** + * @since 3.0 + */ @Override public double getLocationRatio(ITmfLocation location) { final CtfLocation curLocation = (CtfLocation) location; @@ -198,6 +202,7 @@ public class CtfTmfTrace extends TmfTrace * @param location * ITmfLocation * @return ITmfContext + * @since 3.0 */ @Override public synchronized ITmfContext seekEvent(final ITmfLocation location) { diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/ITmfContext.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/ITmfContext.java index 5413d9b8da..f3b526e117 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/ITmfContext.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/ITmfContext.java @@ -14,6 +14,8 @@ package org.eclipse.linuxtools.tmf.core.trace; +import org.eclipse.linuxtools.tmf.core.trace.location.ITmfLocation; + /** * The basic trace context structure in TMF. The purpose of the context is to * associate a trace location to an event at a specific rank (order). @@ -49,6 +51,7 @@ public interface ITmfContext { /** * @return the location of the event at the context rank + * @since 3.0 */ ITmfLocation getLocation(); @@ -63,6 +66,7 @@ public interface ITmfContext { /** * @param location the new location + * @since 3.0 */ void setLocation(ITmfLocation location); diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/ITmfTrace.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/ITmfTrace.java index 1e680af5c2..6abe83791b 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/ITmfTrace.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/ITmfTrace.java @@ -26,6 +26,8 @@ import org.eclipse.linuxtools.tmf.core.statesystem.ITmfStateSystem; import org.eclipse.linuxtools.tmf.core.statistics.ITmfStatistics; import org.eclipse.linuxtools.tmf.core.timestamp.ITmfTimestamp; import org.eclipse.linuxtools.tmf.core.timestamp.TmfTimeRange; +import org.eclipse.linuxtools.tmf.core.trace.indexer.ITmfTraceIndexer; +import org.eclipse.linuxtools.tmf.core.trace.location.ITmfLocation; /** * The event stream structure in TMF. In its basic form, a trace has: @@ -259,6 +261,7 @@ public interface ITmfTrace extends ITmfDataProvider { /** * @return the current trace location + * @since 3.0 */ ITmfLocation getCurrentLocation(); @@ -267,6 +270,7 @@ public interface ITmfTrace extends ITmfDataProvider { * * @param location a trace specific location * @return a floating-point number between 0.0 (beginning) and 1.0 (end) + * @since 3.0 */ double getLocationRatio(ITmfLocation location); @@ -285,6 +289,7 @@ public interface ITmfTrace extends ITmfDataProvider { *

* @param location the trace specific location * @return a context which can later be used to read the corresponding event + * @since 3.0 */ ITmfContext seekEvent(ITmfLocation location); diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/TmfContext.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/TmfContext.java index 96a5b93c15..3b55ebe1ec 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/TmfContext.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/TmfContext.java @@ -14,6 +14,8 @@ package org.eclipse.linuxtools.tmf.core.trace; +import org.eclipse.linuxtools.tmf.core.trace.location.ITmfLocation; + /** * A basic implementation of ITmfContext. *

@@ -52,6 +54,7 @@ public class TmfContext implements ITmfContext { * Simple constructor (unknown rank) * * @param location the event location + * @since 3.0 */ public TmfContext(final ITmfLocation location) { this(location, UNKNOWN_RANK); @@ -62,6 +65,7 @@ public class TmfContext implements ITmfContext { * * @param location the event location * @param rank the event rank + * @since 3.0 */ public TmfContext(final ITmfLocation location, final long rank) { fLocation = location; @@ -85,11 +89,17 @@ public class TmfContext implements ITmfContext { // ITmfContext // ------------------------------------------------------------------------ + /** + * @since 3.0 + */ @Override public ITmfLocation getLocation() { return fLocation; } + /** + * @since 3.0 + */ @Override public void setLocation(final ITmfLocation location) { fLocation = location; diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/TmfExperiment.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/TmfExperiment.java index fd36a951c8..8ecd7ed5da 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/TmfExperiment.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/TmfExperiment.java @@ -33,6 +33,8 @@ import org.eclipse.linuxtools.tmf.core.signal.TmfTraceRangeUpdatedSignal; import org.eclipse.linuxtools.tmf.core.timestamp.ITmfTimestamp; import org.eclipse.linuxtools.tmf.core.timestamp.TmfTimeRange; import org.eclipse.linuxtools.tmf.core.timestamp.TmfTimestamp; +import org.eclipse.linuxtools.tmf.core.trace.indexer.checkpoint.TmfCheckpointIndexer; +import org.eclipse.linuxtools.tmf.core.trace.location.ITmfLocation; /** * TmfExperiment presents a time-ordered, unified view of a set of ITmfTrace:s @@ -254,6 +256,9 @@ public class TmfExperiment extends TmfTrace implements ITmfEventParser { // ITmfTrace trace positioning // ------------------------------------------------------------------------ + /** + * @since 3.0 + */ @Override public synchronized ITmfContext seekEvent(final ITmfLocation location) { // Validate the location @@ -306,6 +311,9 @@ public class TmfExperiment extends TmfTrace implements ITmfEventParser { return context; } + /** + * @since 3.0 + */ @Override public double getLocationRatio(final ITmfLocation location) { if (location instanceof TmfExperimentLocation) { @@ -319,6 +327,9 @@ public class TmfExperiment extends TmfTrace implements ITmfEventParser { return 0.0; } + /** + * @since 3.0 + */ @Override public ITmfLocation getCurrentLocation() { // never used 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 65b871a50a..817d852547 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 @@ -41,6 +41,9 @@ import org.eclipse.linuxtools.tmf.core.statistics.TmfStateStatistics; import org.eclipse.linuxtools.tmf.core.timestamp.ITmfTimestamp; import org.eclipse.linuxtools.tmf.core.timestamp.TmfTimeRange; import org.eclipse.linuxtools.tmf.core.timestamp.TmfTimestamp; +import org.eclipse.linuxtools.tmf.core.trace.indexer.ITmfTraceIndexer; +import org.eclipse.linuxtools.tmf.core.trace.indexer.checkpoint.TmfCheckpointIndexer; +import org.eclipse.linuxtools.tmf.core.trace.location.ITmfLocation; /** * Abstract implementation of ITmfTrace. @@ -340,6 +343,7 @@ public abstract class TmfTrace extends TmfEventProvider implements ITmfTrace { /** * @return the trace indexer + * @since 3.0 */ protected ITmfTraceIndexer getIndexer() { return fIndexer; @@ -493,6 +497,7 @@ public abstract class TmfTrace extends TmfEventProvider implements ITmfTrace { * Set the trace indexer. Must be done at initialization time. * * @param indexer the trace indexer + * @since 3.0 */ protected void setIndexer(final ITmfTraceIndexer indexer) { fIndexer = indexer; diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/ITmfTraceIndexer.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/indexer/ITmfTraceIndexer.java similarity index 95% rename from org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/ITmfTraceIndexer.java rename to org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/indexer/ITmfTraceIndexer.java index a36b3e039a..3f279480e6 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/ITmfTraceIndexer.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/indexer/ITmfTraceIndexer.java @@ -10,20 +10,22 @@ * Francois Chouinard - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.tmf.core.trace; +package org.eclipse.linuxtools.tmf.core.trace.indexer; import org.eclipse.linuxtools.tmf.core.event.ITmfEvent; import org.eclipse.linuxtools.tmf.core.timestamp.ITmfTimestamp; import org.eclipse.linuxtools.tmf.core.timestamp.TmfTimeRange; +import org.eclipse.linuxtools.tmf.core.trace.ITmfContext; +import org.eclipse.linuxtools.tmf.core.trace.ITmfTrace; /** * The generic trace indexer in TMF with support for incremental indexing. * - * @version 1.0 - * @author Francois Chouinard - * * @see ITmfTrace * @see ITmfEvent + * + * @author Francois Chouinard + * @since 3.0 */ public interface ITmfTraceIndexer { diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/ITmfCheckpoint.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/indexer/checkpoint/ITmfCheckpoint.java similarity index 91% rename from org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/ITmfCheckpoint.java rename to org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/indexer/checkpoint/ITmfCheckpoint.java index e2e4e1be2f..9dcb499b07 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/ITmfCheckpoint.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/indexer/checkpoint/ITmfCheckpoint.java @@ -11,19 +11,20 @@ * Patrick Tasse - Updated for location in checkpoint *******************************************************************************/ -package org.eclipse.linuxtools.tmf.core.trace; +package org.eclipse.linuxtools.tmf.core.trace.indexer.checkpoint; import org.eclipse.linuxtools.tmf.core.timestamp.ITmfTimestamp; +import org.eclipse.linuxtools.tmf.core.trace.location.ITmfLocation; /** * The basic trace checkpoint structure in TMF. The purpose of the checkpoint is * to associate a trace location to an event timestamp. - * - * @version 1.0 - * @author Francois Chouinard - * + * * * @see ITmfTimestamp * @see ITmfLocation + * + * @author Francois Chouinard + * @since 3.0 */ public interface ITmfCheckpoint extends Comparable { diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/TmfCheckpoint.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/indexer/checkpoint/TmfCheckpoint.java similarity index 96% rename from org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/TmfCheckpoint.java rename to org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/indexer/checkpoint/TmfCheckpoint.java index 9c93ddcaaa..e2d56243b8 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/TmfCheckpoint.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/indexer/checkpoint/TmfCheckpoint.java @@ -12,19 +12,20 @@ * Patrick Tasse - Updated for location in checkpoint ******************************************************************************/ -package org.eclipse.linuxtools.tmf.core.trace; +package org.eclipse.linuxtools.tmf.core.trace.indexer.checkpoint; import org.eclipse.linuxtools.tmf.core.timestamp.ITmfTimestamp; +import org.eclipse.linuxtools.tmf.core.trace.location.ITmfLocation; /** * A basic implementation of ITmfCheckpoint. It simply maps an event timestamp * to a generic location. * - * @version 1.0 - * @author Francois Chouinard - * * @see ITmfLocation * @see ITmfTimestamp + * + * @author Francois Chouinard + * @since 3.0 */ public class TmfCheckpoint implements ITmfCheckpoint { @@ -47,7 +48,7 @@ public class TmfCheckpoint implements ITmfCheckpoint { * * @param timestamp the checkpoint timestamp * @param location the corresponding trace location - * @since 2.0 + * @since 3.0 */ public TmfCheckpoint(final ITmfTimestamp timestamp, final ITmfLocation location) { fTimestamp = timestamp; diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/TmfCheckpointIndexer.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/indexer/checkpoint/TmfCheckpointIndexer.java similarity index 97% rename from org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/TmfCheckpointIndexer.java rename to org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/indexer/checkpoint/TmfCheckpointIndexer.java index 8171bddceb..18ddef985d 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/TmfCheckpointIndexer.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/indexer/checkpoint/TmfCheckpointIndexer.java @@ -10,7 +10,7 @@ * Francois Chouinard - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.tmf.core.trace; +package org.eclipse.linuxtools.tmf.core.trace.indexer.checkpoint; import java.util.ArrayList; import java.util.Collections; @@ -30,6 +30,10 @@ import org.eclipse.linuxtools.tmf.core.request.TmfEventRequest; import org.eclipse.linuxtools.tmf.core.signal.TmfTraceUpdatedSignal; import org.eclipse.linuxtools.tmf.core.timestamp.ITmfTimestamp; import org.eclipse.linuxtools.tmf.core.timestamp.TmfTimeRange; +import org.eclipse.linuxtools.tmf.core.trace.ITmfContext; +import org.eclipse.linuxtools.tmf.core.trace.ITmfTrace; +import org.eclipse.linuxtools.tmf.core.trace.indexer.ITmfTraceIndexer; +import org.eclipse.linuxtools.tmf.core.trace.location.ITmfLocation; /** * A simple indexer that manages the trace index as an array of trace @@ -43,12 +47,12 @@ import org.eclipse.linuxtools.tmf.core.timestamp.TmfTimeRange; *

* Locating a specific checkpoint is trivial for both rank (rank % interval) and * timestamp (bsearch in the array). - * - * @version 1.0 - * @author Francois Chouinard - * + * * * @see ITmfTrace * @see ITmfEvent + * + * @author Francois Chouinard + * @since 3.0 */ public class TmfCheckpointIndexer implements ITmfTraceIndexer { diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/ITmfLocation.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/location/ITmfLocation.java similarity index 94% rename from org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/ITmfLocation.java rename to org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/location/ITmfLocation.java index 3f7b5279d3..1280723a33 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/ITmfLocation.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/location/ITmfLocation.java @@ -11,7 +11,7 @@ * Francois Chouinard - Updated as per TMF Trace Model 1.0 *******************************************************************************/ -package org.eclipse.linuxtools.tmf.core.trace; +package org.eclipse.linuxtools.tmf.core.trace.location; /** * The generic trace location in TMF. @@ -22,8 +22,8 @@ package org.eclipse.linuxtools.tmf.core.trace; *

* This location is trace-specific, must be comparable and immutable. * - * @version 2.0 * @author Francois Chouinard + * @since 3.0 */ public interface ITmfLocation { diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/TmfLocation.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/location/TmfLocation.java similarity index 97% rename from org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/TmfLocation.java rename to org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/location/TmfLocation.java index 5c9bdd108b..133f002886 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/TmfLocation.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/location/TmfLocation.java @@ -11,15 +11,15 @@ * Francois Chouinard - Updated as per TMF Trace Model 1.0 *******************************************************************************/ -package org.eclipse.linuxtools.tmf.core.trace; +package org.eclipse.linuxtools.tmf.core.trace.location; /** * A abstract implementation of ITmfLocation. The concrete classes must provide * comparable location information. * - * @version 2.0 * @author Francois Chouinard + * @since 3.0 */ public abstract class TmfLocation implements ITmfLocation { diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/TmfLongLocation.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/location/TmfLongLocation.java similarity index 94% rename from org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/TmfLongLocation.java rename to org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/location/TmfLongLocation.java index 905e372ad1..38877ca7ea 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/TmfLongLocation.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/location/TmfLongLocation.java @@ -10,13 +10,14 @@ * Francois Chouinard - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.tmf.core.trace; +package org.eclipse.linuxtools.tmf.core.trace.location; + /** * A concrete implementation of TmfLocation based on Long:s * * @author Francois Chouinard - * @since 2.0 + * @since 3.0 */ public final class TmfLongLocation extends TmfLocation { diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/TmfTimestampLocation.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/location/TmfTimestampLocation.java similarity index 94% rename from org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/TmfTimestampLocation.java rename to org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/location/TmfTimestampLocation.java index 5136d6d1b3..22c48f4535 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/TmfTimestampLocation.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/location/TmfTimestampLocation.java @@ -10,7 +10,7 @@ * Francois Chouinard - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.tmf.core.trace; +package org.eclipse.linuxtools.tmf.core.trace.location; import org.eclipse.linuxtools.tmf.core.timestamp.ITmfTimestamp; @@ -18,7 +18,7 @@ import org.eclipse.linuxtools.tmf.core.timestamp.ITmfTimestamp; * A concrete implementation of TmfLocation based on ITmfTimestamp:s * * @author Francois Chouinard - * @since 2.0 + * @since 3.0 */ public final class TmfTimestampLocation extends TmfLocation { diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/custom/CustomTxtTrace.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/custom/CustomTxtTrace.java index 0a80b2bf6d..513fa43ad6 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/custom/CustomTxtTrace.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/custom/CustomTxtTrace.java @@ -32,11 +32,11 @@ import org.eclipse.linuxtools.tmf.core.io.BufferedRandomAccessFile; import org.eclipse.linuxtools.tmf.core.timestamp.TmfTimestamp; import org.eclipse.linuxtools.tmf.core.trace.ITmfContext; import org.eclipse.linuxtools.tmf.core.trace.ITmfEventParser; -import org.eclipse.linuxtools.tmf.core.trace.ITmfLocation; -import org.eclipse.linuxtools.tmf.core.trace.ITmfTraceIndexer; import org.eclipse.linuxtools.tmf.core.trace.TmfContext; -import org.eclipse.linuxtools.tmf.core.trace.TmfLongLocation; import org.eclipse.linuxtools.tmf.core.trace.TmfTrace; +import org.eclipse.linuxtools.tmf.core.trace.indexer.ITmfTraceIndexer; +import org.eclipse.linuxtools.tmf.core.trace.location.ITmfLocation; +import org.eclipse.linuxtools.tmf.core.trace.location.TmfLongLocation; /** * Base class for custom plain text traces. diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/custom/CustomTxtTraceContext.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/custom/CustomTxtTraceContext.java index ab528a3781..3b593f8603 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/custom/CustomTxtTraceContext.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/custom/CustomTxtTraceContext.java @@ -15,8 +15,8 @@ package org.eclipse.linuxtools.internal.tmf.ui.parsers.custom; import java.util.regex.Matcher; import org.eclipse.linuxtools.internal.tmf.ui.parsers.custom.CustomTxtTraceDefinition.InputLine; -import org.eclipse.linuxtools.tmf.core.trace.ITmfLocation; import org.eclipse.linuxtools.tmf.core.trace.TmfContext; +import org.eclipse.linuxtools.tmf.core.trace.location.ITmfLocation; /** * Trace context for custom text traces. diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/custom/CustomXmlTrace.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/custom/CustomXmlTrace.java index 58b7acae3f..d120da27fe 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/custom/CustomXmlTrace.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/custom/CustomXmlTrace.java @@ -19,10 +19,10 @@ import java.io.RandomAccessFile; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Status; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.Status; import org.eclipse.linuxtools.internal.tmf.ui.Activator; import org.eclipse.linuxtools.internal.tmf.ui.parsers.custom.CustomXmlTraceDefinition.InputAttribute; import org.eclipse.linuxtools.internal.tmf.ui.parsers.custom.CustomXmlTraceDefinition.InputElement; @@ -32,11 +32,11 @@ import org.eclipse.linuxtools.tmf.core.io.BufferedRandomAccessFile; import org.eclipse.linuxtools.tmf.core.timestamp.TmfTimestamp; import org.eclipse.linuxtools.tmf.core.trace.ITmfContext; import org.eclipse.linuxtools.tmf.core.trace.ITmfEventParser; -import org.eclipse.linuxtools.tmf.core.trace.ITmfLocation; -import org.eclipse.linuxtools.tmf.core.trace.ITmfTraceIndexer; import org.eclipse.linuxtools.tmf.core.trace.TmfContext; -import org.eclipse.linuxtools.tmf.core.trace.TmfLongLocation; import org.eclipse.linuxtools.tmf.core.trace.TmfTrace; +import org.eclipse.linuxtools.tmf.core.trace.indexer.ITmfTraceIndexer; +import org.eclipse.linuxtools.tmf.core.trace.location.ITmfLocation; +import org.eclipse.linuxtools.tmf.core.trace.location.TmfLongLocation; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/custom/CustomXmlTraceContext.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/custom/CustomXmlTraceContext.java index 310e355030..55a92f11e9 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/custom/CustomXmlTraceContext.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/custom/CustomXmlTraceContext.java @@ -12,8 +12,8 @@ package org.eclipse.linuxtools.internal.tmf.ui.parsers.custom; -import org.eclipse.linuxtools.tmf.core.trace.ITmfLocation; import org.eclipse.linuxtools.tmf.core.trace.TmfContext; +import org.eclipse.linuxtools.tmf.core.trace.location.ITmfLocation; /** * Trace context for custom XML traces. 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 0626cf3a01..bafe11740a 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 @@ -90,8 +90,8 @@ import org.eclipse.linuxtools.tmf.core.signal.TmfTraceUpdatedSignal; import org.eclipse.linuxtools.tmf.core.timestamp.ITmfTimestamp; import org.eclipse.linuxtools.tmf.core.timestamp.TmfTimestamp; import org.eclipse.linuxtools.tmf.core.trace.ITmfContext; -import org.eclipse.linuxtools.tmf.core.trace.ITmfLocation; import org.eclipse.linuxtools.tmf.core.trace.ITmfTrace; +import org.eclipse.linuxtools.tmf.core.trace.location.ITmfLocation; import org.eclipse.linuxtools.tmf.ui.viewers.events.TmfEventsCache.CachedEvent; import org.eclipse.linuxtools.tmf.ui.views.colors.ColorSetting; import org.eclipse.linuxtools.tmf.ui.views.colors.ColorSettingsManager; diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/widgets/rawviewer/TmfRawEventViewer.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/widgets/rawviewer/TmfRawEventViewer.java index 2570033c2a..84960c55c5 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/widgets/rawviewer/TmfRawEventViewer.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/widgets/rawviewer/TmfRawEventViewer.java @@ -17,8 +17,8 @@ import java.util.List; import org.eclipse.linuxtools.tmf.core.event.ITmfEvent; import org.eclipse.linuxtools.tmf.core.trace.ITmfContext; -import org.eclipse.linuxtools.tmf.core.trace.ITmfLocation; import org.eclipse.linuxtools.tmf.core.trace.ITmfTrace; +import org.eclipse.linuxtools.tmf.core.trace.location.ITmfLocation; import org.eclipse.swt.SWT; import org.eclipse.swt.custom.CaretEvent; import org.eclipse.swt.custom.CaretListener; -- 2.34.1