From 6c13869b6380b7a0aad43ce784ce0138e43afe65 Mon Sep 17 00:00:00 2001 From: Francois Chouinard Date: Thu, 24 Nov 2011 14:32:43 -0500 Subject: [PATCH] Re-structure LTTng sub-project as per the Linux Tools guidelines --- .../.classpath | 0 .../.gitignore | 0 .../.project | 0 .../.settings/org.eclipse.jdt.core.prefs | 0 .../ChangeLog | 0 .../META-INF/MANIFEST.MF | 2 +- .../build.properties | 0 .../plugin.properties | 0 .../pom.xml | 2 +- .../lttng/core}/tests/ActivateDebugging.java | 4 +- .../lttng/core}/tests/AllLTTngCoreTests.java | 42 ++-- .../core}/tests/LTTngCoreTestPlugin.java | 4 +- .../core}/tests/LttngTestPreparation.java | 36 +-- .../LTTngSyntheticEventProviderTest.java | 10 +- .../LTTngSyntheticEventProviderTextTest.java | 4 +- .../core}/tests/event/AllLTTngEventTests.java | 5 +- .../tests/event/LttngEventContentTest.java | 20 +- .../tests/event/LttngEventFieldTest.java | 14 +- .../tests/event/LttngEventReferenceTest.java | 10 +- .../core}/tests/event/LttngEventTest.java | 24 +- .../core}/tests/event/LttngEventTypeTest.java | 10 +- .../core}/tests/event/LttngTimestampTest.java | 10 +- .../core}/tests/headless/JniTraceTest.java | 2 +- .../core}/tests/headless/LttngTraceTest.java | 16 +- .../core}/tests/headless/TmfTraceTest.java | 18 +- .../lttng/core}/tests/jni/AllJniTests.java | 2 +- .../lttng/core}/tests/jni/Combinations.java | 2 +- .../lttng/core}/tests/jni/JniEventTest.java | 2 +- .../core}/tests/jni/JniMarkerFieldTest.java | 2 +- .../lttng/core}/tests/jni/JniMarkerTest.java | 2 +- .../lttng/core}/tests/jni/JniTraceTest.java | 2 +- .../core}/tests/jni/JniTracefileTest.java | 2 +- .../core}/tests/model/LTTngTreeNodeTest.java | 30 +-- .../state/StateManagerFactoryTestSupport.java | 12 +- .../core}/tests/state/TestStateManager.java | 4 +- .../StateExperimentManagerTextTest.java | 8 +- .../tests/state/handlers/AbsStateUpdate.java | 18 +- .../after/StateAfterUpdateFactory.java | 6 +- .../after/StateAfterUpdateHandlers.java | 18 +- .../before/StateBeforeUpdateFactory.java | 6 +- .../before/StateBeforeUpdateHandlers.java | 24 +- .../resource/LTTngStateResourceTest.java | 18 +- .../state/tests/handlers/AbsStateUpdate.java | 18 +- .../tests/trace/LTTngExperimentTest.java | 16 +- .../core}/tests/trace/LTTngTextTraceTest.java | 14 +- .../core}/tests/trace/LTTngTraceTest.java | 14 +- .../test.xml | 0 .../traceset/.gitignore | 0 .../trace-15316events_nolost_newformat.tar.gz | Bin .../trace-15316events_nolost_newformat.txt | 0 .../trace-15471events_nolost_newformat.tar.gz | Bin .../trace-15471events_nolost_newformat.txt | 0 .../traceset/trace-2.6.tar.gz | Bin .../META-INF/MANIFEST.MF | 38 ++-- .../lttng/{ => core}/LTTngCorePlugin.java | 2 +- .../lttng/{ => core}/LTTngProjectNature.java | 4 +- .../lttng/{ => core}/LttngConstants.java | 2 +- .../lttng/{ => core}/LttngFactory.java | 6 +- .../lttng/{ => core}/TraceDebug.java | 2 +- .../lttng/{ => core}/TraceHelper.java | 2 +- .../control/LttngCoreProviderFactory.java | 6 +- .../control/LttngSyntheticEventProvider.java | 54 ++--- .../lttng/{ => core}/event/LttngEvent.java | 18 +- .../{ => core}/event/LttngEventContent.java | 10 +- .../{ => core}/event/LttngEventField.java | 6 +- .../{ => core}/event/LttngEventReference.java | 4 +- .../{ => core}/event/LttngEventSource.java | 4 +- .../{ => core}/event/LttngEventType.java | 4 +- .../lttng/{ => core}/event/LttngLocation.java | 4 +- .../{ => core}/event/LttngSyntheticEvent.java | 10 +- .../{ => core}/event/LttngTimestamp.java | 4 +- .../EventOutOfSequenceException.java | 2 +- .../{ => core}/exceptions/LttngException.java | 2 +- .../{ => core}/model/ILTTngTreeNode.java | 2 +- .../lttng/{ => core}/model/LTTngTreeNode.java | 2 +- .../model/LTTngTreeNodeGeneric.java | 8 +- .../request/ILttngSyntEventRequest.java | 10 +- .../request/IRequestStatusListener.java | 2 +- .../request/LttngBaseEventRequest.java | 14 +- .../request/LttngSyntEventRequest.java | 12 +- .../request/RequestCompletedSignal.java | 4 +- .../request/RequestStartedSignal.java | 4 +- .../ILttExperimentSelectedListener.java | 8 +- .../signal/StateExperimentListener.java | 16 +- .../{ => core}/state/LttngStateException.java | 2 +- .../lttng/{ => core}/state/StateStrings.java | 2 +- .../AbsEventToHandlerResolver.java | 12 +- .../evProcessor/IBaseEventProcessor.java | 6 +- .../evProcessor/IEventToHandlerResolver.java | 2 +- .../evProcessor/ILttngEventProcessor.java | 6 +- .../evProcessor/ITransEventProcessor.java | 2 +- .../evProcessor/state/AbsStateProcessing.java | 18 +- .../evProcessor/state/AbsStateUpdate.java | 32 +-- .../state/StateEventToHandlerFactory.java | 8 +- .../state/StateUpdateHandlers.java | 48 ++-- .../experiment/IStateExperimentManager.java | 10 +- .../experiment/StateExperimentManager.java | 44 ++-- .../state/experiment/StateManagerFactory.java | 18 +- .../{ => core}/state/model/LTTngCPUState.java | 6 +- .../state/model/LttngBdevState.java | 6 +- .../state/model/LttngExecutionState.java | 6 +- .../{ => core}/state/model/LttngIRQState.java | 6 +- .../state/model/LttngProcessState.java | 14 +- .../state/model/LttngSoftIRQState.java | 2 +- .../state/model/LttngTraceState.java | 22 +- .../state/model/LttngTrapState.java | 2 +- .../state/model/StateModelFactory.java | 6 +- .../state/resource/ILTTngStateResource.java | 4 +- .../state/resource/ILttngStateContext.java | 6 +- .../state/resource/LTTngStateResource.java | 8 +- .../state/trace/IStateTraceManager.java | 14 +- .../state/trace/StateTraceManager.java | 52 ++--- .../{ => core}/trace/LTTngExperiment.java | 34 +-- .../{ => core}/trace/LTTngTextTrace.java | 30 +-- .../lttng/{ => core}/trace/LTTngTrace.java | 62 +++--- .../{ => core}/trace/LTTngTraceVersion.java | 4 +- .../{ => core}/tracecontrol/Messages.java | 2 +- .../tracecontrol/messages.properties | 0 .../tracecontrol/model/ProviderResource.java | 6 +- .../tracecontrol/model/TargetResource.java | 10 +- .../tracecontrol/model/TraceResource.java | 8 +- .../model/config/TraceChannel.java | 4 +- .../model/config/TraceChannels.java | 6 +- .../model/config/TraceConfig.java | 2 +- .../service/ILttControllerService.java | 4 +- .../service/LttControllerServiceProxy.java | 4 +- .../lttng/stubs/LTTngEventParserStub.java | 8 +- .../lttng/stubs/LTTngTimestampStub.java | 2 +- .../lttng/stubs/LTTngTraceStub.java | 16 +- .../linuxtools/lttng/ui/LTTngUiPlugin.java | 6 +- .../model/trange/TimeRangeEventResource.java | 2 +- .../trange/TimeRangeResourceFactory.java | 10 +- .../model/trange/TimeRangeViewerProvider.java | 14 +- .../actions/ConfigureMarkers.java | 4 +- .../tracecontrol/actions/ConfigureTrace.java | 12 +- .../tracecontrol/actions/CreateNewTrace.java | 10 +- .../ui/tracecontrol/actions/DeleteTrace.java | 2 +- .../tracecontrol/actions/ImportToProject.java | 2 +- .../ui/tracecontrol/actions/PauseTrace.java | 6 +- .../ui/tracecontrol/actions/StartTrace.java | 8 +- .../ui/tracecontrol/actions/StopTrace.java | 8 +- .../TraceConnectorService.java | 6 +- .../dialogs/ConfigureMarkersDialog.java | 4 +- .../dialogs/ImportTraceDialog.java | 6 +- .../tracecontrol/dialogs/NewTraceDialog.java | 8 +- .../model/ProviderResourceAdapter.java | 2 +- .../model/TargetResourceAdapter.java | 2 +- .../model/TraceAdapterFactory.java | 6 +- .../model/TraceResourceAdapter.java | 6 +- .../config/TraceChannelCellModifier.java | 4 +- .../TraceChannelTableContentProvider.java | 2 +- .../TraceChannelTableLabelProvider.java | 2 +- .../subsystems/TraceSubSystem.java | 16 +- .../tracecontrol/utility/DownloadProxy.java | 4 +- .../wizards/ConfigureTraceWizard.java | 10 +- .../ITraceChannelConfigurationPage.java | 2 +- .../KernelTraceChannelConfigurationPage.java | 6 +- .../wizards/TraceConfigurationPage.java | 6 +- .../UstTraceChannelConfigurationPage.java | 4 +- .../ui/views/common/AbsTRangeUpdate.java | 8 +- .../ui/views/common/AbsTimeUpdateView.java | 44 ++-- .../lttng/ui/views/common/ParamsUpdater.java | 6 +- .../ui/views/controlflow/ControlFlowView.java | 26 +-- .../evProcessor/AbsFlowTRangeUpdate.java | 8 +- .../evProcessor/FlowAfterUpdateHandlers.java | 12 +- .../evProcessor/FlowBeforeUpdateHandlers.java | 12 +- .../FlowEventToHandlerFactory.java | 6 +- .../evProcessor/FlowFinishUpdateHandler.java | 10 +- .../model/FlowProcessContainer.java | 2 +- .../lttng/ui/views/events/EventsTable.java | 6 +- .../views/histogram/HistogramDataModel.java | 2 +- .../ui/views/histogram/HistogramRequest.java | 10 +- .../ui/views/histogram/HistogramView.java | 22 +- .../lttng/ui/views/project/ProjectView.java | 14 +- .../dialogs/ImportTraceWizardPage.java | 6 +- .../dialogs/NewLTTngProjectWizard.java | 6 +- .../dialogs/TraceLibraryPathPropertyPage.java | 2 +- .../views/project/model/LTTngProjectNode.java | 2 +- .../ui/views/resources/ResourcesView.java | 24 +- .../evProcessor/AbsResourcesTRangeUpdate.java | 8 +- .../ResourcesAfterUpdateHandlers.java | 6 +- .../ResourcesBeforeUpdateHandlers.java | 14 +- .../ResourcesEventToHandlerFactory.java | 14 +- .../ResourcesFinishUpdateHandler.java | 8 +- .../resources/model/ResourceContainer.java | 2 +- .../ui/views/statistics/StatisticsView.java | 28 +-- .../AbstractStatsEventHandler.java | 8 +- .../evProcessor/StatsModeChangeHandler.java | 6 +- .../evProcessor/StatsModeEndHandler.java | 6 +- .../evProcessor/StatsProcessExitHandler.java | 6 +- .../StatsTimeCountHandlerFactory.java | 6 +- .../evProcessor/StatsTimeCountHandlers.java | 12 +- .../evProcessor/StatsTracesetEndHandler.java | 4 +- .../model/KernelStatisticsData.java | 14 +- .../statistics/model/StatisticsData.java | 4 +- .../ui/views/timeframe/SpinnerGroup.java | 4 +- .../ui/views/timeframe/TimeFrameView.java | 18 +- .../.gitignore | 0 .../.project | 0 .../build.properties | 0 .../epl-v10.html | 0 .../feature.properties | 0 .../feature.xml | 0 .../license.html | 0 .../pom.xml | 0 org.eclipse.linuxtools.tmf-feature/.project | 17 -- org.eclipse.linuxtools.tmf-feature/ChangeLog | 7 - .../build.properties | 4 - .../.classpath | 0 .../.gitignore | 0 .../.options | 0 .../.project | 0 .../.settings/org.eclipse.jdt.core.prefs | 0 .../ChangeLog | 0 .../META-INF/MANIFEST.MF | 4 +- .../build.properties | 0 .../plugin.properties | 0 .../pom.xml | 2 +- .../tmf/core}/tests/AllTmfCoreTests.java | 16 +- .../tmf/core}/tests/TmfCorePluginTest.java | 4 +- .../tmf/core}/tests/TmfCoreTestPlugin.java | 4 +- .../tmf/core}/tests/component/AllTests.java | 2 +- .../tests/component/TmfEventProviderTest.java | 26 +-- .../component/TmfProviderManagerTest.java | 12 +- .../tmf/core}/tests/event/AllTests.java | 4 +- .../tests/event/TmfEventContentTest.java | 20 +- .../core}/tests/event/TmfEventFieldTest.java | 18 +- .../tests/event/TmfEventReferenceTest.java | 4 +- .../core}/tests/event/TmfEventSourceTest.java | 4 +- .../tmf/core}/tests/event/TmfEventTest.java | 14 +- .../core}/tests/event/TmfEventTypeTest.java | 6 +- .../core}/tests/event/TmfTimeRangeTest.java | 6 +- .../core}/tests/event/TmfTimestampTest.java | 4 +- .../core}/tests/event/TmfTraceEventTest.java | 16 +- .../tmf/core}/tests/experiment/AllTests.java | 4 +- .../tests/experiment/TmfExperimentTest.java | 26 +-- .../TmfMultiTraceExperimentTest.java | 26 +-- .../tmf/core}/tests/request/AllTests.java | 4 +- .../request/TmfCoalescedDataRequestTest.java | 10 +- .../request/TmfCoalescedEventRequestTest.java | 30 +-- .../tests/request/TmfDataRequestTest.java | 8 +- .../tests/request/TmfEventRequestTest.java | 14 +- .../tests/request/TmfRequestExecutorTest.java | 14 +- .../tmf/core}/tests/trace/AllTests.java | 4 +- .../core}/tests/trace/TmfCheckpointTest.java | 8 +- .../tmf/core}/tests/trace/TmfContextTest.java | 8 +- .../core}/tests/trace/TmfExperimentTest.java | 24 +- .../core}/tests/trace/TmfLocationTest.java | 6 +- .../tmf/core}/tests/trace/TmfTraceTest.java | 26 +-- .../tmf/core}/tests/uml2sd/AllTests.java | 4 +- .../TmfAsyncSequenceDiagramEventTest.java | 16 +- .../TmfSyncSequenceDiagramEventTest.java | 16 +- .../tmf/core}/tests/util/AllTests.java | 4 +- .../core}/tests/util/TmfFixedArrayTest.java | 4 +- .../tmf/stubs}/CreateTestFiles.java | 2 +- .../tmf/stubs}/component/TmfClientStub.java | 7 +- .../stubs}/component/TmfDataProviderStub.java | 15 +- .../component/TmfEventProviderStub.java | 15 +- .../TmfSyntheticEventProviderStub.java | 21 +- .../tmf/stubs}/event/TmfEventContentStub.java | 6 +- .../tmf/stubs}/event/TmfEventTypeStub.java | 4 +- .../stubs}/event/TmfSyntheticEventStub.java | 4 +- .../stubs}/request/TmfDataRequestStub.java | 5 +- .../stubs}/request/TmfEventRequestStub.java | 7 +- .../tmf/stubs}/trace/TmfEventParserStub.java | 19 +- .../tmf/stubs}/trace/TmfTraceStub.java | 16 +- .../test.xml | 0 .../testfiles/A-Test-10K | Bin .../testfiles/E-Test-10K | Bin .../testfiles/O-Test-10K | Bin .../testfiles/R-Test-10K | Bin .../.classpath | 0 .../.gitignore | 0 .../.options | 0 org.eclipse.linuxtools.tmf.core/.project | 28 +++ .../.settings/org.eclipse.jdt.core.prefs | 0 org.eclipse.linuxtools.tmf.core/ChangeLog | 204 +++++++++++++++++ .../META-INF/MANIFEST.MF | 27 +++ .../about.html | 0 .../build.properties | 8 + .../plugin.properties | 0 .../plugin.xml | 0 .../pom.xml | 26 ++- .../org.eclipse.linuxtools.tmf.tracetype.exsd | 0 .../linuxtools/tmf/core}/TmfCorePlugin.java | 2 +- .../tmf/core}/TmfProjectNature.java | 2 +- .../eclipse/linuxtools/tmf/core}/Tracer.java | 14 +- .../tmf/core}/component/ITmfComponent.java | 4 +- .../tmf/core}/component/ITmfDataProvider.java | 6 +- .../tmf/core}/component/TmfComponent.java | 6 +- .../tmf/core}/component/TmfDataProvider.java | 24 +- .../tmf/core}/component/TmfEventProvider.java | 20 +- .../core}/component/TmfProviderManager.java | 4 +- .../tmf/core}/component/TmfThread.java | 4 +- .../linuxtools/tmf/core}/event/TmfData.java | 2 +- .../linuxtools/tmf/core}/event/TmfEvent.java | 4 +- .../tmf/core}/event/TmfEventContent.java | 2 +- .../tmf/core}/event/TmfEventField.java | 2 +- .../tmf/core}/event/TmfEventReference.java | 2 +- .../tmf/core}/event/TmfEventSource.java | 2 +- .../tmf/core}/event/TmfEventType.java | 2 +- .../core}/event/TmfNoSuchFieldException.java | 2 +- .../tmf/core}/event/TmfTimeRange.java | 2 +- .../tmf/core}/event/TmfTimestamp.java | 2 +- .../tmf/core}/event/TmfTraceEvent.java | 2 +- .../tmf/core}/experiment/TmfExperiment.java | 42 ++-- .../experiment/TmfExperimentCheckpoint.java | 6 +- .../experiment/TmfExperimentContext.java | 10 +- .../experiment/TmfExperimentLocation.java | 4 +- .../core}/experiment/TmfLocationArray.java | 4 +- .../tmf/core}/filter/ITmfFilter.java | 4 +- .../filter/model/ITmfFilterTreeNode.java | 4 +- .../core}/filter/model/TmfFilterAndNode.java | 4 +- .../filter/model/TmfFilterCompareNode.java | 8 +- .../filter/model/TmfFilterContainsNode.java | 6 +- .../filter/model/TmfFilterEqualsNode.java | 6 +- .../filter/model/TmfFilterEventTypeNode.java | 4 +- .../filter/model/TmfFilterMatchesNode.java | 6 +- .../tmf/core}/filter/model/TmfFilterNode.java | 4 +- .../core}/filter/model/TmfFilterOrNode.java | 4 +- .../core}/filter/model/TmfFilterRootNode.java | 4 +- .../core}/filter/model/TmfFilterTreeNode.java | 4 +- .../filter/xml/TmfFilterContentHandler.java | 26 +-- .../core}/filter/xml/TmfFilterXMLParser.java | 4 +- .../core}/filter/xml/TmfFilterXMLWriter.java | 20 +- .../core}/io/BufferedRandomAccessFile.java | 2 +- .../tmf/core}/parser/ITmfEventParser.java | 8 +- .../tmf/core}/request/ITmfDataRequest.java | 4 +- .../tmf/core}/request/ITmfEventRequest.java | 6 +- .../request/TmfCoalescedDataRequest.java | 4 +- .../request/TmfCoalescedEventRequest.java | 8 +- .../tmf/core}/request/TmfDataRequest.java | 6 +- .../tmf/core}/request/TmfEventRequest.java | 6 +- .../tmf/core}/request/TmfRequestExecutor.java | 8 +- .../tmf/core}/signal/TmfEndSynchSignal.java | 2 +- .../signal/TmfExperimentDisposedSignal.java | 6 +- .../TmfExperimentRangeUpdatedSignal.java | 8 +- .../signal/TmfExperimentSelectedSignal.java | 6 +- .../signal/TmfExperimentUpdatedSignal.java | 6 +- .../tmf/core}/signal/TmfRangeSynchSignal.java | 6 +- .../tmf/core}/signal/TmfSignal.java | 2 +- .../tmf/core}/signal/TmfSignalHandler.java | 2 +- .../tmf/core}/signal/TmfSignalManager.java | 4 +- .../tmf/core}/signal/TmfSignalTracer.java | 2 +- .../tmf/core}/signal/TmfStartSynchSignal.java | 2 +- .../tmf/core}/signal/TmfTimeSynchSignal.java | 4 +- .../core}/signal/TmfTraceSelectedSignal.java | 4 +- .../core}/signal/TmfTraceUpdatedSignal.java | 6 +- .../tmf/core}/trace/ITmfContext.java | 2 +- .../tmf/core}/trace/ITmfLocation.java | 2 +- .../linuxtools/tmf/core}/trace/ITmfTrace.java | 10 +- .../tmf/core}/trace/TmfCheckpoint.java | 4 +- .../tmf/core}/trace/TmfContext.java | 2 +- .../tmf/core}/trace/TmfLocation.java | 2 +- .../linuxtools/tmf/core}/trace/TmfTrace.java | 20 +- .../uml2sd/ITmfAsyncSequenceDiagramEvent.java | 4 +- .../uml2sd/ITmfSyncSequenceDiagramEvent.java | 4 +- .../uml2sd/TmfAsyncSequenceDiagramEvent.java | 6 +- .../uml2sd/TmfSyncSequenceDiagramEvent.java | 6 +- .../tmf/core}/util/TmfFixedArray.java | 2 +- .../tmf/core}/util/TmfSortedArrayList.java | 2 +- .../tmf/core}/util/TmfTraceType.java | 2 +- .../traceset/.gitignore | 0 .../TmfBaseColumnDataProviderTest.java | 14 +- .../statistics/TmfBaseColumnDataTest.java | 2 +- .../statistics/TmfBaseStatisticsDataTest.java | 14 +- .../statistics/TmfStatisticsTreeNodeTest.java | 14 +- .../TmfTreeContentProviderTest.java | 14 +- .../uml2sd/impl/IUml2SdSignalValidator.java | 4 +- .../impl/TmfUml2SDSyncLoaderExpTest.java | 2 +- .../impl/TmfUml2SDSyncLoaderFindTest.java | 4 +- .../impl/TmfUml2SDSyncLoaderSignalTest.java | 6 +- .../impl/TmfUml2SDSyncLoaderTimeTest.java | 8 +- .../uml2sd/impl/Uml2SDSignalValidator.java | 16 +- .../views/uml2sd/impl/Uml2SDTestFacility.java | 12 +- .../uml2sd/impl/Uml2SDTestTimestamp.java | 2 +- .../tmf/ui/tests/uml2sd/load/TestLoaders.java | 2 +- .../uml2sd/trace/TmfUml2SDTestTrace.java | 24 +- .../tmf/ui/editors/ITmfTraceEditor.java | 2 +- .../linuxtools/tmf/ui/editors/TmfEditor.java | 6 +- .../tmf/ui/editors/TmfEditorInput.java | 2 +- .../tmf/ui/editors/TmfEventsEditor.java | 10 +- .../ui/editors/TmfMultiPageEditorPart.java | 6 +- .../tmf/ui/parsers/custom/CustomEvent.java | 12 +- .../ui/parsers/custom/CustomEventContent.java | 2 +- .../ui/parsers/custom/CustomEventType.java | 2 +- .../ui/parsers/custom/CustomEventsTable.java | 2 +- .../parsers/custom/CustomTraceDefinition.java | 2 +- .../tmf/ui/parsers/custom/CustomTxtEvent.java | 12 +- .../tmf/ui/parsers/custom/CustomTxtTrace.java | 22 +- .../parsers/custom/CustomTxtTraceContext.java | 6 +- .../tmf/ui/parsers/custom/CustomXmlEvent.java | 12 +- .../tmf/ui/parsers/custom/CustomXmlTrace.java | 22 +- .../parsers/custom/CustomXmlTraceContext.java | 6 +- .../CustomTxtParserOutputWizardPage.java | 2 +- .../CustomXmlParserOutputWizardPage.java | 2 +- .../handlers/OpenExperimentHandler.java | 10 +- .../ui/project/handlers/OpenTraceHandler.java | 10 +- .../SelectTraceTypeContributionItem.java | 2 +- .../handlers/SelectTraceTypeHandler.java | 2 +- .../tmf/ui/project/model/TmfTraceElement.java | 6 +- .../wizards/ImportTraceWizardPage.java | 6 +- .../project/wizards/NewTmfProjectWizard.java | 2 +- .../tmf/ui/signal/TmfTraceClosedSignal.java | 4 +- .../tmf/ui/signal/TmfTraceOpenedSignal.java | 4 +- .../signal/TmfTraceParserUpdatedSignal.java | 2 +- .../events/ITmfEventsFilterListener.java | 4 +- .../tmf/ui/viewers/events/TmfEventsCache.java | 10 +- .../tmf/ui/viewers/events/TmfEventsTable.java | 40 ++-- .../linuxtools/tmf/ui/views/TmfView.java | 6 +- .../tmf/ui/views/colors/ColorSetting.java | 2 +- .../ui/views/colors/ColorSettingsManager.java | 2 +- .../tmf/ui/views/colors/ColorSettingsXML.java | 6 +- .../tmf/ui/views/events/TmfEventsView.java | 10 +- .../tmf/ui/views/filter/FilterDialog.java | 4 +- .../tmf/ui/views/filter/FilterManager.java | 8 +- .../filter/FilterTreeContentProvider.java | 2 +- .../views/filter/FilterTreeLabelProvider.java | 18 +- .../tmf/ui/views/filter/FilterView.java | 10 +- .../tmf/ui/views/filter/FilterViewer.java | 28 +-- .../views/statistics/TmfStatisticsView.java | 26 +-- .../model/AbsTmfStatisticsTree.java | 4 +- .../model/TmfBaseStatisticsTree.java | 4 +- .../model/TmfStatisticsTreeNode.java | 2 +- .../timechart/TimeChartAnalysisEntry.java | 2 +- .../TimeChartDecorationProvider.java | 4 +- .../ui/views/timechart/TimeChartEvent.java | 2 +- .../tmf/ui/views/timechart/TimeChartView.java | 18 +- .../tmf/ui/views/uml2sd/DrawableToolTip.java | 4 +- .../tmf/ui/views/uml2sd/SDWidget.java | 2 +- .../ui/views/uml2sd/TimeCompressionBar.java | 2 +- .../ui/views/uml2sd/core/AsyncMessage.java | 2 +- .../tmf/ui/views/uml2sd/core/BasicFrame.java | 2 +- .../uml2sd/core/ExecutionOccurrence.java | 2 +- .../tmf/ui/views/uml2sd/core/Frame.java | 2 +- .../tmf/ui/views/uml2sd/core/ITimeRange.java | 2 +- .../tmf/ui/views/uml2sd/core/SDTimeEvent.java | 2 +- .../tmf/ui/views/uml2sd/core/SyncMessage.java | 2 +- .../ui/views/uml2sd/impl/TmfAsyncMessage.java | 2 +- .../ui/views/uml2sd/impl/TmfSyncMessage.java | 2 +- .../uml2sd/impl/TmfUml2SDSyncLoader.java | 38 ++-- .../ui/views/uml2sd/load/LoadersManager.java | 2 +- .../ui/views/uml2sd/util/MinMaxDialog.java | 2 +- .../tmf/ui/widgets/TmfRawEventViewer.java | 8 +- org.eclipse.linuxtools.tmf/.project | 17 +- org.eclipse.linuxtools.tmf/ChangeLog | 205 +----------------- .../META-INF/MANIFEST.MF | 27 --- org.eclipse.linuxtools.tmf/build.properties | 12 +- .../epl-v10.html | 0 .../feature.properties | 0 .../feature.xml | 0 .../license.html | 0 org.eclipse.linuxtools.tmf/pom.xml | 26 +-- pom.xml | 10 +- 454 files changed, 2059 insertions(+), 2031 deletions(-) rename {org.eclipse.linuxtools.lttng.tests => org.eclipse.linuxtools.lttng.core.tests}/.classpath (100%) rename {org.eclipse.linuxtools.lttng-feature => org.eclipse.linuxtools.lttng.core.tests}/.gitignore (100%) rename {org.eclipse.linuxtools.lttng.tests => org.eclipse.linuxtools.lttng.core.tests}/.project (100%) rename {org.eclipse.linuxtools.lttng.tests => org.eclipse.linuxtools.lttng.core.tests}/.settings/org.eclipse.jdt.core.prefs (100%) rename {org.eclipse.linuxtools.lttng.tests => org.eclipse.linuxtools.lttng.core.tests}/ChangeLog (100%) rename {org.eclipse.linuxtools.lttng.tests => org.eclipse.linuxtools.lttng.core.tests}/META-INF/MANIFEST.MF (88%) rename {org.eclipse.linuxtools.lttng.tests => org.eclipse.linuxtools.lttng.core.tests}/build.properties (100%) rename {org.eclipse.linuxtools.lttng.tests => org.eclipse.linuxtools.lttng.core.tests}/plugin.properties (100%) rename {org.eclipse.linuxtools.lttng.tests => org.eclipse.linuxtools.lttng.core.tests}/pom.xml (96%) rename {org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng => org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core}/tests/ActivateDebugging.java (62%) rename {org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng => org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core}/tests/AllLTTngCoreTests.java (54%) rename {org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng => org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core}/tests/LTTngCoreTestPlugin.java (95%) rename {org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng => org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core}/tests/LttngTestPreparation.java (91%) rename {org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng => org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core}/tests/control/LTTngSyntheticEventProviderTest.java (90%) rename {org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng => org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core}/tests/control/LTTngSyntheticEventProviderTextTest.java (94%) rename {org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng => org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core}/tests/event/AllLTTngEventTests.java (84%) rename {org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng => org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core}/tests/event/LttngEventContentTest.java (93%) rename {org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng => org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core}/tests/event/LttngEventFieldTest.java (89%) rename {org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng => org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core}/tests/event/LttngEventReferenceTest.java (93%) rename {org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng => org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core}/tests/event/LttngEventTest.java (91%) rename {org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng => org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core}/tests/event/LttngEventTypeTest.java (92%) rename {org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng => org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core}/tests/event/LttngTimestampTest.java (94%) rename {org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxxtools/lttng => org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core}/tests/headless/JniTraceTest.java (98%) rename {org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxxtools/lttng => org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core}/tests/headless/LttngTraceTest.java (86%) rename {org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxxtools/lttng => org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core}/tests/headless/TmfTraceTest.java (87%) rename {org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng => org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core}/tests/jni/AllJniTests.java (90%) rename {org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng => org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core}/tests/jni/Combinations.java (99%) rename {org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng => org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core}/tests/jni/JniEventTest.java (99%) rename {org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng => org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core}/tests/jni/JniMarkerFieldTest.java (98%) rename {org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng => org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core}/tests/jni/JniMarkerTest.java (98%) rename {org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng => org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core}/tests/jni/JniTraceTest.java (99%) rename {org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng => org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core}/tests/jni/JniTracefileTest.java (99%) rename {org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng => org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core}/tests/model/LTTngTreeNodeTest.java (80%) rename {org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng => org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core}/tests/state/StateManagerFactoryTestSupport.java (84%) rename {org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng => org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core}/tests/state/TestStateManager.java (94%) rename {org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng => org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core}/tests/state/experiment/StateExperimentManagerTextTest.java (86%) rename {org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng => org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core}/tests/state/handlers/AbsStateUpdate.java (96%) rename {org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng => org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core}/tests/state/handlers/after/StateAfterUpdateFactory.java (96%) rename {org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng => org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core}/tests/state/handlers/after/StateAfterUpdateHandlers.java (98%) rename {org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng => org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core}/tests/state/handlers/before/StateBeforeUpdateFactory.java (96%) rename {org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng => org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core}/tests/state/handlers/before/StateBeforeUpdateHandlers.java (98%) rename {org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng => org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core}/tests/state/resource/LTTngStateResourceTest.java (87%) rename {org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng => org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core}/tests/state/tests/handlers/AbsStateUpdate.java (96%) rename {org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng => org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core}/tests/trace/LTTngExperimentTest.java (88%) rename {org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng => org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core}/tests/trace/LTTngTextTraceTest.java (97%) rename {org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng => org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core}/tests/trace/LTTngTraceTest.java (97%) rename {org.eclipse.linuxtools.lttng.tests => org.eclipse.linuxtools.lttng.core.tests}/test.xml (100%) rename {org.eclipse.linuxtools.lttng.tests => org.eclipse.linuxtools.lttng.core.tests}/traceset/.gitignore (100%) rename {org.eclipse.linuxtools.lttng.tests => org.eclipse.linuxtools.lttng.core.tests}/traceset/trace-15316events_nolost_newformat.tar.gz (100%) rename {org.eclipse.linuxtools.lttng.tests => org.eclipse.linuxtools.lttng.core.tests}/traceset/trace-15316events_nolost_newformat.txt (100%) rename {org.eclipse.linuxtools.lttng.tests => org.eclipse.linuxtools.lttng.core.tests}/traceset/trace-15471events_nolost_newformat.tar.gz (100%) rename {org.eclipse.linuxtools.lttng.tests => org.eclipse.linuxtools.lttng.core.tests}/traceset/trace-15471events_nolost_newformat.txt (100%) rename {org.eclipse.linuxtools.lttng.tests => org.eclipse.linuxtools.lttng.core.tests}/traceset/trace-2.6.tar.gz (100%) rename org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/{ => core}/LTTngCorePlugin.java (98%) rename org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/{ => core}/LTTngProjectNature.java (88%) rename org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/{ => core}/LttngConstants.java (99%) rename org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/{ => core}/LttngFactory.java (84%) rename org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/{ => core}/TraceDebug.java (95%) rename org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/{ => core}/TraceHelper.java (98%) rename org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/{ => core}/control/LttngCoreProviderFactory.java (92%) rename org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/{ => core}/control/LttngSyntheticEventProvider.java (89%) rename org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/{ => core}/event/LttngEvent.java (91%) rename org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/{ => core}/event/LttngEventContent.java (96%) rename org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/{ => core}/event/LttngEventField.java (92%) rename org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/{ => core}/event/LttngEventReference.java (96%) rename org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/{ => core}/event/LttngEventSource.java (94%) rename org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/{ => core}/event/LttngEventType.java (97%) rename org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/{ => core}/event/LttngLocation.java (97%) rename org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/{ => core}/event/LttngSyntheticEvent.java (95%) rename org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/{ => core}/event/LttngTimestamp.java (97%) rename org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/{ => core}/exceptions/EventOutOfSequenceException.java (82%) rename org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/{ => core}/exceptions/LttngException.java (83%) rename org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/{ => core}/model/ILTTngTreeNode.java (98%) rename org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/{ => core}/model/LTTngTreeNode.java (97%) rename org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/{ => core}/model/LTTngTreeNodeGeneric.java (97%) rename org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/{ => core}/request/ILttngSyntEventRequest.java (88%) rename org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/{ => core}/request/IRequestStatusListener.java (95%) rename org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/{ => core}/request/LttngBaseEventRequest.java (89%) rename org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/{ => core}/request/LttngSyntEventRequest.java (94%) rename org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/{ => core}/request/RequestCompletedSignal.java (71%) rename org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/{ => core}/request/RequestStartedSignal.java (71%) rename org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/{ => core}/signal/ILttExperimentSelectedListener.java (77%) rename org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/{ => core}/signal/StateExperimentListener.java (72%) rename org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/{ => core}/state/LttngStateException.java (98%) rename org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/{ => core}/state/StateStrings.java (99%) rename org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/{ => core}/state/evProcessor/AbsEventToHandlerResolver.java (94%) rename org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/{ => core}/state/evProcessor/IBaseEventProcessor.java (82%) rename org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/{ => core}/state/evProcessor/IEventToHandlerResolver.java (93%) rename org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/{ => core}/state/evProcessor/ILttngEventProcessor.java (85%) rename org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/{ => core}/state/evProcessor/ITransEventProcessor.java (94%) rename org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/{ => core}/state/evProcessor/state/AbsStateProcessing.java (91%) rename org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/{ => core}/state/evProcessor/state/AbsStateUpdate.java (88%) rename org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/{ => core}/state/evProcessor/state/StateEventToHandlerFactory.java (96%) rename org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/{ => core}/state/evProcessor/state/StateUpdateHandlers.java (96%) rename org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/{ => core}/state/experiment/IStateExperimentManager.java (87%) rename org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/{ => core}/state/experiment/StateExperimentManager.java (92%) rename org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/{ => core}/state/experiment/StateManagerFactory.java (89%) rename org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/{ => core}/state/model/LTTngCPUState.java (96%) rename org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/{ => core}/state/model/LttngBdevState.java (93%) rename org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/{ => core}/state/model/LttngExecutionState.java (96%) rename org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/{ => core}/state/model/LttngIRQState.java (93%) rename org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/{ => core}/state/model/LttngProcessState.java (96%) rename org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/{ => core}/state/model/LttngSoftIRQState.java (98%) rename org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/{ => core}/state/model/LttngTraceState.java (95%) rename org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/{ => core}/state/model/LttngTrapState.java (97%) rename org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/{ => core}/state/model/StateModelFactory.java (89%) rename org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/{ => core}/state/resource/ILTTngStateResource.java (96%) rename org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/{ => core}/state/resource/ILttngStateContext.java (89%) rename org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/{ => core}/state/resource/LTTngStateResource.java (90%) rename org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/{ => core}/state/trace/IStateTraceManager.java (84%) rename org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/{ => core}/state/trace/StateTraceManager.java (90%) rename org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/{ => core}/trace/LTTngExperiment.java (90%) rename org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/{ => core}/trace/LTTngTextTrace.java (95%) rename org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/{ => core}/trace/LTTngTrace.java (95%) rename org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/{ => core}/trace/LTTngTraceVersion.java (97%) rename org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/{ => core}/tracecontrol/Messages.java (96%) rename org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/{ => core}/tracecontrol/messages.properties (100%) rename org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/{ => core}/tracecontrol/model/ProviderResource.java (95%) rename org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/{ => core}/tracecontrol/model/TargetResource.java (95%) rename org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/{ => core}/tracecontrol/model/TraceResource.java (98%) rename org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/{ => core}/tracecontrol/model/config/TraceChannel.java (98%) rename org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/{ => core}/tracecontrol/model/config/TraceChannels.java (95%) rename org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/{ => core}/tracecontrol/model/config/TraceConfig.java (98%) rename org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/{ => core}/tracecontrol/service/ILttControllerService.java (98%) rename org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/{ => core}/tracecontrol/service/LttControllerServiceProxy.java (99%) rename {org.eclipse.linuxtools.lttng.tests => org.eclipse.linuxtools.lttng}/.gitignore (100%) rename {org.eclipse.linuxtools.lttng-feature => org.eclipse.linuxtools.lttng}/.project (100%) rename {org.eclipse.linuxtools.lttng-feature => org.eclipse.linuxtools.lttng}/build.properties (100%) rename {org.eclipse.linuxtools.lttng-feature => org.eclipse.linuxtools.lttng}/epl-v10.html (100%) rename {org.eclipse.linuxtools.lttng-feature => org.eclipse.linuxtools.lttng}/feature.properties (100%) rename {org.eclipse.linuxtools.lttng-feature => org.eclipse.linuxtools.lttng}/feature.xml (100%) rename {org.eclipse.linuxtools.lttng-feature => org.eclipse.linuxtools.lttng}/license.html (100%) rename {org.eclipse.linuxtools.lttng-feature => org.eclipse.linuxtools.lttng}/pom.xml (100%) delete mode 100644 org.eclipse.linuxtools.tmf-feature/.project delete mode 100644 org.eclipse.linuxtools.tmf-feature/ChangeLog delete mode 100644 org.eclipse.linuxtools.tmf-feature/build.properties rename {org.eclipse.linuxtools.tmf.tests => org.eclipse.linuxtools.tmf.core.tests}/.classpath (100%) rename {org.eclipse.linuxtools.tmf-feature => org.eclipse.linuxtools.tmf.core.tests}/.gitignore (100%) rename {org.eclipse.linuxtools.tmf.tests => org.eclipse.linuxtools.tmf.core.tests}/.options (100%) rename {org.eclipse.linuxtools.tmf.tests => org.eclipse.linuxtools.tmf.core.tests}/.project (100%) rename {org.eclipse.linuxtools.tmf.tests => org.eclipse.linuxtools.tmf.core.tests}/.settings/org.eclipse.jdt.core.prefs (100%) rename {org.eclipse.linuxtools.tmf.tests => org.eclipse.linuxtools.tmf.core.tests}/ChangeLog (100%) rename {org.eclipse.linuxtools.tmf.tests => org.eclipse.linuxtools.tmf.core.tests}/META-INF/MANIFEST.MF (74%) rename {org.eclipse.linuxtools.tmf.tests => org.eclipse.linuxtools.tmf.core.tests}/build.properties (100%) rename {org.eclipse.linuxtools.tmf.tests => org.eclipse.linuxtools.tmf.core.tests}/plugin.properties (100%) rename {org.eclipse.linuxtools.tmf.tests => org.eclipse.linuxtools.tmf.core.tests}/pom.xml (95%) rename {org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf => org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core}/tests/AllTmfCoreTests.java (61%) rename {org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf => org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core}/tests/TmfCorePluginTest.java (94%) rename {org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf => org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core}/tests/TmfCoreTestPlugin.java (96%) rename {org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf => org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core}/tests/component/AllTests.java (85%) rename {org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf => org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core}/tests/component/TmfEventProviderTest.java (94%) rename {org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf => org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core}/tests/component/TmfProviderManagerTest.java (97%) rename {org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf => org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core}/tests/event/AllTests.java (87%) rename {org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf => org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core}/tests/event/TmfEventContentTest.java (94%) rename {org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf => org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core}/tests/event/TmfEventFieldTest.java (92%) rename {org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf => org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core}/tests/event/TmfEventReferenceTest.java (97%) rename {org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf => org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core}/tests/event/TmfEventSourceTest.java (97%) rename {org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf => org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core}/tests/event/TmfEventTest.java (94%) rename {org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf => org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core}/tests/event/TmfEventTypeTest.java (97%) rename {org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf => org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core}/tests/event/TmfTimeRangeTest.java (98%) rename {org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf => org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core}/tests/event/TmfTimestampTest.java (99%) rename {org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf => org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core}/tests/event/TmfTraceEventTest.java (92%) rename {org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf => org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core}/tests/experiment/AllTests.java (78%) rename {org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf => org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core}/tests/experiment/TmfExperimentTest.java (97%) rename {org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf => org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core}/tests/experiment/TmfMultiTraceExperimentTest.java (97%) rename {org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf => org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core}/tests/request/AllTests.java (84%) rename {org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf => org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core}/tests/request/TmfCoalescedDataRequestTest.java (98%) rename {org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf => org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core}/tests/request/TmfCoalescedEventRequestTest.java (95%) rename {org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf => org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core}/tests/request/TmfDataRequestTest.java (97%) rename {org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf => org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core}/tests/request/TmfEventRequestTest.java (96%) rename {org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf => org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core}/tests/request/TmfRequestExecutorTest.java (83%) rename {org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf => org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core}/tests/trace/AllTests.java (81%) rename {org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf => org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core}/tests/trace/TmfCheckpointTest.java (96%) rename {org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf => org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core}/tests/trace/TmfContextTest.java (97%) rename {org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf => org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core}/tests/trace/TmfExperimentTest.java (97%) rename {org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf => org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core}/tests/trace/TmfLocationTest.java (98%) rename {org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf => org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core}/tests/trace/TmfTraceTest.java (97%) rename {org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf => org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core}/tests/uml2sd/AllTests.java (79%) rename {org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf => org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core}/tests/uml2sd/TmfAsyncSequenceDiagramEventTest.java (90%) rename {org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf => org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core}/tests/uml2sd/TmfSyncSequenceDiagramEventTest.java (88%) rename {org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf => org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core}/tests/util/AllTests.java (76%) rename {org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf => org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core}/tests/util/TmfFixedArrayTest.java (98%) rename {org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf => org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/stubs}/CreateTestFiles.java (99%) rename {org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf => org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/stubs}/component/TmfClientStub.java (78%) rename {org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf => org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/stubs}/component/TmfDataProviderStub.java (82%) rename {org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf => org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/stubs}/component/TmfEventProviderStub.java (82%) rename {org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf => org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/stubs}/component/TmfSyntheticEventProviderStub.java (79%) rename {org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf => org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/stubs}/event/TmfEventContentStub.java (88%) rename {org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf => org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/stubs}/event/TmfEventTypeStub.java (88%) rename {org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf => org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/stubs}/event/TmfSyntheticEventStub.java (88%) rename {org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf => org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/stubs}/request/TmfDataRequestStub.java (89%) rename {org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf => org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/stubs}/request/TmfEventRequestStub.java (86%) rename {org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf => org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/stubs}/trace/TmfEventParserStub.java (85%) rename {org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf => org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/stubs}/trace/TmfTraceStub.java (92%) rename {org.eclipse.linuxtools.tmf.tests => org.eclipse.linuxtools.tmf.core.tests}/test.xml (100%) rename {org.eclipse.linuxtools.tmf.tests => org.eclipse.linuxtools.tmf.core.tests}/testfiles/A-Test-10K (100%) rename {org.eclipse.linuxtools.tmf.tests => org.eclipse.linuxtools.tmf.core.tests}/testfiles/E-Test-10K (100%) rename {org.eclipse.linuxtools.tmf.tests => org.eclipse.linuxtools.tmf.core.tests}/testfiles/O-Test-10K (100%) rename {org.eclipse.linuxtools.tmf.tests => org.eclipse.linuxtools.tmf.core.tests}/testfiles/R-Test-10K (100%) rename {org.eclipse.linuxtools.tmf => org.eclipse.linuxtools.tmf.core}/.classpath (100%) rename {org.eclipse.linuxtools.tmf.tests => org.eclipse.linuxtools.tmf.core}/.gitignore (100%) rename {org.eclipse.linuxtools.tmf => org.eclipse.linuxtools.tmf.core}/.options (100%) create mode 100644 org.eclipse.linuxtools.tmf.core/.project rename {org.eclipse.linuxtools.tmf => org.eclipse.linuxtools.tmf.core}/.settings/org.eclipse.jdt.core.prefs (100%) create mode 100644 org.eclipse.linuxtools.tmf.core/ChangeLog create mode 100644 org.eclipse.linuxtools.tmf.core/META-INF/MANIFEST.MF rename {org.eclipse.linuxtools.tmf => org.eclipse.linuxtools.tmf.core}/about.html (100%) create mode 100644 org.eclipse.linuxtools.tmf.core/build.properties rename {org.eclipse.linuxtools.tmf => org.eclipse.linuxtools.tmf.core}/plugin.properties (100%) rename {org.eclipse.linuxtools.tmf => org.eclipse.linuxtools.tmf.core}/plugin.xml (100%) rename {org.eclipse.linuxtools.tmf-feature => org.eclipse.linuxtools.tmf.core}/pom.xml (55%) rename {org.eclipse.linuxtools.tmf => org.eclipse.linuxtools.tmf.core}/schema/org.eclipse.linuxtools.tmf.tracetype.exsd (100%) rename {org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf => org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core}/TmfCorePlugin.java (98%) rename {org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf => org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core}/TmfProjectNature.java (96%) rename {org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf => org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core}/Tracer.java (90%) rename {org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf => org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core}/component/ITmfComponent.java (90%) rename {org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf => org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core}/component/ITmfDataProvider.java (85%) rename {org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf => org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core}/component/TmfComponent.java (92%) rename {org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf => org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core}/component/TmfDataProvider.java (94%) rename {org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf => org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core}/component/TmfEventProvider.java (90%) rename {org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf => org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core}/component/TmfProviderManager.java (97%) rename {org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf => org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core}/component/TmfThread.java (69%) rename {org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf => org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core}/event/TmfData.java (93%) rename {org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf => org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core}/event/TmfEvent.java (98%) rename {org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf => org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core}/event/TmfEventContent.java (99%) rename {org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf => org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core}/event/TmfEventField.java (98%) rename {org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf => org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core}/event/TmfEventReference.java (98%) rename {org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf => org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core}/event/TmfEventSource.java (98%) rename {org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf => org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core}/event/TmfEventType.java (98%) rename {org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf => org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core}/event/TmfNoSuchFieldException.java (94%) rename {org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf => org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core}/event/TmfTimeRange.java (99%) rename {org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf => org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core}/event/TmfTimestamp.java (99%) rename {org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf => org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core}/event/TmfTraceEvent.java (98%) rename {org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf => org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core}/experiment/TmfExperiment.java (95%) rename {org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf => org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core}/experiment/TmfExperimentCheckpoint.java (94%) rename {org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf => org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core}/experiment/TmfExperimentContext.java (94%) rename {org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf => org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core}/experiment/TmfExperimentLocation.java (93%) rename {org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf => org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core}/experiment/TmfLocationArray.java (93%) rename {org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf => org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core}/filter/ITmfFilter.java (85%) rename {org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf => org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core}/filter/model/ITmfFilterTreeNode.java (93%) rename {org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf => org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core}/filter/model/TmfFilterAndNode.java (91%) rename {org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf => org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core}/filter/model/TmfFilterCompareNode.java (92%) rename {org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf => org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core}/filter/model/TmfFilterContainsNode.java (90%) rename {org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf => org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core}/filter/model/TmfFilterEqualsNode.java (90%) rename {org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf => org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core}/filter/model/TmfFilterEventTypeNode.java (92%) rename {org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf => org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core}/filter/model/TmfFilterMatchesNode.java (90%) rename {org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf => org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core}/filter/model/TmfFilterNode.java (91%) rename {org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf => org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core}/filter/model/TmfFilterOrNode.java (91%) rename {org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf => org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core}/filter/model/TmfFilterRootNode.java (87%) rename {org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf => org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core}/filter/model/TmfFilterTreeNode.java (94%) rename {org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf => org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core}/filter/xml/TmfFilterContentHandler.java (85%) rename {org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf => org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core}/filter/xml/TmfFilterXMLParser.java (90%) rename {org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf => org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core}/filter/xml/TmfFilterXMLWriter.java (87%) rename {org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf => org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core}/io/BufferedRandomAccessFile.java (95%) rename {org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf => org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core}/parser/ITmfEventParser.java (79%) rename {org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf => org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core}/request/ITmfDataRequest.java (96%) rename {org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf => org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core}/request/ITmfEventRequest.java (85%) rename {org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf => org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core}/request/TmfCoalescedDataRequest.java (98%) rename {org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf => org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core}/request/TmfCoalescedEventRequest.java (96%) rename {org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf => org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core}/request/TmfDataRequest.java (98%) rename {org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf => org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core}/request/TmfEventRequest.java (96%) rename {org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf => org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core}/request/TmfRequestExecutor.java (94%) rename {org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf => org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core}/signal/TmfEndSynchSignal.java (93%) rename {org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf => org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core}/signal/TmfExperimentDisposedSignal.java (86%) rename {org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf => org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core}/signal/TmfExperimentRangeUpdatedSignal.java (85%) rename {org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf => org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core}/signal/TmfExperimentSelectedSignal.java (86%) rename {org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf => org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core}/signal/TmfExperimentUpdatedSignal.java (88%) rename {org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf => org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core}/signal/TmfRangeSynchSignal.java (86%) rename {org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf => org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core}/signal/TmfSignal.java (95%) rename {org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf => org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core}/signal/TmfSignalHandler.java (94%) rename {org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf => org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core}/signal/TmfSignalManager.java (98%) rename {org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf => org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core}/signal/TmfSignalTracer.java (95%) rename {org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf => org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core}/signal/TmfStartSynchSignal.java (93%) rename {org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf => org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core}/signal/TmfTimeSynchSignal.java (90%) rename {org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf => org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core}/signal/TmfTraceSelectedSignal.java (87%) rename {org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf => org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core}/signal/TmfTraceUpdatedSignal.java (88%) rename {org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf => org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core}/trace/ITmfContext.java (95%) rename {org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf => org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core}/trace/ITmfLocation.java (94%) rename {org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf => org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core}/trace/ITmfTrace.java (93%) rename {org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf => org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core}/trace/TmfCheckpoint.java (97%) rename {org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf => org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core}/trace/TmfContext.java (98%) rename {org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf => org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core}/trace/TmfLocation.java (98%) rename {org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf => org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core}/trace/TmfTrace.java (96%) rename {org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf => org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core}/uml2sd/ITmfAsyncSequenceDiagramEvent.java (86%) rename {org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf => org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core}/uml2sd/ITmfSyncSequenceDiagramEvent.java (89%) rename {org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf => org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core}/uml2sd/TmfAsyncSequenceDiagramEvent.java (92%) rename {org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf => org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core}/uml2sd/TmfSyncSequenceDiagramEvent.java (94%) rename {org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf => org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core}/util/TmfFixedArray.java (99%) rename {org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf => org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core}/util/TmfSortedArrayList.java (95%) rename {org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf => org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core}/util/TmfTraceType.java (98%) rename {org.eclipse.linuxtools.tmf => org.eclipse.linuxtools.tmf.core}/traceset/.gitignore (100%) delete mode 100644 org.eclipse.linuxtools.tmf/META-INF/MANIFEST.MF rename {org.eclipse.linuxtools.tmf-feature => org.eclipse.linuxtools.tmf}/epl-v10.html (100%) rename {org.eclipse.linuxtools.tmf-feature => org.eclipse.linuxtools.tmf}/feature.properties (100%) rename {org.eclipse.linuxtools.tmf-feature => org.eclipse.linuxtools.tmf}/feature.xml (100%) rename {org.eclipse.linuxtools.tmf-feature => org.eclipse.linuxtools.tmf}/license.html (100%) diff --git a/org.eclipse.linuxtools.lttng.tests/.classpath b/org.eclipse.linuxtools.lttng.core.tests/.classpath similarity index 100% rename from org.eclipse.linuxtools.lttng.tests/.classpath rename to org.eclipse.linuxtools.lttng.core.tests/.classpath diff --git a/org.eclipse.linuxtools.lttng-feature/.gitignore b/org.eclipse.linuxtools.lttng.core.tests/.gitignore similarity index 100% rename from org.eclipse.linuxtools.lttng-feature/.gitignore rename to org.eclipse.linuxtools.lttng.core.tests/.gitignore diff --git a/org.eclipse.linuxtools.lttng.tests/.project b/org.eclipse.linuxtools.lttng.core.tests/.project similarity index 100% rename from org.eclipse.linuxtools.lttng.tests/.project rename to org.eclipse.linuxtools.lttng.core.tests/.project diff --git a/org.eclipse.linuxtools.lttng.tests/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.linuxtools.lttng.core.tests/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from org.eclipse.linuxtools.lttng.tests/.settings/org.eclipse.jdt.core.prefs rename to org.eclipse.linuxtools.lttng.core.tests/.settings/org.eclipse.jdt.core.prefs diff --git a/org.eclipse.linuxtools.lttng.tests/ChangeLog b/org.eclipse.linuxtools.lttng.core.tests/ChangeLog similarity index 100% rename from org.eclipse.linuxtools.lttng.tests/ChangeLog rename to org.eclipse.linuxtools.lttng.core.tests/ChangeLog diff --git a/org.eclipse.linuxtools.lttng.tests/META-INF/MANIFEST.MF b/org.eclipse.linuxtools.lttng.core.tests/META-INF/MANIFEST.MF similarity index 88% rename from org.eclipse.linuxtools.lttng.tests/META-INF/MANIFEST.MF rename to org.eclipse.linuxtools.lttng.core.tests/META-INF/MANIFEST.MF index 8f91898b51..ed7bbd1071 100644 --- a/org.eclipse.linuxtools.lttng.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.linuxtools.lttng.core.tests/META-INF/MANIFEST.MF @@ -11,6 +11,6 @@ Require-Bundle: org.junit;bundle-version="3.8.2", org.eclipse.linuxtools.tmf.core;bundle-version="0.4.0", org.eclipse.linuxtools.lttng.jni;bundle-version="0.4.0" Bundle-Localization: plugin -Bundle-Activator: org.eclipse.linuxtools.lttng.tests.LTTngCoreTestPlugin +Bundle-Activator: org.eclipse.linuxtools.lttng.core.tests.LTTngCoreTestPlugin Bundle-ActivationPolicy: lazy Import-Package: org.eclipse.linuxtools.lttng.jni diff --git a/org.eclipse.linuxtools.lttng.tests/build.properties b/org.eclipse.linuxtools.lttng.core.tests/build.properties similarity index 100% rename from org.eclipse.linuxtools.lttng.tests/build.properties rename to org.eclipse.linuxtools.lttng.core.tests/build.properties diff --git a/org.eclipse.linuxtools.lttng.tests/plugin.properties b/org.eclipse.linuxtools.lttng.core.tests/plugin.properties similarity index 100% rename from org.eclipse.linuxtools.lttng.tests/plugin.properties rename to org.eclipse.linuxtools.lttng.core.tests/plugin.properties diff --git a/org.eclipse.linuxtools.lttng.tests/pom.xml b/org.eclipse.linuxtools.lttng.core.tests/pom.xml similarity index 96% rename from org.eclipse.linuxtools.lttng.tests/pom.xml rename to org.eclipse.linuxtools.lttng.core.tests/pom.xml index a5c97855ae..133a0f0682 100644 --- a/org.eclipse.linuxtools.lttng.tests/pom.xml +++ b/org.eclipse.linuxtools.lttng.core.tests/pom.xml @@ -63,7 +63,7 @@ ${tycho-version} org.eclipse.linuxtools.lttng.core.tests - org.eclipse.linuxtools.lttng.tests.AllLTTngCoreTests + org.eclipse.linuxtools.lttng.core.tests.AllLTTngCoreTests false false org.eclipse.sdk.ide diff --git a/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/ActivateDebugging.java b/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/ActivateDebugging.java similarity index 62% rename from org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/ActivateDebugging.java rename to org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/ActivateDebugging.java index 0552775487..178c16f1d5 100644 --- a/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/ActivateDebugging.java +++ b/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/ActivateDebugging.java @@ -1,6 +1,6 @@ -package org.eclipse.linuxtools.lttng.tests; +package org.eclipse.linuxtools.lttng.core.tests; -import org.eclipse.linuxtools.lttng.TraceDebug; +import org.eclipse.linuxtools.lttng.core.TraceDebug; public class ActivateDebugging { diff --git a/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/AllLTTngCoreTests.java b/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/AllLTTngCoreTests.java similarity index 54% rename from org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/AllLTTngCoreTests.java rename to org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/AllLTTngCoreTests.java index 8641033b9e..151868b969 100644 --- a/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/AllLTTngCoreTests.java +++ b/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/AllLTTngCoreTests.java @@ -1,28 +1,28 @@ -package org.eclipse.linuxtools.lttng.tests; +package org.eclipse.linuxtools.lttng.core.tests; import junit.framework.Test; import junit.framework.TestSuite; -import org.eclipse.linuxtools.lttng.tests.control.LTTngSyntheticEventProviderTest; -import org.eclipse.linuxtools.lttng.tests.control.LTTngSyntheticEventProviderTextTest; -import org.eclipse.linuxtools.lttng.tests.event.LttngEventContentTest; -import org.eclipse.linuxtools.lttng.tests.event.LttngEventFieldTest; -import org.eclipse.linuxtools.lttng.tests.event.LttngEventReferenceTest; -import org.eclipse.linuxtools.lttng.tests.event.LttngEventTest; -import org.eclipse.linuxtools.lttng.tests.event.LttngEventTypeTest; -import org.eclipse.linuxtools.lttng.tests.event.LttngTimestampTest; -import org.eclipse.linuxtools.lttng.tests.jni.JniEventTest; -import org.eclipse.linuxtools.lttng.tests.jni.JniMarkerFieldTest; -import org.eclipse.linuxtools.lttng.tests.jni.JniMarkerTest; -import org.eclipse.linuxtools.lttng.tests.jni.JniTraceTest; -import org.eclipse.linuxtools.lttng.tests.jni.JniTracefileTest; -import org.eclipse.linuxtools.lttng.tests.model.LTTngTreeNodeTest; -import org.eclipse.linuxtools.lttng.tests.state.TestStateManager; -import org.eclipse.linuxtools.lttng.tests.state.experiment.StateExperimentManagerTextTest; -import org.eclipse.linuxtools.lttng.tests.state.resource.LTTngStateResourceTest; -import org.eclipse.linuxtools.lttng.tests.trace.LTTngExperimentTest; -import org.eclipse.linuxtools.lttng.tests.trace.LTTngTextTraceTest; -import org.eclipse.linuxtools.lttng.tests.trace.LTTngTraceTest; +import org.eclipse.linuxtools.lttng.core.tests.control.LTTngSyntheticEventProviderTest; +import org.eclipse.linuxtools.lttng.core.tests.control.LTTngSyntheticEventProviderTextTest; +import org.eclipse.linuxtools.lttng.core.tests.event.LttngEventContentTest; +import org.eclipse.linuxtools.lttng.core.tests.event.LttngEventFieldTest; +import org.eclipse.linuxtools.lttng.core.tests.event.LttngEventReferenceTest; +import org.eclipse.linuxtools.lttng.core.tests.event.LttngEventTest; +import org.eclipse.linuxtools.lttng.core.tests.event.LttngEventTypeTest; +import org.eclipse.linuxtools.lttng.core.tests.event.LttngTimestampTest; +import org.eclipse.linuxtools.lttng.core.tests.jni.JniEventTest; +import org.eclipse.linuxtools.lttng.core.tests.jni.JniMarkerFieldTest; +import org.eclipse.linuxtools.lttng.core.tests.jni.JniMarkerTest; +import org.eclipse.linuxtools.lttng.core.tests.jni.JniTraceTest; +import org.eclipse.linuxtools.lttng.core.tests.jni.JniTracefileTest; +import org.eclipse.linuxtools.lttng.core.tests.model.LTTngTreeNodeTest; +import org.eclipse.linuxtools.lttng.core.tests.state.TestStateManager; +import org.eclipse.linuxtools.lttng.core.tests.state.experiment.StateExperimentManagerTextTest; +import org.eclipse.linuxtools.lttng.core.tests.state.resource.LTTngStateResourceTest; +import org.eclipse.linuxtools.lttng.core.tests.trace.LTTngExperimentTest; +import org.eclipse.linuxtools.lttng.core.tests.trace.LTTngTextTraceTest; +import org.eclipse.linuxtools.lttng.core.tests.trace.LTTngTraceTest; public class AllLTTngCoreTests { diff --git a/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/LTTngCoreTestPlugin.java b/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/LTTngCoreTestPlugin.java similarity index 95% rename from org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/LTTngCoreTestPlugin.java rename to org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/LTTngCoreTestPlugin.java index 9bdeaaf77b..fbb9aa03fe 100644 --- a/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/LTTngCoreTestPlugin.java +++ b/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/LTTngCoreTestPlugin.java @@ -10,10 +10,10 @@ * Francois Chouinard - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.lttng.tests; +package org.eclipse.linuxtools.lttng.core.tests; import org.eclipse.core.runtime.Plugin; -import org.eclipse.linuxtools.tmf.Tracer; +import org.eclipse.linuxtools.tmf.core.Tracer; import org.osgi.framework.BundleContext; /** diff --git a/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/LttngTestPreparation.java b/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/LttngTestPreparation.java similarity index 91% rename from org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/LttngTestPreparation.java rename to org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/LttngTestPreparation.java index 99ab18330d..1ffa3276c5 100644 --- a/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/LttngTestPreparation.java +++ b/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/LttngTestPreparation.java @@ -1,4 +1,4 @@ -package org.eclipse.linuxtools.lttng.tests; +package org.eclipse.linuxtools.lttng.core.tests; import java.io.File; import java.net.URL; @@ -7,23 +7,23 @@ import junit.framework.TestCase; import org.eclipse.core.runtime.FileLocator; import org.eclipse.core.runtime.Path; -import org.eclipse.linuxtools.lttng.TraceDebug; -import org.eclipse.linuxtools.lttng.control.LttngCoreProviderFactory; -import org.eclipse.linuxtools.lttng.event.LttngEvent; -import org.eclipse.linuxtools.lttng.event.LttngSyntheticEvent; -import org.eclipse.linuxtools.lttng.event.LttngSyntheticEvent.SequenceInd; -import org.eclipse.linuxtools.lttng.event.LttngTimestamp; -import org.eclipse.linuxtools.lttng.state.experiment.IStateExperimentManager; -import org.eclipse.linuxtools.lttng.state.experiment.StateManagerFactory; -import org.eclipse.linuxtools.lttng.trace.LTTngTextTrace; -import org.eclipse.linuxtools.lttng.trace.LTTngTrace; -import org.eclipse.linuxtools.tmf.event.TmfTimeRange; -import org.eclipse.linuxtools.tmf.event.TmfTimestamp; -import org.eclipse.linuxtools.tmf.experiment.TmfExperiment; -import org.eclipse.linuxtools.tmf.request.TmfDataRequest; -import org.eclipse.linuxtools.tmf.request.TmfEventRequest; -import org.eclipse.linuxtools.tmf.signal.TmfExperimentSelectedSignal; -import org.eclipse.linuxtools.tmf.trace.ITmfTrace; +import org.eclipse.linuxtools.lttng.core.TraceDebug; +import org.eclipse.linuxtools.lttng.core.control.LttngCoreProviderFactory; +import org.eclipse.linuxtools.lttng.core.event.LttngEvent; +import org.eclipse.linuxtools.lttng.core.event.LttngSyntheticEvent; +import org.eclipse.linuxtools.lttng.core.event.LttngTimestamp; +import org.eclipse.linuxtools.lttng.core.event.LttngSyntheticEvent.SequenceInd; +import org.eclipse.linuxtools.lttng.core.state.experiment.IStateExperimentManager; +import org.eclipse.linuxtools.lttng.core.state.experiment.StateManagerFactory; +import org.eclipse.linuxtools.lttng.core.trace.LTTngTextTrace; +import org.eclipse.linuxtools.lttng.core.trace.LTTngTrace; +import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange; +import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp; +import org.eclipse.linuxtools.tmf.core.experiment.TmfExperiment; +import org.eclipse.linuxtools.tmf.core.request.TmfDataRequest; +import org.eclipse.linuxtools.tmf.core.request.TmfEventRequest; +import org.eclipse.linuxtools.tmf.core.signal.TmfExperimentSelectedSignal; +import org.eclipse.linuxtools.tmf.core.trace.ITmfTrace; @SuppressWarnings("nls") public abstract class LttngTestPreparation extends TestCase { diff --git a/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/control/LTTngSyntheticEventProviderTest.java b/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/control/LTTngSyntheticEventProviderTest.java similarity index 90% rename from org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/control/LTTngSyntheticEventProviderTest.java rename to org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/control/LTTngSyntheticEventProviderTest.java index 7f2d79d0c6..b446695999 100644 --- a/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/control/LTTngSyntheticEventProviderTest.java +++ b/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/control/LTTngSyntheticEventProviderTest.java @@ -9,12 +9,12 @@ * Contributors: * Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.lttng.tests.control; +package org.eclipse.linuxtools.lttng.core.tests.control; -import org.eclipse.linuxtools.lttng.event.LttngEvent; -import org.eclipse.linuxtools.lttng.tests.LttngTestPreparation; -import org.eclipse.linuxtools.tmf.experiment.TmfExperiment; -import org.eclipse.linuxtools.tmf.request.TmfEventRequest; +import org.eclipse.linuxtools.lttng.core.event.LttngEvent; +import org.eclipse.linuxtools.lttng.core.tests.LttngTestPreparation; +import org.eclipse.linuxtools.tmf.core.experiment.TmfExperiment; +import org.eclipse.linuxtools.tmf.core.request.TmfEventRequest; @SuppressWarnings("nls") public class LTTngSyntheticEventProviderTest extends LttngTestPreparation { diff --git a/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/control/LTTngSyntheticEventProviderTextTest.java b/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/control/LTTngSyntheticEventProviderTextTest.java similarity index 94% rename from org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/control/LTTngSyntheticEventProviderTextTest.java rename to org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/control/LTTngSyntheticEventProviderTextTest.java index e44fbe338e..f36ead13df 100644 --- a/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/control/LTTngSyntheticEventProviderTextTest.java +++ b/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/control/LTTngSyntheticEventProviderTextTest.java @@ -9,11 +9,11 @@ * Contributors: * Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.lttng.tests.control; +package org.eclipse.linuxtools.lttng.core.tests.control; -import org.eclipse.linuxtools.lttng.tests.LttngTestPreparation; +import org.eclipse.linuxtools.lttng.core.tests.LttngTestPreparation; public class LTTngSyntheticEventProviderTextTest extends LttngTestPreparation { diff --git a/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/event/AllLTTngEventTests.java b/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/event/AllLTTngEventTests.java similarity index 84% rename from org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/event/AllLTTngEventTests.java rename to org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/event/AllLTTngEventTests.java index 03f55936f4..406aeb4b8f 100644 --- a/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/event/AllLTTngEventTests.java +++ b/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/event/AllLTTngEventTests.java @@ -1,8 +1,9 @@ -package org.eclipse.linuxtools.lttng.tests.event; +package org.eclipse.linuxtools.lttng.core.tests.event; import junit.framework.TestCase; import junit.framework.TestSuite; -import org.eclipse.linuxtools.lttng.tests.trace.LTTngTextTraceTest;; + +import org.eclipse.linuxtools.lttng.core.tests.trace.LTTngTextTraceTest; @SuppressWarnings("nls") public final class AllLTTngEventTests extends TestCase { diff --git a/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/event/LttngEventContentTest.java b/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/event/LttngEventContentTest.java similarity index 93% rename from org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/event/LttngEventContentTest.java rename to org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/event/LttngEventContentTest.java index e18a3f9321..3a8b7da267 100644 --- a/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/event/LttngEventContentTest.java +++ b/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/event/LttngEventContentTest.java @@ -1,4 +1,4 @@ -package org.eclipse.linuxtools.lttng.tests.event; +package org.eclipse.linuxtools.lttng.core.tests.event; import java.io.File; import java.net.URL; @@ -8,15 +8,15 @@ import junit.framework.TestCase; import org.eclipse.core.runtime.FileLocator; import org.eclipse.core.runtime.Path; -import org.eclipse.linuxtools.lttng.event.LttngEvent; -import org.eclipse.linuxtools.lttng.event.LttngEventContent; -import org.eclipse.linuxtools.lttng.event.LttngEventField; -import org.eclipse.linuxtools.lttng.event.LttngEventType; -import org.eclipse.linuxtools.lttng.event.LttngTimestamp; -import org.eclipse.linuxtools.lttng.tests.LTTngCoreTestPlugin; -import org.eclipse.linuxtools.lttng.trace.LTTngTextTrace; -import org.eclipse.linuxtools.tmf.trace.TmfContext; -import org.eclipse.linuxtools.tmf.trace.TmfLocation; +import org.eclipse.linuxtools.lttng.core.event.LttngEvent; +import org.eclipse.linuxtools.lttng.core.event.LttngEventContent; +import org.eclipse.linuxtools.lttng.core.event.LttngEventField; +import org.eclipse.linuxtools.lttng.core.event.LttngEventType; +import org.eclipse.linuxtools.lttng.core.event.LttngTimestamp; +import org.eclipse.linuxtools.lttng.core.tests.LTTngCoreTestPlugin; +import org.eclipse.linuxtools.lttng.core.trace.LTTngTextTrace; +import org.eclipse.linuxtools.tmf.core.trace.TmfContext; +import org.eclipse.linuxtools.tmf.core.trace.TmfLocation; /* Functions tested here : diff --git a/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/event/LttngEventFieldTest.java b/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/event/LttngEventFieldTest.java similarity index 89% rename from org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/event/LttngEventFieldTest.java rename to org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/event/LttngEventFieldTest.java index 64b3936878..b6218f4553 100644 --- a/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/event/LttngEventFieldTest.java +++ b/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/event/LttngEventFieldTest.java @@ -1,4 +1,4 @@ -package org.eclipse.linuxtools.lttng.tests.event; +package org.eclipse.linuxtools.lttng.core.tests.event; @@ -9,12 +9,12 @@ import junit.framework.TestCase; import org.eclipse.core.runtime.FileLocator; import org.eclipse.core.runtime.Path; -import org.eclipse.linuxtools.lttng.event.LttngEventContent; -import org.eclipse.linuxtools.lttng.event.LttngEventField; -import org.eclipse.linuxtools.lttng.tests.LTTngCoreTestPlugin; -import org.eclipse.linuxtools.lttng.trace.LTTngTextTrace; -import org.eclipse.linuxtools.tmf.trace.TmfContext; -import org.eclipse.linuxtools.tmf.trace.TmfLocation; +import org.eclipse.linuxtools.lttng.core.event.LttngEventContent; +import org.eclipse.linuxtools.lttng.core.event.LttngEventField; +import org.eclipse.linuxtools.lttng.core.tests.LTTngCoreTestPlugin; +import org.eclipse.linuxtools.lttng.core.trace.LTTngTextTrace; +import org.eclipse.linuxtools.tmf.core.trace.TmfContext; +import org.eclipse.linuxtools.tmf.core.trace.TmfLocation; /* Functions tested here : diff --git a/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/event/LttngEventReferenceTest.java b/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/event/LttngEventReferenceTest.java similarity index 93% rename from org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/event/LttngEventReferenceTest.java rename to org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/event/LttngEventReferenceTest.java index 5c01b3bee8..47de6156cd 100644 --- a/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/event/LttngEventReferenceTest.java +++ b/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/event/LttngEventReferenceTest.java @@ -1,4 +1,4 @@ -package org.eclipse.linuxtools.lttng.tests.event; +package org.eclipse.linuxtools.lttng.core.tests.event; import java.io.File; import java.net.URL; @@ -6,10 +6,10 @@ import java.net.URL; import junit.framework.TestCase; import org.eclipse.core.runtime.FileLocator; import org.eclipse.core.runtime.Path; -import org.eclipse.linuxtools.lttng.event.LttngEventReference; -import org.eclipse.linuxtools.lttng.tests.LTTngCoreTestPlugin; -import org.eclipse.linuxtools.lttng.trace.LTTngTextTrace; -import org.eclipse.linuxtools.tmf.trace.TmfContext; +import org.eclipse.linuxtools.lttng.core.event.LttngEventReference; +import org.eclipse.linuxtools.lttng.core.tests.LTTngCoreTestPlugin; +import org.eclipse.linuxtools.lttng.core.trace.LTTngTextTrace; +import org.eclipse.linuxtools.tmf.core.trace.TmfContext; /* Functions tested here : diff --git a/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/event/LttngEventTest.java b/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/event/LttngEventTest.java similarity index 91% rename from org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/event/LttngEventTest.java rename to org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/event/LttngEventTest.java index f713dcf887..aad70453d6 100644 --- a/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/event/LttngEventTest.java +++ b/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/event/LttngEventTest.java @@ -1,4 +1,4 @@ -package org.eclipse.linuxtools.lttng.tests.event; +package org.eclipse.linuxtools.lttng.core.tests.event; import java.io.File; import java.net.URL; @@ -7,18 +7,18 @@ import junit.framework.TestCase; import org.eclipse.core.runtime.FileLocator; import org.eclipse.core.runtime.Path; -import org.eclipse.linuxtools.lttng.event.LttngEvent; -import org.eclipse.linuxtools.lttng.event.LttngEventContent; -import org.eclipse.linuxtools.lttng.event.LttngEventReference; -import org.eclipse.linuxtools.lttng.event.LttngEventType; -import org.eclipse.linuxtools.lttng.event.LttngTimestamp; +import org.eclipse.linuxtools.lttng.core.event.LttngEvent; +import org.eclipse.linuxtools.lttng.core.event.LttngEventContent; +import org.eclipse.linuxtools.lttng.core.event.LttngEventReference; +import org.eclipse.linuxtools.lttng.core.event.LttngEventType; +import org.eclipse.linuxtools.lttng.core.event.LttngTimestamp; +import org.eclipse.linuxtools.lttng.core.tests.LTTngCoreTestPlugin; +import org.eclipse.linuxtools.lttng.core.trace.LTTngTextTrace; +import org.eclipse.linuxtools.lttng.core.trace.LTTngTrace; import org.eclipse.linuxtools.lttng.jni.JniEvent; -import org.eclipse.linuxtools.lttng.tests.LTTngCoreTestPlugin; -import org.eclipse.linuxtools.lttng.trace.LTTngTextTrace; -import org.eclipse.linuxtools.lttng.trace.LTTngTrace; -import org.eclipse.linuxtools.tmf.event.TmfEventSource; -import org.eclipse.linuxtools.tmf.trace.TmfContext; -import org.eclipse.linuxtools.tmf.trace.TmfLocation; +import org.eclipse.linuxtools.tmf.core.event.TmfEventSource; +import org.eclipse.linuxtools.tmf.core.trace.TmfContext; +import org.eclipse.linuxtools.tmf.core.trace.TmfLocation; /* Functions tested here : diff --git a/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/event/LttngEventTypeTest.java b/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/event/LttngEventTypeTest.java similarity index 92% rename from org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/event/LttngEventTypeTest.java rename to org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/event/LttngEventTypeTest.java index 8adcb3ef3f..c1579235aa 100644 --- a/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/event/LttngEventTypeTest.java +++ b/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/event/LttngEventTypeTest.java @@ -1,4 +1,4 @@ -package org.eclipse.linuxtools.lttng.tests.event; +package org.eclipse.linuxtools.lttng.core.tests.event; import java.io.File; import java.net.URL; @@ -6,10 +6,10 @@ import java.net.URL; import junit.framework.TestCase; import org.eclipse.core.runtime.FileLocator; import org.eclipse.core.runtime.Path; -import org.eclipse.linuxtools.lttng.event.LttngEventType; -import org.eclipse.linuxtools.lttng.tests.LTTngCoreTestPlugin; -import org.eclipse.linuxtools.lttng.trace.LTTngTextTrace; -import org.eclipse.linuxtools.tmf.trace.TmfContext; +import org.eclipse.linuxtools.lttng.core.event.LttngEventType; +import org.eclipse.linuxtools.lttng.core.tests.LTTngCoreTestPlugin; +import org.eclipse.linuxtools.lttng.core.trace.LTTngTextTrace; +import org.eclipse.linuxtools.tmf.core.trace.TmfContext; /* Functions tested here : diff --git a/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/event/LttngTimestampTest.java b/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/event/LttngTimestampTest.java similarity index 94% rename from org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/event/LttngTimestampTest.java rename to org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/event/LttngTimestampTest.java index 20f01d8b33..e14e54f119 100644 --- a/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/event/LttngTimestampTest.java +++ b/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/event/LttngTimestampTest.java @@ -1,4 +1,4 @@ -package org.eclipse.linuxtools.lttng.tests.event; +package org.eclipse.linuxtools.lttng.core.tests.event; import java.io.File; import java.net.URL; @@ -7,10 +7,10 @@ import junit.framework.TestCase; import org.eclipse.core.runtime.FileLocator; import org.eclipse.core.runtime.Path; -import org.eclipse.linuxtools.lttng.event.LttngTimestamp; -import org.eclipse.linuxtools.lttng.tests.LTTngCoreTestPlugin; -import org.eclipse.linuxtools.lttng.trace.LTTngTextTrace; -import org.eclipse.linuxtools.tmf.trace.TmfContext; +import org.eclipse.linuxtools.lttng.core.event.LttngTimestamp; +import org.eclipse.linuxtools.lttng.core.tests.LTTngCoreTestPlugin; +import org.eclipse.linuxtools.lttng.core.trace.LTTngTextTrace; +import org.eclipse.linuxtools.tmf.core.trace.TmfContext; /* Functions tested here : diff --git a/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxxtools/lttng/tests/headless/JniTraceTest.java b/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/headless/JniTraceTest.java similarity index 98% rename from org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxxtools/lttng/tests/headless/JniTraceTest.java rename to org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/headless/JniTraceTest.java index 5dbdd3e7c6..5fc59c6cc4 100644 --- a/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxxtools/lttng/tests/headless/JniTraceTest.java +++ b/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/headless/JniTraceTest.java @@ -1,4 +1,4 @@ -package org.eclipse.linuxxtools.lttng.tests.headless; +package org.eclipse.linuxtools.lttng.core.tests.headless; /******************************************************************************* * Copyright (c) 2009 Ericsson * diff --git a/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxxtools/lttng/tests/headless/LttngTraceTest.java b/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/headless/LttngTraceTest.java similarity index 86% rename from org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxxtools/lttng/tests/headless/LttngTraceTest.java rename to org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/headless/LttngTraceTest.java index 7e4d8ea5b6..3463273d64 100644 --- a/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxxtools/lttng/tests/headless/LttngTraceTest.java +++ b/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/headless/LttngTraceTest.java @@ -1,4 +1,4 @@ -package org.eclipse.linuxxtools.lttng.tests.headless; +package org.eclipse.linuxtools.lttng.core.tests.headless; /******************************************************************************* * Copyright (c) 2009 Ericsson * @@ -11,13 +11,13 @@ package org.eclipse.linuxxtools.lttng.tests.headless; * William Bourque (wbourque@gmail.com) - Initial API and implementation *******************************************************************************/ -import org.eclipse.linuxtools.lttng.event.LttngEvent; -import org.eclipse.linuxtools.lttng.event.LttngLocation; -import org.eclipse.linuxtools.lttng.event.LttngTimestamp; -import org.eclipse.linuxtools.lttng.trace.LTTngTextTrace; -import org.eclipse.linuxtools.lttng.trace.LTTngTrace; -import org.eclipse.linuxtools.tmf.trace.TmfContext; -import org.eclipse.linuxtools.tmf.trace.TmfTrace; +import org.eclipse.linuxtools.lttng.core.event.LttngEvent; +import org.eclipse.linuxtools.lttng.core.event.LttngLocation; +import org.eclipse.linuxtools.lttng.core.event.LttngTimestamp; +import org.eclipse.linuxtools.lttng.core.trace.LTTngTextTrace; +import org.eclipse.linuxtools.lttng.core.trace.LTTngTrace; +import org.eclipse.linuxtools.tmf.core.trace.TmfContext; +import org.eclipse.linuxtools.tmf.core.trace.TmfTrace; @SuppressWarnings("nls") diff --git a/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxxtools/lttng/tests/headless/TmfTraceTest.java b/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/headless/TmfTraceTest.java similarity index 87% rename from org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxxtools/lttng/tests/headless/TmfTraceTest.java rename to org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/headless/TmfTraceTest.java index 50997e037f..81b25b1d2a 100644 --- a/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxxtools/lttng/tests/headless/TmfTraceTest.java +++ b/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/headless/TmfTraceTest.java @@ -1,4 +1,4 @@ -package org.eclipse.linuxxtools.lttng.tests.headless; +package org.eclipse.linuxtools.lttng.core.tests.headless; /******************************************************************************* * Copyright (c) 2009 Ericsson * @@ -11,14 +11,14 @@ package org.eclipse.linuxxtools.lttng.tests.headless; * William Bourque (wbourque@gmail.com) - Initial API and implementation *******************************************************************************/ -import org.eclipse.linuxtools.lttng.event.LttngEvent; -import org.eclipse.linuxtools.lttng.event.LttngTimestamp; -import org.eclipse.linuxtools.lttng.trace.LTTngTrace; -import org.eclipse.linuxtools.tmf.event.TmfEvent; -import org.eclipse.linuxtools.tmf.event.TmfTimeRange; -import org.eclipse.linuxtools.tmf.experiment.TmfExperiment; -import org.eclipse.linuxtools.tmf.request.TmfEventRequest; -import org.eclipse.linuxtools.tmf.trace.ITmfTrace; +import org.eclipse.linuxtools.lttng.core.event.LttngEvent; +import org.eclipse.linuxtools.lttng.core.event.LttngTimestamp; +import org.eclipse.linuxtools.lttng.core.trace.LTTngTrace; +import org.eclipse.linuxtools.tmf.core.event.TmfEvent; +import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange; +import org.eclipse.linuxtools.tmf.core.experiment.TmfExperiment; +import org.eclipse.linuxtools.tmf.core.request.TmfEventRequest; +import org.eclipse.linuxtools.tmf.core.trace.ITmfTrace; @SuppressWarnings("nls") public class TmfTraceTest extends TmfEventRequest { diff --git a/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/jni/AllJniTests.java b/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/jni/AllJniTests.java similarity index 90% rename from org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/jni/AllJniTests.java rename to org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/jni/AllJniTests.java index 3a97ce5060..7f9f659d7b 100644 --- a/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/jni/AllJniTests.java +++ b/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/jni/AllJniTests.java @@ -1,5 +1,5 @@ -package org.eclipse.linuxtools.lttng.tests.jni; +package org.eclipse.linuxtools.lttng.core.tests.jni; import junit.framework.TestCase; import junit.framework.TestSuite; diff --git a/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/jni/Combinations.java b/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/jni/Combinations.java similarity index 99% rename from org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/jni/Combinations.java rename to org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/jni/Combinations.java index 395d420159..3f37e24a48 100644 --- a/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/jni/Combinations.java +++ b/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/jni/Combinations.java @@ -1,7 +1,7 @@ /** * */ -package org.eclipse.linuxtools.lttng.tests.jni; +package org.eclipse.linuxtools.lttng.core.tests.jni; import junit.framework.TestCase; import java.util.HashMap; diff --git a/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/jni/JniEventTest.java b/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/jni/JniEventTest.java similarity index 99% rename from org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/jni/JniEventTest.java rename to org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/jni/JniEventTest.java index 6a93385634..842f58083e 100644 --- a/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/jni/JniEventTest.java +++ b/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/jni/JniEventTest.java @@ -28,7 +28,7 @@ */ -package org.eclipse.linuxtools.lttng.tests.jni; +package org.eclipse.linuxtools.lttng.core.tests.jni; import junit.framework.TestCase; diff --git a/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/jni/JniMarkerFieldTest.java b/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/jni/JniMarkerFieldTest.java similarity index 98% rename from org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/jni/JniMarkerFieldTest.java rename to org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/jni/JniMarkerFieldTest.java index f224c6fd3b..b58402f98e 100644 --- a/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/jni/JniMarkerFieldTest.java +++ b/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/jni/JniMarkerFieldTest.java @@ -1,5 +1,5 @@ -package org.eclipse.linuxtools.lttng.tests.jni; +package org.eclipse.linuxtools.lttng.core.tests.jni; import junit.framework.TestCase; diff --git a/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/jni/JniMarkerTest.java b/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/jni/JniMarkerTest.java similarity index 98% rename from org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/jni/JniMarkerTest.java rename to org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/jni/JniMarkerTest.java index f0fb79c7ff..f5462bebfb 100644 --- a/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/jni/JniMarkerTest.java +++ b/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/jni/JniMarkerTest.java @@ -1,5 +1,5 @@ -package org.eclipse.linuxtools.lttng.tests.jni; +package org.eclipse.linuxtools.lttng.core.tests.jni; import junit.framework.TestCase; diff --git a/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/jni/JniTraceTest.java b/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/jni/JniTraceTest.java similarity index 99% rename from org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/jni/JniTraceTest.java rename to org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/jni/JniTraceTest.java index 7021d0c1d7..717e623dbf 100644 --- a/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/jni/JniTraceTest.java +++ b/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/jni/JniTraceTest.java @@ -1,5 +1,5 @@ -package org.eclipse.linuxtools.lttng.tests.jni; +package org.eclipse.linuxtools.lttng.core.tests.jni; import org.eclipse.linuxtools.lttng.jni.JniEvent; import org.eclipse.linuxtools.lttng.jni.JniTrace; diff --git a/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/jni/JniTracefileTest.java b/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/jni/JniTracefileTest.java similarity index 99% rename from org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/jni/JniTracefileTest.java rename to org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/jni/JniTracefileTest.java index 2dbc42423d..997353f8c5 100644 --- a/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/jni/JniTracefileTest.java +++ b/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/jni/JniTracefileTest.java @@ -1,5 +1,5 @@ -package org.eclipse.linuxtools.lttng.tests.jni; +package org.eclipse.linuxtools.lttng.core.tests.jni; import junit.framework.TestCase; diff --git a/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/model/LTTngTreeNodeTest.java b/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/model/LTTngTreeNodeTest.java similarity index 80% rename from org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/model/LTTngTreeNodeTest.java rename to org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/model/LTTngTreeNodeTest.java index ddc5a201c4..91d1a6a5dc 100644 --- a/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/model/LTTngTreeNodeTest.java +++ b/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/model/LTTngTreeNodeTest.java @@ -9,9 +9,9 @@ * Contributors: * Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.lttng.tests.model; +package org.eclipse.linuxtools.lttng.core.tests.model; -import org.eclipse.linuxtools.lttng.model.LTTngTreeNode; +import org.eclipse.linuxtools.lttng.core.model.LTTngTreeNode; import junit.framework.TestCase; @@ -96,7 +96,7 @@ public class LTTngTreeNodeTest extends TestCase { } /** - * Test method for {@link org.eclipse.linuxtools.lttng.model.LTTngTreeNode#getChildren()}. + * Test method for {@link org.eclipse.linuxtools.lttng.core.model.LTTngTreeNode#getChildren()}. */ public void testGetChildren() { LTTngTreeNode[] childrensOf60 = node60.getChildren(); @@ -116,21 +116,21 @@ public class LTTngTreeNodeTest extends TestCase { } /** - * Test method for {@link org.eclipse.linuxtools.lttng.model.LTTngTreeNodeGeneric#getId()}. + * Test method for {@link org.eclipse.linuxtools.lttng.core.model.LTTngTreeNodeGeneric#getId()}. */ public void testGetId() { assertEquals(15L, node15.getId().longValue()); } /** - * Test method for {@link org.eclipse.linuxtools.lttng.model.LTTngTreeNodeGeneric#getType()}. + * Test method for {@link org.eclipse.linuxtools.lttng.core.model.LTTngTreeNodeGeneric#getType()}. */ public void testGetType() { assertEquals(this.getClass(), node15.getType()); } /** - * Test method for {@link org.eclipse.linuxtools.lttng.model.LTTngTreeNodeGeneric#getChildByName(java.lang.String)}. + * Test method for {@link org.eclipse.linuxtools.lttng.core.model.LTTngTreeNodeGeneric#getChildByName(java.lang.String)}. */ public void testGetChildByName() { LTTngTreeNode child65 = node60.getChildByName("node65"); @@ -143,7 +143,7 @@ public class LTTngTreeNodeTest extends TestCase { } /** - * Test method for {@link org.eclipse.linuxtools.lttng.model.LTTngTreeNodeGeneric#removeChild(org.eclipse.linuxtools.lttng.model.ILTTngTreeNode)}. + * Test method for {@link org.eclipse.linuxtools.lttng.core.model.LTTngTreeNodeGeneric#removeChild(org.eclipse.linuxtools.lttng.core.model.ILTTngTreeNode)}. */ public void testRemoveChild() { // Verify node20 @@ -184,7 +184,7 @@ public class LTTngTreeNodeTest extends TestCase { } /** - * Test method for {@link org.eclipse.linuxtools.lttng.model.LTTngTreeNodeGeneric#getChildById(java.lang.Integer)}. + * Test method for {@link org.eclipse.linuxtools.lttng.core.model.LTTngTreeNodeGeneric#getChildById(java.lang.Integer)}. */ public void testGetChildById() { LTTngTreeNode child65 = node60.getChildById(65L); @@ -197,14 +197,14 @@ public class LTTngTreeNodeTest extends TestCase { } /** - * Test method for {@link org.eclipse.linuxtools.lttng.model.LTTngTreeNodeGeneric#getParent()}. + * Test method for {@link org.eclipse.linuxtools.lttng.core.model.LTTngTreeNodeGeneric#getParent()}. */ public void testGetParent() { assertEquals(node60, node67.getParent()); } /** - * Test method for {@link org.eclipse.linuxtools.lttng.model.LTTngTreeNodeGeneric#setParent(org.eclipse.linuxtools.lttng.model.ILTTngTreeNode)}. + * Test method for {@link org.eclipse.linuxtools.lttng.core.model.LTTngTreeNodeGeneric#setParent(org.eclipse.linuxtools.lttng.core.model.ILTTngTreeNode)}. */ public void testSetParent() { node30.removeChild(node35); @@ -215,7 +215,7 @@ public class LTTngTreeNodeTest extends TestCase { } /** - * Test method for {@link org.eclipse.linuxtools.lttng.model.LTTngTreeNodeGeneric#hasChildren()}. + * Test method for {@link org.eclipse.linuxtools.lttng.core.model.LTTngTreeNodeGeneric#hasChildren()}. */ public void testHasChildren() { assertEquals(true, node10.hasChildren()); @@ -227,14 +227,14 @@ public class LTTngTreeNodeTest extends TestCase { } /** - * Test method for {@link org.eclipse.linuxtools.lttng.model.LTTngTreeNodeGeneric#getName()}. + * Test method for {@link org.eclipse.linuxtools.lttng.core.model.LTTngTreeNodeGeneric#getName()}. */ public void testGetName() { assertEquals("node40", node40.getName()); } /** - * Test method for {@link org.eclipse.linuxtools.lttng.model.LTTngTreeNodeGeneric#getPath()}. + * Test method for {@link org.eclipse.linuxtools.lttng.core.model.LTTngTreeNodeGeneric#getPath()}. */ public void testGetPath() { String path = node60.getPath(); @@ -243,7 +243,7 @@ public class LTTngTreeNodeTest extends TestCase { /** * Test method for - * {@link org.eclipse.linuxtools.lttng.model.LTTngTreeNodeGeneric#getAdapter()} + * {@link org.eclipse.linuxtools.lttng.core.model.LTTngTreeNodeGeneric#getAdapter()} * . */ public void testGetAdapter() { @@ -253,7 +253,7 @@ public class LTTngTreeNodeTest extends TestCase { /** * Test method for - * {@link org.eclipse.linuxtools.lttng.model.LTTngTreeNodeGeneric#getAttibute()} + * {@link org.eclipse.linuxtools.lttng.core.model.LTTngTreeNodeGeneric#getAttibute()} * . */ public void testGetAttribute() { diff --git a/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/state/StateManagerFactoryTestSupport.java b/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/state/StateManagerFactoryTestSupport.java similarity index 84% rename from org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/state/StateManagerFactoryTestSupport.java rename to org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/state/StateManagerFactoryTestSupport.java index ff7ee5f7da..845a172546 100644 --- a/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/state/StateManagerFactoryTestSupport.java +++ b/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/state/StateManagerFactoryTestSupport.java @@ -10,16 +10,16 @@ * Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.lttng.tests.state; +package org.eclipse.linuxtools.lttng.core.tests.state; import java.util.HashMap; import java.util.Map; -import org.eclipse.linuxtools.lttng.model.LTTngTreeNode; -import org.eclipse.linuxtools.lttng.state.LttngStateException; -import org.eclipse.linuxtools.lttng.state.trace.IStateTraceManager; -import org.eclipse.linuxtools.lttng.state.trace.StateTraceManager; -import org.eclipse.linuxtools.tmf.trace.ITmfTrace; +import org.eclipse.linuxtools.lttng.core.model.LTTngTreeNode; +import org.eclipse.linuxtools.lttng.core.state.LttngStateException; +import org.eclipse.linuxtools.lttng.core.state.trace.IStateTraceManager; +import org.eclipse.linuxtools.lttng.core.state.trace.StateTraceManager; +import org.eclipse.linuxtools.tmf.core.trace.ITmfTrace; /** * @author alvaro diff --git a/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/state/TestStateManager.java b/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/state/TestStateManager.java similarity index 94% rename from org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/state/TestStateManager.java rename to org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/state/TestStateManager.java index 28023cc003..1740d45a34 100644 --- a/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/state/TestStateManager.java +++ b/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/state/TestStateManager.java @@ -10,11 +10,11 @@ * Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.lttng.tests.state; +package org.eclipse.linuxtools.lttng.core.tests.state; import junit.framework.TestCase; -import org.eclipse.linuxtools.lttng.trace.LTTngTrace; +import org.eclipse.linuxtools.lttng.core.trace.LTTngTrace; /** * @author alvaro diff --git a/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/state/experiment/StateExperimentManagerTextTest.java b/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/state/experiment/StateExperimentManagerTextTest.java similarity index 86% rename from org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/state/experiment/StateExperimentManagerTextTest.java rename to org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/state/experiment/StateExperimentManagerTextTest.java index 0af52fe684..edf3b8fb72 100644 --- a/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/state/experiment/StateExperimentManagerTextTest.java +++ b/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/state/experiment/StateExperimentManagerTextTest.java @@ -9,9 +9,9 @@ * Contributors: * Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.lttng.tests.state.experiment; +package org.eclipse.linuxtools.lttng.core.tests.state.experiment; -import org.eclipse.linuxtools.lttng.tests.LttngTestPreparation; +import org.eclipse.linuxtools.lttng.core.tests.LttngTestPreparation; /** * @author alvaro @@ -21,7 +21,7 @@ import org.eclipse.linuxtools.lttng.tests.LttngTestPreparation; public class StateExperimentManagerTextTest extends LttngTestPreparation { /** - * Test method for {@link org.eclipse.linuxtools.lttng.state.experiment.StateExperimentManager#experimentSelected_prep(org.eclipse.linuxtools.tmf.experiment.TmfExperiment)}. + * Test method for {@link org.eclipse.linuxtools.lttng.core.state.experiment.StateExperimentManager#experimentSelected_prep(org.eclipse.linuxtools.tmf.experiment.TmfExperiment)}. */ public void testExperimentSelected_text() { System.out.println("testExperimentSelected_text: test removed"); @@ -56,7 +56,7 @@ public class StateExperimentManagerTextTest extends LttngTestPreparation { /** * Test method for - * {@link org.eclipse.linuxtools.lttng.state.experiment.StateExperimentManager#experimentSelected_prep(org.eclipse.linuxtools.tmf.experiment.TmfExperiment)} + * {@link org.eclipse.linuxtools.lttng.core.state.experiment.StateExperimentManager#experimentSelected_prep(org.eclipse.linuxtools.tmf.experiment.TmfExperiment)} * . */ public void testExperimentSelected_real() { diff --git a/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/state/handlers/AbsStateUpdate.java b/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/state/handlers/AbsStateUpdate.java similarity index 96% rename from org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/state/handlers/AbsStateUpdate.java rename to org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/state/handlers/AbsStateUpdate.java index f7e930fe00..ec7c2b9122 100644 --- a/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/state/handlers/AbsStateUpdate.java +++ b/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/state/handlers/AbsStateUpdate.java @@ -1,13 +1,13 @@ -package org.eclipse.linuxtools.lttng.tests.state.handlers; +package org.eclipse.linuxtools.lttng.core.tests.state.handlers; -import org.eclipse.linuxtools.lttng.TraceDebug; -import org.eclipse.linuxtools.lttng.event.LttngEvent; -import org.eclipse.linuxtools.lttng.event.LttngEventField; -import org.eclipse.linuxtools.lttng.state.StateStrings.Fields; -import org.eclipse.linuxtools.lttng.state.evProcessor.ILttngEventProcessor; -import org.eclipse.linuxtools.lttng.state.model.LttngExecutionState; -import org.eclipse.linuxtools.lttng.state.model.LttngTraceState; -import org.eclipse.linuxtools.tmf.event.TmfEventField; +import org.eclipse.linuxtools.lttng.core.TraceDebug; +import org.eclipse.linuxtools.lttng.core.event.LttngEvent; +import org.eclipse.linuxtools.lttng.core.event.LttngEventField; +import org.eclipse.linuxtools.lttng.core.state.StateStrings.Fields; +import org.eclipse.linuxtools.lttng.core.state.evProcessor.ILttngEventProcessor; +import org.eclipse.linuxtools.lttng.core.state.model.LttngExecutionState; +import org.eclipse.linuxtools.lttng.core.state.model.LttngTraceState; +import org.eclipse.linuxtools.tmf.core.event.TmfEventField; @SuppressWarnings("nls") public abstract class AbsStateUpdate implements ILttngEventProcessor { diff --git a/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/state/handlers/after/StateAfterUpdateFactory.java b/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/state/handlers/after/StateAfterUpdateFactory.java similarity index 96% rename from org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/state/handlers/after/StateAfterUpdateFactory.java rename to org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/state/handlers/after/StateAfterUpdateFactory.java index 7042ea162a..1e3e5ff442 100644 --- a/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/state/handlers/after/StateAfterUpdateFactory.java +++ b/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/state/handlers/after/StateAfterUpdateFactory.java @@ -9,13 +9,13 @@ * Contributors: * Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.lttng.tests.state.handlers.after; +package org.eclipse.linuxtools.lttng.core.tests.state.handlers.after; import java.util.HashMap; import java.util.Map; -import org.eclipse.linuxtools.lttng.state.StateStrings; -import org.eclipse.linuxtools.lttng.state.evProcessor.ILttngEventProcessor; +import org.eclipse.linuxtools.lttng.core.state.StateStrings; +import org.eclipse.linuxtools.lttng.core.state.evProcessor.ILttngEventProcessor; /** * Builds a Map from string event name to a processing handler object, the diff --git a/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/state/handlers/after/StateAfterUpdateHandlers.java b/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/state/handlers/after/StateAfterUpdateHandlers.java similarity index 98% rename from org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/state/handlers/after/StateAfterUpdateHandlers.java rename to org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/state/handlers/after/StateAfterUpdateHandlers.java index efaa02d6b1..32078596ea 100644 --- a/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/state/handlers/after/StateAfterUpdateHandlers.java +++ b/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/state/handlers/after/StateAfterUpdateHandlers.java @@ -9,18 +9,18 @@ * Contributors: * Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.lttng.tests.state.handlers.after; +package org.eclipse.linuxtools.lttng.core.tests.state.handlers.after; -import org.eclipse.linuxtools.lttng.TraceDebug; -import org.eclipse.linuxtools.lttng.event.LttngEvent; -import org.eclipse.linuxtools.lttng.state.StateStrings.ExecutionMode; -import org.eclipse.linuxtools.lttng.state.evProcessor.ILttngEventProcessor; -import org.eclipse.linuxtools.lttng.state.model.LttngExecutionState; -import org.eclipse.linuxtools.lttng.state.model.LttngProcessState; -import org.eclipse.linuxtools.lttng.state.model.LttngTraceState; -import org.eclipse.linuxtools.lttng.tests.state.handlers.AbsStateUpdate; +import org.eclipse.linuxtools.lttng.core.TraceDebug; +import org.eclipse.linuxtools.lttng.core.event.LttngEvent; +import org.eclipse.linuxtools.lttng.core.state.StateStrings.ExecutionMode; +import org.eclipse.linuxtools.lttng.core.state.evProcessor.ILttngEventProcessor; +import org.eclipse.linuxtools.lttng.core.state.model.LttngExecutionState; +import org.eclipse.linuxtools.lttng.core.state.model.LttngProcessState; +import org.eclipse.linuxtools.lttng.core.state.model.LttngTraceState; +import org.eclipse.linuxtools.lttng.core.tests.state.handlers.AbsStateUpdate; /** * Process the system call entry event diff --git a/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/state/handlers/before/StateBeforeUpdateFactory.java b/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/state/handlers/before/StateBeforeUpdateFactory.java similarity index 96% rename from org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/state/handlers/before/StateBeforeUpdateFactory.java rename to org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/state/handlers/before/StateBeforeUpdateFactory.java index bd3bd7a949..c6516816e8 100644 --- a/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/state/handlers/before/StateBeforeUpdateFactory.java +++ b/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/state/handlers/before/StateBeforeUpdateFactory.java @@ -9,13 +9,13 @@ * Contributors: * Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.lttng.tests.state.handlers.before; +package org.eclipse.linuxtools.lttng.core.tests.state.handlers.before; import java.util.HashMap; import java.util.Map; -import org.eclipse.linuxtools.lttng.state.StateStrings; -import org.eclipse.linuxtools.lttng.state.evProcessor.ILttngEventProcessor; +import org.eclipse.linuxtools.lttng.core.state.StateStrings; +import org.eclipse.linuxtools.lttng.core.state.evProcessor.ILttngEventProcessor; /** * Builds a Map from string event name to a processing handler object, the diff --git a/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/state/handlers/before/StateBeforeUpdateHandlers.java b/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/state/handlers/before/StateBeforeUpdateHandlers.java similarity index 98% rename from org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/state/handlers/before/StateBeforeUpdateHandlers.java rename to org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/state/handlers/before/StateBeforeUpdateHandlers.java index b1139e9911..a5ab256cbf 100644 --- a/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/state/handlers/before/StateBeforeUpdateHandlers.java +++ b/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/state/handlers/before/StateBeforeUpdateHandlers.java @@ -9,18 +9,18 @@ * Contributors: * Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.lttng.tests.state.handlers.before; - -import org.eclipse.linuxtools.lttng.TraceDebug; -import org.eclipse.linuxtools.lttng.event.LttngEvent; -import org.eclipse.linuxtools.lttng.state.StateStrings.ExecutionMode; -import org.eclipse.linuxtools.lttng.state.StateStrings.ExecutionSubMode; -import org.eclipse.linuxtools.lttng.state.StateStrings.Fields; -import org.eclipse.linuxtools.lttng.state.evProcessor.ILttngEventProcessor; -import org.eclipse.linuxtools.lttng.state.model.LttngExecutionState; -import org.eclipse.linuxtools.lttng.state.model.LttngProcessState; -import org.eclipse.linuxtools.lttng.state.model.LttngTraceState; -import org.eclipse.linuxtools.lttng.tests.state.handlers.AbsStateUpdate; +package org.eclipse.linuxtools.lttng.core.tests.state.handlers.before; + +import org.eclipse.linuxtools.lttng.core.TraceDebug; +import org.eclipse.linuxtools.lttng.core.event.LttngEvent; +import org.eclipse.linuxtools.lttng.core.state.StateStrings.ExecutionMode; +import org.eclipse.linuxtools.lttng.core.state.StateStrings.ExecutionSubMode; +import org.eclipse.linuxtools.lttng.core.state.StateStrings.Fields; +import org.eclipse.linuxtools.lttng.core.state.evProcessor.ILttngEventProcessor; +import org.eclipse.linuxtools.lttng.core.state.model.LttngExecutionState; +import org.eclipse.linuxtools.lttng.core.state.model.LttngProcessState; +import org.eclipse.linuxtools.lttng.core.state.model.LttngTraceState; +import org.eclipse.linuxtools.lttng.core.tests.state.handlers.AbsStateUpdate; /** * Process the system call entry event diff --git a/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/state/resource/LTTngStateResourceTest.java b/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/state/resource/LTTngStateResourceTest.java similarity index 87% rename from org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/state/resource/LTTngStateResourceTest.java rename to org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/state/resource/LTTngStateResourceTest.java index a16040a5cf..5bba549a8e 100644 --- a/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/state/resource/LTTngStateResourceTest.java +++ b/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/state/resource/LTTngStateResourceTest.java @@ -9,15 +9,15 @@ * Contributors: * Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.lttng.tests.state.resource; +package org.eclipse.linuxtools.lttng.core.tests.state.resource; import junit.framework.TestCase; -import org.eclipse.linuxtools.lttng.state.resource.ILttngStateContext; -import org.eclipse.linuxtools.lttng.state.resource.LTTngStateResource; -import org.eclipse.linuxtools.lttng.state.resource.ILTTngStateResource.GlobalStateMode; -import org.eclipse.linuxtools.tmf.event.TmfTimeRange; -import org.eclipse.linuxtools.tmf.trace.ITmfTrace; +import org.eclipse.linuxtools.lttng.core.state.resource.ILttngStateContext; +import org.eclipse.linuxtools.lttng.core.state.resource.LTTngStateResource; +import org.eclipse.linuxtools.lttng.core.state.resource.ILTTngStateResource.GlobalStateMode; +import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange; +import org.eclipse.linuxtools.tmf.core.trace.ITmfTrace; /** * For inherited methods see: LTTngTreeNodeTest @@ -149,7 +149,7 @@ public class LTTngStateResourceTest extends TestCase { // ======================================================================= /** * Test method for - * {@link org.eclipse.linuxtools.lttng.state.resource.LTTngStateResource#getChildren()} + * {@link org.eclipse.linuxtools.lttng.core.state.resource.LTTngStateResource#getChildren()} * . */ public void testGetChildren() { @@ -171,7 +171,7 @@ public class LTTngStateResourceTest extends TestCase { /** * Test method for - * {@link org.eclipse.linuxtools.lttng.state.resource.LTTngStateResource#getStateMode()} + * {@link org.eclipse.linuxtools.lttng.core.state.resource.LTTngStateResource#getStateMode()} */ public void testStateMode() { // check default @@ -185,7 +185,7 @@ public class LTTngStateResourceTest extends TestCase { /** * Test method for - * {@link org.eclipse.linuxtools.lttng.state.resource.LTTngStateResource#getContext()} + * {@link org.eclipse.linuxtools.lttng.core.state.resource.LTTngStateResource#getContext()} */ public void testContext() { assertEquals(context, node60.getContext()); diff --git a/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/state/tests/handlers/AbsStateUpdate.java b/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/state/tests/handlers/AbsStateUpdate.java similarity index 96% rename from org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/state/tests/handlers/AbsStateUpdate.java rename to org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/state/tests/handlers/AbsStateUpdate.java index 05e32af183..c1da336262 100644 --- a/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/state/tests/handlers/AbsStateUpdate.java +++ b/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/state/tests/handlers/AbsStateUpdate.java @@ -1,13 +1,13 @@ -package org.eclipse.linuxtools.lttng.tests.state.tests.handlers; +package org.eclipse.linuxtools.lttng.core.tests.state.tests.handlers; -import org.eclipse.linuxtools.lttng.TraceDebug; -import org.eclipse.linuxtools.lttng.event.LttngEvent; -import org.eclipse.linuxtools.lttng.event.LttngEventField; -import org.eclipse.linuxtools.lttng.state.StateStrings.Fields; -import org.eclipse.linuxtools.lttng.state.evProcessor.ILttngEventProcessor; -import org.eclipse.linuxtools.lttng.state.model.LttngExecutionState; -import org.eclipse.linuxtools.lttng.state.model.LttngTraceState; -import org.eclipse.linuxtools.tmf.event.TmfEventField; +import org.eclipse.linuxtools.lttng.core.TraceDebug; +import org.eclipse.linuxtools.lttng.core.event.LttngEvent; +import org.eclipse.linuxtools.lttng.core.event.LttngEventField; +import org.eclipse.linuxtools.lttng.core.state.StateStrings.Fields; +import org.eclipse.linuxtools.lttng.core.state.evProcessor.ILttngEventProcessor; +import org.eclipse.linuxtools.lttng.core.state.model.LttngExecutionState; +import org.eclipse.linuxtools.lttng.core.state.model.LttngTraceState; +import org.eclipse.linuxtools.tmf.core.event.TmfEventField; @SuppressWarnings("nls") public abstract class AbsStateUpdate implements ILttngEventProcessor { diff --git a/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/trace/LTTngExperimentTest.java b/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/trace/LTTngExperimentTest.java similarity index 88% rename from org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/trace/LTTngExperimentTest.java rename to org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/trace/LTTngExperimentTest.java index fe41685c65..aa1a56f2ca 100644 --- a/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/trace/LTTngExperimentTest.java +++ b/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/trace/LTTngExperimentTest.java @@ -10,7 +10,7 @@ * Francois Chouinard - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.lttng.tests.trace; +package org.eclipse.linuxtools.lttng.core.tests.trace; import java.io.File; import java.io.IOException; @@ -21,13 +21,13 @@ import junit.framework.TestCase; import org.eclipse.core.runtime.FileLocator; import org.eclipse.core.runtime.Path; -import org.eclipse.linuxtools.lttng.event.LttngEvent; -import org.eclipse.linuxtools.lttng.tests.LTTngCoreTestPlugin; -import org.eclipse.linuxtools.lttng.trace.LTTngTrace; -import org.eclipse.linuxtools.tmf.event.TmfTimeRange; -import org.eclipse.linuxtools.tmf.event.TmfTimestamp; -import org.eclipse.linuxtools.tmf.experiment.TmfExperiment; -import org.eclipse.linuxtools.tmf.trace.ITmfTrace; +import org.eclipse.linuxtools.lttng.core.event.LttngEvent; +import org.eclipse.linuxtools.lttng.core.tests.LTTngCoreTestPlugin; +import org.eclipse.linuxtools.lttng.core.trace.LTTngTrace; +import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange; +import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp; +import org.eclipse.linuxtools.tmf.core.experiment.TmfExperiment; +import org.eclipse.linuxtools.tmf.core.trace.ITmfTrace; /** * TmfExperimentTest diff --git a/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/trace/LTTngTextTraceTest.java b/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/trace/LTTngTextTraceTest.java similarity index 97% rename from org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/trace/LTTngTextTraceTest.java rename to org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/trace/LTTngTextTraceTest.java index 581cadaa4e..cd16bd706f 100644 --- a/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/trace/LTTngTextTraceTest.java +++ b/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/trace/LTTngTextTraceTest.java @@ -1,4 +1,4 @@ -package org.eclipse.linuxtools.lttng.tests.trace; +package org.eclipse.linuxtools.lttng.core.tests.trace; import java.io.File; import java.net.URL; @@ -7,12 +7,12 @@ import junit.framework.TestCase; import org.eclipse.core.runtime.FileLocator; import org.eclipse.core.runtime.Path; -import org.eclipse.linuxtools.lttng.tests.LTTngCoreTestPlugin; -import org.eclipse.linuxtools.lttng.trace.LTTngTextTrace; -import org.eclipse.linuxtools.tmf.event.TmfEvent; -import org.eclipse.linuxtools.tmf.event.TmfTimestamp; -import org.eclipse.linuxtools.tmf.trace.TmfContext; -import org.eclipse.linuxtools.tmf.trace.TmfLocation; +import org.eclipse.linuxtools.lttng.core.tests.LTTngCoreTestPlugin; +import org.eclipse.linuxtools.lttng.core.trace.LTTngTextTrace; +import org.eclipse.linuxtools.tmf.core.event.TmfEvent; +import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp; +import org.eclipse.linuxtools.tmf.core.trace.TmfContext; +import org.eclipse.linuxtools.tmf.core.trace.TmfLocation; /* Functions tested here : diff --git a/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/trace/LTTngTraceTest.java b/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/trace/LTTngTraceTest.java similarity index 97% rename from org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/trace/LTTngTraceTest.java rename to org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/trace/LTTngTraceTest.java index 1f555636b5..c80e520a37 100644 --- a/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/trace/LTTngTraceTest.java +++ b/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/trace/LTTngTraceTest.java @@ -1,4 +1,4 @@ -package org.eclipse.linuxtools.lttng.tests.trace; +package org.eclipse.linuxtools.lttng.core.tests.trace; import java.io.File; import java.net.URL; @@ -7,12 +7,12 @@ import junit.framework.TestCase; import org.eclipse.core.runtime.FileLocator; import org.eclipse.core.runtime.Path; -import org.eclipse.linuxtools.lttng.event.LttngLocation; -import org.eclipse.linuxtools.lttng.tests.LTTngCoreTestPlugin; -import org.eclipse.linuxtools.lttng.trace.LTTngTrace; -import org.eclipse.linuxtools.tmf.event.TmfEvent; -import org.eclipse.linuxtools.tmf.event.TmfTimestamp; -import org.eclipse.linuxtools.tmf.trace.TmfContext; +import org.eclipse.linuxtools.lttng.core.event.LttngLocation; +import org.eclipse.linuxtools.lttng.core.tests.LTTngCoreTestPlugin; +import org.eclipse.linuxtools.lttng.core.trace.LTTngTrace; +import org.eclipse.linuxtools.tmf.core.event.TmfEvent; +import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp; +import org.eclipse.linuxtools.tmf.core.trace.TmfContext; /* Functions tested here : diff --git a/org.eclipse.linuxtools.lttng.tests/test.xml b/org.eclipse.linuxtools.lttng.core.tests/test.xml similarity index 100% rename from org.eclipse.linuxtools.lttng.tests/test.xml rename to org.eclipse.linuxtools.lttng.core.tests/test.xml diff --git a/org.eclipse.linuxtools.lttng.tests/traceset/.gitignore b/org.eclipse.linuxtools.lttng.core.tests/traceset/.gitignore similarity index 100% rename from org.eclipse.linuxtools.lttng.tests/traceset/.gitignore rename to org.eclipse.linuxtools.lttng.core.tests/traceset/.gitignore diff --git a/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat.tar.gz b/org.eclipse.linuxtools.lttng.core.tests/traceset/trace-15316events_nolost_newformat.tar.gz similarity index 100% rename from org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat.tar.gz rename to org.eclipse.linuxtools.lttng.core.tests/traceset/trace-15316events_nolost_newformat.tar.gz diff --git a/org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat.txt b/org.eclipse.linuxtools.lttng.core.tests/traceset/trace-15316events_nolost_newformat.txt similarity index 100% rename from org.eclipse.linuxtools.lttng.tests/traceset/trace-15316events_nolost_newformat.txt rename to org.eclipse.linuxtools.lttng.core.tests/traceset/trace-15316events_nolost_newformat.txt diff --git a/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat.tar.gz b/org.eclipse.linuxtools.lttng.core.tests/traceset/trace-15471events_nolost_newformat.tar.gz similarity index 100% rename from org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat.tar.gz rename to org.eclipse.linuxtools.lttng.core.tests/traceset/trace-15471events_nolost_newformat.tar.gz diff --git a/org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat.txt b/org.eclipse.linuxtools.lttng.core.tests/traceset/trace-15471events_nolost_newformat.txt similarity index 100% rename from org.eclipse.linuxtools.lttng.tests/traceset/trace-15471events_nolost_newformat.txt rename to org.eclipse.linuxtools.lttng.core.tests/traceset/trace-15471events_nolost_newformat.txt diff --git a/org.eclipse.linuxtools.lttng.tests/traceset/trace-2.6.tar.gz b/org.eclipse.linuxtools.lttng.core.tests/traceset/trace-2.6.tar.gz similarity index 100% rename from org.eclipse.linuxtools.lttng.tests/traceset/trace-2.6.tar.gz rename to org.eclipse.linuxtools.lttng.core.tests/traceset/trace-2.6.tar.gz diff --git a/org.eclipse.linuxtools.lttng.core/META-INF/MANIFEST.MF b/org.eclipse.linuxtools.lttng.core/META-INF/MANIFEST.MF index 6441b9ab0e..a8275a04e2 100644 --- a/org.eclipse.linuxtools.lttng.core/META-INF/MANIFEST.MF +++ b/org.eclipse.linuxtools.lttng.core/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.linuxtools.lttng.core;singleton:=true Bundle-Version: 0.4.0.qualifier -Bundle-Activator: org.eclipse.linuxtools.lttng.LTTngCorePlugin +Bundle-Activator: org.eclipse.linuxtools.lttng.core.LTTngCorePlugin Bundle-Vendor: %Bundle-Vendor Require-Bundle: org.eclipse.core.runtime;bundle-version="3.7.0", org.eclipse.linuxtools.tmf.core;bundle-version="0.4.0", @@ -13,22 +13,22 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.7.0", org.eclipse.core.resources;bundle-version="3.7.100" Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-ActivationPolicy: lazy -Export-Package: org.eclipse.linuxtools.lttng, - org.eclipse.linuxtools.lttng.control, - org.eclipse.linuxtools.lttng.event, - org.eclipse.linuxtools.lttng.exceptions, - org.eclipse.linuxtools.lttng.model, - org.eclipse.linuxtools.lttng.request, - org.eclipse.linuxtools.lttng.signal, - org.eclipse.linuxtools.lttng.state, - org.eclipse.linuxtools.lttng.state.evProcessor, - org.eclipse.linuxtools.lttng.state.evProcessor.state, - org.eclipse.linuxtools.lttng.state.experiment, - org.eclipse.linuxtools.lttng.state.model, - org.eclipse.linuxtools.lttng.state.resource, - org.eclipse.linuxtools.lttng.state.trace, - org.eclipse.linuxtools.lttng.trace, - org.eclipse.linuxtools.lttng.tracecontrol.model, - org.eclipse.linuxtools.lttng.tracecontrol.model.config, - org.eclipse.linuxtools.lttng.tracecontrol.service +Export-Package: org.eclipse.linuxtools.lttng.core, + org.eclipse.linuxtools.lttng.core.control, + org.eclipse.linuxtools.lttng.core.event, + org.eclipse.linuxtools.lttng.core.exceptions, + org.eclipse.linuxtools.lttng.core.model, + org.eclipse.linuxtools.lttng.core.request, + org.eclipse.linuxtools.lttng.core.signal, + org.eclipse.linuxtools.lttng.core.state, + org.eclipse.linuxtools.lttng.core.state.evProcessor, + org.eclipse.linuxtools.lttng.core.state.evProcessor.state, + org.eclipse.linuxtools.lttng.core.state.experiment, + org.eclipse.linuxtools.lttng.core.state.model, + org.eclipse.linuxtools.lttng.core.state.resource, + org.eclipse.linuxtools.lttng.core.state.trace, + org.eclipse.linuxtools.lttng.core.trace, + org.eclipse.linuxtools.lttng.core.tracecontrol.model, + org.eclipse.linuxtools.lttng.core.tracecontrol.model.config, + org.eclipse.linuxtools.lttng.core.tracecontrol.service Bundle-Localization: plugin diff --git a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/LTTngCorePlugin.java b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/LTTngCorePlugin.java similarity index 98% rename from org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/LTTngCorePlugin.java rename to org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/LTTngCorePlugin.java index 31f9c1a2b5..7c055fd351 100644 --- a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/LTTngCorePlugin.java +++ b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/LTTngCorePlugin.java @@ -10,7 +10,7 @@ * Francois Chouinard - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.lttng; +package org.eclipse.linuxtools.lttng.core; import org.eclipse.core.runtime.Plugin; import org.osgi.framework.BundleContext; diff --git a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/LTTngProjectNature.java b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/LTTngProjectNature.java similarity index 88% rename from org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/LTTngProjectNature.java rename to org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/LTTngProjectNature.java index db70b8885d..9452a95b0a 100644 --- a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/LTTngProjectNature.java +++ b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/LTTngProjectNature.java @@ -10,9 +10,9 @@ * Francois Chouinard - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.lttng; +package org.eclipse.linuxtools.lttng.core; -import org.eclipse.linuxtools.tmf.TmfProjectNature; +import org.eclipse.linuxtools.tmf.core.TmfProjectNature; /** * LTTngProjectNature diff --git a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/LttngConstants.java b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/LttngConstants.java similarity index 99% rename from org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/LttngConstants.java rename to org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/LttngConstants.java index 27cd5d7996..cf39b948fa 100644 --- a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/LttngConstants.java +++ b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/LttngConstants.java @@ -10,7 +10,7 @@ * Bernd Hufmann - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.lttng; +package org.eclipse.linuxtools.lttng.core; /** * LttngConstants diff --git a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/LttngFactory.java b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/LttngFactory.java similarity index 84% rename from org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/LttngFactory.java rename to org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/LttngFactory.java index e477f180ae..c684ec59c8 100644 --- a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/LttngFactory.java +++ b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/LttngFactory.java @@ -9,10 +9,10 @@ * Contributors: * Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.lttng; +package org.eclipse.linuxtools.lttng.core; -import org.eclipse.linuxtools.lttng.control.LttngCoreProviderFactory; -import org.eclipse.linuxtools.lttng.state.experiment.StateManagerFactory; +import org.eclipse.linuxtools.lttng.core.control.LttngCoreProviderFactory; +import org.eclipse.linuxtools.lttng.core.state.experiment.StateManagerFactory; /** * @author alvaro diff --git a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/TraceDebug.java b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/TraceDebug.java similarity index 95% rename from org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/TraceDebug.java rename to org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/TraceDebug.java index 8e23ab89f8..26f3e057fc 100644 --- a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/TraceDebug.java +++ b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/TraceDebug.java @@ -1,4 +1,4 @@ -package org.eclipse.linuxtools.lttng; +package org.eclipse.linuxtools.lttng.core; import java.text.SimpleDateFormat; import java.util.Date; diff --git a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/TraceHelper.java b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/TraceHelper.java similarity index 98% rename from org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/TraceHelper.java rename to org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/TraceHelper.java index ac353a2a32..65cbdf385f 100644 --- a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/TraceHelper.java +++ b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/TraceHelper.java @@ -10,7 +10,7 @@ * Yufen Kuo (ykuo@mvista.com) - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.lttng; +package org.eclipse.linuxtools.lttng.core; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.ProjectScope; diff --git a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/control/LttngCoreProviderFactory.java b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/control/LttngCoreProviderFactory.java similarity index 92% rename from org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/control/LttngCoreProviderFactory.java rename to org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/control/LttngCoreProviderFactory.java index d14d2c2c7e..5247c9ff6a 100644 --- a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/control/LttngCoreProviderFactory.java +++ b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/control/LttngCoreProviderFactory.java @@ -9,13 +9,13 @@ * Contributors: * Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.lttng.control; +package org.eclipse.linuxtools.lttng.core.control; import java.util.HashMap; import java.util.Map; -import org.eclipse.linuxtools.lttng.event.LttngSyntheticEvent; -import org.eclipse.linuxtools.lttng.model.LTTngTreeNode; +import org.eclipse.linuxtools.lttng.core.event.LttngSyntheticEvent; +import org.eclipse.linuxtools.lttng.core.model.LTTngTreeNode; /** * @author alvaro diff --git a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/control/LttngSyntheticEventProvider.java b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/control/LttngSyntheticEventProvider.java similarity index 89% rename from org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/control/LttngSyntheticEventProvider.java rename to org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/control/LttngSyntheticEventProvider.java index 554ed21ee0..0ed398abe9 100644 --- a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/control/LttngSyntheticEventProvider.java +++ b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/control/LttngSyntheticEventProvider.java @@ -11,7 +11,7 @@ * Marc Dumais (marc.dumais@ericsson.com) - Fix for 316455 (first part) *******************************************************************************/ -package org.eclipse.linuxtools.lttng.control; +package org.eclipse.linuxtools.lttng.core.control; import java.util.HashMap; import java.util.Iterator; @@ -19,32 +19,32 @@ import java.util.List; import java.util.Map; import java.util.Vector; -import org.eclipse.linuxtools.lttng.TraceDebug; -import org.eclipse.linuxtools.lttng.event.LttngEvent; -import org.eclipse.linuxtools.lttng.event.LttngEventType; -import org.eclipse.linuxtools.lttng.event.LttngSyntheticEvent; -import org.eclipse.linuxtools.lttng.event.LttngSyntheticEvent.SequenceInd; -import org.eclipse.linuxtools.lttng.event.LttngTimestamp; -import org.eclipse.linuxtools.lttng.model.LTTngTreeNode; -import org.eclipse.linuxtools.lttng.request.LttngBaseEventRequest; -import org.eclipse.linuxtools.lttng.state.evProcessor.ITransEventProcessor; -import org.eclipse.linuxtools.lttng.state.evProcessor.state.StateEventToHandlerFactory; -import org.eclipse.linuxtools.lttng.state.model.LttngTraceState; -import org.eclipse.linuxtools.lttng.state.trace.IStateTraceManager; -import org.eclipse.linuxtools.tmf.component.TmfEventProvider; -import org.eclipse.linuxtools.tmf.event.TmfEventSource; -import org.eclipse.linuxtools.tmf.event.TmfTimeRange; -import org.eclipse.linuxtools.tmf.event.TmfTimestamp; -import org.eclipse.linuxtools.tmf.experiment.TmfExperiment; -import org.eclipse.linuxtools.tmf.request.ITmfDataRequest; -import org.eclipse.linuxtools.tmf.request.ITmfEventRequest; -import org.eclipse.linuxtools.tmf.request.TmfDataRequest; -import org.eclipse.linuxtools.tmf.signal.TmfEndSynchSignal; -import org.eclipse.linuxtools.tmf.signal.TmfStartSynchSignal; -import org.eclipse.linuxtools.tmf.trace.ITmfContext; -import org.eclipse.linuxtools.tmf.trace.ITmfTrace; -import org.eclipse.linuxtools.tmf.trace.TmfCheckpoint; -import org.eclipse.linuxtools.tmf.trace.TmfContext; +import org.eclipse.linuxtools.lttng.core.TraceDebug; +import org.eclipse.linuxtools.lttng.core.event.LttngEvent; +import org.eclipse.linuxtools.lttng.core.event.LttngEventType; +import org.eclipse.linuxtools.lttng.core.event.LttngSyntheticEvent; +import org.eclipse.linuxtools.lttng.core.event.LttngTimestamp; +import org.eclipse.linuxtools.lttng.core.event.LttngSyntheticEvent.SequenceInd; +import org.eclipse.linuxtools.lttng.core.model.LTTngTreeNode; +import org.eclipse.linuxtools.lttng.core.request.LttngBaseEventRequest; +import org.eclipse.linuxtools.lttng.core.state.evProcessor.ITransEventProcessor; +import org.eclipse.linuxtools.lttng.core.state.evProcessor.state.StateEventToHandlerFactory; +import org.eclipse.linuxtools.lttng.core.state.model.LttngTraceState; +import org.eclipse.linuxtools.lttng.core.state.trace.IStateTraceManager; +import org.eclipse.linuxtools.tmf.core.component.TmfEventProvider; +import org.eclipse.linuxtools.tmf.core.event.TmfEventSource; +import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange; +import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp; +import org.eclipse.linuxtools.tmf.core.experiment.TmfExperiment; +import org.eclipse.linuxtools.tmf.core.request.ITmfDataRequest; +import org.eclipse.linuxtools.tmf.core.request.ITmfEventRequest; +import org.eclipse.linuxtools.tmf.core.request.TmfDataRequest; +import org.eclipse.linuxtools.tmf.core.signal.TmfEndSynchSignal; +import org.eclipse.linuxtools.tmf.core.signal.TmfStartSynchSignal; +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; /** * @author alvaro diff --git a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/event/LttngEvent.java b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/event/LttngEvent.java similarity index 91% rename from org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/event/LttngEvent.java rename to org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/event/LttngEvent.java index 3849fe63ed..082b9169f9 100644 --- a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/event/LttngEvent.java +++ b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/event/LttngEvent.java @@ -1,9 +1,9 @@ -package org.eclipse.linuxtools.lttng.event; +package org.eclipse.linuxtools.lttng.core.event; import org.eclipse.linuxtools.lttng.jni.JniEvent; -import org.eclipse.linuxtools.tmf.event.TmfEvent; -import org.eclipse.linuxtools.tmf.event.TmfEventSource; -import org.eclipse.linuxtools.tmf.trace.TmfTrace; +import org.eclipse.linuxtools.tmf.core.event.TmfEvent; +import org.eclipse.linuxtools.tmf.core.event.TmfEventSource; +import org.eclipse.linuxtools.tmf.core.trace.TmfTrace; /** * LttngEvent @@ -37,11 +37,11 @@ public class LttngEvent extends TmfEvent { * @param reference The reference of this event * @param lttEvent A reference to a valid JniEvent object * - * @see org.eclipse.linuxtools.tmf.event.TmfTimestamp - * @see org.eclipse.linuxtools.tmf.event.TmfEventSource - * @see org.eclipse.linuxtools.lttng.event.LttngEventType - * @see org.eclipse.linuxtools.lttng.event.LttngEventContent - * @see org.eclipse.linuxtools.lttng.event.LttngEventReference + * @see org.eclipse.linuxtools.tmf.core.event.TmfTimestamp + * @see org.eclipse.linuxtools.tmf.core.event.TmfEventSource + * @see org.eclipse.linuxtools.lttng.core.event.LttngEventType + * @see org.eclipse.linuxtools.lttng.core.event.LttngEventContent + * @see org.eclipse.linuxtools.lttng.core.event.LttngEventReference * @see org.eclipse.linuxtools.org.eclipse.linuxtools.lttng.jni.JniEvent */ public LttngEvent(TmfTrace parent, LttngTimestamp timestamp, TmfEventSource source, LttngEventType type, LttngEventContent content, diff --git a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/event/LttngEventContent.java b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/event/LttngEventContent.java similarity index 96% rename from org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/event/LttngEventContent.java rename to org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/event/LttngEventContent.java index 126f6207bb..a5cc04bca9 100644 --- a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/event/LttngEventContent.java +++ b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/event/LttngEventContent.java @@ -10,13 +10,13 @@ * William Bourque (wbourque@gmail.com) - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.lttng.event; +package org.eclipse.linuxtools.lttng.core.event; import java.util.HashMap; import org.eclipse.linuxtools.lttng.jni.JniEvent; -import org.eclipse.linuxtools.tmf.event.TmfEventContent; -import org.eclipse.linuxtools.tmf.event.TmfNoSuchFieldException; +import org.eclipse.linuxtools.tmf.core.event.TmfEventContent; +import org.eclipse.linuxtools.tmf.core.event.TmfNoSuchFieldException; /** * LttngEventContent

@@ -42,7 +42,7 @@ public class LttngEventContent extends TmfEventContent { * * @param thisParent Parent event for this content. * - * @see org.eclipse.linuxtools.lttng.event.LttngEvent + * @see org.eclipse.linuxtools.lttng.core.event.LttngEvent */ public LttngEventContent(LttngEvent thisParent) { super(thisParent, null); @@ -54,7 +54,7 @@ public class LttngEventContent extends TmfEventContent { * @param thisParent Parent event for this content. * @param thisContent Already parsed content. * - * @see org.eclipse.linuxtools.lttng.event.LttngEvent + * @see org.eclipse.linuxtools.lttng.core.event.LttngEvent */ public LttngEventContent(LttngEvent thisParent, HashMap thisContent) { super(thisParent, null); diff --git a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/event/LttngEventField.java b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/event/LttngEventField.java similarity index 92% rename from org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/event/LttngEventField.java rename to org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/event/LttngEventField.java index 4c1170035d..e5020b0495 100644 --- a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/event/LttngEventField.java +++ b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/event/LttngEventField.java @@ -10,10 +10,10 @@ * William Bourque (wbourque@gmail.com) - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.lttng.event; +package org.eclipse.linuxtools.lttng.core.event; -import org.eclipse.linuxtools.tmf.event.TmfEventContent; -import org.eclipse.linuxtools.tmf.event.TmfEventField; +import org.eclipse.linuxtools.tmf.core.event.TmfEventContent; +import org.eclipse.linuxtools.tmf.core.event.TmfEventField; /** * LttngEventField

diff --git a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/event/LttngEventReference.java b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/event/LttngEventReference.java similarity index 96% rename from org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/event/LttngEventReference.java rename to org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/event/LttngEventReference.java index daacb06846..38a78e078a 100644 --- a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/event/LttngEventReference.java +++ b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/event/LttngEventReference.java @@ -10,9 +10,9 @@ * William Bourque (wbourque@gmail.com) - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.lttng.event; +package org.eclipse.linuxtools.lttng.core.event; -import org.eclipse.linuxtools.tmf.event.*; +import org.eclipse.linuxtools.tmf.core.event.*; /** * LttngEventReference

diff --git a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/event/LttngEventSource.java b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/event/LttngEventSource.java similarity index 94% rename from org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/event/LttngEventSource.java rename to org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/event/LttngEventSource.java index 68d9c61237..dc04bb6b79 100644 --- a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/event/LttngEventSource.java +++ b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/event/LttngEventSource.java @@ -10,9 +10,9 @@ * William Bourque (wbourque@gmail.com) - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.lttng.event; +package org.eclipse.linuxtools.lttng.core.event; -import org.eclipse.linuxtools.tmf.event.*; +import org.eclipse.linuxtools.tmf.core.event.*; /** * LttngEventSource

diff --git a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/event/LttngEventType.java b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/event/LttngEventType.java similarity index 97% rename from org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/event/LttngEventType.java rename to org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/event/LttngEventType.java index 3435197cf2..27b0dd4aac 100644 --- a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/event/LttngEventType.java +++ b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/event/LttngEventType.java @@ -10,9 +10,9 @@ * William Bourque (wbourque@gmail.com) - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.lttng.event; +package org.eclipse.linuxtools.lttng.core.event; -import org.eclipse.linuxtools.tmf.event.*; +import org.eclipse.linuxtools.tmf.core.event.*; /** * LttngEventType

diff --git a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/event/LttngLocation.java b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/event/LttngLocation.java similarity index 97% rename from org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/event/LttngLocation.java rename to org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/event/LttngLocation.java index 25913fcad1..f8111db5b2 100644 --- a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/event/LttngLocation.java +++ b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/event/LttngLocation.java @@ -1,6 +1,6 @@ -package org.eclipse.linuxtools.lttng.event; +package org.eclipse.linuxtools.lttng.core.event; -import org.eclipse.linuxtools.tmf.trace.ITmfLocation; +import org.eclipse.linuxtools.tmf.core.trace.ITmfLocation; public class LttngLocation implements ITmfLocation, Comparable { diff --git a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/event/LttngSyntheticEvent.java b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/event/LttngSyntheticEvent.java similarity index 95% rename from org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/event/LttngSyntheticEvent.java rename to org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/event/LttngSyntheticEvent.java index 2f1526975f..0cf6c8d30f 100644 --- a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/event/LttngSyntheticEvent.java +++ b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/event/LttngSyntheticEvent.java @@ -9,12 +9,12 @@ * Contributors: * Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.lttng.event; +package org.eclipse.linuxtools.lttng.core.event; +import org.eclipse.linuxtools.lttng.core.state.model.LttngTraceState; import org.eclipse.linuxtools.lttng.jni.JniEvent; -import org.eclipse.linuxtools.lttng.state.model.LttngTraceState; -import org.eclipse.linuxtools.tmf.event.TmfEventSource; -import org.eclipse.linuxtools.tmf.trace.TmfTrace; +import org.eclipse.linuxtools.tmf.core.event.TmfEventSource; +import org.eclipse.linuxtools.tmf.core.trace.TmfTrace; /** * @author alvaro @@ -123,7 +123,7 @@ public class LttngSyntheticEvent extends LttngEvent { /** * /* (non-Javadoc) * - * @see org.eclipse.linuxtools.lttng.event.LttngEvent#getParentTrace() + * @see org.eclipse.linuxtools.lttng.core.event.LttngEvent#getParentTrace() */ @SuppressWarnings("unchecked") @Override diff --git a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/event/LttngTimestamp.java b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/event/LttngTimestamp.java similarity index 97% rename from org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/event/LttngTimestamp.java rename to org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/event/LttngTimestamp.java index bc93f392a3..974f4d644e 100644 --- a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/event/LttngTimestamp.java +++ b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/event/LttngTimestamp.java @@ -10,9 +10,9 @@ * William Bourque (wbourque@gmail.com) - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.lttng.event; +package org.eclipse.linuxtools.lttng.core.event; -import org.eclipse.linuxtools.tmf.event.TmfTimestamp; +import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp; /** * LttngTimestamp

diff --git a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/exceptions/EventOutOfSequenceException.java b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/exceptions/EventOutOfSequenceException.java similarity index 82% rename from org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/exceptions/EventOutOfSequenceException.java rename to org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/exceptions/EventOutOfSequenceException.java index 5e002803f5..4ee9e79986 100644 --- a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/exceptions/EventOutOfSequenceException.java +++ b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/exceptions/EventOutOfSequenceException.java @@ -1,7 +1,7 @@ /** * */ -package org.eclipse.linuxtools.lttng.exceptions; +package org.eclipse.linuxtools.lttng.core.exceptions; /** * @author francois diff --git a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/exceptions/LttngException.java b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/exceptions/LttngException.java similarity index 83% rename from org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/exceptions/LttngException.java rename to org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/exceptions/LttngException.java index 00226c85fe..a325546a29 100644 --- a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/exceptions/LttngException.java +++ b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/exceptions/LttngException.java @@ -1,4 +1,4 @@ -package org.eclipse.linuxtools.lttng.exceptions; +package org.eclipse.linuxtools.lttng.core.exceptions; /** * LttngException diff --git a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/model/ILTTngTreeNode.java b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/model/ILTTngTreeNode.java similarity index 98% rename from org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/model/ILTTngTreeNode.java rename to org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/model/ILTTngTreeNode.java index 0d6da5eb5d..16d5cb65c1 100644 --- a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/model/ILTTngTreeNode.java +++ b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/model/ILTTngTreeNode.java @@ -9,7 +9,7 @@ * Contributors: * Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.lttng.model; +package org.eclipse.linuxtools.lttng.core.model; import org.eclipse.core.runtime.IAdaptable; diff --git a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/model/LTTngTreeNode.java b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/model/LTTngTreeNode.java similarity index 97% rename from org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/model/LTTngTreeNode.java rename to org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/model/LTTngTreeNode.java index 65de900fdc..e50e06e872 100644 --- a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/model/LTTngTreeNode.java +++ b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/model/LTTngTreeNode.java @@ -9,7 +9,7 @@ * Contributors: * Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.lttng.model; +package org.eclipse.linuxtools.lttng.core.model; public class LTTngTreeNode extends diff --git a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/model/LTTngTreeNodeGeneric.java b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/model/LTTngTreeNodeGeneric.java similarity index 97% rename from org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/model/LTTngTreeNodeGeneric.java rename to org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/model/LTTngTreeNodeGeneric.java index 08755cabb0..ad2541d0ad 100644 --- a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/model/LTTngTreeNodeGeneric.java +++ b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/model/LTTngTreeNodeGeneric.java @@ -9,15 +9,15 @@ * Contributors: * Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.lttng.model; +package org.eclipse.linuxtools.lttng.core.model; import java.util.Collection; import java.util.HashMap; import java.util.Map; -import org.eclipse.linuxtools.lttng.LttngConstants; -import org.eclipse.linuxtools.lttng.TraceDebug; -import org.eclipse.linuxtools.tmf.event.TmfData; +import org.eclipse.linuxtools.lttng.core.LttngConstants; +import org.eclipse.linuxtools.lttng.core.TraceDebug; +import org.eclipse.linuxtools.tmf.core.event.TmfData; public abstract class LTTngTreeNodeGeneric> extends TmfData implements ILTTngTreeNode { diff --git a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/request/ILttngSyntEventRequest.java b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/request/ILttngSyntEventRequest.java similarity index 88% rename from org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/request/ILttngSyntEventRequest.java rename to org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/request/ILttngSyntEventRequest.java index aaff37fedb..9e0be15f52 100644 --- a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/request/ILttngSyntEventRequest.java +++ b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/request/ILttngSyntEventRequest.java @@ -9,12 +9,12 @@ * Contributors: * Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.lttng.request; +package org.eclipse.linuxtools.lttng.core.request; -import org.eclipse.linuxtools.lttng.event.LttngSyntheticEvent; -import org.eclipse.linuxtools.tmf.component.TmfEventProvider; -import org.eclipse.linuxtools.tmf.event.TmfTimeRange; -import org.eclipse.linuxtools.tmf.request.ITmfDataRequest; +import org.eclipse.linuxtools.lttng.core.event.LttngSyntheticEvent; +import org.eclipse.linuxtools.tmf.core.component.TmfEventProvider; +import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange; +import org.eclipse.linuxtools.tmf.core.request.ITmfDataRequest; public interface ILttngSyntEventRequest extends ITmfDataRequest { diff --git a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/request/IRequestStatusListener.java b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/request/IRequestStatusListener.java similarity index 95% rename from org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/request/IRequestStatusListener.java rename to org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/request/IRequestStatusListener.java index c0d1feb8a6..97d305f4f1 100644 --- a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/request/IRequestStatusListener.java +++ b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/request/IRequestStatusListener.java @@ -9,7 +9,7 @@ * Contributors: * Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.lttng.request; +package org.eclipse.linuxtools.lttng.core.request; diff --git a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/request/LttngBaseEventRequest.java b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/request/LttngBaseEventRequest.java similarity index 89% rename from org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/request/LttngBaseEventRequest.java rename to org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/request/LttngBaseEventRequest.java index bdc3e98d61..f6b7606fe4 100644 --- a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/request/LttngBaseEventRequest.java +++ b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/request/LttngBaseEventRequest.java @@ -10,14 +10,14 @@ * Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation * Marc Dumais (marc.dumais@ericsson.com) - Fix for 316455 (first part) *******************************************************************************/ -package org.eclipse.linuxtools.lttng.request; +package org.eclipse.linuxtools.lttng.core.request; -import org.eclipse.linuxtools.lttng.event.LttngEvent; -import org.eclipse.linuxtools.tmf.event.TmfTimeRange; -import org.eclipse.linuxtools.tmf.event.TmfTimestamp; -import org.eclipse.linuxtools.tmf.experiment.TmfExperiment; -import org.eclipse.linuxtools.tmf.request.ITmfDataRequest; -import org.eclipse.linuxtools.tmf.request.TmfEventRequest; +import org.eclipse.linuxtools.lttng.core.event.LttngEvent; +import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange; +import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp; +import org.eclipse.linuxtools.tmf.core.experiment.TmfExperiment; +import org.eclipse.linuxtools.tmf.core.request.ITmfDataRequest; +import org.eclipse.linuxtools.tmf.core.request.TmfEventRequest; /** * This class is an extension of Tmf Event Request which includes specific diff --git a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/request/LttngSyntEventRequest.java b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/request/LttngSyntEventRequest.java similarity index 94% rename from org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/request/LttngSyntEventRequest.java rename to org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/request/LttngSyntEventRequest.java index 96a0886a6b..4c250ae01b 100644 --- a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/request/LttngSyntEventRequest.java +++ b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/request/LttngSyntEventRequest.java @@ -9,15 +9,15 @@ * Contributors: * Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.lttng.request; +package org.eclipse.linuxtools.lttng.core.request; import java.util.Vector; -import org.eclipse.linuxtools.lttng.event.LttngSyntheticEvent; -import org.eclipse.linuxtools.lttng.state.evProcessor.ITransEventProcessor; -import org.eclipse.linuxtools.tmf.component.TmfEventProvider; -import org.eclipse.linuxtools.tmf.event.TmfTimeRange; -import org.eclipse.linuxtools.tmf.request.TmfEventRequest; +import org.eclipse.linuxtools.lttng.core.event.LttngSyntheticEvent; +import org.eclipse.linuxtools.lttng.core.state.evProcessor.ITransEventProcessor; +import org.eclipse.linuxtools.tmf.core.component.TmfEventProvider; +import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange; +import org.eclipse.linuxtools.tmf.core.request.TmfEventRequest; /** * This class is an extension of Data Request which includes specific references diff --git a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/request/RequestCompletedSignal.java b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/request/RequestCompletedSignal.java similarity index 71% rename from org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/request/RequestCompletedSignal.java rename to org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/request/RequestCompletedSignal.java index 6604dd2144..8f9ab7f630 100644 --- a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/request/RequestCompletedSignal.java +++ b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/request/RequestCompletedSignal.java @@ -1,6 +1,6 @@ -package org.eclipse.linuxtools.lttng.request; +package org.eclipse.linuxtools.lttng.core.request; -import org.eclipse.linuxtools.tmf.signal.TmfSignal; +import org.eclipse.linuxtools.tmf.core.signal.TmfSignal; public class RequestCompletedSignal extends TmfSignal { diff --git a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/request/RequestStartedSignal.java b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/request/RequestStartedSignal.java similarity index 71% rename from org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/request/RequestStartedSignal.java rename to org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/request/RequestStartedSignal.java index 624cb87719..cad89ab04e 100644 --- a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/request/RequestStartedSignal.java +++ b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/request/RequestStartedSignal.java @@ -1,6 +1,6 @@ -package org.eclipse.linuxtools.lttng.request; +package org.eclipse.linuxtools.lttng.core.request; -import org.eclipse.linuxtools.tmf.signal.TmfSignal; +import org.eclipse.linuxtools.tmf.core.signal.TmfSignal; public class RequestStartedSignal extends TmfSignal { diff --git a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/signal/ILttExperimentSelectedListener.java b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/signal/ILttExperimentSelectedListener.java similarity index 77% rename from org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/signal/ILttExperimentSelectedListener.java rename to org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/signal/ILttExperimentSelectedListener.java index dfd115f192..9217c8e91e 100644 --- a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/signal/ILttExperimentSelectedListener.java +++ b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/signal/ILttExperimentSelectedListener.java @@ -9,11 +9,11 @@ * Contributors: * Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.lttng.signal; +package org.eclipse.linuxtools.lttng.core.signal; -import org.eclipse.linuxtools.lttng.event.LttngEvent; -import org.eclipse.linuxtools.tmf.experiment.TmfExperiment; -import org.eclipse.linuxtools.tmf.signal.TmfExperimentRangeUpdatedSignal; +import org.eclipse.linuxtools.lttng.core.event.LttngEvent; +import org.eclipse.linuxtools.tmf.core.experiment.TmfExperiment; +import org.eclipse.linuxtools.tmf.core.signal.TmfExperimentRangeUpdatedSignal; /** * @author alvaro diff --git a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/signal/StateExperimentListener.java b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/signal/StateExperimentListener.java similarity index 72% rename from org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/signal/StateExperimentListener.java rename to org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/signal/StateExperimentListener.java index e47fcc9de9..3f733f5c20 100644 --- a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/signal/StateExperimentListener.java +++ b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/signal/StateExperimentListener.java @@ -9,15 +9,15 @@ * Contributors: * Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.lttng.signal; +package org.eclipse.linuxtools.lttng.core.signal; -import org.eclipse.linuxtools.lttng.event.LttngEvent; -import org.eclipse.linuxtools.tmf.component.TmfComponent; -import org.eclipse.linuxtools.tmf.event.TmfEvent; -import org.eclipse.linuxtools.tmf.experiment.TmfExperiment; -import org.eclipse.linuxtools.tmf.signal.TmfExperimentRangeUpdatedSignal; -import org.eclipse.linuxtools.tmf.signal.TmfExperimentSelectedSignal; -import org.eclipse.linuxtools.tmf.signal.TmfSignalHandler; +import org.eclipse.linuxtools.lttng.core.event.LttngEvent; +import org.eclipse.linuxtools.tmf.core.component.TmfComponent; +import org.eclipse.linuxtools.tmf.core.event.TmfEvent; +import org.eclipse.linuxtools.tmf.core.experiment.TmfExperiment; +import org.eclipse.linuxtools.tmf.core.signal.TmfExperimentRangeUpdatedSignal; +import org.eclipse.linuxtools.tmf.core.signal.TmfExperimentSelectedSignal; +import org.eclipse.linuxtools.tmf.core.signal.TmfSignalHandler; /** * @author alvaro diff --git a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/LttngStateException.java b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/LttngStateException.java similarity index 98% rename from org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/LttngStateException.java rename to org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/LttngStateException.java index 843d6e72e9..0361aa76fc 100644 --- a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/LttngStateException.java +++ b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/LttngStateException.java @@ -10,7 +10,7 @@ * Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.lttng.state; +package org.eclipse.linuxtools.lttng.core.state; /** * diff --git a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/StateStrings.java b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/StateStrings.java similarity index 99% rename from org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/StateStrings.java rename to org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/StateStrings.java index be1149921f..7b1076fd65 100644 --- a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/StateStrings.java +++ b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/StateStrings.java @@ -10,7 +10,7 @@ * Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation * Daniel U. Thibault (daniel.thibault@drdc-rddc.gc.ca) - 2011-06-21 Fixes *******************************************************************************/ -package org.eclipse.linuxtools.lttng.state; +package org.eclipse.linuxtools.lttng.core.state; import java.util.HashMap; import java.util.HashSet; diff --git a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/evProcessor/AbsEventToHandlerResolver.java b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/evProcessor/AbsEventToHandlerResolver.java similarity index 94% rename from org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/evProcessor/AbsEventToHandlerResolver.java rename to org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/evProcessor/AbsEventToHandlerResolver.java index f9f950efa9..35db1f739f 100644 --- a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/evProcessor/AbsEventToHandlerResolver.java +++ b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/evProcessor/AbsEventToHandlerResolver.java @@ -11,15 +11,15 @@ * Michel Dagenais (michel.dagenais@polymtl.ca) - Reference C implementation, used with permission *******************************************************************************/ -package org.eclipse.linuxtools.lttng.state.evProcessor; +package org.eclipse.linuxtools.lttng.core.state.evProcessor; import java.util.Set; -import org.eclipse.linuxtools.lttng.TraceDebug; -import org.eclipse.linuxtools.lttng.event.LttngEvent; -import org.eclipse.linuxtools.lttng.event.LttngSyntheticEvent; -import org.eclipse.linuxtools.lttng.state.model.LttngTraceState; -import org.eclipse.linuxtools.tmf.event.TmfEvent; +import org.eclipse.linuxtools.lttng.core.TraceDebug; +import org.eclipse.linuxtools.lttng.core.event.LttngEvent; +import org.eclipse.linuxtools.lttng.core.event.LttngSyntheticEvent; +import org.eclipse.linuxtools.lttng.core.state.model.LttngTraceState; +import org.eclipse.linuxtools.tmf.core.event.TmfEvent; /** * @author alvaro diff --git a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/evProcessor/IBaseEventProcessor.java b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/evProcessor/IBaseEventProcessor.java similarity index 82% rename from org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/evProcessor/IBaseEventProcessor.java rename to org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/evProcessor/IBaseEventProcessor.java index 9356a4bd4c..63f72d8f09 100644 --- a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/evProcessor/IBaseEventProcessor.java +++ b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/evProcessor/IBaseEventProcessor.java @@ -10,10 +10,10 @@ * Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation * Michel Dagenais (michel.dagenais@polymtl.ca) - Reference C implementation, used with permission *******************************************************************************/ -package org.eclipse.linuxtools.lttng.state.evProcessor; +package org.eclipse.linuxtools.lttng.core.state.evProcessor; -import org.eclipse.linuxtools.lttng.state.model.LttngTraceState; -import org.eclipse.linuxtools.tmf.event.TmfEvent; +import org.eclipse.linuxtools.lttng.core.state.model.LttngTraceState; +import org.eclipse.linuxtools.tmf.core.event.TmfEvent; public interface IBaseEventProcessor { diff --git a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/evProcessor/IEventToHandlerResolver.java b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/evProcessor/IEventToHandlerResolver.java similarity index 93% rename from org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/evProcessor/IEventToHandlerResolver.java rename to org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/evProcessor/IEventToHandlerResolver.java index 7d1de8c8b9..ce877fbdea 100644 --- a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/evProcessor/IEventToHandlerResolver.java +++ b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/evProcessor/IEventToHandlerResolver.java @@ -1,4 +1,4 @@ -package org.eclipse.linuxtools.lttng.state.evProcessor; +package org.eclipse.linuxtools.lttng.core.state.evProcessor; public interface IEventToHandlerResolver { diff --git a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/evProcessor/ILttngEventProcessor.java b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/evProcessor/ILttngEventProcessor.java similarity index 85% rename from org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/evProcessor/ILttngEventProcessor.java rename to org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/evProcessor/ILttngEventProcessor.java index 14c8fc23a8..9710e13d06 100644 --- a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/evProcessor/ILttngEventProcessor.java +++ b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/evProcessor/ILttngEventProcessor.java @@ -10,10 +10,10 @@ * Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation * Michel Dagenais (michel.dagenais@polymtl.ca) - Reference C implementation, used with permission *******************************************************************************/ -package org.eclipse.linuxtools.lttng.state.evProcessor; +package org.eclipse.linuxtools.lttng.core.state.evProcessor; -import org.eclipse.linuxtools.lttng.event.LttngEvent; -import org.eclipse.linuxtools.lttng.state.model.LttngTraceState; +import org.eclipse.linuxtools.lttng.core.event.LttngEvent; +import org.eclipse.linuxtools.lttng.core.state.model.LttngTraceState; /** * @author alvaro diff --git a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/evProcessor/ITransEventProcessor.java b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/evProcessor/ITransEventProcessor.java similarity index 94% rename from org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/evProcessor/ITransEventProcessor.java rename to org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/evProcessor/ITransEventProcessor.java index 3b5aeea88e..805c765536 100644 --- a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/evProcessor/ITransEventProcessor.java +++ b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/evProcessor/ITransEventProcessor.java @@ -10,7 +10,7 @@ * Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation * Michel Dagenais (michel.dagenais@polymtl.ca) - Reference C implementation, used with permission *******************************************************************************/ -package org.eclipse.linuxtools.lttng.state.evProcessor; +package org.eclipse.linuxtools.lttng.core.state.evProcessor; /** * @author alvaro diff --git a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/evProcessor/state/AbsStateProcessing.java b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/evProcessor/state/AbsStateProcessing.java similarity index 91% rename from org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/evProcessor/state/AbsStateProcessing.java rename to org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/evProcessor/state/AbsStateProcessing.java index 306858d2a6..00ce0efaac 100644 --- a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/evProcessor/state/AbsStateProcessing.java +++ b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/evProcessor/state/AbsStateProcessing.java @@ -1,16 +1,16 @@ /** * */ -package org.eclipse.linuxtools.lttng.state.evProcessor.state; +package org.eclipse.linuxtools.lttng.core.state.evProcessor.state; -import org.eclipse.linuxtools.lttng.TraceDebug; -import org.eclipse.linuxtools.lttng.event.LttngEvent; -import org.eclipse.linuxtools.lttng.event.LttngEventContent; -import org.eclipse.linuxtools.lttng.event.LttngEventField; -import org.eclipse.linuxtools.lttng.state.StateStrings.Fields; -import org.eclipse.linuxtools.lttng.state.model.LttngProcessState; -import org.eclipse.linuxtools.lttng.state.model.LttngTraceState; -import org.eclipse.linuxtools.tmf.event.TmfEventField; +import org.eclipse.linuxtools.lttng.core.TraceDebug; +import org.eclipse.linuxtools.lttng.core.event.LttngEvent; +import org.eclipse.linuxtools.lttng.core.event.LttngEventContent; +import org.eclipse.linuxtools.lttng.core.event.LttngEventField; +import org.eclipse.linuxtools.lttng.core.state.StateStrings.Fields; +import org.eclipse.linuxtools.lttng.core.state.model.LttngProcessState; +import org.eclipse.linuxtools.lttng.core.state.model.LttngTraceState; +import org.eclipse.linuxtools.tmf.core.event.TmfEventField; /** * Common utility methods for all state processing handlers, not intended to be diff --git a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/evProcessor/state/AbsStateUpdate.java b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/evProcessor/state/AbsStateUpdate.java similarity index 88% rename from org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/evProcessor/state/AbsStateUpdate.java rename to org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/evProcessor/state/AbsStateUpdate.java index 6d3b58b1a4..03bf13e2d2 100644 --- a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/evProcessor/state/AbsStateUpdate.java +++ b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/evProcessor/state/AbsStateUpdate.java @@ -10,22 +10,22 @@ * Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation * Michel Dagenais (michel.dagenais@polymtl.ca) - Reference C implementation, used with permission *******************************************************************************/ -package org.eclipse.linuxtools.lttng.state.evProcessor.state; - -import org.eclipse.linuxtools.lttng.TraceDebug; -import org.eclipse.linuxtools.lttng.event.LttngEvent; -import org.eclipse.linuxtools.lttng.state.StateStrings; -import org.eclipse.linuxtools.lttng.state.StateStrings.ExecutionMode; -import org.eclipse.linuxtools.lttng.state.StateStrings.IRQMode; -import org.eclipse.linuxtools.lttng.state.StateStrings.ProcessStatus; -import org.eclipse.linuxtools.lttng.state.evProcessor.ILttngEventProcessor; -import org.eclipse.linuxtools.lttng.state.model.LTTngCPUState; -import org.eclipse.linuxtools.lttng.state.model.LttngBdevState; -import org.eclipse.linuxtools.lttng.state.model.LttngExecutionState; -import org.eclipse.linuxtools.lttng.state.model.LttngIRQState; -import org.eclipse.linuxtools.lttng.state.model.LttngProcessState; -import org.eclipse.linuxtools.lttng.state.model.LttngTraceState; -import org.eclipse.linuxtools.tmf.event.TmfTimestamp; +package org.eclipse.linuxtools.lttng.core.state.evProcessor.state; + +import org.eclipse.linuxtools.lttng.core.TraceDebug; +import org.eclipse.linuxtools.lttng.core.event.LttngEvent; +import org.eclipse.linuxtools.lttng.core.state.StateStrings; +import org.eclipse.linuxtools.lttng.core.state.StateStrings.ExecutionMode; +import org.eclipse.linuxtools.lttng.core.state.StateStrings.IRQMode; +import org.eclipse.linuxtools.lttng.core.state.StateStrings.ProcessStatus; +import org.eclipse.linuxtools.lttng.core.state.evProcessor.ILttngEventProcessor; +import org.eclipse.linuxtools.lttng.core.state.model.LTTngCPUState; +import org.eclipse.linuxtools.lttng.core.state.model.LttngBdevState; +import org.eclipse.linuxtools.lttng.core.state.model.LttngExecutionState; +import org.eclipse.linuxtools.lttng.core.state.model.LttngIRQState; +import org.eclipse.linuxtools.lttng.core.state.model.LttngProcessState; +import org.eclipse.linuxtools.lttng.core.state.model.LttngTraceState; +import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp; public abstract class AbsStateUpdate extends AbsStateProcessing implements ILttngEventProcessor { diff --git a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/evProcessor/state/StateEventToHandlerFactory.java b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/evProcessor/state/StateEventToHandlerFactory.java similarity index 96% rename from org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/evProcessor/state/StateEventToHandlerFactory.java rename to org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/evProcessor/state/StateEventToHandlerFactory.java index 7e49a6fd04..882ac8217e 100644 --- a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/evProcessor/state/StateEventToHandlerFactory.java +++ b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/evProcessor/state/StateEventToHandlerFactory.java @@ -10,14 +10,14 @@ * Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation * Michel Dagenais (michel.dagenais@polymtl.ca) - Reference C implementation, used with permission *******************************************************************************/ -package org.eclipse.linuxtools.lttng.state.evProcessor.state; +package org.eclipse.linuxtools.lttng.core.state.evProcessor.state; import java.util.HashMap; import java.util.Map; -import org.eclipse.linuxtools.lttng.state.StateStrings; -import org.eclipse.linuxtools.lttng.state.evProcessor.AbsEventToHandlerResolver; -import org.eclipse.linuxtools.lttng.state.evProcessor.ILttngEventProcessor; +import org.eclipse.linuxtools.lttng.core.state.StateStrings; +import org.eclipse.linuxtools.lttng.core.state.evProcessor.AbsEventToHandlerResolver; +import org.eclipse.linuxtools.lttng.core.state.evProcessor.ILttngEventProcessor; /** * Builds a Map from string event name to a processing handler object, the diff --git a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/evProcessor/state/StateUpdateHandlers.java b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/evProcessor/state/StateUpdateHandlers.java similarity index 96% rename from org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/evProcessor/state/StateUpdateHandlers.java rename to org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/evProcessor/state/StateUpdateHandlers.java index a6f31eb236..35b88956ee 100644 --- a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/evProcessor/state/StateUpdateHandlers.java +++ b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/evProcessor/state/StateUpdateHandlers.java @@ -11,33 +11,33 @@ * Michel Dagenais (michel.dagenais@polymtl.ca) - Reference C implementation, used with permission *******************************************************************************/ -package org.eclipse.linuxtools.lttng.state.evProcessor.state; +package org.eclipse.linuxtools.lttng.core.state.evProcessor.state; import java.util.Map; -import org.eclipse.linuxtools.lttng.LttngConstants; -import org.eclipse.linuxtools.lttng.TraceDebug; -import org.eclipse.linuxtools.lttng.event.LttngEvent; -import org.eclipse.linuxtools.lttng.state.StateStrings; -import org.eclipse.linuxtools.lttng.state.StateStrings.BdevMode; -import org.eclipse.linuxtools.lttng.state.StateStrings.CpuMode; -import org.eclipse.linuxtools.lttng.state.StateStrings.Events; -import org.eclipse.linuxtools.lttng.state.StateStrings.ExecutionMode; -import org.eclipse.linuxtools.lttng.state.StateStrings.ExecutionSubMode; -import org.eclipse.linuxtools.lttng.state.StateStrings.Fields; -import org.eclipse.linuxtools.lttng.state.StateStrings.IRQMode; -import org.eclipse.linuxtools.lttng.state.StateStrings.ProcessStatus; -import org.eclipse.linuxtools.lttng.state.StateStrings.ProcessType; -import org.eclipse.linuxtools.lttng.state.evProcessor.ILttngEventProcessor; -import org.eclipse.linuxtools.lttng.state.model.LTTngCPUState; -import org.eclipse.linuxtools.lttng.state.model.LttngBdevState; -import org.eclipse.linuxtools.lttng.state.model.LttngExecutionState; -import org.eclipse.linuxtools.lttng.state.model.LttngIRQState; -import org.eclipse.linuxtools.lttng.state.model.LttngProcessState; -import org.eclipse.linuxtools.lttng.state.model.LttngSoftIRQState; -import org.eclipse.linuxtools.lttng.state.model.LttngTraceState; -import org.eclipse.linuxtools.lttng.state.model.LttngTrapState; -import org.eclipse.linuxtools.tmf.event.TmfTimestamp; +import org.eclipse.linuxtools.lttng.core.LttngConstants; +import org.eclipse.linuxtools.lttng.core.TraceDebug; +import org.eclipse.linuxtools.lttng.core.event.LttngEvent; +import org.eclipse.linuxtools.lttng.core.state.StateStrings; +import org.eclipse.linuxtools.lttng.core.state.StateStrings.BdevMode; +import org.eclipse.linuxtools.lttng.core.state.StateStrings.CpuMode; +import org.eclipse.linuxtools.lttng.core.state.StateStrings.Events; +import org.eclipse.linuxtools.lttng.core.state.StateStrings.ExecutionMode; +import org.eclipse.linuxtools.lttng.core.state.StateStrings.ExecutionSubMode; +import org.eclipse.linuxtools.lttng.core.state.StateStrings.Fields; +import org.eclipse.linuxtools.lttng.core.state.StateStrings.IRQMode; +import org.eclipse.linuxtools.lttng.core.state.StateStrings.ProcessStatus; +import org.eclipse.linuxtools.lttng.core.state.StateStrings.ProcessType; +import org.eclipse.linuxtools.lttng.core.state.evProcessor.ILttngEventProcessor; +import org.eclipse.linuxtools.lttng.core.state.model.LTTngCPUState; +import org.eclipse.linuxtools.lttng.core.state.model.LttngBdevState; +import org.eclipse.linuxtools.lttng.core.state.model.LttngExecutionState; +import org.eclipse.linuxtools.lttng.core.state.model.LttngIRQState; +import org.eclipse.linuxtools.lttng.core.state.model.LttngProcessState; +import org.eclipse.linuxtools.lttng.core.state.model.LttngSoftIRQState; +import org.eclipse.linuxtools.lttng.core.state.model.LttngTraceState; +import org.eclipse.linuxtools.lttng.core.state.model.LttngTrapState; +import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp; /** * Wraps the creation of individual handlers, each method creates and instance diff --git a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/experiment/IStateExperimentManager.java b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/experiment/IStateExperimentManager.java similarity index 87% rename from org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/experiment/IStateExperimentManager.java rename to org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/experiment/IStateExperimentManager.java index 9258dc13f8..0840577677 100644 --- a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/experiment/IStateExperimentManager.java +++ b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/experiment/IStateExperimentManager.java @@ -10,12 +10,12 @@ * Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.lttng.state.experiment; +package org.eclipse.linuxtools.lttng.core.state.experiment; -import org.eclipse.linuxtools.lttng.event.LttngEvent; -import org.eclipse.linuxtools.lttng.model.LTTngTreeNode; -import org.eclipse.linuxtools.tmf.event.TmfTimeRange; -import org.eclipse.linuxtools.tmf.experiment.TmfExperiment; +import org.eclipse.linuxtools.lttng.core.event.LttngEvent; +import org.eclipse.linuxtools.lttng.core.model.LTTngTreeNode; +import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange; +import org.eclipse.linuxtools.tmf.core.experiment.TmfExperiment; public interface IStateExperimentManager { diff --git a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/experiment/StateExperimentManager.java b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/experiment/StateExperimentManager.java similarity index 92% rename from org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/experiment/StateExperimentManager.java rename to org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/experiment/StateExperimentManager.java index 25d3421034..6e62d11b7f 100644 --- a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/experiment/StateExperimentManager.java +++ b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/experiment/StateExperimentManager.java @@ -10,32 +10,32 @@ * Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation * Marc Dumais (marc.dumais@ericsson.com) - Fix for 316455 (second part) *******************************************************************************/ -package org.eclipse.linuxtools.lttng.state.experiment; +package org.eclipse.linuxtools.lttng.core.state.experiment; import java.util.HashMap; import java.util.Map; -import org.eclipse.linuxtools.lttng.LttngConstants; -import org.eclipse.linuxtools.lttng.TraceDebug; -import org.eclipse.linuxtools.lttng.control.LttngCoreProviderFactory; -import org.eclipse.linuxtools.lttng.event.LttngEvent; -import org.eclipse.linuxtools.lttng.event.LttngSyntheticEvent; -import org.eclipse.linuxtools.lttng.event.LttngSyntheticEvent.SequenceInd; -import org.eclipse.linuxtools.lttng.model.LTTngTreeNode; -import org.eclipse.linuxtools.lttng.signal.ILttExperimentSelectedListener; -import org.eclipse.linuxtools.lttng.signal.StateExperimentListener; -import org.eclipse.linuxtools.lttng.state.model.LttngTraceState; -import org.eclipse.linuxtools.lttng.state.trace.IStateTraceManager; -import org.eclipse.linuxtools.tmf.event.TmfTimeRange; -import org.eclipse.linuxtools.tmf.experiment.TmfExperiment; -import org.eclipse.linuxtools.tmf.request.ITmfDataRequest; -import org.eclipse.linuxtools.tmf.request.ITmfEventRequest; -import org.eclipse.linuxtools.tmf.request.TmfEventRequest; -import org.eclipse.linuxtools.tmf.signal.TmfExperimentRangeUpdatedSignal; -import org.eclipse.linuxtools.tmf.signal.TmfExperimentSelectedSignal; -import org.eclipse.linuxtools.tmf.signal.TmfSignalHandler; -import org.eclipse.linuxtools.tmf.signal.TmfSignalManager; -import org.eclipse.linuxtools.tmf.trace.ITmfTrace; +import org.eclipse.linuxtools.lttng.core.LttngConstants; +import org.eclipse.linuxtools.lttng.core.TraceDebug; +import org.eclipse.linuxtools.lttng.core.control.LttngCoreProviderFactory; +import org.eclipse.linuxtools.lttng.core.event.LttngEvent; +import org.eclipse.linuxtools.lttng.core.event.LttngSyntheticEvent; +import org.eclipse.linuxtools.lttng.core.event.LttngSyntheticEvent.SequenceInd; +import org.eclipse.linuxtools.lttng.core.model.LTTngTreeNode; +import org.eclipse.linuxtools.lttng.core.signal.ILttExperimentSelectedListener; +import org.eclipse.linuxtools.lttng.core.signal.StateExperimentListener; +import org.eclipse.linuxtools.lttng.core.state.model.LttngTraceState; +import org.eclipse.linuxtools.lttng.core.state.trace.IStateTraceManager; +import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange; +import org.eclipse.linuxtools.tmf.core.experiment.TmfExperiment; +import org.eclipse.linuxtools.tmf.core.request.ITmfDataRequest; +import org.eclipse.linuxtools.tmf.core.request.ITmfEventRequest; +import org.eclipse.linuxtools.tmf.core.request.TmfEventRequest; +import org.eclipse.linuxtools.tmf.core.signal.TmfExperimentRangeUpdatedSignal; +import org.eclipse.linuxtools.tmf.core.signal.TmfExperimentSelectedSignal; +import org.eclipse.linuxtools.tmf.core.signal.TmfSignalHandler; +import org.eclipse.linuxtools.tmf.core.signal.TmfSignalManager; +import org.eclipse.linuxtools.tmf.core.trace.ITmfTrace; /** * @author alvaro diff --git a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/experiment/StateManagerFactory.java b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/experiment/StateManagerFactory.java similarity index 89% rename from org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/experiment/StateManagerFactory.java rename to org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/experiment/StateManagerFactory.java index 22411b92a0..6abe08e320 100644 --- a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/experiment/StateManagerFactory.java +++ b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/experiment/StateManagerFactory.java @@ -10,15 +10,15 @@ * Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.lttng.state.experiment; - -import org.eclipse.linuxtools.lttng.TraceDebug; -import org.eclipse.linuxtools.lttng.model.LTTngTreeNode; -import org.eclipse.linuxtools.lttng.state.LttngStateException; -import org.eclipse.linuxtools.lttng.state.trace.IStateTraceManager; -import org.eclipse.linuxtools.lttng.state.trace.StateTraceManager; -import org.eclipse.linuxtools.tmf.experiment.TmfExperiment; -import org.eclipse.linuxtools.tmf.trace.ITmfTrace; +package org.eclipse.linuxtools.lttng.core.state.experiment; + +import org.eclipse.linuxtools.lttng.core.TraceDebug; +import org.eclipse.linuxtools.lttng.core.model.LTTngTreeNode; +import org.eclipse.linuxtools.lttng.core.state.LttngStateException; +import org.eclipse.linuxtools.lttng.core.state.trace.IStateTraceManager; +import org.eclipse.linuxtools.lttng.core.state.trace.StateTraceManager; +import org.eclipse.linuxtools.tmf.core.experiment.TmfExperiment; +import org.eclipse.linuxtools.tmf.core.trace.ITmfTrace; /** * @author alvaro diff --git a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/model/LTTngCPUState.java b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/model/LTTngCPUState.java similarity index 96% rename from org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/model/LTTngCPUState.java rename to org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/model/LTTngCPUState.java index 0d2a3d1e6f..e6094f81ba 100644 --- a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/model/LTTngCPUState.java +++ b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/model/LTTngCPUState.java @@ -9,12 +9,12 @@ * Contributors: * Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.lttng.state.model; +package org.eclipse.linuxtools.lttng.core.state.model; import java.util.Stack; -import org.eclipse.linuxtools.lttng.state.StateStrings; -import org.eclipse.linuxtools.lttng.state.StateStrings.CpuMode; +import org.eclipse.linuxtools.lttng.core.state.StateStrings; +import org.eclipse.linuxtools.lttng.core.state.StateStrings.CpuMode; /** * LTTngCPUState diff --git a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/model/LttngBdevState.java b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/model/LttngBdevState.java similarity index 93% rename from org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/model/LttngBdevState.java rename to org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/model/LttngBdevState.java index d5f94d6aba..08d037ceae 100644 --- a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/model/LttngBdevState.java +++ b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/model/LttngBdevState.java @@ -9,12 +9,12 @@ * Contributors: * Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.lttng.state.model; +package org.eclipse.linuxtools.lttng.core.state.model; import java.util.Stack; -import org.eclipse.linuxtools.lttng.TraceDebug; -import org.eclipse.linuxtools.lttng.state.StateStrings.BdevMode; +import org.eclipse.linuxtools.lttng.core.TraceDebug; +import org.eclipse.linuxtools.lttng.core.state.StateStrings.BdevMode; /** * LttvBdevState diff --git a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/model/LttngExecutionState.java b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/model/LttngExecutionState.java similarity index 96% rename from org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/model/LttngExecutionState.java rename to org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/model/LttngExecutionState.java index 7e6240329d..1392bafb24 100644 --- a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/model/LttngExecutionState.java +++ b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/model/LttngExecutionState.java @@ -9,10 +9,10 @@ * Contributors: * Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.lttng.state.model; +package org.eclipse.linuxtools.lttng.core.state.model; -import org.eclipse.linuxtools.lttng.LttngConstants; -import org.eclipse.linuxtools.lttng.state.StateStrings; +import org.eclipse.linuxtools.lttng.core.LttngConstants; +import org.eclipse.linuxtools.lttng.core.state.StateStrings; /** * LttngExecutionState diff --git a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/model/LttngIRQState.java b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/model/LttngIRQState.java similarity index 93% rename from org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/model/LttngIRQState.java rename to org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/model/LttngIRQState.java index f5e874c07c..afd4f133e0 100644 --- a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/model/LttngIRQState.java +++ b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/model/LttngIRQState.java @@ -9,12 +9,12 @@ * Contributors: * Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.lttng.state.model; +package org.eclipse.linuxtools.lttng.core.state.model; import java.util.Stack; -import org.eclipse.linuxtools.lttng.state.StateStrings; -import org.eclipse.linuxtools.lttng.state.StateStrings.IRQMode; +import org.eclipse.linuxtools.lttng.core.state.StateStrings; +import org.eclipse.linuxtools.lttng.core.state.StateStrings.IRQMode; /** * LttvIRQState diff --git a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/model/LttngProcessState.java b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/model/LttngProcessState.java similarity index 96% rename from org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/model/LttngProcessState.java rename to org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/model/LttngProcessState.java index 052bdb740e..3a9ebff5db 100644 --- a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/model/LttngProcessState.java +++ b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/model/LttngProcessState.java @@ -9,16 +9,16 @@ * Contributors: * Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.lttng.state.model; +package org.eclipse.linuxtools.lttng.core.state.model; import java.util.Stack; -import org.eclipse.linuxtools.lttng.LttngConstants; -import org.eclipse.linuxtools.lttng.TraceDebug; -import org.eclipse.linuxtools.lttng.state.StateStrings; -import org.eclipse.linuxtools.lttng.state.StateStrings.ExecutionMode; -import org.eclipse.linuxtools.lttng.state.StateStrings.ExecutionSubMode; -import org.eclipse.linuxtools.lttng.state.StateStrings.ProcessStatus; +import org.eclipse.linuxtools.lttng.core.LttngConstants; +import org.eclipse.linuxtools.lttng.core.TraceDebug; +import org.eclipse.linuxtools.lttng.core.state.StateStrings; +import org.eclipse.linuxtools.lttng.core.state.StateStrings.ExecutionMode; +import org.eclipse.linuxtools.lttng.core.state.StateStrings.ExecutionSubMode; +import org.eclipse.linuxtools.lttng.core.state.StateStrings.ProcessStatus; /** * LttngProcessState diff --git a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/model/LttngSoftIRQState.java b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/model/LttngSoftIRQState.java similarity index 98% rename from org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/model/LttngSoftIRQState.java rename to org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/model/LttngSoftIRQState.java index d22892afa2..9057ac15c6 100644 --- a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/model/LttngSoftIRQState.java +++ b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/model/LttngSoftIRQState.java @@ -9,7 +9,7 @@ * Contributors: * Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.lttng.state.model; +package org.eclipse.linuxtools.lttng.core.state.model; /** * LttvSoftIRQState diff --git a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/model/LttngTraceState.java b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/model/LttngTraceState.java similarity index 95% rename from org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/model/LttngTraceState.java rename to org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/model/LttngTraceState.java index 42dadead69..f2e9b40a0b 100644 --- a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/model/LttngTraceState.java +++ b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/model/LttngTraceState.java @@ -9,22 +9,22 @@ * Contributors: * Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.lttng.state.model; +package org.eclipse.linuxtools.lttng.core.state.model; import java.util.HashMap; import java.util.Iterator; import java.util.Map; -import org.eclipse.linuxtools.lttng.LttngConstants; -import org.eclipse.linuxtools.lttng.TraceDebug; -import org.eclipse.linuxtools.lttng.state.LttngStateException; -import org.eclipse.linuxtools.lttng.state.StateStrings; -import org.eclipse.linuxtools.lttng.state.StateStrings.ExecutionMode; -import org.eclipse.linuxtools.lttng.state.StateStrings.ExecutionSubMode; -import org.eclipse.linuxtools.lttng.state.StateStrings.IRQMode; -import org.eclipse.linuxtools.lttng.state.StateStrings.ProcessStatus; -import org.eclipse.linuxtools.lttng.state.resource.ILttngStateContext; -import org.eclipse.linuxtools.tmf.event.TmfTimeRange; +import org.eclipse.linuxtools.lttng.core.LttngConstants; +import org.eclipse.linuxtools.lttng.core.TraceDebug; +import org.eclipse.linuxtools.lttng.core.state.LttngStateException; +import org.eclipse.linuxtools.lttng.core.state.StateStrings; +import org.eclipse.linuxtools.lttng.core.state.StateStrings.ExecutionMode; +import org.eclipse.linuxtools.lttng.core.state.StateStrings.ExecutionSubMode; +import org.eclipse.linuxtools.lttng.core.state.StateStrings.IRQMode; +import org.eclipse.linuxtools.lttng.core.state.StateStrings.ProcessStatus; +import org.eclipse.linuxtools.lttng.core.state.resource.ILttngStateContext; +import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange; /** * LttngTraceState diff --git a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/model/LttngTrapState.java b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/model/LttngTrapState.java similarity index 97% rename from org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/model/LttngTrapState.java rename to org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/model/LttngTrapState.java index aa8ff1b105..5cbba2c0ec 100644 --- a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/model/LttngTrapState.java +++ b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/model/LttngTrapState.java @@ -9,7 +9,7 @@ * Contributors: * Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.lttng.state.model; +package org.eclipse.linuxtools.lttng.core.state.model; diff --git a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/model/StateModelFactory.java b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/model/StateModelFactory.java similarity index 89% rename from org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/model/StateModelFactory.java rename to org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/model/StateModelFactory.java index 8ab180e119..f353dba67f 100644 --- a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/model/StateModelFactory.java +++ b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/model/StateModelFactory.java @@ -9,10 +9,10 @@ * Contributors: * Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.lttng.state.model; +package org.eclipse.linuxtools.lttng.core.state.model; -import org.eclipse.linuxtools.lttng.state.LttngStateException; -import org.eclipse.linuxtools.lttng.state.resource.ILttngStateContext; +import org.eclipse.linuxtools.lttng.core.state.LttngStateException; +import org.eclipse.linuxtools.lttng.core.state.resource.ILttngStateContext; /** * Entry point to the package diff --git a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/resource/ILTTngStateResource.java b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/resource/ILTTngStateResource.java similarity index 96% rename from org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/resource/ILTTngStateResource.java rename to org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/resource/ILTTngStateResource.java index 3e422b43c1..b8d3ab6d2b 100644 --- a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/resource/ILTTngStateResource.java +++ b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/resource/ILTTngStateResource.java @@ -9,9 +9,9 @@ * Contributors: * Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.lttng.state.resource; +package org.eclipse.linuxtools.lttng.core.state.resource; -import org.eclipse.linuxtools.lttng.model.ILTTngTreeNode; +import org.eclipse.linuxtools.lttng.core.model.ILTTngTreeNode; /** * @author alvaro diff --git a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/resource/ILttngStateContext.java b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/resource/ILttngStateContext.java similarity index 89% rename from org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/resource/ILttngStateContext.java rename to org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/resource/ILttngStateContext.java index 8e5a70e381..dffd928f7d 100644 --- a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/resource/ILttngStateContext.java +++ b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/resource/ILttngStateContext.java @@ -9,10 +9,10 @@ * Contributors: * Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.lttng.state.resource; +package org.eclipse.linuxtools.lttng.core.state.resource; -import org.eclipse.linuxtools.tmf.event.TmfTimeRange; -import org.eclipse.linuxtools.tmf.trace.ITmfTrace; +import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange; +import org.eclipse.linuxtools.tmf.core.trace.ITmfTrace; /** * ILttngStateContext diff --git a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/resource/LTTngStateResource.java b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/resource/LTTngStateResource.java similarity index 90% rename from org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/resource/LTTngStateResource.java rename to org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/resource/LTTngStateResource.java index 3a077420ab..eda1ce5033 100644 --- a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/resource/LTTngStateResource.java +++ b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/resource/LTTngStateResource.java @@ -9,11 +9,11 @@ * Contributors: * Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.lttng.state.resource; +package org.eclipse.linuxtools.lttng.core.state.resource; -import org.eclipse.linuxtools.lttng.TraceDebug; -import org.eclipse.linuxtools.lttng.model.LTTngTreeNodeGeneric; -import org.eclipse.linuxtools.lttng.state.resource.ILTTngStateResource.GlobalStateMode; +import org.eclipse.linuxtools.lttng.core.TraceDebug; +import org.eclipse.linuxtools.lttng.core.model.LTTngTreeNodeGeneric; +import org.eclipse.linuxtools.lttng.core.state.resource.ILTTngStateResource.GlobalStateMode; /** * @author alvaro diff --git a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/trace/IStateTraceManager.java b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/trace/IStateTraceManager.java similarity index 84% rename from org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/trace/IStateTraceManager.java rename to org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/trace/IStateTraceManager.java index fb7d22daa0..1b2ba88466 100644 --- a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/trace/IStateTraceManager.java +++ b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/trace/IStateTraceManager.java @@ -1,11 +1,11 @@ -package org.eclipse.linuxtools.lttng.state.trace; +package org.eclipse.linuxtools.lttng.core.state.trace; -import org.eclipse.linuxtools.lttng.event.LttngSyntheticEvent; -import org.eclipse.linuxtools.lttng.state.model.LttngTraceState; -import org.eclipse.linuxtools.tmf.event.TmfTimeRange; -import org.eclipse.linuxtools.tmf.event.TmfTimestamp; -import org.eclipse.linuxtools.tmf.trace.ITmfTrace; -import org.eclipse.linuxtools.tmf.trace.TmfCheckpoint; +import org.eclipse.linuxtools.lttng.core.event.LttngSyntheticEvent; +import org.eclipse.linuxtools.lttng.core.state.model.LttngTraceState; +import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange; +import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp; +import org.eclipse.linuxtools.tmf.core.trace.ITmfTrace; +import org.eclipse.linuxtools.tmf.core.trace.TmfCheckpoint; public interface IStateTraceManager { // /** diff --git a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/trace/StateTraceManager.java b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/trace/StateTraceManager.java similarity index 90% rename from org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/trace/StateTraceManager.java rename to org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/trace/StateTraceManager.java index 4f33751c43..3e54400b20 100644 --- a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/state/trace/StateTraceManager.java +++ b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/trace/StateTraceManager.java @@ -9,37 +9,37 @@ * Contributors: * Alvaro Sanchez-Leon (alvsan09@gmail.com) - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.lttng.state.trace; +package org.eclipse.linuxtools.lttng.core.state.trace; import java.util.Collections; import java.util.HashMap; import java.util.Vector; -import org.eclipse.linuxtools.lttng.TraceDebug; -import org.eclipse.linuxtools.lttng.event.LttngEvent; -import org.eclipse.linuxtools.lttng.event.LttngSyntheticEvent; -import org.eclipse.linuxtools.lttng.event.LttngSyntheticEvent.SequenceInd; -import org.eclipse.linuxtools.lttng.event.LttngTimestamp; -import org.eclipse.linuxtools.lttng.model.LTTngTreeNode; -import org.eclipse.linuxtools.lttng.request.ILttngSyntEventRequest; -import org.eclipse.linuxtools.lttng.request.IRequestStatusListener; -import org.eclipse.linuxtools.lttng.request.LttngSyntEventRequest; -import org.eclipse.linuxtools.lttng.state.LttngStateException; -import org.eclipse.linuxtools.lttng.state.evProcessor.ITransEventProcessor; -import org.eclipse.linuxtools.lttng.state.evProcessor.state.StateEventToHandlerFactory; -import org.eclipse.linuxtools.lttng.state.model.LttngTraceState; -import org.eclipse.linuxtools.lttng.state.model.StateModelFactory; -import org.eclipse.linuxtools.lttng.state.resource.ILttngStateContext; -import org.eclipse.linuxtools.lttng.trace.LTTngTextTrace; -import org.eclipse.linuxtools.lttng.trace.LTTngTrace; -import org.eclipse.linuxtools.tmf.event.TmfEvent; -import org.eclipse.linuxtools.tmf.event.TmfTimeRange; -import org.eclipse.linuxtools.tmf.event.TmfTimestamp; -import org.eclipse.linuxtools.tmf.experiment.TmfExperiment; -import org.eclipse.linuxtools.tmf.request.TmfDataRequest; -import org.eclipse.linuxtools.tmf.trace.ITmfTrace; -import org.eclipse.linuxtools.tmf.trace.TmfCheckpoint; -import org.eclipse.linuxtools.tmf.trace.TmfLocation; +import org.eclipse.linuxtools.lttng.core.TraceDebug; +import org.eclipse.linuxtools.lttng.core.event.LttngEvent; +import org.eclipse.linuxtools.lttng.core.event.LttngSyntheticEvent; +import org.eclipse.linuxtools.lttng.core.event.LttngTimestamp; +import org.eclipse.linuxtools.lttng.core.event.LttngSyntheticEvent.SequenceInd; +import org.eclipse.linuxtools.lttng.core.model.LTTngTreeNode; +import org.eclipse.linuxtools.lttng.core.request.ILttngSyntEventRequest; +import org.eclipse.linuxtools.lttng.core.request.IRequestStatusListener; +import org.eclipse.linuxtools.lttng.core.request.LttngSyntEventRequest; +import org.eclipse.linuxtools.lttng.core.state.LttngStateException; +import org.eclipse.linuxtools.lttng.core.state.evProcessor.ITransEventProcessor; +import org.eclipse.linuxtools.lttng.core.state.evProcessor.state.StateEventToHandlerFactory; +import org.eclipse.linuxtools.lttng.core.state.model.LttngTraceState; +import org.eclipse.linuxtools.lttng.core.state.model.StateModelFactory; +import org.eclipse.linuxtools.lttng.core.state.resource.ILttngStateContext; +import org.eclipse.linuxtools.lttng.core.trace.LTTngTextTrace; +import org.eclipse.linuxtools.lttng.core.trace.LTTngTrace; +import org.eclipse.linuxtools.tmf.core.event.TmfEvent; +import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange; +import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp; +import org.eclipse.linuxtools.tmf.core.experiment.TmfExperiment; +import org.eclipse.linuxtools.tmf.core.request.TmfDataRequest; +import org.eclipse.linuxtools.tmf.core.trace.ITmfTrace; +import org.eclipse.linuxtools.tmf.core.trace.TmfCheckpoint; +import org.eclipse.linuxtools.tmf.core.trace.TmfLocation; public class StateTraceManager extends LTTngTreeNode implements IStateTraceManager, ILttngStateContext { diff --git a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/trace/LTTngExperiment.java b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/trace/LTTngExperiment.java similarity index 90% rename from org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/trace/LTTngExperiment.java rename to org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/trace/LTTngExperiment.java index 00b81d3d95..0cae078123 100644 --- a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/trace/LTTngExperiment.java +++ b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/trace/LTTngExperiment.java @@ -10,25 +10,25 @@ * Francois Chouinard - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.lttng.trace; +package org.eclipse.linuxtools.lttng.core.trace; -import org.eclipse.linuxtools.lttng.event.LttngEvent; -import org.eclipse.linuxtools.lttng.event.LttngTimestamp; +import org.eclipse.linuxtools.lttng.core.event.LttngEvent; +import org.eclipse.linuxtools.lttng.core.event.LttngTimestamp; import org.eclipse.linuxtools.lttng.jni.JniTrace; -import org.eclipse.linuxtools.tmf.event.TmfEvent; -import org.eclipse.linuxtools.tmf.event.TmfTimeRange; -import org.eclipse.linuxtools.tmf.event.TmfTimestamp; -import org.eclipse.linuxtools.tmf.experiment.TmfExperiment; -import org.eclipse.linuxtools.tmf.experiment.TmfExperimentContext; -import org.eclipse.linuxtools.tmf.experiment.TmfExperimentLocation; -import org.eclipse.linuxtools.tmf.request.ITmfDataRequest; -import org.eclipse.linuxtools.tmf.request.ITmfDataRequest.ExecutionType; -import org.eclipse.linuxtools.tmf.request.TmfEventRequest; -import org.eclipse.linuxtools.tmf.signal.TmfExperimentRangeUpdatedSignal; -import org.eclipse.linuxtools.tmf.signal.TmfSignalHandler; -import org.eclipse.linuxtools.tmf.signal.TmfSignalManager; -import org.eclipse.linuxtools.tmf.trace.ITmfTrace; -import org.eclipse.linuxtools.tmf.trace.TmfContext; +import org.eclipse.linuxtools.tmf.core.event.TmfEvent; +import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange; +import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp; +import org.eclipse.linuxtools.tmf.core.experiment.TmfExperiment; +import org.eclipse.linuxtools.tmf.core.experiment.TmfExperimentContext; +import org.eclipse.linuxtools.tmf.core.experiment.TmfExperimentLocation; +import org.eclipse.linuxtools.tmf.core.request.ITmfDataRequest; +import org.eclipse.linuxtools.tmf.core.request.TmfEventRequest; +import org.eclipse.linuxtools.tmf.core.request.ITmfDataRequest.ExecutionType; +import org.eclipse.linuxtools.tmf.core.signal.TmfExperimentRangeUpdatedSignal; +import org.eclipse.linuxtools.tmf.core.signal.TmfSignalHandler; +import org.eclipse.linuxtools.tmf.core.signal.TmfSignalManager; +import org.eclipse.linuxtools.tmf.core.trace.ITmfTrace; +import org.eclipse.linuxtools.tmf.core.trace.TmfContext; /** * LTTngExperiment diff --git a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/trace/LTTngTextTrace.java b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/trace/LTTngTextTrace.java similarity index 95% rename from org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/trace/LTTngTextTrace.java rename to org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/trace/LTTngTextTrace.java index 19a48f0b68..d731f74f6d 100644 --- a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/trace/LTTngTextTrace.java +++ b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/trace/LTTngTextTrace.java @@ -10,28 +10,28 @@ * William Bourque (wbourque@gmail.com) - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.lttng.trace; +package org.eclipse.linuxtools.lttng.core.trace; import java.io.BufferedReader; import java.io.FileReader; import java.io.IOException; import java.util.HashMap; -import org.eclipse.linuxtools.lttng.event.LttngEvent; -import org.eclipse.linuxtools.lttng.event.LttngEventContent; -import org.eclipse.linuxtools.lttng.event.LttngEventField; -import org.eclipse.linuxtools.lttng.event.LttngEventReference; -import org.eclipse.linuxtools.lttng.event.LttngEventSource; -import org.eclipse.linuxtools.lttng.event.LttngEventType; -import org.eclipse.linuxtools.lttng.event.LttngTimestamp; +import org.eclipse.linuxtools.lttng.core.event.LttngEvent; +import org.eclipse.linuxtools.lttng.core.event.LttngEventContent; +import org.eclipse.linuxtools.lttng.core.event.LttngEventField; +import org.eclipse.linuxtools.lttng.core.event.LttngEventReference; +import org.eclipse.linuxtools.lttng.core.event.LttngEventSource; +import org.eclipse.linuxtools.lttng.core.event.LttngEventType; +import org.eclipse.linuxtools.lttng.core.event.LttngTimestamp; import org.eclipse.linuxtools.lttng.jni.JniEvent; -import org.eclipse.linuxtools.tmf.event.TmfNoSuchFieldException; -import org.eclipse.linuxtools.tmf.event.TmfTimeRange; -import org.eclipse.linuxtools.tmf.trace.ITmfLocation; -import org.eclipse.linuxtools.tmf.trace.TmfCheckpoint; -import org.eclipse.linuxtools.tmf.trace.TmfContext; -import org.eclipse.linuxtools.tmf.trace.TmfLocation; -import org.eclipse.linuxtools.tmf.trace.TmfTrace; +import org.eclipse.linuxtools.tmf.core.event.TmfNoSuchFieldException; +import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange; +import org.eclipse.linuxtools.tmf.core.trace.ITmfLocation; +import org.eclipse.linuxtools.tmf.core.trace.TmfCheckpoint; +import org.eclipse.linuxtools.tmf.core.trace.TmfContext; +import org.eclipse.linuxtools.tmf.core.trace.TmfLocation; +import org.eclipse.linuxtools.tmf.core.trace.TmfTrace; public class LTTngTextTrace extends TmfTrace { private LttngTimestamp eventTimestamp = null; diff --git a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/trace/LTTngTrace.java b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/trace/LTTngTrace.java similarity index 95% rename from org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/trace/LTTngTrace.java rename to org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/trace/LTTngTrace.java index c6c65b147f..9fdf11281a 100644 --- a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/trace/LTTngTrace.java +++ b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/trace/LTTngTrace.java @@ -11,7 +11,7 @@ * Yufen Kuo (ykuo@mvista.com) - add support to allow user specify trace library path *******************************************************************************/ -package org.eclipse.linuxtools.lttng.trace; +package org.eclipse.linuxtools.lttng.core.trace; import java.io.FileNotFoundException; import java.util.HashMap; @@ -19,15 +19,15 @@ import java.util.Iterator; import java.util.Vector; import org.eclipse.core.resources.IProject; -import org.eclipse.linuxtools.lttng.TraceHelper; -import org.eclipse.linuxtools.lttng.event.LttngEvent; -import org.eclipse.linuxtools.lttng.event.LttngEventContent; -import org.eclipse.linuxtools.lttng.event.LttngEventReference; -import org.eclipse.linuxtools.lttng.event.LttngEventSource; -import org.eclipse.linuxtools.lttng.event.LttngEventType; -import org.eclipse.linuxtools.lttng.event.LttngLocation; -import org.eclipse.linuxtools.lttng.event.LttngTimestamp; -import org.eclipse.linuxtools.lttng.exceptions.LttngException; +import org.eclipse.linuxtools.lttng.core.TraceHelper; +import org.eclipse.linuxtools.lttng.core.event.LttngEvent; +import org.eclipse.linuxtools.lttng.core.event.LttngEventContent; +import org.eclipse.linuxtools.lttng.core.event.LttngEventReference; +import org.eclipse.linuxtools.lttng.core.event.LttngEventSource; +import org.eclipse.linuxtools.lttng.core.event.LttngEventType; +import org.eclipse.linuxtools.lttng.core.event.LttngLocation; +import org.eclipse.linuxtools.lttng.core.event.LttngTimestamp; +import org.eclipse.linuxtools.lttng.core.exceptions.LttngException; import org.eclipse.linuxtools.lttng.jni.JniEvent; import org.eclipse.linuxtools.lttng.jni.JniMarker; import org.eclipse.linuxtools.lttng.jni.JniTrace; @@ -35,13 +35,13 @@ import org.eclipse.linuxtools.lttng.jni.JniTracefile; import org.eclipse.linuxtools.lttng.jni.common.JniTime; import org.eclipse.linuxtools.lttng.jni.exception.JniException; import org.eclipse.linuxtools.lttng.jni.factory.JniTraceFactory; -import org.eclipse.linuxtools.tmf.event.TmfTimeRange; -import org.eclipse.linuxtools.tmf.event.TmfTimestamp; -import org.eclipse.linuxtools.tmf.trace.ITmfContext; -import org.eclipse.linuxtools.tmf.trace.ITmfLocation; -import org.eclipse.linuxtools.tmf.trace.TmfCheckpoint; -import org.eclipse.linuxtools.tmf.trace.TmfContext; -import org.eclipse.linuxtools.tmf.trace.TmfTrace; +import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange; +import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp; +import org.eclipse.linuxtools.tmf.core.trace.ITmfContext; +import org.eclipse.linuxtools.tmf.core.trace.ITmfLocation; +import org.eclipse.linuxtools.tmf.core.trace.TmfCheckpoint; +import org.eclipse.linuxtools.tmf.core.trace.TmfContext; +import org.eclipse.linuxtools.tmf.core.trace.TmfTrace; class LTTngTraceException extends LttngException { static final long serialVersionUID = -1636648737081868146L; @@ -351,7 +351,7 @@ public class LTTngTrace extends TmfTrace { * * @return The LttngLocation as it was after the last operation. * - * @see org.eclipse.linuxtools.lttng.event.LttngLocation + * @see org.eclipse.linuxtools.lttng.core.event.LttngLocation */ @Override public synchronized ITmfLocation getCurrentLocation() { @@ -370,8 +370,8 @@ public class LTTngTrace extends TmfTrace { * * @return The TmfContext that point to this event * - * @see org.eclipse.linuxtools.lttng.event.LttngLocation - * @see org.eclipse.linuxtools.tmf.trace.TmfContext + * @see org.eclipse.linuxtools.lttng.core.event.LttngLocation + * @see org.eclipse.linuxtools.tmf.core.trace.TmfContext */ @Override public synchronized TmfContext seekLocation(ITmfLocation location) { @@ -416,8 +416,8 @@ public class LTTngTrace extends TmfTrace { * * @return The TmfContext that point to this event * - * @see org.eclipse.linuxtools.lttng.event.LttngLocation - * @see org.eclipse.linuxtools.tmf.trace.TmfContext + * @see org.eclipse.linuxtools.lttng.core.event.LttngLocation + * @see org.eclipse.linuxtools.tmf.core.trace.TmfContext */ @Override public synchronized TmfContext seekEvent(TmfTimestamp timestamp) { @@ -454,8 +454,8 @@ public class LTTngTrace extends TmfTrace { * * @return The TmfContext that point to this event * - * @see org.eclipse.linuxtools.lttng.event.LttngLocation - * @see org.eclipse.linuxtools.tmf.trace.TmfContext + * @see org.eclipse.linuxtools.lttng.core.event.LttngLocation + * @see org.eclipse.linuxtools.tmf.core.trace.TmfContext */ @Override public synchronized TmfContext seekEvent(long position) { @@ -542,8 +542,8 @@ public class LTTngTrace extends TmfTrace { * * @return The LttngEvent we read of null if no event are available * - * @see org.eclipse.linuxtools.lttng.event.LttngLocation - * @see org.eclipse.linuxtools.tmf.trace.TmfContext + * @see org.eclipse.linuxtools.lttng.core.event.LttngLocation + * @see org.eclipse.linuxtools.tmf.core.trace.TmfContext */ public int nbEventsRead = 0; @@ -676,8 +676,8 @@ public class LTTngTrace extends TmfTrace { * * @return The LttngEvent we read of null if no event are available * - * @see org.eclipse.linuxtools.lttng.event.LttngLocation - * @see org.eclipse.linuxtools.tmf.trace.TmfContext + * @see org.eclipse.linuxtools.lttng.core.event.LttngLocation + * @see org.eclipse.linuxtools.tmf.core.trace.TmfContext */ @Override public synchronized LttngEvent parseEvent(TmfContext context) { @@ -808,7 +808,7 @@ public class LTTngTrace extends TmfTrace { * @return The converted LttngEvent * * @see org.eclipse.linuxtools.org.eclipse.linuxtools.lttng.jni.JniEvent - * @see org.eclipse.linuxtools.lttng.event.LttngEvent + * @see org.eclipse.linuxtools.lttng.core.event.LttngEvent */ public synchronized LttngEvent convertJniEventToTmf(JniEvent newEvent) { currentLttngEvent = convertJniEventToTmf(newEvent, IS_PARSING_NEEDED_DEFAULT); @@ -827,7 +827,7 @@ public class LTTngTrace extends TmfTrace { * @return The converted LttngEvent * * @see org.eclipse.linuxtools.org.eclipse.linuxtools.lttng.jni.JniEvent - * @see org.eclipse.linuxtools.lttng.event.LttngEvent + * @see org.eclipse.linuxtools.lttng.core.event.LttngEvent */ public synchronized LttngEvent convertJniEventToTmf(JniEvent jniEvent, boolean isParsingNeeded) { @@ -926,7 +926,7 @@ public class LTTngTrace extends TmfTrace { * * @return The current (last read) LttngEvent * - * @see org.eclipse.linuxtools.lttng.event.LttngEvent + * @see org.eclipse.linuxtools.lttng.core.event.LttngEvent */ public synchronized LttngEvent getCurrentEvent() { return currentLttngEvent; diff --git a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/trace/LTTngTraceVersion.java b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/trace/LTTngTraceVersion.java similarity index 97% rename from org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/trace/LTTngTraceVersion.java rename to org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/trace/LTTngTraceVersion.java index b3c986dd07..71437613d5 100644 --- a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/trace/LTTngTraceVersion.java +++ b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/trace/LTTngTraceVersion.java @@ -1,4 +1,4 @@ -package org.eclipse.linuxtools.lttng.trace; +package org.eclipse.linuxtools.lttng.core.trace; /******************************************************************************* * Copyright (c) 2009, 2011 Ericsson, MontaVista Software * @@ -12,7 +12,7 @@ package org.eclipse.linuxtools.lttng.trace; * Yufen Kuo (ykuo@mvista.com) - add support to allow user specify trace library path *******************************************************************************/ -import org.eclipse.linuxtools.lttng.exceptions.LttngException; +import org.eclipse.linuxtools.lttng.core.exceptions.LttngException; import org.eclipse.linuxtools.lttng.jni.exception.JniTraceVersionException; import org.eclipse.linuxtools.lttng.jni.factory.JniTraceVersion; diff --git a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/tracecontrol/Messages.java b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/tracecontrol/Messages.java similarity index 96% rename from org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/tracecontrol/Messages.java rename to org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/tracecontrol/Messages.java index 6c0cac7ceb..fd456a7dec 100644 --- a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/tracecontrol/Messages.java +++ b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/tracecontrol/Messages.java @@ -10,7 +10,7 @@ * Bernd Hufmann - Initial API and implementation * *******************************************************************************/ -package org.eclipse.linuxtools.lttng.tracecontrol; +package org.eclipse.linuxtools.lttng.core.tracecontrol; import org.eclipse.osgi.util.NLS; diff --git a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/tracecontrol/messages.properties b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/tracecontrol/messages.properties similarity index 100% rename from org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/tracecontrol/messages.properties rename to org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/tracecontrol/messages.properties diff --git a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/tracecontrol/model/ProviderResource.java b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/tracecontrol/model/ProviderResource.java similarity index 95% rename from org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/tracecontrol/model/ProviderResource.java rename to org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/tracecontrol/model/ProviderResource.java index 9394af06f1..8ad3c419cd 100644 --- a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/tracecontrol/model/ProviderResource.java +++ b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/tracecontrol/model/ProviderResource.java @@ -11,14 +11,14 @@ * Bernd Hufmann - Productification, enhancements and fixes * *******************************************************************************/ -package org.eclipse.linuxtools.lttng.tracecontrol.model; +package org.eclipse.linuxtools.lttng.core.tracecontrol.model; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import org.eclipse.linuxtools.lttng.LttngConstants; -import org.eclipse.linuxtools.lttng.tracecontrol.model.TargetResource; +import org.eclipse.linuxtools.lttng.core.LttngConstants; +import org.eclipse.linuxtools.lttng.core.tracecontrol.model.TargetResource; import org.eclipse.rse.core.subsystems.AbstractResource; import org.eclipse.rse.core.subsystems.ISubSystem; diff --git a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/tracecontrol/model/TargetResource.java b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/tracecontrol/model/TargetResource.java similarity index 95% rename from org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/tracecontrol/model/TargetResource.java rename to org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/tracecontrol/model/TargetResource.java index a33411abcf..fd1b5d21da 100644 --- a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/tracecontrol/model/TargetResource.java +++ b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/tracecontrol/model/TargetResource.java @@ -11,16 +11,16 @@ * Bernd Hufmann - Productification, enhancements and fixes * *******************************************************************************/ -package org.eclipse.linuxtools.lttng.tracecontrol.model; +package org.eclipse.linuxtools.lttng.core.tracecontrol.model; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import org.eclipse.linuxtools.lttng.LttngConstants; -import org.eclipse.linuxtools.lttng.tracecontrol.model.ProviderResource; -import org.eclipse.linuxtools.lttng.tracecontrol.model.TargetResource; -import org.eclipse.linuxtools.lttng.tracecontrol.model.TraceResource; +import org.eclipse.linuxtools.lttng.core.LttngConstants; +import org.eclipse.linuxtools.lttng.core.tracecontrol.model.ProviderResource; +import org.eclipse.linuxtools.lttng.core.tracecontrol.model.TargetResource; +import org.eclipse.linuxtools.lttng.core.tracecontrol.model.TraceResource; import org.eclipse.rse.core.subsystems.AbstractResource; import org.eclipse.rse.core.subsystems.ISubSystem; diff --git a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/tracecontrol/model/TraceResource.java b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/tracecontrol/model/TraceResource.java similarity index 98% rename from org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/tracecontrol/model/TraceResource.java rename to org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/tracecontrol/model/TraceResource.java index 2c1c1eb8dd..79fa799764 100644 --- a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/tracecontrol/model/TraceResource.java +++ b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/tracecontrol/model/TraceResource.java @@ -11,15 +11,15 @@ * Bernd Hufmann - Productification, enhancements and fixes * *******************************************************************************/ -package org.eclipse.linuxtools.lttng.tracecontrol.model; +package org.eclipse.linuxtools.lttng.core.tracecontrol.model; import java.util.HashMap; import java.util.Map; import java.util.concurrent.TimeUnit; -import org.eclipse.linuxtools.lttng.tracecontrol.Messages; -import org.eclipse.linuxtools.lttng.tracecontrol.model.config.TraceConfig; -import org.eclipse.linuxtools.lttng.tracecontrol.service.ILttControllerService; +import org.eclipse.linuxtools.lttng.core.tracecontrol.Messages; +import org.eclipse.linuxtools.lttng.core.tracecontrol.model.config.TraceConfig; +import org.eclipse.linuxtools.lttng.core.tracecontrol.service.ILttControllerService; import org.eclipse.rse.core.subsystems.AbstractResource; import org.eclipse.rse.core.subsystems.ISubSystem; import org.eclipse.tm.tcf.protocol.IToken; diff --git a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/tracecontrol/model/config/TraceChannel.java b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/tracecontrol/model/config/TraceChannel.java similarity index 98% rename from org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/tracecontrol/model/config/TraceChannel.java rename to org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/tracecontrol/model/config/TraceChannel.java index 11e8d1c4d2..4d0d3b51da 100644 --- a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/tracecontrol/model/config/TraceChannel.java +++ b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/tracecontrol/model/config/TraceChannel.java @@ -10,9 +10,9 @@ * Bernd Hufmann - Initial API and implementation * *******************************************************************************/ -package org.eclipse.linuxtools.lttng.tracecontrol.model.config; +package org.eclipse.linuxtools.lttng.core.tracecontrol.model.config; -import org.eclipse.linuxtools.lttng.tracecontrol.model.config.TraceChannel; +import org.eclipse.linuxtools.lttng.core.tracecontrol.model.config.TraceChannel; /** * TraceChannel diff --git a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/tracecontrol/model/config/TraceChannels.java b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/tracecontrol/model/config/TraceChannels.java similarity index 95% rename from org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/tracecontrol/model/config/TraceChannels.java rename to org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/tracecontrol/model/config/TraceChannels.java index 9942f14656..808a5fe664 100644 --- a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/tracecontrol/model/config/TraceChannels.java +++ b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/tracecontrol/model/config/TraceChannels.java @@ -10,7 +10,7 @@ * Bernd Hufmann - Initial API and implementation * *******************************************************************************/ -package org.eclipse.linuxtools.lttng.tracecontrol.model.config; +package org.eclipse.linuxtools.lttng.core.tracecontrol.model.config; import java.util.Collection; import java.util.HashMap; @@ -18,8 +18,8 @@ import java.util.Iterator; import java.util.Map; import java.util.Set; -import org.eclipse.linuxtools.lttng.tracecontrol.model.config.TraceChannel; -import org.eclipse.linuxtools.lttng.tracecontrol.model.config.TraceChannels; +import org.eclipse.linuxtools.lttng.core.tracecontrol.model.config.TraceChannel; +import org.eclipse.linuxtools.lttng.core.tracecontrol.model.config.TraceChannels; /** * TraceChannels diff --git a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/tracecontrol/model/config/TraceConfig.java b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/tracecontrol/model/config/TraceConfig.java similarity index 98% rename from org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/tracecontrol/model/config/TraceConfig.java rename to org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/tracecontrol/model/config/TraceConfig.java index a963fc06d7..f1308b7e28 100644 --- a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/tracecontrol/model/config/TraceConfig.java +++ b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/tracecontrol/model/config/TraceConfig.java @@ -11,7 +11,7 @@ * Bernd Hufmann - Productification, enhancements and fixes * *******************************************************************************/ -package org.eclipse.linuxtools.lttng.tracecontrol.model.config; +package org.eclipse.linuxtools.lttng.core.tracecontrol.model.config; import org.eclipse.core.resources.IProject; diff --git a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/tracecontrol/service/ILttControllerService.java b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/tracecontrol/service/ILttControllerService.java similarity index 98% rename from org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/tracecontrol/service/ILttControllerService.java rename to org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/tracecontrol/service/ILttControllerService.java index 735e4eaaed..f7d73fa5dc 100644 --- a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/tracecontrol/service/ILttControllerService.java +++ b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/tracecontrol/service/ILttControllerService.java @@ -11,9 +11,9 @@ * Bernd Hufmann - Productification, enhancements and fixes * *******************************************************************************/ -package org.eclipse.linuxtools.lttng.tracecontrol.service; +package org.eclipse.linuxtools.lttng.core.tracecontrol.service; -import org.eclipse.linuxtools.lttng.LttngConstants; +import org.eclipse.linuxtools.lttng.core.LttngConstants; import org.eclipse.tm.tcf.protocol.IService; import org.eclipse.tm.tcf.protocol.IToken; diff --git a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/tracecontrol/service/LttControllerServiceProxy.java b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/tracecontrol/service/LttControllerServiceProxy.java similarity index 99% rename from org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/tracecontrol/service/LttControllerServiceProxy.java rename to org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/tracecontrol/service/LttControllerServiceProxy.java index 20f5ecf944..d647e03830 100644 --- a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/tracecontrol/service/LttControllerServiceProxy.java +++ b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/tracecontrol/service/LttControllerServiceProxy.java @@ -11,9 +11,9 @@ * Bernd Hufmann - Productification, enhancements and fixes * *******************************************************************************/ -package org.eclipse.linuxtools.lttng.tracecontrol.service; +package org.eclipse.linuxtools.lttng.core.tracecontrol.service; -import org.eclipse.linuxtools.lttng.LttngConstants; +import org.eclipse.linuxtools.lttng.core.LttngConstants; import org.eclipse.tm.tcf.core.Command; import org.eclipse.tm.tcf.core.ErrorReport; import org.eclipse.tm.tcf.protocol.IChannel; diff --git a/org.eclipse.linuxtools.lttng.ui.tests/stubs/org/eclipse/linuxtools/lttng/stubs/LTTngEventParserStub.java b/org.eclipse.linuxtools.lttng.ui.tests/stubs/org/eclipse/linuxtools/lttng/stubs/LTTngEventParserStub.java index 26e072e929..cdbccbd11f 100644 --- a/org.eclipse.linuxtools.lttng.ui.tests/stubs/org/eclipse/linuxtools/lttng/stubs/LTTngEventParserStub.java +++ b/org.eclipse.linuxtools.lttng.ui.tests/stubs/org/eclipse/linuxtools/lttng/stubs/LTTngEventParserStub.java @@ -14,10 +14,10 @@ package org.eclipse.linuxtools.lttng.stubs; import java.io.IOException; -import org.eclipse.linuxtools.tmf.event.TmfEvent; -import org.eclipse.linuxtools.tmf.parser.ITmfEventParser; -import org.eclipse.linuxtools.tmf.trace.ITmfTrace; -import org.eclipse.linuxtools.tmf.trace.TmfContext; +import org.eclipse.linuxtools.tmf.core.event.TmfEvent; +import org.eclipse.linuxtools.tmf.core.parser.ITmfEventParser; +import org.eclipse.linuxtools.tmf.core.trace.ITmfTrace; +import org.eclipse.linuxtools.tmf.core.trace.TmfContext; /** * TmfEventParserStub diff --git a/org.eclipse.linuxtools.lttng.ui.tests/stubs/org/eclipse/linuxtools/lttng/stubs/LTTngTimestampStub.java b/org.eclipse.linuxtools.lttng.ui.tests/stubs/org/eclipse/linuxtools/lttng/stubs/LTTngTimestampStub.java index 4ea5823488..dd4957643b 100644 --- a/org.eclipse.linuxtools.lttng.ui.tests/stubs/org/eclipse/linuxtools/lttng/stubs/LTTngTimestampStub.java +++ b/org.eclipse.linuxtools.lttng.ui.tests/stubs/org/eclipse/linuxtools/lttng/stubs/LTTngTimestampStub.java @@ -3,7 +3,7 @@ */ package org.eclipse.linuxtools.lttng.stubs; -import org.eclipse.linuxtools.tmf.event.TmfTimestamp; +import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp; /** * @author francois diff --git a/org.eclipse.linuxtools.lttng.ui.tests/stubs/org/eclipse/linuxtools/lttng/stubs/LTTngTraceStub.java b/org.eclipse.linuxtools.lttng.ui.tests/stubs/org/eclipse/linuxtools/lttng/stubs/LTTngTraceStub.java index 50019de3e1..63b096b1d1 100644 --- a/org.eclipse.linuxtools.lttng.ui.tests/stubs/org/eclipse/linuxtools/lttng/stubs/LTTngTraceStub.java +++ b/org.eclipse.linuxtools.lttng.ui.tests/stubs/org/eclipse/linuxtools/lttng/stubs/LTTngTraceStub.java @@ -16,14 +16,14 @@ import java.io.FileNotFoundException; import java.io.IOException; import java.io.RandomAccessFile; -import org.eclipse.linuxtools.lttng.event.LttngEvent; -import org.eclipse.linuxtools.tmf.event.TmfEvent; -import org.eclipse.linuxtools.tmf.parser.ITmfEventParser; -import org.eclipse.linuxtools.tmf.trace.ITmfLocation; -import org.eclipse.linuxtools.tmf.trace.ITmfTrace; -import org.eclipse.linuxtools.tmf.trace.TmfContext; -import org.eclipse.linuxtools.tmf.trace.TmfLocation; -import org.eclipse.linuxtools.tmf.trace.TmfTrace; +import org.eclipse.linuxtools.lttng.core.event.LttngEvent; +import org.eclipse.linuxtools.tmf.core.event.TmfEvent; +import org.eclipse.linuxtools.tmf.core.parser.ITmfEventParser; +import org.eclipse.linuxtools.tmf.core.trace.ITmfLocation; +import org.eclipse.linuxtools.tmf.core.trace.ITmfTrace; +import org.eclipse.linuxtools.tmf.core.trace.TmfContext; +import org.eclipse.linuxtools.tmf.core.trace.TmfLocation; +import org.eclipse.linuxtools.tmf.core.trace.TmfTrace; /** * LTTngTraceStub diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/LTTngUiPlugin.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/LTTngUiPlugin.java index 8c2c89a627..ec1f5835b8 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/LTTngUiPlugin.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/LTTngUiPlugin.java @@ -19,10 +19,10 @@ import java.util.concurrent.TimeoutException; import org.eclipse.core.runtime.IAdapterManager; import org.eclipse.core.runtime.Platform; -import org.eclipse.linuxtools.lttng.tracecontrol.model.ProviderResource; -import org.eclipse.linuxtools.lttng.tracecontrol.model.TargetResource; +import org.eclipse.linuxtools.lttng.core.tracecontrol.model.ProviderResource; +import org.eclipse.linuxtools.lttng.core.tracecontrol.model.TargetResource; +import org.eclipse.linuxtools.lttng.core.tracecontrol.model.TraceResource; import org.eclipse.linuxtools.lttng.ui.tracecontrol.model.TraceAdapterFactory; -import org.eclipse.linuxtools.lttng.tracecontrol.model.TraceResource; import org.eclipse.linuxtools.lttng.ui.tracecontrol.Messages; import org.eclipse.rse.services.clientserver.messages.SimpleSystemMessage; import org.eclipse.rse.services.clientserver.messages.SystemMessage; diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/model/trange/TimeRangeEventResource.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/model/trange/TimeRangeEventResource.java index 4e5b4519e4..14729fadfd 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/model/trange/TimeRangeEventResource.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/model/trange/TimeRangeEventResource.java @@ -11,7 +11,7 @@ *******************************************************************************/ package org.eclipse.linuxtools.lttng.ui.model.trange; -import org.eclipse.linuxtools.lttng.state.model.LttngTraceState; +import org.eclipse.linuxtools.lttng.core.state.model.LttngTraceState; /** * @author alvaro diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/model/trange/TimeRangeResourceFactory.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/model/trange/TimeRangeResourceFactory.java index ca080c5b44..cd761b2558 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/model/trange/TimeRangeResourceFactory.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/model/trange/TimeRangeResourceFactory.java @@ -12,11 +12,11 @@ package org.eclipse.linuxtools.lttng.ui.model.trange; -import org.eclipse.linuxtools.lttng.state.StateStrings; -import org.eclipse.linuxtools.lttng.state.model.LTTngCPUState; -import org.eclipse.linuxtools.lttng.state.model.LttngIRQState; -import org.eclipse.linuxtools.lttng.state.model.LttngTraceState; -import org.eclipse.linuxtools.lttng.state.model.LttngTrapState; +import org.eclipse.linuxtools.lttng.core.state.StateStrings; +import org.eclipse.linuxtools.lttng.core.state.model.LTTngCPUState; +import org.eclipse.linuxtools.lttng.core.state.model.LttngIRQState; +import org.eclipse.linuxtools.lttng.core.state.model.LttngTraceState; +import org.eclipse.linuxtools.lttng.core.state.model.LttngTrapState; import org.eclipse.linuxtools.lttng.ui.model.trange.TimeRangeEventResource.ResourceTypes; /** diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/model/trange/TimeRangeViewerProvider.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/model/trange/TimeRangeViewerProvider.java index 1a1ab977f4..67f0edc200 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/model/trange/TimeRangeViewerProvider.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/model/trange/TimeRangeViewerProvider.java @@ -15,13 +15,13 @@ import java.util.HashMap; import java.util.Map; import java.util.Set; -import org.eclipse.linuxtools.lttng.state.StateStrings.BdevMode; -import org.eclipse.linuxtools.lttng.state.StateStrings.CpuMode; -import org.eclipse.linuxtools.lttng.state.StateStrings.ExecutionMode; -import org.eclipse.linuxtools.lttng.state.StateStrings.IRQMode; -import org.eclipse.linuxtools.lttng.state.StateStrings.ProcessStatus; -import org.eclipse.linuxtools.lttng.state.StateStrings.SoftIRQMode; -import org.eclipse.linuxtools.lttng.state.StateStrings.TrapMode; +import org.eclipse.linuxtools.lttng.core.state.StateStrings.BdevMode; +import org.eclipse.linuxtools.lttng.core.state.StateStrings.CpuMode; +import org.eclipse.linuxtools.lttng.core.state.StateStrings.ExecutionMode; +import org.eclipse.linuxtools.lttng.core.state.StateStrings.IRQMode; +import org.eclipse.linuxtools.lttng.core.state.StateStrings.ProcessStatus; +import org.eclipse.linuxtools.lttng.core.state.StateStrings.SoftIRQMode; +import org.eclipse.linuxtools.lttng.core.state.StateStrings.TrapMode; import org.eclipse.linuxtools.lttng.ui.views.common.ParamsUpdater; import org.eclipse.linuxtools.tmf.ui.viewers.timeAnalysis.TmfTimeAnalysisProvider; import org.eclipse.linuxtools.tmf.ui.viewers.timeAnalysis.model.ITimeEvent; diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/actions/ConfigureMarkers.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/actions/ConfigureMarkers.java index 0bd835b956..f19f206393 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/actions/ConfigureMarkers.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/actions/ConfigureMarkers.java @@ -22,8 +22,8 @@ import java.util.concurrent.TimeUnit; import org.eclipse.jface.action.IAction; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.linuxtools.lttng.tracecontrol.model.TargetResource; -import org.eclipse.linuxtools.lttng.tracecontrol.service.ILttControllerService; +import org.eclipse.linuxtools.lttng.core.tracecontrol.model.TargetResource; +import org.eclipse.linuxtools.lttng.core.tracecontrol.service.ILttControllerService; import org.eclipse.linuxtools.lttng.ui.LTTngUiPlugin; import org.eclipse.linuxtools.lttng.ui.tracecontrol.TraceControlConstants; import org.eclipse.linuxtools.lttng.ui.tracecontrol.Messages; diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/actions/ConfigureTrace.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/actions/ConfigureTrace.java index e3093f4373..324c856608 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/actions/ConfigureTrace.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/actions/ConfigureTrace.java @@ -21,12 +21,12 @@ import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.window.Window; import org.eclipse.jface.wizard.WizardDialog; -import org.eclipse.linuxtools.lttng.tracecontrol.model.TraceResource; -import org.eclipse.linuxtools.lttng.tracecontrol.model.TraceResource.TraceState; -import org.eclipse.linuxtools.lttng.tracecontrol.model.config.TraceChannel; -import org.eclipse.linuxtools.lttng.tracecontrol.model.config.TraceChannels; -import org.eclipse.linuxtools.lttng.tracecontrol.model.config.TraceConfig; -import org.eclipse.linuxtools.lttng.tracecontrol.service.ILttControllerService; +import org.eclipse.linuxtools.lttng.core.tracecontrol.model.TraceResource; +import org.eclipse.linuxtools.lttng.core.tracecontrol.model.TraceResource.TraceState; +import org.eclipse.linuxtools.lttng.core.tracecontrol.model.config.TraceChannel; +import org.eclipse.linuxtools.lttng.core.tracecontrol.model.config.TraceChannels; +import org.eclipse.linuxtools.lttng.core.tracecontrol.model.config.TraceConfig; +import org.eclipse.linuxtools.lttng.core.tracecontrol.service.ILttControllerService; import org.eclipse.linuxtools.lttng.ui.LTTngUiPlugin; import org.eclipse.linuxtools.lttng.ui.tracecontrol.TraceControlConstants; import org.eclipse.linuxtools.lttng.ui.tracecontrol.Messages; diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/actions/CreateNewTrace.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/actions/CreateNewTrace.java index cb1c9a8e69..01be4b955f 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/actions/CreateNewTrace.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/actions/CreateNewTrace.java @@ -22,11 +22,11 @@ import java.util.concurrent.TimeUnit; import org.eclipse.jface.action.IAction; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.linuxtools.lttng.tracecontrol.model.TargetResource; -import org.eclipse.linuxtools.lttng.tracecontrol.model.TraceResource; -import org.eclipse.linuxtools.lttng.tracecontrol.model.TraceResource.TraceState; -import org.eclipse.linuxtools.lttng.tracecontrol.model.config.TraceConfig; -import org.eclipse.linuxtools.lttng.tracecontrol.service.ILttControllerService; +import org.eclipse.linuxtools.lttng.core.tracecontrol.model.TargetResource; +import org.eclipse.linuxtools.lttng.core.tracecontrol.model.TraceResource; +import org.eclipse.linuxtools.lttng.core.tracecontrol.model.TraceResource.TraceState; +import org.eclipse.linuxtools.lttng.core.tracecontrol.model.config.TraceConfig; +import org.eclipse.linuxtools.lttng.core.tracecontrol.service.ILttControllerService; import org.eclipse.linuxtools.lttng.ui.LTTngUiPlugin; import org.eclipse.linuxtools.lttng.ui.tracecontrol.Messages; import org.eclipse.linuxtools.lttng.ui.tracecontrol.TraceControlConstants; diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/actions/DeleteTrace.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/actions/DeleteTrace.java index 78734eb15f..bba7854540 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/actions/DeleteTrace.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/actions/DeleteTrace.java @@ -20,7 +20,7 @@ import org.eclipse.jface.action.IAction; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.linuxtools.lttng.tracecontrol.model.TraceResource; +import org.eclipse.linuxtools.lttng.core.tracecontrol.model.TraceResource; import org.eclipse.linuxtools.lttng.ui.tracecontrol.Messages; import org.eclipse.rse.core.events.ISystemRemoteChangeEvents; import org.eclipse.rse.core.model.ISystemRegistry; diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/actions/ImportToProject.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/actions/ImportToProject.java index 4a4a7707e5..370fb857ff 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/actions/ImportToProject.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/actions/ImportToProject.java @@ -29,7 +29,7 @@ import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.linuxtools.lttng.tracecontrol.model.TraceResource; +import org.eclipse.linuxtools.lttng.core.tracecontrol.model.TraceResource; import org.eclipse.linuxtools.lttng.ui.tracecontrol.Messages; import org.eclipse.linuxtools.lttng.ui.tracecontrol.dialogs.ImportTraceDialog; import org.eclipse.rse.core.RSECorePlugin; diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/actions/PauseTrace.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/actions/PauseTrace.java index f1572976fb..8bd85fc4ce 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/actions/PauseTrace.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/actions/PauseTrace.java @@ -21,9 +21,9 @@ import java.util.concurrent.TimeUnit; import org.eclipse.jface.action.IAction; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.linuxtools.lttng.tracecontrol.model.TraceResource; -import org.eclipse.linuxtools.lttng.tracecontrol.model.TraceResource.TraceState; -import org.eclipse.linuxtools.lttng.tracecontrol.service.ILttControllerService; +import org.eclipse.linuxtools.lttng.core.tracecontrol.model.TraceResource; +import org.eclipse.linuxtools.lttng.core.tracecontrol.model.TraceResource.TraceState; +import org.eclipse.linuxtools.lttng.core.tracecontrol.service.ILttControllerService; import org.eclipse.linuxtools.lttng.ui.LTTngUiPlugin; import org.eclipse.linuxtools.lttng.ui.tracecontrol.TraceControlConstants; import org.eclipse.linuxtools.lttng.ui.tracecontrol.Messages; diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/actions/StartTrace.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/actions/StartTrace.java index bc7becbbf6..2e6311b274 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/actions/StartTrace.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/actions/StartTrace.java @@ -23,10 +23,10 @@ import org.eclipse.jface.action.IAction; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.window.Window; -import org.eclipse.linuxtools.lttng.tracecontrol.model.TraceResource; -import org.eclipse.linuxtools.lttng.tracecontrol.model.TraceResource.TraceState; -import org.eclipse.linuxtools.lttng.tracecontrol.model.config.TraceConfig; -import org.eclipse.linuxtools.lttng.tracecontrol.service.ILttControllerService; +import org.eclipse.linuxtools.lttng.core.tracecontrol.model.TraceResource; +import org.eclipse.linuxtools.lttng.core.tracecontrol.model.TraceResource.TraceState; +import org.eclipse.linuxtools.lttng.core.tracecontrol.model.config.TraceConfig; +import org.eclipse.linuxtools.lttng.core.tracecontrol.service.ILttControllerService; import org.eclipse.linuxtools.lttng.ui.LTTngUiPlugin; import org.eclipse.linuxtools.lttng.ui.tracecontrol.Messages; import org.eclipse.linuxtools.lttng.ui.tracecontrol.TraceControlConstants; diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/actions/StopTrace.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/actions/StopTrace.java index 83aac28445..ea7aa8d070 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/actions/StopTrace.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/actions/StopTrace.java @@ -21,10 +21,10 @@ import java.util.concurrent.TimeUnit; import org.eclipse.jface.action.IAction; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.linuxtools.lttng.tracecontrol.model.TraceResource; -import org.eclipse.linuxtools.lttng.tracecontrol.model.TraceResource.TraceState; -import org.eclipse.linuxtools.lttng.tracecontrol.model.config.TraceConfig; -import org.eclipse.linuxtools.lttng.tracecontrol.service.ILttControllerService; +import org.eclipse.linuxtools.lttng.core.tracecontrol.model.TraceResource; +import org.eclipse.linuxtools.lttng.core.tracecontrol.model.TraceResource.TraceState; +import org.eclipse.linuxtools.lttng.core.tracecontrol.model.config.TraceConfig; +import org.eclipse.linuxtools.lttng.core.tracecontrol.service.ILttControllerService; import org.eclipse.linuxtools.lttng.ui.LTTngUiPlugin; import org.eclipse.linuxtools.lttng.ui.tracecontrol.Messages; import org.eclipse.linuxtools.lttng.ui.tracecontrol.TraceControlConstants; diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/connectorservice/TraceConnectorService.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/connectorservice/TraceConnectorService.java index d90c168c8e..683bc31de5 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/connectorservice/TraceConnectorService.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/connectorservice/TraceConnectorService.java @@ -20,11 +20,11 @@ import java.util.List; import java.util.Map; import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.linuxtools.lttng.LttngConstants; import org.eclipse.linuxtools.lttng.ui.tracecontrol.TraceControlConstants; import org.eclipse.linuxtools.lttng.ui.tracecontrol.Messages; -import org.eclipse.linuxtools.lttng.tracecontrol.service.ILttControllerService; -import org.eclipse.linuxtools.lttng.tracecontrol.service.LttControllerServiceProxy; +import org.eclipse.linuxtools.lttng.core.LttngConstants; +import org.eclipse.linuxtools.lttng.core.tracecontrol.service.ILttControllerService; +import org.eclipse.linuxtools.lttng.core.tracecontrol.service.LttControllerServiceProxy; import org.eclipse.linuxtools.lttng.ui.tracecontrol.subsystems.TraceSubSystem; import org.eclipse.linuxtools.lttng.ui.tracecontrol.utility.DownloadProxy; import org.eclipse.rse.core.model.IHost; diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/dialogs/ConfigureMarkersDialog.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/dialogs/ConfigureMarkersDialog.java index 09efe883f1..5f1c0df0dc 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/dialogs/ConfigureMarkersDialog.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/dialogs/ConfigureMarkersDialog.java @@ -17,8 +17,8 @@ import java.util.HashMap; import java.util.Map; import java.util.concurrent.TimeUnit; -import org.eclipse.linuxtools.lttng.tracecontrol.model.TargetResource; -import org.eclipse.linuxtools.lttng.tracecontrol.service.ILttControllerService; +import org.eclipse.linuxtools.lttng.core.tracecontrol.model.TargetResource; +import org.eclipse.linuxtools.lttng.core.tracecontrol.service.ILttControllerService; import org.eclipse.linuxtools.lttng.ui.LTTngUiPlugin; import org.eclipse.linuxtools.lttng.ui.tracecontrol.TraceControlConstants; import org.eclipse.linuxtools.lttng.ui.tracecontrol.Messages; diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/dialogs/ImportTraceDialog.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/dialogs/ImportTraceDialog.java index 4e7f2677b2..4c8ac9e443 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/dialogs/ImportTraceDialog.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/dialogs/ImportTraceDialog.java @@ -17,9 +17,9 @@ import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.CoreException; import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.dialogs.IDialogConstants; -import org.eclipse.linuxtools.lttng.LTTngProjectNature; -import org.eclipse.linuxtools.lttng.tracecontrol.model.TraceResource; -import org.eclipse.linuxtools.lttng.tracecontrol.model.TraceResource.TraceState; +import org.eclipse.linuxtools.lttng.core.LTTngProjectNature; +import org.eclipse.linuxtools.lttng.core.tracecontrol.model.TraceResource; +import org.eclipse.linuxtools.lttng.core.tracecontrol.model.TraceResource.TraceState; import org.eclipse.linuxtools.lttng.ui.LTTngUiPlugin; import org.eclipse.linuxtools.lttng.ui.tracecontrol.Messages; import org.eclipse.rse.ui.SystemBasePlugin; diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/dialogs/NewTraceDialog.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/dialogs/NewTraceDialog.java index 517e9f12e2..5acc04bc16 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/dialogs/NewTraceDialog.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/dialogs/NewTraceDialog.java @@ -18,10 +18,10 @@ import java.io.File; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.CoreException; -import org.eclipse.linuxtools.lttng.LTTngProjectNature; -import org.eclipse.linuxtools.lttng.tracecontrol.model.TargetResource; -import org.eclipse.linuxtools.lttng.tracecontrol.model.TraceResource; -import org.eclipse.linuxtools.lttng.tracecontrol.model.config.TraceConfig; +import org.eclipse.linuxtools.lttng.core.LTTngProjectNature; +import org.eclipse.linuxtools.lttng.core.tracecontrol.model.TargetResource; +import org.eclipse.linuxtools.lttng.core.tracecontrol.model.TraceResource; +import org.eclipse.linuxtools.lttng.core.tracecontrol.model.config.TraceConfig; import org.eclipse.linuxtools.lttng.ui.LTTngUiPlugin; import org.eclipse.linuxtools.lttng.ui.tracecontrol.Messages; import org.eclipse.linuxtools.lttng.ui.tracecontrol.TraceControlConstants; diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/model/ProviderResourceAdapter.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/model/ProviderResourceAdapter.java index 69ffb2409a..126ce365b3 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/model/ProviderResourceAdapter.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/model/ProviderResourceAdapter.java @@ -17,7 +17,7 @@ import org.eclipse.core.runtime.IAdaptable; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.linuxtools.lttng.tracecontrol.model.ProviderResource; +import org.eclipse.linuxtools.lttng.core.tracecontrol.model.ProviderResource; import org.eclipse.linuxtools.lttng.ui.LTTngUiPlugin; import org.eclipse.linuxtools.lttng.ui.tracecontrol.TraceControlConstants; import org.eclipse.linuxtools.lttng.ui.tracecontrol.Messages; diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/model/TargetResourceAdapter.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/model/TargetResourceAdapter.java index b821af7abf..bd5ac07cbc 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/model/TargetResourceAdapter.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/model/TargetResourceAdapter.java @@ -17,7 +17,7 @@ import org.eclipse.core.runtime.IAdaptable; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.linuxtools.lttng.tracecontrol.model.TargetResource; +import org.eclipse.linuxtools.lttng.core.tracecontrol.model.TargetResource; import org.eclipse.linuxtools.lttng.ui.LTTngUiPlugin; import org.eclipse.linuxtools.lttng.ui.tracecontrol.TraceControlConstants; import org.eclipse.linuxtools.lttng.ui.tracecontrol.Messages; diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/model/TraceAdapterFactory.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/model/TraceAdapterFactory.java index 864835b204..1ce245ce85 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/model/TraceAdapterFactory.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/model/TraceAdapterFactory.java @@ -14,9 +14,9 @@ package org.eclipse.linuxtools.lttng.ui.tracecontrol.model; import org.eclipse.core.runtime.IAdapterFactory; -import org.eclipse.linuxtools.lttng.tracecontrol.model.ProviderResource; -import org.eclipse.linuxtools.lttng.tracecontrol.model.TargetResource; -import org.eclipse.linuxtools.lttng.tracecontrol.model.TraceResource; +import org.eclipse.linuxtools.lttng.core.tracecontrol.model.ProviderResource; +import org.eclipse.linuxtools.lttng.core.tracecontrol.model.TargetResource; +import org.eclipse.linuxtools.lttng.core.tracecontrol.model.TraceResource; import org.eclipse.rse.ui.view.AbstractSystemRemoteAdapterFactory; import org.eclipse.rse.ui.view.ISystemViewElementAdapter; import org.eclipse.ui.views.properties.IPropertySource; diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/model/TraceResourceAdapter.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/model/TraceResourceAdapter.java index 3e4674f155..86c6755c35 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/model/TraceResourceAdapter.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/model/TraceResourceAdapter.java @@ -21,9 +21,9 @@ import org.eclipse.core.runtime.IAdaptable; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.linuxtools.lttng.tracecontrol.model.TraceResource; -import org.eclipse.linuxtools.lttng.tracecontrol.model.TraceResource.PropertyInfo; -import org.eclipse.linuxtools.lttng.tracecontrol.model.TraceResource.TraceState; +import org.eclipse.linuxtools.lttng.core.tracecontrol.model.TraceResource; +import org.eclipse.linuxtools.lttng.core.tracecontrol.model.TraceResource.PropertyInfo; +import org.eclipse.linuxtools.lttng.core.tracecontrol.model.TraceResource.TraceState; import org.eclipse.linuxtools.lttng.ui.LTTngUiPlugin; import org.eclipse.linuxtools.lttng.ui.tracecontrol.TraceControlConstants; import org.eclipse.linuxtools.lttng.ui.tracecontrol.Messages; diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/model/config/TraceChannelCellModifier.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/model/config/TraceChannelCellModifier.java index 03c7944b61..7a154e6c99 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/model/config/TraceChannelCellModifier.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/model/config/TraceChannelCellModifier.java @@ -13,8 +13,8 @@ package org.eclipse.linuxtools.lttng.ui.tracecontrol.model.config; import org.eclipse.jface.viewers.ICellModifier; -import org.eclipse.linuxtools.lttng.tracecontrol.model.TraceResource.TraceState; -import org.eclipse.linuxtools.lttng.tracecontrol.model.config.TraceChannel; +import org.eclipse.linuxtools.lttng.core.tracecontrol.model.TraceResource.TraceState; +import org.eclipse.linuxtools.lttng.core.tracecontrol.model.config.TraceChannel; import org.eclipse.linuxtools.lttng.ui.tracecontrol.wizards.KernelTraceChannelConfigurationPage; import org.eclipse.swt.widgets.TableItem; diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/model/config/TraceChannelTableContentProvider.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/model/config/TraceChannelTableContentProvider.java index d3e07cb250..1c93ad8f63 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/model/config/TraceChannelTableContentProvider.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/model/config/TraceChannelTableContentProvider.java @@ -14,7 +14,7 @@ package org.eclipse.linuxtools.lttng.ui.tracecontrol.model.config; import org.eclipse.jface.viewers.IStructuredContentProvider; import org.eclipse.jface.viewers.Viewer; -import org.eclipse.linuxtools.lttng.tracecontrol.model.config.TraceChannels; +import org.eclipse.linuxtools.lttng.core.tracecontrol.model.config.TraceChannels; /** * TraceChannelTableContentProvider diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/model/config/TraceChannelTableLabelProvider.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/model/config/TraceChannelTableLabelProvider.java index 522d6bcc0e..c7093a9088 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/model/config/TraceChannelTableLabelProvider.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/model/config/TraceChannelTableLabelProvider.java @@ -14,7 +14,7 @@ package org.eclipse.linuxtools.lttng.ui.tracecontrol.model.config; import org.eclipse.jface.viewers.ILabelProviderListener; import org.eclipse.jface.viewers.ITableLabelProvider; -import org.eclipse.linuxtools.lttng.tracecontrol.model.config.TraceChannel; +import org.eclipse.linuxtools.lttng.core.tracecontrol.model.config.TraceChannel; import org.eclipse.linuxtools.lttng.ui.LTTngUiPlugin; import org.eclipse.swt.graphics.Image; diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/subsystems/TraceSubSystem.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/subsystems/TraceSubSystem.java index 97d7d069d7..efefd3f867 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/subsystems/TraceSubSystem.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/subsystems/TraceSubSystem.java @@ -20,14 +20,14 @@ import java.util.concurrent.TimeUnit; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.jface.dialogs.MessageDialog; -import org.eclipse.linuxtools.lttng.LttngConstants; -import org.eclipse.linuxtools.lttng.tracecontrol.model.ProviderResource; -import org.eclipse.linuxtools.lttng.tracecontrol.model.TargetResource; -import org.eclipse.linuxtools.lttng.tracecontrol.model.TraceResource; -import org.eclipse.linuxtools.lttng.tracecontrol.model.TraceResource.TraceState; -import org.eclipse.linuxtools.lttng.tracecontrol.model.config.TraceConfig; -import org.eclipse.linuxtools.lttng.tracecontrol.service.ILttControllerService; -import org.eclipse.linuxtools.lttng.tracecontrol.service.LttControllerServiceProxy; +import org.eclipse.linuxtools.lttng.core.LttngConstants; +import org.eclipse.linuxtools.lttng.core.tracecontrol.model.ProviderResource; +import org.eclipse.linuxtools.lttng.core.tracecontrol.model.TargetResource; +import org.eclipse.linuxtools.lttng.core.tracecontrol.model.TraceResource; +import org.eclipse.linuxtools.lttng.core.tracecontrol.model.TraceResource.TraceState; +import org.eclipse.linuxtools.lttng.core.tracecontrol.model.config.TraceConfig; +import org.eclipse.linuxtools.lttng.core.tracecontrol.service.ILttControllerService; +import org.eclipse.linuxtools.lttng.core.tracecontrol.service.LttControllerServiceProxy; import org.eclipse.linuxtools.lttng.ui.LTTngUiPlugin; import org.eclipse.linuxtools.lttng.ui.tracecontrol.TraceControlConstants; import org.eclipse.linuxtools.lttng.ui.tracecontrol.Messages; diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/utility/DownloadProxy.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/utility/DownloadProxy.java index 9544ceecc2..cd09409d6b 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/utility/DownloadProxy.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/utility/DownloadProxy.java @@ -17,8 +17,8 @@ import java.io.FileNotFoundException; import java.io.FileOutputStream; import java.io.IOException; -import org.eclipse.linuxtools.lttng.tracecontrol.model.TraceResource; -import org.eclipse.linuxtools.lttng.tracecontrol.model.config.TraceConfig; +import org.eclipse.linuxtools.lttng.core.tracecontrol.model.TraceResource; +import org.eclipse.linuxtools.lttng.core.tracecontrol.model.config.TraceConfig; import org.eclipse.linuxtools.lttng.ui.tracecontrol.subsystems.TraceSubSystem; import org.eclipse.rse.ui.SystemBasePlugin; import org.eclipse.tm.tcf.protocol.JSON; diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/wizards/ConfigureTraceWizard.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/wizards/ConfigureTraceWizard.java index 4c6600070f..9ee805b426 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/wizards/ConfigureTraceWizard.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/wizards/ConfigureTraceWizard.java @@ -17,11 +17,11 @@ import java.util.concurrent.TimeUnit; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.wizard.Wizard; -import org.eclipse.linuxtools.lttng.tracecontrol.model.TraceResource; -import org.eclipse.linuxtools.lttng.tracecontrol.model.config.TraceChannel; -import org.eclipse.linuxtools.lttng.tracecontrol.model.config.TraceChannels; -import org.eclipse.linuxtools.lttng.tracecontrol.model.config.TraceConfig; -import org.eclipse.linuxtools.lttng.tracecontrol.service.ILttControllerService; +import org.eclipse.linuxtools.lttng.core.tracecontrol.model.TraceResource; +import org.eclipse.linuxtools.lttng.core.tracecontrol.model.config.TraceChannel; +import org.eclipse.linuxtools.lttng.core.tracecontrol.model.config.TraceChannels; +import org.eclipse.linuxtools.lttng.core.tracecontrol.model.config.TraceConfig; +import org.eclipse.linuxtools.lttng.core.tracecontrol.service.ILttControllerService; import org.eclipse.linuxtools.lttng.ui.LTTngUiPlugin; import org.eclipse.linuxtools.lttng.ui.tracecontrol.TraceControlConstants; import org.eclipse.linuxtools.lttng.ui.tracecontrol.subsystems.TraceSubSystem; diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/wizards/ITraceChannelConfigurationPage.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/wizards/ITraceChannelConfigurationPage.java index 1ddceab52a..486fa10b07 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/wizards/ITraceChannelConfigurationPage.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/wizards/ITraceChannelConfigurationPage.java @@ -13,7 +13,7 @@ package org.eclipse.linuxtools.lttng.ui.tracecontrol.wizards; import org.eclipse.jface.wizard.IWizardPage; -import org.eclipse.linuxtools.lttng.tracecontrol.model.config.TraceChannels; +import org.eclipse.linuxtools.lttng.core.tracecontrol.model.config.TraceChannels; public interface ITraceChannelConfigurationPage extends IWizardPage { diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/wizards/KernelTraceChannelConfigurationPage.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/wizards/KernelTraceChannelConfigurationPage.java index 83410987da..1a90b4b2fe 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/wizards/KernelTraceChannelConfigurationPage.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/wizards/KernelTraceChannelConfigurationPage.java @@ -29,9 +29,9 @@ import org.eclipse.jface.viewers.Viewer; import org.eclipse.jface.viewers.ViewerComparator; import org.eclipse.jface.window.Window; import org.eclipse.jface.wizard.WizardPage; -import org.eclipse.linuxtools.lttng.tracecontrol.model.TraceResource.TraceState; -import org.eclipse.linuxtools.lttng.tracecontrol.model.config.TraceChannel; -import org.eclipse.linuxtools.lttng.tracecontrol.model.config.TraceChannels; +import org.eclipse.linuxtools.lttng.core.tracecontrol.model.TraceResource.TraceState; +import org.eclipse.linuxtools.lttng.core.tracecontrol.model.config.TraceChannel; +import org.eclipse.linuxtools.lttng.core.tracecontrol.model.config.TraceChannels; import org.eclipse.linuxtools.lttng.ui.LTTngUiPlugin; import org.eclipse.linuxtools.lttng.ui.tracecontrol.Messages; import org.eclipse.linuxtools.lttng.ui.tracecontrol.model.config.TraceChannelCellModifier; diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/wizards/TraceConfigurationPage.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/wizards/TraceConfigurationPage.java index 96e9d63950..8b0b5510f6 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/wizards/TraceConfigurationPage.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/wizards/TraceConfigurationPage.java @@ -15,9 +15,9 @@ package org.eclipse.linuxtools.lttng.ui.tracecontrol.wizards; import java.io.File; import org.eclipse.jface.wizard.WizardPage; -import org.eclipse.linuxtools.lttng.tracecontrol.model.TraceResource; -import org.eclipse.linuxtools.lttng.tracecontrol.model.TraceResource.TraceState; -import org.eclipse.linuxtools.lttng.tracecontrol.model.config.TraceConfig; +import org.eclipse.linuxtools.lttng.core.tracecontrol.model.TraceResource; +import org.eclipse.linuxtools.lttng.core.tracecontrol.model.TraceResource.TraceState; +import org.eclipse.linuxtools.lttng.core.tracecontrol.model.config.TraceConfig; import org.eclipse.linuxtools.lttng.ui.tracecontrol.TraceControlConstants; import org.eclipse.linuxtools.lttng.ui.tracecontrol.Messages; import org.eclipse.linuxtools.lttng.ui.tracecontrol.subsystems.TraceSubSystem; diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/wizards/UstTraceChannelConfigurationPage.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/wizards/UstTraceChannelConfigurationPage.java index 7a9ea8d3c5..e928a0def9 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/wizards/UstTraceChannelConfigurationPage.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/wizards/UstTraceChannelConfigurationPage.java @@ -13,8 +13,8 @@ package org.eclipse.linuxtools.lttng.ui.tracecontrol.wizards; import org.eclipse.jface.wizard.WizardPage; -import org.eclipse.linuxtools.lttng.tracecontrol.model.config.TraceChannel; -import org.eclipse.linuxtools.lttng.tracecontrol.model.config.TraceChannels; +import org.eclipse.linuxtools.lttng.core.tracecontrol.model.config.TraceChannel; +import org.eclipse.linuxtools.lttng.core.tracecontrol.model.config.TraceChannels; import org.eclipse.linuxtools.lttng.ui.tracecontrol.Messages; import org.eclipse.swt.SWT; import org.eclipse.swt.events.VerifyEvent; diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/common/AbsTRangeUpdate.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/common/AbsTRangeUpdate.java index 57cd0e9248..319f0a2684 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/common/AbsTRangeUpdate.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/common/AbsTRangeUpdate.java @@ -10,10 +10,10 @@ *******************************************************************************/ package org.eclipse.linuxtools.lttng.ui.views.common; -import org.eclipse.linuxtools.lttng.state.evProcessor.ILttngEventProcessor; -import org.eclipse.linuxtools.lttng.state.evProcessor.state.AbsStateProcessing; -import org.eclipse.linuxtools.lttng.state.model.LttngTraceState; -import org.eclipse.linuxtools.tmf.event.TmfTimeRange; +import org.eclipse.linuxtools.lttng.core.state.evProcessor.ILttngEventProcessor; +import org.eclipse.linuxtools.lttng.core.state.evProcessor.state.AbsStateProcessing; +import org.eclipse.linuxtools.lttng.core.state.model.LttngTraceState; +import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange; public abstract class AbsTRangeUpdate extends AbsStateProcessing implements ILttngEventProcessor { diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/common/AbsTimeUpdateView.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/common/AbsTimeUpdateView.java index 4af80963c7..9fab6d2a36 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/common/AbsTimeUpdateView.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/common/AbsTimeUpdateView.java @@ -14,30 +14,30 @@ package org.eclipse.linuxtools.lttng.ui.views.common; import java.util.Arrays; -import org.eclipse.linuxtools.lttng.LttngConstants; -import org.eclipse.linuxtools.lttng.control.LttngCoreProviderFactory; -import org.eclipse.linuxtools.lttng.control.LttngSyntheticEventProvider; -import org.eclipse.linuxtools.lttng.event.LttngSyntheticEvent; -import org.eclipse.linuxtools.lttng.event.LttngTimestamp; -import org.eclipse.linuxtools.lttng.request.ILttngSyntEventRequest; -import org.eclipse.linuxtools.lttng.request.IRequestStatusListener; -import org.eclipse.linuxtools.lttng.request.LttngSyntEventRequest; -import org.eclipse.linuxtools.lttng.request.RequestCompletedSignal; -import org.eclipse.linuxtools.lttng.request.RequestStartedSignal; -import org.eclipse.linuxtools.lttng.state.evProcessor.ITransEventProcessor; +import org.eclipse.linuxtools.lttng.core.LttngConstants; +import org.eclipse.linuxtools.lttng.core.control.LttngCoreProviderFactory; +import org.eclipse.linuxtools.lttng.core.control.LttngSyntheticEventProvider; +import org.eclipse.linuxtools.lttng.core.event.LttngSyntheticEvent; +import org.eclipse.linuxtools.lttng.core.event.LttngTimestamp; +import org.eclipse.linuxtools.lttng.core.request.ILttngSyntEventRequest; +import org.eclipse.linuxtools.lttng.core.request.IRequestStatusListener; +import org.eclipse.linuxtools.lttng.core.request.LttngSyntEventRequest; +import org.eclipse.linuxtools.lttng.core.request.RequestCompletedSignal; +import org.eclipse.linuxtools.lttng.core.request.RequestStartedSignal; +import org.eclipse.linuxtools.lttng.core.state.evProcessor.ITransEventProcessor; import org.eclipse.linuxtools.lttng.ui.TraceDebug; import org.eclipse.linuxtools.lttng.ui.model.trange.ItemContainer; -import org.eclipse.linuxtools.tmf.event.TmfEvent; -import org.eclipse.linuxtools.tmf.event.TmfTimeRange; -import org.eclipse.linuxtools.tmf.event.TmfTimestamp; -import org.eclipse.linuxtools.tmf.experiment.TmfExperiment; -import org.eclipse.linuxtools.tmf.request.ITmfDataRequest.ExecutionType; -import org.eclipse.linuxtools.tmf.request.TmfDataRequest; -import org.eclipse.linuxtools.tmf.signal.TmfExperimentDisposedSignal; -import org.eclipse.linuxtools.tmf.signal.TmfRangeSynchSignal; -import org.eclipse.linuxtools.tmf.signal.TmfSignalHandler; -import org.eclipse.linuxtools.tmf.signal.TmfSignalManager; -import org.eclipse.linuxtools.tmf.signal.TmfTimeSynchSignal; +import org.eclipse.linuxtools.tmf.core.event.TmfEvent; +import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange; +import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp; +import org.eclipse.linuxtools.tmf.core.experiment.TmfExperiment; +import org.eclipse.linuxtools.tmf.core.request.TmfDataRequest; +import org.eclipse.linuxtools.tmf.core.request.ITmfDataRequest.ExecutionType; +import org.eclipse.linuxtools.tmf.core.signal.TmfExperimentDisposedSignal; +import org.eclipse.linuxtools.tmf.core.signal.TmfRangeSynchSignal; +import org.eclipse.linuxtools.tmf.core.signal.TmfSignalHandler; +import org.eclipse.linuxtools.tmf.core.signal.TmfSignalManager; +import org.eclipse.linuxtools.tmf.core.signal.TmfTimeSynchSignal; import org.eclipse.linuxtools.tmf.ui.viewers.timeAnalysis.ITimeAnalysisViewer; import org.eclipse.linuxtools.tmf.ui.viewers.timeAnalysis.TmfTimeScaleSelectionEvent; import org.eclipse.linuxtools.tmf.ui.viewers.timeAnalysis.TmfTimeSelectionEvent; diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/common/ParamsUpdater.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/common/ParamsUpdater.java index d78b39688c..5f3b76d368 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/common/ParamsUpdater.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/common/ParamsUpdater.java @@ -11,10 +11,10 @@ *******************************************************************************/ package org.eclipse.linuxtools.lttng.ui.views.common; -import org.eclipse.linuxtools.lttng.event.LttngTimestamp; +import org.eclipse.linuxtools.lttng.core.event.LttngTimestamp; import org.eclipse.linuxtools.lttng.ui.TraceDebug; -import org.eclipse.linuxtools.tmf.event.TmfTimeRange; -import org.eclipse.linuxtools.tmf.event.TmfTimestamp; +import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange; +import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp; import org.eclipse.linuxtools.tmf.ui.viewers.timeAnalysis.TmfTimeScaleSelectionEvent; /** diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/controlflow/ControlFlowView.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/controlflow/ControlFlowView.java index b9963f2620..2a4c345fa1 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/controlflow/ControlFlowView.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/controlflow/ControlFlowView.java @@ -35,10 +35,10 @@ import org.eclipse.jface.viewers.StructuredViewer; import org.eclipse.jface.viewers.TableViewer; import org.eclipse.jface.viewers.Viewer; import org.eclipse.jface.viewers.ViewerFilter; -import org.eclipse.linuxtools.lttng.control.LttngCoreProviderFactory; -import org.eclipse.linuxtools.lttng.event.LttngTimestamp; -import org.eclipse.linuxtools.lttng.request.ILttngSyntEventRequest; -import org.eclipse.linuxtools.lttng.state.evProcessor.ITransEventProcessor; +import org.eclipse.linuxtools.lttng.core.control.LttngCoreProviderFactory; +import org.eclipse.linuxtools.lttng.core.event.LttngTimestamp; +import org.eclipse.linuxtools.lttng.core.request.ILttngSyntEventRequest; +import org.eclipse.linuxtools.lttng.core.state.evProcessor.ITransEventProcessor; import org.eclipse.linuxtools.lttng.ui.TraceDebug; import org.eclipse.linuxtools.lttng.ui.model.trange.ItemContainer; import org.eclipse.linuxtools.lttng.ui.model.trange.TimeRangeEventProcess; @@ -47,15 +47,15 @@ import org.eclipse.linuxtools.lttng.ui.views.common.ParamsUpdater; import org.eclipse.linuxtools.lttng.ui.views.controlflow.evProcessor.FlowEventToHandlerFactory; import org.eclipse.linuxtools.lttng.ui.views.controlflow.model.FlowModelFactory; import org.eclipse.linuxtools.lttng.ui.views.controlflow.model.FlowTimeRangeViewerProvider; -import org.eclipse.linuxtools.tmf.event.TmfEvent; -import org.eclipse.linuxtools.tmf.event.TmfTimeRange; -import org.eclipse.linuxtools.tmf.experiment.TmfExperiment; -import org.eclipse.linuxtools.tmf.request.ITmfDataRequest.ExecutionType; -import org.eclipse.linuxtools.tmf.signal.TmfExperimentRangeUpdatedSignal; -import org.eclipse.linuxtools.tmf.signal.TmfExperimentSelectedSignal; -import org.eclipse.linuxtools.tmf.signal.TmfRangeSynchSignal; -import org.eclipse.linuxtools.tmf.signal.TmfSignalHandler; -import org.eclipse.linuxtools.tmf.signal.TmfTimeSynchSignal; +import org.eclipse.linuxtools.tmf.core.event.TmfEvent; +import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange; +import org.eclipse.linuxtools.tmf.core.experiment.TmfExperiment; +import org.eclipse.linuxtools.tmf.core.request.ITmfDataRequest.ExecutionType; +import org.eclipse.linuxtools.tmf.core.signal.TmfExperimentRangeUpdatedSignal; +import org.eclipse.linuxtools.tmf.core.signal.TmfExperimentSelectedSignal; +import org.eclipse.linuxtools.tmf.core.signal.TmfRangeSynchSignal; +import org.eclipse.linuxtools.tmf.core.signal.TmfSignalHandler; +import org.eclipse.linuxtools.tmf.core.signal.TmfTimeSynchSignal; import org.eclipse.linuxtools.tmf.ui.viewers.TmfViewerFactory; import org.eclipse.linuxtools.tmf.ui.viewers.timeAnalysis.ITmfTimeFilterSelectionListener; import org.eclipse.linuxtools.tmf.ui.viewers.timeAnalysis.ITmfTimeScaleSelectionListener; diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/controlflow/evProcessor/AbsFlowTRangeUpdate.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/controlflow/evProcessor/AbsFlowTRangeUpdate.java index 430d5f4d18..3e920c97cf 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/controlflow/evProcessor/AbsFlowTRangeUpdate.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/controlflow/evProcessor/AbsFlowTRangeUpdate.java @@ -14,10 +14,10 @@ package org.eclipse.linuxtools.lttng.ui.views.controlflow.evProcessor; import java.util.Vector; -import org.eclipse.linuxtools.lttng.state.StateStrings.ProcessStatus; -import org.eclipse.linuxtools.lttng.state.evProcessor.ILttngEventProcessor; -import org.eclipse.linuxtools.lttng.state.model.LttngProcessState; -import org.eclipse.linuxtools.lttng.state.model.LttngTraceState; +import org.eclipse.linuxtools.lttng.core.state.StateStrings.ProcessStatus; +import org.eclipse.linuxtools.lttng.core.state.evProcessor.ILttngEventProcessor; +import org.eclipse.linuxtools.lttng.core.state.model.LttngProcessState; +import org.eclipse.linuxtools.lttng.core.state.model.LttngTraceState; import org.eclipse.linuxtools.lttng.ui.TraceDebug; import org.eclipse.linuxtools.lttng.ui.model.trange.TimeRangeComponent; import org.eclipse.linuxtools.lttng.ui.model.trange.TimeRangeEvent; diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/controlflow/evProcessor/FlowAfterUpdateHandlers.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/controlflow/evProcessor/FlowAfterUpdateHandlers.java index 98c74bf91b..644352f29b 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/controlflow/evProcessor/FlowAfterUpdateHandlers.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/controlflow/evProcessor/FlowAfterUpdateHandlers.java @@ -12,14 +12,14 @@ *******************************************************************************/ package org.eclipse.linuxtools.lttng.ui.views.controlflow.evProcessor; -import org.eclipse.linuxtools.lttng.event.LttngEvent; -import org.eclipse.linuxtools.lttng.state.StateStrings.Fields; -import org.eclipse.linuxtools.lttng.state.evProcessor.ILttngEventProcessor; -import org.eclipse.linuxtools.lttng.state.model.LttngProcessState; -import org.eclipse.linuxtools.lttng.state.model.LttngTraceState; +import org.eclipse.linuxtools.lttng.core.event.LttngEvent; +import org.eclipse.linuxtools.lttng.core.state.StateStrings.Fields; +import org.eclipse.linuxtools.lttng.core.state.evProcessor.ILttngEventProcessor; +import org.eclipse.linuxtools.lttng.core.state.model.LttngProcessState; +import org.eclipse.linuxtools.lttng.core.state.model.LttngTraceState; import org.eclipse.linuxtools.lttng.ui.TraceDebug; import org.eclipse.linuxtools.lttng.ui.model.trange.TimeRangeEventProcess; -import org.eclipse.linuxtools.tmf.event.TmfTimeRange; +import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange; /** * Creates instances of specific after state update handlers, per corresponding diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/controlflow/evProcessor/FlowBeforeUpdateHandlers.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/controlflow/evProcessor/FlowBeforeUpdateHandlers.java index a53aacdcc0..be0a9bafb1 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/controlflow/evProcessor/FlowBeforeUpdateHandlers.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/controlflow/evProcessor/FlowBeforeUpdateHandlers.java @@ -12,14 +12,14 @@ *******************************************************************************/ package org.eclipse.linuxtools.lttng.ui.views.controlflow.evProcessor; -import org.eclipse.linuxtools.lttng.event.LttngEvent; -import org.eclipse.linuxtools.lttng.state.StateStrings.Fields; -import org.eclipse.linuxtools.lttng.state.evProcessor.ILttngEventProcessor; -import org.eclipse.linuxtools.lttng.state.model.LttngProcessState; -import org.eclipse.linuxtools.lttng.state.model.LttngTraceState; +import org.eclipse.linuxtools.lttng.core.event.LttngEvent; +import org.eclipse.linuxtools.lttng.core.state.StateStrings.Fields; +import org.eclipse.linuxtools.lttng.core.state.evProcessor.ILttngEventProcessor; +import org.eclipse.linuxtools.lttng.core.state.model.LttngProcessState; +import org.eclipse.linuxtools.lttng.core.state.model.LttngTraceState; import org.eclipse.linuxtools.lttng.ui.TraceDebug; import org.eclipse.linuxtools.lttng.ui.model.trange.TimeRangeEventProcess; -import org.eclipse.linuxtools.tmf.event.TmfTimeRange; +import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange; /** * Creates instances of specific before state update handlers, per corresponding diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/controlflow/evProcessor/FlowEventToHandlerFactory.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/controlflow/evProcessor/FlowEventToHandlerFactory.java index 43e5a05476..e1aa9d2662 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/controlflow/evProcessor/FlowEventToHandlerFactory.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/controlflow/evProcessor/FlowEventToHandlerFactory.java @@ -15,9 +15,9 @@ package org.eclipse.linuxtools.lttng.ui.views.controlflow.evProcessor; import java.util.HashMap; import java.util.Map; -import org.eclipse.linuxtools.lttng.state.StateStrings; -import org.eclipse.linuxtools.lttng.state.evProcessor.AbsEventToHandlerResolver; -import org.eclipse.linuxtools.lttng.state.evProcessor.ILttngEventProcessor; +import org.eclipse.linuxtools.lttng.core.state.StateStrings; +import org.eclipse.linuxtools.lttng.core.state.evProcessor.AbsEventToHandlerResolver; +import org.eclipse.linuxtools.lttng.core.state.evProcessor.ILttngEventProcessor; /** * Builds a Map from string event name to a processing handler object, the diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/controlflow/evProcessor/FlowFinishUpdateHandler.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/controlflow/evProcessor/FlowFinishUpdateHandler.java index 4d8fadcfba..b7efd6d429 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/controlflow/evProcessor/FlowFinishUpdateHandler.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/controlflow/evProcessor/FlowFinishUpdateHandler.java @@ -14,11 +14,11 @@ package org.eclipse.linuxtools.lttng.ui.views.controlflow.evProcessor; import java.util.Vector; -import org.eclipse.linuxtools.lttng.event.LttngEvent; -import org.eclipse.linuxtools.lttng.state.StateStrings.Events; -import org.eclipse.linuxtools.lttng.state.evProcessor.ILttngEventProcessor; -import org.eclipse.linuxtools.lttng.state.model.LttngProcessState; -import org.eclipse.linuxtools.lttng.state.model.LttngTraceState; +import org.eclipse.linuxtools.lttng.core.event.LttngEvent; +import org.eclipse.linuxtools.lttng.core.state.StateStrings.Events; +import org.eclipse.linuxtools.lttng.core.state.evProcessor.ILttngEventProcessor; +import org.eclipse.linuxtools.lttng.core.state.model.LttngProcessState; +import org.eclipse.linuxtools.lttng.core.state.model.LttngTraceState; import org.eclipse.linuxtools.lttng.ui.TraceDebug; import org.eclipse.linuxtools.lttng.ui.model.trange.TimeRangeComponent; import org.eclipse.linuxtools.lttng.ui.model.trange.TimeRangeEvent; diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/controlflow/model/FlowProcessContainer.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/controlflow/model/FlowProcessContainer.java index 1fc17b18f9..f3b0053f8f 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/controlflow/model/FlowProcessContainer.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/controlflow/model/FlowProcessContainer.java @@ -15,7 +15,7 @@ package org.eclipse.linuxtools.lttng.ui.views.controlflow.model; import java.util.HashMap; import java.util.Iterator; -import org.eclipse.linuxtools.lttng.TraceDebug; +import org.eclipse.linuxtools.lttng.core.TraceDebug; import org.eclipse.linuxtools.lttng.ui.model.trange.ItemContainer; import org.eclipse.linuxtools.lttng.ui.model.trange.TimeRangeEventProcess; diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/events/EventsTable.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/events/EventsTable.java index c1c4a04bf0..c5e149bad6 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/events/EventsTable.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/events/EventsTable.java @@ -13,9 +13,9 @@ package org.eclipse.linuxtools.lttng.ui.views.events; -import org.eclipse.linuxtools.lttng.event.LttngEventContent; -import org.eclipse.linuxtools.tmf.event.TmfEvent; -import org.eclipse.linuxtools.tmf.event.TmfEventContent; +import org.eclipse.linuxtools.lttng.core.event.LttngEventContent; +import org.eclipse.linuxtools.tmf.core.event.TmfEvent; +import org.eclipse.linuxtools.tmf.core.event.TmfEventContent; import org.eclipse.linuxtools.tmf.ui.viewers.events.TmfEventsTable; import org.eclipse.linuxtools.tmf.ui.widgets.ColumnData; import org.eclipse.swt.SWT; diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/histogram/HistogramDataModel.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/histogram/HistogramDataModel.java index b08690116f..36c6fb748c 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/histogram/HistogramDataModel.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/histogram/HistogramDataModel.java @@ -14,7 +14,7 @@ package org.eclipse.linuxtools.lttng.ui.views.histogram; import java.util.Arrays; -import org.eclipse.linuxtools.lttng.exceptions.EventOutOfSequenceException; +import org.eclipse.linuxtools.lttng.core.exceptions.EventOutOfSequenceException; import org.eclipse.linuxtools.lttng.ui.LTTngUILogger; /** diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/histogram/HistogramRequest.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/histogram/HistogramRequest.java index be2fa6d471..2b88329570 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/histogram/HistogramRequest.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/histogram/HistogramRequest.java @@ -14,11 +14,11 @@ package org.eclipse.linuxtools.lttng.ui.views.histogram; -import org.eclipse.linuxtools.lttng.LttngConstants; -import org.eclipse.linuxtools.lttng.event.LttngEvent; -import org.eclipse.linuxtools.tmf.event.TmfTimeRange; -import org.eclipse.linuxtools.tmf.request.ITmfDataRequest; -import org.eclipse.linuxtools.tmf.request.TmfEventRequest; +import org.eclipse.linuxtools.lttng.core.LttngConstants; +import org.eclipse.linuxtools.lttng.core.event.LttngEvent; +import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange; +import org.eclipse.linuxtools.tmf.core.request.ITmfDataRequest; +import org.eclipse.linuxtools.tmf.core.request.TmfEventRequest; /** * HistogramRequest diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/histogram/HistogramView.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/histogram/HistogramView.java index 82c7294923..32f9dc11bf 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/histogram/HistogramView.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/histogram/HistogramView.java @@ -16,17 +16,17 @@ package org.eclipse.linuxtools.lttng.ui.views.histogram; -import org.eclipse.linuxtools.lttng.event.LttngEvent; -import org.eclipse.linuxtools.tmf.event.TmfTimeRange; -import org.eclipse.linuxtools.tmf.event.TmfTimestamp; -import org.eclipse.linuxtools.tmf.experiment.TmfExperiment; -import org.eclipse.linuxtools.tmf.request.ITmfDataRequest.ExecutionType; -import org.eclipse.linuxtools.tmf.signal.TmfExperimentRangeUpdatedSignal; -import org.eclipse.linuxtools.tmf.signal.TmfExperimentSelectedSignal; -import org.eclipse.linuxtools.tmf.signal.TmfRangeSynchSignal; -import org.eclipse.linuxtools.tmf.signal.TmfSignalHandler; -import org.eclipse.linuxtools.tmf.signal.TmfSignalManager; -import org.eclipse.linuxtools.tmf.signal.TmfTimeSynchSignal; +import org.eclipse.linuxtools.lttng.core.event.LttngEvent; +import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange; +import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp; +import org.eclipse.linuxtools.tmf.core.experiment.TmfExperiment; +import org.eclipse.linuxtools.tmf.core.request.ITmfDataRequest.ExecutionType; +import org.eclipse.linuxtools.tmf.core.signal.TmfExperimentRangeUpdatedSignal; +import org.eclipse.linuxtools.tmf.core.signal.TmfExperimentSelectedSignal; +import org.eclipse.linuxtools.tmf.core.signal.TmfRangeSynchSignal; +import org.eclipse.linuxtools.tmf.core.signal.TmfSignalHandler; +import org.eclipse.linuxtools.tmf.core.signal.TmfSignalManager; +import org.eclipse.linuxtools.tmf.core.signal.TmfTimeSynchSignal; import org.eclipse.linuxtools.tmf.ui.views.TmfView; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.GridData; diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/ProjectView.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/ProjectView.java index 98f7834903..9d15e106c0 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/ProjectView.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/ProjectView.java @@ -28,10 +28,10 @@ import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.jface.viewers.TreeSelection; import org.eclipse.jface.viewers.TreeViewer; import org.eclipse.jface.viewers.ViewerSorter; -import org.eclipse.linuxtools.lttng.TraceHelper; -import org.eclipse.linuxtools.lttng.event.LttngEvent; -import org.eclipse.linuxtools.lttng.trace.LTTngExperiment; -import org.eclipse.linuxtools.lttng.trace.LTTngTrace; +import org.eclipse.linuxtools.lttng.core.TraceHelper; +import org.eclipse.linuxtools.lttng.core.event.LttngEvent; +import org.eclipse.linuxtools.lttng.core.trace.LTTngExperiment; +import org.eclipse.linuxtools.lttng.core.trace.LTTngTrace; import org.eclipse.linuxtools.lttng.ui.views.project.dialogs.Messages; import org.eclipse.linuxtools.lttng.ui.views.project.model.ILTTngProjectTreeNode; import org.eclipse.linuxtools.lttng.ui.views.project.model.LTTngExperimentNode; @@ -40,9 +40,9 @@ import org.eclipse.linuxtools.lttng.ui.views.project.model.LTTngProjectLabelProv import org.eclipse.linuxtools.lttng.ui.views.project.model.LTTngProjectNode; import org.eclipse.linuxtools.lttng.ui.views.project.model.LTTngProjectRoot; import org.eclipse.linuxtools.lttng.ui.views.project.model.LTTngTraceNode; -import org.eclipse.linuxtools.tmf.experiment.TmfExperiment; -import org.eclipse.linuxtools.tmf.signal.TmfExperimentSelectedSignal; -import org.eclipse.linuxtools.tmf.trace.ITmfTrace; +import org.eclipse.linuxtools.tmf.core.experiment.TmfExperiment; +import org.eclipse.linuxtools.tmf.core.signal.TmfExperimentSelectedSignal; +import org.eclipse.linuxtools.tmf.core.trace.ITmfTrace; import org.eclipse.linuxtools.tmf.ui.views.TmfView; import org.eclipse.swt.SWT; import org.eclipse.swt.events.MouseAdapter; diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/dialogs/ImportTraceWizardPage.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/dialogs/ImportTraceWizardPage.java index 2132ed37c3..b16c168a99 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/dialogs/ImportTraceWizardPage.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/dialogs/ImportTraceWizardPage.java @@ -17,9 +17,9 @@ import org.eclipse.core.resources.IFolder; import org.eclipse.core.resources.IProject; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.linuxtools.lttng.TraceHelper; -import org.eclipse.linuxtools.lttng.exceptions.LttngException; -import org.eclipse.linuxtools.lttng.trace.LTTngTraceVersion; +import org.eclipse.linuxtools.lttng.core.TraceHelper; +import org.eclipse.linuxtools.lttng.core.exceptions.LttngException; +import org.eclipse.linuxtools.lttng.core.trace.LTTngTraceVersion; import org.eclipse.linuxtools.lttng.ui.views.project.handlers.TraceErrorHandler; import org.eclipse.linuxtools.lttng.ui.views.project.model.LTTngProjectNode; import org.eclipse.ui.IWorkbench; diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/dialogs/NewLTTngProjectWizard.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/dialogs/NewLTTngProjectWizard.java index b7113bc1b0..ed0a21f155 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/dialogs/NewLTTngProjectWizard.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/dialogs/NewLTTngProjectWizard.java @@ -17,9 +17,9 @@ package org.eclipse.linuxtools.lttng.ui.views.project.dialogs; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IProjectDescription; import org.eclipse.core.runtime.CoreException; -import org.eclipse.linuxtools.lttng.LTTngProjectNature; -import org.eclipse.linuxtools.lttng.TraceHelper; -import org.eclipse.linuxtools.tmf.TmfProjectNature; +import org.eclipse.linuxtools.lttng.core.LTTngProjectNature; +import org.eclipse.linuxtools.lttng.core.TraceHelper; +import org.eclipse.linuxtools.tmf.core.TmfProjectNature; import org.eclipse.linuxtools.tmf.ui.project.wizards.NewTmfProjectWizard; /** diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/dialogs/TraceLibraryPathPropertyPage.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/dialogs/TraceLibraryPathPropertyPage.java index 21c015f01c..bd99112350 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/dialogs/TraceLibraryPathPropertyPage.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/dialogs/TraceLibraryPathPropertyPage.java @@ -16,7 +16,7 @@ import java.io.File; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; -import org.eclipse.linuxtools.lttng.TraceHelper; +import org.eclipse.linuxtools.lttng.core.TraceHelper; import org.eclipse.swt.SWT; import org.eclipse.swt.events.ModifyEvent; import org.eclipse.swt.events.ModifyListener; diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/model/LTTngProjectNode.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/model/LTTngProjectNode.java index 8898a10a9d..07648dd878 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/model/LTTngProjectNode.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/model/LTTngProjectNode.java @@ -22,7 +22,7 @@ import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IAdaptable; import org.eclipse.core.runtime.Platform; -import org.eclipse.linuxtools.lttng.LTTngProjectNature; +import org.eclipse.linuxtools.lttng.core.LTTngProjectNature; /** * LTTngProjectNode diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/resources/ResourcesView.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/resources/ResourcesView.java index 8432a5d009..062b566e26 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/resources/ResourcesView.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/resources/ResourcesView.java @@ -18,9 +18,9 @@ import org.eclipse.jface.action.IMenuManager; import org.eclipse.jface.action.IToolBarManager; import org.eclipse.jface.action.MenuManager; import org.eclipse.jface.action.Separator; -import org.eclipse.linuxtools.lttng.control.LttngCoreProviderFactory; -import org.eclipse.linuxtools.lttng.request.ILttngSyntEventRequest; -import org.eclipse.linuxtools.lttng.state.evProcessor.ITransEventProcessor; +import org.eclipse.linuxtools.lttng.core.control.LttngCoreProviderFactory; +import org.eclipse.linuxtools.lttng.core.request.ILttngSyntEventRequest; +import org.eclipse.linuxtools.lttng.core.state.evProcessor.ITransEventProcessor; import org.eclipse.linuxtools.lttng.ui.TraceDebug; import org.eclipse.linuxtools.lttng.ui.model.trange.ItemContainer; import org.eclipse.linuxtools.lttng.ui.views.common.AbsTimeUpdateView; @@ -28,15 +28,15 @@ import org.eclipse.linuxtools.lttng.ui.views.common.ParamsUpdater; import org.eclipse.linuxtools.lttng.ui.views.resources.evProcessor.ResourcesEventToHandlerFactory; import org.eclipse.linuxtools.lttng.ui.views.resources.model.ResourceModelFactory; import org.eclipse.linuxtools.lttng.ui.views.resources.model.ResourcesTimeRangeViewerProvider; -import org.eclipse.linuxtools.tmf.event.TmfEvent; -import org.eclipse.linuxtools.tmf.event.TmfTimeRange; -import org.eclipse.linuxtools.tmf.experiment.TmfExperiment; -import org.eclipse.linuxtools.tmf.request.ITmfDataRequest.ExecutionType; -import org.eclipse.linuxtools.tmf.signal.TmfExperimentRangeUpdatedSignal; -import org.eclipse.linuxtools.tmf.signal.TmfExperimentSelectedSignal; -import org.eclipse.linuxtools.tmf.signal.TmfRangeSynchSignal; -import org.eclipse.linuxtools.tmf.signal.TmfSignalHandler; -import org.eclipse.linuxtools.tmf.signal.TmfTimeSynchSignal; +import org.eclipse.linuxtools.tmf.core.event.TmfEvent; +import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange; +import org.eclipse.linuxtools.tmf.core.experiment.TmfExperiment; +import org.eclipse.linuxtools.tmf.core.request.ITmfDataRequest.ExecutionType; +import org.eclipse.linuxtools.tmf.core.signal.TmfExperimentRangeUpdatedSignal; +import org.eclipse.linuxtools.tmf.core.signal.TmfExperimentSelectedSignal; +import org.eclipse.linuxtools.tmf.core.signal.TmfRangeSynchSignal; +import org.eclipse.linuxtools.tmf.core.signal.TmfSignalHandler; +import org.eclipse.linuxtools.tmf.core.signal.TmfTimeSynchSignal; import org.eclipse.linuxtools.tmf.ui.viewers.TmfViewerFactory; import org.eclipse.linuxtools.tmf.ui.viewers.timeAnalysis.ITmfTimeScaleSelectionListener; import org.eclipse.linuxtools.tmf.ui.viewers.timeAnalysis.ITmfTimeSelectionListener; diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/resources/evProcessor/AbsResourcesTRangeUpdate.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/resources/evProcessor/AbsResourcesTRangeUpdate.java index 235a2d68c6..dfabba081a 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/resources/evProcessor/AbsResourcesTRangeUpdate.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/resources/evProcessor/AbsResourcesTRangeUpdate.java @@ -14,9 +14,9 @@ package org.eclipse.linuxtools.lttng.ui.views.resources.evProcessor; import java.util.Vector; -import org.eclipse.linuxtools.lttng.event.LttngEvent; -import org.eclipse.linuxtools.lttng.state.evProcessor.ILttngEventProcessor; -import org.eclipse.linuxtools.lttng.state.model.LttngTraceState; +import org.eclipse.linuxtools.lttng.core.event.LttngEvent; +import org.eclipse.linuxtools.lttng.core.state.evProcessor.ILttngEventProcessor; +import org.eclipse.linuxtools.lttng.core.state.model.LttngTraceState; import org.eclipse.linuxtools.lttng.ui.TraceDebug; import org.eclipse.linuxtools.lttng.ui.model.trange.TimeRangeComponent; import org.eclipse.linuxtools.lttng.ui.model.trange.TimeRangeEvent; @@ -28,7 +28,7 @@ import org.eclipse.linuxtools.lttng.ui.views.common.AbsTRangeUpdate; import org.eclipse.linuxtools.lttng.ui.views.common.ParamsUpdater; import org.eclipse.linuxtools.lttng.ui.views.resources.model.ResourceContainer; import org.eclipse.linuxtools.lttng.ui.views.resources.model.ResourceModelFactory; -import org.eclipse.linuxtools.tmf.event.TmfTimeRange; +import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange; public abstract class AbsResourcesTRangeUpdate extends AbsTRangeUpdate implements ILttngEventProcessor { diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/resources/evProcessor/ResourcesAfterUpdateHandlers.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/resources/evProcessor/ResourcesAfterUpdateHandlers.java index 85a012e6f3..4c48c96965 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/resources/evProcessor/ResourcesAfterUpdateHandlers.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/resources/evProcessor/ResourcesAfterUpdateHandlers.java @@ -12,9 +12,9 @@ *******************************************************************************/ package org.eclipse.linuxtools.lttng.ui.views.resources.evProcessor; -import org.eclipse.linuxtools.lttng.event.LttngEvent; -import org.eclipse.linuxtools.lttng.state.evProcessor.ILttngEventProcessor; -import org.eclipse.linuxtools.lttng.state.model.LttngTraceState; +import org.eclipse.linuxtools.lttng.core.event.LttngEvent; +import org.eclipse.linuxtools.lttng.core.state.evProcessor.ILttngEventProcessor; +import org.eclipse.linuxtools.lttng.core.state.model.LttngTraceState; /** * Creates instances of specific after state update handlers, per corresponding diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/resources/evProcessor/ResourcesBeforeUpdateHandlers.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/resources/evProcessor/ResourcesBeforeUpdateHandlers.java index f840e62e10..f45fa0b825 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/resources/evProcessor/ResourcesBeforeUpdateHandlers.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/resources/evProcessor/ResourcesBeforeUpdateHandlers.java @@ -12,15 +12,15 @@ *******************************************************************************/ package org.eclipse.linuxtools.lttng.ui.views.resources.evProcessor; -import org.eclipse.linuxtools.lttng.event.LttngEvent; -import org.eclipse.linuxtools.lttng.state.StateStrings.Channels; -import org.eclipse.linuxtools.lttng.state.StateStrings.Events; -import org.eclipse.linuxtools.lttng.state.StateStrings.Fields; -import org.eclipse.linuxtools.lttng.state.evProcessor.ILttngEventProcessor; -import org.eclipse.linuxtools.lttng.state.model.LttngTraceState; +import org.eclipse.linuxtools.lttng.core.event.LttngEvent; +import org.eclipse.linuxtools.lttng.core.state.StateStrings.Channels; +import org.eclipse.linuxtools.lttng.core.state.StateStrings.Events; +import org.eclipse.linuxtools.lttng.core.state.StateStrings.Fields; +import org.eclipse.linuxtools.lttng.core.state.evProcessor.ILttngEventProcessor; +import org.eclipse.linuxtools.lttng.core.state.model.LttngTraceState; import org.eclipse.linuxtools.lttng.ui.model.trange.TimeRangeEventResource; import org.eclipse.linuxtools.lttng.ui.model.trange.TimeRangeEventResource.ResourceTypes; -import org.eclipse.linuxtools.tmf.event.TmfTimeRange; +import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange; /** * Creates instances of specific before state update handlers, per corresponding diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/resources/evProcessor/ResourcesEventToHandlerFactory.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/resources/evProcessor/ResourcesEventToHandlerFactory.java index a42caf962e..2a068d8142 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/resources/evProcessor/ResourcesEventToHandlerFactory.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/resources/evProcessor/ResourcesEventToHandlerFactory.java @@ -15,13 +15,13 @@ package org.eclipse.linuxtools.lttng.ui.views.resources.evProcessor; import java.util.HashMap; import java.util.Map; -import org.eclipse.linuxtools.lttng.event.LttngEvent; -import org.eclipse.linuxtools.lttng.event.LttngSyntheticEvent; -import org.eclipse.linuxtools.lttng.event.LttngSyntheticEvent.SequenceInd; -import org.eclipse.linuxtools.lttng.state.StateStrings; -import org.eclipse.linuxtools.lttng.state.evProcessor.AbsEventToHandlerResolver; -import org.eclipse.linuxtools.lttng.state.evProcessor.ILttngEventProcessor; -import org.eclipse.linuxtools.lttng.state.model.LttngTraceState; +import org.eclipse.linuxtools.lttng.core.event.LttngEvent; +import org.eclipse.linuxtools.lttng.core.event.LttngSyntheticEvent; +import org.eclipse.linuxtools.lttng.core.event.LttngSyntheticEvent.SequenceInd; +import org.eclipse.linuxtools.lttng.core.state.StateStrings; +import org.eclipse.linuxtools.lttng.core.state.evProcessor.AbsEventToHandlerResolver; +import org.eclipse.linuxtools.lttng.core.state.evProcessor.ILttngEventProcessor; +import org.eclipse.linuxtools.lttng.core.state.model.LttngTraceState; /** * Builds a Map from string event name to a processing handler object, the diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/resources/evProcessor/ResourcesFinishUpdateHandler.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/resources/evProcessor/ResourcesFinishUpdateHandler.java index 46ab86b3ab..3bcc934edc 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/resources/evProcessor/ResourcesFinishUpdateHandler.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/resources/evProcessor/ResourcesFinishUpdateHandler.java @@ -12,10 +12,10 @@ *******************************************************************************/ package org.eclipse.linuxtools.lttng.ui.views.resources.evProcessor; -import org.eclipse.linuxtools.lttng.event.LttngEvent; -import org.eclipse.linuxtools.lttng.state.StateStrings.Events; -import org.eclipse.linuxtools.lttng.state.evProcessor.ILttngEventProcessor; -import org.eclipse.linuxtools.lttng.state.model.LttngTraceState; +import org.eclipse.linuxtools.lttng.core.event.LttngEvent; +import org.eclipse.linuxtools.lttng.core.state.StateStrings.Events; +import org.eclipse.linuxtools.lttng.core.state.evProcessor.ILttngEventProcessor; +import org.eclipse.linuxtools.lttng.core.state.model.LttngTraceState; import org.eclipse.linuxtools.lttng.ui.TraceDebug; import org.eclipse.linuxtools.lttng.ui.model.trange.TimeRangeEventResource; diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/resources/model/ResourceContainer.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/resources/model/ResourceContainer.java index 7665fdd85a..d32700fbf3 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/resources/model/ResourceContainer.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/resources/model/ResourceContainer.java @@ -15,7 +15,7 @@ package org.eclipse.linuxtools.lttng.ui.views.resources.model; import java.util.HashMap; import java.util.Iterator; -import org.eclipse.linuxtools.lttng.TraceDebug; +import org.eclipse.linuxtools.lttng.core.TraceDebug; import org.eclipse.linuxtools.lttng.ui.model.trange.ItemContainer; import org.eclipse.linuxtools.lttng.ui.model.trange.TimeRangeEventResource; import org.eclipse.linuxtools.lttng.ui.model.trange.TimeRangeEventResource.ResourceTypes; diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/StatisticsView.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/StatisticsView.java index 0a6b6d0c0d..4ca1fef949 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/StatisticsView.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/StatisticsView.java @@ -27,12 +27,12 @@ import org.eclipse.jface.viewers.TreeViewer; import org.eclipse.jface.viewers.TreeViewerColumn; import org.eclipse.jface.viewers.Viewer; import org.eclipse.jface.viewers.ViewerComparator; -import org.eclipse.linuxtools.lttng.control.LttngCoreProviderFactory; -import org.eclipse.linuxtools.lttng.event.LttngEvent; -import org.eclipse.linuxtools.lttng.model.LTTngTreeNode; -import org.eclipse.linuxtools.lttng.request.ILttngSyntEventRequest; -import org.eclipse.linuxtools.lttng.state.evProcessor.AbsEventToHandlerResolver; -import org.eclipse.linuxtools.lttng.state.experiment.StateManagerFactory; +import org.eclipse.linuxtools.lttng.core.control.LttngCoreProviderFactory; +import org.eclipse.linuxtools.lttng.core.event.LttngEvent; +import org.eclipse.linuxtools.lttng.core.model.LTTngTreeNode; +import org.eclipse.linuxtools.lttng.core.request.ILttngSyntEventRequest; +import org.eclipse.linuxtools.lttng.core.state.evProcessor.AbsEventToHandlerResolver; +import org.eclipse.linuxtools.lttng.core.state.experiment.StateManagerFactory; import org.eclipse.linuxtools.lttng.ui.TraceDebug; import org.eclipse.linuxtools.lttng.ui.model.trange.ItemContainer; import org.eclipse.linuxtools.lttng.ui.views.common.AbsTimeUpdateView; @@ -41,14 +41,14 @@ import org.eclipse.linuxtools.lttng.ui.views.statistics.evProcessor.StatsTimeCou import org.eclipse.linuxtools.lttng.ui.views.statistics.model.KernelStatisticsData; import org.eclipse.linuxtools.lttng.ui.views.statistics.model.StatisticsTreeNode; import org.eclipse.linuxtools.lttng.ui.views.statistics.model.StatisticsTreeRootFactory; -import org.eclipse.linuxtools.tmf.event.TmfEvent; -import org.eclipse.linuxtools.tmf.event.TmfTimeRange; -import org.eclipse.linuxtools.tmf.experiment.TmfExperiment; -import org.eclipse.linuxtools.tmf.request.ITmfDataRequest.ExecutionType; -import org.eclipse.linuxtools.tmf.signal.TmfExperimentRangeUpdatedSignal; -import org.eclipse.linuxtools.tmf.signal.TmfExperimentSelectedSignal; -import org.eclipse.linuxtools.tmf.signal.TmfSignalHandler; -import org.eclipse.linuxtools.tmf.trace.ITmfTrace; +import org.eclipse.linuxtools.tmf.core.event.TmfEvent; +import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange; +import org.eclipse.linuxtools.tmf.core.experiment.TmfExperiment; +import org.eclipse.linuxtools.tmf.core.request.ITmfDataRequest.ExecutionType; +import org.eclipse.linuxtools.tmf.core.signal.TmfExperimentRangeUpdatedSignal; +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.ui.viewers.timeAnalysis.model.ITmfTimeAnalysisEntry; import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionAdapter; diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/evProcessor/AbstractStatsEventHandler.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/evProcessor/AbstractStatsEventHandler.java index 7aec59ac33..342b7f225b 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/evProcessor/AbstractStatsEventHandler.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/evProcessor/AbstractStatsEventHandler.java @@ -11,10 +11,10 @@ *******************************************************************************/ package org.eclipse.linuxtools.lttng.ui.views.statistics.evProcessor; -import org.eclipse.linuxtools.lttng.event.LttngEvent; -import org.eclipse.linuxtools.lttng.state.StateStrings.Events; -import org.eclipse.linuxtools.lttng.state.evProcessor.ILttngEventProcessor; -import org.eclipse.linuxtools.lttng.state.model.LttngTraceState; +import org.eclipse.linuxtools.lttng.core.event.LttngEvent; +import org.eclipse.linuxtools.lttng.core.state.StateStrings.Events; +import org.eclipse.linuxtools.lttng.core.state.evProcessor.ILttngEventProcessor; +import org.eclipse.linuxtools.lttng.core.state.model.LttngTraceState; import org.eclipse.linuxtools.lttng.ui.views.statistics.model.StatisticsData; import org.eclipse.linuxtools.lttng.ui.views.statistics.model.StatisticsTreeRootFactory; diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/evProcessor/StatsModeChangeHandler.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/evProcessor/StatsModeChangeHandler.java index 0e88e0a45d..79ce191ebb 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/evProcessor/StatsModeChangeHandler.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/evProcessor/StatsModeChangeHandler.java @@ -12,9 +12,9 @@ package org.eclipse.linuxtools.lttng.ui.views.statistics.evProcessor; -import org.eclipse.linuxtools.lttng.event.LttngEvent; -import org.eclipse.linuxtools.lttng.state.StateStrings.Events; -import org.eclipse.linuxtools.lttng.state.model.LttngTraceState; +import org.eclipse.linuxtools.lttng.core.event.LttngEvent; +import org.eclipse.linuxtools.lttng.core.state.StateStrings.Events; +import org.eclipse.linuxtools.lttng.core.state.model.LttngTraceState; import org.eclipse.linuxtools.lttng.ui.views.statistics.model.StatisticsData; class StatsModeChangeHandler extends AbstractStatsEventHandler { diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/evProcessor/StatsModeEndHandler.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/evProcessor/StatsModeEndHandler.java index 7cb5d035cb..4a5b2dc07c 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/evProcessor/StatsModeEndHandler.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/evProcessor/StatsModeEndHandler.java @@ -12,9 +12,9 @@ package org.eclipse.linuxtools.lttng.ui.views.statistics.evProcessor; -import org.eclipse.linuxtools.lttng.event.LttngEvent; -import org.eclipse.linuxtools.lttng.state.StateStrings.Events; -import org.eclipse.linuxtools.lttng.state.model.LttngTraceState; +import org.eclipse.linuxtools.lttng.core.event.LttngEvent; +import org.eclipse.linuxtools.lttng.core.state.StateStrings.Events; +import org.eclipse.linuxtools.lttng.core.state.model.LttngTraceState; import org.eclipse.linuxtools.lttng.ui.views.statistics.model.StatisticsData; class StatsModeEndHandler extends AbstractStatsEventHandler { diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/evProcessor/StatsProcessExitHandler.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/evProcessor/StatsProcessExitHandler.java index 15e51dbe23..5dc5f26e4f 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/evProcessor/StatsProcessExitHandler.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/evProcessor/StatsProcessExitHandler.java @@ -12,9 +12,9 @@ package org.eclipse.linuxtools.lttng.ui.views.statistics.evProcessor; -import org.eclipse.linuxtools.lttng.event.LttngEvent; -import org.eclipse.linuxtools.lttng.state.StateStrings.Events; -import org.eclipse.linuxtools.lttng.state.model.LttngTraceState; +import org.eclipse.linuxtools.lttng.core.event.LttngEvent; +import org.eclipse.linuxtools.lttng.core.state.StateStrings.Events; +import org.eclipse.linuxtools.lttng.core.state.model.LttngTraceState; import org.eclipse.linuxtools.lttng.ui.views.statistics.model.StatisticsData; /** diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/evProcessor/StatsTimeCountHandlerFactory.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/evProcessor/StatsTimeCountHandlerFactory.java index 06aea15aa8..f6a0c928e3 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/evProcessor/StatsTimeCountHandlerFactory.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/evProcessor/StatsTimeCountHandlerFactory.java @@ -16,9 +16,9 @@ package org.eclipse.linuxtools.lttng.ui.views.statistics.evProcessor; import java.util.HashMap; import java.util.Map; -import org.eclipse.linuxtools.lttng.state.StateStrings; -import org.eclipse.linuxtools.lttng.state.evProcessor.AbsEventToHandlerResolver; -import org.eclipse.linuxtools.lttng.state.evProcessor.ILttngEventProcessor; +import org.eclipse.linuxtools.lttng.core.state.StateStrings; +import org.eclipse.linuxtools.lttng.core.state.evProcessor.AbsEventToHandlerResolver; +import org.eclipse.linuxtools.lttng.core.state.evProcessor.ILttngEventProcessor; /** * Provide the handlers that will count the CPU Time, Cumulative CPU Time and diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/evProcessor/StatsTimeCountHandlers.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/evProcessor/StatsTimeCountHandlers.java index d1583b0f6f..109c8f7e31 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/evProcessor/StatsTimeCountHandlers.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/evProcessor/StatsTimeCountHandlers.java @@ -12,11 +12,11 @@ package org.eclipse.linuxtools.lttng.ui.views.statistics.evProcessor; -import org.eclipse.linuxtools.lttng.event.LttngEvent; -import org.eclipse.linuxtools.lttng.state.StateStrings; -import org.eclipse.linuxtools.lttng.state.StateStrings.Events; -import org.eclipse.linuxtools.lttng.state.evProcessor.ILttngEventProcessor; -import org.eclipse.linuxtools.lttng.state.model.LttngTraceState; +import org.eclipse.linuxtools.lttng.core.event.LttngEvent; +import org.eclipse.linuxtools.lttng.core.state.StateStrings; +import org.eclipse.linuxtools.lttng.core.state.StateStrings.Events; +import org.eclipse.linuxtools.lttng.core.state.evProcessor.ILttngEventProcessor; +import org.eclipse.linuxtools.lttng.core.state.model.LttngTraceState; /** * Process the system call entry event @@ -186,7 +186,7 @@ class StatsTimeCountHandlers { } /** *

Get the process exit handler

- *

Handles: {@link org.eclipse.linuxtools.lttng.state.StateStrings.Events#LTT_EVENT_PROCESS_EXIT}.

+ *

Handles: {@link org.eclipse.linuxtools.lttng.core.state.StateStrings.Events#LTT_EVENT_PROCESS_EXIT}.

* @return The handler. */ ILttngEventProcessor getProcessExitHandler() { diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/evProcessor/StatsTracesetEndHandler.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/evProcessor/StatsTracesetEndHandler.java index d301b9417b..658e7bdfc9 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/evProcessor/StatsTracesetEndHandler.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/evProcessor/StatsTracesetEndHandler.java @@ -12,8 +12,8 @@ package org.eclipse.linuxtools.lttng.ui.views.statistics.evProcessor; -import org.eclipse.linuxtools.lttng.event.LttngEvent; -import org.eclipse.linuxtools.lttng.state.model.LttngTraceState; +import org.eclipse.linuxtools.lttng.core.event.LttngEvent; +import org.eclipse.linuxtools.lttng.core.state.model.LttngTraceState; import org.eclipse.linuxtools.lttng.ui.views.statistics.model.StatisticsData; /** diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/model/KernelStatisticsData.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/model/KernelStatisticsData.java index 276eaceb20..79d18664d5 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/model/KernelStatisticsData.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/model/KernelStatisticsData.java @@ -19,13 +19,13 @@ import java.util.LinkedList; import java.util.Set; import java.util.Map; -import org.eclipse.linuxtools.lttng.LttngConstants; -import org.eclipse.linuxtools.lttng.event.LttngEvent; -import org.eclipse.linuxtools.lttng.state.StateStrings.Events; -import org.eclipse.linuxtools.lttng.state.StateStrings.ExecutionMode; -import org.eclipse.linuxtools.lttng.state.StateStrings.ProcessStatus; -import org.eclipse.linuxtools.lttng.state.model.LttngProcessState; -import org.eclipse.linuxtools.lttng.state.model.LttngTraceState; +import org.eclipse.linuxtools.lttng.core.LttngConstants; +import org.eclipse.linuxtools.lttng.core.event.LttngEvent; +import org.eclipse.linuxtools.lttng.core.state.StateStrings.Events; +import org.eclipse.linuxtools.lttng.core.state.StateStrings.ExecutionMode; +import org.eclipse.linuxtools.lttng.core.state.StateStrings.ProcessStatus; +import org.eclipse.linuxtools.lttng.core.state.model.LttngProcessState; +import org.eclipse.linuxtools.lttng.core.state.model.LttngTraceState; /** *

Class that process the LTTng kernel events.

diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/model/StatisticsData.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/model/StatisticsData.java index 7589782948..523aa583fa 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/model/StatisticsData.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/model/StatisticsData.java @@ -17,8 +17,8 @@ import java.util.HashMap; import java.util.Map; import java.util.Set; -import org.eclipse.linuxtools.lttng.event.LttngEvent; -import org.eclipse.linuxtools.lttng.state.model.LttngTraceState; +import org.eclipse.linuxtools.lttng.core.event.LttngEvent; +import org.eclipse.linuxtools.lttng.core.state.model.LttngTraceState; /** *

Base class for the statistics storage.

diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/timeframe/SpinnerGroup.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/timeframe/SpinnerGroup.java index a7fb535a56..50aef66712 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/timeframe/SpinnerGroup.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/timeframe/SpinnerGroup.java @@ -12,8 +12,8 @@ package org.eclipse.linuxtools.lttng.ui.views.timeframe; -import org.eclipse.linuxtools.tmf.event.TmfTimeRange; -import org.eclipse.linuxtools.tmf.event.TmfTimestamp; +import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange; +import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp; import org.eclipse.swt.SWT; import org.eclipse.swt.events.ModifyEvent; import org.eclipse.swt.events.ModifyListener; diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/timeframe/TimeFrameView.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/timeframe/TimeFrameView.java index ab59b1e08b..09b031c276 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/timeframe/TimeFrameView.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/timeframe/TimeFrameView.java @@ -12,15 +12,15 @@ package org.eclipse.linuxtools.lttng.ui.views.timeframe; -import org.eclipse.linuxtools.lttng.event.LttngEvent; -import org.eclipse.linuxtools.tmf.event.TmfTimeRange; -import org.eclipse.linuxtools.tmf.event.TmfTimestamp; -import org.eclipse.linuxtools.tmf.experiment.TmfExperiment; -import org.eclipse.linuxtools.tmf.signal.TmfExperimentSelectedSignal; -import org.eclipse.linuxtools.tmf.signal.TmfExperimentUpdatedSignal; -import org.eclipse.linuxtools.tmf.signal.TmfRangeSynchSignal; -import org.eclipse.linuxtools.tmf.signal.TmfSignalHandler; -import org.eclipse.linuxtools.tmf.signal.TmfTimeSynchSignal; +import org.eclipse.linuxtools.lttng.core.event.LttngEvent; +import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange; +import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp; +import org.eclipse.linuxtools.tmf.core.experiment.TmfExperiment; +import org.eclipse.linuxtools.tmf.core.signal.TmfExperimentSelectedSignal; +import org.eclipse.linuxtools.tmf.core.signal.TmfExperimentUpdatedSignal; +import org.eclipse.linuxtools.tmf.core.signal.TmfRangeSynchSignal; +import org.eclipse.linuxtools.tmf.core.signal.TmfSignalHandler; +import org.eclipse.linuxtools.tmf.core.signal.TmfTimeSynchSignal; import org.eclipse.linuxtools.tmf.ui.views.TmfView; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.GridData; diff --git a/org.eclipse.linuxtools.lttng.tests/.gitignore b/org.eclipse.linuxtools.lttng/.gitignore similarity index 100% rename from org.eclipse.linuxtools.lttng.tests/.gitignore rename to org.eclipse.linuxtools.lttng/.gitignore diff --git a/org.eclipse.linuxtools.lttng-feature/.project b/org.eclipse.linuxtools.lttng/.project similarity index 100% rename from org.eclipse.linuxtools.lttng-feature/.project rename to org.eclipse.linuxtools.lttng/.project diff --git a/org.eclipse.linuxtools.lttng-feature/build.properties b/org.eclipse.linuxtools.lttng/build.properties similarity index 100% rename from org.eclipse.linuxtools.lttng-feature/build.properties rename to org.eclipse.linuxtools.lttng/build.properties diff --git a/org.eclipse.linuxtools.lttng-feature/epl-v10.html b/org.eclipse.linuxtools.lttng/epl-v10.html similarity index 100% rename from org.eclipse.linuxtools.lttng-feature/epl-v10.html rename to org.eclipse.linuxtools.lttng/epl-v10.html diff --git a/org.eclipse.linuxtools.lttng-feature/feature.properties b/org.eclipse.linuxtools.lttng/feature.properties similarity index 100% rename from org.eclipse.linuxtools.lttng-feature/feature.properties rename to org.eclipse.linuxtools.lttng/feature.properties diff --git a/org.eclipse.linuxtools.lttng-feature/feature.xml b/org.eclipse.linuxtools.lttng/feature.xml similarity index 100% rename from org.eclipse.linuxtools.lttng-feature/feature.xml rename to org.eclipse.linuxtools.lttng/feature.xml diff --git a/org.eclipse.linuxtools.lttng-feature/license.html b/org.eclipse.linuxtools.lttng/license.html similarity index 100% rename from org.eclipse.linuxtools.lttng-feature/license.html rename to org.eclipse.linuxtools.lttng/license.html diff --git a/org.eclipse.linuxtools.lttng-feature/pom.xml b/org.eclipse.linuxtools.lttng/pom.xml similarity index 100% rename from org.eclipse.linuxtools.lttng-feature/pom.xml rename to org.eclipse.linuxtools.lttng/pom.xml diff --git a/org.eclipse.linuxtools.tmf-feature/.project b/org.eclipse.linuxtools.tmf-feature/.project deleted file mode 100644 index edaa96d626..0000000000 --- a/org.eclipse.linuxtools.tmf-feature/.project +++ /dev/null @@ -1,17 +0,0 @@ - - - org.eclipse.linuxtools.tmf - - - - - - org.eclipse.pde.FeatureBuilder - - - - - - org.eclipse.pde.FeatureNature - - diff --git a/org.eclipse.linuxtools.tmf-feature/ChangeLog b/org.eclipse.linuxtools.tmf-feature/ChangeLog deleted file mode 100644 index 592ef772d3..0000000000 --- a/org.eclipse.linuxtools.tmf-feature/ChangeLog +++ /dev/null @@ -1,7 +0,0 @@ -2011-06-02 Andrew Overholt - - * build.properties: Include license.html. - -2011-02-04 Jeff Johnston - - * feature.properties: Fix license to be consistent with other tools. \ No newline at end of file diff --git a/org.eclipse.linuxtools.tmf-feature/build.properties b/org.eclipse.linuxtools.tmf-feature/build.properties deleted file mode 100644 index 39b0777e50..0000000000 --- a/org.eclipse.linuxtools.tmf-feature/build.properties +++ /dev/null @@ -1,4 +0,0 @@ -bin.includes = feature.xml,\ - epl-v10.html,\ - feature.properties,\ - license.html diff --git a/org.eclipse.linuxtools.tmf.tests/.classpath b/org.eclipse.linuxtools.tmf.core.tests/.classpath similarity index 100% rename from org.eclipse.linuxtools.tmf.tests/.classpath rename to org.eclipse.linuxtools.tmf.core.tests/.classpath diff --git a/org.eclipse.linuxtools.tmf-feature/.gitignore b/org.eclipse.linuxtools.tmf.core.tests/.gitignore similarity index 100% rename from org.eclipse.linuxtools.tmf-feature/.gitignore rename to org.eclipse.linuxtools.tmf.core.tests/.gitignore diff --git a/org.eclipse.linuxtools.tmf.tests/.options b/org.eclipse.linuxtools.tmf.core.tests/.options similarity index 100% rename from org.eclipse.linuxtools.tmf.tests/.options rename to org.eclipse.linuxtools.tmf.core.tests/.options diff --git a/org.eclipse.linuxtools.tmf.tests/.project b/org.eclipse.linuxtools.tmf.core.tests/.project similarity index 100% rename from org.eclipse.linuxtools.tmf.tests/.project rename to org.eclipse.linuxtools.tmf.core.tests/.project diff --git a/org.eclipse.linuxtools.tmf.tests/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.linuxtools.tmf.core.tests/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from org.eclipse.linuxtools.tmf.tests/.settings/org.eclipse.jdt.core.prefs rename to org.eclipse.linuxtools.tmf.core.tests/.settings/org.eclipse.jdt.core.prefs diff --git a/org.eclipse.linuxtools.tmf.tests/ChangeLog b/org.eclipse.linuxtools.tmf.core.tests/ChangeLog similarity index 100% rename from org.eclipse.linuxtools.tmf.tests/ChangeLog rename to org.eclipse.linuxtools.tmf.core.tests/ChangeLog diff --git a/org.eclipse.linuxtools.tmf.tests/META-INF/MANIFEST.MF b/org.eclipse.linuxtools.tmf.core.tests/META-INF/MANIFEST.MF similarity index 74% rename from org.eclipse.linuxtools.tmf.tests/META-INF/MANIFEST.MF rename to org.eclipse.linuxtools.tmf.core.tests/META-INF/MANIFEST.MF index 40a47cb2ab..e87990eb49 100644 --- a/org.eclipse.linuxtools.tmf.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.linuxtools.tmf.core.tests/META-INF/MANIFEST.MF @@ -11,5 +11,5 @@ Require-Bundle: org.junit;bundle-version="3.8.2", org.eclipse.linuxtools.tmf.core;bundle-version="0.4.0" Bundle-Localization: plugin Bundle-ActivationPolicy: lazy -Bundle-Activator: org.eclipse.linuxtools.tmf.tests.TmfCoreTestPlugin -Export-Package: org.eclipse.linuxtools.tmf.trace;x-friends:="org.eclipse.linuxtools.tmf.ui.tests" +Bundle-Activator: org.eclipse.linuxtools.tmf.core.tests.TmfCoreTestPlugin +Export-Package: org.eclipse.linuxtools.tmf.stubs.trace;x-friends:="org.eclipse.linuxtools.tmf.ui.tests" diff --git a/org.eclipse.linuxtools.tmf.tests/build.properties b/org.eclipse.linuxtools.tmf.core.tests/build.properties similarity index 100% rename from org.eclipse.linuxtools.tmf.tests/build.properties rename to org.eclipse.linuxtools.tmf.core.tests/build.properties diff --git a/org.eclipse.linuxtools.tmf.tests/plugin.properties b/org.eclipse.linuxtools.tmf.core.tests/plugin.properties similarity index 100% rename from org.eclipse.linuxtools.tmf.tests/plugin.properties rename to org.eclipse.linuxtools.tmf.core.tests/plugin.properties diff --git a/org.eclipse.linuxtools.tmf.tests/pom.xml b/org.eclipse.linuxtools.tmf.core.tests/pom.xml similarity index 95% rename from org.eclipse.linuxtools.tmf.tests/pom.xml rename to org.eclipse.linuxtools.tmf.core.tests/pom.xml index f3438d6806..60530b8708 100644 --- a/org.eclipse.linuxtools.tmf.tests/pom.xml +++ b/org.eclipse.linuxtools.tmf.core.tests/pom.xml @@ -42,7 +42,7 @@ ${tycho-version} org.eclipse.linuxtools.tmf.core.tests - org.eclipse.linuxtools.tmf.tests.AllTmfCoreTests + org.eclipse.linuxtools.tmf.core.tests.AllTmfCoreTests false false org.eclipse.sdk.ide diff --git a/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/AllTmfCoreTests.java b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/AllTmfCoreTests.java similarity index 61% rename from org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/AllTmfCoreTests.java rename to org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/AllTmfCoreTests.java index c4ffe5569c..412c7942ec 100644 --- a/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/AllTmfCoreTests.java +++ b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/AllTmfCoreTests.java @@ -10,7 +10,7 @@ * Francois Chouinard - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.tmf.tests; +package org.eclipse.linuxtools.tmf.core.tests; import junit.framework.Test; import junit.framework.TestSuite; @@ -26,13 +26,13 @@ public class AllTmfCoreTests { TestSuite suite = new TestSuite(AllTmfCoreTests.class.getName()); //$JUnit-BEGIN$ suite.addTestSuite(TmfCorePluginTest.class); - suite.addTest(org.eclipse.linuxtools.tmf.tests.event.AllTests.suite()); - suite.addTest(org.eclipse.linuxtools.tmf.tests.request.AllTests.suite()); - suite.addTest(org.eclipse.linuxtools.tmf.tests.component.AllTests.suite()); - suite.addTest(org.eclipse.linuxtools.tmf.tests.trace.AllTests.suite()); - suite.addTest(org.eclipse.linuxtools.tmf.tests.experiment.AllTests.suite()); - suite.addTest(org.eclipse.linuxtools.tmf.tests.uml2sd.AllTests.suite()); - suite.addTest(org.eclipse.linuxtools.tmf.tests.util.AllTests.suite()); + suite.addTest(org.eclipse.linuxtools.tmf.core.tests.event.AllTests.suite()); + suite.addTest(org.eclipse.linuxtools.tmf.core.tests.request.AllTests.suite()); + suite.addTest(org.eclipse.linuxtools.tmf.core.tests.component.AllTests.suite()); + suite.addTest(org.eclipse.linuxtools.tmf.core.tests.trace.AllTests.suite()); + suite.addTest(org.eclipse.linuxtools.tmf.core.tests.experiment.AllTests.suite()); + suite.addTest(org.eclipse.linuxtools.tmf.core.tests.uml2sd.AllTests.suite()); + suite.addTest(org.eclipse.linuxtools.tmf.core.tests.util.AllTests.suite()); //$JUnit-END$ return suite; } diff --git a/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/TmfCorePluginTest.java b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/TmfCorePluginTest.java similarity index 94% rename from org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/TmfCorePluginTest.java rename to org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/TmfCorePluginTest.java index 068ae1ed3c..fe5e6337f8 100644 --- a/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/TmfCorePluginTest.java +++ b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/TmfCorePluginTest.java @@ -10,9 +10,9 @@ * Francois Chouinard - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.tmf.tests; +package org.eclipse.linuxtools.tmf.core.tests; -import org.eclipse.linuxtools.tmf.TmfCorePlugin; +import org.eclipse.linuxtools.tmf.core.TmfCorePlugin; import junit.framework.TestCase; diff --git a/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/TmfCoreTestPlugin.java b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/TmfCoreTestPlugin.java similarity index 96% rename from org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/TmfCoreTestPlugin.java rename to org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/TmfCoreTestPlugin.java index 316e7fc567..1461d9e6d5 100644 --- a/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/TmfCoreTestPlugin.java +++ b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/TmfCoreTestPlugin.java @@ -10,10 +10,10 @@ * Francois Chouinard - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.tmf.tests; +package org.eclipse.linuxtools.tmf.core.tests; import org.eclipse.core.runtime.Plugin; -import org.eclipse.linuxtools.tmf.Tracer; +import org.eclipse.linuxtools.tmf.core.Tracer; import org.osgi.framework.BundleContext; /** diff --git a/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/component/AllTests.java b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/component/AllTests.java similarity index 85% rename from org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/component/AllTests.java rename to org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/component/AllTests.java index 78a0532399..e14d8da389 100644 --- a/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/component/AllTests.java +++ b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/component/AllTests.java @@ -1,4 +1,4 @@ -package org.eclipse.linuxtools.tmf.tests.component; +package org.eclipse.linuxtools.tmf.core.tests.component; import junit.framework.Test; import junit.framework.TestSuite; diff --git a/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/component/TmfEventProviderTest.java b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/component/TmfEventProviderTest.java similarity index 94% rename from org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/component/TmfEventProviderTest.java rename to org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/component/TmfEventProviderTest.java index b4b3068c99..9f4402855a 100644 --- a/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/component/TmfEventProviderTest.java +++ b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/component/TmfEventProviderTest.java @@ -10,25 +10,25 @@ * Francois Chouinard - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.tmf.tests.component; +package org.eclipse.linuxtools.tmf.core.tests.component; import java.io.IOException; import java.util.Vector; import junit.framework.TestCase; -import org.eclipse.linuxtools.tmf.component.ITmfDataProvider; -import org.eclipse.linuxtools.tmf.component.TmfEventProviderStub; -import org.eclipse.linuxtools.tmf.component.TmfProviderManager; -import org.eclipse.linuxtools.tmf.component.TmfSyntheticEventProviderStub; -import org.eclipse.linuxtools.tmf.event.TmfEvent; -import org.eclipse.linuxtools.tmf.event.TmfSyntheticEventStub; -import org.eclipse.linuxtools.tmf.event.TmfTimeRange; -import org.eclipse.linuxtools.tmf.event.TmfTimestamp; -import org.eclipse.linuxtools.tmf.request.TmfEventRequest; -import org.eclipse.linuxtools.tmf.signal.TmfEndSynchSignal; -import org.eclipse.linuxtools.tmf.signal.TmfStartSynchSignal; -import org.eclipse.linuxtools.tmf.trace.TmfTraceStub; +import org.eclipse.linuxtools.tmf.core.component.ITmfDataProvider; +import org.eclipse.linuxtools.tmf.core.component.TmfProviderManager; +import org.eclipse.linuxtools.tmf.core.event.TmfEvent; +import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange; +import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp; +import org.eclipse.linuxtools.tmf.core.request.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; /** * TmfClientTest diff --git a/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/component/TmfProviderManagerTest.java b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/component/TmfProviderManagerTest.java similarity index 97% rename from org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/component/TmfProviderManagerTest.java rename to org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/component/TmfProviderManagerTest.java index 366816f775..1e6bb55a1c 100644 --- a/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/component/TmfProviderManagerTest.java +++ b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/component/TmfProviderManagerTest.java @@ -10,15 +10,15 @@ * Francois Chouinard - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.tmf.tests.component; +package org.eclipse.linuxtools.tmf.core.tests.component; import junit.framework.TestCase; -import org.eclipse.linuxtools.tmf.component.TmfDataProvider; -import org.eclipse.linuxtools.tmf.component.TmfProviderManager; -import org.eclipse.linuxtools.tmf.event.TmfEvent; -import org.eclipse.linuxtools.tmf.request.ITmfDataRequest; -import org.eclipse.linuxtools.tmf.trace.ITmfContext; +import org.eclipse.linuxtools.tmf.core.component.TmfDataProvider; +import org.eclipse.linuxtools.tmf.core.component.TmfProviderManager; +import org.eclipse.linuxtools.tmf.core.event.TmfEvent; +import org.eclipse.linuxtools.tmf.core.request.ITmfDataRequest; +import org.eclipse.linuxtools.tmf.core.trace.ITmfContext; /** * TmfProviderManagerTest diff --git a/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/event/AllTests.java b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/AllTests.java similarity index 87% rename from org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/event/AllTests.java rename to org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/AllTests.java index f046694f87..928149c1bd 100644 --- a/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/event/AllTests.java +++ b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/AllTests.java @@ -1,9 +1,9 @@ -package org.eclipse.linuxtools.tmf.tests.event; +package org.eclipse.linuxtools.tmf.core.tests.event; import junit.framework.Test; import junit.framework.TestSuite; -import org.eclipse.linuxtools.tmf.TmfCorePlugin; +import org.eclipse.linuxtools.tmf.core.TmfCorePlugin; @SuppressWarnings("nls") public class AllTests { diff --git a/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/event/TmfEventContentTest.java b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfEventContentTest.java similarity index 94% rename from org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/event/TmfEventContentTest.java rename to org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfEventContentTest.java index fbfbf6121c..f8d39933e2 100644 --- a/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/event/TmfEventContentTest.java +++ b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfEventContentTest.java @@ -10,19 +10,19 @@ * Francois Chouinard - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.tmf.tests.event; +package org.eclipse.linuxtools.tmf.core.tests.event; import junit.framework.TestCase; -import org.eclipse.linuxtools.tmf.event.TmfEvent; -import org.eclipse.linuxtools.tmf.event.TmfEventContent; -import org.eclipse.linuxtools.tmf.event.TmfEventContentStub; -import org.eclipse.linuxtools.tmf.event.TmfEventReference; -import org.eclipse.linuxtools.tmf.event.TmfEventSource; -import org.eclipse.linuxtools.tmf.event.TmfEventType; -import org.eclipse.linuxtools.tmf.event.TmfEventTypeStub; -import org.eclipse.linuxtools.tmf.event.TmfNoSuchFieldException; -import org.eclipse.linuxtools.tmf.event.TmfTimestamp; +import org.eclipse.linuxtools.tmf.core.event.TmfEvent; +import org.eclipse.linuxtools.tmf.core.event.TmfEventContent; +import org.eclipse.linuxtools.tmf.core.event.TmfEventReference; +import org.eclipse.linuxtools.tmf.core.event.TmfEventSource; +import org.eclipse.linuxtools.tmf.core.event.TmfEventType; +import org.eclipse.linuxtools.tmf.core.event.TmfNoSuchFieldException; +import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp; +import org.eclipse.linuxtools.tmf.stubs.event.TmfEventContentStub; +import org.eclipse.linuxtools.tmf.stubs.event.TmfEventTypeStub; /** * TmfEventContentTest diff --git a/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/event/TmfEventFieldTest.java b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfEventFieldTest.java similarity index 92% rename from org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/event/TmfEventFieldTest.java rename to org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfEventFieldTest.java index 8db604588e..b746475743 100644 --- a/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/event/TmfEventFieldTest.java +++ b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfEventFieldTest.java @@ -10,18 +10,18 @@ * Francois Chouinard - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.tmf.tests.event; +package org.eclipse.linuxtools.tmf.core.tests.event; import junit.framework.TestCase; -import org.eclipse.linuxtools.tmf.event.TmfEvent; -import org.eclipse.linuxtools.tmf.event.TmfEventContent; -import org.eclipse.linuxtools.tmf.event.TmfEventField; -import org.eclipse.linuxtools.tmf.event.TmfEventReference; -import org.eclipse.linuxtools.tmf.event.TmfEventSource; -import org.eclipse.linuxtools.tmf.event.TmfEventType; -import org.eclipse.linuxtools.tmf.event.TmfEventTypeStub; -import org.eclipse.linuxtools.tmf.event.TmfTimestamp; +import org.eclipse.linuxtools.tmf.core.event.TmfEvent; +import org.eclipse.linuxtools.tmf.core.event.TmfEventContent; +import org.eclipse.linuxtools.tmf.core.event.TmfEventField; +import org.eclipse.linuxtools.tmf.core.event.TmfEventReference; +import org.eclipse.linuxtools.tmf.core.event.TmfEventSource; +import org.eclipse.linuxtools.tmf.core.event.TmfEventType; +import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp; +import org.eclipse.linuxtools.tmf.stubs.event.TmfEventTypeStub; /** * TmfEventFieldTest diff --git a/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/event/TmfEventReferenceTest.java b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfEventReferenceTest.java similarity index 97% rename from org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/event/TmfEventReferenceTest.java rename to org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfEventReferenceTest.java index 1f350b6d04..ba25db2e73 100644 --- a/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/event/TmfEventReferenceTest.java +++ b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfEventReferenceTest.java @@ -10,11 +10,11 @@ * Francois Chouinard - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.tmf.tests.event; +package org.eclipse.linuxtools.tmf.core.tests.event; import junit.framework.TestCase; -import org.eclipse.linuxtools.tmf.event.TmfEventReference; +import org.eclipse.linuxtools.tmf.core.event.TmfEventReference; /** * TmfEventReferenceTest diff --git a/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/event/TmfEventSourceTest.java b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfEventSourceTest.java similarity index 97% rename from org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/event/TmfEventSourceTest.java rename to org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfEventSourceTest.java index e2b7a6ec1b..341e2b9e77 100644 --- a/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/event/TmfEventSourceTest.java +++ b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfEventSourceTest.java @@ -10,11 +10,11 @@ * Francois Chouinard - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.tmf.tests.event; +package org.eclipse.linuxtools.tmf.core.tests.event; import junit.framework.TestCase; -import org.eclipse.linuxtools.tmf.event.TmfEventSource; +import org.eclipse.linuxtools.tmf.core.event.TmfEventSource; /** * TmfEventSourceTest diff --git a/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/event/TmfEventTest.java b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfEventTest.java similarity index 94% rename from org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/event/TmfEventTest.java rename to org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfEventTest.java index 7691ba0806..ec55b14bf9 100644 --- a/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/event/TmfEventTest.java +++ b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfEventTest.java @@ -10,16 +10,16 @@ * Francois Chouinard - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.tmf.tests.event; +package org.eclipse.linuxtools.tmf.core.tests.event; import junit.framework.TestCase; -import org.eclipse.linuxtools.tmf.event.TmfEvent; -import org.eclipse.linuxtools.tmf.event.TmfEventContent; -import org.eclipse.linuxtools.tmf.event.TmfEventReference; -import org.eclipse.linuxtools.tmf.event.TmfEventSource; -import org.eclipse.linuxtools.tmf.event.TmfEventType; -import org.eclipse.linuxtools.tmf.event.TmfTimestamp; +import org.eclipse.linuxtools.tmf.core.event.TmfEvent; +import org.eclipse.linuxtools.tmf.core.event.TmfEventContent; +import org.eclipse.linuxtools.tmf.core.event.TmfEventReference; +import org.eclipse.linuxtools.tmf.core.event.TmfEventSource; +import org.eclipse.linuxtools.tmf.core.event.TmfEventType; +import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp; /** * TmfEventTest diff --git a/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/event/TmfEventTypeTest.java b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfEventTypeTest.java similarity index 97% rename from org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/event/TmfEventTypeTest.java rename to org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfEventTypeTest.java index 355e1ca764..4715551c12 100644 --- a/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/event/TmfEventTypeTest.java +++ b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfEventTypeTest.java @@ -10,12 +10,12 @@ * Francois Chouinard - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.tmf.tests.event; +package org.eclipse.linuxtools.tmf.core.tests.event; import junit.framework.TestCase; -import org.eclipse.linuxtools.tmf.event.TmfEventType; -import org.eclipse.linuxtools.tmf.event.TmfNoSuchFieldException; +import org.eclipse.linuxtools.tmf.core.event.TmfEventType; +import org.eclipse.linuxtools.tmf.core.event.TmfNoSuchFieldException; /** * TmfEventTypeTest diff --git a/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/event/TmfTimeRangeTest.java b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfTimeRangeTest.java similarity index 98% rename from org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/event/TmfTimeRangeTest.java rename to org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfTimeRangeTest.java index 1bf85eb819..283894a2db 100644 --- a/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/event/TmfTimeRangeTest.java +++ b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfTimeRangeTest.java @@ -10,10 +10,10 @@ * Francois Chouinard - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.tmf.tests.event; +package org.eclipse.linuxtools.tmf.core.tests.event; -import org.eclipse.linuxtools.tmf.event.TmfTimeRange; -import org.eclipse.linuxtools.tmf.event.TmfTimestamp; +import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange; +import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp; import junit.framework.TestCase; diff --git a/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/event/TmfTimestampTest.java b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfTimestampTest.java similarity index 99% rename from org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/event/TmfTimestampTest.java rename to org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfTimestampTest.java index f3b7503634..5f7d6307b4 100644 --- a/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/event/TmfTimestampTest.java +++ b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfTimestampTest.java @@ -10,11 +10,11 @@ * Francois Chouinard - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.tmf.tests.event; +package org.eclipse.linuxtools.tmf.core.tests.event; import junit.framework.TestCase; -import org.eclipse.linuxtools.tmf.event.TmfTimestamp; +import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp; /** * TmfTimestampTest diff --git a/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/event/TmfTraceEventTest.java b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfTraceEventTest.java similarity index 92% rename from org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/event/TmfTraceEventTest.java rename to org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfTraceEventTest.java index 6b3fd2177b..c34f56c031 100644 --- a/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/event/TmfTraceEventTest.java +++ b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfTraceEventTest.java @@ -10,14 +10,14 @@ * Francois Chouinard - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.tmf.tests.event; - -import org.eclipse.linuxtools.tmf.event.TmfEventContent; -import org.eclipse.linuxtools.tmf.event.TmfEventReference; -import org.eclipse.linuxtools.tmf.event.TmfEventSource; -import org.eclipse.linuxtools.tmf.event.TmfEventType; -import org.eclipse.linuxtools.tmf.event.TmfTimestamp; -import org.eclipse.linuxtools.tmf.event.TmfTraceEvent; +package org.eclipse.linuxtools.tmf.core.tests.event; + +import org.eclipse.linuxtools.tmf.core.event.TmfEventContent; +import org.eclipse.linuxtools.tmf.core.event.TmfEventReference; +import org.eclipse.linuxtools.tmf.core.event.TmfEventSource; +import org.eclipse.linuxtools.tmf.core.event.TmfEventType; +import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp; +import org.eclipse.linuxtools.tmf.core.event.TmfTraceEvent; import junit.framework.TestCase; diff --git a/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/experiment/AllTests.java b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/experiment/AllTests.java similarity index 78% rename from org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/experiment/AllTests.java rename to org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/experiment/AllTests.java index 8f706c2de1..cf146400ba 100644 --- a/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/experiment/AllTests.java +++ b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/experiment/AllTests.java @@ -1,9 +1,9 @@ -package org.eclipse.linuxtools.tmf.tests.experiment; +package org.eclipse.linuxtools.tmf.core.tests.experiment; import junit.framework.Test; import junit.framework.TestSuite; -import org.eclipse.linuxtools.tmf.TmfCorePlugin; +import org.eclipse.linuxtools.tmf.core.TmfCorePlugin; @SuppressWarnings("nls") public class AllTests { diff --git a/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/experiment/TmfExperimentTest.java b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/experiment/TmfExperimentTest.java similarity index 97% rename from org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/experiment/TmfExperimentTest.java rename to org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/experiment/TmfExperimentTest.java index 0ece3d3aa2..4bad45758b 100644 --- a/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/experiment/TmfExperimentTest.java +++ b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/experiment/TmfExperimentTest.java @@ -10,7 +10,7 @@ * Francois Chouinard - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.tmf.tests.experiment; +package org.eclipse.linuxtools.tmf.core.tests.experiment; import java.io.File; import java.io.IOException; @@ -22,18 +22,18 @@ import junit.framework.TestCase; import org.eclipse.core.runtime.FileLocator; import org.eclipse.core.runtime.Path; -import org.eclipse.linuxtools.tmf.event.TmfEvent; -import org.eclipse.linuxtools.tmf.event.TmfTimeRange; -import org.eclipse.linuxtools.tmf.event.TmfTimestamp; -import org.eclipse.linuxtools.tmf.experiment.TmfExperiment; -import org.eclipse.linuxtools.tmf.experiment.TmfExperimentContext; -import org.eclipse.linuxtools.tmf.request.TmfEventRequest; -import org.eclipse.linuxtools.tmf.tests.TmfCoreTestPlugin; -import org.eclipse.linuxtools.tmf.trace.ITmfContext; -import org.eclipse.linuxtools.tmf.trace.ITmfTrace; -import org.eclipse.linuxtools.tmf.trace.TmfCheckpoint; -import org.eclipse.linuxtools.tmf.trace.TmfContext; -import org.eclipse.linuxtools.tmf.trace.TmfTraceStub; +import org.eclipse.linuxtools.tmf.core.event.TmfEvent; +import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange; +import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp; +import org.eclipse.linuxtools.tmf.core.experiment.TmfExperiment; +import org.eclipse.linuxtools.tmf.core.experiment.TmfExperimentContext; +import org.eclipse.linuxtools.tmf.core.request.TmfEventRequest; +import org.eclipse.linuxtools.tmf.core.tests.TmfCoreTestPlugin; +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; /** * TmfExperimentTest diff --git a/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/experiment/TmfMultiTraceExperimentTest.java b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/experiment/TmfMultiTraceExperimentTest.java similarity index 97% rename from org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/experiment/TmfMultiTraceExperimentTest.java rename to org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/experiment/TmfMultiTraceExperimentTest.java index 98d8fb9788..66acdca0a0 100644 --- a/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/experiment/TmfMultiTraceExperimentTest.java +++ b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/experiment/TmfMultiTraceExperimentTest.java @@ -10,7 +10,7 @@ * Francois Chouinard - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.tmf.tests.experiment; +package org.eclipse.linuxtools.tmf.core.tests.experiment; import java.io.File; import java.io.IOException; @@ -22,18 +22,18 @@ import junit.framework.TestCase; import org.eclipse.core.runtime.FileLocator; import org.eclipse.core.runtime.Path; -import org.eclipse.linuxtools.tmf.event.TmfEvent; -import org.eclipse.linuxtools.tmf.event.TmfTimeRange; -import org.eclipse.linuxtools.tmf.event.TmfTimestamp; -import org.eclipse.linuxtools.tmf.experiment.TmfExperiment; -import org.eclipse.linuxtools.tmf.experiment.TmfExperimentContext; -import org.eclipse.linuxtools.tmf.request.TmfEventRequest; -import org.eclipse.linuxtools.tmf.tests.TmfCoreTestPlugin; -import org.eclipse.linuxtools.tmf.trace.ITmfContext; -import org.eclipse.linuxtools.tmf.trace.ITmfTrace; -import org.eclipse.linuxtools.tmf.trace.TmfCheckpoint; -import org.eclipse.linuxtools.tmf.trace.TmfContext; -import org.eclipse.linuxtools.tmf.trace.TmfTraceStub; +import org.eclipse.linuxtools.tmf.core.event.TmfEvent; +import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange; +import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp; +import org.eclipse.linuxtools.tmf.core.experiment.TmfExperiment; +import org.eclipse.linuxtools.tmf.core.experiment.TmfExperimentContext; +import org.eclipse.linuxtools.tmf.core.request.TmfEventRequest; +import org.eclipse.linuxtools.tmf.core.tests.TmfCoreTestPlugin; +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; /** * TmfExperimentTest diff --git a/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/request/AllTests.java b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/request/AllTests.java similarity index 84% rename from org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/request/AllTests.java rename to org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/request/AllTests.java index 8fe1686ecb..5e25ec4792 100644 --- a/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/request/AllTests.java +++ b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/request/AllTests.java @@ -1,9 +1,9 @@ -package org.eclipse.linuxtools.tmf.tests.request; +package org.eclipse.linuxtools.tmf.core.tests.request; import junit.framework.Test; import junit.framework.TestSuite; -import org.eclipse.linuxtools.tmf.TmfCorePlugin; +import org.eclipse.linuxtools.tmf.core.TmfCorePlugin; @SuppressWarnings("nls") public class AllTests { diff --git a/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/request/TmfCoalescedDataRequestTest.java b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/request/TmfCoalescedDataRequestTest.java similarity index 98% rename from org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/request/TmfCoalescedDataRequestTest.java rename to org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/request/TmfCoalescedDataRequestTest.java index db023abe07..908b1128d8 100644 --- a/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/request/TmfCoalescedDataRequestTest.java +++ b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/request/TmfCoalescedDataRequestTest.java @@ -10,15 +10,15 @@ * Francois Chouinard - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.tmf.tests.request; +package org.eclipse.linuxtools.tmf.core.tests.request; import junit.framework.TestCase; -import org.eclipse.linuxtools.tmf.event.TmfEvent; -import org.eclipse.linuxtools.tmf.request.TmfCoalescedDataRequest; -import org.eclipse.linuxtools.tmf.request.TmfDataRequest; -import org.eclipse.linuxtools.tmf.request.TmfDataRequestStub; +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; /** * TmfCoalescedDataRequestTest diff --git a/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/request/TmfCoalescedEventRequestTest.java b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/request/TmfCoalescedEventRequestTest.java similarity index 95% rename from org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/request/TmfCoalescedEventRequestTest.java rename to org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/request/TmfCoalescedEventRequestTest.java index d97af006f0..7b7bea6c5b 100644 --- a/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/request/TmfCoalescedEventRequestTest.java +++ b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/request/TmfCoalescedEventRequestTest.java @@ -10,7 +10,7 @@ * Francois Chouinard - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.tmf.tests.request; +package org.eclipse.linuxtools.tmf.core.tests.request; import java.io.File; import java.io.IOException; @@ -22,20 +22,20 @@ import junit.framework.TestCase; import org.eclipse.core.runtime.FileLocator; import org.eclipse.core.runtime.Path; -import org.eclipse.linuxtools.tmf.component.ITmfDataProvider; -import org.eclipse.linuxtools.tmf.component.TmfProviderManager; -import org.eclipse.linuxtools.tmf.event.TmfEvent; -import org.eclipse.linuxtools.tmf.event.TmfTimeRange; -import org.eclipse.linuxtools.tmf.event.TmfTimestamp; -import org.eclipse.linuxtools.tmf.request.TmfCoalescedDataRequest; -import org.eclipse.linuxtools.tmf.request.TmfCoalescedEventRequest; -import org.eclipse.linuxtools.tmf.request.TmfEventRequest; -import org.eclipse.linuxtools.tmf.request.TmfEventRequestStub; -import org.eclipse.linuxtools.tmf.signal.TmfSignal; -import org.eclipse.linuxtools.tmf.signal.TmfSignalHandler; -import org.eclipse.linuxtools.tmf.signal.TmfSignalManager; -import org.eclipse.linuxtools.tmf.tests.TmfCoreTestPlugin; -import org.eclipse.linuxtools.tmf.trace.TmfTraceStub; +import org.eclipse.linuxtools.tmf.core.component.ITmfDataProvider; +import org.eclipse.linuxtools.tmf.core.component.TmfProviderManager; +import org.eclipse.linuxtools.tmf.core.event.TmfEvent; +import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange; +import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp; +import org.eclipse.linuxtools.tmf.core.request.TmfCoalescedDataRequest; +import org.eclipse.linuxtools.tmf.core.request.TmfCoalescedEventRequest; +import org.eclipse.linuxtools.tmf.core.request.TmfEventRequest; +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; /** * TmfCoalescedEventRequestTest diff --git a/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/request/TmfDataRequestTest.java b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/request/TmfDataRequestTest.java similarity index 97% rename from org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/request/TmfDataRequestTest.java rename to org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/request/TmfDataRequestTest.java index 9f879da557..fd3727a649 100644 --- a/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/request/TmfDataRequestTest.java +++ b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/request/TmfDataRequestTest.java @@ -10,13 +10,13 @@ * Francois Chouinard - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.tmf.tests.request; +package org.eclipse.linuxtools.tmf.core.tests.request; import junit.framework.TestCase; -import org.eclipse.linuxtools.tmf.event.TmfEvent; -import org.eclipse.linuxtools.tmf.request.TmfDataRequest; -import org.eclipse.linuxtools.tmf.request.TmfDataRequestStub; +import org.eclipse.linuxtools.tmf.core.event.TmfEvent; +import org.eclipse.linuxtools.tmf.core.request.TmfDataRequest; +import org.eclipse.linuxtools.tmf.stubs.request.TmfDataRequestStub; /** * TmfDataRequestTest diff --git a/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/request/TmfEventRequestTest.java b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/request/TmfEventRequestTest.java similarity index 96% rename from org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/request/TmfEventRequestTest.java rename to org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/request/TmfEventRequestTest.java index ec6170169c..3a00d9c5bd 100644 --- a/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/request/TmfEventRequestTest.java +++ b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/request/TmfEventRequestTest.java @@ -10,16 +10,16 @@ * Francois Chouinard - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.tmf.tests.request; +package org.eclipse.linuxtools.tmf.core.tests.request; import junit.framework.TestCase; -import org.eclipse.linuxtools.tmf.event.TmfEvent; -import org.eclipse.linuxtools.tmf.event.TmfTimeRange; -import org.eclipse.linuxtools.tmf.event.TmfTimestamp; -import org.eclipse.linuxtools.tmf.request.TmfDataRequest; -import org.eclipse.linuxtools.tmf.request.TmfEventRequest; -import org.eclipse.linuxtools.tmf.request.TmfEventRequestStub; +import org.eclipse.linuxtools.tmf.core.event.TmfEvent; +import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange; +import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp; +import org.eclipse.linuxtools.tmf.core.request.TmfDataRequest; +import org.eclipse.linuxtools.tmf.core.request.TmfEventRequest; +import org.eclipse.linuxtools.tmf.stubs.request.TmfEventRequestStub; /** * TmfEventRequestTest diff --git a/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/request/TmfRequestExecutorTest.java b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/request/TmfRequestExecutorTest.java similarity index 83% rename from org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/request/TmfRequestExecutorTest.java rename to org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/request/TmfRequestExecutorTest.java index d490435d41..59949487ea 100644 --- a/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/request/TmfRequestExecutorTest.java +++ b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/request/TmfRequestExecutorTest.java @@ -10,13 +10,13 @@ * Francois Chouinard - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.tmf.tests.request; +package org.eclipse.linuxtools.tmf.core.tests.request; import java.util.concurrent.Executors; import junit.framework.TestCase; -import org.eclipse.linuxtools.tmf.request.TmfRequestExecutor; +import org.eclipse.linuxtools.tmf.core.request.TmfRequestExecutor; /** * TmfRequestExecutorTest @@ -56,7 +56,7 @@ public class TmfRequestExecutorTest extends TestCase { // ------------------------------------------------------------------------ /** - * Test method for {@link org.eclipse.linuxtools.tmf.request.TmfRequestExecutor#TmfRequestExecutor()}. + * Test method for {@link org.eclipse.linuxtools.tmf.core.request.TmfRequestExecutor#TmfRequestExecutor()}. */ public void testTmfRequestExecutor() { TmfRequestExecutor executor = new TmfRequestExecutor(); @@ -66,7 +66,7 @@ public class TmfRequestExecutorTest extends TestCase { } /** - * Test method for {@link org.eclipse.linuxtools.tmf.request.TmfRequestExecutor#TmfRequestExecutor(java.util.concurrent.ExecutorService)}. + * Test method for {@link org.eclipse.linuxtools.tmf.core.request.TmfRequestExecutor#TmfRequestExecutor(java.util.concurrent.ExecutorService)}. */ public void testTmfRequestExecutorExecutorService() { TmfRequestExecutor executor = new TmfRequestExecutor(Executors.newCachedThreadPool()); @@ -76,7 +76,7 @@ public class TmfRequestExecutorTest extends TestCase { } /** - * Test method for {@link org.eclipse.linuxtools.tmf.request.TmfRequestExecutor#stop()}. + * Test method for {@link org.eclipse.linuxtools.tmf.core.request.TmfRequestExecutor#stop()}. */ public void testStop() { TmfRequestExecutor executor = new TmfRequestExecutor(); @@ -91,7 +91,7 @@ public class TmfRequestExecutorTest extends TestCase { // ------------------------------------------------------------------------ /** - * Test method for {@link org.eclipse.linuxtools.tmf.request.TmfRequestExecutor#execute(java.lang.Runnable)}. + * Test method for {@link org.eclipse.linuxtools.tmf.core.request.TmfRequestExecutor#execute(java.lang.Runnable)}. */ public void testExecute() { // fail("Not yet implemented"); @@ -102,7 +102,7 @@ public class TmfRequestExecutorTest extends TestCase { // ------------------------------------------------------------------------ /** - * Test method for {@link org.eclipse.linuxtools.tmf.request.TmfRequestExecutor#toString()}. + * Test method for {@link org.eclipse.linuxtools.tmf.core.request.TmfRequestExecutor#toString()}. */ public void testToString() { // TmfRequestExecutor executor1 = new TmfRequestExecutor(); diff --git a/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/trace/AllTests.java b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/AllTests.java similarity index 81% rename from org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/trace/AllTests.java rename to org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/AllTests.java index 570f4cecc5..c046cbcb32 100644 --- a/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/trace/AllTests.java +++ b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/AllTests.java @@ -1,9 +1,9 @@ -package org.eclipse.linuxtools.tmf.tests.trace; +package org.eclipse.linuxtools.tmf.core.tests.trace; import junit.framework.Test; import junit.framework.TestSuite; -import org.eclipse.linuxtools.tmf.TmfCorePlugin; +import org.eclipse.linuxtools.tmf.core.TmfCorePlugin; @SuppressWarnings("nls") public class AllTests { diff --git a/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/trace/TmfCheckpointTest.java b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/TmfCheckpointTest.java similarity index 96% rename from org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/trace/TmfCheckpointTest.java rename to org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/TmfCheckpointTest.java index 5865a257b9..31eaf26421 100644 --- a/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/trace/TmfCheckpointTest.java +++ b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/TmfCheckpointTest.java @@ -10,13 +10,13 @@ * Francois Chouinard - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.tmf.tests.trace; +package org.eclipse.linuxtools.tmf.core.tests.trace; import junit.framework.TestCase; -import org.eclipse.linuxtools.tmf.event.TmfTimestamp; -import org.eclipse.linuxtools.tmf.trace.TmfCheckpoint; -import org.eclipse.linuxtools.tmf.trace.TmfLocation; +import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp; +import org.eclipse.linuxtools.tmf.core.trace.TmfCheckpoint; +import org.eclipse.linuxtools.tmf.core.trace.TmfLocation; /** * TmfCheckpointTest diff --git a/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/trace/TmfContextTest.java b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/TmfContextTest.java similarity index 97% rename from org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/trace/TmfContextTest.java rename to org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/TmfContextTest.java index 50bdc47d4c..3f6e2620ba 100644 --- a/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/trace/TmfContextTest.java +++ b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/TmfContextTest.java @@ -10,13 +10,13 @@ * Francois Chouinard - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.tmf.tests.trace; +package org.eclipse.linuxtools.tmf.core.tests.trace; import junit.framework.TestCase; -import org.eclipse.linuxtools.tmf.event.TmfTimestamp; -import org.eclipse.linuxtools.tmf.trace.TmfContext; -import org.eclipse.linuxtools.tmf.trace.TmfLocation; +import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp; +import org.eclipse.linuxtools.tmf.core.trace.TmfContext; +import org.eclipse.linuxtools.tmf.core.trace.TmfLocation; /** * TmfContextTest diff --git a/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/trace/TmfExperimentTest.java b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/TmfExperimentTest.java similarity index 97% rename from org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/trace/TmfExperimentTest.java rename to org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/TmfExperimentTest.java index 6ec86ce343..a764ead99f 100644 --- a/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/trace/TmfExperimentTest.java +++ b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/TmfExperimentTest.java @@ -10,7 +10,7 @@ * Francois Chouinard - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.tmf.tests.trace; +package org.eclipse.linuxtools.tmf.core.tests.trace; import java.io.File; import java.io.IOException; @@ -22,17 +22,17 @@ import junit.framework.TestCase; import org.eclipse.core.runtime.FileLocator; import org.eclipse.core.runtime.Path; -import org.eclipse.linuxtools.tmf.event.TmfEvent; -import org.eclipse.linuxtools.tmf.event.TmfTimeRange; -import org.eclipse.linuxtools.tmf.event.TmfTimestamp; -import org.eclipse.linuxtools.tmf.experiment.TmfExperiment; -import org.eclipse.linuxtools.tmf.experiment.TmfExperimentContext; -import org.eclipse.linuxtools.tmf.request.TmfEventRequest; -import org.eclipse.linuxtools.tmf.tests.TmfCoreTestPlugin; -import org.eclipse.linuxtools.tmf.trace.ITmfTrace; -import org.eclipse.linuxtools.tmf.trace.TmfCheckpoint; -import org.eclipse.linuxtools.tmf.trace.TmfContext; -import org.eclipse.linuxtools.tmf.trace.TmfTraceStub; +import org.eclipse.linuxtools.tmf.core.event.TmfEvent; +import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange; +import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp; +import org.eclipse.linuxtools.tmf.core.experiment.TmfExperiment; +import org.eclipse.linuxtools.tmf.core.experiment.TmfExperimentContext; +import org.eclipse.linuxtools.tmf.core.request.TmfEventRequest; +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; /** * TmfExperimentTest diff --git a/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/trace/TmfLocationTest.java b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/TmfLocationTest.java similarity index 98% rename from org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/trace/TmfLocationTest.java rename to org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/TmfLocationTest.java index d811ace6e7..ccc57b1f74 100644 --- a/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/trace/TmfLocationTest.java +++ b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/TmfLocationTest.java @@ -10,12 +10,12 @@ * Francois Chouinard - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.tmf.tests.trace; +package org.eclipse.linuxtools.tmf.core.tests.trace; import junit.framework.TestCase; -import org.eclipse.linuxtools.tmf.event.TmfTimestamp; -import org.eclipse.linuxtools.tmf.trace.TmfLocation; +import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp; +import org.eclipse.linuxtools.tmf.core.trace.TmfLocation; /** * TmfLocationTest diff --git a/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/trace/TmfTraceTest.java b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/TmfTraceTest.java similarity index 97% rename from org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/trace/TmfTraceTest.java rename to org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/TmfTraceTest.java index 2bc01e5235..222fdf981b 100644 --- a/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/trace/TmfTraceTest.java +++ b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/TmfTraceTest.java @@ -10,7 +10,7 @@ * Francois Chouinard - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.tmf.tests.trace; +package org.eclipse.linuxtools.tmf.core.tests.trace; import java.io.File; import java.io.IOException; @@ -22,18 +22,18 @@ import junit.framework.TestCase; import org.eclipse.core.runtime.FileLocator; import org.eclipse.core.runtime.Path; -import org.eclipse.linuxtools.tmf.component.ITmfDataProvider; -import org.eclipse.linuxtools.tmf.component.TmfProviderManager; -import org.eclipse.linuxtools.tmf.event.TmfEvent; -import org.eclipse.linuxtools.tmf.event.TmfTimeRange; -import org.eclipse.linuxtools.tmf.event.TmfTimestamp; -import org.eclipse.linuxtools.tmf.request.TmfEventRequest; -import org.eclipse.linuxtools.tmf.tests.TmfCoreTestPlugin; -import org.eclipse.linuxtools.tmf.trace.ITmfContext; -import org.eclipse.linuxtools.tmf.trace.TmfCheckpoint; -import org.eclipse.linuxtools.tmf.trace.TmfContext; -import org.eclipse.linuxtools.tmf.trace.TmfTrace; -import org.eclipse.linuxtools.tmf.trace.TmfTraceStub; +import org.eclipse.linuxtools.tmf.core.component.ITmfDataProvider; +import org.eclipse.linuxtools.tmf.core.component.TmfProviderManager; +import org.eclipse.linuxtools.tmf.core.event.TmfEvent; +import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange; +import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp; +import org.eclipse.linuxtools.tmf.core.request.TmfEventRequest; +import org.eclipse.linuxtools.tmf.core.tests.TmfCoreTestPlugin; +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; /** * TmfTraceTest diff --git a/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/uml2sd/AllTests.java b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/uml2sd/AllTests.java similarity index 79% rename from org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/uml2sd/AllTests.java rename to org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/uml2sd/AllTests.java index dd62f3d684..638452450c 100644 --- a/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/uml2sd/AllTests.java +++ b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/uml2sd/AllTests.java @@ -1,9 +1,9 @@ -package org.eclipse.linuxtools.tmf.tests.uml2sd; +package org.eclipse.linuxtools.tmf.core.tests.uml2sd; import junit.framework.Test; import junit.framework.TestSuite; -import org.eclipse.linuxtools.tmf.TmfCorePlugin; +import org.eclipse.linuxtools.tmf.core.TmfCorePlugin; @SuppressWarnings("nls") public class AllTests { diff --git a/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/uml2sd/TmfAsyncSequenceDiagramEventTest.java b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/uml2sd/TmfAsyncSequenceDiagramEventTest.java similarity index 90% rename from org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/uml2sd/TmfAsyncSequenceDiagramEventTest.java rename to org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/uml2sd/TmfAsyncSequenceDiagramEventTest.java index 2293130065..d995b5e34c 100644 --- a/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/uml2sd/TmfAsyncSequenceDiagramEventTest.java +++ b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/uml2sd/TmfAsyncSequenceDiagramEventTest.java @@ -9,17 +9,17 @@ * Contributors: * Bernd Hufmann - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.tmf.tests.uml2sd; +package org.eclipse.linuxtools.tmf.core.tests.uml2sd; import junit.framework.TestCase; -import org.eclipse.linuxtools.tmf.event.TmfEvent; -import org.eclipse.linuxtools.tmf.event.TmfEventContent; -import org.eclipse.linuxtools.tmf.event.TmfEventReference; -import org.eclipse.linuxtools.tmf.event.TmfEventSource; -import org.eclipse.linuxtools.tmf.event.TmfEventType; -import org.eclipse.linuxtools.tmf.event.TmfTimestamp; -import org.eclipse.linuxtools.tmf.uml2sd.TmfAsyncSequenceDiagramEvent; +import org.eclipse.linuxtools.tmf.core.event.TmfEvent; +import org.eclipse.linuxtools.tmf.core.event.TmfEventContent; +import org.eclipse.linuxtools.tmf.core.event.TmfEventReference; +import org.eclipse.linuxtools.tmf.core.event.TmfEventSource; +import org.eclipse.linuxtools.tmf.core.event.TmfEventType; +import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp; +import org.eclipse.linuxtools.tmf.core.uml2sd.TmfAsyncSequenceDiagramEvent; @SuppressWarnings("nls") public class TmfAsyncSequenceDiagramEventTest extends TestCase { diff --git a/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/uml2sd/TmfSyncSequenceDiagramEventTest.java b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/uml2sd/TmfSyncSequenceDiagramEventTest.java similarity index 88% rename from org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/uml2sd/TmfSyncSequenceDiagramEventTest.java rename to org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/uml2sd/TmfSyncSequenceDiagramEventTest.java index 7941aaf30c..8b2557081e 100644 --- a/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/uml2sd/TmfSyncSequenceDiagramEventTest.java +++ b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/uml2sd/TmfSyncSequenceDiagramEventTest.java @@ -9,17 +9,17 @@ * Contributors: * Bernd Hufmann - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.tmf.tests.uml2sd; +package org.eclipse.linuxtools.tmf.core.tests.uml2sd; import junit.framework.TestCase; -import org.eclipse.linuxtools.tmf.event.TmfEvent; -import org.eclipse.linuxtools.tmf.event.TmfEventContent; -import org.eclipse.linuxtools.tmf.event.TmfEventReference; -import org.eclipse.linuxtools.tmf.event.TmfEventSource; -import org.eclipse.linuxtools.tmf.event.TmfEventType; -import org.eclipse.linuxtools.tmf.event.TmfTimestamp; -import org.eclipse.linuxtools.tmf.uml2sd.TmfSyncSequenceDiagramEvent; +import org.eclipse.linuxtools.tmf.core.event.TmfEvent; +import org.eclipse.linuxtools.tmf.core.event.TmfEventContent; +import org.eclipse.linuxtools.tmf.core.event.TmfEventReference; +import org.eclipse.linuxtools.tmf.core.event.TmfEventSource; +import org.eclipse.linuxtools.tmf.core.event.TmfEventType; +import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp; +import org.eclipse.linuxtools.tmf.core.uml2sd.TmfSyncSequenceDiagramEvent; @SuppressWarnings("nls") public class TmfSyncSequenceDiagramEventTest extends TestCase { diff --git a/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/util/AllTests.java b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/util/AllTests.java similarity index 76% rename from org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/util/AllTests.java rename to org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/util/AllTests.java index 537bdc5b88..ed809931ba 100644 --- a/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/util/AllTests.java +++ b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/util/AllTests.java @@ -1,9 +1,9 @@ -package org.eclipse.linuxtools.tmf.tests.util; +package org.eclipse.linuxtools.tmf.core.tests.util; import junit.framework.Test; import junit.framework.TestSuite; -import org.eclipse.linuxtools.tmf.TmfCorePlugin; +import org.eclipse.linuxtools.tmf.core.TmfCorePlugin; @SuppressWarnings("nls") public class AllTests { diff --git a/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/util/TmfFixedArrayTest.java b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/util/TmfFixedArrayTest.java similarity index 98% rename from org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/util/TmfFixedArrayTest.java rename to org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/util/TmfFixedArrayTest.java index 076a6c2c68..2de859f062 100755 --- a/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/util/TmfFixedArrayTest.java +++ b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/util/TmfFixedArrayTest.java @@ -10,13 +10,13 @@ * Mathieu Denis (mathieu.denis@polymtl.ca) - Initial design and implementation *******************************************************************************/ -package org.eclipse.linuxtools.tmf.tests.util; +package org.eclipse.linuxtools.tmf.core.tests.util; import java.util.Arrays; import junit.framework.TestCase; -import org.eclipse.linuxtools.tmf.util.TmfFixedArray; +import org.eclipse.linuxtools.tmf.core.util.TmfFixedArray; public class TmfFixedArrayTest extends TestCase { diff --git a/org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf/CreateTestFiles.java b/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/stubs/CreateTestFiles.java similarity index 99% rename from org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf/CreateTestFiles.java rename to org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/stubs/CreateTestFiles.java index c4c438db75..1a896ba392 100644 --- a/org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf/CreateTestFiles.java +++ b/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/stubs/CreateTestFiles.java @@ -10,7 +10,7 @@ * Francois Chouinard - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.tmf; +package org.eclipse.linuxtools.tmf.stubs; import java.io.BufferedOutputStream; import java.io.DataOutputStream; diff --git a/org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf/component/TmfClientStub.java b/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/stubs/component/TmfClientStub.java similarity index 78% rename from org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf/component/TmfClientStub.java rename to org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/stubs/component/TmfClientStub.java index 8ce79737ea..bd8c506866 100644 --- a/org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf/component/TmfClientStub.java +++ b/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/stubs/component/TmfClientStub.java @@ -10,9 +10,12 @@ * Francois Chouinard - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.tmf.component; +package org.eclipse.linuxtools.tmf.stubs.component; -import org.eclipse.linuxtools.tmf.event.TmfSyntheticEventStub; +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; /** * TmfClientStub diff --git a/org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf/component/TmfDataProviderStub.java b/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/stubs/component/TmfDataProviderStub.java similarity index 82% rename from org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf/component/TmfDataProviderStub.java rename to org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/stubs/component/TmfDataProviderStub.java index 2df7db7d6d..a238f023ba 100644 --- a/org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf/component/TmfDataProviderStub.java +++ b/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/stubs/component/TmfDataProviderStub.java @@ -10,7 +10,7 @@ * Francois Chouinard - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.tmf.component; +package org.eclipse.linuxtools.tmf.stubs.component; import java.io.File; import java.io.IOException; @@ -19,12 +19,13 @@ import java.net.URL; import org.eclipse.core.runtime.FileLocator; import org.eclipse.core.runtime.Path; -import org.eclipse.linuxtools.tmf.event.TmfData; -import org.eclipse.linuxtools.tmf.request.ITmfDataRequest; -import org.eclipse.linuxtools.tmf.request.ITmfEventRequest; -import org.eclipse.linuxtools.tmf.tests.TmfCoreTestPlugin; -import org.eclipse.linuxtools.tmf.trace.ITmfContext; -import org.eclipse.linuxtools.tmf.trace.TmfTraceStub; +import org.eclipse.linuxtools.tmf.core.component.TmfDataProvider; +import org.eclipse.linuxtools.tmf.core.event.TmfData; +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; /** * TmfDataProviderStub diff --git a/org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf/component/TmfEventProviderStub.java b/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/stubs/component/TmfEventProviderStub.java similarity index 82% rename from org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf/component/TmfEventProviderStub.java rename to org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/stubs/component/TmfEventProviderStub.java index 10dbe9fb1c..75d78e4daa 100644 --- a/org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf/component/TmfEventProviderStub.java +++ b/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/stubs/component/TmfEventProviderStub.java @@ -10,7 +10,7 @@ * Francois Chouinard - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.tmf.component; +package org.eclipse.linuxtools.tmf.stubs.component; import java.io.File; import java.io.IOException; @@ -19,12 +19,13 @@ import java.net.URL; import org.eclipse.core.runtime.FileLocator; import org.eclipse.core.runtime.Path; -import org.eclipse.linuxtools.tmf.event.TmfEvent; -import org.eclipse.linuxtools.tmf.request.ITmfDataRequest; -import org.eclipse.linuxtools.tmf.request.ITmfEventRequest; -import org.eclipse.linuxtools.tmf.tests.TmfCoreTestPlugin; -import org.eclipse.linuxtools.tmf.trace.ITmfContext; -import org.eclipse.linuxtools.tmf.trace.TmfTraceStub; +import org.eclipse.linuxtools.tmf.core.component.TmfEventProvider; +import org.eclipse.linuxtools.tmf.core.event.TmfEvent; +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; /** * TmfEventProviderStub diff --git a/org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf/component/TmfSyntheticEventProviderStub.java b/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/stubs/component/TmfSyntheticEventProviderStub.java similarity index 79% rename from org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf/component/TmfSyntheticEventProviderStub.java rename to org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/stubs/component/TmfSyntheticEventProviderStub.java index b1e062584c..fcea703eb2 100644 --- a/org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf/component/TmfSyntheticEventProviderStub.java +++ b/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/stubs/component/TmfSyntheticEventProviderStub.java @@ -10,18 +10,21 @@ * Francois Chouinard - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.tmf.component; +package org.eclipse.linuxtools.tmf.stubs.component; import java.util.concurrent.TimeUnit; -import org.eclipse.linuxtools.tmf.event.TmfEvent; -import org.eclipse.linuxtools.tmf.event.TmfSyntheticEventStub; -import org.eclipse.linuxtools.tmf.event.TmfTimeRange; -import org.eclipse.linuxtools.tmf.request.ITmfDataRequest; -import org.eclipse.linuxtools.tmf.request.ITmfEventRequest; -import org.eclipse.linuxtools.tmf.request.TmfEventRequest; -import org.eclipse.linuxtools.tmf.trace.ITmfContext; -import org.eclipse.linuxtools.tmf.trace.TmfContext; +import org.eclipse.linuxtools.tmf.core.component.ITmfDataProvider; +import org.eclipse.linuxtools.tmf.core.component.TmfEventProvider; +import org.eclipse.linuxtools.tmf.core.component.TmfProviderManager; +import org.eclipse.linuxtools.tmf.core.event.TmfEvent; +import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange; +import org.eclipse.linuxtools.tmf.core.request.ITmfDataRequest; +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; /** * TmfSyntheticEventProviderStub diff --git a/org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf/event/TmfEventContentStub.java b/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/stubs/event/TmfEventContentStub.java similarity index 88% rename from org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf/event/TmfEventContentStub.java rename to org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/stubs/event/TmfEventContentStub.java index 97f87cc3af..59576b55ce 100644 --- a/org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf/event/TmfEventContentStub.java +++ b/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/stubs/event/TmfEventContentStub.java @@ -10,7 +10,11 @@ * Francois Chouinard - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.tmf.event; +package org.eclipse.linuxtools.tmf.stubs.event; + +import org.eclipse.linuxtools.tmf.core.event.TmfEvent; +import org.eclipse.linuxtools.tmf.core.event.TmfEventContent; +import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp; /** * TmfEventContentStub diff --git a/org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf/event/TmfEventTypeStub.java b/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/stubs/event/TmfEventTypeStub.java similarity index 88% rename from org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf/event/TmfEventTypeStub.java rename to org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/stubs/event/TmfEventTypeStub.java index cdb05eec32..1cfda3d031 100644 --- a/org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf/event/TmfEventTypeStub.java +++ b/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/stubs/event/TmfEventTypeStub.java @@ -10,7 +10,9 @@ * Francois Chouinard - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.tmf.event; +package org.eclipse.linuxtools.tmf.stubs.event; + +import org.eclipse.linuxtools.tmf.core.event.TmfEventType; /** * TmfEventTypeStub diff --git a/org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf/event/TmfSyntheticEventStub.java b/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/stubs/event/TmfSyntheticEventStub.java similarity index 88% rename from org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf/event/TmfSyntheticEventStub.java rename to org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/stubs/event/TmfSyntheticEventStub.java index 7254f35fc3..675c9f7af3 100644 --- a/org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf/event/TmfSyntheticEventStub.java +++ b/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/stubs/event/TmfSyntheticEventStub.java @@ -10,7 +10,9 @@ * Francois Chouinard - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.tmf.event; +package org.eclipse.linuxtools.tmf.stubs.event; + +import org.eclipse.linuxtools.tmf.core.event.TmfEvent; /** * TmfSyntheticEventStub diff --git a/org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf/request/TmfDataRequestStub.java b/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/stubs/request/TmfDataRequestStub.java similarity index 89% rename from org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf/request/TmfDataRequestStub.java rename to org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/stubs/request/TmfDataRequestStub.java index bdf585f760..36135c5fb0 100644 --- a/org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf/request/TmfDataRequestStub.java +++ b/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/stubs/request/TmfDataRequestStub.java @@ -10,9 +10,10 @@ * Francois Chouinard - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.tmf.request; +package org.eclipse.linuxtools.tmf.stubs.request; -import org.eclipse.linuxtools.tmf.event.TmfData; +import org.eclipse.linuxtools.tmf.core.event.TmfData; +import org.eclipse.linuxtools.tmf.core.request.TmfDataRequest; /** * TmfDataRequestStub diff --git a/org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf/request/TmfEventRequestStub.java b/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/stubs/request/TmfEventRequestStub.java similarity index 86% rename from org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf/request/TmfEventRequestStub.java rename to org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/stubs/request/TmfEventRequestStub.java index 73991de92e..a88ba4d7b6 100644 --- a/org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf/request/TmfEventRequestStub.java +++ b/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/stubs/request/TmfEventRequestStub.java @@ -10,10 +10,11 @@ * Francois Chouinard - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.tmf.request; +package org.eclipse.linuxtools.tmf.stubs.request; -import org.eclipse.linuxtools.tmf.event.TmfEvent; -import org.eclipse.linuxtools.tmf.event.TmfTimeRange; +import org.eclipse.linuxtools.tmf.core.event.TmfEvent; +import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange; +import org.eclipse.linuxtools.tmf.core.request.TmfEventRequest; /** * TmfEventRequestStub diff --git a/org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf/trace/TmfEventParserStub.java b/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/stubs/trace/TmfEventParserStub.java similarity index 85% rename from org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf/trace/TmfEventParserStub.java rename to org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/stubs/trace/TmfEventParserStub.java index eab0891473..ac9d95bbcc 100644 --- a/org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf/trace/TmfEventParserStub.java +++ b/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/stubs/trace/TmfEventParserStub.java @@ -10,20 +10,23 @@ * Francois Chouinard - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.tmf.trace; +package org.eclipse.linuxtools.tmf.stubs.trace; import java.io.EOFException; import java.io.IOException; import java.io.RandomAccessFile; import java.util.Vector; -import org.eclipse.linuxtools.tmf.event.TmfEvent; -import org.eclipse.linuxtools.tmf.event.TmfEventContent; -import org.eclipse.linuxtools.tmf.event.TmfEventReference; -import org.eclipse.linuxtools.tmf.event.TmfEventSource; -import org.eclipse.linuxtools.tmf.event.TmfEventType; -import org.eclipse.linuxtools.tmf.event.TmfTimestamp; -import org.eclipse.linuxtools.tmf.parser.ITmfEventParser; +import org.eclipse.linuxtools.tmf.core.event.TmfEvent; +import org.eclipse.linuxtools.tmf.core.event.TmfEventContent; +import org.eclipse.linuxtools.tmf.core.event.TmfEventReference; +import org.eclipse.linuxtools.tmf.core.event.TmfEventSource; +import org.eclipse.linuxtools.tmf.core.event.TmfEventType; +import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp; +import org.eclipse.linuxtools.tmf.core.parser.ITmfEventParser; +import org.eclipse.linuxtools.tmf.core.trace.ITmfTrace; +import org.eclipse.linuxtools.tmf.core.trace.TmfContext; +import org.eclipse.linuxtools.tmf.core.trace.TmfLocation; /** * TmfEventParserStub diff --git a/org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf/trace/TmfTraceStub.java b/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/stubs/trace/TmfTraceStub.java similarity index 92% rename from org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf/trace/TmfTraceStub.java rename to org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/stubs/trace/TmfTraceStub.java index e2cdcbc044..9a87af97a2 100644 --- a/org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf/trace/TmfTraceStub.java +++ b/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/stubs/trace/TmfTraceStub.java @@ -10,17 +10,23 @@ * Francois Chouinard - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.tmf.trace; +package org.eclipse.linuxtools.tmf.stubs.trace; import java.io.FileNotFoundException; import java.io.IOException; import java.io.RandomAccessFile; import java.util.concurrent.locks.ReentrantLock; -import org.eclipse.linuxtools.tmf.event.TmfEvent; -import org.eclipse.linuxtools.tmf.event.TmfTimeRange; -import org.eclipse.linuxtools.tmf.event.TmfTimestamp; -import org.eclipse.linuxtools.tmf.parser.ITmfEventParser; +import org.eclipse.linuxtools.tmf.core.event.TmfEvent; +import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange; +import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp; +import org.eclipse.linuxtools.tmf.core.parser.ITmfEventParser; +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.TmfContext; +import org.eclipse.linuxtools.tmf.core.trace.TmfLocation; +import org.eclipse.linuxtools.tmf.core.trace.TmfTrace; /** * TmfTraceStub diff --git a/org.eclipse.linuxtools.tmf.tests/test.xml b/org.eclipse.linuxtools.tmf.core.tests/test.xml similarity index 100% rename from org.eclipse.linuxtools.tmf.tests/test.xml rename to org.eclipse.linuxtools.tmf.core.tests/test.xml diff --git a/org.eclipse.linuxtools.tmf.tests/testfiles/A-Test-10K b/org.eclipse.linuxtools.tmf.core.tests/testfiles/A-Test-10K similarity index 100% rename from org.eclipse.linuxtools.tmf.tests/testfiles/A-Test-10K rename to org.eclipse.linuxtools.tmf.core.tests/testfiles/A-Test-10K diff --git a/org.eclipse.linuxtools.tmf.tests/testfiles/E-Test-10K b/org.eclipse.linuxtools.tmf.core.tests/testfiles/E-Test-10K similarity index 100% rename from org.eclipse.linuxtools.tmf.tests/testfiles/E-Test-10K rename to org.eclipse.linuxtools.tmf.core.tests/testfiles/E-Test-10K diff --git a/org.eclipse.linuxtools.tmf.tests/testfiles/O-Test-10K b/org.eclipse.linuxtools.tmf.core.tests/testfiles/O-Test-10K similarity index 100% rename from org.eclipse.linuxtools.tmf.tests/testfiles/O-Test-10K rename to org.eclipse.linuxtools.tmf.core.tests/testfiles/O-Test-10K diff --git a/org.eclipse.linuxtools.tmf.tests/testfiles/R-Test-10K b/org.eclipse.linuxtools.tmf.core.tests/testfiles/R-Test-10K similarity index 100% rename from org.eclipse.linuxtools.tmf.tests/testfiles/R-Test-10K rename to org.eclipse.linuxtools.tmf.core.tests/testfiles/R-Test-10K diff --git a/org.eclipse.linuxtools.tmf/.classpath b/org.eclipse.linuxtools.tmf.core/.classpath similarity index 100% rename from org.eclipse.linuxtools.tmf/.classpath rename to org.eclipse.linuxtools.tmf.core/.classpath diff --git a/org.eclipse.linuxtools.tmf.tests/.gitignore b/org.eclipse.linuxtools.tmf.core/.gitignore similarity index 100% rename from org.eclipse.linuxtools.tmf.tests/.gitignore rename to org.eclipse.linuxtools.tmf.core/.gitignore diff --git a/org.eclipse.linuxtools.tmf/.options b/org.eclipse.linuxtools.tmf.core/.options similarity index 100% rename from org.eclipse.linuxtools.tmf/.options rename to org.eclipse.linuxtools.tmf.core/.options diff --git a/org.eclipse.linuxtools.tmf.core/.project b/org.eclipse.linuxtools.tmf.core/.project new file mode 100644 index 0000000000..cd66d8b0f4 --- /dev/null +++ b/org.eclipse.linuxtools.tmf.core/.project @@ -0,0 +1,28 @@ + + + org.eclipse.linuxtools.tmf.core + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.pde.ManifestBuilder + + + + + org.eclipse.pde.SchemaBuilder + + + + + + org.eclipse.pde.PluginNature + org.eclipse.jdt.core.javanature + + diff --git a/org.eclipse.linuxtools.tmf/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.linuxtools.tmf.core/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from org.eclipse.linuxtools.tmf/.settings/org.eclipse.jdt.core.prefs rename to org.eclipse.linuxtools.tmf.core/.settings/org.eclipse.jdt.core.prefs diff --git a/org.eclipse.linuxtools.tmf.core/ChangeLog b/org.eclipse.linuxtools.tmf.core/ChangeLog new file mode 100644 index 0000000000..2ad58a7fcf --- /dev/null +++ b/org.eclipse.linuxtools.tmf.core/ChangeLog @@ -0,0 +1,204 @@ +2011-03-10 Francois Chouinard + + * src/org/eclipse/linuxtools/tmf/.options: Fixed a typo + * src/org/eclipse/linuxtools/tmf/signal/TmfSignalManager.java: Improved request tracing + * src/org/eclipse/linuxtools/tmf/request/TmfRequestExecutor.java: Improved request tracing + * src/org/eclipse/linuxtools/tmf/request/TmfEventRequest.java: Streamlined constructor + * src/org/eclipse/linuxtools/tmf/request/TmfDataRequest.java: Improved request tracing + * src/org/eclipse/linuxtools/tmf/component/TmfEventProvider.java: Improved request tracing + * src/org/eclipse/linuxtools/tmf/component/TmfDataProvider.java: Improved request tracing + * src/org/eclipse/linuxtools/tmf/Tracer.java: Improved request tracing + * src/org/eclipse/linuxtools/tmf/experiment/TmfExperiment.java: Fixed request completion call + +2010-12-13 Bernd Hufmann + + * src/org/eclipse/linuxtools/tmf/experiment/TmfExperiment.java (armRequest): For data requests, seek only if necessary + +2010-11-23 Francois Chouinard + + * src/org/eclipse/linuxtools/tmf/component/TmfDataProvider.java: Adjusted background request block size + * src/org/eclipse/linuxtools/tmf/trace/TmfTrace.java: Adjusted buffering between checkpoints + +2010-11-10 Francois Chouinard + + Suppress warning for non-externalized strings + * src/org/eclipse/linuxtools/tmf/experiment/TmfExperiment.java: + +2010-11-09 Francois Chouinard + + * src/org/eclipse/linuxtools/tmf/experiment/TmfExperiment.java (getNextEvent): Fix for NullPointerException + + Suppress warning for non-externalized strings + * src/org/eclipse/linuxtools/tmf/component/TmfDataProvider.java (newCoalescedDataRequest): + (coalesceDataRequest): + (.run): + (queueRequest): + * src/org/eclipse/linuxtools/tmf/component/TmfEventProvider.java (newCoalescedDataRequest): + * src/org/eclipse/linuxtools/tmf/event/TmfEvent.java (toString): + * src/org/eclipse/linuxtools/tmf/event/TmfEventContent.java (toString): + * src/org/eclipse/linuxtools/tmf/event/TmfEventField.java (toString): + * src/org/eclipse/linuxtools/tmf/event/TmfEventReference.java (toString): + * src/org/eclipse/linuxtools/tmf/event/TmfEventSource.java (toString): + * src/org/eclipse/linuxtools/tmf/event/TmfEventType.java (DEFAULT_TYPE_ID): + (getLabel): + (toString): + * src/org/eclipse/linuxtools/tmf/event/TmfTimeRange.java (toString): + * src/org/eclipse/linuxtools/tmf/event/TmfTimestamp.java (synchronize): + (toString): + * src/org/eclipse/linuxtools/tmf/event/TmfTraceEvent.java (toString): + * src/org/eclipse/linuxtools/tmf/experiment/TmfExperiment.java (TmfExperiment): + (toString): + * src/org/eclipse/linuxtools/tmf/experiment/TmfExperimentLocation.java (toString): + * src/org/eclipse/linuxtools/tmf/request/TmfCoalescedDataRequest.java (toString): + * src/org/eclipse/linuxtools/tmf/request/TmfCoalescedEventRequest.java (toString): + * src/org/eclipse/linuxtools/tmf/request/TmfDataRequest.java (TmfDataRequest): + (handleCompleted): + (start): + (done): + (toString): + * src/org/eclipse/linuxtools/tmf/request/TmfEventRequest.java (toString): + * src/org/eclipse/linuxtools/tmf/request/TmfRequestExecutor.java (TmfRequestExecutor): + (stop): + (.run): + (toString): + * src/org/eclipse/linuxtools/tmf/signal/TmfExperimentSelectedSignal.java (toString): + * src/org/eclipse/linuxtools/tmf/signal/TmfExperimentUpdatedSignal.java (toString): + * src/org/eclipse/linuxtools/tmf/signal/TmfSignalTracer.java (traceSignal): + * src/org/eclipse/linuxtools/tmf/signal/TmfTimeSynchSignal.java (toString): + * src/org/eclipse/linuxtools/tmf/signal/TmfTraceClosedSignal.java (toString): + * src/org/eclipse/linuxtools/tmf/signal/TmfTraceOpenedSignal.java (toString): + * src/org/eclipse/linuxtools/tmf/signal/TmfTraceParserUpdatedSignal.java (toString): + * src/org/eclipse/linuxtools/tmf/signal/TmfTraceSelectedSignal.java (toString): + * src/org/eclipse/linuxtools/tmf/signal/TmfTraceUpdatedSignal.java (toString): + * src/org/eclipse/linuxtools/tmf/TmfCorePlugin.java (PLUGIN_ID): + * src/org/eclipse/linuxtools/tmf/trace/TmfCheckpoint.java (toString): + * src/org/eclipse/linuxtools/tmf/trace/TmfContext.java (toString): + * src/org/eclipse/linuxtools/tmf/trace/TmfLocation.java (toString): + (clone): + * src/org/eclipse/linuxtools/tmf/trace/TmfTrace.java (toString): + * src/org/eclipse/linuxtools/tmf/Tracer.java: + +2010-11-04 Francois Chouinard + + * src/org/eclipse/linuxtools/tmf/experiment/TmfExperiment.java: Use the correct index page size + * src/org/eclipse/linuxtools/tmf/trace/TmfTrace.java: Added indexTrace() and support code + +2010-10-29 Francois Chouinard + + * src/org/eclipse/linuxtools/tmf/experiment/TmfExperiment.java (getNextEvent): Removed an unnecessary clone() operation + +2010-10-27 Francois Chouinard + + * src/org/eclipse/linuxtools/tmf/component/ITmfDataProvider.java: Augmented API for coalescing (notifyPendingRequest) + * src/org/eclipse/linuxtools/tmf/component/TmfDataProvider.java: Request coalescing and cancelling + * src/org/eclipse/linuxtools/tmf/experiment/TmfExperiment.java: Augmented API + * src/org/eclipse/linuxtools/tmf/request/TmfCoalescedDataRequest.java: Improved coalescing and cancelling + * src/org/eclipse/linuxtools/tmf/request/TmfCoalescedEventRequest.java: Ditto + * src/org/eclipse/linuxtools/tmf/request/TmfDataRequest.java: Ditto + * src/org/eclipse/linuxtools/tmf/signal/TmfSignalManager.java: Renaming of a field + +2010-10-15 Francois Chouinard + + * src/org/eclipse/linuxtools/tmf/event/TmfEvent.java: Implement cloning + * src/org/eclipse/linuxtools/tmf/event/TmfEventContent.java: Implement cloning + * src/org/eclipse/linuxtools/tmf/event/TmfEventField.java: Implement cloning + * src/org/eclipse/linuxtools/tmf/event/TmfEventReference.java: Implement cloning + * src/org/eclipse/linuxtools/tmf/event/TmfEventSource.java: Implement cloning + * src/org/eclipse/linuxtools/tmf/event/TmfEventType.java: Implement cloning + * src/org/eclipse/linuxtools/tmf/event/TmfTimestamp.java: Implement cloning + * src/org/eclipse/linuxtools/tmf/experiment/TmfExperiment.java (updateIndex): Fixed timestamp cloning + * src/org/eclipse/linuxtools/tmf/request/TmfDataRequest.java: Replaced lock.wait() by CountDownLatch + * src/org/eclipse/linuxtools/tmf/trace/TmfTrace.java (updateIndex): Fixed timestamp cloning + +2010-10-13 Francois Chouinard + + * src/org/eclipse/linuxtools/tmf/request/TmfRequestExecutor.java: Added checks for disposed widget + * src/org/eclipse/linuxtools/tmf/experiment/TmfExperiment.java: Added checks for disposed widget + * src/org/eclipse/linuxtools/tmf/request/TmfDataRequest.java: Added waitForStart() API + * src/org/eclipse/linuxtools/tmf/event/TmfEventContent.java: Added setEvent() + * src/org/eclipse/linuxtools/tmf/event/TmfTimeRange.java: Added getIntersection() + * src/org/eclipse/linuxtools/tmf/event/TmfTimestamp.java: Improved timestamp comparison + +2010-09-17 Francois Chouinard + + * src/org/eclipse/linuxtools/tmf/component/TmfDataProvider.java: Adjusted to new handleData() API + * src/org/eclipse/linuxtools/tmf/component/TmfEventProvider.java: Adjusted to new handleData() API + * src/org/eclipse/linuxtools/tmf/event/TmfEvent.java: Support for single event + * src/org/eclipse/linuxtools/tmf/experiment/TmfExperiment.java: Adjusted to new handleData() API + * src/org/eclipse/linuxtools/tmf/request/ITmfDataRequest.java: Adjusted to new handleData() API + * src/org/eclipse/linuxtools/tmf/request/TmfCoalescedDataRequest.java: Adjusted to new handleData() API + * src/org/eclipse/linuxtools/tmf/request/TmfCoalescedEventRequest.java: Adjusted to new handleData() API + * src/org/eclipse/linuxtools/tmf/request/TmfDataRequest.java: Adjusted to new handleData() API + * src/org/eclipse/linuxtools/tmf/request/TmfEventRequest.java: Adjusted to new handleData() API + +2010-09-17 Francois Chouinard + + * src/org/eclipse/linuxtools/tmf/component/TmfDataProvider.java: Adjusted to new handleData() API + * src/org/eclipse/linuxtools/tmf/component/TmfEventProvider.java: Adjusted to new handleData() API + * src/org/eclipse/linuxtools/tmf/event/TmfEvent.java: Support for single event + * src/org/eclipse/linuxtools/tmf/experiment/TmfExperiment.java: Adjusted to new handleData() API + * src/org/eclipse/linuxtools/tmf/request/ITmfDataRequest.java: Adjusted to new handleData() API + * src/org/eclipse/linuxtools/tmf/request/TmfCoalescedDataRequest.java: Adjusted to new handleData() API + * src/org/eclipse/linuxtools/tmf/request/TmfCoalescedEventRequest.java: Adjusted to new handleData() API + * src/org/eclipse/linuxtools/tmf/request/TmfDataRequest.java: Adjusted to new handleData() API + * src/org/eclipse/linuxtools/tmf/request/TmfEventRequest.java: Adjusted to new handleData() API + +2010-09-15 Francois Chouinard + + * src/org/eclipse/linuxtools/tmf/experiment/TmfExperiment.java: Optimized TmfExperimentContext handling + * src/org/eclipse/linuxtools/tmf/trace/TmfTrace.java: ExecutionType update + * src/org/eclipse/linuxtools/tmf/trace/TmfContext.java: ExecutionType update + * src/org/eclipse/linuxtools/tmf/request/TmfRequestExecutor.java: ExecutionType update + * src/org/eclipse/linuxtools/tmf/request/TmfEventRequest.java: ExecutionType update + * src/org/eclipse/linuxtools/tmf/request/TmfDataRequest.java: ExecutionType update + * src/org/eclipse/linuxtools/tmf/request/TmfCoalescedEventRequest.java: ExecutionType update + * src/org/eclipse/linuxtools/tmf/request/TmfCoalescedDataRequest.java: ExecutionType update + * src/org/eclipse/linuxtools/tmf/request/ITmfDataRequest.java: ExecutionType update + * src/org/eclipse/linuxtools/tmf/component/TmfDataProvider.java: ExecutionType update + * src/org/eclipse/linuxtools/tmf/Tracer.java: ExecutionType update + +2010-09-09 Francois Chouinard + + * src/org/eclipse/linuxtools/tmf/request/TmfCoalescedEventRequest.java: Fix in handleData() + * src/org/eclipse/linuxtools/tmf/experiment/TmfExperiment.java: Made class extendable + +2010-07-20 Francois Chouinard + + * src/org/eclipse/linuxtools/tmf/component/TmfDataProvider.java: + - Use a specific lock object (instead of this) for synchronization + - Fix executor exception when request comes in immediately after dispose + * src/org/eclipse/linuxtools/tmf/experiment/TmfExperiment.java: + - Fix constructor ignoring index page size + - Update saved context on parse to avoid unnecessary seeks + +2010-07-19 Francois Chouinard + + * src/org/eclipse/linuxtools/tmf/experiment/TmfExperiment.java: Some modifications to make the experiment more generic. + +2010-07-13 Francois Chouinard + + * src/org/eclipse/linuxtools/tmf/experiment/TmfExperiment.java (.updateExperiment): Added check for empty experiment + * src/org/eclipse/linuxtools/tmf/trace/TmfTrace.java (.updateTraceData): Added check for empty trace + +2010-07-12 Francois Chouinard + + * src/org/eclipse/linuxtools/tmf/signal/TmfTraceClosedSignal.java: New file. + * src/org/eclipse/linuxtools/tmf/signal/TmfTraceOpenedSignal.java: New file. + * src/org/eclipse/linuxtools/tmf/signal/TmfTraceParserUpdatedSignal.java: New file. + * src/org/eclipse/linuxtools/tmf/signal/TmfTraceSelectedSignal.java: New file. + * META-INF/MANIFEST.MF: Added a dependency on org.eclipse.core.resources + * src/org/eclipse/linuxtools/tmf/experiment/TmfExperiment.java (seekEvent): Commented out useless statements + * src/org/eclipse/linuxtools/tmf/trace/ITmfContext.java: Added a constant + * src/org/eclipse/linuxtools/tmf/trace/ITmfTrace.java: Added APIs + * src/org/eclipse/linuxtools/tmf/trace/TmfLocation.java: Added validation on location + * src/org/eclipse/linuxtools/tmf/trace/TmfTrace.java (getRank): Added + (indexTrace): Cleaned up warning + (queueLongRequest): Added background process handling + +2010-07-08 Francois Chouinard + + * src/org/eclipse/linuxtools/tmf/trace/TmfTrace.java (indexTrace): New method + renamed a constant + +2009-06-16 Andrew Overholt + + * META-INF/MANIFEST.MF: Change provider from Ericsson to Eclipse. \ No newline at end of file diff --git a/org.eclipse.linuxtools.tmf.core/META-INF/MANIFEST.MF b/org.eclipse.linuxtools.tmf.core/META-INF/MANIFEST.MF new file mode 100644 index 0000000000..185642d259 --- /dev/null +++ b/org.eclipse.linuxtools.tmf.core/META-INF/MANIFEST.MF @@ -0,0 +1,27 @@ +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: %Bundle-Name +Bundle-SymbolicName: org.eclipse.linuxtools.tmf.core;singleton:=true +Bundle-Version: 0.4.0.qualifier +Bundle-Activator: org.eclipse.linuxtools.tmf.core.TmfCorePlugin +Bundle-Vendor: %Bundle-Vendor +Require-Bundle: org.eclipse.core.runtime;bundle-version="3.7.0", + org.eclipse.core.resources;bundle-version="3.7.100" +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-ActivationPolicy: lazy +Export-Package: org.eclipse.linuxtools.tmf.core, + org.eclipse.linuxtools.tmf.core.component, + org.eclipse.linuxtools.tmf.core.event, + org.eclipse.linuxtools.tmf.core.experiment, + org.eclipse.linuxtools.tmf.core.filter, + org.eclipse.linuxtools.tmf.core.filter.model, + org.eclipse.linuxtools.tmf.core.filter.xml, + org.eclipse.linuxtools.tmf.core.io, + org.eclipse.linuxtools.tmf.core.parser, + org.eclipse.linuxtools.tmf.core.request, + org.eclipse.linuxtools.tmf.core.signal, + org.eclipse.linuxtools.tmf.core.trace, + org.eclipse.linuxtools.tmf.core.uml2sd, + org.eclipse.linuxtools.tmf.core.util +Bundle-Localization: plugin +Import-Package: org.eclipse.core.filesystem.provider diff --git a/org.eclipse.linuxtools.tmf/about.html b/org.eclipse.linuxtools.tmf.core/about.html similarity index 100% rename from org.eclipse.linuxtools.tmf/about.html rename to org.eclipse.linuxtools.tmf.core/about.html diff --git a/org.eclipse.linuxtools.tmf.core/build.properties b/org.eclipse.linuxtools.tmf.core/build.properties new file mode 100644 index 0000000000..00e586480b --- /dev/null +++ b/org.eclipse.linuxtools.tmf.core/build.properties @@ -0,0 +1,8 @@ +source.. = src/ +output.. = bin/ +bin.includes = META-INF/,\ + plugin.xml,\ + plugin.properties,\ + about.html,\ + . + \ No newline at end of file diff --git a/org.eclipse.linuxtools.tmf/plugin.properties b/org.eclipse.linuxtools.tmf.core/plugin.properties similarity index 100% rename from org.eclipse.linuxtools.tmf/plugin.properties rename to org.eclipse.linuxtools.tmf.core/plugin.properties diff --git a/org.eclipse.linuxtools.tmf/plugin.xml b/org.eclipse.linuxtools.tmf.core/plugin.xml similarity index 100% rename from org.eclipse.linuxtools.tmf/plugin.xml rename to org.eclipse.linuxtools.tmf.core/plugin.xml diff --git a/org.eclipse.linuxtools.tmf-feature/pom.xml b/org.eclipse.linuxtools.tmf.core/pom.xml similarity index 55% rename from org.eclipse.linuxtools.tmf-feature/pom.xml rename to org.eclipse.linuxtools.tmf.core/pom.xml index fea4e7cd0a..b8fcf4084f 100644 --- a/org.eclipse.linuxtools.tmf-feature/pom.xml +++ b/org.eclipse.linuxtools.tmf.core/pom.xml @@ -17,11 +17,29 @@ 0.10.0-SNAPSHOT - org.eclipse.linuxtools.tmf + org.eclipse.linuxtools.tmf.core 0.4.0-SNAPSHOT - eclipse-feature + eclipse-plugin - Linux Tools LTTng TMF (Tracing and Monitoring Framework) + Linux Tools LTTng TMF Core Plug-in - org.eclipse.linuxtools.tmf + + + + + src + + **/*.java + + + + + + org.eclipse.tycho + tycho-source-plugin + + + + + org.eclipse.linuxtools.tmf diff --git a/org.eclipse.linuxtools.tmf/schema/org.eclipse.linuxtools.tmf.tracetype.exsd b/org.eclipse.linuxtools.tmf.core/schema/org.eclipse.linuxtools.tmf.tracetype.exsd similarity index 100% rename from org.eclipse.linuxtools.tmf/schema/org.eclipse.linuxtools.tmf.tracetype.exsd rename to org.eclipse.linuxtools.tmf.core/schema/org.eclipse.linuxtools.tmf.tracetype.exsd diff --git a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/TmfCorePlugin.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/TmfCorePlugin.java similarity index 98% rename from org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/TmfCorePlugin.java rename to org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/TmfCorePlugin.java index 949ac5b330..239b427776 100644 --- a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/TmfCorePlugin.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/TmfCorePlugin.java @@ -10,7 +10,7 @@ * Francois Chouinard - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.tmf; +package org.eclipse.linuxtools.tmf.core; import org.eclipse.core.runtime.Plugin; import org.osgi.framework.BundleContext; diff --git a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/TmfProjectNature.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/TmfProjectNature.java similarity index 96% rename from org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/TmfProjectNature.java rename to org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/TmfProjectNature.java index d219c1af2c..6d7c6e9ca9 100644 --- a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/TmfProjectNature.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/TmfProjectNature.java @@ -10,7 +10,7 @@ * Francois Chouinard - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.tmf; +package org.eclipse.linuxtools.tmf.core; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IProjectNature; diff --git a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/Tracer.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/Tracer.java similarity index 90% rename from org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/Tracer.java rename to org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/Tracer.java index bf86f2f28f..4881c79f0e 100644 --- a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/Tracer.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/Tracer.java @@ -1,16 +1,16 @@ -package org.eclipse.linuxtools.tmf; +package org.eclipse.linuxtools.tmf.core; import java.io.BufferedWriter; import java.io.FileWriter; import java.io.IOException; import org.eclipse.core.runtime.Platform; -import org.eclipse.linuxtools.tmf.component.ITmfComponent; -import org.eclipse.linuxtools.tmf.component.ITmfDataProvider; -import org.eclipse.linuxtools.tmf.event.TmfData; -import org.eclipse.linuxtools.tmf.request.ITmfDataRequest; -import org.eclipse.linuxtools.tmf.request.ITmfEventRequest; -import org.eclipse.linuxtools.tmf.signal.TmfSignal; +import org.eclipse.linuxtools.tmf.core.component.ITmfComponent; +import org.eclipse.linuxtools.tmf.core.component.ITmfDataProvider; +import org.eclipse.linuxtools.tmf.core.event.TmfData; +import org.eclipse.linuxtools.tmf.core.request.ITmfDataRequest; +import org.eclipse.linuxtools.tmf.core.request.ITmfEventRequest; +import org.eclipse.linuxtools.tmf.core.signal.TmfSignal; @SuppressWarnings("nls") public class Tracer { diff --git a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/component/ITmfComponent.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/component/ITmfComponent.java similarity index 90% rename from org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/component/ITmfComponent.java rename to org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/component/ITmfComponent.java index b82ad6d7a8..e9040500ad 100644 --- a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/component/ITmfComponent.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/component/ITmfComponent.java @@ -10,9 +10,9 @@ * Francois Chouinard - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.tmf.component; +package org.eclipse.linuxtools.tmf.core.component; -import org.eclipse.linuxtools.tmf.signal.TmfSignal; +import org.eclipse.linuxtools.tmf.core.signal.TmfSignal; /** * ITmfComponent diff --git a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/component/ITmfDataProvider.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/component/ITmfDataProvider.java similarity index 85% rename from org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/component/ITmfDataProvider.java rename to org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/component/ITmfDataProvider.java index ab88ab578c..d0b3063560 100644 --- a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/component/ITmfDataProvider.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/component/ITmfDataProvider.java @@ -10,10 +10,10 @@ * Francois Chouinard - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.tmf.component; +package org.eclipse.linuxtools.tmf.core.component; -import org.eclipse.linuxtools.tmf.event.TmfData; -import org.eclipse.linuxtools.tmf.request.ITmfDataRequest; +import org.eclipse.linuxtools.tmf.core.event.TmfData; +import org.eclipse.linuxtools.tmf.core.request.ITmfDataRequest; /** * ITmfDataRequest diff --git a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/component/TmfComponent.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/component/TmfComponent.java similarity index 92% rename from org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/component/TmfComponent.java rename to org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/component/TmfComponent.java index 62d863fc70..58501a4195 100644 --- a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/component/TmfComponent.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/component/TmfComponent.java @@ -10,10 +10,10 @@ * Francois Chouinard - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.tmf.component; +package org.eclipse.linuxtools.tmf.core.component; -import org.eclipse.linuxtools.tmf.signal.TmfSignal; -import org.eclipse.linuxtools.tmf.signal.TmfSignalManager; +import org.eclipse.linuxtools.tmf.core.signal.TmfSignal; +import org.eclipse.linuxtools.tmf.core.signal.TmfSignalManager; /** * TmfComponent diff --git a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/component/TmfDataProvider.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/component/TmfDataProvider.java similarity index 94% rename from org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/component/TmfDataProvider.java rename to org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/component/TmfDataProvider.java index 4d476e93f5..832ffbb4d2 100644 --- a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/component/TmfDataProvider.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/component/TmfDataProvider.java @@ -10,24 +10,24 @@ * Francois Chouinard - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.tmf.component; +package org.eclipse.linuxtools.tmf.core.component; import java.util.Vector; import java.util.concurrent.BlockingQueue; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.SynchronousQueue; -import org.eclipse.linuxtools.tmf.Tracer; -import org.eclipse.linuxtools.tmf.event.TmfData; -import org.eclipse.linuxtools.tmf.request.ITmfDataRequest; -import org.eclipse.linuxtools.tmf.request.ITmfDataRequest.ExecutionType; -import org.eclipse.linuxtools.tmf.request.TmfCoalescedDataRequest; -import org.eclipse.linuxtools.tmf.request.TmfDataRequest; -import org.eclipse.linuxtools.tmf.request.TmfRequestExecutor; -import org.eclipse.linuxtools.tmf.signal.TmfEndSynchSignal; -import org.eclipse.linuxtools.tmf.signal.TmfSignalHandler; -import org.eclipse.linuxtools.tmf.signal.TmfStartSynchSignal; -import org.eclipse.linuxtools.tmf.trace.ITmfContext; +import org.eclipse.linuxtools.tmf.core.Tracer; +import org.eclipse.linuxtools.tmf.core.event.TmfData; +import org.eclipse.linuxtools.tmf.core.request.ITmfDataRequest; +import org.eclipse.linuxtools.tmf.core.request.TmfCoalescedDataRequest; +import org.eclipse.linuxtools.tmf.core.request.TmfDataRequest; +import org.eclipse.linuxtools.tmf.core.request.TmfRequestExecutor; +import org.eclipse.linuxtools.tmf.core.request.ITmfDataRequest.ExecutionType; +import org.eclipse.linuxtools.tmf.core.signal.TmfEndSynchSignal; +import org.eclipse.linuxtools.tmf.core.signal.TmfSignalHandler; +import org.eclipse.linuxtools.tmf.core.signal.TmfStartSynchSignal; +import org.eclipse.linuxtools.tmf.core.trace.ITmfContext; /** * TmfProvider diff --git a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/component/TmfEventProvider.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/component/TmfEventProvider.java similarity index 90% rename from org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/component/TmfEventProvider.java rename to org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/component/TmfEventProvider.java index 37e8676d1b..1d738043e8 100644 --- a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/component/TmfEventProvider.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/component/TmfEventProvider.java @@ -10,16 +10,16 @@ * Francois Chouinard - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.tmf.component; - -import org.eclipse.linuxtools.tmf.Tracer; -import org.eclipse.linuxtools.tmf.event.TmfEvent; -import org.eclipse.linuxtools.tmf.event.TmfTimestamp; -import org.eclipse.linuxtools.tmf.request.ITmfDataRequest; -import org.eclipse.linuxtools.tmf.request.ITmfDataRequest.ExecutionType; -import org.eclipse.linuxtools.tmf.request.ITmfEventRequest; -import org.eclipse.linuxtools.tmf.request.TmfCoalescedEventRequest; -import org.eclipse.linuxtools.tmf.request.TmfEventRequest; +package org.eclipse.linuxtools.tmf.core.component; + +import org.eclipse.linuxtools.tmf.core.Tracer; +import org.eclipse.linuxtools.tmf.core.event.TmfEvent; +import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp; +import org.eclipse.linuxtools.tmf.core.request.ITmfDataRequest; +import org.eclipse.linuxtools.tmf.core.request.ITmfEventRequest; +import org.eclipse.linuxtools.tmf.core.request.TmfCoalescedEventRequest; +import org.eclipse.linuxtools.tmf.core.request.TmfEventRequest; +import org.eclipse.linuxtools.tmf.core.request.ITmfDataRequest.ExecutionType; /** * TmfEventProvider diff --git a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/component/TmfProviderManager.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/component/TmfProviderManager.java similarity index 97% rename from org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/component/TmfProviderManager.java rename to org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/component/TmfProviderManager.java index 0b71a53a36..7c9c28596c 100644 --- a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/component/TmfProviderManager.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/component/TmfProviderManager.java @@ -10,14 +10,14 @@ * Francois Chouinard - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.tmf.component; +package org.eclipse.linuxtools.tmf.core.component; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import org.eclipse.linuxtools.tmf.event.TmfData; +import org.eclipse.linuxtools.tmf.core.event.TmfData; /** * TmfProviderManager.java diff --git a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/component/TmfThread.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/component/TmfThread.java similarity index 69% rename from org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/component/TmfThread.java rename to org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/component/TmfThread.java index 3ee41b7507..921b556160 100644 --- a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/component/TmfThread.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/component/TmfThread.java @@ -1,6 +1,6 @@ -package org.eclipse.linuxtools.tmf.component; +package org.eclipse.linuxtools.tmf.core.component; -import org.eclipse.linuxtools.tmf.request.ITmfDataRequest.ExecutionType; +import org.eclipse.linuxtools.tmf.core.request.ITmfDataRequest.ExecutionType; public class TmfThread extends Thread { // implements Comparator> { diff --git a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/event/TmfData.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfData.java similarity index 93% rename from org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/event/TmfData.java rename to org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfData.java index 1576c01170..709d771e8a 100644 --- a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/event/TmfData.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfData.java @@ -10,7 +10,7 @@ * Francois Chouinard - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.tmf.event; +package org.eclipse.linuxtools.tmf.core.event; /** * TmfData diff --git a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/event/TmfEvent.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfEvent.java similarity index 98% rename from org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/event/TmfEvent.java rename to org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfEvent.java index be395743de..7b89b4581e 100644 --- a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/event/TmfEvent.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfEvent.java @@ -10,9 +10,9 @@ * Francois Chouinard - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.tmf.event; +package org.eclipse.linuxtools.tmf.core.event; -import org.eclipse.linuxtools.tmf.trace.ITmfTrace; +import org.eclipse.linuxtools.tmf.core.trace.ITmfTrace; /** * TmfEvent diff --git a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/event/TmfEventContent.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfEventContent.java similarity index 99% rename from org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/event/TmfEventContent.java rename to org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfEventContent.java index bd9f701e31..7ea4d307d9 100644 --- a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/event/TmfEventContent.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfEventContent.java @@ -10,7 +10,7 @@ * Francois Chouinard - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.tmf.event; +package org.eclipse.linuxtools.tmf.core.event; /** * TmfEventContent diff --git a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/event/TmfEventField.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfEventField.java similarity index 98% rename from org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/event/TmfEventField.java rename to org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfEventField.java index 6729b776ec..b85fb24d56 100644 --- a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/event/TmfEventField.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfEventField.java @@ -10,7 +10,7 @@ * Francois Chouinard - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.tmf.event; +package org.eclipse.linuxtools.tmf.core.event; /** * TmfEventField diff --git a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/event/TmfEventReference.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfEventReference.java similarity index 98% rename from org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/event/TmfEventReference.java rename to org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfEventReference.java index d7a9319552..c5dc9177d6 100644 --- a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/event/TmfEventReference.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfEventReference.java @@ -10,7 +10,7 @@ * Francois Chouinard - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.tmf.event; +package org.eclipse.linuxtools.tmf.core.event; /** * TmfEventReference diff --git a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/event/TmfEventSource.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfEventSource.java similarity index 98% rename from org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/event/TmfEventSource.java rename to org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfEventSource.java index eda1c77f0a..87a2171072 100644 --- a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/event/TmfEventSource.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfEventSource.java @@ -10,7 +10,7 @@ * Francois Chouinard - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.tmf.event; +package org.eclipse.linuxtools.tmf.core.event; /** * TmfEventSource diff --git a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/event/TmfEventType.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfEventType.java similarity index 98% rename from org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/event/TmfEventType.java rename to org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfEventType.java index 03f8030795..2ff674b486 100644 --- a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/event/TmfEventType.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfEventType.java @@ -10,7 +10,7 @@ * Francois Chouinard - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.tmf.event; +package org.eclipse.linuxtools.tmf.core.event; import java.util.HashMap; diff --git a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/event/TmfNoSuchFieldException.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfNoSuchFieldException.java similarity index 94% rename from org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/event/TmfNoSuchFieldException.java rename to org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfNoSuchFieldException.java index e28e933eaa..b7420a6297 100644 --- a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/event/TmfNoSuchFieldException.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfNoSuchFieldException.java @@ -10,7 +10,7 @@ * Francois Chouinard - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.tmf.event; +package org.eclipse.linuxtools.tmf.core.event; /** * TmfNoSuchFieldException diff --git a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/event/TmfTimeRange.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfTimeRange.java similarity index 99% rename from org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/event/TmfTimeRange.java rename to org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfTimeRange.java index ae1a67064e..544d56422a 100644 --- a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/event/TmfTimeRange.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfTimeRange.java @@ -10,7 +10,7 @@ * Francois Chouinard - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.tmf.event; +package org.eclipse.linuxtools.tmf.core.event; /** * TmfTimeRange diff --git a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/event/TmfTimestamp.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfTimestamp.java similarity index 99% rename from org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/event/TmfTimestamp.java rename to org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfTimestamp.java index 0708e27721..4ecf90369e 100644 --- a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/event/TmfTimestamp.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfTimestamp.java @@ -11,7 +11,7 @@ * Thomas Gatterweh - Updated scaling / synchronization *******************************************************************************/ -package org.eclipse.linuxtools.tmf.event; +package org.eclipse.linuxtools.tmf.core.event; /** * TmfTimestamp diff --git a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/event/TmfTraceEvent.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfTraceEvent.java similarity index 98% rename from org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/event/TmfTraceEvent.java rename to org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfTraceEvent.java index 25c05d1bd1..065c673f42 100644 --- a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/event/TmfTraceEvent.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfTraceEvent.java @@ -10,7 +10,7 @@ * Francois Chouinard - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.tmf.event; +package org.eclipse.linuxtools.tmf.core.event; /** * TmfTraceEvent diff --git a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/experiment/TmfExperiment.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/experiment/TmfExperiment.java similarity index 95% rename from org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/experiment/TmfExperiment.java rename to org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/experiment/TmfExperiment.java index 82fcf996fa..0def3397e0 100644 --- a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/experiment/TmfExperiment.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/experiment/TmfExperiment.java @@ -10,7 +10,7 @@ * Francois Chouinard - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.tmf.experiment; +package org.eclipse.linuxtools.tmf.core.experiment; import java.io.FileNotFoundException; import java.util.Collections; @@ -21,26 +21,26 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.jobs.Job; -import org.eclipse.linuxtools.tmf.component.TmfEventProvider; -import org.eclipse.linuxtools.tmf.event.TmfEvent; -import org.eclipse.linuxtools.tmf.event.TmfTimeRange; -import org.eclipse.linuxtools.tmf.event.TmfTimestamp; -import org.eclipse.linuxtools.tmf.request.ITmfDataRequest; -import org.eclipse.linuxtools.tmf.request.ITmfEventRequest; -import org.eclipse.linuxtools.tmf.request.TmfDataRequest; -import org.eclipse.linuxtools.tmf.request.TmfEventRequest; -import org.eclipse.linuxtools.tmf.signal.TmfExperimentDisposedSignal; -import org.eclipse.linuxtools.tmf.signal.TmfExperimentRangeUpdatedSignal; -import org.eclipse.linuxtools.tmf.signal.TmfExperimentSelectedSignal; -import org.eclipse.linuxtools.tmf.signal.TmfExperimentUpdatedSignal; -import org.eclipse.linuxtools.tmf.signal.TmfSignalHandler; -import org.eclipse.linuxtools.tmf.signal.TmfSignalManager; -import org.eclipse.linuxtools.tmf.signal.TmfTraceUpdatedSignal; -import org.eclipse.linuxtools.tmf.trace.ITmfContext; -import org.eclipse.linuxtools.tmf.trace.ITmfLocation; -import org.eclipse.linuxtools.tmf.trace.ITmfTrace; -import org.eclipse.linuxtools.tmf.trace.TmfCheckpoint; -import org.eclipse.linuxtools.tmf.trace.TmfContext; +import org.eclipse.linuxtools.tmf.core.component.TmfEventProvider; +import org.eclipse.linuxtools.tmf.core.event.TmfEvent; +import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange; +import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp; +import org.eclipse.linuxtools.tmf.core.request.ITmfDataRequest; +import org.eclipse.linuxtools.tmf.core.request.ITmfEventRequest; +import org.eclipse.linuxtools.tmf.core.request.TmfDataRequest; +import org.eclipse.linuxtools.tmf.core.request.TmfEventRequest; +import org.eclipse.linuxtools.tmf.core.signal.TmfExperimentDisposedSignal; +import org.eclipse.linuxtools.tmf.core.signal.TmfExperimentRangeUpdatedSignal; +import org.eclipse.linuxtools.tmf.core.signal.TmfExperimentSelectedSignal; +import org.eclipse.linuxtools.tmf.core.signal.TmfExperimentUpdatedSignal; +import org.eclipse.linuxtools.tmf.core.signal.TmfSignalHandler; +import org.eclipse.linuxtools.tmf.core.signal.TmfSignalManager; +import org.eclipse.linuxtools.tmf.core.signal.TmfTraceUpdatedSignal; +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.TmfCheckpoint; +import org.eclipse.linuxtools.tmf.core.trace.TmfContext; /** * TmfExperiment diff --git a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/experiment/TmfExperimentCheckpoint.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/experiment/TmfExperimentCheckpoint.java similarity index 94% rename from org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/experiment/TmfExperimentCheckpoint.java rename to org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/experiment/TmfExperimentCheckpoint.java index d7257f6833..c3d8d1e57d 100644 --- a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/experiment/TmfExperimentCheckpoint.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/experiment/TmfExperimentCheckpoint.java @@ -10,10 +10,10 @@ * Francois Chouinard - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.tmf.experiment; +package org.eclipse.linuxtools.tmf.core.experiment; -import org.eclipse.linuxtools.tmf.event.TmfTimestamp; -import org.eclipse.linuxtools.tmf.trace.TmfContext; +import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp; +import org.eclipse.linuxtools.tmf.core.trace.TmfContext; /** * TmfExperimentCheckpoint diff --git a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/experiment/TmfExperimentContext.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/experiment/TmfExperimentContext.java similarity index 94% rename from org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/experiment/TmfExperimentContext.java rename to org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/experiment/TmfExperimentContext.java index 3d4981cbc1..72b22b13a3 100644 --- a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/experiment/TmfExperimentContext.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/experiment/TmfExperimentContext.java @@ -10,12 +10,12 @@ * Francois Chouinard - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.tmf.experiment; +package org.eclipse.linuxtools.tmf.core.experiment; -import org.eclipse.linuxtools.tmf.event.TmfEvent; -import org.eclipse.linuxtools.tmf.trace.ITmfLocation; -import org.eclipse.linuxtools.tmf.trace.ITmfTrace; -import org.eclipse.linuxtools.tmf.trace.TmfContext; +import org.eclipse.linuxtools.tmf.core.event.TmfEvent; +import org.eclipse.linuxtools.tmf.core.trace.ITmfLocation; +import org.eclipse.linuxtools.tmf.core.trace.ITmfTrace; +import org.eclipse.linuxtools.tmf.core.trace.TmfContext; /** * TmfExperimentContext diff --git a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/experiment/TmfExperimentLocation.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/experiment/TmfExperimentLocation.java similarity index 93% rename from org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/experiment/TmfExperimentLocation.java rename to org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/experiment/TmfExperimentLocation.java index 2637fbe22c..1e901b5426 100644 --- a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/experiment/TmfExperimentLocation.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/experiment/TmfExperimentLocation.java @@ -10,9 +10,9 @@ * Francois Chouinard - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.tmf.experiment; +package org.eclipse.linuxtools.tmf.core.experiment; -import org.eclipse.linuxtools.tmf.trace.TmfLocation; +import org.eclipse.linuxtools.tmf.core.trace.TmfLocation; /** * TmfExperimentLocation diff --git a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/experiment/TmfLocationArray.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/experiment/TmfLocationArray.java similarity index 93% rename from org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/experiment/TmfLocationArray.java rename to org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/experiment/TmfLocationArray.java index e5f7d70820..3210d976b2 100644 --- a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/experiment/TmfLocationArray.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/experiment/TmfLocationArray.java @@ -10,9 +10,9 @@ * Patrick Tasse - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.tmf.experiment; +package org.eclipse.linuxtools.tmf.core.experiment; -import org.eclipse.linuxtools.tmf.trace.ITmfLocation; +import org.eclipse.linuxtools.tmf.core.trace.ITmfLocation; public class TmfLocationArray implements Comparable, Cloneable { public ITmfLocation>[] locations; diff --git a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/filter/ITmfFilter.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/filter/ITmfFilter.java similarity index 85% rename from org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/filter/ITmfFilter.java rename to org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/filter/ITmfFilter.java index 02fa8d42e2..1c01af8d5c 100644 --- a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/filter/ITmfFilter.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/filter/ITmfFilter.java @@ -10,9 +10,9 @@ * Patrick Tasse - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.tmf.filter; +package org.eclipse.linuxtools.tmf.core.filter; -import org.eclipse.linuxtools.tmf.event.TmfEvent; +import org.eclipse.linuxtools.tmf.core.event.TmfEvent; public interface ITmfFilter { diff --git a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/filter/model/ITmfFilterTreeNode.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/filter/model/ITmfFilterTreeNode.java similarity index 93% rename from org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/filter/model/ITmfFilterTreeNode.java rename to org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/filter/model/ITmfFilterTreeNode.java index d77ffff6f3..f3fe069f88 100644 --- a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/filter/model/ITmfFilterTreeNode.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/filter/model/ITmfFilterTreeNode.java @@ -11,11 +11,11 @@ * Yuriy Vashchuk (yvashchuk@gmail.com) - Initial implementation *******************************************************************************/ -package org.eclipse.linuxtools.tmf.filter.model; +package org.eclipse.linuxtools.tmf.core.filter.model; import java.util.List; -import org.eclipse.linuxtools.tmf.filter.ITmfFilter; +import org.eclipse.linuxtools.tmf.core.filter.ITmfFilter; /** diff --git a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/filter/model/TmfFilterAndNode.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/filter/model/TmfFilterAndNode.java similarity index 91% rename from org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/filter/model/TmfFilterAndNode.java rename to org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/filter/model/TmfFilterAndNode.java index 673a373465..549c54e9bf 100644 --- a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/filter/model/TmfFilterAndNode.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/filter/model/TmfFilterAndNode.java @@ -10,9 +10,9 @@ * Patrick Tasse - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.tmf.filter.model; +package org.eclipse.linuxtools.tmf.core.filter.model; -import org.eclipse.linuxtools.tmf.event.TmfEvent; +import org.eclipse.linuxtools.tmf.core.event.TmfEvent; public class TmfFilterAndNode extends TmfFilterTreeNode { diff --git a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/filter/model/TmfFilterCompareNode.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/filter/model/TmfFilterCompareNode.java similarity index 92% rename from org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/filter/model/TmfFilterCompareNode.java rename to org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/filter/model/TmfFilterCompareNode.java index d1f9adc68d..fb9bb56c18 100644 --- a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/filter/model/TmfFilterCompareNode.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/filter/model/TmfFilterCompareNode.java @@ -10,16 +10,16 @@ * Patrick Tasse - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.tmf.filter.model; +package org.eclipse.linuxtools.tmf.core.filter.model; import java.text.NumberFormat; import java.text.ParseException; import java.util.ArrayList; import java.util.List; -import org.eclipse.linuxtools.tmf.event.TmfEvent; -import org.eclipse.linuxtools.tmf.event.TmfNoSuchFieldException; -import org.eclipse.linuxtools.tmf.event.TmfTimestamp; +import org.eclipse.linuxtools.tmf.core.event.TmfEvent; +import org.eclipse.linuxtools.tmf.core.event.TmfNoSuchFieldException; +import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp; public class TmfFilterCompareNode extends TmfFilterTreeNode { diff --git a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/filter/model/TmfFilterContainsNode.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/filter/model/TmfFilterContainsNode.java similarity index 90% rename from org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/filter/model/TmfFilterContainsNode.java rename to org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/filter/model/TmfFilterContainsNode.java index e2db82df88..01a7c0429f 100644 --- a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/filter/model/TmfFilterContainsNode.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/filter/model/TmfFilterContainsNode.java @@ -10,13 +10,13 @@ * Patrick Tasse - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.tmf.filter.model; +package org.eclipse.linuxtools.tmf.core.filter.model; import java.util.ArrayList; import java.util.List; -import org.eclipse.linuxtools.tmf.event.TmfEvent; -import org.eclipse.linuxtools.tmf.event.TmfNoSuchFieldException; +import org.eclipse.linuxtools.tmf.core.event.TmfEvent; +import org.eclipse.linuxtools.tmf.core.event.TmfNoSuchFieldException; public class TmfFilterContainsNode extends TmfFilterTreeNode { diff --git a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/filter/model/TmfFilterEqualsNode.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/filter/model/TmfFilterEqualsNode.java similarity index 90% rename from org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/filter/model/TmfFilterEqualsNode.java rename to org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/filter/model/TmfFilterEqualsNode.java index 16b8aa3696..d7781b5dab 100644 --- a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/filter/model/TmfFilterEqualsNode.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/filter/model/TmfFilterEqualsNode.java @@ -10,13 +10,13 @@ * Patrick Tasse - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.tmf.filter.model; +package org.eclipse.linuxtools.tmf.core.filter.model; import java.util.ArrayList; import java.util.List; -import org.eclipse.linuxtools.tmf.event.TmfEvent; -import org.eclipse.linuxtools.tmf.event.TmfNoSuchFieldException; +import org.eclipse.linuxtools.tmf.core.event.TmfEvent; +import org.eclipse.linuxtools.tmf.core.event.TmfNoSuchFieldException; public class TmfFilterEqualsNode extends TmfFilterTreeNode { diff --git a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/filter/model/TmfFilterEventTypeNode.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/filter/model/TmfFilterEventTypeNode.java similarity index 92% rename from org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/filter/model/TmfFilterEventTypeNode.java rename to org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/filter/model/TmfFilterEventTypeNode.java index 66ea2571e1..8175ad3df8 100644 --- a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/filter/model/TmfFilterEventTypeNode.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/filter/model/TmfFilterEventTypeNode.java @@ -10,12 +10,12 @@ * Patrick Tasse - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.tmf.filter.model; +package org.eclipse.linuxtools.tmf.core.filter.model; import java.util.ArrayList; import java.util.List; -import org.eclipse.linuxtools.tmf.event.TmfEvent; +import org.eclipse.linuxtools.tmf.core.event.TmfEvent; public class TmfFilterEventTypeNode extends TmfFilterTreeNode { diff --git a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/filter/model/TmfFilterMatchesNode.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/filter/model/TmfFilterMatchesNode.java similarity index 90% rename from org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/filter/model/TmfFilterMatchesNode.java rename to org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/filter/model/TmfFilterMatchesNode.java index c0b09cdf95..828de83989 100644 --- a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/filter/model/TmfFilterMatchesNode.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/filter/model/TmfFilterMatchesNode.java @@ -10,15 +10,15 @@ * Patrick Tasse - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.tmf.filter.model; +package org.eclipse.linuxtools.tmf.core.filter.model; import java.util.ArrayList; import java.util.List; import java.util.regex.Pattern; import java.util.regex.PatternSyntaxException; -import org.eclipse.linuxtools.tmf.event.TmfEvent; -import org.eclipse.linuxtools.tmf.event.TmfNoSuchFieldException; +import org.eclipse.linuxtools.tmf.core.event.TmfEvent; +import org.eclipse.linuxtools.tmf.core.event.TmfNoSuchFieldException; public class TmfFilterMatchesNode extends TmfFilterTreeNode { diff --git a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/filter/model/TmfFilterNode.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/filter/model/TmfFilterNode.java similarity index 91% rename from org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/filter/model/TmfFilterNode.java rename to org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/filter/model/TmfFilterNode.java index 63467419d1..0ed8af5e88 100644 --- a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/filter/model/TmfFilterNode.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/filter/model/TmfFilterNode.java @@ -10,12 +10,12 @@ * Patrick Tasse - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.tmf.filter.model; +package org.eclipse.linuxtools.tmf.core.filter.model; import java.util.ArrayList; import java.util.List; -import org.eclipse.linuxtools.tmf.event.TmfEvent; +import org.eclipse.linuxtools.tmf.core.event.TmfEvent; public class TmfFilterNode extends TmfFilterTreeNode { diff --git a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/filter/model/TmfFilterOrNode.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/filter/model/TmfFilterOrNode.java similarity index 91% rename from org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/filter/model/TmfFilterOrNode.java rename to org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/filter/model/TmfFilterOrNode.java index 185508ee08..c81a6f3d9e 100644 --- a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/filter/model/TmfFilterOrNode.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/filter/model/TmfFilterOrNode.java @@ -10,9 +10,9 @@ * Patrick Tasse - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.tmf.filter.model; +package org.eclipse.linuxtools.tmf.core.filter.model; -import org.eclipse.linuxtools.tmf.event.TmfEvent; +import org.eclipse.linuxtools.tmf.core.event.TmfEvent; public class TmfFilterOrNode extends TmfFilterTreeNode { diff --git a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/filter/model/TmfFilterRootNode.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/filter/model/TmfFilterRootNode.java similarity index 87% rename from org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/filter/model/TmfFilterRootNode.java rename to org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/filter/model/TmfFilterRootNode.java index d31260f5c4..5a48144dd7 100644 --- a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/filter/model/TmfFilterRootNode.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/filter/model/TmfFilterRootNode.java @@ -10,12 +10,12 @@ * Patrick Tasse - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.tmf.filter.model; +package org.eclipse.linuxtools.tmf.core.filter.model; import java.util.Arrays; import java.util.List; -import org.eclipse.linuxtools.tmf.event.TmfEvent; +import org.eclipse.linuxtools.tmf.core.event.TmfEvent; public class TmfFilterRootNode extends TmfFilterTreeNode { diff --git a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/filter/model/TmfFilterTreeNode.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/filter/model/TmfFilterTreeNode.java similarity index 94% rename from org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/filter/model/TmfFilterTreeNode.java rename to org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/filter/model/TmfFilterTreeNode.java index 88a2607955..cd260f4598 100644 --- a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/filter/model/TmfFilterTreeNode.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/filter/model/TmfFilterTreeNode.java @@ -11,13 +11,13 @@ * Patrick Tasse - Refactoring *******************************************************************************/ -package org.eclipse.linuxtools.tmf.filter.model; +package org.eclipse.linuxtools.tmf.core.filter.model; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import org.eclipse.linuxtools.tmf.event.TmfEvent; +import org.eclipse.linuxtools.tmf.core.event.TmfEvent; /** * TmfFilterTreeNode diff --git a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/filter/xml/TmfFilterContentHandler.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/filter/xml/TmfFilterContentHandler.java similarity index 85% rename from org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/filter/xml/TmfFilterContentHandler.java rename to org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/filter/xml/TmfFilterContentHandler.java index c405f72b9e..f3ecc79d4a 100644 --- a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/filter/xml/TmfFilterContentHandler.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/filter/xml/TmfFilterContentHandler.java @@ -12,22 +12,22 @@ * Patrick Tasse - Refactoring *******************************************************************************/ -package org.eclipse.linuxtools.tmf.filter.xml; +package org.eclipse.linuxtools.tmf.core.filter.xml; import java.util.Stack; -import org.eclipse.linuxtools.tmf.filter.model.ITmfFilterTreeNode; -import org.eclipse.linuxtools.tmf.filter.model.TmfFilterAndNode; -import org.eclipse.linuxtools.tmf.filter.model.TmfFilterCompareNode; -import org.eclipse.linuxtools.tmf.filter.model.TmfFilterCompareNode.Type; -import org.eclipse.linuxtools.tmf.filter.model.TmfFilterContainsNode; -import org.eclipse.linuxtools.tmf.filter.model.TmfFilterEqualsNode; -import org.eclipse.linuxtools.tmf.filter.model.TmfFilterEventTypeNode; -import org.eclipse.linuxtools.tmf.filter.model.TmfFilterMatchesNode; -import org.eclipse.linuxtools.tmf.filter.model.TmfFilterNode; -import org.eclipse.linuxtools.tmf.filter.model.TmfFilterOrNode; -import org.eclipse.linuxtools.tmf.filter.model.TmfFilterRootNode; -import org.eclipse.linuxtools.tmf.filter.model.TmfFilterTreeNode; +import org.eclipse.linuxtools.tmf.core.filter.model.ITmfFilterTreeNode; +import org.eclipse.linuxtools.tmf.core.filter.model.TmfFilterAndNode; +import org.eclipse.linuxtools.tmf.core.filter.model.TmfFilterCompareNode; +import org.eclipse.linuxtools.tmf.core.filter.model.TmfFilterContainsNode; +import org.eclipse.linuxtools.tmf.core.filter.model.TmfFilterEqualsNode; +import org.eclipse.linuxtools.tmf.core.filter.model.TmfFilterEventTypeNode; +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.filter.model.TmfFilterTreeNode; +import org.eclipse.linuxtools.tmf.core.filter.model.TmfFilterCompareNode.Type; import org.xml.sax.Attributes; import org.xml.sax.SAXException; import org.xml.sax.helpers.DefaultHandler; diff --git a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/filter/xml/TmfFilterXMLParser.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/filter/xml/TmfFilterXMLParser.java similarity index 90% rename from org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/filter/xml/TmfFilterXMLParser.java rename to org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/filter/xml/TmfFilterXMLParser.java index f58ed8ccec..b56a5d235e 100644 --- a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/filter/xml/TmfFilterXMLParser.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/filter/xml/TmfFilterXMLParser.java @@ -10,14 +10,14 @@ * Yuriy Vashchuk (yvashchuk@gmail.com) - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.tmf.filter.xml; +package org.eclipse.linuxtools.tmf.core.filter.xml; import java.io.IOException; import javax.xml.parsers.ParserConfigurationException; import javax.xml.parsers.SAXParserFactory; -import org.eclipse.linuxtools.tmf.filter.model.ITmfFilterTreeNode; +import org.eclipse.linuxtools.tmf.core.filter.model.ITmfFilterTreeNode; import org.xml.sax.SAXException; import org.xml.sax.XMLReader; diff --git a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/filter/xml/TmfFilterXMLWriter.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/filter/xml/TmfFilterXMLWriter.java similarity index 87% rename from org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/filter/xml/TmfFilterXMLWriter.java rename to org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/filter/xml/TmfFilterXMLWriter.java index ffd5585875..3e542498d3 100644 --- a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/filter/xml/TmfFilterXMLWriter.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/filter/xml/TmfFilterXMLWriter.java @@ -10,7 +10,7 @@ * Yuriy Vashchuk (yvashchuk@gmail.com) - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.tmf.filter.xml; +package org.eclipse.linuxtools.tmf.core.filter.xml; import java.io.File; import java.io.IOException; @@ -25,15 +25,15 @@ import javax.xml.transform.TransformerFactory; import javax.xml.transform.dom.DOMSource; import javax.xml.transform.stream.StreamResult; -import org.eclipse.linuxtools.tmf.filter.model.ITmfFilterTreeNode; -import org.eclipse.linuxtools.tmf.filter.model.TmfFilterAndNode; -import org.eclipse.linuxtools.tmf.filter.model.TmfFilterCompareNode; -import org.eclipse.linuxtools.tmf.filter.model.TmfFilterContainsNode; -import org.eclipse.linuxtools.tmf.filter.model.TmfFilterEqualsNode; -import org.eclipse.linuxtools.tmf.filter.model.TmfFilterEventTypeNode; -import org.eclipse.linuxtools.tmf.filter.model.TmfFilterMatchesNode; -import org.eclipse.linuxtools.tmf.filter.model.TmfFilterNode; -import org.eclipse.linuxtools.tmf.filter.model.TmfFilterOrNode; +import org.eclipse.linuxtools.tmf.core.filter.model.ITmfFilterTreeNode; +import org.eclipse.linuxtools.tmf.core.filter.model.TmfFilterAndNode; +import org.eclipse.linuxtools.tmf.core.filter.model.TmfFilterCompareNode; +import org.eclipse.linuxtools.tmf.core.filter.model.TmfFilterContainsNode; +import org.eclipse.linuxtools.tmf.core.filter.model.TmfFilterEqualsNode; +import org.eclipse.linuxtools.tmf.core.filter.model.TmfFilterEventTypeNode; +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.w3c.dom.Document; import org.w3c.dom.Element; diff --git a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/io/BufferedRandomAccessFile.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/io/BufferedRandomAccessFile.java similarity index 95% rename from org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/io/BufferedRandomAccessFile.java rename to org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/io/BufferedRandomAccessFile.java index 435952fc12..c2980d2c20 100644 --- a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/io/BufferedRandomAccessFile.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/io/BufferedRandomAccessFile.java @@ -11,7 +11,7 @@ * (http://www.javaworld.com/javatips/jw-javatip26.html) ******************************************************************************/ -package org.eclipse.linuxtools.tmf.io; +package org.eclipse.linuxtools.tmf.core.io; import java.io.File; import java.io.IOException; diff --git a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/parser/ITmfEventParser.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/parser/ITmfEventParser.java similarity index 79% rename from org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/parser/ITmfEventParser.java rename to org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/parser/ITmfEventParser.java index bf5f34d341..910db144c4 100644 --- a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/parser/ITmfEventParser.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/parser/ITmfEventParser.java @@ -10,13 +10,13 @@ * Francois Chouinard - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.tmf.parser; +package org.eclipse.linuxtools.tmf.core.parser; import java.io.IOException; -import org.eclipse.linuxtools.tmf.event.TmfEvent; -import org.eclipse.linuxtools.tmf.trace.ITmfTrace; -import org.eclipse.linuxtools.tmf.trace.TmfContext; +import org.eclipse.linuxtools.tmf.core.event.TmfEvent; +import org.eclipse.linuxtools.tmf.core.trace.ITmfTrace; +import org.eclipse.linuxtools.tmf.core.trace.TmfContext; /** * ITmfEventParser diff --git a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/request/ITmfDataRequest.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/request/ITmfDataRequest.java similarity index 96% rename from org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/request/ITmfDataRequest.java rename to org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/request/ITmfDataRequest.java index 9e3760f74e..feec21c7a4 100644 --- a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/request/ITmfDataRequest.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/request/ITmfDataRequest.java @@ -10,9 +10,9 @@ * Francois Chouinard - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.tmf.request; +package org.eclipse.linuxtools.tmf.core.request; -import org.eclipse.linuxtools.tmf.event.TmfData; +import org.eclipse.linuxtools.tmf.core.event.TmfData; /** * ITmfDataRequest diff --git a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/request/ITmfEventRequest.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/request/ITmfEventRequest.java similarity index 85% rename from org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/request/ITmfEventRequest.java rename to org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/request/ITmfEventRequest.java index 9e28b287d7..9014380c02 100644 --- a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/request/ITmfEventRequest.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/request/ITmfEventRequest.java @@ -10,10 +10,10 @@ * Francois Chouinard - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.tmf.request; +package org.eclipse.linuxtools.tmf.core.request; -import org.eclipse.linuxtools.tmf.event.TmfEvent; -import org.eclipse.linuxtools.tmf.event.TmfTimeRange; +import org.eclipse.linuxtools.tmf.core.event.TmfEvent; +import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange; /** * ITmfEventRequest diff --git a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/request/TmfCoalescedDataRequest.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/request/TmfCoalescedDataRequest.java similarity index 98% rename from org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/request/TmfCoalescedDataRequest.java rename to org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/request/TmfCoalescedDataRequest.java index 738e8f1b67..fc923b5036 100644 --- a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/request/TmfCoalescedDataRequest.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/request/TmfCoalescedDataRequest.java @@ -10,11 +10,11 @@ * Francois Chouinard - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.tmf.request; +package org.eclipse.linuxtools.tmf.core.request; import java.util.Vector; -import org.eclipse.linuxtools.tmf.event.TmfData; +import org.eclipse.linuxtools.tmf.core.event.TmfData; /** * TmfCoalescedDataRequest diff --git a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/request/TmfCoalescedEventRequest.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/request/TmfCoalescedEventRequest.java similarity index 96% rename from org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/request/TmfCoalescedEventRequest.java rename to org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/request/TmfCoalescedEventRequest.java index efbb88a03d..13327067bd 100644 --- a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/request/TmfCoalescedEventRequest.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/request/TmfCoalescedEventRequest.java @@ -10,11 +10,11 @@ * Francois Chouinard - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.tmf.request; +package org.eclipse.linuxtools.tmf.core.request; -import org.eclipse.linuxtools.tmf.event.TmfEvent; -import org.eclipse.linuxtools.tmf.event.TmfTimeRange; -import org.eclipse.linuxtools.tmf.event.TmfTimestamp; +import org.eclipse.linuxtools.tmf.core.event.TmfEvent; +import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange; +import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp; /** * TmfCoalescedEventRequest diff --git a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/request/TmfDataRequest.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/request/TmfDataRequest.java similarity index 98% rename from org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/request/TmfDataRequest.java rename to org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/request/TmfDataRequest.java index d4329bdaa4..9f06934a5b 100644 --- a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/request/TmfDataRequest.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/request/TmfDataRequest.java @@ -10,12 +10,12 @@ * Francois Chouinard - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.tmf.request; +package org.eclipse.linuxtools.tmf.core.request; import java.util.concurrent.CountDownLatch; -import org.eclipse.linuxtools.tmf.Tracer; -import org.eclipse.linuxtools.tmf.event.TmfData; +import org.eclipse.linuxtools.tmf.core.Tracer; +import org.eclipse.linuxtools.tmf.core.event.TmfData; /** * TmfDataRequest diff --git a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/request/TmfEventRequest.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/request/TmfEventRequest.java similarity index 96% rename from org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/request/TmfEventRequest.java rename to org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/request/TmfEventRequest.java index f5375a3bf8..e34f39b52e 100644 --- a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/request/TmfEventRequest.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/request/TmfEventRequest.java @@ -10,10 +10,10 @@ * Francois Chouinard - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.tmf.request; +package org.eclipse.linuxtools.tmf.core.request; -import org.eclipse.linuxtools.tmf.event.TmfEvent; -import org.eclipse.linuxtools.tmf.event.TmfTimeRange; +import org.eclipse.linuxtools.tmf.core.event.TmfEvent; +import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange; /** * TmfEventRequest diff --git a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/request/TmfRequestExecutor.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/request/TmfRequestExecutor.java similarity index 94% rename from org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/request/TmfRequestExecutor.java rename to org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/request/TmfRequestExecutor.java index 56f967b2ec..ef406dc9c8 100644 --- a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/request/TmfRequestExecutor.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/request/TmfRequestExecutor.java @@ -10,7 +10,7 @@ * Francois Chouinard - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.tmf.request; +package org.eclipse.linuxtools.tmf.core.request; import java.util.Comparator; import java.util.concurrent.Executor; @@ -18,9 +18,9 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.PriorityBlockingQueue; -import org.eclipse.linuxtools.tmf.Tracer; -import org.eclipse.linuxtools.tmf.component.TmfThread; -import org.eclipse.linuxtools.tmf.request.ITmfDataRequest.ExecutionType; +import org.eclipse.linuxtools.tmf.core.Tracer; +import org.eclipse.linuxtools.tmf.core.component.TmfThread; +import org.eclipse.linuxtools.tmf.core.request.ITmfDataRequest.ExecutionType; /** * TmfRequestExecutor diff --git a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/signal/TmfEndSynchSignal.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/signal/TmfEndSynchSignal.java similarity index 93% rename from org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/signal/TmfEndSynchSignal.java rename to org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/signal/TmfEndSynchSignal.java index caeaff17e7..e824e8356e 100644 --- a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/signal/TmfEndSynchSignal.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/signal/TmfEndSynchSignal.java @@ -10,7 +10,7 @@ * Francois Chouinard - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.tmf.signal; +package org.eclipse.linuxtools.tmf.core.signal; /** * TmfEndSynchSignal diff --git a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/signal/TmfExperimentDisposedSignal.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/signal/TmfExperimentDisposedSignal.java similarity index 86% rename from org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/signal/TmfExperimentDisposedSignal.java rename to org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/signal/TmfExperimentDisposedSignal.java index 33bfe55c4e..efa66b3399 100644 --- a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/signal/TmfExperimentDisposedSignal.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/signal/TmfExperimentDisposedSignal.java @@ -10,10 +10,10 @@ * Francois Chouinard - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.tmf.signal; +package org.eclipse.linuxtools.tmf.core.signal; -import org.eclipse.linuxtools.tmf.event.TmfEvent; -import org.eclipse.linuxtools.tmf.experiment.TmfExperiment; +import org.eclipse.linuxtools.tmf.core.event.TmfEvent; +import org.eclipse.linuxtools.tmf.core.experiment.TmfExperiment; /** * TmfExperimentDisposedSignal diff --git a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/signal/TmfExperimentRangeUpdatedSignal.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/signal/TmfExperimentRangeUpdatedSignal.java similarity index 85% rename from org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/signal/TmfExperimentRangeUpdatedSignal.java rename to org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/signal/TmfExperimentRangeUpdatedSignal.java index 80a94ad238..cb08b29d77 100644 --- a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/signal/TmfExperimentRangeUpdatedSignal.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/signal/TmfExperimentRangeUpdatedSignal.java @@ -10,11 +10,11 @@ * Patrick Tasse - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.tmf.signal; +package org.eclipse.linuxtools.tmf.core.signal; -import org.eclipse.linuxtools.tmf.event.TmfEvent; -import org.eclipse.linuxtools.tmf.event.TmfTimeRange; -import org.eclipse.linuxtools.tmf.experiment.TmfExperiment; +import org.eclipse.linuxtools.tmf.core.event.TmfEvent; +import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange; +import org.eclipse.linuxtools.tmf.core.experiment.TmfExperiment; /** * TmfExperimentRangeUpdatedSignal diff --git a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/signal/TmfExperimentSelectedSignal.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/signal/TmfExperimentSelectedSignal.java similarity index 86% rename from org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/signal/TmfExperimentSelectedSignal.java rename to org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/signal/TmfExperimentSelectedSignal.java index 9aa264fd68..a476d768b7 100644 --- a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/signal/TmfExperimentSelectedSignal.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/signal/TmfExperimentSelectedSignal.java @@ -10,10 +10,10 @@ * Francois Chouinard - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.tmf.signal; +package org.eclipse.linuxtools.tmf.core.signal; -import org.eclipse.linuxtools.tmf.event.TmfEvent; -import org.eclipse.linuxtools.tmf.experiment.TmfExperiment; +import org.eclipse.linuxtools.tmf.core.event.TmfEvent; +import org.eclipse.linuxtools.tmf.core.experiment.TmfExperiment; /** * TmfExperimentSelectedSignal diff --git a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/signal/TmfExperimentUpdatedSignal.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/signal/TmfExperimentUpdatedSignal.java similarity index 88% rename from org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/signal/TmfExperimentUpdatedSignal.java rename to org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/signal/TmfExperimentUpdatedSignal.java index f217f4c57f..738a88ff19 100644 --- a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/signal/TmfExperimentUpdatedSignal.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/signal/TmfExperimentUpdatedSignal.java @@ -10,10 +10,10 @@ * Francois Chouinard - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.tmf.signal; +package org.eclipse.linuxtools.tmf.core.signal; -import org.eclipse.linuxtools.tmf.event.TmfEvent; -import org.eclipse.linuxtools.tmf.experiment.TmfExperiment; +import org.eclipse.linuxtools.tmf.core.event.TmfEvent; +import org.eclipse.linuxtools.tmf.core.experiment.TmfExperiment; /** * TmfExperimentUpdatedSignal diff --git a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/signal/TmfRangeSynchSignal.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/signal/TmfRangeSynchSignal.java similarity index 86% rename from org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/signal/TmfRangeSynchSignal.java rename to org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/signal/TmfRangeSynchSignal.java index b73b0d7fce..1892b3cb3c 100644 --- a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/signal/TmfRangeSynchSignal.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/signal/TmfRangeSynchSignal.java @@ -10,10 +10,10 @@ * Francois Chouinard - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.tmf.signal; +package org.eclipse.linuxtools.tmf.core.signal; -import org.eclipse.linuxtools.tmf.event.TmfTimeRange; -import org.eclipse.linuxtools.tmf.event.TmfTimestamp; +import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange; +import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp; /** * TmfRangeSynchSignal diff --git a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/signal/TmfSignal.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/signal/TmfSignal.java similarity index 95% rename from org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/signal/TmfSignal.java rename to org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/signal/TmfSignal.java index 340bfc179e..ebf321096a 100644 --- a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/signal/TmfSignal.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/signal/TmfSignal.java @@ -10,7 +10,7 @@ * Francois Chouinard - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.tmf.signal; +package org.eclipse.linuxtools.tmf.core.signal; /** * TmfSignal diff --git a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/signal/TmfSignalHandler.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/signal/TmfSignalHandler.java similarity index 94% rename from org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/signal/TmfSignalHandler.java rename to org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/signal/TmfSignalHandler.java index 238cea988c..c0486cae91 100644 --- a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/signal/TmfSignalHandler.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/signal/TmfSignalHandler.java @@ -10,7 +10,7 @@ * Francois Chouinard - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.tmf.signal; +package org.eclipse.linuxtools.tmf.core.signal; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/signal/TmfSignalManager.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/signal/TmfSignalManager.java similarity index 98% rename from org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/signal/TmfSignalManager.java rename to org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/signal/TmfSignalManager.java index 45a54a7902..46581eb36e 100644 --- a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/signal/TmfSignalManager.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/signal/TmfSignalManager.java @@ -10,7 +10,7 @@ * Francois Chouinard - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.tmf.signal; +package org.eclipse.linuxtools.tmf.core.signal; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; @@ -19,7 +19,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.eclipse.linuxtools.tmf.Tracer; +import org.eclipse.linuxtools.tmf.core.Tracer; /** * TmfSignalHandler diff --git a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/signal/TmfSignalTracer.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/signal/TmfSignalTracer.java similarity index 95% rename from org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/signal/TmfSignalTracer.java rename to org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/signal/TmfSignalTracer.java index 5b0b0d5e9b..2c58b513f4 100644 --- a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/signal/TmfSignalTracer.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/signal/TmfSignalTracer.java @@ -10,7 +10,7 @@ * Francois Chouinard - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.tmf.signal; +package org.eclipse.linuxtools.tmf.core.signal; /** * TmfSignalTracer diff --git a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/signal/TmfStartSynchSignal.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/signal/TmfStartSynchSignal.java similarity index 93% rename from org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/signal/TmfStartSynchSignal.java rename to org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/signal/TmfStartSynchSignal.java index a833a16423..6415e1c5bd 100644 --- a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/signal/TmfStartSynchSignal.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/signal/TmfStartSynchSignal.java @@ -10,7 +10,7 @@ * Francois Chouinard - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.tmf.signal; +package org.eclipse.linuxtools.tmf.core.signal; /** * TmfStartSynchSignal diff --git a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/signal/TmfTimeSynchSignal.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/signal/TmfTimeSynchSignal.java similarity index 90% rename from org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/signal/TmfTimeSynchSignal.java rename to org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/signal/TmfTimeSynchSignal.java index 77fada3934..1b7cb09570 100644 --- a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/signal/TmfTimeSynchSignal.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/signal/TmfTimeSynchSignal.java @@ -10,9 +10,9 @@ * Francois Chouinard - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.tmf.signal; +package org.eclipse.linuxtools.tmf.core.signal; -import org.eclipse.linuxtools.tmf.event.TmfTimestamp; +import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp; /** * TmfTimeSynchSignal diff --git a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/signal/TmfTraceSelectedSignal.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/signal/TmfTraceSelectedSignal.java similarity index 87% rename from org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/signal/TmfTraceSelectedSignal.java rename to org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/signal/TmfTraceSelectedSignal.java index f98ec44325..3b2a995c97 100644 --- a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/signal/TmfTraceSelectedSignal.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/signal/TmfTraceSelectedSignal.java @@ -10,9 +10,9 @@ * Patrick Tasse - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.tmf.signal; +package org.eclipse.linuxtools.tmf.core.signal; -import org.eclipse.linuxtools.tmf.trace.ITmfTrace; +import org.eclipse.linuxtools.tmf.core.trace.ITmfTrace; /** * TmfTraceSelectedSignal diff --git a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/signal/TmfTraceUpdatedSignal.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/signal/TmfTraceUpdatedSignal.java similarity index 88% rename from org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/signal/TmfTraceUpdatedSignal.java rename to org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/signal/TmfTraceUpdatedSignal.java index db26c04eb3..75394332aa 100644 --- a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/signal/TmfTraceUpdatedSignal.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/signal/TmfTraceUpdatedSignal.java @@ -10,10 +10,10 @@ * Francois Chouinard - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.tmf.signal; +package org.eclipse.linuxtools.tmf.core.signal; -import org.eclipse.linuxtools.tmf.event.TmfTimeRange; -import org.eclipse.linuxtools.tmf.trace.ITmfTrace; +import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange; +import org.eclipse.linuxtools.tmf.core.trace.ITmfTrace; /** * TmfTraceUpdatedSignal diff --git a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/trace/ITmfContext.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/ITmfContext.java similarity index 95% rename from org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/trace/ITmfContext.java rename to org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/ITmfContext.java index 5536cf7f3a..caca47b86b 100644 --- a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/trace/ITmfContext.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/ITmfContext.java @@ -10,7 +10,7 @@ * Francois Chouinard - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.tmf.trace; +package org.eclipse.linuxtools.tmf.core.trace; /** * ITmfContext diff --git a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/trace/ITmfLocation.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/ITmfLocation.java similarity index 94% rename from org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/trace/ITmfLocation.java rename to org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/ITmfLocation.java index 843b0169f6..09ef798871 100644 --- a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/trace/ITmfLocation.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/ITmfLocation.java @@ -10,7 +10,7 @@ * Francois Chouinard - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.tmf.trace; +package org.eclipse.linuxtools.tmf.core.trace; /** * ITmfLocation diff --git a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/trace/ITmfTrace.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/ITmfTrace.java similarity index 93% rename from org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/trace/ITmfTrace.java rename to org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/ITmfTrace.java index 4af6fd4811..ce589ec2c1 100644 --- a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/trace/ITmfTrace.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/ITmfTrace.java @@ -10,15 +10,15 @@ * Francois Chouinard - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.tmf.trace; +package org.eclipse.linuxtools.tmf.core.trace; import java.io.FileNotFoundException; import org.eclipse.core.resources.IProject; -import org.eclipse.linuxtools.tmf.component.ITmfComponent; -import org.eclipse.linuxtools.tmf.event.TmfEvent; -import org.eclipse.linuxtools.tmf.event.TmfTimeRange; -import org.eclipse.linuxtools.tmf.event.TmfTimestamp; +import org.eclipse.linuxtools.tmf.core.component.ITmfComponent; +import org.eclipse.linuxtools.tmf.core.event.TmfEvent; +import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange; +import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp; /** * ITmfTrace diff --git a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/trace/TmfCheckpoint.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/TmfCheckpoint.java similarity index 97% rename from org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/trace/TmfCheckpoint.java rename to org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/TmfCheckpoint.java index 7cea1cba9f..4e0881dd3d 100644 --- a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/trace/TmfCheckpoint.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/TmfCheckpoint.java @@ -10,9 +10,9 @@ * Francois Chouinard - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.tmf.trace; +package org.eclipse.linuxtools.tmf.core.trace; -import org.eclipse.linuxtools.tmf.event.TmfTimestamp; +import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp; /** * TmfCheckpoint diff --git a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/trace/TmfContext.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/TmfContext.java similarity index 98% rename from org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/trace/TmfContext.java rename to org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/TmfContext.java index 4b93029f8a..bd5b10eb05 100644 --- a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/trace/TmfContext.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/TmfContext.java @@ -10,7 +10,7 @@ * Francois Chouinard - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.tmf.trace; +package org.eclipse.linuxtools.tmf.core.trace; /** * TmfContext diff --git a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/trace/TmfLocation.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/TmfLocation.java similarity index 98% rename from org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/trace/TmfLocation.java rename to org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/TmfLocation.java index 33bb23076b..55c5a8a8d2 100644 --- a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/trace/TmfLocation.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/TmfLocation.java @@ -10,7 +10,7 @@ * Francois Chouinard - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.tmf.trace; +package org.eclipse.linuxtools.tmf.core.trace; import java.lang.reflect.Method; diff --git a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/trace/TmfTrace.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/TmfTrace.java similarity index 96% rename from org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/trace/TmfTrace.java rename to org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/TmfTrace.java index 12a6b4cb4f..b1e9b80ad6 100644 --- a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/trace/TmfTrace.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/TmfTrace.java @@ -10,7 +10,7 @@ * Francois Chouinard - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.tmf.trace; +package org.eclipse.linuxtools.tmf.core.trace; import java.io.File; import java.io.FileNotFoundException; @@ -22,15 +22,15 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.jobs.Job; -import org.eclipse.linuxtools.tmf.component.TmfEventProvider; -import org.eclipse.linuxtools.tmf.event.TmfEvent; -import org.eclipse.linuxtools.tmf.event.TmfTimeRange; -import org.eclipse.linuxtools.tmf.event.TmfTimestamp; -import org.eclipse.linuxtools.tmf.request.ITmfDataRequest; -import org.eclipse.linuxtools.tmf.request.ITmfEventRequest; -import org.eclipse.linuxtools.tmf.request.TmfDataRequest; -import org.eclipse.linuxtools.tmf.request.TmfEventRequest; -import org.eclipse.linuxtools.tmf.signal.TmfTraceUpdatedSignal; +import org.eclipse.linuxtools.tmf.core.component.TmfEventProvider; +import org.eclipse.linuxtools.tmf.core.event.TmfEvent; +import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange; +import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp; +import org.eclipse.linuxtools.tmf.core.request.ITmfDataRequest; +import org.eclipse.linuxtools.tmf.core.request.ITmfEventRequest; +import org.eclipse.linuxtools.tmf.core.request.TmfDataRequest; +import org.eclipse.linuxtools.tmf.core.request.TmfEventRequest; +import org.eclipse.linuxtools.tmf.core.signal.TmfTraceUpdatedSignal; /** * TmfTrace diff --git a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/uml2sd/ITmfAsyncSequenceDiagramEvent.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/uml2sd/ITmfAsyncSequenceDiagramEvent.java similarity index 86% rename from org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/uml2sd/ITmfAsyncSequenceDiagramEvent.java rename to org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/uml2sd/ITmfAsyncSequenceDiagramEvent.java index b3ba7cc14a..74b7ac4a9b 100644 --- a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/uml2sd/ITmfAsyncSequenceDiagramEvent.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/uml2sd/ITmfAsyncSequenceDiagramEvent.java @@ -9,9 +9,9 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.tmf.uml2sd; +package org.eclipse.linuxtools.tmf.core.uml2sd; -import org.eclipse.linuxtools.tmf.event.TmfTimestamp; +import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp; public interface ITmfAsyncSequenceDiagramEvent extends ITmfSyncSequenceDiagramEvent { /** diff --git a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/uml2sd/ITmfSyncSequenceDiagramEvent.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/uml2sd/ITmfSyncSequenceDiagramEvent.java similarity index 89% rename from org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/uml2sd/ITmfSyncSequenceDiagramEvent.java rename to org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/uml2sd/ITmfSyncSequenceDiagramEvent.java index b0db304b5e..e13b0070a9 100644 --- a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/uml2sd/ITmfSyncSequenceDiagramEvent.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/uml2sd/ITmfSyncSequenceDiagramEvent.java @@ -9,9 +9,9 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.tmf.uml2sd; +package org.eclipse.linuxtools.tmf.core.uml2sd; -import org.eclipse.linuxtools.tmf.event.TmfTimestamp; +import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp; public interface ITmfSyncSequenceDiagramEvent { diff --git a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/uml2sd/TmfAsyncSequenceDiagramEvent.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/uml2sd/TmfAsyncSequenceDiagramEvent.java similarity index 92% rename from org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/uml2sd/TmfAsyncSequenceDiagramEvent.java rename to org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/uml2sd/TmfAsyncSequenceDiagramEvent.java index 422723078f..0ddee4eb72 100644 --- a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/uml2sd/TmfAsyncSequenceDiagramEvent.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/uml2sd/TmfAsyncSequenceDiagramEvent.java @@ -9,10 +9,10 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.tmf.uml2sd; +package org.eclipse.linuxtools.tmf.core.uml2sd; -import org.eclipse.linuxtools.tmf.event.TmfEvent; -import org.eclipse.linuxtools.tmf.event.TmfTimestamp; +import org.eclipse.linuxtools.tmf.core.event.TmfEvent; +import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp; /** * TmfAsyncSequenceDiagramEvent diff --git a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/uml2sd/TmfSyncSequenceDiagramEvent.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/uml2sd/TmfSyncSequenceDiagramEvent.java similarity index 94% rename from org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/uml2sd/TmfSyncSequenceDiagramEvent.java rename to org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/uml2sd/TmfSyncSequenceDiagramEvent.java index 2b7375decc..4a16c780e0 100644 --- a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/uml2sd/TmfSyncSequenceDiagramEvent.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/uml2sd/TmfSyncSequenceDiagramEvent.java @@ -9,10 +9,10 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.tmf.uml2sd; +package org.eclipse.linuxtools.tmf.core.uml2sd; -import org.eclipse.linuxtools.tmf.event.TmfEvent; -import org.eclipse.linuxtools.tmf.event.TmfTimestamp; +import org.eclipse.linuxtools.tmf.core.event.TmfEvent; +import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp; /** * TmfSyncSequenceDiagramEvent diff --git a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/util/TmfFixedArray.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/util/TmfFixedArray.java similarity index 99% rename from org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/util/TmfFixedArray.java rename to org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/util/TmfFixedArray.java index af26d3e35b..140c799ab8 100755 --- a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/util/TmfFixedArray.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/util/TmfFixedArray.java @@ -11,7 +11,7 @@ * Mathieu Denis (mathieu.denis@polymtl.ca) - Correction and refactoring *******************************************************************************/ -package org.eclipse.linuxtools.tmf.util; +package org.eclipse.linuxtools.tmf.core.util; import java.lang.reflect.Array; import java.util.AbstractList; diff --git a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/util/TmfSortedArrayList.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/util/TmfSortedArrayList.java similarity index 95% rename from org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/util/TmfSortedArrayList.java rename to org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/util/TmfSortedArrayList.java index ceb39c5706..fa52bdb531 100644 --- a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/util/TmfSortedArrayList.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/util/TmfSortedArrayList.java @@ -10,7 +10,7 @@ * Francois Chouinard - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.tmf.util; +package org.eclipse.linuxtools.tmf.core.util; import java.util.ArrayList; diff --git a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/util/TmfTraceType.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/util/TmfTraceType.java similarity index 98% rename from org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/util/TmfTraceType.java rename to org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/util/TmfTraceType.java index 748e46752f..305f95830c 100644 --- a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/util/TmfTraceType.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/util/TmfTraceType.java @@ -10,7 +10,7 @@ * Patrick Tasse - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.tmf.util; +package org.eclipse.linuxtools.tmf.core.util; import java.util.LinkedList; import java.util.List; diff --git a/org.eclipse.linuxtools.tmf/traceset/.gitignore b/org.eclipse.linuxtools.tmf.core/traceset/.gitignore similarity index 100% rename from org.eclipse.linuxtools.tmf/traceset/.gitignore rename to org.eclipse.linuxtools.tmf.core/traceset/.gitignore 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 c6bcbf316f..c5dbbaa789 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,13 @@ import junit.framework.TestCase; import org.eclipse.jface.viewers.ColumnLabelProvider; import org.eclipse.jface.viewers.ViewerComparator; -import org.eclipse.linuxtools.tmf.event.TmfEvent; -import org.eclipse.linuxtools.tmf.event.TmfEventContent; -import org.eclipse.linuxtools.tmf.event.TmfEventReference; -import org.eclipse.linuxtools.tmf.event.TmfEventSource; -import org.eclipse.linuxtools.tmf.event.TmfEventType; -import org.eclipse.linuxtools.tmf.event.TmfTimestamp; +import org.eclipse.linuxtools.tmf.core.event.TmfEvent; +import org.eclipse.linuxtools.tmf.core.event.TmfEventContent; +import org.eclipse.linuxtools.tmf.core.event.TmfEventReference; +import org.eclipse.linuxtools.tmf.core.event.TmfEventSource; +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; @@ -31,7 +32,6 @@ import org.eclipse.linuxtools.tmf.ui.views.statistics.model.TmfBaseColumnData.IT import org.eclipse.linuxtools.tmf.ui.views.statistics.model.TmfBaseColumnDataProvider; import org.eclipse.linuxtools.tmf.ui.views.statistics.model.TmfBaseStatisticsTree; import org.eclipse.linuxtools.tmf.ui.views.statistics.model.TmfStatisticsTreeNode; -import org.eclipse.linuxtools.tmf.util.TmfFixedArray; @SuppressWarnings("nls") public class TmfBaseColumnDataProviderTest extends TestCase { 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 7c55bd5fb0..e44ce0fe22 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,11 +17,11 @@ 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.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; import org.eclipse.linuxtools.tmf.ui.views.statistics.model.TmfStatisticsTreeNode; -import org.eclipse.linuxtools.tmf.util.TmfFixedArray; import org.eclipse.swt.SWT; import org.eclipse.swt.graphics.Image; import org.eclipse.ui.ISharedImages; 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 cfe1ae3c08..f86c266682 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,18 +19,18 @@ import java.util.Vector; import junit.framework.TestCase; -import org.eclipse.linuxtools.tmf.event.TmfEvent; -import org.eclipse.linuxtools.tmf.event.TmfEventContent; -import org.eclipse.linuxtools.tmf.event.TmfEventReference; -import org.eclipse.linuxtools.tmf.event.TmfEventSource; -import org.eclipse.linuxtools.tmf.event.TmfEventType; -import org.eclipse.linuxtools.tmf.event.TmfTimestamp; +import org.eclipse.linuxtools.tmf.core.event.TmfEvent; +import org.eclipse.linuxtools.tmf.core.event.TmfEventContent; +import org.eclipse.linuxtools.tmf.core.event.TmfEventReference; +import org.eclipse.linuxtools.tmf.core.event.TmfEventSource; +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.TmfBaseStatisticsTree; import org.eclipse.linuxtools.tmf.ui.views.statistics.model.AbsTmfStatisticsTree; import org.eclipse.linuxtools.tmf.ui.views.statistics.model.TmfStatisticsTreeNode; -import org.eclipse.linuxtools.tmf.util.TmfFixedArray; @SuppressWarnings("nls") public class TmfBaseStatisticsDataTest extends TestCase { 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 73dbbfc048..0e98d8891d 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,18 +19,18 @@ import java.util.Vector; import junit.framework.TestCase; -import org.eclipse.linuxtools.tmf.event.TmfEvent; -import org.eclipse.linuxtools.tmf.event.TmfEventContent; -import org.eclipse.linuxtools.tmf.event.TmfEventReference; -import org.eclipse.linuxtools.tmf.event.TmfEventSource; -import org.eclipse.linuxtools.tmf.event.TmfEventType; -import org.eclipse.linuxtools.tmf.event.TmfTimestamp; +import org.eclipse.linuxtools.tmf.core.event.TmfEvent; +import org.eclipse.linuxtools.tmf.core.event.TmfEventContent; +import org.eclipse.linuxtools.tmf.core.event.TmfEventReference; +import org.eclipse.linuxtools.tmf.core.event.TmfEventSource; +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.TmfBaseStatisticsTree; import org.eclipse.linuxtools.tmf.ui.views.statistics.model.AbsTmfStatisticsTree; import org.eclipse.linuxtools.tmf.ui.views.statistics.model.TmfStatisticsTreeNode; -import org.eclipse.linuxtools.tmf.util.TmfFixedArray; @SuppressWarnings("nls") public class TmfStatisticsTreeNodeTest extends TestCase { 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 7457f2ba32..6f70752113 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,19 +19,19 @@ import java.util.Vector; import junit.framework.TestCase; -import org.eclipse.linuxtools.tmf.event.TmfEvent; -import org.eclipse.linuxtools.tmf.event.TmfEventContent; -import org.eclipse.linuxtools.tmf.event.TmfEventReference; -import org.eclipse.linuxtools.tmf.event.TmfEventSource; -import org.eclipse.linuxtools.tmf.event.TmfEventType; -import org.eclipse.linuxtools.tmf.event.TmfTimestamp; +import org.eclipse.linuxtools.tmf.core.event.TmfEvent; +import org.eclipse.linuxtools.tmf.core.event.TmfEventContent; +import org.eclipse.linuxtools.tmf.core.event.TmfEventReference; +import org.eclipse.linuxtools.tmf.core.event.TmfEventSource; +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.TmfBaseStatisticsTree; import org.eclipse.linuxtools.tmf.ui.views.statistics.model.AbsTmfStatisticsTree; import org.eclipse.linuxtools.tmf.ui.views.statistics.model.TmfStatisticsTreeNode; import org.eclipse.linuxtools.tmf.ui.views.statistics.model.TmfTreeContentProvider; -import org.eclipse.linuxtools.tmf.util.TmfFixedArray; @SuppressWarnings("nls") public class TmfTreeContentProviderTest extends TestCase { diff --git a/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/views/uml2sd/impl/IUml2SdSignalValidator.java b/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/views/uml2sd/impl/IUml2SdSignalValidator.java index 26294efb4a..82aa1c8535 100644 --- a/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/views/uml2sd/impl/IUml2SdSignalValidator.java +++ b/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/views/uml2sd/impl/IUml2SdSignalValidator.java @@ -11,8 +11,8 @@ *******************************************************************************/ package org.eclipse.linuxtools.tmf.ui.tests.views.uml2sd.impl; -import org.eclipse.linuxtools.tmf.event.TmfTimeRange; -import org.eclipse.linuxtools.tmf.event.TmfTimestamp; +import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange; +import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp; /** * Interface for testing signal handling within TmfUml2SD diff --git a/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/views/uml2sd/impl/TmfUml2SDSyncLoaderExpTest.java b/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/views/uml2sd/impl/TmfUml2SDSyncLoaderExpTest.java index 35ab759eda..c26c5e0464 100644 --- a/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/views/uml2sd/impl/TmfUml2SDSyncLoaderExpTest.java +++ b/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/views/uml2sd/impl/TmfUml2SDSyncLoaderExpTest.java @@ -17,7 +17,7 @@ import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; -import org.eclipse.linuxtools.tmf.signal.TmfSignalManager; +import org.eclipse.linuxtools.tmf.core.signal.TmfSignalManager; import org.eclipse.linuxtools.tmf.ui.views.uml2sd.handlers.provider.ISDAdvancedPagingProvider; import org.eclipse.linuxtools.tmf.ui.views.uml2sd.handlers.provider.ISDPagingProvider; import org.eclipse.linuxtools.tmf.ui.views.uml2sd.handlers.widgets.FilterCriteria; diff --git a/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/views/uml2sd/impl/TmfUml2SDSyncLoaderFindTest.java b/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/views/uml2sd/impl/TmfUml2SDSyncLoaderFindTest.java index 5b4b5db002..9fdf1a42c1 100644 --- a/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/views/uml2sd/impl/TmfUml2SDSyncLoaderFindTest.java +++ b/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/views/uml2sd/impl/TmfUml2SDSyncLoaderFindTest.java @@ -17,8 +17,8 @@ import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; -import org.eclipse.linuxtools.tmf.event.TmfTimeRange; -import org.eclipse.linuxtools.tmf.event.TmfTimestamp; +import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange; +import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp; import org.eclipse.linuxtools.tmf.ui.views.uml2sd.core.GraphNode; import org.eclipse.linuxtools.tmf.ui.views.uml2sd.core.Lifeline; import org.eclipse.linuxtools.tmf.ui.views.uml2sd.handlers.provider.ISDGraphNodeSupporter; diff --git a/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/views/uml2sd/impl/TmfUml2SDSyncLoaderSignalTest.java b/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/views/uml2sd/impl/TmfUml2SDSyncLoaderSignalTest.java index e84190ac0c..94c19987b7 100644 --- a/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/views/uml2sd/impl/TmfUml2SDSyncLoaderSignalTest.java +++ b/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/views/uml2sd/impl/TmfUml2SDSyncLoaderSignalTest.java @@ -15,9 +15,9 @@ import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; -import org.eclipse.linuxtools.tmf.event.TmfTimeRange; -import org.eclipse.linuxtools.tmf.event.TmfTimestamp; -import org.eclipse.linuxtools.tmf.signal.TmfRangeSynchSignal; +import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange; +import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp; +import org.eclipse.linuxtools.tmf.core.signal.TmfRangeSynchSignal; import org.eclipse.linuxtools.tmf.ui.views.uml2sd.core.GraphNode; public class TmfUml2SDSyncLoaderSignalTest extends TestCase { diff --git a/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/views/uml2sd/impl/TmfUml2SDSyncLoaderTimeTest.java b/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/views/uml2sd/impl/TmfUml2SDSyncLoaderTimeTest.java index da0e9b0cd8..92a5ec8617 100644 --- a/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/views/uml2sd/impl/TmfUml2SDSyncLoaderTimeTest.java +++ b/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/views/uml2sd/impl/TmfUml2SDSyncLoaderTimeTest.java @@ -17,10 +17,10 @@ import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; -import org.eclipse.linuxtools.tmf.event.TmfTimeRange; -import org.eclipse.linuxtools.tmf.event.TmfTimestamp; -import org.eclipse.linuxtools.tmf.signal.TmfRangeSynchSignal; -import org.eclipse.linuxtools.tmf.signal.TmfTimeSynchSignal; +import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange; +import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp; +import org.eclipse.linuxtools.tmf.core.signal.TmfRangeSynchSignal; +import org.eclipse.linuxtools.tmf.core.signal.TmfTimeSynchSignal; import org.eclipse.linuxtools.tmf.ui.views.uml2sd.core.GraphNode; import org.eclipse.linuxtools.tmf.ui.views.uml2sd.impl.TmfSyncMessage; diff --git a/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/views/uml2sd/impl/Uml2SDSignalValidator.java b/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/views/uml2sd/impl/Uml2SDSignalValidator.java index 8a6870d16c..ae159ce78d 100644 --- a/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/views/uml2sd/impl/Uml2SDSignalValidator.java +++ b/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/views/uml2sd/impl/Uml2SDSignalValidator.java @@ -11,14 +11,14 @@ *******************************************************************************/ package org.eclipse.linuxtools.tmf.ui.tests.views.uml2sd.impl; -import org.eclipse.linuxtools.tmf.component.TmfComponent; -import org.eclipse.linuxtools.tmf.event.TmfTimeRange; -import org.eclipse.linuxtools.tmf.event.TmfTimestamp; -import org.eclipse.linuxtools.tmf.signal.TmfEndSynchSignal; -import org.eclipse.linuxtools.tmf.signal.TmfRangeSynchSignal; -import org.eclipse.linuxtools.tmf.signal.TmfSignalHandler; -import org.eclipse.linuxtools.tmf.signal.TmfStartSynchSignal; -import org.eclipse.linuxtools.tmf.signal.TmfTimeSynchSignal; +import org.eclipse.linuxtools.tmf.core.component.TmfComponent; +import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange; +import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp; +import org.eclipse.linuxtools.tmf.core.signal.TmfEndSynchSignal; +import org.eclipse.linuxtools.tmf.core.signal.TmfRangeSynchSignal; +import org.eclipse.linuxtools.tmf.core.signal.TmfSignalHandler; +import org.eclipse.linuxtools.tmf.core.signal.TmfStartSynchSignal; +import org.eclipse.linuxtools.tmf.core.signal.TmfTimeSynchSignal; /** * Class to implement that certain signals are sent as well as are sent with correct content. 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 de169d3343..7ea731cb42 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 @@ -21,12 +21,12 @@ import java.util.List; import org.eclipse.core.runtime.FileLocator; import org.eclipse.core.runtime.Path; import org.eclipse.core.runtime.jobs.Job; -import org.eclipse.linuxtools.tmf.event.TmfEvent; -import org.eclipse.linuxtools.tmf.experiment.TmfExperiment; -import org.eclipse.linuxtools.tmf.parser.ITmfEventParser; -import org.eclipse.linuxtools.tmf.signal.TmfExperimentSelectedSignal; -import org.eclipse.linuxtools.tmf.trace.ITmfTrace; -import org.eclipse.linuxtools.tmf.trace.TmfTraceStub; +import org.eclipse.linuxtools.tmf.core.event.TmfEvent; +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.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/impl/Uml2SDTestTimestamp.java b/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/views/uml2sd/impl/Uml2SDTestTimestamp.java index 0fda30caca..c92d887a7d 100644 --- a/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/views/uml2sd/impl/Uml2SDTestTimestamp.java +++ b/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/views/uml2sd/impl/Uml2SDTestTimestamp.java @@ -11,7 +11,7 @@ *******************************************************************************/ package org.eclipse.linuxtools.tmf.ui.tests.views.uml2sd.impl; -import org.eclipse.linuxtools.tmf.event.TmfTimestamp; +import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp; public class Uml2SDTestTimestamp extends TmfTimestamp { // ------------------------------------------------------------------------ diff --git a/org.eclipse.linuxtools.tmf.ui.tests/widgetStubs/org/eclipse/linuxtools/tmf/ui/tests/uml2sd/load/TestLoaders.java b/org.eclipse.linuxtools.tmf.ui.tests/widgetStubs/org/eclipse/linuxtools/tmf/ui/tests/uml2sd/load/TestLoaders.java index 40881c8c55..9922b20fc3 100644 --- a/org.eclipse.linuxtools.tmf.ui.tests/widgetStubs/org/eclipse/linuxtools/tmf/ui/tests/uml2sd/load/TestLoaders.java +++ b/org.eclipse.linuxtools.tmf.ui.tests/widgetStubs/org/eclipse/linuxtools/tmf/ui/tests/uml2sd/load/TestLoaders.java @@ -8,7 +8,7 @@ import org.eclipse.jface.action.Action; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.StructuredSelection; -import org.eclipse.linuxtools.tmf.event.TmfTimestamp; +import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp; import org.eclipse.linuxtools.tmf.ui.views.uml2sd.SDView; import org.eclipse.linuxtools.tmf.ui.views.uml2sd.core.AsyncMessageReturn; import org.eclipse.linuxtools.tmf.ui.views.uml2sd.core.BasicExecutionOccurrence; 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 dfd4b85c80..4d6286719b 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 @@ -15,18 +15,18 @@ import java.io.EOFException; import java.io.IOException; import java.io.RandomAccessFile; -import org.eclipse.linuxtools.tmf.event.TmfEvent; -import org.eclipse.linuxtools.tmf.event.TmfEventContent; -import org.eclipse.linuxtools.tmf.event.TmfEventField; -import org.eclipse.linuxtools.tmf.event.TmfEventReference; -import org.eclipse.linuxtools.tmf.event.TmfEventSource; -import org.eclipse.linuxtools.tmf.event.TmfEventType; -import org.eclipse.linuxtools.tmf.event.TmfTimestamp; -import org.eclipse.linuxtools.tmf.parser.ITmfEventParser; -import org.eclipse.linuxtools.tmf.trace.ITmfTrace; -import org.eclipse.linuxtools.tmf.trace.TmfContext; -import org.eclipse.linuxtools.tmf.trace.TmfLocation; -import org.eclipse.linuxtools.tmf.trace.TmfTraceStub; +import org.eclipse.linuxtools.tmf.core.event.TmfEvent; +import org.eclipse.linuxtools.tmf.core.event.TmfEventContent; +import org.eclipse.linuxtools.tmf.core.event.TmfEventField; +import org.eclipse.linuxtools.tmf.core.event.TmfEventReference; +import org.eclipse.linuxtools.tmf.core.event.TmfEventSource; +import org.eclipse.linuxtools.tmf.core.event.TmfEventType; +import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp; +import org.eclipse.linuxtools.tmf.core.parser.ITmfEventParser; +import org.eclipse.linuxtools.tmf.core.trace.ITmfTrace; +import org.eclipse.linuxtools.tmf.core.trace.TmfContext; +import org.eclipse.linuxtools.tmf.core.trace.TmfLocation; +import org.eclipse.linuxtools.tmf.stubs.trace.TmfTraceStub; public class TmfUml2SDTestTrace implements ITmfEventParser { diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/editors/ITmfTraceEditor.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/editors/ITmfTraceEditor.java index a8d1824334..bee5a3bb4a 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/editors/ITmfTraceEditor.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/editors/ITmfTraceEditor.java @@ -13,7 +13,7 @@ package org.eclipse.linuxtools.tmf.ui.editors; import org.eclipse.core.resources.IResource; -import org.eclipse.linuxtools.tmf.trace.ITmfTrace; +import org.eclipse.linuxtools.tmf.core.trace.ITmfTrace; public interface ITmfTraceEditor { diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/editors/TmfEditor.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/editors/TmfEditor.java index 958f19a2bf..cd1e3e9a06 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/editors/TmfEditor.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/editors/TmfEditor.java @@ -12,9 +12,9 @@ package org.eclipse.linuxtools.tmf.ui.editors; -import org.eclipse.linuxtools.tmf.component.ITmfComponent; -import org.eclipse.linuxtools.tmf.signal.TmfSignal; -import org.eclipse.linuxtools.tmf.signal.TmfSignalManager; +import org.eclipse.linuxtools.tmf.core.component.ITmfComponent; +import org.eclipse.linuxtools.tmf.core.signal.TmfSignal; +import org.eclipse.linuxtools.tmf.core.signal.TmfSignalManager; import org.eclipse.ui.part.EditorPart; public abstract class TmfEditor extends EditorPart implements ITmfComponent { diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/editors/TmfEditorInput.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/editors/TmfEditorInput.java index c98f9956c0..a6cff91dc9 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/editors/TmfEditorInput.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/editors/TmfEditorInput.java @@ -16,7 +16,7 @@ import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.content.IContentType; import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.linuxtools.tmf.trace.ITmfTrace; +import org.eclipse.linuxtools.tmf.core.trace.ITmfTrace; import org.eclipse.ui.IEditorInput; import org.eclipse.ui.IFileEditorInput; import org.eclipse.ui.IPersistableElement; 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 7912862f46..8c0082980e 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 @@ -28,10 +28,11 @@ 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.tmf.event.TmfEvent; -import org.eclipse.linuxtools.tmf.signal.TmfSignalHandler; -import org.eclipse.linuxtools.tmf.signal.TmfTraceSelectedSignal; -import org.eclipse.linuxtools.tmf.trace.ITmfTrace; +import org.eclipse.linuxtools.tmf.core.event.TmfEvent; +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.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; @@ -40,7 +41,6 @@ import org.eclipse.linuxtools.tmf.ui.signal.TmfTraceClosedSignal; import org.eclipse.linuxtools.tmf.ui.signal.TmfTraceOpenedSignal; import org.eclipse.linuxtools.tmf.ui.signal.TmfTraceParserUpdatedSignal; import org.eclipse.linuxtools.tmf.ui.viewers.events.TmfEventsTable; -import org.eclipse.linuxtools.tmf.util.TmfTraceType; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Display; import org.eclipse.ui.IEditorInput; diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/editors/TmfMultiPageEditorPart.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/editors/TmfMultiPageEditorPart.java index ca4b90b28c..3da8e36439 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/editors/TmfMultiPageEditorPart.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/editors/TmfMultiPageEditorPart.java @@ -12,9 +12,9 @@ package org.eclipse.linuxtools.tmf.ui.editors; -import org.eclipse.linuxtools.tmf.component.ITmfComponent; -import org.eclipse.linuxtools.tmf.signal.TmfSignal; -import org.eclipse.linuxtools.tmf.signal.TmfSignalManager; +import org.eclipse.linuxtools.tmf.core.component.ITmfComponent; +import org.eclipse.linuxtools.tmf.core.signal.TmfSignal; +import org.eclipse.linuxtools.tmf.core.signal.TmfSignalManager; import org.eclipse.ui.part.MultiPageEditorPart; public abstract class TmfMultiPageEditorPart extends MultiPageEditorPart implements ITmfComponent { diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomEvent.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomEvent.java index d6a04cf4da..baebd5d0ff 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomEvent.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomEvent.java @@ -18,12 +18,12 @@ import java.util.Date; import java.util.HashMap; import java.util.Map; -import org.eclipse.linuxtools.tmf.event.TmfEvent; -import org.eclipse.linuxtools.tmf.event.TmfEventReference; -import org.eclipse.linuxtools.tmf.event.TmfEventSource; -import org.eclipse.linuxtools.tmf.event.TmfEventType; -import org.eclipse.linuxtools.tmf.event.TmfTimestamp; -import org.eclipse.linuxtools.tmf.trace.ITmfTrace; +import org.eclipse.linuxtools.tmf.core.event.TmfEvent; +import org.eclipse.linuxtools.tmf.core.event.TmfEventReference; +import org.eclipse.linuxtools.tmf.core.event.TmfEventSource; +import org.eclipse.linuxtools.tmf.core.event.TmfEventType; +import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp; +import org.eclipse.linuxtools.tmf.core.trace.ITmfTrace; import org.eclipse.linuxtools.tmf.ui.parsers.custom.CustomTraceDefinition.OutputColumn; public class CustomEvent extends TmfEvent { diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomEventContent.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomEventContent.java index 3db0494693..42086dcd24 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomEventContent.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomEventContent.java @@ -2,7 +2,7 @@ package org.eclipse.linuxtools.tmf.ui.parsers.custom; import java.util.Arrays; -import org.eclipse.linuxtools.tmf.event.TmfEventContent; +import org.eclipse.linuxtools.tmf.core.event.TmfEventContent; public class CustomEventContent extends TmfEventContent { diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomEventType.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomEventType.java index 1d07fef18d..8a6e4e7b24 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomEventType.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomEventType.java @@ -1,6 +1,6 @@ package org.eclipse.linuxtools.tmf.ui.parsers.custom; -import org.eclipse.linuxtools.tmf.event.TmfEventType; +import org.eclipse.linuxtools.tmf.core.event.TmfEventType; public abstract class CustomEventType extends TmfEventType { diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomEventsTable.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomEventsTable.java index 89e31003b1..1448eb77f1 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomEventsTable.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomEventsTable.java @@ -15,7 +15,7 @@ package org.eclipse.linuxtools.tmf.ui.parsers.custom; import java.util.LinkedList; import java.util.List; -import org.eclipse.linuxtools.tmf.event.TmfEvent; +import org.eclipse.linuxtools.tmf.core.event.TmfEvent; import org.eclipse.linuxtools.tmf.ui.parsers.custom.CustomTraceDefinition.OutputColumn; import org.eclipse.linuxtools.tmf.ui.viewers.events.TmfEventsTable; import org.eclipse.linuxtools.tmf.ui.widgets.ColumnData; diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomTraceDefinition.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomTraceDefinition.java index 5f00286d75..5c51d204fd 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomTraceDefinition.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomTraceDefinition.java @@ -16,7 +16,7 @@ import java.text.SimpleDateFormat; import java.util.List; import java.util.TimeZone; -import org.eclipse.linuxtools.tmf.event.TmfTimestamp; +import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp; import org.eclipse.linuxtools.tmf.ui.internal.Messages; diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomTxtEvent.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomTxtEvent.java index fa6833abca..c09612991a 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomTxtEvent.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomTxtEvent.java @@ -14,12 +14,12 @@ package org.eclipse.linuxtools.tmf.ui.parsers.custom; import java.util.regex.Matcher; -import org.eclipse.linuxtools.tmf.event.TmfEvent; -import org.eclipse.linuxtools.tmf.event.TmfEventReference; -import org.eclipse.linuxtools.tmf.event.TmfEventSource; -import org.eclipse.linuxtools.tmf.event.TmfEventType; -import org.eclipse.linuxtools.tmf.event.TmfTimestamp; -import org.eclipse.linuxtools.tmf.trace.ITmfTrace; +import org.eclipse.linuxtools.tmf.core.event.TmfEvent; +import org.eclipse.linuxtools.tmf.core.event.TmfEventReference; +import org.eclipse.linuxtools.tmf.core.event.TmfEventSource; +import org.eclipse.linuxtools.tmf.core.event.TmfEventType; +import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp; +import org.eclipse.linuxtools.tmf.core.trace.ITmfTrace; import org.eclipse.linuxtools.tmf.ui.parsers.custom.CustomTxtTraceDefinition.InputData; import org.eclipse.linuxtools.tmf.ui.parsers.custom.CustomTxtTraceDefinition.InputLine; diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomTxtTrace.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomTxtTrace.java index ff5af68620..e4bd564c76 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomTxtTrace.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomTxtTrace.java @@ -21,17 +21,17 @@ import java.util.List; import java.util.Map.Entry; import java.util.regex.Matcher; -import org.eclipse.linuxtools.tmf.event.TmfEvent; -import org.eclipse.linuxtools.tmf.event.TmfEventReference; -import org.eclipse.linuxtools.tmf.event.TmfEventSource; -import org.eclipse.linuxtools.tmf.event.TmfTimestamp; -import org.eclipse.linuxtools.tmf.io.BufferedRandomAccessFile; -import org.eclipse.linuxtools.tmf.trace.ITmfContext; -import org.eclipse.linuxtools.tmf.trace.ITmfLocation; -import org.eclipse.linuxtools.tmf.trace.ITmfTrace; -import org.eclipse.linuxtools.tmf.trace.TmfContext; -import org.eclipse.linuxtools.tmf.trace.TmfLocation; -import org.eclipse.linuxtools.tmf.trace.TmfTrace; +import org.eclipse.linuxtools.tmf.core.event.TmfEvent; +import org.eclipse.linuxtools.tmf.core.event.TmfEventReference; +import org.eclipse.linuxtools.tmf.core.event.TmfEventSource; +import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp; +import org.eclipse.linuxtools.tmf.core.io.BufferedRandomAccessFile; +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.TmfContext; +import org.eclipse.linuxtools.tmf.core.trace.TmfLocation; +import org.eclipse.linuxtools.tmf.core.trace.TmfTrace; import org.eclipse.linuxtools.tmf.ui.parsers.custom.CustomTxtTraceDefinition.InputLine; public class CustomTxtTrace extends TmfTrace { diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomTxtTraceContext.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomTxtTraceContext.java index 3fac6ae810..7c56eb296a 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomTxtTraceContext.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomTxtTraceContext.java @@ -15,9 +15,9 @@ package org.eclipse.linuxtools.tmf.ui.parsers.custom; import java.io.IOException; import java.util.regex.Matcher; -import org.eclipse.linuxtools.tmf.io.BufferedRandomAccessFile; -import org.eclipse.linuxtools.tmf.trace.ITmfLocation; -import org.eclipse.linuxtools.tmf.trace.TmfContext; +import org.eclipse.linuxtools.tmf.core.io.BufferedRandomAccessFile; +import org.eclipse.linuxtools.tmf.core.trace.ITmfLocation; +import org.eclipse.linuxtools.tmf.core.trace.TmfContext; import org.eclipse.linuxtools.tmf.ui.parsers.custom.CustomTxtTraceDefinition.InputLine; public class CustomTxtTraceContext extends TmfContext { diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomXmlEvent.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomXmlEvent.java index a553b0b752..706457b228 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomXmlEvent.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomXmlEvent.java @@ -12,12 +12,12 @@ package org.eclipse.linuxtools.tmf.ui.parsers.custom; -import org.eclipse.linuxtools.tmf.event.TmfEvent; -import org.eclipse.linuxtools.tmf.event.TmfEventReference; -import org.eclipse.linuxtools.tmf.event.TmfEventSource; -import org.eclipse.linuxtools.tmf.event.TmfEventType; -import org.eclipse.linuxtools.tmf.event.TmfTimestamp; -import org.eclipse.linuxtools.tmf.trace.ITmfTrace; +import org.eclipse.linuxtools.tmf.core.event.TmfEvent; +import org.eclipse.linuxtools.tmf.core.event.TmfEventReference; +import org.eclipse.linuxtools.tmf.core.event.TmfEventSource; +import org.eclipse.linuxtools.tmf.core.event.TmfEventType; +import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp; +import org.eclipse.linuxtools.tmf.core.trace.ITmfTrace; public class CustomXmlEvent extends CustomEvent { diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomXmlTrace.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomXmlTrace.java index 525a85f318..9f8f2931a9 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomXmlTrace.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomXmlTrace.java @@ -22,17 +22,17 @@ import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; -import org.eclipse.linuxtools.tmf.event.TmfEvent; -import org.eclipse.linuxtools.tmf.event.TmfEventReference; -import org.eclipse.linuxtools.tmf.event.TmfEventSource; -import org.eclipse.linuxtools.tmf.event.TmfTimestamp; -import org.eclipse.linuxtools.tmf.io.BufferedRandomAccessFile; -import org.eclipse.linuxtools.tmf.trace.ITmfContext; -import org.eclipse.linuxtools.tmf.trace.ITmfLocation; -import org.eclipse.linuxtools.tmf.trace.ITmfTrace; -import org.eclipse.linuxtools.tmf.trace.TmfContext; -import org.eclipse.linuxtools.tmf.trace.TmfLocation; -import org.eclipse.linuxtools.tmf.trace.TmfTrace; +import org.eclipse.linuxtools.tmf.core.event.TmfEvent; +import org.eclipse.linuxtools.tmf.core.event.TmfEventReference; +import org.eclipse.linuxtools.tmf.core.event.TmfEventSource; +import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp; +import org.eclipse.linuxtools.tmf.core.io.BufferedRandomAccessFile; +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.TmfContext; +import org.eclipse.linuxtools.tmf.core.trace.TmfLocation; +import org.eclipse.linuxtools.tmf.core.trace.TmfTrace; import org.eclipse.linuxtools.tmf.ui.parsers.custom.CustomXmlTraceDefinition.InputAttribute; import org.eclipse.linuxtools.tmf.ui.parsers.custom.CustomXmlTraceDefinition.InputElement; import org.w3c.dom.Document; diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomXmlTraceContext.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomXmlTraceContext.java index f74b0687c1..9af06b6139 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomXmlTraceContext.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomXmlTraceContext.java @@ -14,9 +14,9 @@ package org.eclipse.linuxtools.tmf.ui.parsers.custom; import java.io.IOException; -import org.eclipse.linuxtools.tmf.io.BufferedRandomAccessFile; -import org.eclipse.linuxtools.tmf.trace.ITmfLocation; -import org.eclipse.linuxtools.tmf.trace.TmfContext; +import org.eclipse.linuxtools.tmf.core.io.BufferedRandomAccessFile; +import org.eclipse.linuxtools.tmf.core.trace.ITmfLocation; +import org.eclipse.linuxtools.tmf.core.trace.TmfContext; public class CustomXmlTraceContext extends TmfContext { public BufferedRandomAccessFile raFile; diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/wizards/CustomTxtParserOutputWizardPage.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/wizards/CustomTxtParserOutputWizardPage.java index 6e04ad72b6..55e93d3e41 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/wizards/CustomTxtParserOutputWizardPage.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/wizards/CustomTxtParserOutputWizardPage.java @@ -9,7 +9,7 @@ import java.util.Iterator; import java.util.List; import org.eclipse.jface.wizard.WizardPage; -import org.eclipse.linuxtools.tmf.trace.ITmfTrace; +import org.eclipse.linuxtools.tmf.core.trace.ITmfTrace; import org.eclipse.linuxtools.tmf.ui.TmfUiPlugin; import org.eclipse.linuxtools.tmf.ui.internal.Messages; import org.eclipse.linuxtools.tmf.ui.parsers.custom.CustomEventsTable; diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/wizards/CustomXmlParserOutputWizardPage.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/wizards/CustomXmlParserOutputWizardPage.java index b383336a03..71cbec8a2f 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/wizards/CustomXmlParserOutputWizardPage.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/wizards/CustomXmlParserOutputWizardPage.java @@ -9,7 +9,7 @@ import java.util.Iterator; import java.util.List; import org.eclipse.jface.wizard.WizardPage; -import org.eclipse.linuxtools.tmf.trace.ITmfTrace; +import org.eclipse.linuxtools.tmf.core.trace.ITmfTrace; import org.eclipse.linuxtools.tmf.ui.TmfUiPlugin; import org.eclipse.linuxtools.tmf.ui.internal.Messages; import org.eclipse.linuxtools.tmf.ui.parsers.custom.CustomEventsTable; diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/handlers/OpenExperimentHandler.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/handlers/OpenExperimentHandler.java index 715ca40fc4..7700bad2be 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/handlers/OpenExperimentHandler.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/handlers/OpenExperimentHandler.java @@ -21,11 +21,11 @@ import org.eclipse.core.commands.ExecutionException; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.ISelectionProvider; import org.eclipse.jface.viewers.TreeSelection; -import org.eclipse.linuxtools.tmf.event.TmfEvent; -import org.eclipse.linuxtools.tmf.experiment.TmfExperiment; -import org.eclipse.linuxtools.tmf.signal.TmfExperimentSelectedSignal; -import org.eclipse.linuxtools.tmf.signal.TmfSignalManager; -import org.eclipse.linuxtools.tmf.trace.ITmfTrace; +import org.eclipse.linuxtools.tmf.core.event.TmfEvent; +import org.eclipse.linuxtools.tmf.core.experiment.TmfExperiment; +import org.eclipse.linuxtools.tmf.core.signal.TmfExperimentSelectedSignal; +import org.eclipse.linuxtools.tmf.core.signal.TmfSignalManager; +import org.eclipse.linuxtools.tmf.core.trace.ITmfTrace; import org.eclipse.linuxtools.tmf.ui.project.model.TmfExperimentElement; import org.eclipse.linuxtools.tmf.ui.project.model.TmfTraceElement; import org.eclipse.swt.widgets.MessageBox; diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/handlers/OpenTraceHandler.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/handlers/OpenTraceHandler.java index 213d4f509a..d5c84b1c34 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/handlers/OpenTraceHandler.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/handlers/OpenTraceHandler.java @@ -21,11 +21,11 @@ import org.eclipse.core.resources.IResource; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.ISelectionProvider; import org.eclipse.jface.viewers.TreeSelection; -import org.eclipse.linuxtools.tmf.event.TmfEvent; -import org.eclipse.linuxtools.tmf.experiment.TmfExperiment; -import org.eclipse.linuxtools.tmf.signal.TmfExperimentSelectedSignal; -import org.eclipse.linuxtools.tmf.signal.TmfSignalManager; -import org.eclipse.linuxtools.tmf.trace.ITmfTrace; +import org.eclipse.linuxtools.tmf.core.event.TmfEvent; +import org.eclipse.linuxtools.tmf.core.experiment.TmfExperiment; +import org.eclipse.linuxtools.tmf.core.signal.TmfExperimentSelectedSignal; +import org.eclipse.linuxtools.tmf.core.signal.TmfSignalManager; +import org.eclipse.linuxtools.tmf.core.trace.ITmfTrace; import org.eclipse.linuxtools.tmf.ui.editors.TmfEditorInput; import org.eclipse.linuxtools.tmf.ui.project.model.TmfTraceElement; import org.eclipse.swt.widgets.MessageBox; 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 8ca25eb18b..0d9db2c4fe 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,13 +24,13 @@ 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.tmf.ui.TmfUiPlugin; import org.eclipse.linuxtools.tmf.ui.parsers.custom.CustomTxtTrace; import org.eclipse.linuxtools.tmf.ui.parsers.custom.CustomTxtTraceDefinition; import org.eclipse.linuxtools.tmf.ui.parsers.custom.CustomXmlTrace; import org.eclipse.linuxtools.tmf.ui.parsers.custom.CustomXmlTraceDefinition; import org.eclipse.linuxtools.tmf.ui.project.model.TmfTraceElement; -import org.eclipse.linuxtools.tmf.util.TmfTraceType; import org.eclipse.ui.IWorkbenchPage; import org.eclipse.ui.IWorkbenchWindow; import org.eclipse.ui.PlatformUI; diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/handlers/SelectTraceTypeHandler.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/handlers/SelectTraceTypeHandler.java index 2baa92595d..07e195ce46 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/handlers/SelectTraceTypeHandler.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/handlers/SelectTraceTypeHandler.java @@ -23,7 +23,7 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.ISelectionProvider; import org.eclipse.jface.viewers.TreeSelection; -import org.eclipse.linuxtools.tmf.trace.ITmfTrace; +import org.eclipse.linuxtools.tmf.core.trace.ITmfTrace; import org.eclipse.linuxtools.tmf.ui.project.model.ITmfProjectModelElement; import org.eclipse.linuxtools.tmf.ui.project.model.TmfExperimentFolder; import org.eclipse.linuxtools.tmf.ui.project.model.TmfTraceElement; 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 c437a2234d..63c552ecd1 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 @@ -20,8 +20,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.tmf.event.TmfEvent; -import org.eclipse.linuxtools.tmf.trace.ITmfTrace; +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; @@ -29,7 +30,6 @@ import org.eclipse.linuxtools.tmf.ui.parsers.custom.CustomTxtTraceDefinition; import org.eclipse.linuxtools.tmf.ui.parsers.custom.CustomXmlEvent; import org.eclipse.linuxtools.tmf.ui.parsers.custom.CustomXmlTrace; import org.eclipse.linuxtools.tmf.ui.parsers.custom.CustomXmlTraceDefinition; -import org.eclipse.linuxtools.tmf.util.TmfTraceType; import org.eclipse.ui.IActionFilter; import org.eclipse.ui.views.properties.IPropertyDescriptor; import org.eclipse.ui.views.properties.IPropertySource2; 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 2f88deafbc..3550de98c8 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 @@ -43,8 +43,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.TmfProjectNature; -import org.eclipse.linuxtools.tmf.trace.ITmfTrace; +import org.eclipse.linuxtools.tmf.core.TmfProjectNature; +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; @@ -52,7 +53,6 @@ import org.eclipse.linuxtools.tmf.ui.parsers.custom.CustomXmlTrace; import org.eclipse.linuxtools.tmf.ui.parsers.custom.CustomXmlTraceDefinition; import org.eclipse.linuxtools.tmf.ui.project.model.TmfTraceElement; import org.eclipse.linuxtools.tmf.ui.project.model.TmfTraceFolder; -import org.eclipse.linuxtools.tmf.util.TmfTraceType; import org.eclipse.swt.SWT; import org.eclipse.swt.custom.BusyIndicator; import org.eclipse.swt.events.FocusEvent; 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 092ea3bf24..d34eeb4036 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 @@ -25,7 +25,7 @@ import org.eclipse.core.runtime.IConfigurationElement; import org.eclipse.core.runtime.IExecutableExtension; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.NullProgressMonitor; -import org.eclipse.linuxtools.tmf.TmfProjectNature; +import org.eclipse.linuxtools.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/signal/TmfTraceClosedSignal.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/signal/TmfTraceClosedSignal.java index 7ffe61980f..e8a6f9665d 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/signal/TmfTraceClosedSignal.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/signal/TmfTraceClosedSignal.java @@ -12,8 +12,8 @@ package org.eclipse.linuxtools.tmf.ui.signal; -import org.eclipse.linuxtools.tmf.signal.TmfSignal; -import org.eclipse.linuxtools.tmf.trace.ITmfTrace; +import org.eclipse.linuxtools.tmf.core.signal.TmfSignal; +import org.eclipse.linuxtools.tmf.core.trace.ITmfTrace; /** * TmfTraceClosedSignal diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/signal/TmfTraceOpenedSignal.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/signal/TmfTraceOpenedSignal.java index 557ee085bf..1f3a02198e 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/signal/TmfTraceOpenedSignal.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/signal/TmfTraceOpenedSignal.java @@ -13,8 +13,8 @@ package org.eclipse.linuxtools.tmf.ui.signal; import org.eclipse.core.resources.IResource; -import org.eclipse.linuxtools.tmf.signal.TmfSignal; -import org.eclipse.linuxtools.tmf.trace.ITmfTrace; +import org.eclipse.linuxtools.tmf.core.signal.TmfSignal; +import org.eclipse.linuxtools.tmf.core.trace.ITmfTrace; import org.eclipse.linuxtools.tmf.ui.viewers.events.ITmfEventsFilterProvider; /** diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/signal/TmfTraceParserUpdatedSignal.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/signal/TmfTraceParserUpdatedSignal.java index f614a9271c..081869e8d8 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/signal/TmfTraceParserUpdatedSignal.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/signal/TmfTraceParserUpdatedSignal.java @@ -13,7 +13,7 @@ package org.eclipse.linuxtools.tmf.ui.signal; import org.eclipse.core.resources.IResource; -import org.eclipse.linuxtools.tmf.signal.TmfSignal; +import org.eclipse.linuxtools.tmf.core.signal.TmfSignal; /** * TmfTraceParserUpdatedSignal diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/events/ITmfEventsFilterListener.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/events/ITmfEventsFilterListener.java index 3626936e5f..470afb136b 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/events/ITmfEventsFilterListener.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/events/ITmfEventsFilterListener.java @@ -12,8 +12,8 @@ package org.eclipse.linuxtools.tmf.ui.viewers.events; -import org.eclipse.linuxtools.tmf.filter.ITmfFilter; -import org.eclipse.linuxtools.tmf.trace.ITmfTrace; +import org.eclipse.linuxtools.tmf.core.filter.ITmfFilter; +import org.eclipse.linuxtools.tmf.core.trace.ITmfTrace; public interface ITmfEventsFilterListener { diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/events/TmfEventsCache.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/events/TmfEventsCache.java index 295f041e65..a075fc2f54 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/events/TmfEventsCache.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/events/TmfEventsCache.java @@ -18,11 +18,11 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.jobs.Job; -import org.eclipse.linuxtools.tmf.component.ITmfDataProvider; -import org.eclipse.linuxtools.tmf.event.TmfEvent; -import org.eclipse.linuxtools.tmf.filter.ITmfFilter; -import org.eclipse.linuxtools.tmf.request.TmfDataRequest; -import org.eclipse.linuxtools.tmf.trace.ITmfTrace; +import org.eclipse.linuxtools.tmf.core.component.ITmfDataProvider; +import org.eclipse.linuxtools.tmf.core.event.TmfEvent; +import org.eclipse.linuxtools.tmf.core.filter.ITmfFilter; +import org.eclipse.linuxtools.tmf.core.request.TmfDataRequest; +import org.eclipse.linuxtools.tmf.core.trace.ITmfTrace; public class TmfEventsCache { 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 02de0e61ad..396760314a 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 @@ -42,26 +42,26 @@ import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.resource.FontDescriptor; import org.eclipse.jface.resource.JFaceResources; import org.eclipse.jface.resource.LocalResourceManager; -import org.eclipse.linuxtools.tmf.component.ITmfDataProvider; -import org.eclipse.linuxtools.tmf.component.TmfComponent; -import org.eclipse.linuxtools.tmf.event.TmfEvent; -import org.eclipse.linuxtools.tmf.event.TmfEventContent; -import org.eclipse.linuxtools.tmf.event.TmfTimeRange; -import org.eclipse.linuxtools.tmf.event.TmfTimestamp; -import org.eclipse.linuxtools.tmf.filter.ITmfFilter; -import org.eclipse.linuxtools.tmf.filter.model.ITmfFilterTreeNode; -import org.eclipse.linuxtools.tmf.filter.model.TmfFilterAndNode; -import org.eclipse.linuxtools.tmf.filter.model.TmfFilterMatchesNode; -import org.eclipse.linuxtools.tmf.filter.model.TmfFilterNode; -import org.eclipse.linuxtools.tmf.request.ITmfDataRequest.ExecutionType; -import org.eclipse.linuxtools.tmf.request.TmfDataRequest; -import org.eclipse.linuxtools.tmf.request.TmfEventRequest; -import org.eclipse.linuxtools.tmf.signal.TmfExperimentRangeUpdatedSignal; -import org.eclipse.linuxtools.tmf.signal.TmfSignalHandler; -import org.eclipse.linuxtools.tmf.signal.TmfTimeSynchSignal; -import org.eclipse.linuxtools.tmf.signal.TmfTraceUpdatedSignal; -import org.eclipse.linuxtools.tmf.trace.ITmfLocation; -import org.eclipse.linuxtools.tmf.trace.ITmfTrace; +import org.eclipse.linuxtools.tmf.core.component.ITmfDataProvider; +import org.eclipse.linuxtools.tmf.core.component.TmfComponent; +import org.eclipse.linuxtools.tmf.core.event.TmfEvent; +import org.eclipse.linuxtools.tmf.core.event.TmfEventContent; +import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange; +import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp; +import org.eclipse.linuxtools.tmf.core.filter.ITmfFilter; +import org.eclipse.linuxtools.tmf.core.filter.model.ITmfFilterTreeNode; +import org.eclipse.linuxtools.tmf.core.filter.model.TmfFilterAndNode; +import org.eclipse.linuxtools.tmf.core.filter.model.TmfFilterMatchesNode; +import org.eclipse.linuxtools.tmf.core.filter.model.TmfFilterNode; +import org.eclipse.linuxtools.tmf.core.request.TmfDataRequest; +import org.eclipse.linuxtools.tmf.core.request.TmfEventRequest; +import org.eclipse.linuxtools.tmf.core.request.ITmfDataRequest.ExecutionType; +import org.eclipse.linuxtools.tmf.core.signal.TmfExperimentRangeUpdatedSignal; +import org.eclipse.linuxtools.tmf.core.signal.TmfSignalHandler; +import org.eclipse.linuxtools.tmf.core.signal.TmfTimeSynchSignal; +import org.eclipse.linuxtools.tmf.core.signal.TmfTraceUpdatedSignal; +import org.eclipse.linuxtools.tmf.core.trace.ITmfLocation; +import org.eclipse.linuxtools.tmf.core.trace.ITmfTrace; import org.eclipse.linuxtools.tmf.ui.TmfUiPlugin; import org.eclipse.linuxtools.tmf.ui.internal.Messages; import org.eclipse.linuxtools.tmf.ui.viewers.events.TmfEventsCache.CachedEvent; diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/TmfView.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/TmfView.java index 094380f25b..bf487fd32e 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/TmfView.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/TmfView.java @@ -12,9 +12,9 @@ package org.eclipse.linuxtools.tmf.ui.views; -import org.eclipse.linuxtools.tmf.component.ITmfComponent; -import org.eclipse.linuxtools.tmf.signal.TmfSignal; -import org.eclipse.linuxtools.tmf.signal.TmfSignalManager; +import org.eclipse.linuxtools.tmf.core.component.ITmfComponent; +import org.eclipse.linuxtools.tmf.core.signal.TmfSignal; +import org.eclipse.linuxtools.tmf.core.signal.TmfSignalManager; import org.eclipse.swt.widgets.Composite; import org.eclipse.ui.part.ViewPart; diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/colors/ColorSetting.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/colors/ColorSetting.java index 6dbd01c735..f2e67aeed0 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/colors/ColorSetting.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/colors/ColorSetting.java @@ -12,7 +12,7 @@ package org.eclipse.linuxtools.tmf.ui.views.colors; -import org.eclipse.linuxtools.tmf.filter.model.ITmfFilterTreeNode; +import org.eclipse.linuxtools.tmf.core.filter.model.ITmfFilterTreeNode; import org.eclipse.swt.SWT; import org.eclipse.swt.graphics.Color; import org.eclipse.swt.graphics.RGB; diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/colors/ColorSettingsManager.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/colors/ColorSettingsManager.java index b4c68621a6..94c8b5e87c 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/colors/ColorSettingsManager.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/colors/ColorSettingsManager.java @@ -14,7 +14,7 @@ package org.eclipse.linuxtools.tmf.ui.views.colors; import java.util.ArrayList; -import org.eclipse.linuxtools.tmf.event.TmfEvent; +import org.eclipse.linuxtools.tmf.core.event.TmfEvent; import org.eclipse.linuxtools.tmf.ui.TmfUiPlugin; import org.eclipse.linuxtools.tmf.ui.viewers.timeAnalysis.widgets.TraceColorScheme; import org.eclipse.swt.SWT; diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/colors/ColorSettingsXML.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/colors/ColorSettingsXML.java index 6aaf5d2fa0..ec06981205 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/colors/ColorSettingsXML.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/colors/ColorSettingsXML.java @@ -27,9 +27,9 @@ import javax.xml.transform.TransformerFactory; import javax.xml.transform.dom.DOMSource; import javax.xml.transform.stream.StreamResult; -import org.eclipse.linuxtools.tmf.filter.model.ITmfFilterTreeNode; -import org.eclipse.linuxtools.tmf.filter.xml.TmfFilterContentHandler; -import org.eclipse.linuxtools.tmf.filter.xml.TmfFilterXMLWriter; +import org.eclipse.linuxtools.tmf.core.filter.model.ITmfFilterTreeNode; +import org.eclipse.linuxtools.tmf.core.filter.xml.TmfFilterContentHandler; +import org.eclipse.linuxtools.tmf.core.filter.xml.TmfFilterXMLWriter; import org.eclipse.swt.graphics.RGB; import org.w3c.dom.Document; import org.w3c.dom.Element; 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 9c10ad369c..77c96f51df 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 @@ -13,11 +13,11 @@ package org.eclipse.linuxtools.tmf.ui.views.events; -import org.eclipse.linuxtools.tmf.event.TmfEvent; -import org.eclipse.linuxtools.tmf.experiment.TmfExperiment; -import org.eclipse.linuxtools.tmf.signal.TmfExperimentDisposedSignal; -import org.eclipse.linuxtools.tmf.signal.TmfExperimentSelectedSignal; -import org.eclipse.linuxtools.tmf.signal.TmfSignalHandler; +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.ui.TmfUiPlugin; import org.eclipse.linuxtools.tmf.ui.viewers.events.TmfEventsTable; import org.eclipse.linuxtools.tmf.ui.views.TmfView; diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/filter/FilterDialog.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/filter/FilterDialog.java index a1d8c0cf63..4efcb6164a 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/filter/FilterDialog.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/filter/FilterDialog.java @@ -13,8 +13,8 @@ package org.eclipse.linuxtools.tmf.ui.views.filter; import org.eclipse.jface.dialogs.Dialog; -import org.eclipse.linuxtools.tmf.filter.model.ITmfFilterTreeNode; -import org.eclipse.linuxtools.tmf.filter.model.TmfFilterNode; +import org.eclipse.linuxtools.tmf.core.filter.model.ITmfFilterTreeNode; +import org.eclipse.linuxtools.tmf.core.filter.model.TmfFilterNode; import org.eclipse.linuxtools.tmf.ui.internal.Messages; import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Composite; diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/filter/FilterManager.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/filter/FilterManager.java index a1849aa9d5..dd9e0282b8 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/filter/FilterManager.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/filter/FilterManager.java @@ -17,10 +17,10 @@ import java.io.IOException; import javax.xml.parsers.ParserConfigurationException; -import org.eclipse.linuxtools.tmf.filter.model.ITmfFilterTreeNode; -import org.eclipse.linuxtools.tmf.filter.model.TmfFilterRootNode; -import org.eclipse.linuxtools.tmf.filter.xml.TmfFilterXMLParser; -import org.eclipse.linuxtools.tmf.filter.xml.TmfFilterXMLWriter; +import org.eclipse.linuxtools.tmf.core.filter.model.ITmfFilterTreeNode; +import org.eclipse.linuxtools.tmf.core.filter.model.TmfFilterRootNode; +import org.eclipse.linuxtools.tmf.core.filter.xml.TmfFilterXMLParser; +import org.eclipse.linuxtools.tmf.core.filter.xml.TmfFilterXMLWriter; import org.eclipse.linuxtools.tmf.ui.TmfUiPlugin; import org.xml.sax.SAXException; diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/filter/FilterTreeContentProvider.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/filter/FilterTreeContentProvider.java index d5e349715d..5f5d67dc9e 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/filter/FilterTreeContentProvider.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/filter/FilterTreeContentProvider.java @@ -16,7 +16,7 @@ import java.util.ArrayList; import org.eclipse.jface.viewers.ITreeContentProvider; import org.eclipse.jface.viewers.Viewer; -import org.eclipse.linuxtools.tmf.filter.model.ITmfFilterTreeNode; +import org.eclipse.linuxtools.tmf.core.filter.model.ITmfFilterTreeNode; /** * FilterTreeContentProvider diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/filter/FilterTreeLabelProvider.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/filter/FilterTreeLabelProvider.java index fc61d2c495..2bc8707b7a 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/filter/FilterTreeLabelProvider.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/filter/FilterTreeLabelProvider.java @@ -14,15 +14,15 @@ package org.eclipse.linuxtools.tmf.ui.views.filter; import org.eclipse.jface.viewers.ILabelProvider; import org.eclipse.jface.viewers.ILabelProviderListener; -import org.eclipse.linuxtools.tmf.filter.model.TmfFilterAndNode; -import org.eclipse.linuxtools.tmf.filter.model.TmfFilterCompareNode; -import org.eclipse.linuxtools.tmf.filter.model.TmfFilterCompareNode.Type; -import org.eclipse.linuxtools.tmf.filter.model.TmfFilterContainsNode; -import org.eclipse.linuxtools.tmf.filter.model.TmfFilterEqualsNode; -import org.eclipse.linuxtools.tmf.filter.model.TmfFilterEventTypeNode; -import org.eclipse.linuxtools.tmf.filter.model.TmfFilterMatchesNode; -import org.eclipse.linuxtools.tmf.filter.model.TmfFilterNode; -import org.eclipse.linuxtools.tmf.filter.model.TmfFilterOrNode; +import org.eclipse.linuxtools.tmf.core.filter.model.TmfFilterAndNode; +import org.eclipse.linuxtools.tmf.core.filter.model.TmfFilterCompareNode; +import org.eclipse.linuxtools.tmf.core.filter.model.TmfFilterContainsNode; +import org.eclipse.linuxtools.tmf.core.filter.model.TmfFilterEqualsNode; +import org.eclipse.linuxtools.tmf.core.filter.model.TmfFilterEventTypeNode; +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.TmfFilterCompareNode.Type; import org.eclipse.swt.graphics.Image; /** diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/filter/FilterView.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/filter/FilterView.java index ea7cd81611..923189b086 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/filter/FilterView.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/filter/FilterView.java @@ -28,11 +28,11 @@ import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.viewers.ISelectionChangedListener; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.SelectionChangedEvent; -import org.eclipse.linuxtools.tmf.filter.model.ITmfFilterTreeNode; -import org.eclipse.linuxtools.tmf.filter.model.TmfFilterNode; -import org.eclipse.linuxtools.tmf.filter.model.TmfFilterRootNode; -import org.eclipse.linuxtools.tmf.filter.xml.TmfFilterXMLParser; -import org.eclipse.linuxtools.tmf.filter.xml.TmfFilterXMLWriter; +import org.eclipse.linuxtools.tmf.core.filter.model.ITmfFilterTreeNode; +import org.eclipse.linuxtools.tmf.core.filter.model.TmfFilterNode; +import org.eclipse.linuxtools.tmf.core.filter.model.TmfFilterRootNode; +import org.eclipse.linuxtools.tmf.core.filter.xml.TmfFilterXMLParser; +import org.eclipse.linuxtools.tmf.core.filter.xml.TmfFilterXMLWriter; import org.eclipse.linuxtools.tmf.ui.TmfUiPlugin; import org.eclipse.linuxtools.tmf.ui.internal.Messages; import org.eclipse.linuxtools.tmf.ui.views.TmfView; 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 1d15d9dc80..7845053da1 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,19 +30,20 @@ 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.tmf.event.TmfEvent; -import org.eclipse.linuxtools.tmf.event.TmfEventType; -import org.eclipse.linuxtools.tmf.filter.model.ITmfFilterTreeNode; -import org.eclipse.linuxtools.tmf.filter.model.TmfFilterAndNode; -import org.eclipse.linuxtools.tmf.filter.model.TmfFilterCompareNode; -import org.eclipse.linuxtools.tmf.filter.model.TmfFilterCompareNode.Type; -import org.eclipse.linuxtools.tmf.filter.model.TmfFilterContainsNode; -import org.eclipse.linuxtools.tmf.filter.model.TmfFilterEqualsNode; -import org.eclipse.linuxtools.tmf.filter.model.TmfFilterEventTypeNode; -import org.eclipse.linuxtools.tmf.filter.model.TmfFilterMatchesNode; -import org.eclipse.linuxtools.tmf.filter.model.TmfFilterNode; -import org.eclipse.linuxtools.tmf.filter.model.TmfFilterOrNode; -import org.eclipse.linuxtools.tmf.filter.model.TmfFilterRootNode; +import org.eclipse.linuxtools.tmf.core.event.TmfEvent; +import org.eclipse.linuxtools.tmf.core.event.TmfEventType; +import org.eclipse.linuxtools.tmf.core.filter.model.ITmfFilterTreeNode; +import org.eclipse.linuxtools.tmf.core.filter.model.TmfFilterAndNode; +import org.eclipse.linuxtools.tmf.core.filter.model.TmfFilterCompareNode; +import org.eclipse.linuxtools.tmf.core.filter.model.TmfFilterContainsNode; +import org.eclipse.linuxtools.tmf.core.filter.model.TmfFilterEqualsNode; +import org.eclipse.linuxtools.tmf.core.filter.model.TmfFilterEventTypeNode; +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.filter.model.TmfFilterCompareNode.Type; +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; @@ -51,7 +52,6 @@ import org.eclipse.linuxtools.tmf.ui.parsers.custom.CustomTxtTraceDefinition; import org.eclipse.linuxtools.tmf.ui.parsers.custom.CustomXmlEvent; import org.eclipse.linuxtools.tmf.ui.parsers.custom.CustomXmlTrace; import org.eclipse.linuxtools.tmf.ui.parsers.custom.CustomXmlTraceDefinition; -import org.eclipse.linuxtools.tmf.util.TmfTraceType; import org.eclipse.swt.SWT; import org.eclipse.swt.custom.SashForm; import org.eclipse.swt.events.FocusEvent; diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/statistics/TmfStatisticsView.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/statistics/TmfStatisticsView.java index a564354a0d..d03d11b6dc 100755 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/statistics/TmfStatisticsView.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/statistics/TmfStatisticsView.java @@ -19,19 +19,19 @@ import org.eclipse.jface.viewers.TreeViewer; import org.eclipse.jface.viewers.TreeViewerColumn; import org.eclipse.jface.viewers.Viewer; import org.eclipse.jface.viewers.ViewerComparator; -import org.eclipse.linuxtools.tmf.event.TmfEvent; -import org.eclipse.linuxtools.tmf.event.TmfTimeRange; -import org.eclipse.linuxtools.tmf.experiment.TmfExperiment; -import org.eclipse.linuxtools.tmf.request.ITmfDataRequest; -import org.eclipse.linuxtools.tmf.request.ITmfDataRequest.ExecutionType; -import org.eclipse.linuxtools.tmf.request.ITmfEventRequest; -import org.eclipse.linuxtools.tmf.request.TmfDataRequest; -import org.eclipse.linuxtools.tmf.request.TmfEventRequest; -import org.eclipse.linuxtools.tmf.signal.TmfExperimentDisposedSignal; -import org.eclipse.linuxtools.tmf.signal.TmfExperimentRangeUpdatedSignal; -import org.eclipse.linuxtools.tmf.signal.TmfExperimentSelectedSignal; -import org.eclipse.linuxtools.tmf.signal.TmfSignalHandler; -import org.eclipse.linuxtools.tmf.trace.ITmfTrace; +import org.eclipse.linuxtools.tmf.core.event.TmfEvent; +import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange; +import org.eclipse.linuxtools.tmf.core.experiment.TmfExperiment; +import org.eclipse.linuxtools.tmf.core.request.ITmfDataRequest; +import org.eclipse.linuxtools.tmf.core.request.ITmfEventRequest; +import org.eclipse.linuxtools.tmf.core.request.TmfDataRequest; +import org.eclipse.linuxtools.tmf.core.request.TmfEventRequest; +import org.eclipse.linuxtools.tmf.core.request.ITmfDataRequest.ExecutionType; +import org.eclipse.linuxtools.tmf.core.signal.TmfExperimentDisposedSignal; +import org.eclipse.linuxtools.tmf.core.signal.TmfExperimentRangeUpdatedSignal; +import org.eclipse.linuxtools.tmf.core.signal.TmfExperimentSelectedSignal; +import org.eclipse.linuxtools.tmf.core.signal.TmfSignalHandler; +import org.eclipse.linuxtools.tmf.core.trace.ITmfTrace; import org.eclipse.linuxtools.tmf.ui.views.TmfView; import org.eclipse.linuxtools.tmf.ui.views.statistics.model.AbsTmfStatisticsTree; import org.eclipse.linuxtools.tmf.ui.views.statistics.model.ITmfColumnDataProvider; 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 06bd8db6ec..2e877fa887 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,9 +17,9 @@ import java.util.HashMap; import java.util.Map; import java.util.Set; -import org.eclipse.linuxtools.tmf.event.TmfEvent; +import org.eclipse.linuxtools.tmf.core.event.TmfEvent; +import org.eclipse.linuxtools.tmf.core.util.TmfFixedArray; import org.eclipse.linuxtools.tmf.ui.views.statistics.ITmfExtraEventInfo; -import org.eclipse.linuxtools.tmf.util.TmfFixedArray; /** *

Base class for the statistics storage.

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 4bf2bc1e42..debac476fd 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,9 +18,9 @@ import java.util.LinkedList; import java.util.Map; import java.util.Set; -import org.eclipse.linuxtools.tmf.event.TmfEvent; +import org.eclipse.linuxtools.tmf.core.event.TmfEvent; +import org.eclipse.linuxtools.tmf.core.util.TmfFixedArray; import org.eclipse.linuxtools.tmf.ui.views.statistics.ITmfExtraEventInfo; -import org.eclipse.linuxtools.tmf.util.TmfFixedArray; /** *

Store information about base statistics data

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 3bbc197b75..cb7408336d 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.util.TmfFixedArray; +import org.eclipse.linuxtools.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/timechart/TimeChartAnalysisEntry.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/timechart/TimeChartAnalysisEntry.java index 6f94b21e04..6a1a131393 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/timechart/TimeChartAnalysisEntry.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/timechart/TimeChartAnalysisEntry.java @@ -16,7 +16,7 @@ import java.util.Iterator; import java.util.NoSuchElementException; import java.util.Vector; -import org.eclipse.linuxtools.tmf.trace.ITmfTrace; +import org.eclipse.linuxtools.tmf.core.trace.ITmfTrace; import org.eclipse.linuxtools.tmf.ui.viewers.timeAnalysis.model.ITimeEvent; import org.eclipse.linuxtools.tmf.ui.viewers.timeAnalysis.model.ITmfTimeAnalysisEntry; diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/timechart/TimeChartDecorationProvider.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/timechart/TimeChartDecorationProvider.java index 0a56c6fa99..e7f8d0a9ee 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/timechart/TimeChartDecorationProvider.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/timechart/TimeChartDecorationProvider.java @@ -18,8 +18,8 @@ import java.util.Set; import org.eclipse.core.resources.IMarker; import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.CoreException; -import org.eclipse.linuxtools.tmf.event.TmfEvent; -import org.eclipse.linuxtools.tmf.filter.ITmfFilter; +import org.eclipse.linuxtools.tmf.core.event.TmfEvent; +import org.eclipse.linuxtools.tmf.core.filter.ITmfFilter; public class TimeChartDecorationProvider { diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/timechart/TimeChartEvent.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/timechart/TimeChartEvent.java index e77d9f4b86..4cce2bf606 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/timechart/TimeChartEvent.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/timechart/TimeChartEvent.java @@ -15,7 +15,7 @@ package org.eclipse.linuxtools.tmf.ui.views.timechart; import java.util.ArrayList; import java.util.Iterator; -import org.eclipse.linuxtools.tmf.event.TmfEvent; +import org.eclipse.linuxtools.tmf.core.event.TmfEvent; import org.eclipse.linuxtools.tmf.ui.viewers.timeAnalysis.model.ITimeEvent; import org.eclipse.linuxtools.tmf.ui.viewers.timeAnalysis.model.ITmfTimeAnalysisEntry; import org.eclipse.linuxtools.tmf.ui.views.colors.ColorSettingsManager; diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/timechart/TimeChartView.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/timechart/TimeChartView.java index bc51be409b..30913efcc4 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/timechart/TimeChartView.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/timechart/TimeChartView.java @@ -24,15 +24,15 @@ import org.eclipse.core.resources.IResourceChangeEvent; import org.eclipse.core.resources.IResourceChangeListener; import org.eclipse.core.resources.IResourceDelta; import org.eclipse.core.resources.ResourcesPlugin; -import org.eclipse.linuxtools.tmf.event.TmfEvent; -import org.eclipse.linuxtools.tmf.event.TmfTimestamp; -import org.eclipse.linuxtools.tmf.filter.ITmfFilter; -import org.eclipse.linuxtools.tmf.signal.TmfSignalHandler; -import org.eclipse.linuxtools.tmf.signal.TmfTimeSynchSignal; -import org.eclipse.linuxtools.tmf.signal.TmfTraceSelectedSignal; -import org.eclipse.linuxtools.tmf.signal.TmfTraceUpdatedSignal; -import org.eclipse.linuxtools.tmf.trace.ITmfTrace; -import org.eclipse.linuxtools.tmf.trace.TmfContext; +import org.eclipse.linuxtools.tmf.core.event.TmfEvent; +import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp; +import org.eclipse.linuxtools.tmf.core.filter.ITmfFilter; +import org.eclipse.linuxtools.tmf.core.signal.TmfSignalHandler; +import org.eclipse.linuxtools.tmf.core.signal.TmfTimeSynchSignal; +import org.eclipse.linuxtools.tmf.core.signal.TmfTraceSelectedSignal; +import org.eclipse.linuxtools.tmf.core.signal.TmfTraceUpdatedSignal; +import org.eclipse.linuxtools.tmf.core.trace.ITmfTrace; +import org.eclipse.linuxtools.tmf.core.trace.TmfContext; import org.eclipse.linuxtools.tmf.ui.editors.ITmfTraceEditor; import org.eclipse.linuxtools.tmf.ui.signal.TmfTraceClosedSignal; import org.eclipse.linuxtools.tmf.ui.signal.TmfTraceOpenedSignal; diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/DrawableToolTip.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/DrawableToolTip.java index ae75d2d294..1a5f92217b 100755 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/DrawableToolTip.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/DrawableToolTip.java @@ -12,8 +12,8 @@ **********************************************************************/ package org.eclipse.linuxtools.tmf.ui.views.uml2sd; -import org.eclipse.linuxtools.tmf.event.TmfTimeRange; -import org.eclipse.linuxtools.tmf.event.TmfTimestamp; +import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange; +import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp; import org.eclipse.linuxtools.tmf.ui.views.uml2sd.util.SDMessages; import org.eclipse.swt.SWT; import org.eclipse.swt.events.PaintEvent; diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/SDWidget.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/SDWidget.java index 8e0aa0a30f..efaf6ae801 100755 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/SDWidget.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/SDWidget.java @@ -23,7 +23,7 @@ import org.eclipse.jface.util.IPropertyChangeListener; import org.eclipse.jface.util.PropertyChangeEvent; import org.eclipse.jface.viewers.ISelectionProvider; import org.eclipse.jface.viewers.StructuredSelection; -import org.eclipse.linuxtools.tmf.event.TmfTimestamp; +import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp; import org.eclipse.linuxtools.tmf.ui.ITmfImageConstants; import org.eclipse.linuxtools.tmf.ui.TmfUiPlugin; import org.eclipse.linuxtools.tmf.ui.views.uml2sd.core.BaseMessage; diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/TimeCompressionBar.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/TimeCompressionBar.java index b6c709f711..6ee571ab3b 100755 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/TimeCompressionBar.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/TimeCompressionBar.java @@ -17,7 +17,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import org.eclipse.linuxtools.tmf.event.TmfTimestamp; +import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp; import org.eclipse.linuxtools.tmf.ui.views.uml2sd.core.AsyncMessage; import org.eclipse.linuxtools.tmf.ui.views.uml2sd.core.AsyncMessageReturn; import org.eclipse.linuxtools.tmf.ui.views.uml2sd.core.BaseMessage; diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/core/AsyncMessage.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/core/AsyncMessage.java index 1aaf3926e2..1d11035ba4 100755 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/core/AsyncMessage.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/core/AsyncMessage.java @@ -14,7 +14,7 @@ package org.eclipse.linuxtools.tmf.ui.views.uml2sd.core; import java.util.Comparator; -import org.eclipse.linuxtools.tmf.event.TmfTimestamp; +import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp; import org.eclipse.linuxtools.tmf.ui.views.uml2sd.drawings.IGC; import org.eclipse.linuxtools.tmf.ui.views.uml2sd.drawings.ISDPreferences; import org.eclipse.linuxtools.tmf.ui.views.uml2sd.util.SortAsyncForBackward; diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/core/BasicFrame.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/core/BasicFrame.java index 4dc1b8aef1..ecb9322a46 100755 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/core/BasicFrame.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/core/BasicFrame.java @@ -16,7 +16,7 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import org.eclipse.linuxtools.tmf.event.TmfTimestamp; +import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp; import org.eclipse.linuxtools.tmf.ui.views.uml2sd.drawings.IGC; import org.eclipse.linuxtools.tmf.ui.views.uml2sd.drawings.ISDPreferences; import org.eclipse.linuxtools.tmf.ui.views.uml2sd.preferences.SDViewPref; diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/core/ExecutionOccurrence.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/core/ExecutionOccurrence.java index 5b28c32d3b..f1c2edd199 100755 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/core/ExecutionOccurrence.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/core/ExecutionOccurrence.java @@ -12,7 +12,7 @@ **********************************************************************/ package org.eclipse.linuxtools.tmf.ui.views.uml2sd.core; -import org.eclipse.linuxtools.tmf.event.TmfTimestamp; +import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp; import org.eclipse.linuxtools.tmf.ui.views.uml2sd.drawings.IColor; import org.eclipse.linuxtools.tmf.ui.views.uml2sd.drawings.IGC; import org.eclipse.linuxtools.tmf.ui.views.uml2sd.drawings.IImage; diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/core/Frame.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/core/Frame.java index d3a17099d4..1c26438679 100755 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/core/Frame.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/core/Frame.java @@ -17,7 +17,7 @@ import java.util.Arrays; import java.util.Iterator; import java.util.List; -import org.eclipse.linuxtools.tmf.event.TmfTimestamp; +import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp; import org.eclipse.linuxtools.tmf.ui.views.uml2sd.drawings.IColor; import org.eclipse.linuxtools.tmf.ui.views.uml2sd.drawings.IGC; import org.eclipse.linuxtools.tmf.ui.views.uml2sd.preferences.SDViewPref; diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/core/ITimeRange.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/core/ITimeRange.java index f9b37e7f97..aadc496234 100755 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/core/ITimeRange.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/core/ITimeRange.java @@ -12,7 +12,7 @@ **********************************************************************/ package org.eclipse.linuxtools.tmf.ui.views.uml2sd.core; -import org.eclipse.linuxtools.tmf.event.TmfTimestamp; +import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp; /** * @author sveyrier diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/core/SDTimeEvent.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/core/SDTimeEvent.java index 17f541f8ab..5b353b3ecb 100755 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/core/SDTimeEvent.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/core/SDTimeEvent.java @@ -12,7 +12,7 @@ **********************************************************************/ package org.eclipse.linuxtools.tmf.ui.views.uml2sd.core; -import org.eclipse.linuxtools.tmf.event.TmfTimestamp; +import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp; /** * @author sveyrier diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/core/SyncMessage.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/core/SyncMessage.java index c9c3fbdb01..021666df57 100755 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/core/SyncMessage.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/core/SyncMessage.java @@ -14,7 +14,7 @@ package org.eclipse.linuxtools.tmf.ui.views.uml2sd.core; import java.util.Comparator; -import org.eclipse.linuxtools.tmf.event.TmfTimestamp; +import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp; import org.eclipse.linuxtools.tmf.ui.views.uml2sd.drawings.IGC; import org.eclipse.linuxtools.tmf.ui.views.uml2sd.drawings.ISDPreferences; import org.eclipse.linuxtools.tmf.ui.views.uml2sd.util.SortSyncMessageComparator; diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/impl/TmfAsyncMessage.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/impl/TmfAsyncMessage.java index 6c21128c7b..cf141b9bee 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/impl/TmfAsyncMessage.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/impl/TmfAsyncMessage.java @@ -17,8 +17,8 @@ package org.eclipse.linuxtools.tmf.ui.views.uml2sd.impl; * Extends AsyncMessage class to provide additional information about the trace event. *

*/ +import org.eclipse.linuxtools.tmf.core.uml2sd.ITmfAsyncSequenceDiagramEvent; import org.eclipse.linuxtools.tmf.ui.views.uml2sd.core.AsyncMessage; -import org.eclipse.linuxtools.tmf.uml2sd.ITmfAsyncSequenceDiagramEvent; public class TmfAsyncMessage extends AsyncMessage implements ITmfAsyncSequenceDiagramEvent { diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/impl/TmfSyncMessage.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/impl/TmfSyncMessage.java index 557aca1f53..2c6a5a823d 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/impl/TmfSyncMessage.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/impl/TmfSyncMessage.java @@ -17,8 +17,8 @@ package org.eclipse.linuxtools.tmf.ui.views.uml2sd.impl; * Extends AsyncMessage class to provide additional information about the trace event. *

*/ +import org.eclipse.linuxtools.tmf.core.uml2sd.ITmfSyncSequenceDiagramEvent; import org.eclipse.linuxtools.tmf.ui.views.uml2sd.core.SyncMessage; -import org.eclipse.linuxtools.tmf.uml2sd.ITmfSyncSequenceDiagramEvent; public class TmfSyncMessage extends SyncMessage implements ITmfSyncSequenceDiagramEvent { diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/impl/TmfUml2SDSyncLoader.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/impl/TmfUml2SDSyncLoader.java index 6c75d5a4ea..c9467ff89b 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/impl/TmfUml2SDSyncLoader.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/impl/TmfUml2SDSyncLoader.java @@ -23,23 +23,25 @@ import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.jobs.Job; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.StructuredSelection; -import org.eclipse.linuxtools.tmf.component.TmfComponent; -import org.eclipse.linuxtools.tmf.event.TmfEvent; -import org.eclipse.linuxtools.tmf.event.TmfEventField; -import org.eclipse.linuxtools.tmf.event.TmfNoSuchFieldException; -import org.eclipse.linuxtools.tmf.event.TmfTimeRange; -import org.eclipse.linuxtools.tmf.event.TmfTimestamp; -import org.eclipse.linuxtools.tmf.experiment.TmfExperiment; -import org.eclipse.linuxtools.tmf.request.ITmfDataRequest; -import org.eclipse.linuxtools.tmf.request.ITmfEventRequest; -import org.eclipse.linuxtools.tmf.request.TmfDataRequest; -import org.eclipse.linuxtools.tmf.request.TmfEventRequest; -import org.eclipse.linuxtools.tmf.signal.TmfExperimentDisposedSignal; -import org.eclipse.linuxtools.tmf.signal.TmfExperimentSelectedSignal; -import org.eclipse.linuxtools.tmf.signal.TmfRangeSynchSignal; -import org.eclipse.linuxtools.tmf.signal.TmfSignal; -import org.eclipse.linuxtools.tmf.signal.TmfSignalHandler; -import org.eclipse.linuxtools.tmf.signal.TmfTimeSynchSignal; +import org.eclipse.linuxtools.tmf.core.component.TmfComponent; +import org.eclipse.linuxtools.tmf.core.event.TmfEvent; +import org.eclipse.linuxtools.tmf.core.event.TmfEventField; +import org.eclipse.linuxtools.tmf.core.event.TmfNoSuchFieldException; +import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange; +import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp; +import org.eclipse.linuxtools.tmf.core.experiment.TmfExperiment; +import org.eclipse.linuxtools.tmf.core.request.ITmfDataRequest; +import org.eclipse.linuxtools.tmf.core.request.ITmfEventRequest; +import org.eclipse.linuxtools.tmf.core.request.TmfDataRequest; +import org.eclipse.linuxtools.tmf.core.request.TmfEventRequest; +import org.eclipse.linuxtools.tmf.core.signal.TmfExperimentDisposedSignal; +import org.eclipse.linuxtools.tmf.core.signal.TmfExperimentSelectedSignal; +import org.eclipse.linuxtools.tmf.core.signal.TmfRangeSynchSignal; +import org.eclipse.linuxtools.tmf.core.signal.TmfSignal; +import org.eclipse.linuxtools.tmf.core.signal.TmfSignalHandler; +import org.eclipse.linuxtools.tmf.core.signal.TmfTimeSynchSignal; +import org.eclipse.linuxtools.tmf.core.uml2sd.ITmfSyncSequenceDiagramEvent; +import org.eclipse.linuxtools.tmf.core.uml2sd.TmfSyncSequenceDiagramEvent; import org.eclipse.linuxtools.tmf.ui.TmfUiPlugin; import org.eclipse.linuxtools.tmf.ui.views.uml2sd.SDView; import org.eclipse.linuxtools.tmf.ui.views.uml2sd.core.Frame; @@ -53,8 +55,6 @@ import org.eclipse.linuxtools.tmf.ui.views.uml2sd.handlers.widgets.Criteria; import org.eclipse.linuxtools.tmf.ui.views.uml2sd.handlers.widgets.FilterCriteria; import org.eclipse.linuxtools.tmf.ui.views.uml2sd.handlers.widgets.FilterListDialog; import org.eclipse.linuxtools.tmf.ui.views.uml2sd.load.IUml2SDLoader; -import org.eclipse.linuxtools.tmf.uml2sd.ITmfSyncSequenceDiagramEvent; -import org.eclipse.linuxtools.tmf.uml2sd.TmfSyncSequenceDiagramEvent; import org.eclipse.swt.widgets.Display; import org.eclipse.ui.ISelectionListener; import org.eclipse.ui.IWorkbenchPart; 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 f71a44bbba..582b54fd01 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.Tracer; +import org.eclipse.linuxtools.tmf.core.Tracer; import org.eclipse.linuxtools.tmf.ui.TmfUiPlugin; import org.eclipse.linuxtools.tmf.ui.views.uml2sd.SDView; import org.eclipse.ui.IViewReference; diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/util/MinMaxDialog.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/util/MinMaxDialog.java index cd2484714f..b7e850ba49 100755 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/util/MinMaxDialog.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/util/MinMaxDialog.java @@ -15,7 +15,7 @@ package org.eclipse.linuxtools.tmf.ui.views.uml2sd.util; import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.jface.dialogs.MessageDialog; -import org.eclipse.linuxtools.tmf.event.TmfTimestamp; +import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp; import org.eclipse.linuxtools.tmf.ui.views.uml2sd.SDWidget; import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionEvent; diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/widgets/TmfRawEventViewer.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/widgets/TmfRawEventViewer.java index 91d41e502e..45159b9d32 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/widgets/TmfRawEventViewer.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/widgets/TmfRawEventViewer.java @@ -14,10 +14,10 @@ package org.eclipse.linuxtools.tmf.ui.widgets; import java.util.ArrayList; -import org.eclipse.linuxtools.tmf.event.TmfEvent; -import org.eclipse.linuxtools.tmf.trace.ITmfLocation; -import org.eclipse.linuxtools.tmf.trace.ITmfTrace; -import org.eclipse.linuxtools.tmf.trace.TmfContext; +import org.eclipse.linuxtools.tmf.core.event.TmfEvent; +import org.eclipse.linuxtools.tmf.core.trace.ITmfLocation; +import org.eclipse.linuxtools.tmf.core.trace.ITmfTrace; +import org.eclipse.linuxtools.tmf.core.trace.TmfContext; import org.eclipse.swt.SWT; import org.eclipse.swt.custom.CaretEvent; import org.eclipse.swt.custom.CaretListener; diff --git a/org.eclipse.linuxtools.tmf/.project b/org.eclipse.linuxtools.tmf/.project index cd66d8b0f4..edaa96d626 100644 --- a/org.eclipse.linuxtools.tmf/.project +++ b/org.eclipse.linuxtools.tmf/.project @@ -1,28 +1,17 @@ - org.eclipse.linuxtools.tmf.core + org.eclipse.linuxtools.tmf - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder + org.eclipse.pde.FeatureBuilder - org.eclipse.pde.PluginNature - org.eclipse.jdt.core.javanature + org.eclipse.pde.FeatureNature diff --git a/org.eclipse.linuxtools.tmf/ChangeLog b/org.eclipse.linuxtools.tmf/ChangeLog index 2ad58a7fcf..592ef772d3 100644 --- a/org.eclipse.linuxtools.tmf/ChangeLog +++ b/org.eclipse.linuxtools.tmf/ChangeLog @@ -1,204 +1,7 @@ -2011-03-10 Francois Chouinard +2011-06-02 Andrew Overholt - * src/org/eclipse/linuxtools/tmf/.options: Fixed a typo - * src/org/eclipse/linuxtools/tmf/signal/TmfSignalManager.java: Improved request tracing - * src/org/eclipse/linuxtools/tmf/request/TmfRequestExecutor.java: Improved request tracing - * src/org/eclipse/linuxtools/tmf/request/TmfEventRequest.java: Streamlined constructor - * src/org/eclipse/linuxtools/tmf/request/TmfDataRequest.java: Improved request tracing - * src/org/eclipse/linuxtools/tmf/component/TmfEventProvider.java: Improved request tracing - * src/org/eclipse/linuxtools/tmf/component/TmfDataProvider.java: Improved request tracing - * src/org/eclipse/linuxtools/tmf/Tracer.java: Improved request tracing - * src/org/eclipse/linuxtools/tmf/experiment/TmfExperiment.java: Fixed request completion call - -2010-12-13 Bernd Hufmann + * build.properties: Include license.html. - * src/org/eclipse/linuxtools/tmf/experiment/TmfExperiment.java (armRequest): For data requests, seek only if necessary +2011-02-04 Jeff Johnston -2010-11-23 Francois Chouinard - - * src/org/eclipse/linuxtools/tmf/component/TmfDataProvider.java: Adjusted background request block size - * src/org/eclipse/linuxtools/tmf/trace/TmfTrace.java: Adjusted buffering between checkpoints - -2010-11-10 Francois Chouinard - - Suppress warning for non-externalized strings - * src/org/eclipse/linuxtools/tmf/experiment/TmfExperiment.java: - -2010-11-09 Francois Chouinard - - * src/org/eclipse/linuxtools/tmf/experiment/TmfExperiment.java (getNextEvent): Fix for NullPointerException - - Suppress warning for non-externalized strings - * src/org/eclipse/linuxtools/tmf/component/TmfDataProvider.java (newCoalescedDataRequest): - (coalesceDataRequest): - (.run): - (queueRequest): - * src/org/eclipse/linuxtools/tmf/component/TmfEventProvider.java (newCoalescedDataRequest): - * src/org/eclipse/linuxtools/tmf/event/TmfEvent.java (toString): - * src/org/eclipse/linuxtools/tmf/event/TmfEventContent.java (toString): - * src/org/eclipse/linuxtools/tmf/event/TmfEventField.java (toString): - * src/org/eclipse/linuxtools/tmf/event/TmfEventReference.java (toString): - * src/org/eclipse/linuxtools/tmf/event/TmfEventSource.java (toString): - * src/org/eclipse/linuxtools/tmf/event/TmfEventType.java (DEFAULT_TYPE_ID): - (getLabel): - (toString): - * src/org/eclipse/linuxtools/tmf/event/TmfTimeRange.java (toString): - * src/org/eclipse/linuxtools/tmf/event/TmfTimestamp.java (synchronize): - (toString): - * src/org/eclipse/linuxtools/tmf/event/TmfTraceEvent.java (toString): - * src/org/eclipse/linuxtools/tmf/experiment/TmfExperiment.java (TmfExperiment): - (toString): - * src/org/eclipse/linuxtools/tmf/experiment/TmfExperimentLocation.java (toString): - * src/org/eclipse/linuxtools/tmf/request/TmfCoalescedDataRequest.java (toString): - * src/org/eclipse/linuxtools/tmf/request/TmfCoalescedEventRequest.java (toString): - * src/org/eclipse/linuxtools/tmf/request/TmfDataRequest.java (TmfDataRequest): - (handleCompleted): - (start): - (done): - (toString): - * src/org/eclipse/linuxtools/tmf/request/TmfEventRequest.java (toString): - * src/org/eclipse/linuxtools/tmf/request/TmfRequestExecutor.java (TmfRequestExecutor): - (stop): - (.run): - (toString): - * src/org/eclipse/linuxtools/tmf/signal/TmfExperimentSelectedSignal.java (toString): - * src/org/eclipse/linuxtools/tmf/signal/TmfExperimentUpdatedSignal.java (toString): - * src/org/eclipse/linuxtools/tmf/signal/TmfSignalTracer.java (traceSignal): - * src/org/eclipse/linuxtools/tmf/signal/TmfTimeSynchSignal.java (toString): - * src/org/eclipse/linuxtools/tmf/signal/TmfTraceClosedSignal.java (toString): - * src/org/eclipse/linuxtools/tmf/signal/TmfTraceOpenedSignal.java (toString): - * src/org/eclipse/linuxtools/tmf/signal/TmfTraceParserUpdatedSignal.java (toString): - * src/org/eclipse/linuxtools/tmf/signal/TmfTraceSelectedSignal.java (toString): - * src/org/eclipse/linuxtools/tmf/signal/TmfTraceUpdatedSignal.java (toString): - * src/org/eclipse/linuxtools/tmf/TmfCorePlugin.java (PLUGIN_ID): - * src/org/eclipse/linuxtools/tmf/trace/TmfCheckpoint.java (toString): - * src/org/eclipse/linuxtools/tmf/trace/TmfContext.java (toString): - * src/org/eclipse/linuxtools/tmf/trace/TmfLocation.java (toString): - (clone): - * src/org/eclipse/linuxtools/tmf/trace/TmfTrace.java (toString): - * src/org/eclipse/linuxtools/tmf/Tracer.java: - -2010-11-04 Francois Chouinard - - * src/org/eclipse/linuxtools/tmf/experiment/TmfExperiment.java: Use the correct index page size - * src/org/eclipse/linuxtools/tmf/trace/TmfTrace.java: Added indexTrace() and support code - -2010-10-29 Francois Chouinard - - * src/org/eclipse/linuxtools/tmf/experiment/TmfExperiment.java (getNextEvent): Removed an unnecessary clone() operation - -2010-10-27 Francois Chouinard - - * src/org/eclipse/linuxtools/tmf/component/ITmfDataProvider.java: Augmented API for coalescing (notifyPendingRequest) - * src/org/eclipse/linuxtools/tmf/component/TmfDataProvider.java: Request coalescing and cancelling - * src/org/eclipse/linuxtools/tmf/experiment/TmfExperiment.java: Augmented API - * src/org/eclipse/linuxtools/tmf/request/TmfCoalescedDataRequest.java: Improved coalescing and cancelling - * src/org/eclipse/linuxtools/tmf/request/TmfCoalescedEventRequest.java: Ditto - * src/org/eclipse/linuxtools/tmf/request/TmfDataRequest.java: Ditto - * src/org/eclipse/linuxtools/tmf/signal/TmfSignalManager.java: Renaming of a field - -2010-10-15 Francois Chouinard - - * src/org/eclipse/linuxtools/tmf/event/TmfEvent.java: Implement cloning - * src/org/eclipse/linuxtools/tmf/event/TmfEventContent.java: Implement cloning - * src/org/eclipse/linuxtools/tmf/event/TmfEventField.java: Implement cloning - * src/org/eclipse/linuxtools/tmf/event/TmfEventReference.java: Implement cloning - * src/org/eclipse/linuxtools/tmf/event/TmfEventSource.java: Implement cloning - * src/org/eclipse/linuxtools/tmf/event/TmfEventType.java: Implement cloning - * src/org/eclipse/linuxtools/tmf/event/TmfTimestamp.java: Implement cloning - * src/org/eclipse/linuxtools/tmf/experiment/TmfExperiment.java (updateIndex): Fixed timestamp cloning - * src/org/eclipse/linuxtools/tmf/request/TmfDataRequest.java: Replaced lock.wait() by CountDownLatch - * src/org/eclipse/linuxtools/tmf/trace/TmfTrace.java (updateIndex): Fixed timestamp cloning - -2010-10-13 Francois Chouinard - - * src/org/eclipse/linuxtools/tmf/request/TmfRequestExecutor.java: Added checks for disposed widget - * src/org/eclipse/linuxtools/tmf/experiment/TmfExperiment.java: Added checks for disposed widget - * src/org/eclipse/linuxtools/tmf/request/TmfDataRequest.java: Added waitForStart() API - * src/org/eclipse/linuxtools/tmf/event/TmfEventContent.java: Added setEvent() - * src/org/eclipse/linuxtools/tmf/event/TmfTimeRange.java: Added getIntersection() - * src/org/eclipse/linuxtools/tmf/event/TmfTimestamp.java: Improved timestamp comparison - -2010-09-17 Francois Chouinard - - * src/org/eclipse/linuxtools/tmf/component/TmfDataProvider.java: Adjusted to new handleData() API - * src/org/eclipse/linuxtools/tmf/component/TmfEventProvider.java: Adjusted to new handleData() API - * src/org/eclipse/linuxtools/tmf/event/TmfEvent.java: Support for single event - * src/org/eclipse/linuxtools/tmf/experiment/TmfExperiment.java: Adjusted to new handleData() API - * src/org/eclipse/linuxtools/tmf/request/ITmfDataRequest.java: Adjusted to new handleData() API - * src/org/eclipse/linuxtools/tmf/request/TmfCoalescedDataRequest.java: Adjusted to new handleData() API - * src/org/eclipse/linuxtools/tmf/request/TmfCoalescedEventRequest.java: Adjusted to new handleData() API - * src/org/eclipse/linuxtools/tmf/request/TmfDataRequest.java: Adjusted to new handleData() API - * src/org/eclipse/linuxtools/tmf/request/TmfEventRequest.java: Adjusted to new handleData() API - -2010-09-17 Francois Chouinard - - * src/org/eclipse/linuxtools/tmf/component/TmfDataProvider.java: Adjusted to new handleData() API - * src/org/eclipse/linuxtools/tmf/component/TmfEventProvider.java: Adjusted to new handleData() API - * src/org/eclipse/linuxtools/tmf/event/TmfEvent.java: Support for single event - * src/org/eclipse/linuxtools/tmf/experiment/TmfExperiment.java: Adjusted to new handleData() API - * src/org/eclipse/linuxtools/tmf/request/ITmfDataRequest.java: Adjusted to new handleData() API - * src/org/eclipse/linuxtools/tmf/request/TmfCoalescedDataRequest.java: Adjusted to new handleData() API - * src/org/eclipse/linuxtools/tmf/request/TmfCoalescedEventRequest.java: Adjusted to new handleData() API - * src/org/eclipse/linuxtools/tmf/request/TmfDataRequest.java: Adjusted to new handleData() API - * src/org/eclipse/linuxtools/tmf/request/TmfEventRequest.java: Adjusted to new handleData() API - -2010-09-15 Francois Chouinard - - * src/org/eclipse/linuxtools/tmf/experiment/TmfExperiment.java: Optimized TmfExperimentContext handling - * src/org/eclipse/linuxtools/tmf/trace/TmfTrace.java: ExecutionType update - * src/org/eclipse/linuxtools/tmf/trace/TmfContext.java: ExecutionType update - * src/org/eclipse/linuxtools/tmf/request/TmfRequestExecutor.java: ExecutionType update - * src/org/eclipse/linuxtools/tmf/request/TmfEventRequest.java: ExecutionType update - * src/org/eclipse/linuxtools/tmf/request/TmfDataRequest.java: ExecutionType update - * src/org/eclipse/linuxtools/tmf/request/TmfCoalescedEventRequest.java: ExecutionType update - * src/org/eclipse/linuxtools/tmf/request/TmfCoalescedDataRequest.java: ExecutionType update - * src/org/eclipse/linuxtools/tmf/request/ITmfDataRequest.java: ExecutionType update - * src/org/eclipse/linuxtools/tmf/component/TmfDataProvider.java: ExecutionType update - * src/org/eclipse/linuxtools/tmf/Tracer.java: ExecutionType update - -2010-09-09 Francois Chouinard - - * src/org/eclipse/linuxtools/tmf/request/TmfCoalescedEventRequest.java: Fix in handleData() - * src/org/eclipse/linuxtools/tmf/experiment/TmfExperiment.java: Made class extendable - -2010-07-20 Francois Chouinard - - * src/org/eclipse/linuxtools/tmf/component/TmfDataProvider.java: - - Use a specific lock object (instead of this) for synchronization - - Fix executor exception when request comes in immediately after dispose - * src/org/eclipse/linuxtools/tmf/experiment/TmfExperiment.java: - - Fix constructor ignoring index page size - - Update saved context on parse to avoid unnecessary seeks - -2010-07-19 Francois Chouinard - - * src/org/eclipse/linuxtools/tmf/experiment/TmfExperiment.java: Some modifications to make the experiment more generic. - -2010-07-13 Francois Chouinard - - * src/org/eclipse/linuxtools/tmf/experiment/TmfExperiment.java (.updateExperiment): Added check for empty experiment - * src/org/eclipse/linuxtools/tmf/trace/TmfTrace.java (.updateTraceData): Added check for empty trace - -2010-07-12 Francois Chouinard - - * src/org/eclipse/linuxtools/tmf/signal/TmfTraceClosedSignal.java: New file. - * src/org/eclipse/linuxtools/tmf/signal/TmfTraceOpenedSignal.java: New file. - * src/org/eclipse/linuxtools/tmf/signal/TmfTraceParserUpdatedSignal.java: New file. - * src/org/eclipse/linuxtools/tmf/signal/TmfTraceSelectedSignal.java: New file. - * META-INF/MANIFEST.MF: Added a dependency on org.eclipse.core.resources - * src/org/eclipse/linuxtools/tmf/experiment/TmfExperiment.java (seekEvent): Commented out useless statements - * src/org/eclipse/linuxtools/tmf/trace/ITmfContext.java: Added a constant - * src/org/eclipse/linuxtools/tmf/trace/ITmfTrace.java: Added APIs - * src/org/eclipse/linuxtools/tmf/trace/TmfLocation.java: Added validation on location - * src/org/eclipse/linuxtools/tmf/trace/TmfTrace.java (getRank): Added - (indexTrace): Cleaned up warning - (queueLongRequest): Added background process handling - -2010-07-08 Francois Chouinard - - * src/org/eclipse/linuxtools/tmf/trace/TmfTrace.java (indexTrace): New method + renamed a constant - -2009-06-16 Andrew Overholt - - * META-INF/MANIFEST.MF: Change provider from Ericsson to Eclipse. \ No newline at end of file + * feature.properties: Fix license to be consistent with other tools. \ No newline at end of file diff --git a/org.eclipse.linuxtools.tmf/META-INF/MANIFEST.MF b/org.eclipse.linuxtools.tmf/META-INF/MANIFEST.MF deleted file mode 100644 index b31597ce45..0000000000 --- a/org.eclipse.linuxtools.tmf/META-INF/MANIFEST.MF +++ /dev/null @@ -1,27 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: %Bundle-Name -Bundle-SymbolicName: org.eclipse.linuxtools.tmf.core;singleton:=true -Bundle-Version: 0.4.0.qualifier -Bundle-Activator: org.eclipse.linuxtools.tmf.TmfCorePlugin -Bundle-Vendor: %Bundle-Vendor -Require-Bundle: org.eclipse.core.runtime;bundle-version="3.7.0", - org.eclipse.core.resources;bundle-version="3.7.100" -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 -Bundle-ActivationPolicy: lazy -Export-Package: org.eclipse.linuxtools.tmf, - org.eclipse.linuxtools.tmf.component, - org.eclipse.linuxtools.tmf.event, - org.eclipse.linuxtools.tmf.experiment, - org.eclipse.linuxtools.tmf.filter, - org.eclipse.linuxtools.tmf.filter.model, - org.eclipse.linuxtools.tmf.filter.xml, - org.eclipse.linuxtools.tmf.io, - org.eclipse.linuxtools.tmf.parser, - org.eclipse.linuxtools.tmf.request, - org.eclipse.linuxtools.tmf.signal, - org.eclipse.linuxtools.tmf.trace, - org.eclipse.linuxtools.tmf.uml2sd, - org.eclipse.linuxtools.tmf.util -Bundle-Localization: plugin -Import-Package: org.eclipse.core.filesystem.provider diff --git a/org.eclipse.linuxtools.tmf/build.properties b/org.eclipse.linuxtools.tmf/build.properties index 00e586480b..39b0777e50 100644 --- a/org.eclipse.linuxtools.tmf/build.properties +++ b/org.eclipse.linuxtools.tmf/build.properties @@ -1,8 +1,4 @@ -source.. = src/ -output.. = bin/ -bin.includes = META-INF/,\ - plugin.xml,\ - plugin.properties,\ - about.html,\ - . - \ No newline at end of file +bin.includes = feature.xml,\ + epl-v10.html,\ + feature.properties,\ + license.html diff --git a/org.eclipse.linuxtools.tmf-feature/epl-v10.html b/org.eclipse.linuxtools.tmf/epl-v10.html similarity index 100% rename from org.eclipse.linuxtools.tmf-feature/epl-v10.html rename to org.eclipse.linuxtools.tmf/epl-v10.html diff --git a/org.eclipse.linuxtools.tmf-feature/feature.properties b/org.eclipse.linuxtools.tmf/feature.properties similarity index 100% rename from org.eclipse.linuxtools.tmf-feature/feature.properties rename to org.eclipse.linuxtools.tmf/feature.properties diff --git a/org.eclipse.linuxtools.tmf-feature/feature.xml b/org.eclipse.linuxtools.tmf/feature.xml similarity index 100% rename from org.eclipse.linuxtools.tmf-feature/feature.xml rename to org.eclipse.linuxtools.tmf/feature.xml diff --git a/org.eclipse.linuxtools.tmf-feature/license.html b/org.eclipse.linuxtools.tmf/license.html similarity index 100% rename from org.eclipse.linuxtools.tmf-feature/license.html rename to org.eclipse.linuxtools.tmf/license.html diff --git a/org.eclipse.linuxtools.tmf/pom.xml b/org.eclipse.linuxtools.tmf/pom.xml index b8fcf4084f..fea4e7cd0a 100644 --- a/org.eclipse.linuxtools.tmf/pom.xml +++ b/org.eclipse.linuxtools.tmf/pom.xml @@ -17,29 +17,11 @@ 0.10.0-SNAPSHOT - org.eclipse.linuxtools.tmf.core + org.eclipse.linuxtools.tmf 0.4.0-SNAPSHOT - eclipse-plugin + eclipse-feature - Linux Tools LTTng TMF Core Plug-in + Linux Tools LTTng TMF (Tracing and Monitoring Framework) - - - - - src - - **/*.java - - - - - - org.eclipse.tycho - tycho-source-plugin - - - - - org.eclipse.linuxtools.tmf + org.eclipse.linuxtools.tmf diff --git a/pom.xml b/pom.xml index 49bdee1b37..f1151ae500 100644 --- a/pom.xml +++ b/pom.xml @@ -80,7 +80,7 @@ lttngTests - org.eclipse.linuxtools.lttng.tests + org.eclipse.linuxtools.lttng.core.tests @@ -107,15 +107,15 @@ - org.eclipse.linuxtools.tmf-feature org.eclipse.linuxtools.tmf - org.eclipse.linuxtools.tmf.tests + org.eclipse.linuxtools.tmf.core + org.eclipse.linuxtools.tmf.core.tests org.eclipse.linuxtools.tmf.ui org.eclipse.linuxtools.tmf.ui.tests - org.eclipse.linuxtools.lttng-feature org.eclipse.linuxtools.lttng - + org.eclipse.linuxtools.lttng.core + org.eclipse.linuxtools.lttng.help org.eclipse.linuxtools.lttng.jni org.eclipse.linuxtools.lttng.ui -- 2.34.1