From 4918b8f293e2f059487e19e08ff856ffa1c4cf4c Mon Sep 17 00:00:00 2001 From: Francois Chouinard Date: Thu, 22 Mar 2012 21:08:14 -0500 Subject: [PATCH] Internalize some TMF APIs --- .../internal/lttng/core/LTTngProjectNature.java | 2 +- .../lttng/ui/project/dialogs/NewLTTngProjectWizard.java | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../linuxtools/tmf/core/tests/TmfCorePluginTest.java | 2 +- .../linuxtools/tmf/core/tests/TmfCoreTestPlugin.java | 2 +- .../tmf/core/tests/component/TmfEventProviderTest.java | 8 ++++---- .../eclipse/linuxtools/tmf/core/tests/event/AllTests.java | 2 +- .../linuxtools/tmf/core/tests/event/TmfEventTest.java | 2 +- .../linuxtools/tmf/core/tests/experiment/AllTests.java | 2 +- .../tmf/core/tests/experiment/TmfExperimentTest.java | 2 +- .../tests/experiment/TmfMultiTraceExperimentTest.java | 2 +- .../linuxtools/tmf/core/tests/request/AllTests.java | 2 +- .../core/tests/request/TmfCoalescedDataRequestTest.java | 2 +- .../core/tests/request/TmfCoalescedEventRequestTest.java | 4 ++-- .../tmf/core/tests/request/TmfDataRequestTest.java | 2 +- .../tmf/core/tests/request/TmfEventRequestTest.java | 2 +- .../eclipse/linuxtools/tmf/core/tests/trace/AllTests.java | 2 +- .../tmf/core/tests/trace/TmfExperimentTest.java | 2 +- .../linuxtools/tmf/core/tests/trace/TmfTraceTest.java | 2 +- .../linuxtools/tmf/core/tests/uml2sd/AllTests.java | 2 +- .../eclipse/linuxtools/tmf/core/tests/util/AllTests.java | 2 +- .../linuxtools/tmf/core/tests/util/TmfFixedArrayTest.java | 2 +- .../linuxtools/tmf/{ => tests}/stubs/CreateTestFiles.java | 2 +- .../tmf/{ => tests}/stubs/component/TmfClientStub.java | 4 ++-- .../{ => tests}/stubs/component/TmfDataProviderStub.java | 4 ++-- .../{ => tests}/stubs/component/TmfEventProviderStub.java | 4 ++-- .../stubs/component/TmfSyntheticEventProviderStub.java | 4 ++-- .../tmf/{ => tests}/stubs/event/TmfEventTypeStub.java | 2 +- .../{ => tests}/stubs/event/TmfSyntheticEventStub.java | 2 +- .../tmf/{ => tests}/stubs/request/TmfDataRequestStub.java | 2 +- .../{ => tests}/stubs/request/TmfEventRequestStub.java | 2 +- .../tmf/{ => tests}/stubs/trace/TmfEventParserStub.java | 2 +- .../tmf/{ => tests}/stubs/trace/TmfTraceStub.java | 2 +- org.eclipse.linuxtools.tmf.core/META-INF/MANIFEST.MF | 8 ++++---- .../linuxtools/{ => internal}/tmf/core/TmfCorePlugin.java | 2 +- .../{ => internal}/tmf/core/TmfProjectNature.java | 2 +- .../linuxtools/{ => internal}/tmf/core/Tracer.java | 2 +- .../{ => internal}/tmf/core/util/TmfFixedArray.java | 2 +- .../{ => internal}/tmf/core/util/TmfSortedArrayList.java | 2 +- .../{ => internal}/tmf/core/util/TmfTraceType.java | 2 +- .../linuxtools/tmf/core/component/TmfDataProvider.java | 2 +- .../linuxtools/tmf/core/component/TmfEventProvider.java | 2 +- .../eclipse/linuxtools/tmf/core/event/TmfEventType.java | 1 + .../linuxtools/tmf/core/event/TmfEventTypeManager.java | 1 + .../linuxtools/tmf/core/request/TmfDataRequest.java | 2 +- .../linuxtools/tmf/core/request/TmfRequestExecutor.java | 2 +- .../linuxtools/tmf/core/signal/TmfSignalManager.java | 2 +- .../tests/statistics/TmfBaseColumnDataProviderTest.java | 2 +- .../tmf/ui/tests/statistics/TmfBaseColumnDataTest.java | 2 +- .../ui/tests/statistics/TmfBaseStatisticsDataTest.java | 2 +- .../ui/tests/statistics/TmfStatisticsTreeNodeTest.java | 2 +- .../ui/tests/statistics/TmfTreeContentProviderTest.java | 2 +- .../ui/tests/views/uml2sd/impl/Uml2SDTestFacility.java | 2 +- .../ui/tests/views/uml2sd/load/LoadersManagerTest.java | 2 +- .../tmf/ui/tests/uml2sd/trace/TmfUml2SDTestTrace.java | 2 +- .../linuxtools/tmf/ui/editors/TmfEventsEditor.java | 2 +- .../project/handlers/SelectTraceTypeContributionItem.java | 2 +- .../linuxtools/tmf/ui/project/model/TmfTraceElement.java | 2 +- .../tmf/ui/project/wizards/ImportTraceWizardPage.java | 4 ++-- .../tmf/ui/project/wizards/NewTmfProjectWizard.java | 2 +- .../linuxtools/tmf/ui/views/events/TmfEventsView.java | 2 +- .../linuxtools/tmf/ui/views/filter/FilterViewer.java | 2 +- .../ui/views/statistics/model/AbsTmfStatisticsTree.java | 2 +- .../ui/views/statistics/model/TmfBaseStatisticsTree.java | 2 +- .../ui/views/statistics/model/TmfStatisticsTreeNode.java | 2 +- .../tmf/ui/views/uml2sd/load/LoadersManager.java | 2 +- 66 files changed, 78 insertions(+), 76 deletions(-) rename org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/{ => tests}/stubs/CreateTestFiles.java (98%) rename org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/{ => tests}/stubs/component/TmfClientStub.java (91%) rename org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/{ => tests}/stubs/component/TmfDataProviderStub.java (95%) rename org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/{ => tests}/stubs/component/TmfEventProviderStub.java (95%) rename org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/{ => tests}/stubs/component/TmfSyntheticEventProviderStub.java (96%) rename org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/{ => tests}/stubs/event/TmfEventTypeStub.java (96%) rename org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/{ => tests}/stubs/event/TmfSyntheticEventStub.java (94%) rename org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/{ => tests}/stubs/request/TmfDataRequestStub.java (97%) rename org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/{ => tests}/stubs/request/TmfEventRequestStub.java (97%) rename org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/{ => tests}/stubs/trace/TmfEventParserStub.java (98%) rename org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/{ => tests}/stubs/trace/TmfTraceStub.java (99%) rename org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/{ => internal}/tmf/core/TmfCorePlugin.java (97%) rename org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/{ => internal}/tmf/core/TmfProjectNature.java (96%) rename org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/{ => internal}/tmf/core/Tracer.java (96%) rename org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/{ => internal}/tmf/core/util/TmfFixedArray.java (99%) rename org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/{ => internal}/tmf/core/util/TmfSortedArrayList.java (95%) rename org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/{ => internal}/tmf/core/util/TmfTraceType.java (98%) diff --git a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/internal/lttng/core/LTTngProjectNature.java b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/internal/lttng/core/LTTngProjectNature.java index b1d1288ff5..045044d49b 100644 --- a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/internal/lttng/core/LTTngProjectNature.java +++ b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/internal/lttng/core/LTTngProjectNature.java @@ -12,7 +12,7 @@ package org.eclipse.linuxtools.internal.lttng.core; -import org.eclipse.linuxtools.tmf.core.TmfProjectNature; +import org.eclipse.linuxtools.internal.tmf.core.TmfProjectNature; /** * LTTngProjectNature diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/project/dialogs/NewLTTngProjectWizard.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/project/dialogs/NewLTTngProjectWizard.java index 9bfc53e718..2e50153697 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/project/dialogs/NewLTTngProjectWizard.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/project/dialogs/NewLTTngProjectWizard.java @@ -19,7 +19,7 @@ import org.eclipse.core.resources.IProjectDescription; import org.eclipse.core.runtime.CoreException; import org.eclipse.linuxtools.internal.lttng.core.LTTngProjectNature; import org.eclipse.linuxtools.internal.lttng.core.TraceHelper; -import org.eclipse.linuxtools.tmf.core.TmfProjectNature; +import org.eclipse.linuxtools.internal.tmf.core.TmfProjectNature; import org.eclipse.linuxtools.tmf.ui.project.wizards.NewTmfProjectWizard; /** diff --git a/org.eclipse.linuxtools.tmf.core.tests/META-INF/MANIFEST.MF b/org.eclipse.linuxtools.tmf.core.tests/META-INF/MANIFEST.MF index ea7f307869..31c3c81636 100644 --- a/org.eclipse.linuxtools.tmf.core.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.linuxtools.tmf.core.tests/META-INF/MANIFEST.MF @@ -12,4 +12,4 @@ Require-Bundle: org.junit;bundle-version="3.8.2", org.eclipse.core.runtime;bundle-version="3.7.0", org.eclipse.core.resources;bundle-version="3.7.100", org.eclipse.linuxtools.tmf.core;bundle-version="0.4.0" -Export-Package: org.eclipse.linuxtools.tmf.stubs.trace;x-friends:="org.eclipse.linuxtools.tmf.ui.tests" +Export-Package: org.eclipse.linuxtools.tmf.tests.stubs.trace;x-friends:="org.eclipse.linuxtools.tmf.ui.tests" diff --git a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/TmfCorePluginTest.java b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/TmfCorePluginTest.java index fe07585159..8fe1998618 100644 --- a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/TmfCorePluginTest.java +++ b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/TmfCorePluginTest.java @@ -12,7 +12,7 @@ package org.eclipse.linuxtools.tmf.core.tests; -import org.eclipse.linuxtools.tmf.core.TmfCorePlugin; +import org.eclipse.linuxtools.internal.tmf.core.TmfCorePlugin; import junit.framework.TestCase; diff --git a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/TmfCoreTestPlugin.java b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/TmfCoreTestPlugin.java index 1461d9e6d5..68f921081c 100644 --- a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/TmfCoreTestPlugin.java +++ b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/TmfCoreTestPlugin.java @@ -13,7 +13,7 @@ package org.eclipse.linuxtools.tmf.core.tests; import org.eclipse.core.runtime.Plugin; -import org.eclipse.linuxtools.tmf.core.Tracer; +import org.eclipse.linuxtools.internal.tmf.core.Tracer; import org.osgi.framework.BundleContext; /** 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 3f9f6ed974..e92e0c65e8 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 @@ -25,10 +25,10 @@ import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp; import org.eclipse.linuxtools.tmf.core.request.TmfEventRequest; import org.eclipse.linuxtools.tmf.core.signal.TmfEndSynchSignal; import org.eclipse.linuxtools.tmf.core.signal.TmfStartSynchSignal; -import org.eclipse.linuxtools.tmf.stubs.component.TmfEventProviderStub; -import org.eclipse.linuxtools.tmf.stubs.component.TmfSyntheticEventProviderStub; -import org.eclipse.linuxtools.tmf.stubs.event.TmfSyntheticEventStub; -import org.eclipse.linuxtools.tmf.stubs.trace.TmfTraceStub; +import org.eclipse.linuxtools.tmf.tests.stubs.component.TmfEventProviderStub; +import org.eclipse.linuxtools.tmf.tests.stubs.component.TmfSyntheticEventProviderStub; +import org.eclipse.linuxtools.tmf.tests.stubs.event.TmfSyntheticEventStub; +import org.eclipse.linuxtools.tmf.tests.stubs.trace.TmfTraceStub; /** * TmfClientTest diff --git a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/AllTests.java b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/AllTests.java index c6395cf4f3..70f7848c42 100644 --- a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/AllTests.java +++ b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/AllTests.java @@ -16,7 +16,7 @@ package org.eclipse.linuxtools.tmf.core.tests.event; import junit.framework.Test; import junit.framework.TestSuite; -import org.eclipse.linuxtools.tmf.core.TmfCorePlugin; +import org.eclipse.linuxtools.internal.tmf.core.TmfCorePlugin; /** * AllTests diff --git a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfEventTest.java b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfEventTest.java index 8f43f1acc9..80017bed96 100644 --- a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfEventTest.java +++ b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfEventTest.java @@ -32,7 +32,7 @@ import org.eclipse.linuxtools.tmf.core.event.TmfEventType; import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp; import org.eclipse.linuxtools.tmf.core.tests.TmfCoreTestPlugin; import org.eclipse.linuxtools.tmf.core.trace.ITmfTrace; -import org.eclipse.linuxtools.tmf.stubs.trace.TmfTraceStub; +import org.eclipse.linuxtools.tmf.tests.stubs.trace.TmfTraceStub; /** * TmfEventTest diff --git a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/experiment/AllTests.java b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/experiment/AllTests.java index cf146400ba..21c10605e2 100644 --- a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/experiment/AllTests.java +++ b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/experiment/AllTests.java @@ -3,7 +3,7 @@ package org.eclipse.linuxtools.tmf.core.tests.experiment; import junit.framework.Test; import junit.framework.TestSuite; -import org.eclipse.linuxtools.tmf.core.TmfCorePlugin; +import org.eclipse.linuxtools.internal.tmf.core.TmfCorePlugin; @SuppressWarnings("nls") public class AllTests { 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 1208791ed2..57e418a2aa 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 @@ -34,7 +34,7 @@ import org.eclipse.linuxtools.tmf.core.trace.ITmfContext; import org.eclipse.linuxtools.tmf.core.trace.ITmfTrace; import org.eclipse.linuxtools.tmf.core.trace.TmfCheckpoint; import org.eclipse.linuxtools.tmf.core.trace.TmfContext; -import org.eclipse.linuxtools.tmf.stubs.trace.TmfTraceStub; +import org.eclipse.linuxtools.tmf.tests.stubs.trace.TmfTraceStub; /** * TmfExperimentTest 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 a317cf3f5c..7768390f80 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 @@ -34,7 +34,7 @@ import org.eclipse.linuxtools.tmf.core.trace.ITmfContext; import org.eclipse.linuxtools.tmf.core.trace.ITmfTrace; import org.eclipse.linuxtools.tmf.core.trace.TmfCheckpoint; import org.eclipse.linuxtools.tmf.core.trace.TmfContext; -import org.eclipse.linuxtools.tmf.stubs.trace.TmfTraceStub; +import org.eclipse.linuxtools.tmf.tests.stubs.trace.TmfTraceStub; /** * TmfExperimentTest diff --git a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/request/AllTests.java b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/request/AllTests.java index 5e25ec4792..0a4ea69490 100644 --- a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/request/AllTests.java +++ b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/request/AllTests.java @@ -3,7 +3,7 @@ package org.eclipse.linuxtools.tmf.core.tests.request; import junit.framework.Test; import junit.framework.TestSuite; -import org.eclipse.linuxtools.tmf.core.TmfCorePlugin; +import org.eclipse.linuxtools.internal.tmf.core.TmfCorePlugin; @SuppressWarnings("nls") public class AllTests { diff --git a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/request/TmfCoalescedDataRequestTest.java b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/request/TmfCoalescedDataRequestTest.java index 3ddf74a69d..3328803eb1 100644 --- a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/request/TmfCoalescedDataRequestTest.java +++ b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/request/TmfCoalescedDataRequestTest.java @@ -18,7 +18,7 @@ import junit.framework.TestCase; import org.eclipse.linuxtools.tmf.core.event.TmfEvent; import org.eclipse.linuxtools.tmf.core.request.TmfCoalescedDataRequest; import org.eclipse.linuxtools.tmf.core.request.TmfDataRequest; -import org.eclipse.linuxtools.tmf.stubs.request.TmfDataRequestStub; +import org.eclipse.linuxtools.tmf.tests.stubs.request.TmfDataRequestStub; /** * TmfCoalescedDataRequestTest 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 4803cd865e..f5d591e9e5 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 @@ -34,8 +34,8 @@ import org.eclipse.linuxtools.tmf.core.signal.TmfSignal; import org.eclipse.linuxtools.tmf.core.signal.TmfSignalHandler; import org.eclipse.linuxtools.tmf.core.signal.TmfSignalManager; import org.eclipse.linuxtools.tmf.core.tests.TmfCoreTestPlugin; -import org.eclipse.linuxtools.tmf.stubs.request.TmfEventRequestStub; -import org.eclipse.linuxtools.tmf.stubs.trace.TmfTraceStub; +import org.eclipse.linuxtools.tmf.tests.stubs.request.TmfEventRequestStub; +import org.eclipse.linuxtools.tmf.tests.stubs.trace.TmfTraceStub; /** * TmfCoalescedEventRequestTest diff --git a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/request/TmfDataRequestTest.java b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/request/TmfDataRequestTest.java index fd3727a649..7c12e4c6e8 100644 --- a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/request/TmfDataRequestTest.java +++ b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/request/TmfDataRequestTest.java @@ -16,7 +16,7 @@ import junit.framework.TestCase; import org.eclipse.linuxtools.tmf.core.event.TmfEvent; import org.eclipse.linuxtools.tmf.core.request.TmfDataRequest; -import org.eclipse.linuxtools.tmf.stubs.request.TmfDataRequestStub; +import org.eclipse.linuxtools.tmf.tests.stubs.request.TmfDataRequestStub; /** * TmfDataRequestTest 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 5b5b688f1d..4c4a89f863 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 @@ -19,7 +19,7 @@ import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange; import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp; import org.eclipse.linuxtools.tmf.core.request.TmfDataRequest; import org.eclipse.linuxtools.tmf.core.request.TmfEventRequest; -import org.eclipse.linuxtools.tmf.stubs.request.TmfEventRequestStub; +import org.eclipse.linuxtools.tmf.tests.stubs.request.TmfEventRequestStub; /** * TmfEventRequestTest 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 c046cbcb32..2b21a106b6 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 @@ -3,7 +3,7 @@ package org.eclipse.linuxtools.tmf.core.tests.trace; import junit.framework.Test; import junit.framework.TestSuite; -import org.eclipse.linuxtools.tmf.core.TmfCorePlugin; +import org.eclipse.linuxtools.internal.tmf.core.TmfCorePlugin; @SuppressWarnings("nls") public class AllTests { 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 d466d5f6d8..5625870a25 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 @@ -33,7 +33,7 @@ import org.eclipse.linuxtools.tmf.core.tests.TmfCoreTestPlugin; import org.eclipse.linuxtools.tmf.core.trace.ITmfTrace; import org.eclipse.linuxtools.tmf.core.trace.TmfCheckpoint; import org.eclipse.linuxtools.tmf.core.trace.TmfContext; -import org.eclipse.linuxtools.tmf.stubs.trace.TmfTraceStub; +import org.eclipse.linuxtools.tmf.tests.stubs.trace.TmfTraceStub; /** * TmfExperimentTest 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 226c75c6db..40213c3947 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 @@ -34,7 +34,7 @@ import org.eclipse.linuxtools.tmf.core.trace.ITmfContext; import org.eclipse.linuxtools.tmf.core.trace.TmfCheckpoint; import org.eclipse.linuxtools.tmf.core.trace.TmfContext; import org.eclipse.linuxtools.tmf.core.trace.TmfTrace; -import org.eclipse.linuxtools.tmf.stubs.trace.TmfTraceStub; +import org.eclipse.linuxtools.tmf.tests.stubs.trace.TmfTraceStub; /** * TmfTraceTest diff --git a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/uml2sd/AllTests.java b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/uml2sd/AllTests.java index 638452450c..b4e3d74e3a 100644 --- a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/uml2sd/AllTests.java +++ b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/uml2sd/AllTests.java @@ -3,7 +3,7 @@ package org.eclipse.linuxtools.tmf.core.tests.uml2sd; import junit.framework.Test; import junit.framework.TestSuite; -import org.eclipse.linuxtools.tmf.core.TmfCorePlugin; +import org.eclipse.linuxtools.internal.tmf.core.TmfCorePlugin; @SuppressWarnings("nls") public class AllTests { diff --git a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/util/AllTests.java b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/util/AllTests.java index ed809931ba..bc53d4696f 100644 --- a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/util/AllTests.java +++ b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/util/AllTests.java @@ -3,7 +3,7 @@ package org.eclipse.linuxtools.tmf.core.tests.util; import junit.framework.Test; import junit.framework.TestSuite; -import org.eclipse.linuxtools.tmf.core.TmfCorePlugin; +import org.eclipse.linuxtools.internal.tmf.core.TmfCorePlugin; @SuppressWarnings("nls") public class AllTests { diff --git a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/util/TmfFixedArrayTest.java b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/util/TmfFixedArrayTest.java index 7f4d6d4abe..b92f741134 100755 --- a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/util/TmfFixedArrayTest.java +++ b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/util/TmfFixedArrayTest.java @@ -16,7 +16,7 @@ import java.util.Arrays; import junit.framework.TestCase; -import org.eclipse.linuxtools.tmf.core.util.TmfFixedArray; +import org.eclipse.linuxtools.internal.tmf.core.util.TmfFixedArray; public class TmfFixedArrayTest extends TestCase { diff --git a/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/stubs/CreateTestFiles.java b/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/CreateTestFiles.java similarity index 98% rename from org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/stubs/CreateTestFiles.java rename to org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/CreateTestFiles.java index 933bb0dd78..56f65e53d7 100644 --- a/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/stubs/CreateTestFiles.java +++ b/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/CreateTestFiles.java @@ -10,7 +10,7 @@ * Francois Chouinard - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.tmf.stubs; +package org.eclipse.linuxtools.tmf.tests.stubs; import java.io.BufferedOutputStream; import java.io.DataOutputStream; diff --git a/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/stubs/component/TmfClientStub.java b/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/component/TmfClientStub.java similarity index 91% rename from org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/stubs/component/TmfClientStub.java rename to org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/component/TmfClientStub.java index bd8c506866..7e4615fa35 100644 --- a/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/stubs/component/TmfClientStub.java +++ b/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/component/TmfClientStub.java @@ -10,12 +10,12 @@ * Francois Chouinard - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.tmf.stubs.component; +package org.eclipse.linuxtools.tmf.tests.stubs.component; import org.eclipse.linuxtools.tmf.core.component.TmfComponent; import org.eclipse.linuxtools.tmf.core.component.TmfDataProvider; import org.eclipse.linuxtools.tmf.core.component.TmfProviderManager; -import org.eclipse.linuxtools.tmf.stubs.event.TmfSyntheticEventStub; +import org.eclipse.linuxtools.tmf.tests.stubs.event.TmfSyntheticEventStub; /** * TmfClientStub diff --git a/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/stubs/component/TmfDataProviderStub.java b/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/component/TmfDataProviderStub.java similarity index 95% rename from org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/stubs/component/TmfDataProviderStub.java rename to org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/component/TmfDataProviderStub.java index b25b3ce334..1eaef70f10 100644 --- a/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/stubs/component/TmfDataProviderStub.java +++ b/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/component/TmfDataProviderStub.java @@ -10,7 +10,7 @@ * Francois Chouinard - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.tmf.stubs.component; +package org.eclipse.linuxtools.tmf.tests.stubs.component; import java.io.File; import java.io.IOException; @@ -25,7 +25,7 @@ import org.eclipse.linuxtools.tmf.core.request.ITmfDataRequest; import org.eclipse.linuxtools.tmf.core.request.ITmfEventRequest; import org.eclipse.linuxtools.tmf.core.tests.TmfCoreTestPlugin; import org.eclipse.linuxtools.tmf.core.trace.ITmfContext; -import org.eclipse.linuxtools.tmf.stubs.trace.TmfTraceStub; +import org.eclipse.linuxtools.tmf.tests.stubs.trace.TmfTraceStub; /** * TmfDataProviderStub diff --git a/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/stubs/component/TmfEventProviderStub.java b/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/component/TmfEventProviderStub.java similarity index 95% rename from org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/stubs/component/TmfEventProviderStub.java rename to org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/component/TmfEventProviderStub.java index 75d78e4daa..1d155378a8 100644 --- a/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/stubs/component/TmfEventProviderStub.java +++ b/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/component/TmfEventProviderStub.java @@ -10,7 +10,7 @@ * Francois Chouinard - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.tmf.stubs.component; +package org.eclipse.linuxtools.tmf.tests.stubs.component; import java.io.File; import java.io.IOException; @@ -25,7 +25,7 @@ import org.eclipse.linuxtools.tmf.core.request.ITmfDataRequest; import org.eclipse.linuxtools.tmf.core.request.ITmfEventRequest; import org.eclipse.linuxtools.tmf.core.tests.TmfCoreTestPlugin; import org.eclipse.linuxtools.tmf.core.trace.ITmfContext; -import org.eclipse.linuxtools.tmf.stubs.trace.TmfTraceStub; +import org.eclipse.linuxtools.tmf.tests.stubs.trace.TmfTraceStub; /** * TmfEventProviderStub diff --git a/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/stubs/component/TmfSyntheticEventProviderStub.java b/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/component/TmfSyntheticEventProviderStub.java similarity index 96% rename from org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/stubs/component/TmfSyntheticEventProviderStub.java rename to org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/component/TmfSyntheticEventProviderStub.java index fcea703eb2..6eb3829f53 100644 --- a/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/stubs/component/TmfSyntheticEventProviderStub.java +++ b/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/component/TmfSyntheticEventProviderStub.java @@ -10,7 +10,7 @@ * Francois Chouinard - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.tmf.stubs.component; +package org.eclipse.linuxtools.tmf.tests.stubs.component; import java.util.concurrent.TimeUnit; @@ -24,7 +24,7 @@ import org.eclipse.linuxtools.tmf.core.request.ITmfEventRequest; import org.eclipse.linuxtools.tmf.core.request.TmfEventRequest; import org.eclipse.linuxtools.tmf.core.trace.ITmfContext; import org.eclipse.linuxtools.tmf.core.trace.TmfContext; -import org.eclipse.linuxtools.tmf.stubs.event.TmfSyntheticEventStub; +import org.eclipse.linuxtools.tmf.tests.stubs.event.TmfSyntheticEventStub; /** * TmfSyntheticEventProviderStub 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/tests/stubs/event/TmfEventTypeStub.java similarity index 96% rename from org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/stubs/event/TmfEventTypeStub.java rename to org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/event/TmfEventTypeStub.java index f817d6112b..340b19b7f3 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/tests/stubs/event/TmfEventTypeStub.java @@ -9,7 +9,7 @@ * Contributors: Francois Chouinard - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.tmf.stubs.event; +package org.eclipse.linuxtools.tmf.tests.stubs.event; import org.eclipse.linuxtools.tmf.core.event.ITmfEventField; import org.eclipse.linuxtools.tmf.core.event.TmfEventField; diff --git a/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/stubs/event/TmfSyntheticEventStub.java b/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/event/TmfSyntheticEventStub.java similarity index 94% rename from org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/stubs/event/TmfSyntheticEventStub.java rename to org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/event/TmfSyntheticEventStub.java index 675c9f7af3..e4f5ad73b5 100644 --- a/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/stubs/event/TmfSyntheticEventStub.java +++ b/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/event/TmfSyntheticEventStub.java @@ -10,7 +10,7 @@ * Francois Chouinard - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.tmf.stubs.event; +package org.eclipse.linuxtools.tmf.tests.stubs.event; import org.eclipse.linuxtools.tmf.core.event.TmfEvent; diff --git a/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/stubs/request/TmfDataRequestStub.java b/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/request/TmfDataRequestStub.java similarity index 97% rename from org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/stubs/request/TmfDataRequestStub.java rename to org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/request/TmfDataRequestStub.java index 4393c301fc..2a25c774bf 100644 --- a/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/stubs/request/TmfDataRequestStub.java +++ b/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/request/TmfDataRequestStub.java @@ -10,7 +10,7 @@ * Francois Chouinard - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.tmf.stubs.request; +package org.eclipse.linuxtools.tmf.tests.stubs.request; import org.eclipse.linuxtools.tmf.core.event.TmfEvent; import org.eclipse.linuxtools.tmf.core.request.TmfDataRequest; diff --git a/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/stubs/request/TmfEventRequestStub.java b/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/request/TmfEventRequestStub.java similarity index 97% rename from org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/stubs/request/TmfEventRequestStub.java rename to org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/request/TmfEventRequestStub.java index 762c1d2b27..99923d1b3d 100644 --- a/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/stubs/request/TmfEventRequestStub.java +++ b/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/request/TmfEventRequestStub.java @@ -10,7 +10,7 @@ * Francois Chouinard - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.tmf.stubs.request; +package org.eclipse.linuxtools.tmf.tests.stubs.request; import org.eclipse.linuxtools.tmf.core.event.TmfEvent; import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange; 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/tests/stubs/trace/TmfEventParserStub.java similarity index 98% rename from org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/stubs/trace/TmfEventParserStub.java rename to org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/trace/TmfEventParserStub.java index ea246f00c2..f7238fc7e0 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/tests/stubs/trace/TmfEventParserStub.java @@ -10,7 +10,7 @@ * Francois Chouinard - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.tmf.stubs.trace; +package org.eclipse.linuxtools.tmf.tests.stubs.trace; import java.io.EOFException; import java.io.IOException; diff --git a/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/stubs/trace/TmfTraceStub.java b/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/trace/TmfTraceStub.java similarity index 99% rename from org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/stubs/trace/TmfTraceStub.java rename to org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/trace/TmfTraceStub.java index 47750f8e4d..3267cc1b0b 100644 --- a/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/stubs/trace/TmfTraceStub.java +++ b/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/trace/TmfTraceStub.java @@ -10,7 +10,7 @@ * Francois Chouinard - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.tmf.stubs.trace; +package org.eclipse.linuxtools.tmf.tests.stubs.trace; import java.io.FileNotFoundException; import java.io.IOException; diff --git a/org.eclipse.linuxtools.tmf.core/META-INF/MANIFEST.MF b/org.eclipse.linuxtools.tmf.core/META-INF/MANIFEST.MF index 2060c1acc0..d0cd6b9acd 100644 --- a/org.eclipse.linuxtools.tmf.core/META-INF/MANIFEST.MF +++ b/org.eclipse.linuxtools.tmf.core/META-INF/MANIFEST.MF @@ -5,15 +5,14 @@ Bundle-Vendor: %Bundle-Vendor Bundle-Version: 0.5.0.qualifier Bundle-Localization: plugin Bundle-SymbolicName: org.eclipse.linuxtools.tmf.core;singleton:=true -Bundle-Activator: org.eclipse.linuxtools.tmf.core.TmfCorePlugin +Bundle-Activator: org.eclipse.linuxtools.internal.tmf.core.TmfCorePlugin Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Require-Bundle: org.eclipse.core.runtime;bundle-version="3.7.0", org.eclipse.core.resources;bundle-version="3.7.100", org.eclipse.linuxtools.ctf.core;bundle-version="0.1.0", org.eclipse.core.filesystem;bundle-version="1.3.200" -Export-Package: org.eclipse.linuxtools.tmf.core, - org.eclipse.linuxtools.tmf.core.component, +Export-Package: org.eclipse.linuxtools.tmf.core.component, org.eclipse.linuxtools.tmf.core.ctfadaptor, org.eclipse.linuxtools.tmf.core.event, org.eclipse.linuxtools.tmf.core.experiment, @@ -31,4 +30,5 @@ Export-Package: org.eclipse.linuxtools.tmf.core, org.eclipse.linuxtools.tmf.core.statevalue, org.eclipse.linuxtools.tmf.core.trace, org.eclipse.linuxtools.tmf.core.uml2sd, - org.eclipse.linuxtools.tmf.core.util + org.eclipse.linuxtools.internal.tmf.core;x-friends="org.eclipse.linuxtools.tmf.core.tests", + org.eclipse.linuxtools.internal.tmf.core.util;x-friends="org.eclipse.linuxtools.tmf.core.tests" diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/TmfCorePlugin.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/internal/tmf/core/TmfCorePlugin.java similarity index 97% rename from org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/TmfCorePlugin.java rename to org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/internal/tmf/core/TmfCorePlugin.java index 0b484f87ac..a0e014593a 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/TmfCorePlugin.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/internal/tmf/core/TmfCorePlugin.java @@ -10,7 +10,7 @@ * Francois Chouinard - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.tmf.core; +package org.eclipse.linuxtools.internal.tmf.core; import org.eclipse.core.runtime.Plugin; import org.osgi.framework.BundleContext; diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/TmfProjectNature.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/internal/tmf/core/TmfProjectNature.java similarity index 96% rename from org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/TmfProjectNature.java rename to org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/internal/tmf/core/TmfProjectNature.java index 6d7c6e9ca9..0129b4d39a 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/TmfProjectNature.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/internal/tmf/core/TmfProjectNature.java @@ -10,7 +10,7 @@ * Francois Chouinard - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.tmf.core; +package org.eclipse.linuxtools.internal.tmf.core; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IProjectNature; diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/Tracer.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/internal/tmf/core/Tracer.java similarity index 96% rename from org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/Tracer.java rename to org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/internal/tmf/core/Tracer.java index 6736fa7262..8d1404d193 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/Tracer.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/internal/tmf/core/Tracer.java @@ -1,4 +1,4 @@ -package org.eclipse.linuxtools.tmf.core; +package org.eclipse.linuxtools.internal.tmf.core; import java.io.BufferedWriter; import java.io.FileWriter; diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/util/TmfFixedArray.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/internal/tmf/core/util/TmfFixedArray.java similarity index 99% rename from org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/util/TmfFixedArray.java rename to org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/internal/tmf/core/util/TmfFixedArray.java index b55be6dcc1..8f3d07c758 100755 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/util/TmfFixedArray.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/internal/tmf/core/util/TmfFixedArray.java @@ -11,7 +11,7 @@ * Mathieu Denis (mathieu.denis@polymtl.ca) - Correction and refactoring *******************************************************************************/ -package org.eclipse.linuxtools.tmf.core.util; +package org.eclipse.linuxtools.internal.tmf.core.util; import java.lang.reflect.Array; import java.util.AbstractList; diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/util/TmfSortedArrayList.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/internal/tmf/core/util/TmfSortedArrayList.java similarity index 95% rename from org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/util/TmfSortedArrayList.java rename to org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/internal/tmf/core/util/TmfSortedArrayList.java index fa52bdb531..f2eabb5703 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/util/TmfSortedArrayList.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/internal/tmf/core/util/TmfSortedArrayList.java @@ -10,7 +10,7 @@ * Francois Chouinard - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.tmf.core.util; +package org.eclipse.linuxtools.internal.tmf.core.util; import java.util.ArrayList; diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/util/TmfTraceType.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/internal/tmf/core/util/TmfTraceType.java similarity index 98% rename from org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/util/TmfTraceType.java rename to org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/internal/tmf/core/util/TmfTraceType.java index 9420905b2c..f4eadf3e45 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/util/TmfTraceType.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/internal/tmf/core/util/TmfTraceType.java @@ -10,7 +10,7 @@ * Patrick Tasse - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.tmf.core.util; +package org.eclipse.linuxtools.internal.tmf.core.util; import java.util.LinkedList; import java.util.List; diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/component/TmfDataProvider.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/component/TmfDataProvider.java index 8a77096bcc..2902e53324 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/component/TmfDataProvider.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/component/TmfDataProvider.java @@ -17,7 +17,7 @@ import java.util.concurrent.BlockingQueue; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.SynchronousQueue; -import org.eclipse.linuxtools.tmf.core.Tracer; +import org.eclipse.linuxtools.internal.tmf.core.Tracer; import org.eclipse.linuxtools.tmf.core.event.ITmfEvent; import org.eclipse.linuxtools.tmf.core.request.ITmfDataRequest; import org.eclipse.linuxtools.tmf.core.request.ITmfDataRequest.ExecutionType; diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/component/TmfEventProvider.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/component/TmfEventProvider.java index 67b62eee0d..fa5848fca9 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/component/TmfEventProvider.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/component/TmfEventProvider.java @@ -12,7 +12,7 @@ package org.eclipse.linuxtools.tmf.core.component; -import org.eclipse.linuxtools.tmf.core.Tracer; +import org.eclipse.linuxtools.internal.tmf.core.Tracer; import org.eclipse.linuxtools.tmf.core.event.ITmfEvent; import org.eclipse.linuxtools.tmf.core.event.ITmfTimestamp; import org.eclipse.linuxtools.tmf.core.request.ITmfDataRequest; diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfEventType.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfEventType.java index 0972d52ce1..4edb7e3fb5 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfEventType.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfEventType.java @@ -13,6 +13,7 @@ package org.eclipse.linuxtools.tmf.core.event; + /** * TmfEventType *

diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfEventTypeManager.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfEventTypeManager.java index 0c649ab971..e9266f1b4d 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfEventTypeManager.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfEventTypeManager.java @@ -14,6 +14,7 @@ package org.eclipse.linuxtools.tmf.core.event; import java.util.HashMap; + /** * TmfEventTypeManager *

diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/request/TmfDataRequest.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/request/TmfDataRequest.java index 2a28f00ddc..fa8fcb90aa 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/request/TmfDataRequest.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/request/TmfDataRequest.java @@ -14,7 +14,7 @@ package org.eclipse.linuxtools.tmf.core.request; import java.util.concurrent.CountDownLatch; -import org.eclipse.linuxtools.tmf.core.Tracer; +import org.eclipse.linuxtools.internal.tmf.core.Tracer; import org.eclipse.linuxtools.tmf.core.event.ITmfEvent; /** diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/request/TmfRequestExecutor.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/request/TmfRequestExecutor.java index ef406dc9c8..d9e9259bc0 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/request/TmfRequestExecutor.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/request/TmfRequestExecutor.java @@ -18,7 +18,7 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.PriorityBlockingQueue; -import org.eclipse.linuxtools.tmf.core.Tracer; +import org.eclipse.linuxtools.internal.tmf.core.Tracer; import org.eclipse.linuxtools.tmf.core.component.TmfThread; import org.eclipse.linuxtools.tmf.core.request.ITmfDataRequest.ExecutionType; diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/signal/TmfSignalManager.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/signal/TmfSignalManager.java index 03e6218f56..e67afc7ed3 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/signal/TmfSignalManager.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/signal/TmfSignalManager.java @@ -19,7 +19,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.eclipse.linuxtools.tmf.core.Tracer; +import org.eclipse.linuxtools.internal.tmf.core.Tracer; /** * TmfSignalHandler 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 b11845ed24..348a1c5058 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 @@ -18,12 +18,12 @@ import junit.framework.TestCase; import org.eclipse.jface.viewers.ColumnLabelProvider; import org.eclipse.jface.viewers.ViewerComparator; +import org.eclipse.linuxtools.internal.tmf.core.util.TmfFixedArray; import org.eclipse.linuxtools.tmf.core.event.ITmfEventField; import org.eclipse.linuxtools.tmf.core.event.TmfEvent; import org.eclipse.linuxtools.tmf.core.event.TmfEventField; import org.eclipse.linuxtools.tmf.core.event.TmfEventType; import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp; -import org.eclipse.linuxtools.tmf.core.util.TmfFixedArray; import org.eclipse.linuxtools.tmf.ui.views.statistics.ITmfExtraEventInfo; import org.eclipse.linuxtools.tmf.ui.views.statistics.model.Messages; import org.eclipse.linuxtools.tmf.ui.views.statistics.model.TmfBaseColumnData; diff --git a/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/statistics/TmfBaseColumnDataTest.java b/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/statistics/TmfBaseColumnDataTest.java index e44ce0fe22..1c582a5360 100755 --- a/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/statistics/TmfBaseColumnDataTest.java +++ b/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/statistics/TmfBaseColumnDataTest.java @@ -17,7 +17,7 @@ import junit.framework.TestCase; import org.eclipse.jface.viewers.ColumnLabelProvider; import org.eclipse.jface.viewers.Viewer; import org.eclipse.jface.viewers.ViewerComparator; -import org.eclipse.linuxtools.tmf.core.util.TmfFixedArray; +import org.eclipse.linuxtools.internal.tmf.core.util.TmfFixedArray; import org.eclipse.linuxtools.tmf.ui.views.statistics.model.TmfBaseColumnData; import org.eclipse.linuxtools.tmf.ui.views.statistics.model.TmfBaseColumnData.ITmfColumnPercentageProvider; import org.eclipse.linuxtools.tmf.ui.views.statistics.model.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 9ab73f4152..3929c9a7df 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 @@ -19,12 +19,12 @@ import java.util.Vector; import junit.framework.TestCase; +import org.eclipse.linuxtools.internal.tmf.core.util.TmfFixedArray; import org.eclipse.linuxtools.tmf.core.event.ITmfEventField; import org.eclipse.linuxtools.tmf.core.event.TmfEvent; import org.eclipse.linuxtools.tmf.core.event.TmfEventField; import org.eclipse.linuxtools.tmf.core.event.TmfEventType; import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp; -import org.eclipse.linuxtools.tmf.core.util.TmfFixedArray; import org.eclipse.linuxtools.tmf.ui.views.statistics.ITmfExtraEventInfo; import org.eclipse.linuxtools.tmf.ui.views.statistics.model.AbsTmfStatisticsTree; import org.eclipse.linuxtools.tmf.ui.views.statistics.model.Messages; 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 c7bda0c63b..f4f6f0a26b 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 @@ -19,12 +19,12 @@ import java.util.Vector; import junit.framework.TestCase; +import org.eclipse.linuxtools.internal.tmf.core.util.TmfFixedArray; import org.eclipse.linuxtools.tmf.core.event.ITmfEventField; import org.eclipse.linuxtools.tmf.core.event.TmfEvent; import org.eclipse.linuxtools.tmf.core.event.TmfEventField; import org.eclipse.linuxtools.tmf.core.event.TmfEventType; import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp; -import org.eclipse.linuxtools.tmf.core.util.TmfFixedArray; import org.eclipse.linuxtools.tmf.ui.views.statistics.ITmfExtraEventInfo; import org.eclipse.linuxtools.tmf.ui.views.statistics.model.AbsTmfStatisticsTree; import org.eclipse.linuxtools.tmf.ui.views.statistics.model.Messages; 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 54d97688f5..7733c22975 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 @@ -19,12 +19,12 @@ import java.util.Vector; import junit.framework.TestCase; +import org.eclipse.linuxtools.internal.tmf.core.util.TmfFixedArray; import org.eclipse.linuxtools.tmf.core.event.ITmfEventField; import org.eclipse.linuxtools.tmf.core.event.TmfEvent; import org.eclipse.linuxtools.tmf.core.event.TmfEventField; import org.eclipse.linuxtools.tmf.core.event.TmfEventType; import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp; -import org.eclipse.linuxtools.tmf.core.util.TmfFixedArray; import org.eclipse.linuxtools.tmf.ui.views.statistics.ITmfExtraEventInfo; import org.eclipse.linuxtools.tmf.ui.views.statistics.model.AbsTmfStatisticsTree; import org.eclipse.linuxtools.tmf.ui.views.statistics.model.Messages; diff --git a/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/views/uml2sd/impl/Uml2SDTestFacility.java b/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/views/uml2sd/impl/Uml2SDTestFacility.java index 94ad56ef6e..b8a749f3ab 100644 --- a/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/views/uml2sd/impl/Uml2SDTestFacility.java +++ b/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/views/uml2sd/impl/Uml2SDTestFacility.java @@ -26,7 +26,7 @@ import org.eclipse.linuxtools.tmf.core.experiment.TmfExperiment; import org.eclipse.linuxtools.tmf.core.parser.ITmfEventParser; import org.eclipse.linuxtools.tmf.core.signal.TmfExperimentSelectedSignal; import org.eclipse.linuxtools.tmf.core.trace.ITmfTrace; -import org.eclipse.linuxtools.tmf.stubs.trace.TmfTraceStub; +import org.eclipse.linuxtools.tmf.tests.stubs.trace.TmfTraceStub; import org.eclipse.linuxtools.tmf.ui.tests.TmfUITestPlugin; import org.eclipse.linuxtools.tmf.ui.tests.uml2sd.trace.TmfUml2SDTestTrace; import org.eclipse.linuxtools.tmf.ui.views.uml2sd.SDView; diff --git a/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/views/uml2sd/load/LoadersManagerTest.java b/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/views/uml2sd/load/LoadersManagerTest.java index 8349b5a46f..dd2f351a0f 100644 --- a/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/views/uml2sd/load/LoadersManagerTest.java +++ b/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/views/uml2sd/load/LoadersManagerTest.java @@ -13,7 +13,7 @@ package org.eclipse.linuxtools.tmf.ui.tests.views.uml2sd.load; import junit.framework.TestCase; import org.eclipse.jface.preference.IPreferenceStore; -import org.eclipse.linuxtools.tmf.ui.TmfUiPlugin; +import org.eclipse.linuxtools.internal.tmf.ui.TmfUiPlugin; import org.eclipse.linuxtools.tmf.ui.views.uml2sd.SDView; import org.eclipse.linuxtools.tmf.ui.views.uml2sd.load.IUml2SDLoader; import org.eclipse.linuxtools.tmf.ui.views.uml2sd.load.LoadersManager; 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 a0df87c855..efd4719a48 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 @@ -24,7 +24,7 @@ import org.eclipse.linuxtools.tmf.core.parser.ITmfEventParser; import org.eclipse.linuxtools.tmf.core.trace.ITmfContext; import org.eclipse.linuxtools.tmf.core.trace.ITmfTrace; import org.eclipse.linuxtools.tmf.core.trace.TmfLocation; -import org.eclipse.linuxtools.tmf.stubs.trace.TmfTraceStub; +import org.eclipse.linuxtools.tmf.tests.stubs.trace.TmfTraceStub; public class TmfUml2SDTestTrace implements ITmfEventParser { diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/editors/TmfEventsEditor.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/editors/TmfEventsEditor.java index 7997d3ab4c..92cfe90c52 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/editors/TmfEventsEditor.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/editors/TmfEventsEditor.java @@ -30,13 +30,13 @@ import org.eclipse.core.runtime.IConfigurationElement; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.InvalidRegistryObjectException; import org.eclipse.core.runtime.Platform; +import org.eclipse.linuxtools.internal.tmf.core.util.TmfTraceType; import org.eclipse.linuxtools.tmf.core.event.TmfEvent; import org.eclipse.linuxtools.tmf.core.experiment.TmfExperiment; import org.eclipse.linuxtools.tmf.core.signal.TmfSignalHandler; import org.eclipse.linuxtools.tmf.core.signal.TmfTraceSelectedSignal; import org.eclipse.linuxtools.tmf.core.trace.ITmfTrace; import org.eclipse.linuxtools.tmf.core.trace.TmfTrace; -import org.eclipse.linuxtools.tmf.core.util.TmfTraceType; import org.eclipse.linuxtools.tmf.ui.parsers.custom.CustomEventsTable; import org.eclipse.linuxtools.tmf.ui.parsers.custom.CustomTxtTrace; import org.eclipse.linuxtools.tmf.ui.parsers.custom.CustomXmlTrace; diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/handlers/SelectTraceTypeContributionItem.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/handlers/SelectTraceTypeContributionItem.java index 4674c784f6..1a76db068c 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/handlers/SelectTraceTypeContributionItem.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/handlers/SelectTraceTypeContributionItem.java @@ -24,7 +24,7 @@ import org.eclipse.jface.action.MenuManager; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.StructuredSelection; -import org.eclipse.linuxtools.tmf.core.util.TmfTraceType; +import org.eclipse.linuxtools.internal.tmf.core.util.TmfTraceType; import org.eclipse.linuxtools.tmf.ui.TmfUiPlugin; import org.eclipse.linuxtools.tmf.ui.parsers.custom.CustomTxtTrace; import org.eclipse.linuxtools.tmf.ui.parsers.custom.CustomTxtTraceDefinition; diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/model/TmfTraceElement.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/model/TmfTraceElement.java index 30021e1590..84d60e4167 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/model/TmfTraceElement.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/model/TmfTraceElement.java @@ -21,9 +21,9 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IConfigurationElement; import org.eclipse.core.runtime.Platform; import org.eclipse.core.runtime.QualifiedName; +import org.eclipse.linuxtools.internal.tmf.core.util.TmfTraceType; import org.eclipse.linuxtools.tmf.core.event.TmfEvent; import org.eclipse.linuxtools.tmf.core.trace.ITmfTrace; -import org.eclipse.linuxtools.tmf.core.util.TmfTraceType; import org.eclipse.linuxtools.tmf.ui.editors.TmfEventsEditor; import org.eclipse.linuxtools.tmf.ui.parsers.custom.CustomTxtEvent; import org.eclipse.linuxtools.tmf.ui.parsers.custom.CustomTxtTrace; diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/wizards/ImportTraceWizardPage.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/wizards/ImportTraceWizardPage.java index 39bd75408a..e48883e4d9 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/wizards/ImportTraceWizardPage.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/wizards/ImportTraceWizardPage.java @@ -44,9 +44,9 @@ import org.eclipse.jface.viewers.CheckboxTreeViewer; import org.eclipse.jface.viewers.ICheckStateListener; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.ITreeContentProvider; -import org.eclipse.linuxtools.tmf.core.TmfProjectNature; +import org.eclipse.linuxtools.internal.tmf.core.TmfProjectNature; +import org.eclipse.linuxtools.internal.tmf.core.util.TmfTraceType; import org.eclipse.linuxtools.tmf.core.trace.ITmfTrace; -import org.eclipse.linuxtools.tmf.core.util.TmfTraceType; import org.eclipse.linuxtools.tmf.ui.TmfUiPlugin; import org.eclipse.linuxtools.tmf.ui.parsers.custom.CustomTxtTrace; import org.eclipse.linuxtools.tmf.ui.parsers.custom.CustomTxtTraceDefinition; diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/wizards/NewTmfProjectWizard.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/wizards/NewTmfProjectWizard.java index b7e68370b8..635c7ff3e4 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/wizards/NewTmfProjectWizard.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/wizards/NewTmfProjectWizard.java @@ -27,7 +27,7 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.wizard.Wizard; -import org.eclipse.linuxtools.tmf.core.TmfProjectNature; +import org.eclipse.linuxtools.internal.tmf.core.TmfProjectNature; import org.eclipse.linuxtools.tmf.ui.TmfUiPlugin; import org.eclipse.linuxtools.tmf.ui.project.model.TmfExperimentFolder; import org.eclipse.linuxtools.tmf.ui.project.model.TmfTraceFolder; diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/events/TmfEventsView.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/events/TmfEventsView.java index 2c8ef385a8..41a0f8620d 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/events/TmfEventsView.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/events/TmfEventsView.java @@ -21,13 +21,13 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IConfigurationElement; import org.eclipse.core.runtime.InvalidRegistryObjectException; import org.eclipse.core.runtime.Platform; +import org.eclipse.linuxtools.internal.tmf.core.util.TmfTraceType; import org.eclipse.linuxtools.tmf.core.event.TmfEvent; import org.eclipse.linuxtools.tmf.core.experiment.TmfExperiment; import org.eclipse.linuxtools.tmf.core.signal.TmfExperimentDisposedSignal; import org.eclipse.linuxtools.tmf.core.signal.TmfExperimentSelectedSignal; import org.eclipse.linuxtools.tmf.core.signal.TmfSignalHandler; import org.eclipse.linuxtools.tmf.core.trace.ITmfTrace; -import org.eclipse.linuxtools.tmf.core.util.TmfTraceType; import org.eclipse.linuxtools.tmf.ui.TmfUiPlugin; import org.eclipse.linuxtools.tmf.ui.parsers.custom.CustomEventsTable; import org.eclipse.linuxtools.tmf.ui.parsers.custom.CustomTxtTrace; diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/filter/FilterViewer.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/filter/FilterViewer.java index 4668efbf3f..96c8cc41d9 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/filter/FilterViewer.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/filter/FilterViewer.java @@ -30,6 +30,7 @@ import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.SelectionChangedEvent; import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.jface.viewers.TreeViewer; +import org.eclipse.linuxtools.internal.tmf.core.util.TmfTraceType; import org.eclipse.linuxtools.tmf.core.event.ITmfEvent; import org.eclipse.linuxtools.tmf.core.event.ITmfEventType; import org.eclipse.linuxtools.tmf.core.event.TmfEvent; @@ -44,7 +45,6 @@ import org.eclipse.linuxtools.tmf.core.filter.model.TmfFilterMatchesNode; import org.eclipse.linuxtools.tmf.core.filter.model.TmfFilterNode; import org.eclipse.linuxtools.tmf.core.filter.model.TmfFilterOrNode; import org.eclipse.linuxtools.tmf.core.filter.model.TmfFilterRootNode; -import org.eclipse.linuxtools.tmf.core.util.TmfTraceType; import org.eclipse.linuxtools.tmf.ui.internal.Messages; import org.eclipse.linuxtools.tmf.ui.parsers.custom.CustomTraceDefinition.OutputColumn; import org.eclipse.linuxtools.tmf.ui.parsers.custom.CustomTxtEvent; diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/statistics/model/AbsTmfStatisticsTree.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/statistics/model/AbsTmfStatisticsTree.java index 76f754f8de..eb0d582d10 100755 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/statistics/model/AbsTmfStatisticsTree.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/statistics/model/AbsTmfStatisticsTree.java @@ -17,8 +17,8 @@ import java.util.HashMap; import java.util.Map; import java.util.Set; +import org.eclipse.linuxtools.internal.tmf.core.util.TmfFixedArray; import org.eclipse.linuxtools.tmf.core.event.ITmfEvent; -import org.eclipse.linuxtools.tmf.core.util.TmfFixedArray; import org.eclipse.linuxtools.tmf.ui.views.statistics.ITmfExtraEventInfo; /** diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/statistics/model/TmfBaseStatisticsTree.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/statistics/model/TmfBaseStatisticsTree.java index 81c9d501af..00a76a1c44 100755 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/statistics/model/TmfBaseStatisticsTree.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/statistics/model/TmfBaseStatisticsTree.java @@ -18,8 +18,8 @@ import java.util.LinkedList; import java.util.Map; import java.util.Set; +import org.eclipse.linuxtools.internal.tmf.core.util.TmfFixedArray; import org.eclipse.linuxtools.tmf.core.event.ITmfEvent; -import org.eclipse.linuxtools.tmf.core.util.TmfFixedArray; import org.eclipse.linuxtools.tmf.ui.views.statistics.ITmfExtraEventInfo; /** diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/statistics/model/TmfStatisticsTreeNode.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/statistics/model/TmfStatisticsTreeNode.java index cb7408336d..390058d11e 100755 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/statistics/model/TmfStatisticsTreeNode.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/statistics/model/TmfStatisticsTreeNode.java @@ -16,7 +16,7 @@ package org.eclipse.linuxtools.tmf.ui.views.statistics.model; import java.util.Collection; -import org.eclipse.linuxtools.tmf.core.util.TmfFixedArray; +import org.eclipse.linuxtools.internal.tmf.core.util.TmfFixedArray; /** *

A tree where nodes can be accessed efficiently using paths.

diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/load/LoadersManager.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/load/LoadersManager.java index 582b54fd01..f2536c8220 100755 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/load/LoadersManager.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/load/LoadersManager.java @@ -23,7 +23,7 @@ import org.eclipse.core.runtime.IExtension; import org.eclipse.core.runtime.IExtensionPoint; import org.eclipse.core.runtime.Platform; import org.eclipse.jface.preference.IPreferenceStore; -import org.eclipse.linuxtools.tmf.core.Tracer; +import org.eclipse.linuxtools.internal.tmf.core.Tracer; import org.eclipse.linuxtools.tmf.ui.TmfUiPlugin; import org.eclipse.linuxtools.tmf.ui.views.uml2sd.SDView; import org.eclipse.ui.IViewReference; -- 2.34.1