From 8e8c022634079344d10d14abcdcb65ff0a5c90d0 Mon Sep 17 00:00:00 2001 From: Alexandre Montplaisir Date: Thu, 24 Apr 2014 16:36:51 -0400 Subject: [PATCH] lttng: Rename lttng2 feature/plugins to lttng2.control Change-Id: I4e62711ad2a4355758aff4e8dd4dafdd86f91a98 Signed-off-by: Alexandre Montplaisir Reviewed-on: https://git.eclipse.org/r/25525 Tested-by: Hudson CI Reviewed-by: Marc-Andre Laperle Tested-by: Marc-Andre Laperle --- .../META-INF/MANIFEST.MF | 4 +- .../lttng/alltests/RunAllTests.java | 4 +- .../doc/User-Guide.mediawiki | 4 +- .../.classpath | 0 .../.gitignore | 2 + .../.project | 2 +- .../org.eclipse.core.resources.prefs | 0 .../.settings/org.eclipse.core.runtime.prefs | 0 .../.settings/org.eclipse.jdt.core.prefs | 0 .../.settings/org.eclipse.jdt.ui.prefs | 0 .../.settings/org.eclipse.pde.api.tools.prefs | 0 .../.settings/org.eclipse.pde.prefs | 0 .../META-INF/MANIFEST.MF | 14 ++ .../about.html | 0 .../build.properties | 0 .../plugin.properties | 4 +- .../pom.xml | 36 +--- .../control}/core/tests/ActivatorTest.java | 10 +- .../lttng2/control}/core/tests/AllTests.java | 9 +- .../core/tests}/model/impl/AllTests.java | 4 +- .../tests}/model/impl/BaseEventInfoTest.java | 14 +- .../tests}/model/impl/ChannelInfoTest.java | 14 +- .../tests}/model/impl/DomainInfoTest.java | 8 +- .../core/tests}/model/impl/EventInfoTest.java | 10 +- .../core/tests}/model/impl/FieldInfoTest.java | 6 +- .../tests}/model/impl/ModelImplFactory.java | 48 +++--- .../tests}/model/impl/ProbeEventInfoTest.java | 10 +- .../tests}/model/impl/SessionInfoTest.java | 10 +- .../tests}/model/impl/SnapshotInfoTest.java | 8 +- .../core/tests}/model/impl/TraceInfoTest.java | 11 +- .../model/impl/UstProviderInfoTest.java | 10 +- .../control}/core/tests/session/AllTests.java | 2 +- .../session/SessionConfigGeneratorTest.java | 25 +-- .../test_invalid.lttng | 0 .../test_valid.lttng | 0 .../.classpath | 0 .../.gitignore | 2 + .../.project | 2 +- .../org.eclipse.core.resources.prefs | 0 .../.settings/org.eclipse.core.runtime.prefs | 0 .../.settings/org.eclipse.jdt.core.prefs | 0 .../.settings/org.eclipse.jdt.ui.prefs | 0 .../.settings/org.eclipse.pde.api.tools.prefs | 0 .../.settings/org.eclipse.pde.prefs | 0 .../META-INF/MANIFEST.MF | 15 ++ .../about.html | 0 .../build.properties | 0 .../plugin.properties | 4 +- .../pom.xml | 13 +- .../lttng2/control}/core/Activator.java | 4 +- .../control/core}/model/IBaseEventInfo.java | 2 +- .../control/core}/model/IChannelInfo.java | 4 +- .../control/core}/model/IDomainInfo.java | 4 +- .../control/core}/model/IEventInfo.java | 2 +- .../control/core}/model/IFieldInfo.java | 2 +- .../control/core}/model/IProbeEventInfo.java | 2 +- .../control/core}/model/ISessionInfo.java | 2 +- .../control/core}/model/ISnapshotInfo.java | 2 +- .../control/core}/model/ITraceInfo.java | 2 +- .../control/core}/model/IUstProviderInfo.java | 2 +- .../control/core}/model/LogLevelType.java | 2 +- .../control/core}/model/TargetNodeState.java | 2 +- .../control/core}/model/TraceEnablement.java | 2 +- .../control/core}/model/TraceEventType.java | 2 +- .../control/core}/model/TraceLogLevel.java | 2 +- .../core}/model/TraceSessionState.java | 2 +- .../core}/model/impl/BaseEventInfo.java | 10 +- .../control/core}/model/impl/BufferType.java | 2 +- .../control/core}/model/impl/ChannelInfo.java | 8 +- .../control/core}/model/impl/DomainInfo.java | 6 +- .../control/core}/model/impl/EventInfo.java | 6 +- .../control/core}/model/impl/FieldInfo.java | 4 +- .../core}/model/impl/ProbeEventInfo.java | 4 +- .../control/core}/model/impl/SessionInfo.java | 10 +- .../core}/model/impl/SnapshotInfo.java | 4 +- .../control/core}/model/impl/TraceInfo.java | 4 +- .../core}/model/impl/UstProviderInfo.java | 6 +- .../control}/core/session/Messages.java | 4 +- .../core/session/SessionConfigGenerator.java | 20 +-- .../core/session/SessionConfigStrings.java | 2 +- .../control}/core/session/messages.properties | 0 .../lttng2/control}/core/session/session.xsd | 0 .../.classpath | 0 .../.gitignore | 2 + .../.project | 2 +- .../org.eclipse.core.resources.prefs | 0 .../.settings/org.eclipse.core.runtime.prefs | 0 .../.settings/org.eclipse.jdt.core.prefs | 0 .../.settings/org.eclipse.jdt.ui.prefs | 0 .../.settings/org.eclipse.pde.api.tools.prefs | 0 .../.settings/org.eclipse.pde.prefs | 0 .../META-INF/MANIFEST.MF | 29 ++++ .../about.html | 0 .../build.properties | 0 .../plugin.properties | 4 +- .../pom.xml | 17 +- .../control}/ui/tests/ActivatorTest.java | 10 +- .../lttng2/control}/ui/tests/AllTests.java | 8 +- .../ui/tests}/model/component/AllTests.java | 4 +- .../model/component/ListenerValidator.java | 6 +- .../component/TraceControlComponentTest.java | 25 +-- .../TraceControlCreateSessionTests.java | 26 +-- .../TraceControlKernelProviderTests.java | 38 ++-- .../TraceControlKernelSessionTests.java | 42 ++--- .../component/TraceControlPropertiesTest.java | 56 +++--- .../TraceControlSnapshotSessionTests.java | 24 +-- .../component/TraceControlTestFacility.java | 8 +- .../TraceControlTreeModelNoProvidersTest.java | 20 +-- .../component/TraceControlTreeModelTest.java | 42 ++--- .../TraceControlUstProviderTests.java | 40 ++--- .../TraceControlUstSessionTests.java | 44 ++--- .../TraceControlUstSessionTests2.java | 30 ++-- .../control/ui/tests}/service/AllTests.java | 4 +- .../service/LTTngControlServiceTest.java | 50 +++--- .../stubs/dialogs/AddContextDialogStub.java | 4 +- .../dialogs/CreateSessionDialogStub.java | 10 +- .../dialogs/DestroyConfirmDialogStub.java | 12 +- .../dialogs/EnableChannelDialogStub.java | 14 +- .../stubs/dialogs/EnableEventsDialogStub.java | 12 +- .../stubs/dialogs/GetEventInfoDialogStub.java | 8 +- .../stubs/service/CommandShellFactory.java | 4 +- .../stubs/service/TestRemoteSystemProxy.java | 8 +- .../stubs/shells/LTTngToolsFileShell.java | 6 +- .../stubs/shells/TestCommandShell.java | 8 +- .../testfiles/CreateSessionTest.cfg | 0 .../testfiles/CreateSessionTest2.cfg | 0 .../testfiles/CreateTreeTest.cfg | 0 .../testfiles/CreateTreeTest2.cfg | 0 .../testfiles/LTTngServiceTest.cfg | 0 .../testfiles/ListInfoTest.cfg | 0 .../.classpath | 0 .../.gitignore | 2 + .../.project | 2 +- .../org.eclipse.core.resources.prefs | 0 .../.settings/org.eclipse.core.runtime.prefs | 0 .../.settings/org.eclipse.jdt.core.prefs | 0 .../.settings/org.eclipse.jdt.ui.prefs | 0 .../.settings/org.eclipse.pde.api.tools.prefs | 0 .../.settings/org.eclipse.pde.prefs | 0 .../META-INF/MANIFEST.MF | 40 +++++ .../about.html | 0 .../build.properties | 0 .../icons/elcl16/add-context.gif | Bin .../icons/elcl16/add_button.gif | Bin .../icons/elcl16/calibrate.gif | Bin .../icons/elcl16/connect.gif | Bin .../icons/elcl16/delete_trace.gif | Bin .../icons/elcl16/disable.gif | Bin .../icons/elcl16/disable_event.gif | Bin .../icons/elcl16/disconnect.gif | Bin .../icons/elcl16/edit.gif | Bin .../icons/elcl16/enable.gif | Bin .../icons/elcl16/enable_event.gif | Bin .../icons/elcl16/import_trace.gif | Bin .../icons/elcl16/pause_trace.gif | Bin .../icons/elcl16/refresh.gif | Bin .../icons/elcl16/snapshot.gif | Bin .../icons/elcl16/start_trace.gif | Bin .../icons/elcl16/stop_trace.gif | Bin .../icons/elcl16/target_add.gif | Bin .../icons/elcl16/target_delete.gif | Bin .../icons/eview16/control_view.gif | Bin .../icons/obj16/channel.gif | Bin .../icons/obj16/channel_disabled.gif | Bin .../icons/obj16/domain.gif | Bin .../icons/obj16/event_disabled.gif | Bin .../icons/obj16/event_enabled.gif | Bin .../icons/obj16/garland16.png | Bin .../icons/obj16/providers.gif | Bin .../icons/obj16/session_active.gif | Bin .../icons/obj16/session_destroyed.gif | Bin .../icons/obj16/session_inactive.gif | Bin .../icons/obj16/sessions.gif | Bin .../icons/obj16/systemlttng2-live.gif | Bin .../icons/obj16/systemlttng2.gif | Bin .../icons/obj16/target_connected.gif | Bin .../icons/obj16/target_disconnected.gif | Bin .../icons/obj16/targets.gif | Bin .../plugin.properties | 6 +- .../plugin.xml | 162 +++++++++--------- .../pom.xml | 13 +- .../lttng2/control}/ui/Activator.java | 6 +- .../lttng2/control/ui/views}/ControlView.java | 12 +- .../ui/views}/dialogs/AddContextDialog.java | 6 +- .../ui/views}/dialogs/ConfirmDialog.java | 4 +- .../views}/dialogs/CreateSessionDialog.java | 17 +- .../views}/dialogs/EnableChannelDialog.java | 18 +- .../ui/views}/dialogs/EnableEventsDialog.java | 14 +- .../dialogs/EnableKernelEventComposite.java | 16 +- .../dialogs/EnableUstEventsComposite.java | 22 +-- .../ui/views}/dialogs/GetEventInfoDialog.java | 12 +- .../ui/views}/dialogs/IAddContextDialog.java | 2 +- .../ui/views}/dialogs/IConfirmDialog.java | 2 +- .../views}/dialogs/ICreateSessionDialog.java | 6 +- .../views}/dialogs/IEnableChannelDialog.java | 8 +- .../views}/dialogs/IEnableEventsDialog.java | 6 +- .../views}/dialogs/IEnableKernelEvents.java | 2 +- .../ui/views}/dialogs/IEnableUstEvents.java | 6 +- .../views}/dialogs/IGetEventInfoDialog.java | 6 +- .../dialogs/IImportConfirmationDialog.java | 2 +- .../ui/views}/dialogs/IImportDialog.java | 4 +- .../views}/dialogs/INewConnectionDialog.java | 4 +- .../dialogs/ImportConfirmationDialog.java | 6 +- .../ui/views}/dialogs/ImportDialog.java | 10 +- .../ui/views}/dialogs/ImportFileInfo.java | 2 +- .../views}/dialogs/NewConnectionDialog.java | 10 +- .../dialogs/TraceControlDialogFactory.java | 2 +- .../handlers/AddContextOnChannelHandler.java | 10 +- .../handlers/AddContextOnDomainHandler.java | 10 +- .../handlers/AddContextOnEventHandler.java | 10 +- .../views}/handlers/AssignEventHandler.java | 26 +-- .../handlers/BaseAddContextHandler.java | 10 +- .../handlers/BaseControlViewHandler.java | 8 +- .../handlers/BaseEnableChannelHandler.java | 14 +- .../handlers/BaseEnableEventHandler.java | 22 +-- .../ui/views}/handlers/BaseNodeHandler.java | 6 +- .../ui/views}/handlers/CalibrateHandler.java | 12 +- .../handlers/ChangeChannelStateHandler.java | 16 +- .../handlers/ChangeEventStateHandler.java | 16 +- .../handlers/ChangeSessionStateHandler.java | 12 +- .../handlers/ChannelCommandParameter.java | 6 +- .../ui/views}/handlers/CommandParameter.java | 4 +- .../ui/views}/handlers/ConnectHandler.java | 4 +- .../views}/handlers/CreateSessionHandler.java | 14 +- .../ui/views}/handlers/DeleteHandler.java | 6 +- .../handlers/DestroySessionHandler.java | 18 +- .../handlers/DisableChannelHandler.java | 6 +- .../views}/handlers/DisableEventHandler.java | 6 +- .../ui/views}/handlers/DisconnectHandler.java | 4 +- .../handlers/DomainCommandParameter.java | 6 +- .../views}/handlers/EnableChannelHandler.java | 6 +- .../EnableChannelOnDomainHandler.java | 12 +- .../EnableChannelOnSessionHandler.java | 12 +- .../views}/handlers/EnableEventHandler.java | 6 +- .../handlers/EnableEventOnChannelHandler.java | 14 +- .../handlers/EnableEventOnDomainHandler.java | 14 +- .../handlers/EnableEventOnSessionHandler.java | 14 +- .../handlers/EventCommandParameter.java | 6 +- .../ui/views}/handlers/ImportHandler.java | 18 +- .../views}/handlers/NewConnectionHandler.java | 16 +- .../ui/views}/handlers/RefreshHandler.java | 10 +- .../ui/views}/handlers/SnaphshotHandler.java | 12 +- .../ui/views}/handlers/StartHandler.java | 6 +- .../ui/views}/handlers/StopHandler.java | 6 +- .../views}/logging/ControlCommandLogger.java | 4 +- .../control/ui/views}/messages/Messages.java | 7 +- .../ui/views}/messages/messages.properties | 0 .../views}/model/ITraceControlComponent.java | 6 +- ...ITraceControlComponentChangedListener.java | 2 +- .../views}/model/impl/BaseEventComponent.java | 18 +- .../model/impl/KernelProviderComponent.java | 10 +- .../model/impl/TargetNodeComponent.java | 22 +-- .../model/impl/TraceChannelComponent.java | 24 +-- .../model/impl/TraceControlComponent.java | 12 +- .../impl/TraceControlContentProvider.java | 4 +- .../model/impl/TraceControlLabelProvider.java | 4 +- .../impl/TraceControlPropertyTester.java | 2 +- .../views}/model/impl/TraceControlRoot.java | 2 +- .../model/impl/TraceDomainComponent.java | 20 +-- .../model/impl/TraceEventComponent.java | 20 +-- .../model/impl/TraceProbeEventComponent.java | 10 +- .../views}/model/impl/TraceProviderGroup.java | 10 +- .../model/impl/TraceSessionComponent.java | 26 +-- .../views}/model/impl/TraceSessionGroup.java | 6 +- .../model/impl/UstProviderComponent.java | 14 +- .../ControlPreferenceInitializer.java | 2 +- .../preferences/ControlPreferencePage.java | 6 +- .../preferences/ControlPreferences.java | 4 +- .../property/BaseEventPropertySource.java | 8 +- .../views}/property/BasePropertySource.java | 2 +- .../KernelProviderPropertySource.java | 6 +- .../property/TargetNodePropertySource.java | 6 +- .../property/TraceChannelPropertySource.java | 6 +- .../property/TraceDomainPropertySource.java | 8 +- .../property/TraceEventPropertySource.java | 8 +- .../TraceProbeEventPropertySource.java | 8 +- .../property/TraceSessionPropertySource.java | 6 +- .../property/UstProviderPropertySource.java | 6 +- .../ui/views}/remote/CommandResult.java | 2 +- .../ui/views}/remote/CommandShell.java | 6 +- .../ui/views}/remote/ICommandResult.java | 2 +- .../ui/views}/remote/ICommandShell.java | 2 +- .../ui/views}/remote/IRemoteSystemProxy.java | 2 +- .../ui/views}/remote/RemoteSystemProxy.java | 2 +- .../views}/service/ILttngControlService.java | 16 +- .../views}/service/LTTngControlService.java | 56 +++--- .../service/LTTngControlServiceConstants.java | 2 +- .../service/LTTngControlServiceFactory.java | 12 +- .../ui/views}/service/LttngVersion.java | 2 +- .../.gitignore | 0 .../.project | 2 +- .../org.eclipse.core.resources.prefs | 0 .../.settings/org.eclipse.core.runtime.prefs | 0 .../build.properties | 1 + .../feature.properties | 4 +- .../feature.xml | 8 +- .../p2.inf | 5 + .../pom.xml | 4 +- .../sourceTemplateFeature/p2.inf | 8 + .../META-INF/MANIFEST.MF | 15 -- org.eclipse.linuxtools.lttng2.core/.gitignore | 5 - org.eclipse.linuxtools.lttng2.core/.options | 3 - .../META-INF/MANIFEST.MF | 16 -- .../META-INF/MANIFEST.MF | 2 +- .../tests/KernelPerspectiveChecker.java | 2 +- .../META-INF/MANIFEST.MF | 4 +- .../kernel/ui/views/PerspectiveFactory.java | 2 +- .../feature.xml | 6 +- .../.gitignore | 5 - .../META-INF/MANIFEST.MF | 29 ---- org.eclipse.linuxtools.lttng2.ui/.gitignore | 5 - org.eclipse.linuxtools.lttng2.ui/.options | 7 - .../META-INF/MANIFEST.MF | 40 ----- org.eclipse.linuxtools.lttng2.ust/feature.xml | 2 +- org.eclipse.linuxtools.lttng2/.gitignore | 5 - .../tracing.product | 2 +- pom.xml | 12 +- 317 files changed, 1211 insertions(+), 1266 deletions(-) rename {org.eclipse.linuxtools.lttng2.core.tests => org.eclipse.linuxtools.lttng2.control.core.tests}/.classpath (100%) create mode 100644 org.eclipse.linuxtools.lttng2.control.core.tests/.gitignore rename {org.eclipse.linuxtools.lttng2.ui.tests => org.eclipse.linuxtools.lttng2.control.core.tests}/.project (92%) rename {org.eclipse.linuxtools.lttng2.core.tests => org.eclipse.linuxtools.lttng2.control.core.tests}/.settings/org.eclipse.core.resources.prefs (100%) rename {org.eclipse.linuxtools.lttng2.core.tests => org.eclipse.linuxtools.lttng2.control.core.tests}/.settings/org.eclipse.core.runtime.prefs (100%) rename {org.eclipse.linuxtools.lttng2.core.tests => org.eclipse.linuxtools.lttng2.control.core.tests}/.settings/org.eclipse.jdt.core.prefs (100%) rename {org.eclipse.linuxtools.lttng2.core.tests => org.eclipse.linuxtools.lttng2.control.core.tests}/.settings/org.eclipse.jdt.ui.prefs (100%) rename {org.eclipse.linuxtools.lttng2.core.tests => org.eclipse.linuxtools.lttng2.control.core.tests}/.settings/org.eclipse.pde.api.tools.prefs (100%) rename {org.eclipse.linuxtools.lttng2.core.tests => org.eclipse.linuxtools.lttng2.control.core.tests}/.settings/org.eclipse.pde.prefs (100%) create mode 100644 org.eclipse.linuxtools.lttng2.control.core.tests/META-INF/MANIFEST.MF rename {org.eclipse.linuxtools.lttng2.core.tests => org.eclipse.linuxtools.lttng2.control.core.tests}/about.html (100%) rename {org.eclipse.linuxtools.lttng2.core.tests => org.eclipse.linuxtools.lttng2.control.core.tests}/build.properties (100%) rename {org.eclipse.linuxtools.lttng2.core.tests => org.eclipse.linuxtools.lttng2.control.core.tests}/plugin.properties (80%) rename {org.eclipse.linuxtools.lttng2.core.tests => org.eclipse.linuxtools.lttng2.control.core.tests}/pom.xml (52%) rename {org.eclipse.linuxtools.lttng2.core.tests/src/org/eclipse/linuxtools/lttng2 => org.eclipse.linuxtools.lttng2.control.core.tests/src/org/eclipse/linuxtools/lttng2/control}/core/tests/ActivatorTest.java (84%) rename {org.eclipse.linuxtools.lttng2.core.tests/src/org/eclipse/linuxtools/lttng2 => org.eclipse.linuxtools.lttng2.control.core.tests/src/org/eclipse/linuxtools/lttng2/control}/core/tests/AllTests.java (70%) rename {org.eclipse.linuxtools.lttng2.core.tests/src/org/eclipse/linuxtools/lttng2/core/tests/control => org.eclipse.linuxtools.lttng2.control.core.tests/src/org/eclipse/linuxtools/lttng2/control/core/tests}/model/impl/AllTests.java (90%) rename {org.eclipse.linuxtools.lttng2.core.tests/src/org/eclipse/linuxtools/lttng2/core/tests/control => org.eclipse.linuxtools.lttng2.control.core.tests/src/org/eclipse/linuxtools/lttng2/control/core/tests}/model/impl/BaseEventInfoTest.java (97%) rename {org.eclipse.linuxtools.lttng2.core.tests/src/org/eclipse/linuxtools/lttng2/core/tests/control => org.eclipse.linuxtools.lttng2.control.core.tests/src/org/eclipse/linuxtools/lttng2/control/core/tests}/model/impl/ChannelInfoTest.java (96%) rename {org.eclipse.linuxtools.lttng2.core.tests/src/org/eclipse/linuxtools/lttng2/core/tests/control => org.eclipse.linuxtools.lttng2.control.core.tests/src/org/eclipse/linuxtools/lttng2/control/core/tests}/model/impl/DomainInfoTest.java (96%) rename {org.eclipse.linuxtools.lttng2.core.tests/src/org/eclipse/linuxtools/lttng2/core/tests/control => org.eclipse.linuxtools.lttng2.control.core.tests/src/org/eclipse/linuxtools/lttng2/control/core/tests}/model/impl/EventInfoTest.java (96%) rename {org.eclipse.linuxtools.lttng2.core.tests/src/org/eclipse/linuxtools/lttng2/core/tests/control => org.eclipse.linuxtools.lttng2.control.core.tests/src/org/eclipse/linuxtools/lttng2/control/core/tests}/model/impl/FieldInfoTest.java (96%) rename {org.eclipse.linuxtools.lttng2.core.tests/src/org/eclipse/linuxtools/lttng2/core/tests/control => org.eclipse.linuxtools.lttng2.control.core.tests/src/org/eclipse/linuxtools/lttng2/control/core/tests}/model/impl/ModelImplFactory.java (83%) rename {org.eclipse.linuxtools.lttng2.core.tests/src/org/eclipse/linuxtools/lttng2/core/tests/control => org.eclipse.linuxtools.lttng2.control.core.tests/src/org/eclipse/linuxtools/lttng2/control/core/tests}/model/impl/ProbeEventInfoTest.java (95%) rename {org.eclipse.linuxtools.lttng2.core.tests/src/org/eclipse/linuxtools/lttng2/core/tests/control => org.eclipse.linuxtools.lttng2.control.core.tests/src/org/eclipse/linuxtools/lttng2/control/core/tests}/model/impl/SessionInfoTest.java (97%) rename {org.eclipse.linuxtools.lttng2.core.tests/src/org/eclipse/linuxtools/lttng2/core/tests/control => org.eclipse.linuxtools.lttng2.control.core.tests/src/org/eclipse/linuxtools/lttng2/control/core/tests}/model/impl/SnapshotInfoTest.java (96%) rename {org.eclipse.linuxtools.lttng2.core.tests/src/org/eclipse/linuxtools/lttng2/core/tests/control => org.eclipse.linuxtools.lttng2.control.core.tests/src/org/eclipse/linuxtools/lttng2/control/core/tests}/model/impl/TraceInfoTest.java (93%) rename {org.eclipse.linuxtools.lttng2.core.tests/src/org/eclipse/linuxtools/lttng2/core/tests/control => org.eclipse.linuxtools.lttng2.control.core.tests/src/org/eclipse/linuxtools/lttng2/control/core/tests}/model/impl/UstProviderInfoTest.java (96%) rename {org.eclipse.linuxtools.lttng2.core.tests/src/org/eclipse/linuxtools/lttng2 => org.eclipse.linuxtools.lttng2.control.core.tests/src/org/eclipse/linuxtools/lttng2/control}/core/tests/session/AllTests.java (92%) rename {org.eclipse.linuxtools.lttng2.core.tests/src/org/eclipse/linuxtools/lttng2 => org.eclipse.linuxtools.lttng2.control.core.tests/src/org/eclipse/linuxtools/lttng2/control}/core/tests/session/SessionConfigGeneratorTest.java (87%) rename {org.eclipse.linuxtools.lttng2.core.tests => org.eclipse.linuxtools.lttng2.control.core.tests}/test_session_config_files/test_invalid.lttng (100%) rename {org.eclipse.linuxtools.lttng2.core.tests => org.eclipse.linuxtools.lttng2.control.core.tests}/test_session_config_files/test_valid.lttng (100%) rename {org.eclipse.linuxtools.lttng2.core => org.eclipse.linuxtools.lttng2.control.core}/.classpath (100%) create mode 100644 org.eclipse.linuxtools.lttng2.control.core/.gitignore rename {org.eclipse.linuxtools.lttng2.core => org.eclipse.linuxtools.lttng2.control.core}/.project (93%) rename {org.eclipse.linuxtools.lttng2.core => org.eclipse.linuxtools.lttng2.control.core}/.settings/org.eclipse.core.resources.prefs (100%) rename {org.eclipse.linuxtools.lttng2.core => org.eclipse.linuxtools.lttng2.control.core}/.settings/org.eclipse.core.runtime.prefs (100%) rename {org.eclipse.linuxtools.lttng2.core => org.eclipse.linuxtools.lttng2.control.core}/.settings/org.eclipse.jdt.core.prefs (100%) rename {org.eclipse.linuxtools.lttng2.core => org.eclipse.linuxtools.lttng2.control.core}/.settings/org.eclipse.jdt.ui.prefs (100%) rename {org.eclipse.linuxtools.lttng2.core => org.eclipse.linuxtools.lttng2.control.core}/.settings/org.eclipse.pde.api.tools.prefs (100%) rename {org.eclipse.linuxtools.lttng2.core => org.eclipse.linuxtools.lttng2.control.core}/.settings/org.eclipse.pde.prefs (100%) create mode 100644 org.eclipse.linuxtools.lttng2.control.core/META-INF/MANIFEST.MF rename {org.eclipse.linuxtools.lttng2.core => org.eclipse.linuxtools.lttng2.control.core}/about.html (100%) rename {org.eclipse.linuxtools.lttng2.core => org.eclipse.linuxtools.lttng2.control.core}/build.properties (100%) rename {org.eclipse.linuxtools.lttng2.ui.tests => org.eclipse.linuxtools.lttng2.control.core}/plugin.properties (82%) rename {org.eclipse.linuxtools.lttng2.ui => org.eclipse.linuxtools.lttng2.control.core}/pom.xml (74%) rename {org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2 => org.eclipse.linuxtools.lttng2.control.core/src/org/eclipse/linuxtools/internal/lttng2/control}/core/Activator.java (97%) rename {org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control => org.eclipse.linuxtools.lttng2.control.core/src/org/eclipse/linuxtools/internal/lttng2/control/core}/model/IBaseEventInfo.java (97%) rename {org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control => org.eclipse.linuxtools.lttng2.control.core/src/org/eclipse/linuxtools/internal/lttng2/control/core}/model/IChannelInfo.java (96%) rename {org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control => org.eclipse.linuxtools.lttng2.control.core/src/org/eclipse/linuxtools/internal/lttng2/control/core}/model/IDomainInfo.java (92%) rename {org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control => org.eclipse.linuxtools.lttng2.control.core/src/org/eclipse/linuxtools/internal/lttng2/control/core}/model/IEventInfo.java (94%) rename {org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control => org.eclipse.linuxtools.lttng2.control.core/src/org/eclipse/linuxtools/internal/lttng2/control/core}/model/IFieldInfo.java (93%) rename {org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control => org.eclipse.linuxtools.lttng2.control.core/src/org/eclipse/linuxtools/internal/lttng2/control/core}/model/IProbeEventInfo.java (95%) rename {org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control => org.eclipse.linuxtools.lttng2.control.core/src/org/eclipse/linuxtools/internal/lttng2/control/core}/model/ISessionInfo.java (98%) rename {org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control => org.eclipse.linuxtools.lttng2.control.core/src/org/eclipse/linuxtools/internal/lttng2/control/core}/model/ISnapshotInfo.java (96%) rename {org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control => org.eclipse.linuxtools.lttng2.control.core/src/org/eclipse/linuxtools/internal/lttng2/control/core}/model/ITraceInfo.java (93%) rename {org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control => org.eclipse.linuxtools.lttng2.control.core/src/org/eclipse/linuxtools/internal/lttng2/control/core}/model/IUstProviderInfo.java (95%) rename {org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control => org.eclipse.linuxtools.lttng2.control.core/src/org/eclipse/linuxtools/internal/lttng2/control/core}/model/LogLevelType.java (93%) rename {org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control => org.eclipse.linuxtools.lttng2.control.core/src/org/eclipse/linuxtools/internal/lttng2/control/core}/model/TargetNodeState.java (92%) rename {org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control => org.eclipse.linuxtools.lttng2.control.core/src/org/eclipse/linuxtools/internal/lttng2/control/core}/model/TraceEnablement.java (96%) rename {org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control => org.eclipse.linuxtools.lttng2.control.core/src/org/eclipse/linuxtools/internal/lttng2/control/core}/model/TraceEventType.java (95%) rename {org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control => org.eclipse.linuxtools.lttng2.control.core/src/org/eclipse/linuxtools/internal/lttng2/control/core}/model/TraceLogLevel.java (97%) rename {org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control => org.eclipse.linuxtools.lttng2.control.core/src/org/eclipse/linuxtools/internal/lttng2/control/core}/model/TraceSessionState.java (96%) rename {org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control => org.eclipse.linuxtools.lttng2.control.core/src/org/eclipse/linuxtools/internal/lttng2/control/core}/model/impl/BaseEventInfo.java (96%) rename {org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control => org.eclipse.linuxtools.lttng2.control.core/src/org/eclipse/linuxtools/internal/lttng2/control/core}/model/impl/BufferType.java (97%) rename {org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control => org.eclipse.linuxtools.lttng2.control.core/src/org/eclipse/linuxtools/internal/lttng2/control/core}/model/impl/ChannelInfo.java (97%) rename {org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control => org.eclipse.linuxtools.lttng2.control.core/src/org/eclipse/linuxtools/internal/lttng2/control/core}/model/impl/DomainInfo.java (96%) rename {org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control => org.eclipse.linuxtools.lttng2.control.core/src/org/eclipse/linuxtools/internal/lttng2/control/core}/model/impl/EventInfo.java (94%) rename {org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control => org.eclipse.linuxtools.lttng2.control.core/src/org/eclipse/linuxtools/internal/lttng2/control/core}/model/impl/FieldInfo.java (95%) rename {org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control => org.eclipse.linuxtools.lttng2.control.core/src/org/eclipse/linuxtools/internal/lttng2/control/core}/model/impl/ProbeEventInfo.java (97%) rename {org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control => org.eclipse.linuxtools.lttng2.control.core/src/org/eclipse/linuxtools/internal/lttng2/control/core}/model/impl/SessionInfo.java (95%) rename {org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control => org.eclipse.linuxtools.lttng2.control.core/src/org/eclipse/linuxtools/internal/lttng2/control/core}/model/impl/SnapshotInfo.java (97%) rename {org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control => org.eclipse.linuxtools.lttng2.control.core/src/org/eclipse/linuxtools/internal/lttng2/control/core}/model/impl/TraceInfo.java (95%) rename {org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control => org.eclipse.linuxtools.lttng2.control.core/src/org/eclipse/linuxtools/internal/lttng2/control/core}/model/impl/UstProviderInfo.java (96%) rename {org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/lttng2 => org.eclipse.linuxtools.lttng2.control.core/src/org/eclipse/linuxtools/lttng2/control}/core/session/Messages.java (93%) rename {org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/lttng2 => org.eclipse.linuxtools.lttng2.control.core/src/org/eclipse/linuxtools/lttng2/control}/core/session/SessionConfigGenerator.java (97%) rename {org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/lttng2 => org.eclipse.linuxtools.lttng2.control.core/src/org/eclipse/linuxtools/lttng2/control}/core/session/SessionConfigStrings.java (98%) rename {org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/lttng2 => org.eclipse.linuxtools.lttng2.control.core/src/org/eclipse/linuxtools/lttng2/control}/core/session/messages.properties (100%) rename {org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/lttng2 => org.eclipse.linuxtools.lttng2.control.core/src/org/eclipse/linuxtools/lttng2/control}/core/session/session.xsd (100%) rename {org.eclipse.linuxtools.lttng2.ui.tests => org.eclipse.linuxtools.lttng2.control.ui.tests}/.classpath (100%) create mode 100644 org.eclipse.linuxtools.lttng2.control.ui.tests/.gitignore rename {org.eclipse.linuxtools.lttng2.ui => org.eclipse.linuxtools.lttng2.control.ui.tests}/.project (92%) rename {org.eclipse.linuxtools.lttng2.ui.tests => org.eclipse.linuxtools.lttng2.control.ui.tests}/.settings/org.eclipse.core.resources.prefs (100%) rename {org.eclipse.linuxtools.lttng2.ui.tests => org.eclipse.linuxtools.lttng2.control.ui.tests}/.settings/org.eclipse.core.runtime.prefs (100%) rename {org.eclipse.linuxtools.lttng2.ui.tests => org.eclipse.linuxtools.lttng2.control.ui.tests}/.settings/org.eclipse.jdt.core.prefs (100%) rename {org.eclipse.linuxtools.lttng2.ui.tests => org.eclipse.linuxtools.lttng2.control.ui.tests}/.settings/org.eclipse.jdt.ui.prefs (100%) rename {org.eclipse.linuxtools.lttng2.ui.tests => org.eclipse.linuxtools.lttng2.control.ui.tests}/.settings/org.eclipse.pde.api.tools.prefs (100%) rename {org.eclipse.linuxtools.lttng2.ui.tests => org.eclipse.linuxtools.lttng2.control.ui.tests}/.settings/org.eclipse.pde.prefs (100%) create mode 100644 org.eclipse.linuxtools.lttng2.control.ui.tests/META-INF/MANIFEST.MF rename {org.eclipse.linuxtools.lttng2.ui.tests => org.eclipse.linuxtools.lttng2.control.ui.tests}/about.html (100%) rename {org.eclipse.linuxtools.lttng2.ui.tests => org.eclipse.linuxtools.lttng2.control.ui.tests}/build.properties (100%) rename {org.eclipse.linuxtools.lttng2.core => org.eclipse.linuxtools.lttng2.control.ui.tests}/plugin.properties (81%) rename {org.eclipse.linuxtools.lttng2.ui.tests => org.eclipse.linuxtools.lttng2.control.ui.tests}/pom.xml (72%) rename {org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2 => org.eclipse.linuxtools.lttng2.control.ui.tests/src/org/eclipse/linuxtools/lttng2/control}/ui/tests/ActivatorTest.java (88%) rename {org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2 => org.eclipse.linuxtools.lttng2.control.ui.tests/src/org/eclipse/linuxtools/lttng2/control}/ui/tests/AllTests.java (78%) rename {org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control => org.eclipse.linuxtools.lttng2.control.ui.tests/src/org/eclipse/linuxtools/lttng2/control/ui/tests}/model/component/AllTests.java (90%) rename {org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control => org.eclipse.linuxtools.lttng2.control.ui.tests/src/org/eclipse/linuxtools/lttng2/control/ui/tests}/model/component/ListenerValidator.java (93%) rename {org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control => org.eclipse.linuxtools.lttng2.control.ui.tests/src/org/eclipse/linuxtools/lttng2/control/ui/tests}/model/component/TraceControlComponentTest.java (95%) rename {org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control => org.eclipse.linuxtools.lttng2.control.ui.tests/src/org/eclipse/linuxtools/lttng2/control/ui/tests}/model/component/TraceControlCreateSessionTests.java (93%) rename {org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control => org.eclipse.linuxtools.lttng2.control.ui.tests/src/org/eclipse/linuxtools/lttng2/control/ui/tests}/model/component/TraceControlKernelProviderTests.java (89%) rename {org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control => org.eclipse.linuxtools.lttng2.control.ui.tests/src/org/eclipse/linuxtools/lttng2/control/ui/tests}/model/component/TraceControlKernelSessionTests.java (95%) rename {org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control => org.eclipse.linuxtools.lttng2.control.ui.tests/src/org/eclipse/linuxtools/lttng2/control/ui/tests}/model/component/TraceControlPropertiesTest.java (90%) rename {org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control => org.eclipse.linuxtools.lttng2.control.ui.tests/src/org/eclipse/linuxtools/lttng2/control/ui/tests}/model/component/TraceControlSnapshotSessionTests.java (90%) rename {org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control => org.eclipse.linuxtools.lttng2.control.ui.tests/src/org/eclipse/linuxtools/lttng2/control/ui/tests}/model/component/TraceControlTestFacility.java (97%) rename {org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control => org.eclipse.linuxtools.lttng2.control.ui.tests/src/org/eclipse/linuxtools/lttng2/control/ui/tests}/model/component/TraceControlTreeModelNoProvidersTest.java (90%) rename {org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control => org.eclipse.linuxtools.lttng2.control.ui.tests/src/org/eclipse/linuxtools/lttng2/control/ui/tests}/model/component/TraceControlTreeModelTest.java (95%) rename {org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control => org.eclipse.linuxtools.lttng2.control.ui.tests/src/org/eclipse/linuxtools/lttng2/control/ui/tests}/model/component/TraceControlUstProviderTests.java (89%) rename {org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control => org.eclipse.linuxtools.lttng2.control.ui.tests/src/org/eclipse/linuxtools/lttng2/control/ui/tests}/model/component/TraceControlUstSessionTests.java (93%) rename {org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control => org.eclipse.linuxtools.lttng2.control.ui.tests/src/org/eclipse/linuxtools/lttng2/control/ui/tests}/model/component/TraceControlUstSessionTests2.java (91%) rename {org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control => org.eclipse.linuxtools.lttng2.control.ui.tests/src/org/eclipse/linuxtools/lttng2/control/ui/tests}/service/AllTests.java (87%) rename {org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control => org.eclipse.linuxtools.lttng2.control.ui.tests/src/org/eclipse/linuxtools/lttng2/control/ui/tests}/service/LTTngControlServiceTest.java (97%) rename {org.eclipse.linuxtools.lttng2.ui.tests/stubs/org/eclipse/linuxtools/internal/lttng2 => org.eclipse.linuxtools.lttng2.control.ui.tests/stubs/org/eclipse/linuxtools/internal/lttng2/control}/stubs/dialogs/AddContextDialogStub.java (93%) rename {org.eclipse.linuxtools.lttng2.ui.tests/stubs/org/eclipse/linuxtools/internal/lttng2 => org.eclipse.linuxtools.lttng2.control.ui.tests/stubs/org/eclipse/linuxtools/internal/lttng2/control}/stubs/dialogs/CreateSessionDialogStub.java (87%) rename {org.eclipse.linuxtools.lttng2.ui.tests/stubs/org/eclipse/linuxtools/internal/lttng2 => org.eclipse.linuxtools.lttng2.control.ui.tests/stubs/org/eclipse/linuxtools/internal/lttng2/control}/stubs/dialogs/DestroyConfirmDialogStub.java (78%) rename {org.eclipse.linuxtools.lttng2.ui.tests/stubs/org/eclipse/linuxtools/internal/lttng2 => org.eclipse.linuxtools.lttng2.control.ui.tests/stubs/org/eclipse/linuxtools/internal/lttng2/control}/stubs/dialogs/EnableChannelDialogStub.java (85%) rename {org.eclipse.linuxtools.lttng2.ui.tests/stubs/org/eclipse/linuxtools/internal/lttng2 => org.eclipse.linuxtools.lttng2.control.ui.tests/stubs/org/eclipse/linuxtools/internal/lttng2/control}/stubs/dialogs/EnableEventsDialogStub.java (93%) rename {org.eclipse.linuxtools.lttng2.ui.tests/stubs/org/eclipse/linuxtools/internal/lttng2 => org.eclipse.linuxtools.lttng2.control.ui.tests/stubs/org/eclipse/linuxtools/internal/lttng2/control}/stubs/dialogs/GetEventInfoDialogStub.java (86%) rename {org.eclipse.linuxtools.lttng2.ui.tests/stubs/org/eclipse/linuxtools/internal/lttng2 => org.eclipse.linuxtools.lttng2.control.ui.tests/stubs/org/eclipse/linuxtools/internal/lttng2/control}/stubs/service/CommandShellFactory.java (89%) rename {org.eclipse.linuxtools.lttng2.ui.tests/stubs/org/eclipse/linuxtools/internal/lttng2 => org.eclipse.linuxtools.lttng2.control.ui.tests/stubs/org/eclipse/linuxtools/internal/lttng2/control}/stubs/service/TestRemoteSystemProxy.java (91%) rename {org.eclipse.linuxtools.lttng2.ui.tests/stubs/org/eclipse/linuxtools/internal/lttng2 => org.eclipse.linuxtools.lttng2.control.ui.tests/stubs/org/eclipse/linuxtools/internal/lttng2/control}/stubs/shells/LTTngToolsFileShell.java (98%) rename {org.eclipse.linuxtools.lttng2.ui.tests/stubs/org/eclipse/linuxtools/internal/lttng2 => org.eclipse.linuxtools.lttng2.control.ui.tests/stubs/org/eclipse/linuxtools/internal/lttng2/control}/stubs/shells/TestCommandShell.java (84%) rename {org.eclipse.linuxtools.lttng2.ui.tests => org.eclipse.linuxtools.lttng2.control.ui.tests}/testfiles/CreateSessionTest.cfg (100%) rename {org.eclipse.linuxtools.lttng2.ui.tests => org.eclipse.linuxtools.lttng2.control.ui.tests}/testfiles/CreateSessionTest2.cfg (100%) rename {org.eclipse.linuxtools.lttng2.ui.tests => org.eclipse.linuxtools.lttng2.control.ui.tests}/testfiles/CreateTreeTest.cfg (100%) rename {org.eclipse.linuxtools.lttng2.ui.tests => org.eclipse.linuxtools.lttng2.control.ui.tests}/testfiles/CreateTreeTest2.cfg (100%) rename {org.eclipse.linuxtools.lttng2.ui.tests => org.eclipse.linuxtools.lttng2.control.ui.tests}/testfiles/LTTngServiceTest.cfg (100%) rename {org.eclipse.linuxtools.lttng2.ui.tests => org.eclipse.linuxtools.lttng2.control.ui.tests}/testfiles/ListInfoTest.cfg (100%) rename {org.eclipse.linuxtools.lttng2.ui => org.eclipse.linuxtools.lttng2.control.ui}/.classpath (100%) create mode 100644 org.eclipse.linuxtools.lttng2.control.ui/.gitignore rename {org.eclipse.linuxtools.lttng2.core.tests => org.eclipse.linuxtools.lttng2.control.ui}/.project (93%) rename {org.eclipse.linuxtools.lttng2.ui => org.eclipse.linuxtools.lttng2.control.ui}/.settings/org.eclipse.core.resources.prefs (100%) rename {org.eclipse.linuxtools.lttng2.ui => org.eclipse.linuxtools.lttng2.control.ui}/.settings/org.eclipse.core.runtime.prefs (100%) rename {org.eclipse.linuxtools.lttng2.ui => org.eclipse.linuxtools.lttng2.control.ui}/.settings/org.eclipse.jdt.core.prefs (100%) rename {org.eclipse.linuxtools.lttng2.ui => org.eclipse.linuxtools.lttng2.control.ui}/.settings/org.eclipse.jdt.ui.prefs (100%) rename {org.eclipse.linuxtools.lttng2.ui => org.eclipse.linuxtools.lttng2.control.ui}/.settings/org.eclipse.pde.api.tools.prefs (100%) rename {org.eclipse.linuxtools.lttng2.ui => org.eclipse.linuxtools.lttng2.control.ui}/.settings/org.eclipse.pde.prefs (100%) create mode 100644 org.eclipse.linuxtools.lttng2.control.ui/META-INF/MANIFEST.MF rename {org.eclipse.linuxtools.lttng2.ui => org.eclipse.linuxtools.lttng2.control.ui}/about.html (100%) rename {org.eclipse.linuxtools.lttng2.ui => org.eclipse.linuxtools.lttng2.control.ui}/build.properties (100%) rename {org.eclipse.linuxtools.lttng2.ui => org.eclipse.linuxtools.lttng2.control.ui}/icons/elcl16/add-context.gif (100%) rename {org.eclipse.linuxtools.lttng2.ui => org.eclipse.linuxtools.lttng2.control.ui}/icons/elcl16/add_button.gif (100%) rename {org.eclipse.linuxtools.lttng2.ui => org.eclipse.linuxtools.lttng2.control.ui}/icons/elcl16/calibrate.gif (100%) rename {org.eclipse.linuxtools.lttng2.ui => org.eclipse.linuxtools.lttng2.control.ui}/icons/elcl16/connect.gif (100%) rename {org.eclipse.linuxtools.lttng2.ui => org.eclipse.linuxtools.lttng2.control.ui}/icons/elcl16/delete_trace.gif (100%) rename {org.eclipse.linuxtools.lttng2.ui => org.eclipse.linuxtools.lttng2.control.ui}/icons/elcl16/disable.gif (100%) rename {org.eclipse.linuxtools.lttng2.ui => org.eclipse.linuxtools.lttng2.control.ui}/icons/elcl16/disable_event.gif (100%) rename {org.eclipse.linuxtools.lttng2.ui => org.eclipse.linuxtools.lttng2.control.ui}/icons/elcl16/disconnect.gif (100%) rename {org.eclipse.linuxtools.lttng2.ui => org.eclipse.linuxtools.lttng2.control.ui}/icons/elcl16/edit.gif (100%) rename {org.eclipse.linuxtools.lttng2.ui => org.eclipse.linuxtools.lttng2.control.ui}/icons/elcl16/enable.gif (100%) rename {org.eclipse.linuxtools.lttng2.ui => org.eclipse.linuxtools.lttng2.control.ui}/icons/elcl16/enable_event.gif (100%) rename {org.eclipse.linuxtools.lttng2.ui => org.eclipse.linuxtools.lttng2.control.ui}/icons/elcl16/import_trace.gif (100%) rename {org.eclipse.linuxtools.lttng2.ui => org.eclipse.linuxtools.lttng2.control.ui}/icons/elcl16/pause_trace.gif (100%) rename {org.eclipse.linuxtools.lttng2.ui => org.eclipse.linuxtools.lttng2.control.ui}/icons/elcl16/refresh.gif (100%) rename {org.eclipse.linuxtools.lttng2.ui => org.eclipse.linuxtools.lttng2.control.ui}/icons/elcl16/snapshot.gif (100%) rename {org.eclipse.linuxtools.lttng2.ui => org.eclipse.linuxtools.lttng2.control.ui}/icons/elcl16/start_trace.gif (100%) rename {org.eclipse.linuxtools.lttng2.ui => org.eclipse.linuxtools.lttng2.control.ui}/icons/elcl16/stop_trace.gif (100%) rename {org.eclipse.linuxtools.lttng2.ui => org.eclipse.linuxtools.lttng2.control.ui}/icons/elcl16/target_add.gif (100%) rename {org.eclipse.linuxtools.lttng2.ui => org.eclipse.linuxtools.lttng2.control.ui}/icons/elcl16/target_delete.gif (100%) rename {org.eclipse.linuxtools.lttng2.ui => org.eclipse.linuxtools.lttng2.control.ui}/icons/eview16/control_view.gif (100%) rename {org.eclipse.linuxtools.lttng2.ui => org.eclipse.linuxtools.lttng2.control.ui}/icons/obj16/channel.gif (100%) rename {org.eclipse.linuxtools.lttng2.ui => org.eclipse.linuxtools.lttng2.control.ui}/icons/obj16/channel_disabled.gif (100%) rename {org.eclipse.linuxtools.lttng2.ui => org.eclipse.linuxtools.lttng2.control.ui}/icons/obj16/domain.gif (100%) rename {org.eclipse.linuxtools.lttng2.ui => org.eclipse.linuxtools.lttng2.control.ui}/icons/obj16/event_disabled.gif (100%) rename {org.eclipse.linuxtools.lttng2.ui => org.eclipse.linuxtools.lttng2.control.ui}/icons/obj16/event_enabled.gif (100%) rename {org.eclipse.linuxtools.lttng2.ui => org.eclipse.linuxtools.lttng2.control.ui}/icons/obj16/garland16.png (100%) rename {org.eclipse.linuxtools.lttng2.ui => org.eclipse.linuxtools.lttng2.control.ui}/icons/obj16/providers.gif (100%) rename {org.eclipse.linuxtools.lttng2.ui => org.eclipse.linuxtools.lttng2.control.ui}/icons/obj16/session_active.gif (100%) rename {org.eclipse.linuxtools.lttng2.ui => org.eclipse.linuxtools.lttng2.control.ui}/icons/obj16/session_destroyed.gif (100%) rename {org.eclipse.linuxtools.lttng2.ui => org.eclipse.linuxtools.lttng2.control.ui}/icons/obj16/session_inactive.gif (100%) rename {org.eclipse.linuxtools.lttng2.ui => org.eclipse.linuxtools.lttng2.control.ui}/icons/obj16/sessions.gif (100%) rename {org.eclipse.linuxtools.lttng2.ui => org.eclipse.linuxtools.lttng2.control.ui}/icons/obj16/systemlttng2-live.gif (100%) rename {org.eclipse.linuxtools.lttng2.ui => org.eclipse.linuxtools.lttng2.control.ui}/icons/obj16/systemlttng2.gif (100%) rename {org.eclipse.linuxtools.lttng2.ui => org.eclipse.linuxtools.lttng2.control.ui}/icons/obj16/target_connected.gif (100%) rename {org.eclipse.linuxtools.lttng2.ui => org.eclipse.linuxtools.lttng2.control.ui}/icons/obj16/target_disconnected.gif (100%) rename {org.eclipse.linuxtools.lttng2.ui => org.eclipse.linuxtools.lttng2.control.ui}/icons/obj16/targets.gif (100%) rename {org.eclipse.linuxtools.lttng2.ui => org.eclipse.linuxtools.lttng2.control.ui}/plugin.properties (96%) rename {org.eclipse.linuxtools.lttng2.ui => org.eclipse.linuxtools.lttng2.control.ui}/plugin.xml (88%) rename {org.eclipse.linuxtools.lttng2.core => org.eclipse.linuxtools.lttng2.control.ui}/pom.xml (74%) rename {org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2 => org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control}/ui/Activator.java (97%) rename {org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control => org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views}/ControlView.java (94%) rename {org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control => org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views}/dialogs/AddContextDialog.java (98%) rename {org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control => org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views}/dialogs/ConfirmDialog.java (89%) rename {org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control => org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views}/dialogs/CreateSessionDialog.java (98%) rename {org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control => org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views}/dialogs/EnableChannelDialog.java (97%) rename {org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control => org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views}/dialogs/EnableEventsDialog.java (96%) rename {org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control => org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views}/dialogs/EnableKernelEventComposite.java (97%) rename {org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control => org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views}/dialogs/EnableUstEventsComposite.java (97%) rename {org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control => org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views}/dialogs/GetEventInfoDialog.java (96%) rename {org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control => org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views}/dialogs/IAddContextDialog.java (95%) rename {org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control => org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views}/dialogs/IConfirmDialog.java (94%) rename {org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control => org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views}/dialogs/ICreateSessionDialog.java (88%) rename {org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control => org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views}/dialogs/IEnableChannelDialog.java (87%) rename {org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control => org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views}/dialogs/IEnableEventsDialog.java (89%) rename {org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control => org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views}/dialogs/IEnableKernelEvents.java (97%) rename {org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control => org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views}/dialogs/IEnableUstEvents.java (91%) rename {org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control => org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views}/dialogs/IGetEventInfoDialog.java (91%) rename {org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control => org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views}/dialogs/IImportConfirmationDialog.java (95%) rename {org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control => org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views}/dialogs/IImportDialog.java (93%) rename {org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control => org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views}/dialogs/INewConnectionDialog.java (93%) rename {org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control => org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views}/dialogs/ImportConfirmationDialog.java (97%) rename {org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control => org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views}/dialogs/ImportDialog.java (98%) rename {org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control => org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views}/dialogs/ImportFileInfo.java (98%) rename {org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control => org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views}/dialogs/NewConnectionDialog.java (97%) rename {org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control => org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views}/dialogs/TraceControlDialogFactory.java (99%) rename {org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control => org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views}/handlers/AddContextOnChannelHandler.java (91%) rename {org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control => org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views}/handlers/AddContextOnDomainHandler.java (91%) rename {org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control => org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views}/handlers/AddContextOnEventHandler.java (91%) rename {org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control => org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views}/handlers/AssignEventHandler.java (91%) rename {org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control => org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views}/handlers/BaseAddContextHandler.java (93%) rename {org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control => org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views}/handlers/BaseControlViewHandler.java (92%) rename {org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control => org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views}/handlers/BaseEnableChannelHandler.java (90%) rename {org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control => org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views}/handlers/BaseEnableEventHandler.java (92%) rename {org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control => org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views}/handlers/BaseNodeHandler.java (92%) rename {org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control => org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views}/handlers/CalibrateHandler.java (91%) rename {org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control => org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views}/handlers/ChangeChannelStateHandler.java (95%) rename {org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control => org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views}/handlers/ChangeEventStateHandler.java (94%) rename {org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control => org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views}/handlers/ChangeSessionStateHandler.java (93%) rename {org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control => org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views}/handlers/ChannelCommandParameter.java (91%) rename {org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control => org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views}/handlers/CommandParameter.java (94%) rename {org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control => org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views}/handlers/ConnectHandler.java (92%) rename {org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control => org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views}/handlers/CreateSessionHandler.java (89%) rename {org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control => org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views}/handlers/DeleteHandler.java (90%) rename {org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control => org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views}/handlers/DestroySessionHandler.java (89%) rename {org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control => org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views}/handlers/DisableChannelHandler.java (89%) rename {org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control => org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views}/handlers/DisableEventHandler.java (89%) rename {org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control => org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views}/handlers/DisconnectHandler.java (92%) rename {org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control => org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views}/handlers/DomainCommandParameter.java (91%) rename {org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control => org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views}/handlers/EnableChannelHandler.java (89%) rename {org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control => org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views}/handlers/EnableChannelOnDomainHandler.java (90%) rename {org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control => org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views}/handlers/EnableChannelOnSessionHandler.java (89%) rename {org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control => org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views}/handlers/EnableEventHandler.java (89%) rename {org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control => org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views}/handlers/EnableEventOnChannelHandler.java (91%) rename {org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control => org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views}/handlers/EnableEventOnDomainHandler.java (91%) rename {org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control => org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views}/handlers/EnableEventOnSessionHandler.java (90%) rename {org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control => org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views}/handlers/EventCommandParameter.java (91%) rename {org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control => org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views}/handlers/ImportHandler.java (95%) rename {org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control => org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views}/handlers/NewConnectionHandler.java (93%) rename {org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control => org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views}/handlers/RefreshHandler.java (91%) rename {org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control => org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views}/handlers/SnaphshotHandler.java (92%) rename {org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control => org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views}/handlers/StartHandler.java (88%) rename {org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control => org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views}/handlers/StopHandler.java (88%) rename {org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control => org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views}/logging/ControlCommandLogger.java (96%) rename {org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control => org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views}/messages/Messages.java (98%) rename {org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control => org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views}/messages/messages.properties (100%) rename {org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control => org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views}/model/ITraceControlComponent.java (96%) rename {org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control => org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views}/model/ITraceControlComponentChangedListener.java (95%) rename {org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control => org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views}/model/impl/BaseEventComponent.java (90%) rename {org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control => org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views}/model/impl/KernelProviderComponent.java (89%) rename {org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control => org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views}/model/impl/TargetNodeComponent.java (95%) rename {org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control => org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views}/model/impl/TraceChannelComponent.java (93%) rename {org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control => org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views}/model/impl/TraceControlComponent.java (96%) rename {org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control => org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views}/model/impl/TraceControlContentProvider.java (93%) rename {org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control => org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views}/model/impl/TraceControlLabelProvider.java (93%) rename {org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control => org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views}/model/impl/TraceControlPropertyTester.java (96%) rename {org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control => org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views}/model/impl/TraceControlRoot.java (95%) rename {org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control => org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views}/model/impl/TraceDomainComponent.java (93%) rename {org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control => org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views}/model/impl/TraceEventComponent.java (91%) rename {org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control => org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views}/model/impl/TraceProbeEventComponent.java (92%) rename {org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control => org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views}/model/impl/TraceProviderGroup.java (92%) rename {org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control => org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views}/model/impl/TraceSessionComponent.java (94%) rename {org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control => org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views}/model/impl/TraceSessionGroup.java (96%) rename {org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control => org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views}/model/impl/UstProviderComponent.java (88%) rename {org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control => org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views}/preferences/ControlPreferenceInitializer.java (96%) rename {org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control => org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views}/preferences/ControlPreferencePage.java (97%) rename {org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control => org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views}/preferences/ControlPreferences.java (98%) rename {org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control => org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views}/property/BaseEventPropertySource.java (94%) rename {org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control => org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views}/property/BasePropertySource.java (95%) rename {org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control => org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views}/property/KernelProviderPropertySource.java (93%) rename {org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control => org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views}/property/TargetNodePropertySource.java (95%) rename {org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control => org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views}/property/TraceChannelPropertySource.java (97%) rename {org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control => org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views}/property/TraceDomainPropertySource.java (93%) rename {org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control => org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views}/property/TraceEventPropertySource.java (95%) rename {org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control => org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views}/property/TraceProbeEventPropertySource.java (95%) rename {org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control => org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views}/property/TraceSessionPropertySource.java (96%) rename {org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control => org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views}/property/UstProviderPropertySource.java (94%) rename {org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control => org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views}/remote/CommandResult.java (97%) rename {org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control => org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views}/remote/CommandShell.java (98%) rename {org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control => org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views}/remote/ICommandResult.java (94%) rename {org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control => org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views}/remote/ICommandShell.java (97%) rename {org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control => org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views}/remote/IRemoteSystemProxy.java (98%) rename {org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control => org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views}/remote/RemoteSystemProxy.java (99%) rename {org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control => org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views}/service/ILttngControlService.java (96%) rename {org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control => org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views}/service/LTTngControlService.java (97%) rename {org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control => org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views}/service/LTTngControlServiceConstants.java (99%) rename {org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control => org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views}/service/LTTngControlServiceFactory.java (92%) rename {org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control => org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views}/service/LttngVersion.java (96%) rename {org.eclipse.linuxtools.lttng2.core.tests => org.eclipse.linuxtools.lttng2.control}/.gitignore (100%) rename {org.eclipse.linuxtools.lttng2 => org.eclipse.linuxtools.lttng2.control}/.project (86%) rename {org.eclipse.linuxtools.lttng2 => org.eclipse.linuxtools.lttng2.control}/.settings/org.eclipse.core.resources.prefs (100%) rename {org.eclipse.linuxtools.lttng2 => org.eclipse.linuxtools.lttng2.control}/.settings/org.eclipse.core.runtime.prefs (100%) rename {org.eclipse.linuxtools.lttng2 => org.eclipse.linuxtools.lttng2.control}/build.properties (93%) rename {org.eclipse.linuxtools.lttng2 => org.eclipse.linuxtools.lttng2.control}/feature.properties (84%) rename {org.eclipse.linuxtools.lttng2 => org.eclipse.linuxtools.lttng2.control}/feature.xml (85%) rename {org.eclipse.linuxtools.lttng2 => org.eclipse.linuxtools.lttng2.control}/p2.inf (67%) rename {org.eclipse.linuxtools.lttng2 => org.eclipse.linuxtools.lttng2.control}/pom.xml (96%) create mode 100644 org.eclipse.linuxtools.lttng2.control/sourceTemplateFeature/p2.inf delete mode 100644 org.eclipse.linuxtools.lttng2.core.tests/META-INF/MANIFEST.MF delete mode 100644 org.eclipse.linuxtools.lttng2.core/.gitignore delete mode 100644 org.eclipse.linuxtools.lttng2.core/.options delete mode 100644 org.eclipse.linuxtools.lttng2.core/META-INF/MANIFEST.MF delete mode 100644 org.eclipse.linuxtools.lttng2.ui.tests/.gitignore delete mode 100644 org.eclipse.linuxtools.lttng2.ui.tests/META-INF/MANIFEST.MF delete mode 100644 org.eclipse.linuxtools.lttng2.ui/.gitignore delete mode 100644 org.eclipse.linuxtools.lttng2.ui/.options delete mode 100644 org.eclipse.linuxtools.lttng2.ui/META-INF/MANIFEST.MF delete mode 100644 org.eclipse.linuxtools.lttng2/.gitignore diff --git a/org.eclipse.linuxtools.lttng.alltests/META-INF/MANIFEST.MF b/org.eclipse.linuxtools.lttng.alltests/META-INF/MANIFEST.MF index cc6e7f807b..b524449651 100644 --- a/org.eclipse.linuxtools.lttng.alltests/META-INF/MANIFEST.MF +++ b/org.eclipse.linuxtools.lttng.alltests/META-INF/MANIFEST.MF @@ -11,8 +11,8 @@ Require-Bundle: org.junit;bundle-version="4.0.0", org.eclipse.linuxtools.ctf.core.tests;bundle-version="2.1.0", org.eclipse.linuxtools.gdbtrace.core.tests;bundle-version="1.1.0", org.eclipse.linuxtools.gdbtrace.ui.tests;bundle-version="1.1.0", - org.eclipse.linuxtools.lttng2.core.tests;bundle-version="2.1.0", - org.eclipse.linuxtools.lttng2.ui.tests;bundle-version="2.1.0", + org.eclipse.linuxtools.lttng2.control.core.tests;bundle-version="2.1.0", + org.eclipse.linuxtools.lttng2.control.ui.tests;bundle-version="2.1.0", org.eclipse.linuxtools.lttng2.kernel.core.tests;bundle-version="2.1.0", org.eclipse.linuxtools.lttng2.kernel.ui.swtbot.tests;bundle-version="3.0.0", org.eclipse.linuxtools.lttng2.kernel.ui.tests;bundle-version="2.1.0", diff --git a/org.eclipse.linuxtools.lttng.alltests/src/org/eclipse/linuxtools/lttng/alltests/RunAllTests.java b/org.eclipse.linuxtools.lttng.alltests/src/org/eclipse/linuxtools/lttng/alltests/RunAllTests.java index 6ca507f3fb..2e9608eeb6 100644 --- a/org.eclipse.linuxtools.lttng.alltests/src/org/eclipse/linuxtools/lttng/alltests/RunAllTests.java +++ b/org.eclipse.linuxtools.lttng.alltests/src/org/eclipse/linuxtools/lttng/alltests/RunAllTests.java @@ -24,8 +24,8 @@ import org.junit.runners.Suite; org.eclipse.linuxtools.ctf.parser.tests.AllCtfParserTests.class, org.eclipse.linuxtools.gdbtrace.core.tests.AllGdbTraceCoreTests.class, org.eclipse.linuxtools.gdbtrace.ui.tests.AllGdbTraceUITests.class, - org.eclipse.linuxtools.lttng2.core.tests.AllTests.class, - org.eclipse.linuxtools.lttng2.ui.tests.AllTests.class, + org.eclipse.linuxtools.lttng2.control.core.tests.AllTests.class, + org.eclipse.linuxtools.lttng2.control.ui.tests.AllTests.class, org.eclipse.linuxtools.lttng2.kernel.core.tests.AllTests.class, org.eclipse.linuxtools.lttng2.kernel.ui.tests.AllTests.class, org.eclipse.linuxtools.lttng2.ust.core.tests.AllTests.class, diff --git a/org.eclipse.linuxtools.lttng.help/doc/User-Guide.mediawiki b/org.eclipse.linuxtools.lttng.help/doc/User-Guide.mediawiki index 9030621644..d5e2ef1f5a 100644 --- a/org.eclipse.linuxtools.lttng.help/doc/User-Guide.mediawiki +++ b/org.eclipse.linuxtools.lttng.help/doc/User-Guide.mediawiki @@ -86,8 +86,8 @@ The LTTng plug-ins are structured as a stack of features/plug-ins as following: ** ''Plug-ins'': org.eclipse.linuxtools.tmf.core, org.eclipse.linuxtools.tmf.ui * '''LTTng''' - The wrapper for the LTTng tracer control. Can be used for kernel or application tracing. -** ''Feature'': org.eclipse.linuxtools.lttng2 -** ''Plug-ins'': org.eclipse.linuxtools.lttng2.core, org.eclipse.linuxtools.lttng2.ui +** ''Feature'': org.eclipse.linuxtools.lttng2.control +** ''Plug-ins'': org.eclipse.linuxtools.lttng2.control.core, org.eclipse.linuxtools.lttng2.control.ui * '''LTTng Kernel''' - Analysis components specific to Linux kernel traces ** ''Feature'': org.eclipse.linuxtools.lttng2.kernel diff --git a/org.eclipse.linuxtools.lttng2.core.tests/.classpath b/org.eclipse.linuxtools.lttng2.control.core.tests/.classpath similarity index 100% rename from org.eclipse.linuxtools.lttng2.core.tests/.classpath rename to org.eclipse.linuxtools.lttng2.control.core.tests/.classpath diff --git a/org.eclipse.linuxtools.lttng2.control.core.tests/.gitignore b/org.eclipse.linuxtools.lttng2.control.core.tests/.gitignore new file mode 100644 index 0000000000..fb60f67b1e --- /dev/null +++ b/org.eclipse.linuxtools.lttng2.control.core.tests/.gitignore @@ -0,0 +1,2 @@ +bin/ +target/ diff --git a/org.eclipse.linuxtools.lttng2.ui.tests/.project b/org.eclipse.linuxtools.lttng2.control.core.tests/.project similarity index 92% rename from org.eclipse.linuxtools.lttng2.ui.tests/.project rename to org.eclipse.linuxtools.lttng2.control.core.tests/.project index d5b50ea9de..9aaf321441 100644 --- a/org.eclipse.linuxtools.lttng2.ui.tests/.project +++ b/org.eclipse.linuxtools.lttng2.control.core.tests/.project @@ -1,6 +1,6 @@ - org.eclipse.linuxtools.lttng2.ui.tests + org.eclipse.linuxtools.lttng2.control.core.tests diff --git a/org.eclipse.linuxtools.lttng2.core.tests/.settings/org.eclipse.core.resources.prefs b/org.eclipse.linuxtools.lttng2.control.core.tests/.settings/org.eclipse.core.resources.prefs similarity index 100% rename from org.eclipse.linuxtools.lttng2.core.tests/.settings/org.eclipse.core.resources.prefs rename to org.eclipse.linuxtools.lttng2.control.core.tests/.settings/org.eclipse.core.resources.prefs diff --git a/org.eclipse.linuxtools.lttng2.core.tests/.settings/org.eclipse.core.runtime.prefs b/org.eclipse.linuxtools.lttng2.control.core.tests/.settings/org.eclipse.core.runtime.prefs similarity index 100% rename from org.eclipse.linuxtools.lttng2.core.tests/.settings/org.eclipse.core.runtime.prefs rename to org.eclipse.linuxtools.lttng2.control.core.tests/.settings/org.eclipse.core.runtime.prefs diff --git a/org.eclipse.linuxtools.lttng2.core.tests/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.linuxtools.lttng2.control.core.tests/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from org.eclipse.linuxtools.lttng2.core.tests/.settings/org.eclipse.jdt.core.prefs rename to org.eclipse.linuxtools.lttng2.control.core.tests/.settings/org.eclipse.jdt.core.prefs diff --git a/org.eclipse.linuxtools.lttng2.core.tests/.settings/org.eclipse.jdt.ui.prefs b/org.eclipse.linuxtools.lttng2.control.core.tests/.settings/org.eclipse.jdt.ui.prefs similarity index 100% rename from org.eclipse.linuxtools.lttng2.core.tests/.settings/org.eclipse.jdt.ui.prefs rename to org.eclipse.linuxtools.lttng2.control.core.tests/.settings/org.eclipse.jdt.ui.prefs diff --git a/org.eclipse.linuxtools.lttng2.core.tests/.settings/org.eclipse.pde.api.tools.prefs b/org.eclipse.linuxtools.lttng2.control.core.tests/.settings/org.eclipse.pde.api.tools.prefs similarity index 100% rename from org.eclipse.linuxtools.lttng2.core.tests/.settings/org.eclipse.pde.api.tools.prefs rename to org.eclipse.linuxtools.lttng2.control.core.tests/.settings/org.eclipse.pde.api.tools.prefs diff --git a/org.eclipse.linuxtools.lttng2.core.tests/.settings/org.eclipse.pde.prefs b/org.eclipse.linuxtools.lttng2.control.core.tests/.settings/org.eclipse.pde.prefs similarity index 100% rename from org.eclipse.linuxtools.lttng2.core.tests/.settings/org.eclipse.pde.prefs rename to org.eclipse.linuxtools.lttng2.control.core.tests/.settings/org.eclipse.pde.prefs diff --git a/org.eclipse.linuxtools.lttng2.control.core.tests/META-INF/MANIFEST.MF b/org.eclipse.linuxtools.lttng2.control.core.tests/META-INF/MANIFEST.MF new file mode 100644 index 0000000000..70582811f9 --- /dev/null +++ b/org.eclipse.linuxtools.lttng2.control.core.tests/META-INF/MANIFEST.MF @@ -0,0 +1,14 @@ +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: %Bundle-Name +Bundle-Vendor: %Bundle-Vendor +Bundle-Version: 3.0.0.qualifier +Bundle-Localization: plugin +Bundle-SymbolicName: org.eclipse.linuxtools.lttng2.control.core.tests;singleton:=true +Bundle-ActivationPolicy: lazy +Bundle-RequiredExecutionEnvironment: JavaSE-1.7 +Require-Bundle: org.junit;bundle-version="4.0.0", + org.eclipse.core.runtime, + org.eclipse.linuxtools.lttng2.control.core;bundle-version="3.0.0" +Export-Package: org.eclipse.linuxtools.lttng2.control.core.tests;x-friends:="org.eclipse.linuxtools.lttng.alltests", + org.eclipse.linuxtools.lttng2.control.core.tests.model.impl;x-internal:=true diff --git a/org.eclipse.linuxtools.lttng2.core.tests/about.html b/org.eclipse.linuxtools.lttng2.control.core.tests/about.html similarity index 100% rename from org.eclipse.linuxtools.lttng2.core.tests/about.html rename to org.eclipse.linuxtools.lttng2.control.core.tests/about.html diff --git a/org.eclipse.linuxtools.lttng2.core.tests/build.properties b/org.eclipse.linuxtools.lttng2.control.core.tests/build.properties similarity index 100% rename from org.eclipse.linuxtools.lttng2.core.tests/build.properties rename to org.eclipse.linuxtools.lttng2.control.core.tests/build.properties diff --git a/org.eclipse.linuxtools.lttng2.core.tests/plugin.properties b/org.eclipse.linuxtools.lttng2.control.core.tests/plugin.properties similarity index 80% rename from org.eclipse.linuxtools.lttng2.core.tests/plugin.properties rename to org.eclipse.linuxtools.lttng2.control.core.tests/plugin.properties index dc1fc33b78..f2ad963160 100644 --- a/org.eclipse.linuxtools.lttng2.core.tests/plugin.properties +++ b/org.eclipse.linuxtools.lttng2.control.core.tests/plugin.properties @@ -10,6 +10,6 @@ # Ericsson - Initial API and implementation ############################################################################### -#Properties file for org.eclipse.linuxtools.lttng2.core.tests +#Properties file for org.eclipse.linuxtools.lttng2.control.core.tests Bundle-Vendor = Eclipse Linux Tools -Bundle-Name = Linux Tools LTTng Core Tests Plug-in \ No newline at end of file +Bundle-Name = Linux Tools LTTng Control Core Tests Plug-in diff --git a/org.eclipse.linuxtools.lttng2.core.tests/pom.xml b/org.eclipse.linuxtools.lttng2.control.core.tests/pom.xml similarity index 52% rename from org.eclipse.linuxtools.lttng2.core.tests/pom.xml rename to org.eclipse.linuxtools.lttng2.control.core.tests/pom.xml index 7d4e3f0a43..a77c2a4cfc 100644 --- a/org.eclipse.linuxtools.lttng2.core.tests/pom.xml +++ b/org.eclipse.linuxtools.lttng2.control.core.tests/pom.xml @@ -17,49 +17,21 @@ 3.0.0-SNAPSHOT - org.eclipse.linuxtools.lttng2.core.tests + org.eclipse.linuxtools.lttng2.control.core.tests 3.0.0-SNAPSHOT eclipse-test-plugin - Linux Tools LTTng Core Tests Plug-in + Linux Tools LTTng Control Core Tests Plug-in - - - - src - - **/*.java - - - - - org.apache.maven.plugins - maven-antrun-plugin - 1.7 - - - prepare - validate - - - - - - - run - - - - org.eclipse.tycho tycho-surefire-plugin ${tycho-version} - org.eclipse.linuxtools.lttng2.core.tests - org.eclipse.linuxtools.lttng2.core.tests.AllTests + org.eclipse.linuxtools.lttng2.control.core.tests + org.eclipse.linuxtools.lttng2.control.core.tests.AllTests false false org.eclipse.platform.ide diff --git a/org.eclipse.linuxtools.lttng2.core.tests/src/org/eclipse/linuxtools/lttng2/core/tests/ActivatorTest.java b/org.eclipse.linuxtools.lttng2.control.core.tests/src/org/eclipse/linuxtools/lttng2/control/core/tests/ActivatorTest.java similarity index 84% rename from org.eclipse.linuxtools.lttng2.core.tests/src/org/eclipse/linuxtools/lttng2/core/tests/ActivatorTest.java rename to org.eclipse.linuxtools.lttng2.control.core.tests/src/org/eclipse/linuxtools/lttng2/control/core/tests/ActivatorTest.java index 4882f03c8f..c0239d81af 100644 --- a/org.eclipse.linuxtools.lttng2.core.tests/src/org/eclipse/linuxtools/lttng2/core/tests/ActivatorTest.java +++ b/org.eclipse.linuxtools.lttng2.control.core.tests/src/org/eclipse/linuxtools/lttng2/control/core/tests/ActivatorTest.java @@ -11,7 +11,7 @@ * Alexandre Montplaisir - Port to JUnit4 *******************************************************************************/ -package org.eclipse.linuxtools.lttng2.core.tests; +package org.eclipse.linuxtools.lttng2.control.core.tests; import static org.junit.Assert.assertTrue; @@ -27,7 +27,7 @@ public class ActivatorTest { // ------------------------------------------------------------------------ /** - * Test method for {@link org.eclipse.linuxtools.internal.lttng2.core.Activator#Activator()}. + * Test method for {@link org.eclipse.linuxtools.internal.lttng2.control.core.Activator#Activator()}. */ @Test public void testActivator() { @@ -35,7 +35,7 @@ public class ActivatorTest { } /** - * Test method for {@link org.eclipse.linuxtools.internal.lttng2.core.Activator#getDefault()}. + * Test method for {@link org.eclipse.linuxtools.internal.lttng2.control.core.Activator#getDefault()}. */ @Test public void testGetDefault() { @@ -43,7 +43,7 @@ public class ActivatorTest { } /** - * Test method for {@link org.eclipse.linuxtools.internal.lttng2.core.Activator#start(org.osgi.framework.BundleContext)}. + * Test method for {@link org.eclipse.linuxtools.internal.lttng2.control.core.Activator#start(org.osgi.framework.BundleContext)}. */ @Test public void testStartBundleContext() { @@ -51,7 +51,7 @@ public class ActivatorTest { } /** - * Test method for {@link org.eclipse.linuxtools.internal.lttng2.core.Activator#stop(org.osgi.framework.BundleContext)}. + * Test method for {@link org.eclipse.linuxtools.internal.lttng2.control.core.Activator#stop(org.osgi.framework.BundleContext)}. */ @Test public void testStopBundleContext() { diff --git a/org.eclipse.linuxtools.lttng2.core.tests/src/org/eclipse/linuxtools/lttng2/core/tests/AllTests.java b/org.eclipse.linuxtools.lttng2.control.core.tests/src/org/eclipse/linuxtools/lttng2/control/core/tests/AllTests.java similarity index 70% rename from org.eclipse.linuxtools.lttng2.core.tests/src/org/eclipse/linuxtools/lttng2/core/tests/AllTests.java rename to org.eclipse.linuxtools.lttng2.control.core.tests/src/org/eclipse/linuxtools/lttng2/control/core/tests/AllTests.java index 41ff5dcaae..cd640621f3 100644 --- a/org.eclipse.linuxtools.lttng2.core.tests/src/org/eclipse/linuxtools/lttng2/core/tests/AllTests.java +++ b/org.eclipse.linuxtools.lttng2.control.core.tests/src/org/eclipse/linuxtools/lttng2/control/core/tests/AllTests.java @@ -11,19 +11,20 @@ * Alexandre Montplaisir - Port to JUnit4 *******************************************************************************/ -package org.eclipse.linuxtools.lttng2.core.tests; +package org.eclipse.linuxtools.lttng2.control.core.tests; import org.junit.runner.RunWith; import org.junit.runners.Suite; /** - * Run all the tests in the lttng2.core plugin. + * Run all the tests in the test suite */ @RunWith(Suite.class) @Suite.SuiteClasses({ ActivatorTest.class, - org.eclipse.linuxtools.lttng2.core.tests.control.model.impl.AllTests.class, - org.eclipse.linuxtools.lttng2.core.tests.session.AllTests.class + org.eclipse.linuxtools.lttng2.control.core.tests.model.impl.AllTests.class, + org.eclipse.linuxtools.lttng2.control.core.tests.session.AllTests.class, + org.eclipse.linuxtools.lttng2.control.core.tests.model.impl.AllTests.class }) public class AllTests { diff --git a/org.eclipse.linuxtools.lttng2.core.tests/src/org/eclipse/linuxtools/lttng2/core/tests/control/model/impl/AllTests.java b/org.eclipse.linuxtools.lttng2.control.core.tests/src/org/eclipse/linuxtools/lttng2/control/core/tests/model/impl/AllTests.java similarity index 90% rename from org.eclipse.linuxtools.lttng2.core.tests/src/org/eclipse/linuxtools/lttng2/core/tests/control/model/impl/AllTests.java rename to org.eclipse.linuxtools.lttng2.control.core.tests/src/org/eclipse/linuxtools/lttng2/control/core/tests/model/impl/AllTests.java index ce0e6e1d80..76f4d33447 100644 --- a/org.eclipse.linuxtools.lttng2.core.tests/src/org/eclipse/linuxtools/lttng2/core/tests/control/model/impl/AllTests.java +++ b/org.eclipse.linuxtools.lttng2.control.core.tests/src/org/eclipse/linuxtools/lttng2/control/core/tests/model/impl/AllTests.java @@ -11,13 +11,13 @@ * Alexandre Montplaisir - Port to JUnit4 *******************************************************************************/ -package org.eclipse.linuxtools.lttng2.core.tests.control.model.impl; +package org.eclipse.linuxtools.lttng2.control.core.tests.model.impl; import org.junit.runner.RunWith; import org.junit.runners.Suite; /** - * Runner for the LTTng2.core unit tests + * Runner for the test suite */ @RunWith(Suite.class) @Suite.SuiteClasses({ diff --git a/org.eclipse.linuxtools.lttng2.core.tests/src/org/eclipse/linuxtools/lttng2/core/tests/control/model/impl/BaseEventInfoTest.java b/org.eclipse.linuxtools.lttng2.control.core.tests/src/org/eclipse/linuxtools/lttng2/control/core/tests/model/impl/BaseEventInfoTest.java similarity index 97% rename from org.eclipse.linuxtools.lttng2.core.tests/src/org/eclipse/linuxtools/lttng2/core/tests/control/model/impl/BaseEventInfoTest.java rename to org.eclipse.linuxtools.lttng2.control.core.tests/src/org/eclipse/linuxtools/lttng2/control/core/tests/model/impl/BaseEventInfoTest.java index 42dc097c39..0bb5755c3d 100644 --- a/org.eclipse.linuxtools.lttng2.core.tests/src/org/eclipse/linuxtools/lttng2/core/tests/control/model/impl/BaseEventInfoTest.java +++ b/org.eclipse.linuxtools.lttng2.control.core.tests/src/org/eclipse/linuxtools/lttng2/control/core/tests/model/impl/BaseEventInfoTest.java @@ -11,19 +11,19 @@ * Alexandre Montplaisir - Port to JUnit4 **********************************************************************/ -package org.eclipse.linuxtools.lttng2.core.tests.control.model.impl; +package org.eclipse.linuxtools.lttng2.control.core.tests.model.impl; import static org.junit.Assert.*; import java.util.LinkedList; import java.util.List; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.IBaseEventInfo; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.IFieldInfo; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceEventType; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceLogLevel; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.impl.BaseEventInfo; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.impl.FieldInfo; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.IBaseEventInfo; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.IFieldInfo; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.TraceEventType; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.TraceLogLevel; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.impl.BaseEventInfo; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.impl.FieldInfo; import org.junit.Before; import org.junit.Test; diff --git a/org.eclipse.linuxtools.lttng2.core.tests/src/org/eclipse/linuxtools/lttng2/core/tests/control/model/impl/ChannelInfoTest.java b/org.eclipse.linuxtools.lttng2.control.core.tests/src/org/eclipse/linuxtools/lttng2/control/core/tests/model/impl/ChannelInfoTest.java similarity index 96% rename from org.eclipse.linuxtools.lttng2.core.tests/src/org/eclipse/linuxtools/lttng2/core/tests/control/model/impl/ChannelInfoTest.java rename to org.eclipse.linuxtools.lttng2.control.core.tests/src/org/eclipse/linuxtools/lttng2/control/core/tests/model/impl/ChannelInfoTest.java index bd4a25c9e9..b8cae40663 100644 --- a/org.eclipse.linuxtools.lttng2.core.tests/src/org/eclipse/linuxtools/lttng2/core/tests/control/model/impl/ChannelInfoTest.java +++ b/org.eclipse.linuxtools.lttng2.control.core.tests/src/org/eclipse/linuxtools/lttng2/control/core/tests/model/impl/ChannelInfoTest.java @@ -11,19 +11,19 @@ * Alexandre Montplaisir - Port to JUnit4 **********************************************************************/ -package org.eclipse.linuxtools.lttng2.core.tests.control.model.impl; +package org.eclipse.linuxtools.lttng2.control.core.tests.model.impl; import static org.junit.Assert.*; import java.util.LinkedList; import java.util.List; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.IChannelInfo; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.IEventInfo; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceEnablement; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.impl.BufferType; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.impl.ChannelInfo; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.impl.EventInfo; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.IChannelInfo; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.IEventInfo; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.TraceEnablement; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.impl.BufferType; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.impl.ChannelInfo; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.impl.EventInfo; import org.junit.Before; import org.junit.Test; diff --git a/org.eclipse.linuxtools.lttng2.core.tests/src/org/eclipse/linuxtools/lttng2/core/tests/control/model/impl/DomainInfoTest.java b/org.eclipse.linuxtools.lttng2.control.core.tests/src/org/eclipse/linuxtools/lttng2/control/core/tests/model/impl/DomainInfoTest.java similarity index 96% rename from org.eclipse.linuxtools.lttng2.core.tests/src/org/eclipse/linuxtools/lttng2/core/tests/control/model/impl/DomainInfoTest.java rename to org.eclipse.linuxtools.lttng2.control.core.tests/src/org/eclipse/linuxtools/lttng2/control/core/tests/model/impl/DomainInfoTest.java index 71fdbe3aa8..e85c258f5e 100644 --- a/org.eclipse.linuxtools.lttng2.core.tests/src/org/eclipse/linuxtools/lttng2/core/tests/control/model/impl/DomainInfoTest.java +++ b/org.eclipse.linuxtools.lttng2.control.core.tests/src/org/eclipse/linuxtools/lttng2/control/core/tests/model/impl/DomainInfoTest.java @@ -11,16 +11,16 @@ * Alexandre Montplaisir - Port to JUnit4 **********************************************************************/ -package org.eclipse.linuxtools.lttng2.core.tests.control.model.impl; +package org.eclipse.linuxtools.lttng2.control.core.tests.model.impl; import static org.junit.Assert.*; import java.util.LinkedList; import java.util.List; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.IChannelInfo; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.IDomainInfo; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.impl.DomainInfo; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.IChannelInfo; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.IDomainInfo; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.impl.DomainInfo; import org.junit.Before; import org.junit.Test; diff --git a/org.eclipse.linuxtools.lttng2.core.tests/src/org/eclipse/linuxtools/lttng2/core/tests/control/model/impl/EventInfoTest.java b/org.eclipse.linuxtools.lttng2.control.core.tests/src/org/eclipse/linuxtools/lttng2/control/core/tests/model/impl/EventInfoTest.java similarity index 96% rename from org.eclipse.linuxtools.lttng2.core.tests/src/org/eclipse/linuxtools/lttng2/core/tests/control/model/impl/EventInfoTest.java rename to org.eclipse.linuxtools.lttng2.control.core.tests/src/org/eclipse/linuxtools/lttng2/control/core/tests/model/impl/EventInfoTest.java index a36e1ee42a..be5400a686 100644 --- a/org.eclipse.linuxtools.lttng2.core.tests/src/org/eclipse/linuxtools/lttng2/core/tests/control/model/impl/EventInfoTest.java +++ b/org.eclipse.linuxtools.lttng2.control.core.tests/src/org/eclipse/linuxtools/lttng2/control/core/tests/model/impl/EventInfoTest.java @@ -11,17 +11,17 @@ * Alexandre Montplaisir - Port to JUnit4 **********************************************************************/ -package org.eclipse.linuxtools.lttng2.core.tests.control.model.impl; +package org.eclipse.linuxtools.lttng2.control.core.tests.model.impl; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.IEventInfo; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceEnablement; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceEventType; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.impl.EventInfo; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.IEventInfo; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.TraceEnablement; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.TraceEventType; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.impl.EventInfo; import org.junit.Before; import org.junit.Test; diff --git a/org.eclipse.linuxtools.lttng2.core.tests/src/org/eclipse/linuxtools/lttng2/core/tests/control/model/impl/FieldInfoTest.java b/org.eclipse.linuxtools.lttng2.control.core.tests/src/org/eclipse/linuxtools/lttng2/control/core/tests/model/impl/FieldInfoTest.java similarity index 96% rename from org.eclipse.linuxtools.lttng2.core.tests/src/org/eclipse/linuxtools/lttng2/core/tests/control/model/impl/FieldInfoTest.java rename to org.eclipse.linuxtools.lttng2.control.core.tests/src/org/eclipse/linuxtools/lttng2/control/core/tests/model/impl/FieldInfoTest.java index 1be7926a46..c0b18c8a20 100644 --- a/org.eclipse.linuxtools.lttng2.core.tests/src/org/eclipse/linuxtools/lttng2/core/tests/control/model/impl/FieldInfoTest.java +++ b/org.eclipse.linuxtools.lttng2.control.core.tests/src/org/eclipse/linuxtools/lttng2/control/core/tests/model/impl/FieldInfoTest.java @@ -11,12 +11,12 @@ * Alexandre Montplaisir - Port to JUnit4 **********************************************************************/ -package org.eclipse.linuxtools.lttng2.core.tests.control.model.impl; +package org.eclipse.linuxtools.lttng2.control.core.tests.model.impl; import static org.junit.Assert.*; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.IFieldInfo; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.impl.FieldInfo; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.IFieldInfo; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.impl.FieldInfo; import org.junit.Before; import org.junit.Test; diff --git a/org.eclipse.linuxtools.lttng2.core.tests/src/org/eclipse/linuxtools/lttng2/core/tests/control/model/impl/ModelImplFactory.java b/org.eclipse.linuxtools.lttng2.control.core.tests/src/org/eclipse/linuxtools/lttng2/control/core/tests/model/impl/ModelImplFactory.java similarity index 83% rename from org.eclipse.linuxtools.lttng2.core.tests/src/org/eclipse/linuxtools/lttng2/core/tests/control/model/impl/ModelImplFactory.java rename to org.eclipse.linuxtools.lttng2.control.core.tests/src/org/eclipse/linuxtools/lttng2/control/core/tests/model/impl/ModelImplFactory.java index de8d4fc0d9..22c8e004c3 100644 --- a/org.eclipse.linuxtools.lttng2.core.tests/src/org/eclipse/linuxtools/lttng2/core/tests/control/model/impl/ModelImplFactory.java +++ b/org.eclipse.linuxtools.lttng2.control.core.tests/src/org/eclipse/linuxtools/lttng2/control/core/tests/model/impl/ModelImplFactory.java @@ -10,30 +10,30 @@ * Bernd Hufmann - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.lttng2.core.tests.control.model.impl; - -import org.eclipse.linuxtools.internal.lttng2.core.control.model.IBaseEventInfo; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.IChannelInfo; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.IDomainInfo; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.IEventInfo; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.IFieldInfo; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.IProbeEventInfo; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.ISessionInfo; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.ISnapshotInfo; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.IUstProviderInfo; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceEnablement; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceEventType; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceLogLevel; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceSessionState; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.impl.BaseEventInfo; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.impl.ChannelInfo; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.impl.DomainInfo; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.impl.EventInfo; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.impl.FieldInfo; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.impl.ProbeEventInfo; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.impl.SessionInfo; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.impl.SnapshotInfo; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.impl.UstProviderInfo; +package org.eclipse.linuxtools.lttng2.control.core.tests.model.impl; + +import org.eclipse.linuxtools.internal.lttng2.control.core.model.IBaseEventInfo; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.IChannelInfo; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.IDomainInfo; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.IEventInfo; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.IFieldInfo; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.IProbeEventInfo; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.ISessionInfo; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.ISnapshotInfo; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.IUstProviderInfo; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.TraceEnablement; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.TraceEventType; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.TraceLogLevel; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.TraceSessionState; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.impl.BaseEventInfo; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.impl.ChannelInfo; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.impl.DomainInfo; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.impl.EventInfo; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.impl.FieldInfo; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.impl.ProbeEventInfo; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.impl.SessionInfo; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.impl.SnapshotInfo; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.impl.UstProviderInfo; /** * Test facility to constants across test case diff --git a/org.eclipse.linuxtools.lttng2.core.tests/src/org/eclipse/linuxtools/lttng2/core/tests/control/model/impl/ProbeEventInfoTest.java b/org.eclipse.linuxtools.lttng2.control.core.tests/src/org/eclipse/linuxtools/lttng2/control/core/tests/model/impl/ProbeEventInfoTest.java similarity index 95% rename from org.eclipse.linuxtools.lttng2.core.tests/src/org/eclipse/linuxtools/lttng2/core/tests/control/model/impl/ProbeEventInfoTest.java rename to org.eclipse.linuxtools.lttng2.control.core.tests/src/org/eclipse/linuxtools/lttng2/control/core/tests/model/impl/ProbeEventInfoTest.java index 83d2c0d00c..a3d6c42383 100644 --- a/org.eclipse.linuxtools.lttng2.core.tests/src/org/eclipse/linuxtools/lttng2/core/tests/control/model/impl/ProbeEventInfoTest.java +++ b/org.eclipse.linuxtools.lttng2.control.core.tests/src/org/eclipse/linuxtools/lttng2/control/core/tests/model/impl/ProbeEventInfoTest.java @@ -11,14 +11,14 @@ * Alexandre Montplaisir - Port to JUnit4 **********************************************************************/ -package org.eclipse.linuxtools.lttng2.core.tests.control.model.impl; +package org.eclipse.linuxtools.lttng2.control.core.tests.model.impl; import static org.junit.Assert.*; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.IProbeEventInfo; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceEnablement; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceEventType; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.impl.ProbeEventInfo; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.IProbeEventInfo; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.TraceEnablement; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.TraceEventType; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.impl.ProbeEventInfo; import org.junit.Before; import org.junit.Test; diff --git a/org.eclipse.linuxtools.lttng2.core.tests/src/org/eclipse/linuxtools/lttng2/core/tests/control/model/impl/SessionInfoTest.java b/org.eclipse.linuxtools.lttng2.control.core.tests/src/org/eclipse/linuxtools/lttng2/control/core/tests/model/impl/SessionInfoTest.java similarity index 97% rename from org.eclipse.linuxtools.lttng2.core.tests/src/org/eclipse/linuxtools/lttng2/core/tests/control/model/impl/SessionInfoTest.java rename to org.eclipse.linuxtools.lttng2.control.core.tests/src/org/eclipse/linuxtools/lttng2/control/core/tests/model/impl/SessionInfoTest.java index 5112069991..694c6d69d4 100644 --- a/org.eclipse.linuxtools.lttng2.core.tests/src/org/eclipse/linuxtools/lttng2/core/tests/control/model/impl/SessionInfoTest.java +++ b/org.eclipse.linuxtools.lttng2.control.core.tests/src/org/eclipse/linuxtools/lttng2/control/core/tests/model/impl/SessionInfoTest.java @@ -11,17 +11,17 @@ * Alexandre Montplaisir - Port to JUnit4 **********************************************************************/ -package org.eclipse.linuxtools.lttng2.core.tests.control.model.impl; +package org.eclipse.linuxtools.lttng2.control.core.tests.model.impl; import static org.junit.Assert.*; import java.util.LinkedList; import java.util.List; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.IDomainInfo; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.ISessionInfo; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceSessionState; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.impl.SessionInfo; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.IDomainInfo; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.ISessionInfo; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.TraceSessionState; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.impl.SessionInfo; import org.junit.Before; import org.junit.Test; diff --git a/org.eclipse.linuxtools.lttng2.core.tests/src/org/eclipse/linuxtools/lttng2/core/tests/control/model/impl/SnapshotInfoTest.java b/org.eclipse.linuxtools.lttng2.control.core.tests/src/org/eclipse/linuxtools/lttng2/control/core/tests/model/impl/SnapshotInfoTest.java similarity index 96% rename from org.eclipse.linuxtools.lttng2.core.tests/src/org/eclipse/linuxtools/lttng2/core/tests/control/model/impl/SnapshotInfoTest.java rename to org.eclipse.linuxtools.lttng2.control.core.tests/src/org/eclipse/linuxtools/lttng2/control/core/tests/model/impl/SnapshotInfoTest.java index 75a285d4fe..aa28c15644 100644 --- a/org.eclipse.linuxtools.lttng2.core.tests/src/org/eclipse/linuxtools/lttng2/core/tests/control/model/impl/SnapshotInfoTest.java +++ b/org.eclipse.linuxtools.lttng2.control.core.tests/src/org/eclipse/linuxtools/lttng2/control/core/tests/model/impl/SnapshotInfoTest.java @@ -10,16 +10,16 @@ * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.lttng2.core.tests.control.model.impl; +package org.eclipse.linuxtools.lttng2.control.core.tests.model.impl; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.ISnapshotInfo; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.impl.SnapshotInfo; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.impl.TraceInfo; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.ISnapshotInfo; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.impl.SnapshotInfo; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.impl.TraceInfo; import org.junit.Before; import org.junit.Test; diff --git a/org.eclipse.linuxtools.lttng2.core.tests/src/org/eclipse/linuxtools/lttng2/core/tests/control/model/impl/TraceInfoTest.java b/org.eclipse.linuxtools.lttng2.control.core.tests/src/org/eclipse/linuxtools/lttng2/control/core/tests/model/impl/TraceInfoTest.java similarity index 93% rename from org.eclipse.linuxtools.lttng2.core.tests/src/org/eclipse/linuxtools/lttng2/core/tests/control/model/impl/TraceInfoTest.java rename to org.eclipse.linuxtools.lttng2.control.core.tests/src/org/eclipse/linuxtools/lttng2/control/core/tests/model/impl/TraceInfoTest.java index 63935407f1..3f6c8a9dc1 100644 --- a/org.eclipse.linuxtools.lttng2.core.tests/src/org/eclipse/linuxtools/lttng2/core/tests/control/model/impl/TraceInfoTest.java +++ b/org.eclipse.linuxtools.lttng2.control.core.tests/src/org/eclipse/linuxtools/lttng2/control/core/tests/model/impl/TraceInfoTest.java @@ -11,12 +11,15 @@ * Alexandre Montplaisir - Port to JUnit4 **********************************************************************/ -package org.eclipse.linuxtools.lttng2.core.tests.control.model.impl; +package org.eclipse.linuxtools.lttng2.control.core.tests.model.impl; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.ITraceInfo; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.impl.TraceInfo; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.ITraceInfo; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.impl.TraceInfo; import org.junit.Before; import org.junit.Test; diff --git a/org.eclipse.linuxtools.lttng2.core.tests/src/org/eclipse/linuxtools/lttng2/core/tests/control/model/impl/UstProviderInfoTest.java b/org.eclipse.linuxtools.lttng2.control.core.tests/src/org/eclipse/linuxtools/lttng2/control/core/tests/model/impl/UstProviderInfoTest.java similarity index 96% rename from org.eclipse.linuxtools.lttng2.core.tests/src/org/eclipse/linuxtools/lttng2/core/tests/control/model/impl/UstProviderInfoTest.java rename to org.eclipse.linuxtools.lttng2.control.core.tests/src/org/eclipse/linuxtools/lttng2/control/core/tests/model/impl/UstProviderInfoTest.java index 7f8c298525..bb5dcdbac4 100644 --- a/org.eclipse.linuxtools.lttng2.core.tests/src/org/eclipse/linuxtools/lttng2/core/tests/control/model/impl/UstProviderInfoTest.java +++ b/org.eclipse.linuxtools.lttng2.control.core.tests/src/org/eclipse/linuxtools/lttng2/control/core/tests/model/impl/UstProviderInfoTest.java @@ -11,17 +11,17 @@ * Alexandre Montplaisir - Port to JUnit4 **********************************************************************/ -package org.eclipse.linuxtools.lttng2.core.tests.control.model.impl; +package org.eclipse.linuxtools.lttng2.control.core.tests.model.impl; import static org.junit.Assert.*; import java.util.LinkedList; import java.util.List; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.IBaseEventInfo; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.IUstProviderInfo; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.impl.BaseEventInfo; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.impl.UstProviderInfo; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.IBaseEventInfo; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.IUstProviderInfo; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.impl.BaseEventInfo; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.impl.UstProviderInfo; import org.junit.Before; import org.junit.Test; diff --git a/org.eclipse.linuxtools.lttng2.core.tests/src/org/eclipse/linuxtools/lttng2/core/tests/session/AllTests.java b/org.eclipse.linuxtools.lttng2.control.core.tests/src/org/eclipse/linuxtools/lttng2/control/core/tests/session/AllTests.java similarity index 92% rename from org.eclipse.linuxtools.lttng2.core.tests/src/org/eclipse/linuxtools/lttng2/core/tests/session/AllTests.java rename to org.eclipse.linuxtools.lttng2.control.core.tests/src/org/eclipse/linuxtools/lttng2/control/core/tests/session/AllTests.java index 985e99cd69..a647473f4a 100644 --- a/org.eclipse.linuxtools.lttng2.core.tests/src/org/eclipse/linuxtools/lttng2/core/tests/session/AllTests.java +++ b/org.eclipse.linuxtools.lttng2.control.core.tests/src/org/eclipse/linuxtools/lttng2/control/core/tests/session/AllTests.java @@ -9,7 +9,7 @@ * Contributors: * Guilliano Molaire - Initial API and implementation *********************************************************************/ -package org.eclipse.linuxtools.lttng2.core.tests.session; +package org.eclipse.linuxtools.lttng2.control.core.tests.session; import org.junit.runner.RunWith; import org.junit.runners.Suite; diff --git a/org.eclipse.linuxtools.lttng2.core.tests/src/org/eclipse/linuxtools/lttng2/core/tests/session/SessionConfigGeneratorTest.java b/org.eclipse.linuxtools.lttng2.control.core.tests/src/org/eclipse/linuxtools/lttng2/control/core/tests/session/SessionConfigGeneratorTest.java similarity index 87% rename from org.eclipse.linuxtools.lttng2.core.tests/src/org/eclipse/linuxtools/lttng2/core/tests/session/SessionConfigGeneratorTest.java rename to org.eclipse.linuxtools.lttng2.control.core.tests/src/org/eclipse/linuxtools/lttng2/control/core/tests/session/SessionConfigGeneratorTest.java index 78fb9ea68f..aa45579dd9 100644 --- a/org.eclipse.linuxtools.lttng2.core.tests/src/org/eclipse/linuxtools/lttng2/core/tests/session/SessionConfigGeneratorTest.java +++ b/org.eclipse.linuxtools.lttng2.control.core.tests/src/org/eclipse/linuxtools/lttng2/control/core/tests/session/SessionConfigGeneratorTest.java @@ -9,7 +9,8 @@ * Contributors: * Guilliano Molaire - Initial API and implementation *********************************************************************/ -package org.eclipse.linuxtools.lttng2.core.tests.session; + +package org.eclipse.linuxtools.lttng2.control.core.tests.session; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; @@ -21,15 +22,15 @@ import java.util.Set; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.IStatus; -import org.eclipse.linuxtools.internal.lttng2.core.Activator; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.IDomainInfo; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.ISessionInfo; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceSessionState; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.impl.BufferType; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.impl.SessionInfo; -import org.eclipse.linuxtools.lttng2.core.session.SessionConfigGenerator; -import org.eclipse.linuxtools.lttng2.core.session.SessionConfigStrings; -import org.eclipse.linuxtools.lttng2.core.tests.control.model.impl.ModelImplFactory; +import org.eclipse.linuxtools.internal.lttng2.control.core.Activator; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.IDomainInfo; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.ISessionInfo; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.TraceSessionState; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.impl.BufferType; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.impl.SessionInfo; +import org.eclipse.linuxtools.lttng2.control.core.session.SessionConfigGenerator; +import org.eclipse.linuxtools.lttng2.control.core.session.SessionConfigStrings; +import org.eclipse.linuxtools.lttng2.control.core.tests.model.impl.ModelImplFactory; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -44,8 +45,8 @@ public class SessionConfigGeneratorTest { // ------------------------------------------------------------------------ /** Session files for validation */ - private static final File VALID_SESSION_FILE = new File("../org.eclipse.linuxtools.lttng2.core.tests/test_session_config_files/test_valid.lttng"); - private static final File INVALID_SESSION_FILE = new File("../org.eclipse.linuxtools.lttng2.core.tests/test_session_config_files/test_invalid.lttng"); + private static final File VALID_SESSION_FILE = new File("../org.eclipse.linuxtools.lttng2.control.core.tests/test_session_config_files/test_valid.lttng"); + private static final File INVALID_SESSION_FILE = new File("../org.eclipse.linuxtools.lttng2.control.core.tests/test_session_config_files/test_invalid.lttng"); private static final String SESSION_FILENAME = "test_session." + SessionConfigStrings.SESSION_CONFIG_FILE_EXTENSION; private static final IPath SESSION_FILE_PATH = Activator.getDefault().getStateLocation().addTrailingSeparator().append(SESSION_FILENAME); diff --git a/org.eclipse.linuxtools.lttng2.core.tests/test_session_config_files/test_invalid.lttng b/org.eclipse.linuxtools.lttng2.control.core.tests/test_session_config_files/test_invalid.lttng similarity index 100% rename from org.eclipse.linuxtools.lttng2.core.tests/test_session_config_files/test_invalid.lttng rename to org.eclipse.linuxtools.lttng2.control.core.tests/test_session_config_files/test_invalid.lttng diff --git a/org.eclipse.linuxtools.lttng2.core.tests/test_session_config_files/test_valid.lttng b/org.eclipse.linuxtools.lttng2.control.core.tests/test_session_config_files/test_valid.lttng similarity index 100% rename from org.eclipse.linuxtools.lttng2.core.tests/test_session_config_files/test_valid.lttng rename to org.eclipse.linuxtools.lttng2.control.core.tests/test_session_config_files/test_valid.lttng diff --git a/org.eclipse.linuxtools.lttng2.core/.classpath b/org.eclipse.linuxtools.lttng2.control.core/.classpath similarity index 100% rename from org.eclipse.linuxtools.lttng2.core/.classpath rename to org.eclipse.linuxtools.lttng2.control.core/.classpath diff --git a/org.eclipse.linuxtools.lttng2.control.core/.gitignore b/org.eclipse.linuxtools.lttng2.control.core/.gitignore new file mode 100644 index 0000000000..fb60f67b1e --- /dev/null +++ b/org.eclipse.linuxtools.lttng2.control.core/.gitignore @@ -0,0 +1,2 @@ +bin/ +target/ diff --git a/org.eclipse.linuxtools.lttng2.core/.project b/org.eclipse.linuxtools.lttng2.control.core/.project similarity index 93% rename from org.eclipse.linuxtools.lttng2.core/.project rename to org.eclipse.linuxtools.lttng2.control.core/.project index 855a4271be..6152f75871 100644 --- a/org.eclipse.linuxtools.lttng2.core/.project +++ b/org.eclipse.linuxtools.lttng2.control.core/.project @@ -1,6 +1,6 @@ - org.eclipse.linuxtools.lttng2.core + org.eclipse.linuxtools.lttng2.control.core diff --git a/org.eclipse.linuxtools.lttng2.core/.settings/org.eclipse.core.resources.prefs b/org.eclipse.linuxtools.lttng2.control.core/.settings/org.eclipse.core.resources.prefs similarity index 100% rename from org.eclipse.linuxtools.lttng2.core/.settings/org.eclipse.core.resources.prefs rename to org.eclipse.linuxtools.lttng2.control.core/.settings/org.eclipse.core.resources.prefs diff --git a/org.eclipse.linuxtools.lttng2.core/.settings/org.eclipse.core.runtime.prefs b/org.eclipse.linuxtools.lttng2.control.core/.settings/org.eclipse.core.runtime.prefs similarity index 100% rename from org.eclipse.linuxtools.lttng2.core/.settings/org.eclipse.core.runtime.prefs rename to org.eclipse.linuxtools.lttng2.control.core/.settings/org.eclipse.core.runtime.prefs diff --git a/org.eclipse.linuxtools.lttng2.core/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.linuxtools.lttng2.control.core/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from org.eclipse.linuxtools.lttng2.core/.settings/org.eclipse.jdt.core.prefs rename to org.eclipse.linuxtools.lttng2.control.core/.settings/org.eclipse.jdt.core.prefs diff --git a/org.eclipse.linuxtools.lttng2.core/.settings/org.eclipse.jdt.ui.prefs b/org.eclipse.linuxtools.lttng2.control.core/.settings/org.eclipse.jdt.ui.prefs similarity index 100% rename from org.eclipse.linuxtools.lttng2.core/.settings/org.eclipse.jdt.ui.prefs rename to org.eclipse.linuxtools.lttng2.control.core/.settings/org.eclipse.jdt.ui.prefs diff --git a/org.eclipse.linuxtools.lttng2.core/.settings/org.eclipse.pde.api.tools.prefs b/org.eclipse.linuxtools.lttng2.control.core/.settings/org.eclipse.pde.api.tools.prefs similarity index 100% rename from org.eclipse.linuxtools.lttng2.core/.settings/org.eclipse.pde.api.tools.prefs rename to org.eclipse.linuxtools.lttng2.control.core/.settings/org.eclipse.pde.api.tools.prefs diff --git a/org.eclipse.linuxtools.lttng2.core/.settings/org.eclipse.pde.prefs b/org.eclipse.linuxtools.lttng2.control.core/.settings/org.eclipse.pde.prefs similarity index 100% rename from org.eclipse.linuxtools.lttng2.core/.settings/org.eclipse.pde.prefs rename to org.eclipse.linuxtools.lttng2.control.core/.settings/org.eclipse.pde.prefs diff --git a/org.eclipse.linuxtools.lttng2.control.core/META-INF/MANIFEST.MF b/org.eclipse.linuxtools.lttng2.control.core/META-INF/MANIFEST.MF new file mode 100644 index 0000000000..342881b044 --- /dev/null +++ b/org.eclipse.linuxtools.lttng2.control.core/META-INF/MANIFEST.MF @@ -0,0 +1,15 @@ +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: %Bundle-Name +Bundle-Vendor: %Bundle-Vendor +Bundle-Version: 3.0.0.qualifier +Bundle-Localization: plugin +Bundle-SymbolicName: org.eclipse.linuxtools.lttng2.control.core;singleton:=true +Bundle-Activator: org.eclipse.linuxtools.internal.lttng2.control.core.Activator +Bundle-ActivationPolicy: lazy +Bundle-RequiredExecutionEnvironment: JavaSE-1.7 +Require-Bundle: org.eclipse.core.runtime +Export-Package: org.eclipse.linuxtools.internal.lttng2.control.core;x-friends:="org.eclipse.linuxtools.lttng2.control.core.tests", + org.eclipse.linuxtools.internal.lttng2.control.core.model;x-friends:="org.eclipse.linuxtools.lttng2.control.ui,org.eclipse.linuxtools.lttng2.control.ui.tests,org.eclipse.linuxtools.lttng2.control.core.tests", + org.eclipse.linuxtools.internal.lttng2.control.core.model.impl;x-friends:="org.eclipse.linuxtools.lttng2.control.ui,org.eclipse.linuxtools.lttng2.control.ui.tests,org.eclipse.linuxtools.lttng2.control.core.tests", + org.eclipse.linuxtools.lttng2.control.core.session diff --git a/org.eclipse.linuxtools.lttng2.core/about.html b/org.eclipse.linuxtools.lttng2.control.core/about.html similarity index 100% rename from org.eclipse.linuxtools.lttng2.core/about.html rename to org.eclipse.linuxtools.lttng2.control.core/about.html diff --git a/org.eclipse.linuxtools.lttng2.core/build.properties b/org.eclipse.linuxtools.lttng2.control.core/build.properties similarity index 100% rename from org.eclipse.linuxtools.lttng2.core/build.properties rename to org.eclipse.linuxtools.lttng2.control.core/build.properties diff --git a/org.eclipse.linuxtools.lttng2.ui.tests/plugin.properties b/org.eclipse.linuxtools.lttng2.control.core/plugin.properties similarity index 82% rename from org.eclipse.linuxtools.lttng2.ui.tests/plugin.properties rename to org.eclipse.linuxtools.lttng2.control.core/plugin.properties index 00e3bc0695..f4637e1581 100644 --- a/org.eclipse.linuxtools.lttng2.ui.tests/plugin.properties +++ b/org.eclipse.linuxtools.lttng2.control.core/plugin.properties @@ -10,6 +10,6 @@ # Ericsson - Initial API and implementation ############################################################################### -#Properties file for org.eclipse.linuxtools.lttng2.ui.tests +#Properties file for org.eclipse.linuxtools.lttng2.control.core Bundle-Vendor = Eclipse Linux Tools -Bundle-Name = Linux Tools LTTng UI Tests Plug-in \ No newline at end of file +Bundle-Name = Linux Tools LTTng Control Core Plug-in diff --git a/org.eclipse.linuxtools.lttng2.ui/pom.xml b/org.eclipse.linuxtools.lttng2.control.core/pom.xml similarity index 74% rename from org.eclipse.linuxtools.lttng2.ui/pom.xml rename to org.eclipse.linuxtools.lttng2.control.core/pom.xml index da19e0043d..e16e123944 100644 --- a/org.eclipse.linuxtools.lttng2.ui/pom.xml +++ b/org.eclipse.linuxtools.lttng2.control.core/pom.xml @@ -17,22 +17,13 @@ 3.0.0-SNAPSHOT - org.eclipse.linuxtools.lttng2.ui + org.eclipse.linuxtools.lttng2.control.core 3.0.0-SNAPSHOT eclipse-plugin - Linux Tools LTTng UI Plug-in + Linux Tools LTTng Control Core Plug-in - - - - src - - **/*.java - - - org.eclipse.tycho diff --git a/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/Activator.java b/org.eclipse.linuxtools.lttng2.control.core/src/org/eclipse/linuxtools/internal/lttng2/control/core/Activator.java similarity index 97% rename from org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/Activator.java rename to org.eclipse.linuxtools.lttng2.control.core/src/org/eclipse/linuxtools/internal/lttng2/control/core/Activator.java index 3c6199dc48..be722ee69b 100644 --- a/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/Activator.java +++ b/org.eclipse.linuxtools.lttng2.control.core/src/org/eclipse/linuxtools/internal/lttng2/control/core/Activator.java @@ -10,7 +10,7 @@ * Francois Chouinard - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.core; +package org.eclipse.linuxtools.internal.lttng2.control.core; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Plugin; @@ -31,7 +31,7 @@ public class Activator extends Plugin { /** * The plug-in ID */ - public static final String PLUGIN_ID = "org.eclipse.linuxtools.lttng2.core"; //$NON-NLS-1$ + public static final String PLUGIN_ID = "org.eclipse.linuxtools.lttng2.control.core"; //$NON-NLS-1$ /** * The shared instance diff --git a/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/IBaseEventInfo.java b/org.eclipse.linuxtools.lttng2.control.core/src/org/eclipse/linuxtools/internal/lttng2/control/core/model/IBaseEventInfo.java similarity index 97% rename from org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/IBaseEventInfo.java rename to org.eclipse.linuxtools.lttng2.control.core/src/org/eclipse/linuxtools/internal/lttng2/control/core/model/IBaseEventInfo.java index 6f1e6bc655..21d7b3bfdc 100644 --- a/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/IBaseEventInfo.java +++ b/org.eclipse.linuxtools.lttng2.control.core/src/org/eclipse/linuxtools/internal/lttng2/control/core/model/IBaseEventInfo.java @@ -10,7 +10,7 @@ * Bernd Hufmann - Initial API and implementation * Bernd Hufmann - Updated for support of LTTng Tools 2.1 **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.core.control.model; +package org.eclipse.linuxtools.internal.lttng2.control.core.model; import java.util.List; diff --git a/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/IChannelInfo.java b/org.eclipse.linuxtools.lttng2.control.core/src/org/eclipse/linuxtools/internal/lttng2/control/core/model/IChannelInfo.java similarity index 96% rename from org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/IChannelInfo.java rename to org.eclipse.linuxtools.lttng2.control.core/src/org/eclipse/linuxtools/internal/lttng2/control/core/model/IChannelInfo.java index 209b27f2e2..6cf9e118ec 100644 --- a/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/IChannelInfo.java +++ b/org.eclipse.linuxtools.lttng2.control.core/src/org/eclipse/linuxtools/internal/lttng2/control/core/model/IChannelInfo.java @@ -10,11 +10,11 @@ * Bernd Hufmann - Initial API and implementation * Simon Delisle - Updated for support of LTTng Tools 2.2 **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.core.control.model; +package org.eclipse.linuxtools.internal.lttng2.control.core.model; import java.util.List; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.impl.BufferType; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.impl.BufferType; /** *

diff --git a/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/IDomainInfo.java b/org.eclipse.linuxtools.lttng2.control.core/src/org/eclipse/linuxtools/internal/lttng2/control/core/model/IDomainInfo.java similarity index 92% rename from org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/IDomainInfo.java rename to org.eclipse.linuxtools.lttng2.control.core/src/org/eclipse/linuxtools/internal/lttng2/control/core/model/IDomainInfo.java index a054fc1c94..783deb511f 100644 --- a/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/IDomainInfo.java +++ b/org.eclipse.linuxtools.lttng2.control.core/src/org/eclipse/linuxtools/internal/lttng2/control/core/model/IDomainInfo.java @@ -9,11 +9,11 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.core.control.model; +package org.eclipse.linuxtools.internal.lttng2.control.core.model; import java.util.List; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.impl.BufferType; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.impl.BufferType; /** *

diff --git a/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/IEventInfo.java b/org.eclipse.linuxtools.lttng2.control.core/src/org/eclipse/linuxtools/internal/lttng2/control/core/model/IEventInfo.java similarity index 94% rename from org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/IEventInfo.java rename to org.eclipse.linuxtools.lttng2.control.core/src/org/eclipse/linuxtools/internal/lttng2/control/core/model/IEventInfo.java index 359a0f24ab..4fc5033fa6 100644 --- a/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/IEventInfo.java +++ b/org.eclipse.linuxtools.lttng2.control.core/src/org/eclipse/linuxtools/internal/lttng2/control/core/model/IEventInfo.java @@ -9,7 +9,7 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.core.control.model; +package org.eclipse.linuxtools.internal.lttng2.control.core.model; /** *

diff --git a/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/IFieldInfo.java b/org.eclipse.linuxtools.lttng2.control.core/src/org/eclipse/linuxtools/internal/lttng2/control/core/model/IFieldInfo.java similarity index 93% rename from org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/IFieldInfo.java rename to org.eclipse.linuxtools.lttng2.control.core/src/org/eclipse/linuxtools/internal/lttng2/control/core/model/IFieldInfo.java index a889e6aa8f..3486a841fd 100644 --- a/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/IFieldInfo.java +++ b/org.eclipse.linuxtools.lttng2.control.core/src/org/eclipse/linuxtools/internal/lttng2/control/core/model/IFieldInfo.java @@ -9,7 +9,7 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.core.control.model; +package org.eclipse.linuxtools.internal.lttng2.control.core.model; /** *

diff --git a/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/IProbeEventInfo.java b/org.eclipse.linuxtools.lttng2.control.core/src/org/eclipse/linuxtools/internal/lttng2/control/core/model/IProbeEventInfo.java similarity index 95% rename from org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/IProbeEventInfo.java rename to org.eclipse.linuxtools.lttng2.control.core/src/org/eclipse/linuxtools/internal/lttng2/control/core/model/IProbeEventInfo.java index 4d132a5e6f..915998bdbf 100644 --- a/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/IProbeEventInfo.java +++ b/org.eclipse.linuxtools.lttng2.control.core/src/org/eclipse/linuxtools/internal/lttng2/control/core/model/IProbeEventInfo.java @@ -9,7 +9,7 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.core.control.model; +package org.eclipse.linuxtools.internal.lttng2.control.core.model; /** *

diff --git a/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/ISessionInfo.java b/org.eclipse.linuxtools.lttng2.control.core/src/org/eclipse/linuxtools/internal/lttng2/control/core/model/ISessionInfo.java similarity index 98% rename from org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/ISessionInfo.java rename to org.eclipse.linuxtools.lttng2.control.core/src/org/eclipse/linuxtools/internal/lttng2/control/core/model/ISessionInfo.java index e5ffd56ee7..74a8636820 100644 --- a/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/ISessionInfo.java +++ b/org.eclipse.linuxtools.lttng2.control.core/src/org/eclipse/linuxtools/internal/lttng2/control/core/model/ISessionInfo.java @@ -10,7 +10,7 @@ * Bernd Hufmann - Initial API and implementation * Bernd Hufmann - Updated for support of LTTng Tools 2.1 **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.core.control.model; +package org.eclipse.linuxtools.internal.lttng2.control.core.model; import java.util.List; diff --git a/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/ISnapshotInfo.java b/org.eclipse.linuxtools.lttng2.control.core/src/org/eclipse/linuxtools/internal/lttng2/control/core/model/ISnapshotInfo.java similarity index 96% rename from org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/ISnapshotInfo.java rename to org.eclipse.linuxtools.lttng2.control.core/src/org/eclipse/linuxtools/internal/lttng2/control/core/model/ISnapshotInfo.java index 4f9c91f704..7c360feb9c 100644 --- a/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/ISnapshotInfo.java +++ b/org.eclipse.linuxtools.lttng2.control.core/src/org/eclipse/linuxtools/internal/lttng2/control/core/model/ISnapshotInfo.java @@ -9,7 +9,7 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.core.control.model; +package org.eclipse.linuxtools.internal.lttng2.control.core.model; /** diff --git a/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/ITraceInfo.java b/org.eclipse.linuxtools.lttng2.control.core/src/org/eclipse/linuxtools/internal/lttng2/control/core/model/ITraceInfo.java similarity index 93% rename from org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/ITraceInfo.java rename to org.eclipse.linuxtools.lttng2.control.core/src/org/eclipse/linuxtools/internal/lttng2/control/core/model/ITraceInfo.java index a49d3c58e5..1a3722730c 100644 --- a/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/ITraceInfo.java +++ b/org.eclipse.linuxtools.lttng2.control.core/src/org/eclipse/linuxtools/internal/lttng2/control/core/model/ITraceInfo.java @@ -9,7 +9,7 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.core.control.model; +package org.eclipse.linuxtools.internal.lttng2.control.core.model; /** *

diff --git a/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/IUstProviderInfo.java b/org.eclipse.linuxtools.lttng2.control.core/src/org/eclipse/linuxtools/internal/lttng2/control/core/model/IUstProviderInfo.java similarity index 95% rename from org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/IUstProviderInfo.java rename to org.eclipse.linuxtools.lttng2.control.core/src/org/eclipse/linuxtools/internal/lttng2/control/core/model/IUstProviderInfo.java index 403a8572bf..843028bf9d 100644 --- a/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/IUstProviderInfo.java +++ b/org.eclipse.linuxtools.lttng2.control.core/src/org/eclipse/linuxtools/internal/lttng2/control/core/model/IUstProviderInfo.java @@ -9,7 +9,7 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.core.control.model; +package org.eclipse.linuxtools.internal.lttng2.control.core.model; import java.util.List; diff --git a/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/LogLevelType.java b/org.eclipse.linuxtools.lttng2.control.core/src/org/eclipse/linuxtools/internal/lttng2/control/core/model/LogLevelType.java similarity index 93% rename from org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/LogLevelType.java rename to org.eclipse.linuxtools.lttng2.control.core/src/org/eclipse/linuxtools/internal/lttng2/control/core/model/LogLevelType.java index 1cc3d7924b..5ca363789f 100644 --- a/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/LogLevelType.java +++ b/org.eclipse.linuxtools.lttng2.control.core/src/org/eclipse/linuxtools/internal/lttng2/control/core/model/LogLevelType.java @@ -9,7 +9,7 @@ * Contributors: * Bernd Hufmann - Initial API and implementation *********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.core.control.model; +package org.eclipse.linuxtools.internal.lttng2.control.core.model; /** *

diff --git a/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/TargetNodeState.java b/org.eclipse.linuxtools.lttng2.control.core/src/org/eclipse/linuxtools/internal/lttng2/control/core/model/TargetNodeState.java similarity index 92% rename from org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/TargetNodeState.java rename to org.eclipse.linuxtools.lttng2.control.core/src/org/eclipse/linuxtools/internal/lttng2/control/core/model/TargetNodeState.java index ae1cfa7bca..5a023155b2 100644 --- a/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/TargetNodeState.java +++ b/org.eclipse.linuxtools.lttng2.control.core/src/org/eclipse/linuxtools/internal/lttng2/control/core/model/TargetNodeState.java @@ -9,7 +9,7 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.core.control.model; +package org.eclipse.linuxtools.internal.lttng2.control.core.model; /** *

diff --git a/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/TraceEnablement.java b/org.eclipse.linuxtools.lttng2.control.core/src/org/eclipse/linuxtools/internal/lttng2/control/core/model/TraceEnablement.java similarity index 96% rename from org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/TraceEnablement.java rename to org.eclipse.linuxtools.lttng2.control.core/src/org/eclipse/linuxtools/internal/lttng2/control/core/model/TraceEnablement.java index c9eab3e097..77e15c2b23 100644 --- a/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/TraceEnablement.java +++ b/org.eclipse.linuxtools.lttng2.control.core/src/org/eclipse/linuxtools/internal/lttng2/control/core/model/TraceEnablement.java @@ -9,7 +9,7 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.core.control.model; +package org.eclipse.linuxtools.internal.lttng2.control.core.model; /** *

diff --git a/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/TraceEventType.java b/org.eclipse.linuxtools.lttng2.control.core/src/org/eclipse/linuxtools/internal/lttng2/control/core/model/TraceEventType.java similarity index 95% rename from org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/TraceEventType.java rename to org.eclipse.linuxtools.lttng2.control.core/src/org/eclipse/linuxtools/internal/lttng2/control/core/model/TraceEventType.java index 7f0d7b1862..26d89ce7b3 100644 --- a/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/TraceEventType.java +++ b/org.eclipse.linuxtools.lttng2.control.core/src/org/eclipse/linuxtools/internal/lttng2/control/core/model/TraceEventType.java @@ -9,7 +9,7 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.core.control.model; +package org.eclipse.linuxtools.internal.lttng2.control.core.model; /** *

diff --git a/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/TraceLogLevel.java b/org.eclipse.linuxtools.lttng2.control.core/src/org/eclipse/linuxtools/internal/lttng2/control/core/model/TraceLogLevel.java similarity index 97% rename from org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/TraceLogLevel.java rename to org.eclipse.linuxtools.lttng2.control.core/src/org/eclipse/linuxtools/internal/lttng2/control/core/model/TraceLogLevel.java index 27e7ba2d5b..70f1b00f3d 100644 --- a/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/TraceLogLevel.java +++ b/org.eclipse.linuxtools.lttng2.control.core/src/org/eclipse/linuxtools/internal/lttng2/control/core/model/TraceLogLevel.java @@ -9,7 +9,7 @@ * Contributors: * Bernd Hufmann - Initial API and implementation *********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.core.control.model; +package org.eclipse.linuxtools.internal.lttng2.control.core.model; /** *

diff --git a/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/TraceSessionState.java b/org.eclipse.linuxtools.lttng2.control.core/src/org/eclipse/linuxtools/internal/lttng2/control/core/model/TraceSessionState.java similarity index 96% rename from org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/TraceSessionState.java rename to org.eclipse.linuxtools.lttng2.control.core/src/org/eclipse/linuxtools/internal/lttng2/control/core/model/TraceSessionState.java index 2bd1f38e0b..4a96e030df 100644 --- a/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/TraceSessionState.java +++ b/org.eclipse.linuxtools.lttng2.control.core/src/org/eclipse/linuxtools/internal/lttng2/control/core/model/TraceSessionState.java @@ -9,7 +9,7 @@ * Contributors: * Bernd Hufmann - Initial API and implementation *********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.core.control.model; +package org.eclipse.linuxtools.internal.lttng2.control.core.model; /** *

diff --git a/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/BaseEventInfo.java b/org.eclipse.linuxtools.lttng2.control.core/src/org/eclipse/linuxtools/internal/lttng2/control/core/model/impl/BaseEventInfo.java similarity index 96% rename from org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/BaseEventInfo.java rename to org.eclipse.linuxtools.lttng2.control.core/src/org/eclipse/linuxtools/internal/lttng2/control/core/model/impl/BaseEventInfo.java index e05626b9c7..a2a2e0769b 100644 --- a/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/BaseEventInfo.java +++ b/org.eclipse.linuxtools.lttng2.control.core/src/org/eclipse/linuxtools/internal/lttng2/control/core/model/impl/BaseEventInfo.java @@ -9,16 +9,16 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.core.control.model.impl; +package org.eclipse.linuxtools.internal.lttng2.control.core.model.impl; import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.IBaseEventInfo; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.IFieldInfo; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceEventType; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceLogLevel; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.IBaseEventInfo; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.IFieldInfo; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.TraceEventType; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.TraceLogLevel; /** *

diff --git a/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/BufferType.java b/org.eclipse.linuxtools.lttng2.control.core/src/org/eclipse/linuxtools/internal/lttng2/control/core/model/impl/BufferType.java similarity index 97% rename from org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/BufferType.java rename to org.eclipse.linuxtools.lttng2.control.core/src/org/eclipse/linuxtools/internal/lttng2/control/core/model/impl/BufferType.java index 4593f77763..06f6cd118f 100644 --- a/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/BufferType.java +++ b/org.eclipse.linuxtools.lttng2.control.core/src/org/eclipse/linuxtools/internal/lttng2/control/core/model/impl/BufferType.java @@ -11,7 +11,7 @@ * Bernd Hufmann - Updated to enum definition **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.core.control.model.impl; +package org.eclipse.linuxtools.internal.lttng2.control.core.model.impl; /** * Constants for buffer type. diff --git a/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/ChannelInfo.java b/org.eclipse.linuxtools.lttng2.control.core/src/org/eclipse/linuxtools/internal/lttng2/control/core/model/impl/ChannelInfo.java similarity index 97% rename from org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/ChannelInfo.java rename to org.eclipse.linuxtools.lttng2.control.core/src/org/eclipse/linuxtools/internal/lttng2/control/core/model/impl/ChannelInfo.java index 5c6a4f5f1a..f4b770aafc 100644 --- a/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/ChannelInfo.java +++ b/org.eclipse.linuxtools.lttng2.control.core/src/org/eclipse/linuxtools/internal/lttng2/control/core/model/impl/ChannelInfo.java @@ -10,15 +10,15 @@ * Bernd Hufmann - Initial API and implementation * Simon Delisle - Updated for support of LTTng Tools 2.2 **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.core.control.model.impl; +package org.eclipse.linuxtools.internal.lttng2.control.core.model.impl; import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.IChannelInfo; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.IEventInfo; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceEnablement; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.IChannelInfo; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.IEventInfo; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.TraceEnablement; /** *

diff --git a/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/DomainInfo.java b/org.eclipse.linuxtools.lttng2.control.core/src/org/eclipse/linuxtools/internal/lttng2/control/core/model/impl/DomainInfo.java similarity index 96% rename from org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/DomainInfo.java rename to org.eclipse.linuxtools.lttng2.control.core/src/org/eclipse/linuxtools/internal/lttng2/control/core/model/impl/DomainInfo.java index 85239bbf2e..c378e125f0 100644 --- a/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/DomainInfo.java +++ b/org.eclipse.linuxtools.lttng2.control.core/src/org/eclipse/linuxtools/internal/lttng2/control/core/model/impl/DomainInfo.java @@ -9,14 +9,14 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.core.control.model.impl; +package org.eclipse.linuxtools.internal.lttng2.control.core.model.impl; import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.IChannelInfo; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.IDomainInfo; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.IChannelInfo; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.IDomainInfo; /** *

diff --git a/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/EventInfo.java b/org.eclipse.linuxtools.lttng2.control.core/src/org/eclipse/linuxtools/internal/lttng2/control/core/model/impl/EventInfo.java similarity index 94% rename from org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/EventInfo.java rename to org.eclipse.linuxtools.lttng2.control.core/src/org/eclipse/linuxtools/internal/lttng2/control/core/model/impl/EventInfo.java index a872b065d1..abfb5e14c1 100644 --- a/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/EventInfo.java +++ b/org.eclipse.linuxtools.lttng2.control.core/src/org/eclipse/linuxtools/internal/lttng2/control/core/model/impl/EventInfo.java @@ -9,10 +9,10 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.core.control.model.impl; +package org.eclipse.linuxtools.internal.lttng2.control.core.model.impl; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.IEventInfo; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceEnablement; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.IEventInfo; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.TraceEnablement; /** *

diff --git a/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/FieldInfo.java b/org.eclipse.linuxtools.lttng2.control.core/src/org/eclipse/linuxtools/internal/lttng2/control/core/model/impl/FieldInfo.java similarity index 95% rename from org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/FieldInfo.java rename to org.eclipse.linuxtools.lttng2.control.core/src/org/eclipse/linuxtools/internal/lttng2/control/core/model/impl/FieldInfo.java index 300796f95e..a95beaa3fc 100644 --- a/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/FieldInfo.java +++ b/org.eclipse.linuxtools.lttng2.control.core/src/org/eclipse/linuxtools/internal/lttng2/control/core/model/impl/FieldInfo.java @@ -9,9 +9,9 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.core.control.model.impl; +package org.eclipse.linuxtools.internal.lttng2.control.core.model.impl; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.IFieldInfo; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.IFieldInfo; /** *

diff --git a/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/ProbeEventInfo.java b/org.eclipse.linuxtools.lttng2.control.core/src/org/eclipse/linuxtools/internal/lttng2/control/core/model/impl/ProbeEventInfo.java similarity index 97% rename from org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/ProbeEventInfo.java rename to org.eclipse.linuxtools.lttng2.control.core/src/org/eclipse/linuxtools/internal/lttng2/control/core/model/impl/ProbeEventInfo.java index 462297b193..87f40a954f 100644 --- a/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/ProbeEventInfo.java +++ b/org.eclipse.linuxtools.lttng2.control.core/src/org/eclipse/linuxtools/internal/lttng2/control/core/model/impl/ProbeEventInfo.java @@ -9,9 +9,9 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.core.control.model.impl; +package org.eclipse.linuxtools.internal.lttng2.control.core.model.impl; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.IProbeEventInfo; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.IProbeEventInfo; /** *

diff --git a/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/SessionInfo.java b/org.eclipse.linuxtools.lttng2.control.core/src/org/eclipse/linuxtools/internal/lttng2/control/core/model/impl/SessionInfo.java similarity index 95% rename from org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/SessionInfo.java rename to org.eclipse.linuxtools.lttng2.control.core/src/org/eclipse/linuxtools/internal/lttng2/control/core/model/impl/SessionInfo.java index 519955bfbf..c5dd8a2bb4 100644 --- a/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/SessionInfo.java +++ b/org.eclipse.linuxtools.lttng2.control.core/src/org/eclipse/linuxtools/internal/lttng2/control/core/model/impl/SessionInfo.java @@ -10,16 +10,16 @@ * Bernd Hufmann - Initial API and implementation * Bernd Hufmann - Updated for support of LTTng Tools 2.1 **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.core.control.model.impl; +package org.eclipse.linuxtools.internal.lttng2.control.core.model.impl; import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.IDomainInfo; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.ISessionInfo; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.ISnapshotInfo; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceSessionState; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.IDomainInfo; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.ISessionInfo; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.ISnapshotInfo; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.TraceSessionState; /** *

diff --git a/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/SnapshotInfo.java b/org.eclipse.linuxtools.lttng2.control.core/src/org/eclipse/linuxtools/internal/lttng2/control/core/model/impl/SnapshotInfo.java similarity index 97% rename from org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/SnapshotInfo.java rename to org.eclipse.linuxtools.lttng2.control.core/src/org/eclipse/linuxtools/internal/lttng2/control/core/model/impl/SnapshotInfo.java index 352e7f9ce1..f7aa791e0e 100644 --- a/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/SnapshotInfo.java +++ b/org.eclipse.linuxtools.lttng2.control.core/src/org/eclipse/linuxtools/internal/lttng2/control/core/model/impl/SnapshotInfo.java @@ -9,9 +9,9 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.core.control.model.impl; +package org.eclipse.linuxtools.internal.lttng2.control.core.model.impl; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.ISnapshotInfo; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.ISnapshotInfo; /** *

diff --git a/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/TraceInfo.java b/org.eclipse.linuxtools.lttng2.control.core/src/org/eclipse/linuxtools/internal/lttng2/control/core/model/impl/TraceInfo.java similarity index 95% rename from org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/TraceInfo.java rename to org.eclipse.linuxtools.lttng2.control.core/src/org/eclipse/linuxtools/internal/lttng2/control/core/model/impl/TraceInfo.java index 70ddf82994..65ef13b41b 100644 --- a/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/TraceInfo.java +++ b/org.eclipse.linuxtools.lttng2.control.core/src/org/eclipse/linuxtools/internal/lttng2/control/core/model/impl/TraceInfo.java @@ -9,9 +9,9 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.core.control.model.impl; +package org.eclipse.linuxtools.internal.lttng2.control.core.model.impl; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.ITraceInfo; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.ITraceInfo; /** *

diff --git a/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/UstProviderInfo.java b/org.eclipse.linuxtools.lttng2.control.core/src/org/eclipse/linuxtools/internal/lttng2/control/core/model/impl/UstProviderInfo.java similarity index 96% rename from org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/UstProviderInfo.java rename to org.eclipse.linuxtools.lttng2.control.core/src/org/eclipse/linuxtools/internal/lttng2/control/core/model/impl/UstProviderInfo.java index 5ba01d5672..7f33c8a150 100644 --- a/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/UstProviderInfo.java +++ b/org.eclipse.linuxtools.lttng2.control.core/src/org/eclipse/linuxtools/internal/lttng2/control/core/model/impl/UstProviderInfo.java @@ -9,14 +9,14 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.core.control.model.impl; +package org.eclipse.linuxtools.internal.lttng2.control.core.model.impl; import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.IBaseEventInfo; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.IUstProviderInfo; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.IBaseEventInfo; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.IUstProviderInfo; /** *

diff --git a/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/lttng2/core/session/Messages.java b/org.eclipse.linuxtools.lttng2.control.core/src/org/eclipse/linuxtools/lttng2/control/core/session/Messages.java similarity index 93% rename from org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/lttng2/core/session/Messages.java rename to org.eclipse.linuxtools.lttng2.control.core/src/org/eclipse/linuxtools/lttng2/control/core/session/Messages.java index b58bd33986..2c8bac841a 100644 --- a/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/lttng2/core/session/Messages.java +++ b/org.eclipse.linuxtools.lttng2.control.core/src/org/eclipse/linuxtools/lttng2/control/core/session/Messages.java @@ -10,7 +10,7 @@ * Guilliano Molaire - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.lttng2.core.session; +package org.eclipse.linuxtools.lttng2.control.core.session; import org.eclipse.osgi.util.NLS; @@ -22,7 +22,7 @@ import org.eclipse.osgi.util.NLS; */ @SuppressWarnings("javadoc") public class Messages extends NLS { - private static final String BUNDLE_NAME = "org.eclipse.linuxtools.lttng2.core.control.session.messages"; //$NON-NLS-1$ + private static final String BUNDLE_NAME = "org.eclipse.linuxtools.lttng2.control.core.session.messages"; //$NON-NLS-1$ public static String SessionConfigXML_BadRequirementType; public static String SessionConfigXML_DomainTypeMissing; diff --git a/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/lttng2/core/session/SessionConfigGenerator.java b/org.eclipse.linuxtools.lttng2.control.core/src/org/eclipse/linuxtools/lttng2/control/core/session/SessionConfigGenerator.java similarity index 97% rename from org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/lttng2/core/session/SessionConfigGenerator.java rename to org.eclipse.linuxtools.lttng2.control.core/src/org/eclipse/linuxtools/lttng2/control/core/session/SessionConfigGenerator.java index 692862eb36..5f896b76c1 100644 --- a/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/lttng2/core/session/SessionConfigGenerator.java +++ b/org.eclipse.linuxtools.lttng2.control.core/src/org/eclipse/linuxtools/lttng2/control/core/session/SessionConfigGenerator.java @@ -9,7 +9,7 @@ * Contributors: * Guilliano Molaire - Initial API and implementation *********************************************************************/ -package org.eclipse.linuxtools.lttng2.core.session; +package org.eclipse.linuxtools.lttng2.control.core.session; import java.io.File; import java.io.IOException; @@ -35,15 +35,15 @@ import javax.xml.validation.Validator; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; -import org.eclipse.linuxtools.internal.lttng2.core.Activator; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.IChannelInfo; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.IDomainInfo; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.IEventInfo; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.ISessionInfo; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceEnablement; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceEventType; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceLogLevel; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceSessionState; +import org.eclipse.linuxtools.internal.lttng2.control.core.Activator; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.IChannelInfo; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.IDomainInfo; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.IEventInfo; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.ISessionInfo; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.TraceEnablement; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.TraceEventType; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.TraceLogLevel; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.TraceSessionState; import org.eclipse.osgi.util.NLS; import org.w3c.dom.Document; import org.w3c.dom.Element; diff --git a/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/lttng2/core/session/SessionConfigStrings.java b/org.eclipse.linuxtools.lttng2.control.core/src/org/eclipse/linuxtools/lttng2/control/core/session/SessionConfigStrings.java similarity index 98% rename from org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/lttng2/core/session/SessionConfigStrings.java rename to org.eclipse.linuxtools.lttng2.control.core/src/org/eclipse/linuxtools/lttng2/control/core/session/SessionConfigStrings.java index ee8e77d03c..6e3af06cdc 100644 --- a/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/lttng2/core/session/SessionConfigStrings.java +++ b/org.eclipse.linuxtools.lttng2.control.core/src/org/eclipse/linuxtools/lttng2/control/core/session/SessionConfigStrings.java @@ -9,7 +9,7 @@ * Contributors: * Guilliano Molaire - Initial API and implementation *********************************************************************/ -package org.eclipse.linuxtools.lttng2.core.session; +package org.eclipse.linuxtools.lttng2.control.core.session; /** * This file defines most markers from a session configuration file used to diff --git a/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/lttng2/core/session/messages.properties b/org.eclipse.linuxtools.lttng2.control.core/src/org/eclipse/linuxtools/lttng2/control/core/session/messages.properties similarity index 100% rename from org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/lttng2/core/session/messages.properties rename to org.eclipse.linuxtools.lttng2.control.core/src/org/eclipse/linuxtools/lttng2/control/core/session/messages.properties diff --git a/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/lttng2/core/session/session.xsd b/org.eclipse.linuxtools.lttng2.control.core/src/org/eclipse/linuxtools/lttng2/control/core/session/session.xsd similarity index 100% rename from org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/lttng2/core/session/session.xsd rename to org.eclipse.linuxtools.lttng2.control.core/src/org/eclipse/linuxtools/lttng2/control/core/session/session.xsd diff --git a/org.eclipse.linuxtools.lttng2.ui.tests/.classpath b/org.eclipse.linuxtools.lttng2.control.ui.tests/.classpath similarity index 100% rename from org.eclipse.linuxtools.lttng2.ui.tests/.classpath rename to org.eclipse.linuxtools.lttng2.control.ui.tests/.classpath diff --git a/org.eclipse.linuxtools.lttng2.control.ui.tests/.gitignore b/org.eclipse.linuxtools.lttng2.control.ui.tests/.gitignore new file mode 100644 index 0000000000..fb60f67b1e --- /dev/null +++ b/org.eclipse.linuxtools.lttng2.control.ui.tests/.gitignore @@ -0,0 +1,2 @@ +bin/ +target/ diff --git a/org.eclipse.linuxtools.lttng2.ui/.project b/org.eclipse.linuxtools.lttng2.control.ui.tests/.project similarity index 92% rename from org.eclipse.linuxtools.lttng2.ui/.project rename to org.eclipse.linuxtools.lttng2.control.ui.tests/.project index fda4666ec0..b92abe85bb 100644 --- a/org.eclipse.linuxtools.lttng2.ui/.project +++ b/org.eclipse.linuxtools.lttng2.control.ui.tests/.project @@ -1,6 +1,6 @@ - org.eclipse.linuxtools.lttng2.ui + org.eclipse.linuxtools.lttng2.control.ui.tests diff --git a/org.eclipse.linuxtools.lttng2.ui.tests/.settings/org.eclipse.core.resources.prefs b/org.eclipse.linuxtools.lttng2.control.ui.tests/.settings/org.eclipse.core.resources.prefs similarity index 100% rename from org.eclipse.linuxtools.lttng2.ui.tests/.settings/org.eclipse.core.resources.prefs rename to org.eclipse.linuxtools.lttng2.control.ui.tests/.settings/org.eclipse.core.resources.prefs diff --git a/org.eclipse.linuxtools.lttng2.ui.tests/.settings/org.eclipse.core.runtime.prefs b/org.eclipse.linuxtools.lttng2.control.ui.tests/.settings/org.eclipse.core.runtime.prefs similarity index 100% rename from org.eclipse.linuxtools.lttng2.ui.tests/.settings/org.eclipse.core.runtime.prefs rename to org.eclipse.linuxtools.lttng2.control.ui.tests/.settings/org.eclipse.core.runtime.prefs diff --git a/org.eclipse.linuxtools.lttng2.ui.tests/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.linuxtools.lttng2.control.ui.tests/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from org.eclipse.linuxtools.lttng2.ui.tests/.settings/org.eclipse.jdt.core.prefs rename to org.eclipse.linuxtools.lttng2.control.ui.tests/.settings/org.eclipse.jdt.core.prefs diff --git a/org.eclipse.linuxtools.lttng2.ui.tests/.settings/org.eclipse.jdt.ui.prefs b/org.eclipse.linuxtools.lttng2.control.ui.tests/.settings/org.eclipse.jdt.ui.prefs similarity index 100% rename from org.eclipse.linuxtools.lttng2.ui.tests/.settings/org.eclipse.jdt.ui.prefs rename to org.eclipse.linuxtools.lttng2.control.ui.tests/.settings/org.eclipse.jdt.ui.prefs diff --git a/org.eclipse.linuxtools.lttng2.ui.tests/.settings/org.eclipse.pde.api.tools.prefs b/org.eclipse.linuxtools.lttng2.control.ui.tests/.settings/org.eclipse.pde.api.tools.prefs similarity index 100% rename from org.eclipse.linuxtools.lttng2.ui.tests/.settings/org.eclipse.pde.api.tools.prefs rename to org.eclipse.linuxtools.lttng2.control.ui.tests/.settings/org.eclipse.pde.api.tools.prefs diff --git a/org.eclipse.linuxtools.lttng2.ui.tests/.settings/org.eclipse.pde.prefs b/org.eclipse.linuxtools.lttng2.control.ui.tests/.settings/org.eclipse.pde.prefs similarity index 100% rename from org.eclipse.linuxtools.lttng2.ui.tests/.settings/org.eclipse.pde.prefs rename to org.eclipse.linuxtools.lttng2.control.ui.tests/.settings/org.eclipse.pde.prefs diff --git a/org.eclipse.linuxtools.lttng2.control.ui.tests/META-INF/MANIFEST.MF b/org.eclipse.linuxtools.lttng2.control.ui.tests/META-INF/MANIFEST.MF new file mode 100644 index 0000000000..b0b8146c46 --- /dev/null +++ b/org.eclipse.linuxtools.lttng2.control.ui.tests/META-INF/MANIFEST.MF @@ -0,0 +1,29 @@ +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: %Bundle-Name +Bundle-Vendor: %Bundle-Vendor +Bundle-Version: 3.0.0.qualifier +Bundle-Localization: plugin +Bundle-SymbolicName: org.eclipse.linuxtools.lttng2.control.ui.tests;singleton:=true +Bundle-ActivationPolicy: lazy +Bundle-RequiredExecutionEnvironment: JavaSE-1.7 +Require-Bundle: org.junit;bundle-version="4.0.0", + org.eclipse.core.commands, + org.eclipse.core.runtime, + org.eclipse.ui, + org.eclipse.ui.ide, + org.eclipse.linuxtools.lttng2.control.core;bundle-version="3.0.0", + org.eclipse.linuxtools.lttng2.control.ui;bundle-version="3.0.0" +Import-Package: org.eclipse.rse.core, + org.eclipse.rse.core.model, + org.eclipse.rse.core.subsystems, + org.eclipse.rse.services.shells, + org.eclipse.rse.services.terminals, + org.eclipse.rse.subsystems.files.core, + org.eclipse.rse.subsystems.files.core.servicesubsystem +Export-Package: org.eclipse.linuxtools.internal.lttng2.control.stubs.dialogs;x-internal:=true, + org.eclipse.linuxtools.internal.lttng2.control.stubs.service;x-internal:=true, + org.eclipse.linuxtools.internal.lttng2.control.stubs.shells;x-internal:=true, + org.eclipse.linuxtools.lttng2.control.ui.tests;x-friends:="org.eclipse.linuxtools.lttng.alltests", + org.eclipse.linuxtools.lttng2.control.ui.tests.model.component;x-internal:=true, + org.eclipse.linuxtools.lttng2.control.ui.tests.service;x-internal:=true diff --git a/org.eclipse.linuxtools.lttng2.ui.tests/about.html b/org.eclipse.linuxtools.lttng2.control.ui.tests/about.html similarity index 100% rename from org.eclipse.linuxtools.lttng2.ui.tests/about.html rename to org.eclipse.linuxtools.lttng2.control.ui.tests/about.html diff --git a/org.eclipse.linuxtools.lttng2.ui.tests/build.properties b/org.eclipse.linuxtools.lttng2.control.ui.tests/build.properties similarity index 100% rename from org.eclipse.linuxtools.lttng2.ui.tests/build.properties rename to org.eclipse.linuxtools.lttng2.control.ui.tests/build.properties diff --git a/org.eclipse.linuxtools.lttng2.core/plugin.properties b/org.eclipse.linuxtools.lttng2.control.ui.tests/plugin.properties similarity index 81% rename from org.eclipse.linuxtools.lttng2.core/plugin.properties rename to org.eclipse.linuxtools.lttng2.control.ui.tests/plugin.properties index 857fcc1604..cfd871204f 100644 --- a/org.eclipse.linuxtools.lttng2.core/plugin.properties +++ b/org.eclipse.linuxtools.lttng2.control.ui.tests/plugin.properties @@ -10,6 +10,6 @@ # Ericsson - Initial API and implementation ############################################################################### -#Properties file for org.eclipse.linuxtools.lttng2.core +#Properties file for org.eclipse.linuxtools.lttng2.control.ui.tests Bundle-Vendor = Eclipse Linux Tools -Bundle-Name = Linux Tools LTTng Core Plug-in \ No newline at end of file +Bundle-Name = Linux Tools LTTng Control UI Tests Plug-in diff --git a/org.eclipse.linuxtools.lttng2.ui.tests/pom.xml b/org.eclipse.linuxtools.lttng2.control.ui.tests/pom.xml similarity index 72% rename from org.eclipse.linuxtools.lttng2.ui.tests/pom.xml rename to org.eclipse.linuxtools.lttng2.control.ui.tests/pom.xml index 802e5a8666..8f03187db7 100644 --- a/org.eclipse.linuxtools.lttng2.ui.tests/pom.xml +++ b/org.eclipse.linuxtools.lttng2.control.ui.tests/pom.xml @@ -17,30 +17,21 @@ 3.0.0-SNAPSHOT - org.eclipse.linuxtools.lttng2.ui.tests + org.eclipse.linuxtools.lttng2.control.ui.tests 3.0.0-SNAPSHOT eclipse-test-plugin - Linux Tools LTTng UI Tests Plug-in + Linux Tools LTTng Control UI Tests Plug-in - - - - src - - **/*.java - - - org.eclipse.tycho tycho-surefire-plugin ${tycho-version} - org.eclipse.linuxtools.lttng2.ui.tests - org.eclipse.linuxtools.lttng2.ui.tests.AllTests + org.eclipse.linuxtools.lttng2.control.ui.tests + org.eclipse.linuxtools.lttng2.control.ui.tests.AllTests true true ${tycho.testArgLine} ${base.ui.test.vmargs} diff --git a/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/ActivatorTest.java b/org.eclipse.linuxtools.lttng2.control.ui.tests/src/org/eclipse/linuxtools/lttng2/control/ui/tests/ActivatorTest.java similarity index 88% rename from org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/ActivatorTest.java rename to org.eclipse.linuxtools.lttng2.control.ui.tests/src/org/eclipse/linuxtools/lttng2/control/ui/tests/ActivatorTest.java index 325fe5255c..7878ac0732 100644 --- a/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/ActivatorTest.java +++ b/org.eclipse.linuxtools.lttng2.control.ui.tests/src/org/eclipse/linuxtools/lttng2/control/ui/tests/ActivatorTest.java @@ -10,7 +10,7 @@ * Francois Chouinard - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.lttng2.ui.tests; +package org.eclipse.linuxtools.lttng2.control.ui.tests; import static org.junit.Assert.assertTrue; @@ -26,7 +26,7 @@ public class ActivatorTest { // ------------------------------------------------------------------------ /** - * Test method for {@link org.eclipse.linuxtools.internal.lttng2.ui.Activator#Activator}. + * Test method for {@link org.eclipse.linuxtools.internal.lttng2.control.ui.Activator#Activator}. */ @Test public void testActivator() { @@ -34,7 +34,7 @@ public class ActivatorTest { } /** - * Test method for {@link org.eclipse.linuxtools.internal.lttng2.ui.Activator#getDefault}. + * Test method for {@link org.eclipse.linuxtools.internal.lttng2.control.ui.Activator#getDefault}. */ @Test public void testGetDefault() { @@ -42,7 +42,7 @@ public class ActivatorTest { } /** - * Test method for {@link org.eclipse.linuxtools.internal.lttng2.ui.Activator#start}. + * Test method for {@link org.eclipse.linuxtools.internal.lttng2.control.ui.Activator#start}. */ @Test public void testStartBundleContext() { @@ -50,7 +50,7 @@ public class ActivatorTest { } /** - * Test method for {@link org.eclipse.linuxtools.internal.lttng2.ui.Activator#stop}. + * Test method for {@link org.eclipse.linuxtools.internal.lttng2.control.ui.Activator#stop}. */ @Test public void testStopBundleContext() { diff --git a/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/AllTests.java b/org.eclipse.linuxtools.lttng2.control.ui.tests/src/org/eclipse/linuxtools/lttng2/control/ui/tests/AllTests.java similarity index 78% rename from org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/AllTests.java rename to org.eclipse.linuxtools.lttng2.control.ui.tests/src/org/eclipse/linuxtools/lttng2/control/ui/tests/AllTests.java index bf338e73fc..9d884e8921 100644 --- a/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/AllTests.java +++ b/org.eclipse.linuxtools.lttng2.control.ui.tests/src/org/eclipse/linuxtools/lttng2/control/ui/tests/AllTests.java @@ -11,19 +11,19 @@ * Alexandre Montplaisir - Port to JUnit4 *******************************************************************************/ -package org.eclipse.linuxtools.lttng2.ui.tests; +package org.eclipse.linuxtools.lttng2.control.ui.tests; import org.junit.runner.RunWith; import org.junit.runners.Suite; /** - * Runner for the lttng2.ui unit tests. + * Runner for the test suite */ @RunWith(Suite.class) @Suite.SuiteClasses({ ActivatorTest.class, - org.eclipse.linuxtools.lttng2.ui.tests.control.model.component.AllTests.class, - org.eclipse.linuxtools.lttng2.ui.tests.control.service.AllTests.class + org.eclipse.linuxtools.lttng2.control.ui.tests.model.component.AllTests.class, + org.eclipse.linuxtools.lttng2.control.ui.tests.service.AllTests.class }) public class AllTests { diff --git a/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/AllTests.java b/org.eclipse.linuxtools.lttng2.control.ui.tests/src/org/eclipse/linuxtools/lttng2/control/ui/tests/model/component/AllTests.java similarity index 90% rename from org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/AllTests.java rename to org.eclipse.linuxtools.lttng2.control.ui.tests/src/org/eclipse/linuxtools/lttng2/control/ui/tests/model/component/AllTests.java index 86d433445a..4000217747 100644 --- a/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/AllTests.java +++ b/org.eclipse.linuxtools.lttng2.control.ui.tests/src/org/eclipse/linuxtools/lttng2/control/ui/tests/model/component/AllTests.java @@ -11,13 +11,13 @@ * Alexandre Montplaisir - Port to JUnit4 *******************************************************************************/ -package org.eclipse.linuxtools.lttng2.ui.tests.control.model.component; +package org.eclipse.linuxtools.lttng2.control.ui.tests.model.component; import org.junit.runner.RunWith; import org.junit.runners.Suite; /** - * Runner for the control.model.component unit tests. + * Runner for the model.component unit tests. */ @RunWith(Suite.class) @Suite.SuiteClasses({ diff --git a/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/ListenerValidator.java b/org.eclipse.linuxtools.lttng2.control.ui.tests/src/org/eclipse/linuxtools/lttng2/control/ui/tests/model/component/ListenerValidator.java similarity index 93% rename from org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/ListenerValidator.java rename to org.eclipse.linuxtools.lttng2.control.ui.tests/src/org/eclipse/linuxtools/lttng2/control/ui/tests/model/component/ListenerValidator.java index 24065ab31d..9dbd99fada 100644 --- a/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/ListenerValidator.java +++ b/org.eclipse.linuxtools.lttng2.control.ui.tests/src/org/eclipse/linuxtools/lttng2/control/ui/tests/model/component/ListenerValidator.java @@ -9,10 +9,10 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.lttng2.ui.tests.control.model.component; +package org.eclipse.linuxtools.lttng2.control.ui.tests.model.component; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponentChangedListener; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.ITraceControlComponent; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.ITraceControlComponentChangedListener; /** * The class can be used to validate the listener interface. diff --git a/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/TraceControlComponentTest.java b/org.eclipse.linuxtools.lttng2.control.ui.tests/src/org/eclipse/linuxtools/lttng2/control/ui/tests/model/component/TraceControlComponentTest.java similarity index 95% rename from org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/TraceControlComponentTest.java rename to org.eclipse.linuxtools.lttng2.control.ui.tests/src/org/eclipse/linuxtools/lttng2/control/ui/tests/model/component/TraceControlComponentTest.java index 8365126e8a..785a19981c 100644 --- a/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/TraceControlComponentTest.java +++ b/org.eclipse.linuxtools.lttng2.control.ui.tests/src/org/eclipse/linuxtools/lttng2/control/ui/tests/model/component/TraceControlComponentTest.java @@ -11,23 +11,26 @@ * Alexandre Montplaisir - Port to JUnit4 **********************************************************************/ -package org.eclipse.linuxtools.lttng2.ui.tests.control.model.component; +package org.eclipse.linuxtools.lttng2.control.ui.tests.model.component; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; import java.util.LinkedList; import java.util.List; import org.eclipse.core.commands.ExecutionException; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.TargetNodeState; -import org.eclipse.linuxtools.internal.lttng2.stubs.service.TestRemoteSystemProxy; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.ControlView; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponentChangedListener; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceControlComponent; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceControlRoot; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.service.ILttngControlService; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.service.LTTngControlService; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.TargetNodeState; +import org.eclipse.linuxtools.internal.lttng2.control.stubs.service.TestRemoteSystemProxy; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.ControlView; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.ITraceControlComponent; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.ITraceControlComponentChangedListener; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceControlComponent; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceControlRoot; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.service.ILttngControlService; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.service.LTTngControlService; import org.eclipse.swt.graphics.Image; import org.eclipse.ui.ISharedImages; import org.eclipse.ui.PlatformUI; diff --git a/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/TraceControlCreateSessionTests.java b/org.eclipse.linuxtools.lttng2.control.ui.tests/src/org/eclipse/linuxtools/lttng2/control/ui/tests/model/component/TraceControlCreateSessionTests.java similarity index 93% rename from org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/TraceControlCreateSessionTests.java rename to org.eclipse.linuxtools.lttng2.control.ui.tests/src/org/eclipse/linuxtools/lttng2/control/ui/tests/model/component/TraceControlCreateSessionTests.java index 25c657538c..4ff93b0ad8 100644 --- a/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/TraceControlCreateSessionTests.java +++ b/org.eclipse.linuxtools.lttng2.control.ui.tests/src/org/eclipse/linuxtools/lttng2/control/ui/tests/model/component/TraceControlCreateSessionTests.java @@ -9,26 +9,26 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.lttng2.ui.tests.control.model.component; - -import java.io.File; -import java.net.URL; +package org.eclipse.linuxtools.lttng2.control.ui.tests.model.component; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; +import java.io.File; +import java.net.URL; + import org.eclipse.core.runtime.FileLocator; import org.eclipse.core.runtime.Path; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.TargetNodeState; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceSessionState; -import org.eclipse.linuxtools.internal.lttng2.stubs.dialogs.CreateSessionDialogStub; -import org.eclipse.linuxtools.internal.lttng2.stubs.dialogs.DestroyConfirmDialogStub; -import org.eclipse.linuxtools.internal.lttng2.stubs.service.TestRemoteSystemProxy; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.TraceControlDialogFactory; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TargetNodeComponent; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceSessionComponent; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.TargetNodeState; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.TraceSessionState; +import org.eclipse.linuxtools.internal.lttng2.control.stubs.dialogs.CreateSessionDialogStub; +import org.eclipse.linuxtools.internal.lttng2.control.stubs.dialogs.DestroyConfirmDialogStub; +import org.eclipse.linuxtools.internal.lttng2.control.stubs.service.TestRemoteSystemProxy; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.dialogs.TraceControlDialogFactory; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.ITraceControlComponent; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TargetNodeComponent; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceSessionComponent; import org.eclipse.rse.core.RSECorePlugin; import org.eclipse.rse.core.model.IHost; import org.eclipse.rse.core.model.ISystemProfile; diff --git a/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/TraceControlKernelProviderTests.java b/org.eclipse.linuxtools.lttng2.control.ui.tests/src/org/eclipse/linuxtools/lttng2/control/ui/tests/model/component/TraceControlKernelProviderTests.java similarity index 89% rename from org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/TraceControlKernelProviderTests.java rename to org.eclipse.linuxtools.lttng2.control.ui.tests/src/org/eclipse/linuxtools/lttng2/control/ui/tests/model/component/TraceControlKernelProviderTests.java index 71ff991a86..31f76f7b23 100644 --- a/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/TraceControlKernelProviderTests.java +++ b/org.eclipse.linuxtools.lttng2.control.ui.tests/src/org/eclipse/linuxtools/lttng2/control/ui/tests/model/component/TraceControlKernelProviderTests.java @@ -11,7 +11,7 @@ * Alexandre Montplaisir - Port to JUnit4 **********************************************************************/ -package org.eclipse.linuxtools.lttng2.ui.tests.control.model.component; +package org.eclipse.linuxtools.lttng2.control.ui.tests.model.component; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -22,24 +22,24 @@ import java.net.URL; import org.eclipse.core.runtime.FileLocator; import org.eclipse.core.runtime.Path; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.TargetNodeState; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceEnablement; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceEventType; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceLogLevel; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceSessionState; -import org.eclipse.linuxtools.internal.lttng2.stubs.dialogs.CreateSessionDialogStub; -import org.eclipse.linuxtools.internal.lttng2.stubs.dialogs.DestroyConfirmDialogStub; -import org.eclipse.linuxtools.internal.lttng2.stubs.dialogs.GetEventInfoDialogStub; -import org.eclipse.linuxtools.internal.lttng2.stubs.service.TestRemoteSystemProxy; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.TraceControlDialogFactory; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.BaseEventComponent; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.KernelProviderComponent; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TargetNodeComponent; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceChannelComponent; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceEventComponent; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceProviderGroup; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceSessionComponent; +import org.eclipse.linuxtools.internal.lttng2.control.stubs.dialogs.CreateSessionDialogStub; +import org.eclipse.linuxtools.internal.lttng2.control.stubs.dialogs.DestroyConfirmDialogStub; +import org.eclipse.linuxtools.internal.lttng2.control.stubs.dialogs.GetEventInfoDialogStub; +import org.eclipse.linuxtools.internal.lttng2.control.stubs.service.TestRemoteSystemProxy; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.TargetNodeState; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.TraceEnablement; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.TraceEventType; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.TraceLogLevel; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.TraceSessionState; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.dialogs.TraceControlDialogFactory; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.ITraceControlComponent; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.BaseEventComponent; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.KernelProviderComponent; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TargetNodeComponent; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceChannelComponent; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceEventComponent; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceProviderGroup; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceSessionComponent; import org.eclipse.rse.core.RSECorePlugin; import org.eclipse.rse.core.model.IHost; import org.eclipse.rse.core.model.ISystemProfile; diff --git a/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/TraceControlKernelSessionTests.java b/org.eclipse.linuxtools.lttng2.control.ui.tests/src/org/eclipse/linuxtools/lttng2/control/ui/tests/model/component/TraceControlKernelSessionTests.java similarity index 95% rename from org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/TraceControlKernelSessionTests.java rename to org.eclipse.linuxtools.lttng2.control.ui.tests/src/org/eclipse/linuxtools/lttng2/control/ui/tests/model/component/TraceControlKernelSessionTests.java index a478873683..7f1d4332d2 100644 --- a/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/TraceControlKernelSessionTests.java +++ b/org.eclipse.linuxtools.lttng2.control.ui.tests/src/org/eclipse/linuxtools/lttng2/control/ui/tests/model/component/TraceControlKernelSessionTests.java @@ -11,7 +11,7 @@ * Alexandre Montplaisir - Port to JUnit4 **********************************************************************/ -package org.eclipse.linuxtools.lttng2.ui.tests.control.model.component; +package org.eclipse.linuxtools.lttng2.control.ui.tests.model.component; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -26,26 +26,26 @@ import java.util.List; import org.eclipse.core.runtime.FileLocator; import org.eclipse.core.runtime.Path; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.TargetNodeState; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceEnablement; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceEventType; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceLogLevel; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceSessionState; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.impl.ChannelInfo; -import org.eclipse.linuxtools.internal.lttng2.stubs.dialogs.AddContextDialogStub; -import org.eclipse.linuxtools.internal.lttng2.stubs.dialogs.CreateSessionDialogStub; -import org.eclipse.linuxtools.internal.lttng2.stubs.dialogs.DestroyConfirmDialogStub; -import org.eclipse.linuxtools.internal.lttng2.stubs.dialogs.EnableChannelDialogStub; -import org.eclipse.linuxtools.internal.lttng2.stubs.dialogs.EnableEventsDialogStub; -import org.eclipse.linuxtools.internal.lttng2.stubs.dialogs.GetEventInfoDialogStub; -import org.eclipse.linuxtools.internal.lttng2.stubs.service.TestRemoteSystemProxy; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.TraceControlDialogFactory; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TargetNodeComponent; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceChannelComponent; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceEventComponent; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceProbeEventComponent; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceSessionComponent; +import org.eclipse.linuxtools.internal.lttng2.control.stubs.dialogs.AddContextDialogStub; +import org.eclipse.linuxtools.internal.lttng2.control.stubs.dialogs.CreateSessionDialogStub; +import org.eclipse.linuxtools.internal.lttng2.control.stubs.dialogs.DestroyConfirmDialogStub; +import org.eclipse.linuxtools.internal.lttng2.control.stubs.dialogs.EnableChannelDialogStub; +import org.eclipse.linuxtools.internal.lttng2.control.stubs.dialogs.EnableEventsDialogStub; +import org.eclipse.linuxtools.internal.lttng2.control.stubs.dialogs.GetEventInfoDialogStub; +import org.eclipse.linuxtools.internal.lttng2.control.stubs.service.TestRemoteSystemProxy; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.TargetNodeState; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.TraceEnablement; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.TraceEventType; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.TraceLogLevel; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.TraceSessionState; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.impl.ChannelInfo; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.dialogs.TraceControlDialogFactory; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.ITraceControlComponent; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TargetNodeComponent; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceChannelComponent; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceEventComponent; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceProbeEventComponent; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceSessionComponent; import org.eclipse.rse.core.RSECorePlugin; import org.eclipse.rse.core.model.IHost; import org.eclipse.rse.core.model.ISystemProfile; diff --git a/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/TraceControlPropertiesTest.java b/org.eclipse.linuxtools.lttng2.control.ui.tests/src/org/eclipse/linuxtools/lttng2/control/ui/tests/model/component/TraceControlPropertiesTest.java similarity index 90% rename from org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/TraceControlPropertiesTest.java rename to org.eclipse.linuxtools.lttng2.control.ui.tests/src/org/eclipse/linuxtools/lttng2/control/ui/tests/model/component/TraceControlPropertiesTest.java index be1df087a0..c09c490b90 100644 --- a/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/TraceControlPropertiesTest.java +++ b/org.eclipse.linuxtools.lttng2.control.ui.tests/src/org/eclipse/linuxtools/lttng2/control/ui/tests/model/component/TraceControlPropertiesTest.java @@ -11,7 +11,7 @@ * Alexandre Montplaisir - Port to JUnit4 **********************************************************************/ -package org.eclipse.linuxtools.lttng2.ui.tests.control.model.component; +package org.eclipse.linuxtools.lttng2.control.ui.tests.model.component; import static org.junit.Assert.*; @@ -20,33 +20,33 @@ import java.net.URL; import org.eclipse.core.runtime.FileLocator; import org.eclipse.core.runtime.Path; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.IChannelInfo; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.TargetNodeState; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceEnablement; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceEventType; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceLogLevel; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceSessionState; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.impl.BufferType; -import org.eclipse.linuxtools.internal.lttng2.stubs.service.TestRemoteSystemProxy; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.BaseEventComponent; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.KernelProviderComponent; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TargetNodeComponent; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceChannelComponent; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceDomainComponent; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceEventComponent; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceProbeEventComponent; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceSessionComponent; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.UstProviderComponent; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.property.BaseEventPropertySource; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.property.KernelProviderPropertySource; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.property.TargetNodePropertySource; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.property.TraceChannelPropertySource; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.property.TraceDomainPropertySource; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.property.TraceEventPropertySource; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.property.TraceProbeEventPropertySource; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.property.TraceSessionPropertySource; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.property.UstProviderPropertySource; +import org.eclipse.linuxtools.internal.lttng2.control.stubs.service.TestRemoteSystemProxy; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.IChannelInfo; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.TargetNodeState; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.TraceEnablement; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.TraceEventType; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.TraceLogLevel; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.TraceSessionState; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.impl.BufferType; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.ITraceControlComponent; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.BaseEventComponent; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.KernelProviderComponent; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TargetNodeComponent; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceChannelComponent; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceDomainComponent; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceEventComponent; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceProbeEventComponent; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceSessionComponent; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.UstProviderComponent; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.property.BaseEventPropertySource; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.property.KernelProviderPropertySource; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.property.TargetNodePropertySource; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.property.TraceChannelPropertySource; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.property.TraceDomainPropertySource; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.property.TraceEventPropertySource; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.property.TraceProbeEventPropertySource; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.property.TraceSessionPropertySource; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.property.UstProviderPropertySource; import org.eclipse.rse.core.RSECorePlugin; import org.eclipse.rse.core.model.IHost; import org.eclipse.rse.core.model.ISystemProfile; diff --git a/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/TraceControlSnapshotSessionTests.java b/org.eclipse.linuxtools.lttng2.control.ui.tests/src/org/eclipse/linuxtools/lttng2/control/ui/tests/model/component/TraceControlSnapshotSessionTests.java similarity index 90% rename from org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/TraceControlSnapshotSessionTests.java rename to org.eclipse.linuxtools.lttng2.control.ui.tests/src/org/eclipse/linuxtools/lttng2/control/ui/tests/model/component/TraceControlSnapshotSessionTests.java index 072805eadb..569de1d086 100644 --- a/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/TraceControlSnapshotSessionTests.java +++ b/org.eclipse.linuxtools.lttng2.control.ui.tests/src/org/eclipse/linuxtools/lttng2/control/ui/tests/model/component/TraceControlSnapshotSessionTests.java @@ -10,7 +10,7 @@ * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.lttng2.ui.tests.control.model.component; +package org.eclipse.linuxtools.lttng2.control.ui.tests.model.component; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -23,17 +23,17 @@ import java.util.Map; import org.eclipse.core.runtime.FileLocator; import org.eclipse.core.runtime.Path; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.TargetNodeState; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceSessionState; -import org.eclipse.linuxtools.internal.lttng2.stubs.dialogs.CreateSessionDialogStub; -import org.eclipse.linuxtools.internal.lttng2.stubs.dialogs.DestroyConfirmDialogStub; -import org.eclipse.linuxtools.internal.lttng2.stubs.dialogs.GetEventInfoDialogStub; -import org.eclipse.linuxtools.internal.lttng2.stubs.service.TestRemoteSystemProxy; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.TraceControlDialogFactory; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TargetNodeComponent; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceSessionComponent; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.property.TraceSessionPropertySource; +import org.eclipse.linuxtools.internal.lttng2.control.stubs.dialogs.CreateSessionDialogStub; +import org.eclipse.linuxtools.internal.lttng2.control.stubs.dialogs.DestroyConfirmDialogStub; +import org.eclipse.linuxtools.internal.lttng2.control.stubs.dialogs.GetEventInfoDialogStub; +import org.eclipse.linuxtools.internal.lttng2.control.stubs.service.TestRemoteSystemProxy; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.TargetNodeState; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.TraceSessionState; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.dialogs.TraceControlDialogFactory; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.ITraceControlComponent; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TargetNodeComponent; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceSessionComponent; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.property.TraceSessionPropertySource; import org.eclipse.rse.core.RSECorePlugin; import org.eclipse.rse.core.model.IHost; import org.eclipse.rse.core.model.ISystemProfile; diff --git a/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/TraceControlTestFacility.java b/org.eclipse.linuxtools.lttng2.control.ui.tests/src/org/eclipse/linuxtools/lttng2/control/ui/tests/model/component/TraceControlTestFacility.java similarity index 97% rename from org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/TraceControlTestFacility.java rename to org.eclipse.linuxtools.lttng2.control.ui.tests/src/org/eclipse/linuxtools/lttng2/control/ui/tests/model/component/TraceControlTestFacility.java index b96185a6c1..c2d8cca604 100644 --- a/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/TraceControlTestFacility.java +++ b/org.eclipse.linuxtools.lttng2.control.ui.tests/src/org/eclipse/linuxtools/lttng2/control/ui/tests/model/component/TraceControlTestFacility.java @@ -10,16 +10,16 @@ * Bernd Hufmann - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.lttng2.ui.tests.control.model.component; +package org.eclipse.linuxtools.lttng2.control.ui.tests.model.component; import org.eclipse.core.commands.ExecutionException; import org.eclipse.core.commands.NotEnabledException; import org.eclipse.core.commands.NotHandledException; import org.eclipse.core.commands.common.NotDefinedException; import org.eclipse.core.runtime.jobs.Job; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.ControlView; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceSessionComponent; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.ControlView; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.ITraceControlComponent; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceSessionComponent; import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Display; import org.eclipse.ui.IViewPart; diff --git a/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/TraceControlTreeModelNoProvidersTest.java b/org.eclipse.linuxtools.lttng2.control.ui.tests/src/org/eclipse/linuxtools/lttng2/control/ui/tests/model/component/TraceControlTreeModelNoProvidersTest.java similarity index 90% rename from org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/TraceControlTreeModelNoProvidersTest.java rename to org.eclipse.linuxtools.lttng2.control.ui.tests/src/org/eclipse/linuxtools/lttng2/control/ui/tests/model/component/TraceControlTreeModelNoProvidersTest.java index cb0ff069fa..76397a0950 100644 --- a/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/TraceControlTreeModelNoProvidersTest.java +++ b/org.eclipse.linuxtools.lttng2.control.ui.tests/src/org/eclipse/linuxtools/lttng2/control/ui/tests/model/component/TraceControlTreeModelNoProvidersTest.java @@ -11,7 +11,7 @@ * Alexandre Montplaisir - Port to JUnit4 **********************************************************************/ -package org.eclipse.linuxtools.lttng2.ui.tests.control.model.component; +package org.eclipse.linuxtools.lttng2.control.ui.tests.model.component; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -24,15 +24,15 @@ import java.net.URL; import org.eclipse.core.runtime.FileLocator; import org.eclipse.core.runtime.Path; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.TargetNodeState; -import org.eclipse.linuxtools.internal.lttng2.stubs.service.TestRemoteSystemProxy; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TargetNodeComponent; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceProviderGroup; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceSessionGroup; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.UstProviderComponent; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.service.ILttngControlService; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.service.LTTngControlService; +import org.eclipse.linuxtools.internal.lttng2.control.stubs.service.TestRemoteSystemProxy; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.TargetNodeState; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.ITraceControlComponent; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TargetNodeComponent; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceProviderGroup; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceSessionGroup; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.UstProviderComponent; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.service.ILttngControlService; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.service.LTTngControlService; import org.eclipse.rse.core.RSECorePlugin; import org.eclipse.rse.core.model.IHost; import org.eclipse.rse.core.model.ISystemProfile; diff --git a/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/TraceControlTreeModelTest.java b/org.eclipse.linuxtools.lttng2.control.ui.tests/src/org/eclipse/linuxtools/lttng2/control/ui/tests/model/component/TraceControlTreeModelTest.java similarity index 95% rename from org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/TraceControlTreeModelTest.java rename to org.eclipse.linuxtools.lttng2.control.ui.tests/src/org/eclipse/linuxtools/lttng2/control/ui/tests/model/component/TraceControlTreeModelTest.java index d503bde447..22086fb0d7 100644 --- a/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/TraceControlTreeModelTest.java +++ b/org.eclipse.linuxtools.lttng2.control.ui.tests/src/org/eclipse/linuxtools/lttng2/control/ui/tests/model/component/TraceControlTreeModelTest.java @@ -11,7 +11,7 @@ * Alexandre Montplaisir - Port to JUnit4 **********************************************************************/ -package org.eclipse.linuxtools.lttng2.ui.tests.control.model.component; +package org.eclipse.linuxtools.lttng2.control.ui.tests.model.component; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -25,26 +25,26 @@ import java.net.URL; import org.eclipse.core.runtime.FileLocator; import org.eclipse.core.runtime.Path; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.TargetNodeState; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceEnablement; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceEventType; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceLogLevel; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceSessionState; -import org.eclipse.linuxtools.internal.lttng2.stubs.service.TestRemoteSystemProxy; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.BaseEventComponent; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.KernelProviderComponent; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TargetNodeComponent; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceChannelComponent; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceDomainComponent; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceEventComponent; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceProbeEventComponent; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceProviderGroup; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceSessionComponent; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceSessionGroup; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.UstProviderComponent; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.service.ILttngControlService; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.service.LTTngControlService; +import org.eclipse.linuxtools.internal.lttng2.control.stubs.service.TestRemoteSystemProxy; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.TargetNodeState; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.TraceEnablement; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.TraceEventType; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.TraceLogLevel; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.TraceSessionState; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.ITraceControlComponent; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.BaseEventComponent; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.KernelProviderComponent; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TargetNodeComponent; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceChannelComponent; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceDomainComponent; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceEventComponent; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceProbeEventComponent; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceProviderGroup; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceSessionComponent; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceSessionGroup; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.UstProviderComponent; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.service.ILttngControlService; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.service.LTTngControlService; import org.eclipse.rse.core.RSECorePlugin; import org.eclipse.rse.core.model.IHost; import org.eclipse.rse.core.model.ISystemProfile; diff --git a/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/TraceControlUstProviderTests.java b/org.eclipse.linuxtools.lttng2.control.ui.tests/src/org/eclipse/linuxtools/lttng2/control/ui/tests/model/component/TraceControlUstProviderTests.java similarity index 89% rename from org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/TraceControlUstProviderTests.java rename to org.eclipse.linuxtools.lttng2.control.ui.tests/src/org/eclipse/linuxtools/lttng2/control/ui/tests/model/component/TraceControlUstProviderTests.java index 7d7dafe954..58b91d3114 100644 --- a/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/TraceControlUstProviderTests.java +++ b/org.eclipse.linuxtools.lttng2.control.ui.tests/src/org/eclipse/linuxtools/lttng2/control/ui/tests/model/component/TraceControlUstProviderTests.java @@ -11,7 +11,7 @@ * Alexandre Montplaisir - Port to JUnit4 **********************************************************************/ -package org.eclipse.linuxtools.lttng2.ui.tests.control.model.component; +package org.eclipse.linuxtools.lttng2.control.ui.tests.model.component; import static org.junit.Assert.*; @@ -20,25 +20,25 @@ import java.net.URL; import org.eclipse.core.runtime.FileLocator; import org.eclipse.core.runtime.Path; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.TargetNodeState; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceEnablement; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceEventType; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceLogLevel; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceSessionState; -import org.eclipse.linuxtools.internal.lttng2.stubs.dialogs.CreateSessionDialogStub; -import org.eclipse.linuxtools.internal.lttng2.stubs.dialogs.DestroyConfirmDialogStub; -import org.eclipse.linuxtools.internal.lttng2.stubs.dialogs.EnableChannelDialogStub; -import org.eclipse.linuxtools.internal.lttng2.stubs.dialogs.GetEventInfoDialogStub; -import org.eclipse.linuxtools.internal.lttng2.stubs.service.TestRemoteSystemProxy; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.TraceControlDialogFactory; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.BaseEventComponent; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.KernelProviderComponent; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TargetNodeComponent; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceChannelComponent; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceEventComponent; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceSessionComponent; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.UstProviderComponent; +import org.eclipse.linuxtools.internal.lttng2.control.stubs.dialogs.CreateSessionDialogStub; +import org.eclipse.linuxtools.internal.lttng2.control.stubs.dialogs.DestroyConfirmDialogStub; +import org.eclipse.linuxtools.internal.lttng2.control.stubs.dialogs.EnableChannelDialogStub; +import org.eclipse.linuxtools.internal.lttng2.control.stubs.dialogs.GetEventInfoDialogStub; +import org.eclipse.linuxtools.internal.lttng2.control.stubs.service.TestRemoteSystemProxy; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.TargetNodeState; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.TraceEnablement; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.TraceEventType; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.TraceLogLevel; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.TraceSessionState; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.dialogs.TraceControlDialogFactory; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.ITraceControlComponent; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.BaseEventComponent; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.KernelProviderComponent; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TargetNodeComponent; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceChannelComponent; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceEventComponent; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceSessionComponent; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.UstProviderComponent; import org.eclipse.rse.core.RSECorePlugin; import org.eclipse.rse.core.model.IHost; import org.eclipse.rse.core.model.ISystemProfile; diff --git a/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/TraceControlUstSessionTests.java b/org.eclipse.linuxtools.lttng2.control.ui.tests/src/org/eclipse/linuxtools/lttng2/control/ui/tests/model/component/TraceControlUstSessionTests.java similarity index 93% rename from org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/TraceControlUstSessionTests.java rename to org.eclipse.linuxtools.lttng2.control.ui.tests/src/org/eclipse/linuxtools/lttng2/control/ui/tests/model/component/TraceControlUstSessionTests.java index ee052c6e61..6081a2b60f 100644 --- a/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/TraceControlUstSessionTests.java +++ b/org.eclipse.linuxtools.lttng2.control.ui.tests/src/org/eclipse/linuxtools/lttng2/control/ui/tests/model/component/TraceControlUstSessionTests.java @@ -11,7 +11,7 @@ * Alexandre Montplaisir - Port to JUnit4 **********************************************************************/ -package org.eclipse.linuxtools.lttng2.ui.tests.control.model.component; +package org.eclipse.linuxtools.lttng2.control.ui.tests.model.component; import static org.junit.Assert.*; @@ -22,27 +22,27 @@ import java.util.List; import org.eclipse.core.runtime.FileLocator; import org.eclipse.core.runtime.Path; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.LogLevelType; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.TargetNodeState; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceEnablement; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceEventType; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceLogLevel; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceSessionState; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.impl.BufferType; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.impl.ChannelInfo; -import org.eclipse.linuxtools.internal.lttng2.stubs.dialogs.CreateSessionDialogStub; -import org.eclipse.linuxtools.internal.lttng2.stubs.dialogs.DestroyConfirmDialogStub; -import org.eclipse.linuxtools.internal.lttng2.stubs.dialogs.EnableChannelDialogStub; -import org.eclipse.linuxtools.internal.lttng2.stubs.dialogs.EnableEventsDialogStub; -import org.eclipse.linuxtools.internal.lttng2.stubs.dialogs.GetEventInfoDialogStub; -import org.eclipse.linuxtools.internal.lttng2.stubs.service.TestRemoteSystemProxy; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.TraceControlDialogFactory; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TargetNodeComponent; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceChannelComponent; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceDomainComponent; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceEventComponent; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceSessionComponent; +import org.eclipse.linuxtools.internal.lttng2.control.stubs.dialogs.CreateSessionDialogStub; +import org.eclipse.linuxtools.internal.lttng2.control.stubs.dialogs.DestroyConfirmDialogStub; +import org.eclipse.linuxtools.internal.lttng2.control.stubs.dialogs.EnableChannelDialogStub; +import org.eclipse.linuxtools.internal.lttng2.control.stubs.dialogs.EnableEventsDialogStub; +import org.eclipse.linuxtools.internal.lttng2.control.stubs.dialogs.GetEventInfoDialogStub; +import org.eclipse.linuxtools.internal.lttng2.control.stubs.service.TestRemoteSystemProxy; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.LogLevelType; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.TargetNodeState; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.TraceEnablement; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.TraceEventType; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.TraceLogLevel; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.TraceSessionState; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.impl.BufferType; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.impl.ChannelInfo; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.dialogs.TraceControlDialogFactory; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.ITraceControlComponent; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TargetNodeComponent; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceChannelComponent; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceDomainComponent; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceEventComponent; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceSessionComponent; import org.eclipse.rse.core.RSECorePlugin; import org.eclipse.rse.core.model.IHost; import org.eclipse.rse.core.model.ISystemProfile; diff --git a/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/TraceControlUstSessionTests2.java b/org.eclipse.linuxtools.lttng2.control.ui.tests/src/org/eclipse/linuxtools/lttng2/control/ui/tests/model/component/TraceControlUstSessionTests2.java similarity index 91% rename from org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/TraceControlUstSessionTests2.java rename to org.eclipse.linuxtools.lttng2.control.ui.tests/src/org/eclipse/linuxtools/lttng2/control/ui/tests/model/component/TraceControlUstSessionTests2.java index f6f3d95ec4..6f13022303 100644 --- a/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/TraceControlUstSessionTests2.java +++ b/org.eclipse.linuxtools.lttng2.control.ui.tests/src/org/eclipse/linuxtools/lttng2/control/ui/tests/model/component/TraceControlUstSessionTests2.java @@ -10,7 +10,7 @@ * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.lttng2.ui.tests.control.model.component; +package org.eclipse.linuxtools.lttng2.control.ui.tests.model.component; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -21,20 +21,20 @@ import java.net.URL; import org.eclipse.core.runtime.FileLocator; import org.eclipse.core.runtime.Path; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.TargetNodeState; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.impl.BufferType; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.impl.ChannelInfo; -import org.eclipse.linuxtools.internal.lttng2.stubs.dialogs.CreateSessionDialogStub; -import org.eclipse.linuxtools.internal.lttng2.stubs.dialogs.DestroyConfirmDialogStub; -import org.eclipse.linuxtools.internal.lttng2.stubs.dialogs.EnableChannelDialogStub; -import org.eclipse.linuxtools.internal.lttng2.stubs.dialogs.GetEventInfoDialogStub; -import org.eclipse.linuxtools.internal.lttng2.stubs.service.TestRemoteSystemProxy; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.TraceControlDialogFactory; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TargetNodeComponent; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceChannelComponent; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceDomainComponent; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceSessionComponent; +import org.eclipse.linuxtools.internal.lttng2.control.stubs.dialogs.CreateSessionDialogStub; +import org.eclipse.linuxtools.internal.lttng2.control.stubs.dialogs.DestroyConfirmDialogStub; +import org.eclipse.linuxtools.internal.lttng2.control.stubs.dialogs.EnableChannelDialogStub; +import org.eclipse.linuxtools.internal.lttng2.control.stubs.dialogs.GetEventInfoDialogStub; +import org.eclipse.linuxtools.internal.lttng2.control.stubs.service.TestRemoteSystemProxy; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.TargetNodeState; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.impl.BufferType; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.impl.ChannelInfo; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.dialogs.TraceControlDialogFactory; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.ITraceControlComponent; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TargetNodeComponent; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceChannelComponent; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceDomainComponent; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceSessionComponent; import org.eclipse.rse.core.RSECorePlugin; import org.eclipse.rse.core.model.IHost; import org.eclipse.rse.core.model.ISystemProfile; diff --git a/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/service/AllTests.java b/org.eclipse.linuxtools.lttng2.control.ui.tests/src/org/eclipse/linuxtools/lttng2/control/ui/tests/service/AllTests.java similarity index 87% rename from org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/service/AllTests.java rename to org.eclipse.linuxtools.lttng2.control.ui.tests/src/org/eclipse/linuxtools/lttng2/control/ui/tests/service/AllTests.java index 57d397c871..a4bc83334b 100644 --- a/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/service/AllTests.java +++ b/org.eclipse.linuxtools.lttng2.control.ui.tests/src/org/eclipse/linuxtools/lttng2/control/ui/tests/service/AllTests.java @@ -11,13 +11,13 @@ * Alexandre Montplaisir - Port to JUnit4 *******************************************************************************/ -package org.eclipse.linuxtools.lttng2.ui.tests.control.service; +package org.eclipse.linuxtools.lttng2.control.ui.tests.service; import org.junit.runner.RunWith; import org.junit.runners.Suite; /** - * Runner for the control.service unit tests. + * Runner for the service unit tests. */ @RunWith(Suite.class) @Suite.SuiteClasses({ diff --git a/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/service/LTTngControlServiceTest.java b/org.eclipse.linuxtools.lttng2.control.ui.tests/src/org/eclipse/linuxtools/lttng2/control/ui/tests/service/LTTngControlServiceTest.java similarity index 97% rename from org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/service/LTTngControlServiceTest.java rename to org.eclipse.linuxtools.lttng2.control.ui.tests/src/org/eclipse/linuxtools/lttng2/control/ui/tests/service/LTTngControlServiceTest.java index aebad3bc56..4df5f9c561 100644 --- a/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/service/LTTngControlServiceTest.java +++ b/org.eclipse.linuxtools.lttng2.control.ui.tests/src/org/eclipse/linuxtools/lttng2/control/ui/tests/service/LTTngControlServiceTest.java @@ -11,7 +11,7 @@ * Alexandre Montplaisir - Port to JUnit4 **********************************************************************/ -package org.eclipse.linuxtools.lttng2.ui.tests.control.service; +package org.eclipse.linuxtools.lttng2.control.ui.tests.service; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -29,30 +29,30 @@ import org.eclipse.core.commands.ExecutionException; import org.eclipse.core.runtime.FileLocator; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.Path; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.IBaseEventInfo; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.IChannelInfo; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.IDomainInfo; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.IEventInfo; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.IFieldInfo; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.ISessionInfo; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.ISnapshotInfo; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.IUstProviderInfo; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.LogLevelType; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceEnablement; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceEventType; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceLogLevel; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceSessionState; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.impl.BufferType; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.impl.ChannelInfo; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.impl.SessionInfo; -import org.eclipse.linuxtools.internal.lttng2.stubs.service.CommandShellFactory; -import org.eclipse.linuxtools.internal.lttng2.stubs.shells.LTTngToolsFileShell; -import org.eclipse.linuxtools.internal.lttng2.ui.Activator; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.logging.ControlCommandLogger; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.preferences.ControlPreferences; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.service.ILttngControlService; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.service.LTTngControlService; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.service.LTTngControlServiceFactory; +import org.eclipse.linuxtools.internal.lttng2.control.stubs.service.CommandShellFactory; +import org.eclipse.linuxtools.internal.lttng2.control.stubs.shells.LTTngToolsFileShell; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.IBaseEventInfo; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.IChannelInfo; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.IDomainInfo; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.IEventInfo; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.IFieldInfo; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.ISessionInfo; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.ISnapshotInfo; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.IUstProviderInfo; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.LogLevelType; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.TraceEnablement; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.TraceEventType; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.TraceLogLevel; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.TraceSessionState; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.impl.BufferType; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.impl.ChannelInfo; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.impl.SessionInfo; +import org.eclipse.linuxtools.internal.lttng2.control.ui.Activator; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.logging.ControlCommandLogger; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.preferences.ControlPreferences; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.service.ILttngControlService; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.service.LTTngControlService; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.service.LTTngControlServiceFactory; import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/org.eclipse.linuxtools.lttng2.ui.tests/stubs/org/eclipse/linuxtools/internal/lttng2/stubs/dialogs/AddContextDialogStub.java b/org.eclipse.linuxtools.lttng2.control.ui.tests/stubs/org/eclipse/linuxtools/internal/lttng2/control/stubs/dialogs/AddContextDialogStub.java similarity index 93% rename from org.eclipse.linuxtools.lttng2.ui.tests/stubs/org/eclipse/linuxtools/internal/lttng2/stubs/dialogs/AddContextDialogStub.java rename to org.eclipse.linuxtools.lttng2.control.ui.tests/stubs/org/eclipse/linuxtools/internal/lttng2/control/stubs/dialogs/AddContextDialogStub.java index e31b2533c2..189964bc10 100644 --- a/org.eclipse.linuxtools.lttng2.ui.tests/stubs/org/eclipse/linuxtools/internal/lttng2/stubs/dialogs/AddContextDialogStub.java +++ b/org.eclipse.linuxtools.lttng2.control.ui.tests/stubs/org/eclipse/linuxtools/internal/lttng2/control/stubs/dialogs/AddContextDialogStub.java @@ -9,7 +9,7 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.stubs.dialogs; +package org.eclipse.linuxtools.internal.lttng2.control.stubs.dialogs; import java.util.ArrayList; import java.util.HashSet; @@ -17,7 +17,7 @@ import java.util.Iterator; import java.util.List; import java.util.Set; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.IAddContextDialog; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.dialogs.IAddContextDialog; /** * Add Context dialog stub. diff --git a/org.eclipse.linuxtools.lttng2.ui.tests/stubs/org/eclipse/linuxtools/internal/lttng2/stubs/dialogs/CreateSessionDialogStub.java b/org.eclipse.linuxtools.lttng2.control.ui.tests/stubs/org/eclipse/linuxtools/internal/lttng2/control/stubs/dialogs/CreateSessionDialogStub.java similarity index 87% rename from org.eclipse.linuxtools.lttng2.ui.tests/stubs/org/eclipse/linuxtools/internal/lttng2/stubs/dialogs/CreateSessionDialogStub.java rename to org.eclipse.linuxtools.lttng2.control.ui.tests/stubs/org/eclipse/linuxtools/internal/lttng2/control/stubs/dialogs/CreateSessionDialogStub.java index 15950c870d..44cca482f8 100644 --- a/org.eclipse.linuxtools.lttng2.ui.tests/stubs/org/eclipse/linuxtools/internal/lttng2/stubs/dialogs/CreateSessionDialogStub.java +++ b/org.eclipse.linuxtools.lttng2.control.ui.tests/stubs/org/eclipse/linuxtools/internal/lttng2/control/stubs/dialogs/CreateSessionDialogStub.java @@ -10,12 +10,12 @@ * Bernd Hufmann - Initial API and implementation * Bernd Hufmann - Updated for support of LTTng Tools 2.1 **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.stubs.dialogs; +package org.eclipse.linuxtools.internal.lttng2.control.stubs.dialogs; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.ISessionInfo; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.impl.SessionInfo; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.ICreateSessionDialog; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceSessionGroup; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.ISessionInfo; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.impl.SessionInfo; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.dialogs.ICreateSessionDialog; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceSessionGroup; /** * Create session dialog stub implementation. diff --git a/org.eclipse.linuxtools.lttng2.ui.tests/stubs/org/eclipse/linuxtools/internal/lttng2/stubs/dialogs/DestroyConfirmDialogStub.java b/org.eclipse.linuxtools.lttng2.control.ui.tests/stubs/org/eclipse/linuxtools/internal/lttng2/control/stubs/dialogs/DestroyConfirmDialogStub.java similarity index 78% rename from org.eclipse.linuxtools.lttng2.ui.tests/stubs/org/eclipse/linuxtools/internal/lttng2/stubs/dialogs/DestroyConfirmDialogStub.java rename to org.eclipse.linuxtools.lttng2.control.ui.tests/stubs/org/eclipse/linuxtools/internal/lttng2/control/stubs/dialogs/DestroyConfirmDialogStub.java index d754109688..88479e2354 100644 --- a/org.eclipse.linuxtools.lttng2.ui.tests/stubs/org/eclipse/linuxtools/internal/lttng2/stubs/dialogs/DestroyConfirmDialogStub.java +++ b/org.eclipse.linuxtools.lttng2.control.ui.tests/stubs/org/eclipse/linuxtools/internal/lttng2/control/stubs/dialogs/DestroyConfirmDialogStub.java @@ -1,21 +1,21 @@ /********************************************************************** * Copyright (c) 2012 Ericsson - * + * * All rights reserved. This program and the accompanying materials are * made available under the terms of the Eclipse Public License v1.0 which * accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: + * + * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.stubs.dialogs; +package org.eclipse.linuxtools.internal.lttng2.control.stubs.dialogs; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.IConfirmDialog; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.dialogs.IConfirmDialog; import org.eclipse.swt.widgets.Shell; /** - * A confirmation dialog stub implementation. + * A confirmation dialog stub implementation. */ public class DestroyConfirmDialogStub implements IConfirmDialog { diff --git a/org.eclipse.linuxtools.lttng2.ui.tests/stubs/org/eclipse/linuxtools/internal/lttng2/stubs/dialogs/EnableChannelDialogStub.java b/org.eclipse.linuxtools.lttng2.control.ui.tests/stubs/org/eclipse/linuxtools/internal/lttng2/control/stubs/dialogs/EnableChannelDialogStub.java similarity index 85% rename from org.eclipse.linuxtools.lttng2.ui.tests/stubs/org/eclipse/linuxtools/internal/lttng2/stubs/dialogs/EnableChannelDialogStub.java rename to org.eclipse.linuxtools.lttng2.control.ui.tests/stubs/org/eclipse/linuxtools/internal/lttng2/control/stubs/dialogs/EnableChannelDialogStub.java index 1418001dc8..eb96367227 100644 --- a/org.eclipse.linuxtools.lttng2.ui.tests/stubs/org/eclipse/linuxtools/internal/lttng2/stubs/dialogs/EnableChannelDialogStub.java +++ b/org.eclipse.linuxtools.lttng2.control.ui.tests/stubs/org/eclipse/linuxtools/internal/lttng2/control/stubs/dialogs/EnableChannelDialogStub.java @@ -9,14 +9,14 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.stubs.dialogs; +package org.eclipse.linuxtools.internal.lttng2.control.stubs.dialogs; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.IChannelInfo; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.impl.BufferType; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.impl.ChannelInfo; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.IEnableChannelDialog; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TargetNodeComponent; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceDomainComponent; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.IChannelInfo; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.impl.BufferType; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.impl.ChannelInfo; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.dialogs.IEnableChannelDialog; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TargetNodeComponent; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceDomainComponent; /** * Create channel dialog stub implementation. diff --git a/org.eclipse.linuxtools.lttng2.ui.tests/stubs/org/eclipse/linuxtools/internal/lttng2/stubs/dialogs/EnableEventsDialogStub.java b/org.eclipse.linuxtools.lttng2.control.ui.tests/stubs/org/eclipse/linuxtools/internal/lttng2/control/stubs/dialogs/EnableEventsDialogStub.java similarity index 93% rename from org.eclipse.linuxtools.lttng2.ui.tests/stubs/org/eclipse/linuxtools/internal/lttng2/stubs/dialogs/EnableEventsDialogStub.java rename to org.eclipse.linuxtools.lttng2.control.ui.tests/stubs/org/eclipse/linuxtools/internal/lttng2/control/stubs/dialogs/EnableEventsDialogStub.java index 54e4e6200f..b8be180e9e 100644 --- a/org.eclipse.linuxtools.lttng2.ui.tests/stubs/org/eclipse/linuxtools/internal/lttng2/stubs/dialogs/EnableEventsDialogStub.java +++ b/org.eclipse.linuxtools.lttng2.control.ui.tests/stubs/org/eclipse/linuxtools/internal/lttng2/control/stubs/dialogs/EnableEventsDialogStub.java @@ -9,16 +9,16 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.stubs.dialogs; +package org.eclipse.linuxtools.internal.lttng2.control.stubs.dialogs; import java.util.ArrayList; import java.util.List; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.LogLevelType; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceLogLevel; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.IEnableEventsDialog; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceDomainComponent; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceProviderGroup; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.LogLevelType; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.TraceLogLevel; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.dialogs.IEnableEventsDialog; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceDomainComponent; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceProviderGroup; /** * Enable events dialog stub implementation. diff --git a/org.eclipse.linuxtools.lttng2.ui.tests/stubs/org/eclipse/linuxtools/internal/lttng2/stubs/dialogs/GetEventInfoDialogStub.java b/org.eclipse.linuxtools.lttng2.control.ui.tests/stubs/org/eclipse/linuxtools/internal/lttng2/control/stubs/dialogs/GetEventInfoDialogStub.java similarity index 86% rename from org.eclipse.linuxtools.lttng2.ui.tests/stubs/org/eclipse/linuxtools/internal/lttng2/stubs/dialogs/GetEventInfoDialogStub.java rename to org.eclipse.linuxtools.lttng2.control.ui.tests/stubs/org/eclipse/linuxtools/internal/lttng2/control/stubs/dialogs/GetEventInfoDialogStub.java index ae4cec1d5e..51940fb4f8 100644 --- a/org.eclipse.linuxtools.lttng2.ui.tests/stubs/org/eclipse/linuxtools/internal/lttng2/stubs/dialogs/GetEventInfoDialogStub.java +++ b/org.eclipse.linuxtools.lttng2.control.ui.tests/stubs/org/eclipse/linuxtools/internal/lttng2/control/stubs/dialogs/GetEventInfoDialogStub.java @@ -9,13 +9,13 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.stubs.dialogs; +package org.eclipse.linuxtools.internal.lttng2.control.stubs.dialogs; import java.util.Arrays; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.IGetEventInfoDialog; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceChannelComponent; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceSessionComponent; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.dialogs.IGetEventInfoDialog; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceChannelComponent; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceSessionComponent; /** * Get event information dialog stub implementation. diff --git a/org.eclipse.linuxtools.lttng2.ui.tests/stubs/org/eclipse/linuxtools/internal/lttng2/stubs/service/CommandShellFactory.java b/org.eclipse.linuxtools.lttng2.control.ui.tests/stubs/org/eclipse/linuxtools/internal/lttng2/control/stubs/service/CommandShellFactory.java similarity index 89% rename from org.eclipse.linuxtools.lttng2.ui.tests/stubs/org/eclipse/linuxtools/internal/lttng2/stubs/service/CommandShellFactory.java rename to org.eclipse.linuxtools.lttng2.control.ui.tests/stubs/org/eclipse/linuxtools/internal/lttng2/control/stubs/service/CommandShellFactory.java index 3fe895f7d5..f7dc1bdb7f 100644 --- a/org.eclipse.linuxtools.lttng2.ui.tests/stubs/org/eclipse/linuxtools/internal/lttng2/stubs/service/CommandShellFactory.java +++ b/org.eclipse.linuxtools.lttng2.control.ui.tests/stubs/org/eclipse/linuxtools/internal/lttng2/control/stubs/service/CommandShellFactory.java @@ -9,9 +9,9 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.stubs.service; +package org.eclipse.linuxtools.internal.lttng2.control.stubs.service; -import org.eclipse.linuxtools.internal.lttng2.stubs.shells.LTTngToolsFileShell; +import org.eclipse.linuxtools.internal.lttng2.control.stubs.shells.LTTngToolsFileShell; @SuppressWarnings("javadoc") public class CommandShellFactory { diff --git a/org.eclipse.linuxtools.lttng2.ui.tests/stubs/org/eclipse/linuxtools/internal/lttng2/stubs/service/TestRemoteSystemProxy.java b/org.eclipse.linuxtools.lttng2.control.ui.tests/stubs/org/eclipse/linuxtools/internal/lttng2/control/stubs/service/TestRemoteSystemProxy.java similarity index 91% rename from org.eclipse.linuxtools.lttng2.ui.tests/stubs/org/eclipse/linuxtools/internal/lttng2/stubs/service/TestRemoteSystemProxy.java rename to org.eclipse.linuxtools.lttng2.control.ui.tests/stubs/org/eclipse/linuxtools/internal/lttng2/control/stubs/service/TestRemoteSystemProxy.java index d802cec791..e4125a985c 100644 --- a/org.eclipse.linuxtools.lttng2.ui.tests/stubs/org/eclipse/linuxtools/internal/lttng2/stubs/service/TestRemoteSystemProxy.java +++ b/org.eclipse.linuxtools.lttng2.control.ui.tests/stubs/org/eclipse/linuxtools/internal/lttng2/control/stubs/service/TestRemoteSystemProxy.java @@ -9,13 +9,13 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.stubs.service; +package org.eclipse.linuxtools.internal.lttng2.control.stubs.service; import org.eclipse.core.commands.ExecutionException; import org.eclipse.core.runtime.Status; -import org.eclipse.linuxtools.internal.lttng2.stubs.shells.LTTngToolsFileShell; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.remote.ICommandShell; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.remote.IRemoteSystemProxy; +import org.eclipse.linuxtools.internal.lttng2.control.stubs.shells.LTTngToolsFileShell; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.remote.ICommandShell; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.remote.IRemoteSystemProxy; import org.eclipse.rse.core.model.IRSECallback; import org.eclipse.rse.core.subsystems.ICommunicationsListener; import org.eclipse.rse.core.subsystems.ISubSystem; diff --git a/org.eclipse.linuxtools.lttng2.ui.tests/stubs/org/eclipse/linuxtools/internal/lttng2/stubs/shells/LTTngToolsFileShell.java b/org.eclipse.linuxtools.lttng2.control.ui.tests/stubs/org/eclipse/linuxtools/internal/lttng2/control/stubs/shells/LTTngToolsFileShell.java similarity index 98% rename from org.eclipse.linuxtools.lttng2.ui.tests/stubs/org/eclipse/linuxtools/internal/lttng2/stubs/shells/LTTngToolsFileShell.java rename to org.eclipse.linuxtools.lttng2.control.ui.tests/stubs/org/eclipse/linuxtools/internal/lttng2/control/stubs/shells/LTTngToolsFileShell.java index 0f7227b569..babebe29da 100644 --- a/org.eclipse.linuxtools.lttng2.ui.tests/stubs/org/eclipse/linuxtools/internal/lttng2/stubs/shells/LTTngToolsFileShell.java +++ b/org.eclipse.linuxtools.lttng2.control.ui.tests/stubs/org/eclipse/linuxtools/internal/lttng2/control/stubs/shells/LTTngToolsFileShell.java @@ -9,7 +9,7 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.stubs.shells; +package org.eclipse.linuxtools.internal.lttng2.control.stubs.shells; import java.io.BufferedReader; import java.io.DataInputStream; @@ -26,8 +26,8 @@ import java.util.regex.Pattern; import org.eclipse.core.commands.ExecutionException; import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.remote.CommandResult; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.remote.ICommandResult; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.remote.CommandResult; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.remote.ICommandResult; @SuppressWarnings("javadoc") public class LTTngToolsFileShell extends TestCommandShell { diff --git a/org.eclipse.linuxtools.lttng2.ui.tests/stubs/org/eclipse/linuxtools/internal/lttng2/stubs/shells/TestCommandShell.java b/org.eclipse.linuxtools.lttng2.control.ui.tests/stubs/org/eclipse/linuxtools/internal/lttng2/control/stubs/shells/TestCommandShell.java similarity index 84% rename from org.eclipse.linuxtools.lttng2.ui.tests/stubs/org/eclipse/linuxtools/internal/lttng2/stubs/shells/TestCommandShell.java rename to org.eclipse.linuxtools.lttng2.control.ui.tests/stubs/org/eclipse/linuxtools/internal/lttng2/control/stubs/shells/TestCommandShell.java index 82537cc8cd..86b39e2dad 100644 --- a/org.eclipse.linuxtools.lttng2.ui.tests/stubs/org/eclipse/linuxtools/internal/lttng2/stubs/shells/TestCommandShell.java +++ b/org.eclipse.linuxtools.lttng2.control.ui.tests/stubs/org/eclipse/linuxtools/internal/lttng2/control/stubs/shells/TestCommandShell.java @@ -9,13 +9,13 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.stubs.shells; +package org.eclipse.linuxtools.internal.lttng2.control.stubs.shells; import org.eclipse.core.commands.ExecutionException; import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.remote.CommandResult; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.remote.ICommandResult; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.remote.ICommandShell; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.remote.CommandResult; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.remote.ICommandResult; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.remote.ICommandShell; /** * Command shell stub diff --git a/org.eclipse.linuxtools.lttng2.ui.tests/testfiles/CreateSessionTest.cfg b/org.eclipse.linuxtools.lttng2.control.ui.tests/testfiles/CreateSessionTest.cfg similarity index 100% rename from org.eclipse.linuxtools.lttng2.ui.tests/testfiles/CreateSessionTest.cfg rename to org.eclipse.linuxtools.lttng2.control.ui.tests/testfiles/CreateSessionTest.cfg diff --git a/org.eclipse.linuxtools.lttng2.ui.tests/testfiles/CreateSessionTest2.cfg b/org.eclipse.linuxtools.lttng2.control.ui.tests/testfiles/CreateSessionTest2.cfg similarity index 100% rename from org.eclipse.linuxtools.lttng2.ui.tests/testfiles/CreateSessionTest2.cfg rename to org.eclipse.linuxtools.lttng2.control.ui.tests/testfiles/CreateSessionTest2.cfg diff --git a/org.eclipse.linuxtools.lttng2.ui.tests/testfiles/CreateTreeTest.cfg b/org.eclipse.linuxtools.lttng2.control.ui.tests/testfiles/CreateTreeTest.cfg similarity index 100% rename from org.eclipse.linuxtools.lttng2.ui.tests/testfiles/CreateTreeTest.cfg rename to org.eclipse.linuxtools.lttng2.control.ui.tests/testfiles/CreateTreeTest.cfg diff --git a/org.eclipse.linuxtools.lttng2.ui.tests/testfiles/CreateTreeTest2.cfg b/org.eclipse.linuxtools.lttng2.control.ui.tests/testfiles/CreateTreeTest2.cfg similarity index 100% rename from org.eclipse.linuxtools.lttng2.ui.tests/testfiles/CreateTreeTest2.cfg rename to org.eclipse.linuxtools.lttng2.control.ui.tests/testfiles/CreateTreeTest2.cfg diff --git a/org.eclipse.linuxtools.lttng2.ui.tests/testfiles/LTTngServiceTest.cfg b/org.eclipse.linuxtools.lttng2.control.ui.tests/testfiles/LTTngServiceTest.cfg similarity index 100% rename from org.eclipse.linuxtools.lttng2.ui.tests/testfiles/LTTngServiceTest.cfg rename to org.eclipse.linuxtools.lttng2.control.ui.tests/testfiles/LTTngServiceTest.cfg diff --git a/org.eclipse.linuxtools.lttng2.ui.tests/testfiles/ListInfoTest.cfg b/org.eclipse.linuxtools.lttng2.control.ui.tests/testfiles/ListInfoTest.cfg similarity index 100% rename from org.eclipse.linuxtools.lttng2.ui.tests/testfiles/ListInfoTest.cfg rename to org.eclipse.linuxtools.lttng2.control.ui.tests/testfiles/ListInfoTest.cfg diff --git a/org.eclipse.linuxtools.lttng2.ui/.classpath b/org.eclipse.linuxtools.lttng2.control.ui/.classpath similarity index 100% rename from org.eclipse.linuxtools.lttng2.ui/.classpath rename to org.eclipse.linuxtools.lttng2.control.ui/.classpath diff --git a/org.eclipse.linuxtools.lttng2.control.ui/.gitignore b/org.eclipse.linuxtools.lttng2.control.ui/.gitignore new file mode 100644 index 0000000000..fb60f67b1e --- /dev/null +++ b/org.eclipse.linuxtools.lttng2.control.ui/.gitignore @@ -0,0 +1,2 @@ +bin/ +target/ diff --git a/org.eclipse.linuxtools.lttng2.core.tests/.project b/org.eclipse.linuxtools.lttng2.control.ui/.project similarity index 93% rename from org.eclipse.linuxtools.lttng2.core.tests/.project rename to org.eclipse.linuxtools.lttng2.control.ui/.project index d0c47de085..6234036160 100644 --- a/org.eclipse.linuxtools.lttng2.core.tests/.project +++ b/org.eclipse.linuxtools.lttng2.control.ui/.project @@ -1,6 +1,6 @@ - org.eclipse.linuxtools.lttng2.core.tests + org.eclipse.linuxtools.lttng2.control.ui diff --git a/org.eclipse.linuxtools.lttng2.ui/.settings/org.eclipse.core.resources.prefs b/org.eclipse.linuxtools.lttng2.control.ui/.settings/org.eclipse.core.resources.prefs similarity index 100% rename from org.eclipse.linuxtools.lttng2.ui/.settings/org.eclipse.core.resources.prefs rename to org.eclipse.linuxtools.lttng2.control.ui/.settings/org.eclipse.core.resources.prefs diff --git a/org.eclipse.linuxtools.lttng2.ui/.settings/org.eclipse.core.runtime.prefs b/org.eclipse.linuxtools.lttng2.control.ui/.settings/org.eclipse.core.runtime.prefs similarity index 100% rename from org.eclipse.linuxtools.lttng2.ui/.settings/org.eclipse.core.runtime.prefs rename to org.eclipse.linuxtools.lttng2.control.ui/.settings/org.eclipse.core.runtime.prefs diff --git a/org.eclipse.linuxtools.lttng2.ui/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.linuxtools.lttng2.control.ui/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from org.eclipse.linuxtools.lttng2.ui/.settings/org.eclipse.jdt.core.prefs rename to org.eclipse.linuxtools.lttng2.control.ui/.settings/org.eclipse.jdt.core.prefs diff --git a/org.eclipse.linuxtools.lttng2.ui/.settings/org.eclipse.jdt.ui.prefs b/org.eclipse.linuxtools.lttng2.control.ui/.settings/org.eclipse.jdt.ui.prefs similarity index 100% rename from org.eclipse.linuxtools.lttng2.ui/.settings/org.eclipse.jdt.ui.prefs rename to org.eclipse.linuxtools.lttng2.control.ui/.settings/org.eclipse.jdt.ui.prefs diff --git a/org.eclipse.linuxtools.lttng2.ui/.settings/org.eclipse.pde.api.tools.prefs b/org.eclipse.linuxtools.lttng2.control.ui/.settings/org.eclipse.pde.api.tools.prefs similarity index 100% rename from org.eclipse.linuxtools.lttng2.ui/.settings/org.eclipse.pde.api.tools.prefs rename to org.eclipse.linuxtools.lttng2.control.ui/.settings/org.eclipse.pde.api.tools.prefs diff --git a/org.eclipse.linuxtools.lttng2.ui/.settings/org.eclipse.pde.prefs b/org.eclipse.linuxtools.lttng2.control.ui/.settings/org.eclipse.pde.prefs similarity index 100% rename from org.eclipse.linuxtools.lttng2.ui/.settings/org.eclipse.pde.prefs rename to org.eclipse.linuxtools.lttng2.control.ui/.settings/org.eclipse.pde.prefs diff --git a/org.eclipse.linuxtools.lttng2.control.ui/META-INF/MANIFEST.MF b/org.eclipse.linuxtools.lttng2.control.ui/META-INF/MANIFEST.MF new file mode 100644 index 0000000000..e6b6fd5b8f --- /dev/null +++ b/org.eclipse.linuxtools.lttng2.control.ui/META-INF/MANIFEST.MF @@ -0,0 +1,40 @@ +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: %Bundle-Name +Bundle-Vendor: %Bundle-Vendor +Bundle-Version: 3.0.0.qualifier +Bundle-Localization: plugin +Bundle-SymbolicName: org.eclipse.linuxtools.lttng2.control.ui;singleton:=true +Bundle-Activator: org.eclipse.linuxtools.internal.lttng2.control.ui.Activator +Bundle-ActivationPolicy: lazy +Bundle-RequiredExecutionEnvironment: JavaSE-1.7 +Require-Bundle: org.eclipse.ui, + org.eclipse.ui.ide, + org.eclipse.core.expressions, + org.eclipse.core.resources, + org.eclipse.core.runtime, + org.eclipse.linuxtools.lttng2.control.core;bundle-version="3.0.0", + org.eclipse.linuxtools.tmf.core;bundle-version="3.0.0", + org.eclipse.linuxtools.tmf.ui;bundle-version="3.0.0" +Export-Package: org.eclipse.linuxtools.internal.lttng2.control.ui;x-friends:="org.eclipse.linuxtools.lttng2.control.ui.tests", + org.eclipse.linuxtools.internal.lttng2.control.ui.views;x-friends:="org.eclipse.linuxtools.lttng2.kernel.ui,org.eclipse.linuxtools.lttng2.control.ui.tests,org.eclipse.linuxtools.lttng2.kernel.ui.swtbot.tests", + org.eclipse.linuxtools.internal.lttng2.control.ui.views.dialogs;x-friends:="org.eclipse.linuxtools.lttng2.control.ui.tests", + org.eclipse.linuxtools.internal.lttng2.control.ui.views.handlers;x-internal:=true, + org.eclipse.linuxtools.internal.lttng2.control.ui.views.logging;x-friends:="org.eclipse.linuxtools.lttng2.control.ui.tests", + org.eclipse.linuxtools.internal.lttng2.control.ui.views.messages;x-internal:=true, + org.eclipse.linuxtools.internal.lttng2.control.ui.views.model;x-friends:="org.eclipse.linuxtools.lttng2.control.ui.tests", + org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl;x-friends:="org.eclipse.linuxtools.lttng2.control.ui.tests", + org.eclipse.linuxtools.internal.lttng2.control.ui.views.preferences;x-friends:="org.eclipse.linuxtools.lttng2.control.ui.tests", + org.eclipse.linuxtools.internal.lttng2.control.ui.views.property;x-friends:="org.eclipse.linuxtools.lttng2.control.ui.tests", + org.eclipse.linuxtools.internal.lttng2.control.ui.views.remote;x-friends:="org.eclipse.linuxtools.lttng2.control.ui.tests", + org.eclipse.linuxtools.internal.lttng2.control.ui.views.service;x-friends:="org.eclipse.linuxtools.lttng2.control.ui.tests" +Import-Package: org.eclipse.rse.core, + org.eclipse.rse.core.model, + org.eclipse.rse.core.subsystems, + org.eclipse.rse.services, + org.eclipse.rse.services.clientserver.messages, + org.eclipse.rse.services.files, + org.eclipse.rse.services.shells, + org.eclipse.rse.services.terminals, + org.eclipse.rse.subsystems.files.core.servicesubsystem, + org.eclipse.rse.subsystems.files.core.subsystems diff --git a/org.eclipse.linuxtools.lttng2.ui/about.html b/org.eclipse.linuxtools.lttng2.control.ui/about.html similarity index 100% rename from org.eclipse.linuxtools.lttng2.ui/about.html rename to org.eclipse.linuxtools.lttng2.control.ui/about.html diff --git a/org.eclipse.linuxtools.lttng2.ui/build.properties b/org.eclipse.linuxtools.lttng2.control.ui/build.properties similarity index 100% rename from org.eclipse.linuxtools.lttng2.ui/build.properties rename to org.eclipse.linuxtools.lttng2.control.ui/build.properties diff --git a/org.eclipse.linuxtools.lttng2.ui/icons/elcl16/add-context.gif b/org.eclipse.linuxtools.lttng2.control.ui/icons/elcl16/add-context.gif similarity index 100% rename from org.eclipse.linuxtools.lttng2.ui/icons/elcl16/add-context.gif rename to org.eclipse.linuxtools.lttng2.control.ui/icons/elcl16/add-context.gif diff --git a/org.eclipse.linuxtools.lttng2.ui/icons/elcl16/add_button.gif b/org.eclipse.linuxtools.lttng2.control.ui/icons/elcl16/add_button.gif similarity index 100% rename from org.eclipse.linuxtools.lttng2.ui/icons/elcl16/add_button.gif rename to org.eclipse.linuxtools.lttng2.control.ui/icons/elcl16/add_button.gif diff --git a/org.eclipse.linuxtools.lttng2.ui/icons/elcl16/calibrate.gif b/org.eclipse.linuxtools.lttng2.control.ui/icons/elcl16/calibrate.gif similarity index 100% rename from org.eclipse.linuxtools.lttng2.ui/icons/elcl16/calibrate.gif rename to org.eclipse.linuxtools.lttng2.control.ui/icons/elcl16/calibrate.gif diff --git a/org.eclipse.linuxtools.lttng2.ui/icons/elcl16/connect.gif b/org.eclipse.linuxtools.lttng2.control.ui/icons/elcl16/connect.gif similarity index 100% rename from org.eclipse.linuxtools.lttng2.ui/icons/elcl16/connect.gif rename to org.eclipse.linuxtools.lttng2.control.ui/icons/elcl16/connect.gif diff --git a/org.eclipse.linuxtools.lttng2.ui/icons/elcl16/delete_trace.gif b/org.eclipse.linuxtools.lttng2.control.ui/icons/elcl16/delete_trace.gif similarity index 100% rename from org.eclipse.linuxtools.lttng2.ui/icons/elcl16/delete_trace.gif rename to org.eclipse.linuxtools.lttng2.control.ui/icons/elcl16/delete_trace.gif diff --git a/org.eclipse.linuxtools.lttng2.ui/icons/elcl16/disable.gif b/org.eclipse.linuxtools.lttng2.control.ui/icons/elcl16/disable.gif similarity index 100% rename from org.eclipse.linuxtools.lttng2.ui/icons/elcl16/disable.gif rename to org.eclipse.linuxtools.lttng2.control.ui/icons/elcl16/disable.gif diff --git a/org.eclipse.linuxtools.lttng2.ui/icons/elcl16/disable_event.gif b/org.eclipse.linuxtools.lttng2.control.ui/icons/elcl16/disable_event.gif similarity index 100% rename from org.eclipse.linuxtools.lttng2.ui/icons/elcl16/disable_event.gif rename to org.eclipse.linuxtools.lttng2.control.ui/icons/elcl16/disable_event.gif diff --git a/org.eclipse.linuxtools.lttng2.ui/icons/elcl16/disconnect.gif b/org.eclipse.linuxtools.lttng2.control.ui/icons/elcl16/disconnect.gif similarity index 100% rename from org.eclipse.linuxtools.lttng2.ui/icons/elcl16/disconnect.gif rename to org.eclipse.linuxtools.lttng2.control.ui/icons/elcl16/disconnect.gif diff --git a/org.eclipse.linuxtools.lttng2.ui/icons/elcl16/edit.gif b/org.eclipse.linuxtools.lttng2.control.ui/icons/elcl16/edit.gif similarity index 100% rename from org.eclipse.linuxtools.lttng2.ui/icons/elcl16/edit.gif rename to org.eclipse.linuxtools.lttng2.control.ui/icons/elcl16/edit.gif diff --git a/org.eclipse.linuxtools.lttng2.ui/icons/elcl16/enable.gif b/org.eclipse.linuxtools.lttng2.control.ui/icons/elcl16/enable.gif similarity index 100% rename from org.eclipse.linuxtools.lttng2.ui/icons/elcl16/enable.gif rename to org.eclipse.linuxtools.lttng2.control.ui/icons/elcl16/enable.gif diff --git a/org.eclipse.linuxtools.lttng2.ui/icons/elcl16/enable_event.gif b/org.eclipse.linuxtools.lttng2.control.ui/icons/elcl16/enable_event.gif similarity index 100% rename from org.eclipse.linuxtools.lttng2.ui/icons/elcl16/enable_event.gif rename to org.eclipse.linuxtools.lttng2.control.ui/icons/elcl16/enable_event.gif diff --git a/org.eclipse.linuxtools.lttng2.ui/icons/elcl16/import_trace.gif b/org.eclipse.linuxtools.lttng2.control.ui/icons/elcl16/import_trace.gif similarity index 100% rename from org.eclipse.linuxtools.lttng2.ui/icons/elcl16/import_trace.gif rename to org.eclipse.linuxtools.lttng2.control.ui/icons/elcl16/import_trace.gif diff --git a/org.eclipse.linuxtools.lttng2.ui/icons/elcl16/pause_trace.gif b/org.eclipse.linuxtools.lttng2.control.ui/icons/elcl16/pause_trace.gif similarity index 100% rename from org.eclipse.linuxtools.lttng2.ui/icons/elcl16/pause_trace.gif rename to org.eclipse.linuxtools.lttng2.control.ui/icons/elcl16/pause_trace.gif diff --git a/org.eclipse.linuxtools.lttng2.ui/icons/elcl16/refresh.gif b/org.eclipse.linuxtools.lttng2.control.ui/icons/elcl16/refresh.gif similarity index 100% rename from org.eclipse.linuxtools.lttng2.ui/icons/elcl16/refresh.gif rename to org.eclipse.linuxtools.lttng2.control.ui/icons/elcl16/refresh.gif diff --git a/org.eclipse.linuxtools.lttng2.ui/icons/elcl16/snapshot.gif b/org.eclipse.linuxtools.lttng2.control.ui/icons/elcl16/snapshot.gif similarity index 100% rename from org.eclipse.linuxtools.lttng2.ui/icons/elcl16/snapshot.gif rename to org.eclipse.linuxtools.lttng2.control.ui/icons/elcl16/snapshot.gif diff --git a/org.eclipse.linuxtools.lttng2.ui/icons/elcl16/start_trace.gif b/org.eclipse.linuxtools.lttng2.control.ui/icons/elcl16/start_trace.gif similarity index 100% rename from org.eclipse.linuxtools.lttng2.ui/icons/elcl16/start_trace.gif rename to org.eclipse.linuxtools.lttng2.control.ui/icons/elcl16/start_trace.gif diff --git a/org.eclipse.linuxtools.lttng2.ui/icons/elcl16/stop_trace.gif b/org.eclipse.linuxtools.lttng2.control.ui/icons/elcl16/stop_trace.gif similarity index 100% rename from org.eclipse.linuxtools.lttng2.ui/icons/elcl16/stop_trace.gif rename to org.eclipse.linuxtools.lttng2.control.ui/icons/elcl16/stop_trace.gif diff --git a/org.eclipse.linuxtools.lttng2.ui/icons/elcl16/target_add.gif b/org.eclipse.linuxtools.lttng2.control.ui/icons/elcl16/target_add.gif similarity index 100% rename from org.eclipse.linuxtools.lttng2.ui/icons/elcl16/target_add.gif rename to org.eclipse.linuxtools.lttng2.control.ui/icons/elcl16/target_add.gif diff --git a/org.eclipse.linuxtools.lttng2.ui/icons/elcl16/target_delete.gif b/org.eclipse.linuxtools.lttng2.control.ui/icons/elcl16/target_delete.gif similarity index 100% rename from org.eclipse.linuxtools.lttng2.ui/icons/elcl16/target_delete.gif rename to org.eclipse.linuxtools.lttng2.control.ui/icons/elcl16/target_delete.gif diff --git a/org.eclipse.linuxtools.lttng2.ui/icons/eview16/control_view.gif b/org.eclipse.linuxtools.lttng2.control.ui/icons/eview16/control_view.gif similarity index 100% rename from org.eclipse.linuxtools.lttng2.ui/icons/eview16/control_view.gif rename to org.eclipse.linuxtools.lttng2.control.ui/icons/eview16/control_view.gif diff --git a/org.eclipse.linuxtools.lttng2.ui/icons/obj16/channel.gif b/org.eclipse.linuxtools.lttng2.control.ui/icons/obj16/channel.gif similarity index 100% rename from org.eclipse.linuxtools.lttng2.ui/icons/obj16/channel.gif rename to org.eclipse.linuxtools.lttng2.control.ui/icons/obj16/channel.gif diff --git a/org.eclipse.linuxtools.lttng2.ui/icons/obj16/channel_disabled.gif b/org.eclipse.linuxtools.lttng2.control.ui/icons/obj16/channel_disabled.gif similarity index 100% rename from org.eclipse.linuxtools.lttng2.ui/icons/obj16/channel_disabled.gif rename to org.eclipse.linuxtools.lttng2.control.ui/icons/obj16/channel_disabled.gif diff --git a/org.eclipse.linuxtools.lttng2.ui/icons/obj16/domain.gif b/org.eclipse.linuxtools.lttng2.control.ui/icons/obj16/domain.gif similarity index 100% rename from org.eclipse.linuxtools.lttng2.ui/icons/obj16/domain.gif rename to org.eclipse.linuxtools.lttng2.control.ui/icons/obj16/domain.gif diff --git a/org.eclipse.linuxtools.lttng2.ui/icons/obj16/event_disabled.gif b/org.eclipse.linuxtools.lttng2.control.ui/icons/obj16/event_disabled.gif similarity index 100% rename from org.eclipse.linuxtools.lttng2.ui/icons/obj16/event_disabled.gif rename to org.eclipse.linuxtools.lttng2.control.ui/icons/obj16/event_disabled.gif diff --git a/org.eclipse.linuxtools.lttng2.ui/icons/obj16/event_enabled.gif b/org.eclipse.linuxtools.lttng2.control.ui/icons/obj16/event_enabled.gif similarity index 100% rename from org.eclipse.linuxtools.lttng2.ui/icons/obj16/event_enabled.gif rename to org.eclipse.linuxtools.lttng2.control.ui/icons/obj16/event_enabled.gif diff --git a/org.eclipse.linuxtools.lttng2.ui/icons/obj16/garland16.png b/org.eclipse.linuxtools.lttng2.control.ui/icons/obj16/garland16.png similarity index 100% rename from org.eclipse.linuxtools.lttng2.ui/icons/obj16/garland16.png rename to org.eclipse.linuxtools.lttng2.control.ui/icons/obj16/garland16.png diff --git a/org.eclipse.linuxtools.lttng2.ui/icons/obj16/providers.gif b/org.eclipse.linuxtools.lttng2.control.ui/icons/obj16/providers.gif similarity index 100% rename from org.eclipse.linuxtools.lttng2.ui/icons/obj16/providers.gif rename to org.eclipse.linuxtools.lttng2.control.ui/icons/obj16/providers.gif diff --git a/org.eclipse.linuxtools.lttng2.ui/icons/obj16/session_active.gif b/org.eclipse.linuxtools.lttng2.control.ui/icons/obj16/session_active.gif similarity index 100% rename from org.eclipse.linuxtools.lttng2.ui/icons/obj16/session_active.gif rename to org.eclipse.linuxtools.lttng2.control.ui/icons/obj16/session_active.gif diff --git a/org.eclipse.linuxtools.lttng2.ui/icons/obj16/session_destroyed.gif b/org.eclipse.linuxtools.lttng2.control.ui/icons/obj16/session_destroyed.gif similarity index 100% rename from org.eclipse.linuxtools.lttng2.ui/icons/obj16/session_destroyed.gif rename to org.eclipse.linuxtools.lttng2.control.ui/icons/obj16/session_destroyed.gif diff --git a/org.eclipse.linuxtools.lttng2.ui/icons/obj16/session_inactive.gif b/org.eclipse.linuxtools.lttng2.control.ui/icons/obj16/session_inactive.gif similarity index 100% rename from org.eclipse.linuxtools.lttng2.ui/icons/obj16/session_inactive.gif rename to org.eclipse.linuxtools.lttng2.control.ui/icons/obj16/session_inactive.gif diff --git a/org.eclipse.linuxtools.lttng2.ui/icons/obj16/sessions.gif b/org.eclipse.linuxtools.lttng2.control.ui/icons/obj16/sessions.gif similarity index 100% rename from org.eclipse.linuxtools.lttng2.ui/icons/obj16/sessions.gif rename to org.eclipse.linuxtools.lttng2.control.ui/icons/obj16/sessions.gif diff --git a/org.eclipse.linuxtools.lttng2.ui/icons/obj16/systemlttng2-live.gif b/org.eclipse.linuxtools.lttng2.control.ui/icons/obj16/systemlttng2-live.gif similarity index 100% rename from org.eclipse.linuxtools.lttng2.ui/icons/obj16/systemlttng2-live.gif rename to org.eclipse.linuxtools.lttng2.control.ui/icons/obj16/systemlttng2-live.gif diff --git a/org.eclipse.linuxtools.lttng2.ui/icons/obj16/systemlttng2.gif b/org.eclipse.linuxtools.lttng2.control.ui/icons/obj16/systemlttng2.gif similarity index 100% rename from org.eclipse.linuxtools.lttng2.ui/icons/obj16/systemlttng2.gif rename to org.eclipse.linuxtools.lttng2.control.ui/icons/obj16/systemlttng2.gif diff --git a/org.eclipse.linuxtools.lttng2.ui/icons/obj16/target_connected.gif b/org.eclipse.linuxtools.lttng2.control.ui/icons/obj16/target_connected.gif similarity index 100% rename from org.eclipse.linuxtools.lttng2.ui/icons/obj16/target_connected.gif rename to org.eclipse.linuxtools.lttng2.control.ui/icons/obj16/target_connected.gif diff --git a/org.eclipse.linuxtools.lttng2.ui/icons/obj16/target_disconnected.gif b/org.eclipse.linuxtools.lttng2.control.ui/icons/obj16/target_disconnected.gif similarity index 100% rename from org.eclipse.linuxtools.lttng2.ui/icons/obj16/target_disconnected.gif rename to org.eclipse.linuxtools.lttng2.control.ui/icons/obj16/target_disconnected.gif diff --git a/org.eclipse.linuxtools.lttng2.ui/icons/obj16/targets.gif b/org.eclipse.linuxtools.lttng2.control.ui/icons/obj16/targets.gif similarity index 100% rename from org.eclipse.linuxtools.lttng2.ui/icons/obj16/targets.gif rename to org.eclipse.linuxtools.lttng2.control.ui/icons/obj16/targets.gif diff --git a/org.eclipse.linuxtools.lttng2.ui/plugin.properties b/org.eclipse.linuxtools.lttng2.control.ui/plugin.properties similarity index 96% rename from org.eclipse.linuxtools.lttng2.ui/plugin.properties rename to org.eclipse.linuxtools.lttng2.control.ui/plugin.properties index 8b85752b6d..399f2d513a 100644 --- a/org.eclipse.linuxtools.lttng2.ui/plugin.properties +++ b/org.eclipse.linuxtools.lttng2.control.ui/plugin.properties @@ -10,9 +10,9 @@ # Ericsson - Initial API and implementation ############################################################################### -#Properties file for org.eclipse.linuxtools.lttng2.ui +#Properties file for org.eclipse.linuxtools.lttng2.control.ui Bundle-Vendor = Eclipse Linux Tools -Bundle-Name = Linux Tools LTTng UI Plug-in +Bundle-Name = Linux Tools LTTng Control UI Plug-in views.category.name = LTTng control.view.name = Control @@ -137,4 +137,4 @@ commands.control.calibrate.description=Quantify LTTng overhead commands.control.snapshot=Record Snapshot commands.control.snapshot.description=Record a snapshot -preference.page.control.name=LTTng Tracer Control Preferences \ No newline at end of file +preference.page.control.name=LTTng Tracer Control Preferences diff --git a/org.eclipse.linuxtools.lttng2.ui/plugin.xml b/org.eclipse.linuxtools.lttng2.control.ui/plugin.xml similarity index 88% rename from org.eclipse.linuxtools.lttng2.ui/plugin.xml rename to org.eclipse.linuxtools.lttng2.control.ui/plugin.xml index 9e9a48ecc2..d47c061e03 100644 --- a/org.eclipse.linuxtools.lttng2.ui/plugin.xml +++ b/org.eclipse.linuxtools.lttng2.control.ui/plugin.xml @@ -11,7 +11,7 @@ + value="org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TargetNodeComponent"> @@ -302,7 +302,7 @@ + value="org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TargetNodeComponent"> @@ -320,7 +320,7 @@ + value="org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceControlComponent"> @@ -338,7 +338,7 @@ + value="org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TargetNodeComponent"> @@ -356,7 +356,7 @@ + value="org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceSessionGroup"> @@ -374,7 +374,7 @@ + value="org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceSessionComponent"> @@ -392,7 +392,7 @@ + value="org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceSessionComponent"> @@ -410,7 +410,7 @@ + value="org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceSessionComponent"> @@ -433,7 +433,7 @@ + value="org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceSessionComponent"> + value="org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceSessionComponent"> + value="org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceDomainComponent"> @@ -491,7 +491,7 @@ + value="org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceSessionComponent"> + value="org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceDomainComponent"> + value="org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceSessionComponent"> @@ -545,7 +545,7 @@ + value="org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceDomainComponent"> + value="org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceChannelComponent"> @@ -585,7 +585,7 @@ + value="org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceChannelComponent"> @@ -604,7 +604,7 @@ + value="org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.BaseEventComponent"> @@ -623,7 +623,7 @@ + value="org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceEventComponent"> @@ -642,7 +642,7 @@ + value="org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceEventComponent"> @@ -661,7 +661,7 @@ + value="org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceChannelComponent"> + value="org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceDomainComponent"> + value="org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceChannelComponent"> + value="org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceEventComponent"> + value="org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceDomainComponent"> + value="org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceSessionComponent"> + value="org.eclipse.linuxtools.internal.lttng2.control.ui.views.ControlView"> + value="org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TargetNodeComponent"> + value="org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TargetNodeComponent"> + value="org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceControlComponent"> + value="org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TargetNodeComponent"> + value="org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceSessionGroup"> + value="org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceSessionComponent"> + value="org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceSessionComponent"> + value="org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceSessionComponent"> + value="org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceDomainComponent"> + value="org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceChannelComponent"> + value="org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceChannelComponent"> @@ -986,7 +986,7 @@ + value="org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceSessionComponent"> @@ -1002,7 +1002,7 @@ + value="org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceSessionComponent"> @@ -1018,7 +1018,7 @@ + value="org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceSessionComponent"> @@ -1035,7 +1035,7 @@ + value="org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.BaseEventComponent"> @@ -1051,7 +1051,7 @@ + value="org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceEventComponent"> @@ -1067,7 +1067,7 @@ + value="org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceEventComponent"> @@ -1083,7 +1083,7 @@ + value="org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceChannelComponent"> @@ -1099,7 +1099,7 @@ + value="org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceDomainComponent"> + value="org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceSessionComponent"> @@ -1130,7 +1130,7 @@ + value="org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceDomainComponent"> @@ -1146,7 +1146,7 @@ + value="org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceDomainComponent"> @@ -1162,7 +1162,7 @@ + value="org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceChannelComponent"> @@ -1178,7 +1178,7 @@ + value="org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceEventComponent"> @@ -1212,7 +1212,7 @@ point="org.eclipse.ui.preferencePages"> @@ -1220,17 +1220,17 @@ + class="org.eclipse.linuxtools.internal.lttng2.control.ui.views.preferences.ControlPreferenceInitializer"> + type="org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceControlComponent"> diff --git a/org.eclipse.linuxtools.lttng2.core/pom.xml b/org.eclipse.linuxtools.lttng2.control.ui/pom.xml similarity index 74% rename from org.eclipse.linuxtools.lttng2.core/pom.xml rename to org.eclipse.linuxtools.lttng2.control.ui/pom.xml index 48e03a6f78..7432d6c2a2 100644 --- a/org.eclipse.linuxtools.lttng2.core/pom.xml +++ b/org.eclipse.linuxtools.lttng2.control.ui/pom.xml @@ -17,22 +17,13 @@ 3.0.0-SNAPSHOT - org.eclipse.linuxtools.lttng2.core + org.eclipse.linuxtools.lttng2.control.ui 3.0.0-SNAPSHOT eclipse-plugin - Linux Tools LTTng Core Plug-in + Linux Tools LTTng Control UI Plug-in - - - - src - - **/*.java - - - org.eclipse.tycho diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/Activator.java b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/Activator.java similarity index 97% rename from org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/Activator.java rename to org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/Activator.java index dcdb081760..e9740cb9e6 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/Activator.java +++ b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/Activator.java @@ -10,7 +10,7 @@ * Francois Chouinard - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.ui; +package org.eclipse.linuxtools.internal.lttng2.control.ui; import java.net.URL; @@ -18,7 +18,7 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.resource.ImageRegistry; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.preferences.ControlPreferences; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.preferences.ControlPreferences; import org.eclipse.swt.graphics.Image; import org.eclipse.ui.plugin.AbstractUIPlugin; import org.osgi.framework.BundleContext; @@ -35,7 +35,7 @@ public class Activator extends AbstractUIPlugin { /** * The plug-in ID */ - public static final String PLUGIN_ID = "org.eclipse.linuxtools.lttng2.ui"; //$NON-NLS-1$ + public static final String PLUGIN_ID = "org.eclipse.linuxtools.lttng2.control.ui"; //$NON-NLS-1$ /** * The shared instance diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/ControlView.java b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/ControlView.java similarity index 94% rename from org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/ControlView.java rename to org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/ControlView.java index 558088d513..1a24bd77e2 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/ControlView.java +++ b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/ControlView.java @@ -11,7 +11,7 @@ * Bernd Hufmann - Filled with content *******************************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.ui.views.control; +package org.eclipse.linuxtools.internal.lttng2.control.ui.views; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; @@ -21,11 +21,11 @@ import org.eclipse.jface.viewers.ColumnViewerToolTipSupport; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.jface.viewers.TreeViewer; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponentChangedListener; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceControlContentProvider; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceControlLabelProvider; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceControlRoot; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.ITraceControlComponent; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.ITraceControlComponentChangedListener; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceControlContentProvider; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceControlLabelProvider; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceControlRoot; import org.eclipse.rse.core.RSECorePlugin; import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Composite; diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/AddContextDialog.java b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/dialogs/AddContextDialog.java similarity index 98% rename from org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/AddContextDialog.java rename to org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/dialogs/AddContextDialog.java index a560219f62..d2a0018141 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/AddContextDialog.java +++ b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/dialogs/AddContextDialog.java @@ -9,7 +9,7 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs; +package org.eclipse.linuxtools.internal.lttng2.control.ui.views.dialogs; import java.util.ArrayList; import java.util.Iterator; @@ -23,8 +23,8 @@ import org.eclipse.jface.viewers.ColumnLabelProvider; import org.eclipse.jface.viewers.ICheckStateListener; import org.eclipse.jface.viewers.ITreeContentProvider; import org.eclipse.jface.viewers.Viewer; -import org.eclipse.linuxtools.internal.lttng2.ui.Activator; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.messages.Messages; +import org.eclipse.linuxtools.internal.lttng2.control.ui.Activator; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.messages.Messages; import org.eclipse.swt.SWT; import org.eclipse.swt.graphics.Point; import org.eclipse.swt.layout.GridData; diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/ConfirmDialog.java b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/dialogs/ConfirmDialog.java similarity index 89% rename from org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/ConfirmDialog.java rename to org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/dialogs/ConfirmDialog.java index a94003a93b..088a48ec89 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/ConfirmDialog.java +++ b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/dialogs/ConfirmDialog.java @@ -10,11 +10,11 @@ * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs; +package org.eclipse.linuxtools.internal.lttng2.control.ui.views.dialogs; import org.eclipse.jface.dialogs.MessageDialog; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.messages.Messages; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.messages.Messages; import org.eclipse.swt.widgets.Shell; /** diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/CreateSessionDialog.java b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/dialogs/CreateSessionDialog.java similarity index 98% rename from org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/CreateSessionDialog.java rename to org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/dialogs/CreateSessionDialog.java index b3d9cd631a..9389d625d1 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/CreateSessionDialog.java +++ b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/dialogs/CreateSessionDialog.java @@ -10,18 +10,19 @@ * Bernd Hufmann - Initial API and implementation * Bernd Hufmann - Updated for support of LTTng Tools 2.1 **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs; + +package org.eclipse.linuxtools.internal.lttng2.control.ui.views.dialogs; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.jface.dialogs.TitleAreaDialog; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.ISessionInfo; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.impl.SessionInfo; -import org.eclipse.linuxtools.internal.lttng2.ui.Activator; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.messages.Messages; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TargetNodeComponent; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceSessionGroup; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.remote.IRemoteSystemProxy; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.ISessionInfo; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.impl.SessionInfo; +import org.eclipse.linuxtools.internal.lttng2.control.ui.Activator; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.messages.Messages; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TargetNodeComponent; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceSessionGroup; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.remote.IRemoteSystemProxy; import org.eclipse.rse.services.clientserver.messages.SystemMessageException; import org.eclipse.rse.subsystems.files.core.servicesubsystem.IFileServiceSubSystem; import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile; diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/EnableChannelDialog.java b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/dialogs/EnableChannelDialog.java similarity index 97% rename from org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/EnableChannelDialog.java rename to org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/dialogs/EnableChannelDialog.java index 844c354aa3..649e90af47 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/EnableChannelDialog.java +++ b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/dialogs/EnableChannelDialog.java @@ -10,19 +10,19 @@ * Bernd Hufmann - Initial API and implementation * Simon Delisle - Updated for support of LTTng Tools 2.2 **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs; +package org.eclipse.linuxtools.internal.lttng2.control.ui.views.dialogs; import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.jface.dialogs.MessageDialog; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.IChannelInfo; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.impl.BufferType; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.impl.ChannelInfo; -import org.eclipse.linuxtools.internal.lttng2.ui.Activator; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.messages.Messages; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TargetNodeComponent; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceDomainComponent; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.service.LTTngControlServiceConstants; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.IChannelInfo; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.impl.BufferType; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.impl.ChannelInfo; +import org.eclipse.linuxtools.internal.lttng2.control.ui.Activator; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.messages.Messages; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TargetNodeComponent; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceDomainComponent; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.service.LTTngControlServiceConstants; import org.eclipse.swt.SWT; import org.eclipse.swt.events.FocusEvent; import org.eclipse.swt.events.FocusListener; diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/EnableEventsDialog.java b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/dialogs/EnableEventsDialog.java similarity index 96% rename from org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/EnableEventsDialog.java rename to org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/dialogs/EnableEventsDialog.java index 6cf8bd2966..120af0ce65 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/EnableEventsDialog.java +++ b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/dialogs/EnableEventsDialog.java @@ -10,18 +10,18 @@ * Bernd Hufmann - Initial API and implementation * Bernd Hufmann - Updated for support of LTTng Tools 2.1 **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs; +package org.eclipse.linuxtools.internal.lttng2.control.ui.views.dialogs; import java.util.List; import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.dialogs.IDialogConstants; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.LogLevelType; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceLogLevel; -import org.eclipse.linuxtools.internal.lttng2.ui.Activator; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.messages.Messages; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceDomainComponent; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceProviderGroup; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.LogLevelType; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.TraceLogLevel; +import org.eclipse.linuxtools.internal.lttng2.control.ui.Activator; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.messages.Messages; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceDomainComponent; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceProviderGroup; import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionAdapter; import org.eclipse.swt.events.SelectionEvent; diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/EnableKernelEventComposite.java b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/dialogs/EnableKernelEventComposite.java similarity index 97% rename from org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/EnableKernelEventComposite.java rename to org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/dialogs/EnableKernelEventComposite.java index 001acea8e9..7dc6300752 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/EnableKernelEventComposite.java +++ b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/dialogs/EnableKernelEventComposite.java @@ -10,7 +10,7 @@ * Bernd Hufmann - Initial API and implementation * Marc-Andre Laperle - Add filtering textbox **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs; +package org.eclipse.linuxtools.internal.lttng2.control.ui.views.dialogs; import java.util.ArrayList; import java.util.List; @@ -20,13 +20,13 @@ import org.eclipse.jface.viewers.CheckStateChangedEvent; import org.eclipse.jface.viewers.CheckboxTreeViewer; import org.eclipse.jface.viewers.ICheckStateListener; import org.eclipse.jface.viewers.TreeViewer; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.messages.Messages; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.BaseEventComponent; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.KernelProviderComponent; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceControlContentProvider; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceControlLabelProvider; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceProviderGroup; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.messages.Messages; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.ITraceControlComponent; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.BaseEventComponent; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.KernelProviderComponent; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceControlContentProvider; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceControlLabelProvider; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceProviderGroup; import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionAdapter; import org.eclipse.swt.events.SelectionEvent; diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/EnableUstEventsComposite.java b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/dialogs/EnableUstEventsComposite.java similarity index 97% rename from org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/EnableUstEventsComposite.java rename to org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/dialogs/EnableUstEventsComposite.java index c3090d9124..af21af6aae 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/EnableUstEventsComposite.java +++ b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/dialogs/EnableUstEventsComposite.java @@ -11,7 +11,7 @@ * Bernd Hufmann - Updated for support of LTTng Tools 2.1 * Marc-Andre Laperle - Add filtering textbox **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs; +package org.eclipse.linuxtools.internal.lttng2.control.ui.views.dialogs; import java.util.ArrayList; import java.util.HashSet; @@ -23,16 +23,16 @@ import org.eclipse.jface.viewers.CheckStateChangedEvent; import org.eclipse.jface.viewers.CheckboxTreeViewer; import org.eclipse.jface.viewers.ICheckStateListener; import org.eclipse.jface.viewers.TreeViewer; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.LogLevelType; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceLogLevel; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.messages.Messages; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.BaseEventComponent; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TargetNodeComponent; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceControlContentProvider; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceControlLabelProvider; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceProviderGroup; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.UstProviderComponent; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.LogLevelType; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.TraceLogLevel; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.messages.Messages; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.ITraceControlComponent; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.BaseEventComponent; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TargetNodeComponent; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceControlContentProvider; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceControlLabelProvider; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceProviderGroup; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.UstProviderComponent; import org.eclipse.swt.SWT; import org.eclipse.swt.custom.CCombo; import org.eclipse.swt.events.SelectionAdapter; diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/GetEventInfoDialog.java b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/dialogs/GetEventInfoDialog.java similarity index 96% rename from org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/GetEventInfoDialog.java rename to org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/dialogs/GetEventInfoDialog.java index 4f227b4069..2ec434aeb0 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/GetEventInfoDialog.java +++ b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/dialogs/GetEventInfoDialog.java @@ -10,18 +10,18 @@ * Bernd Hufmann - Initial API and implementation * Bernd Hufmann - Updated for support of LTTng Tools 2.1 **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs; +package org.eclipse.linuxtools.internal.lttng2.control.ui.views.dialogs; import java.util.Arrays; import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.jface.dialogs.MessageDialog; -import org.eclipse.linuxtools.internal.lttng2.ui.Activator; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.messages.Messages; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceChannelComponent; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceDomainComponent; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceSessionComponent; +import org.eclipse.linuxtools.internal.lttng2.control.ui.Activator; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.messages.Messages; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceChannelComponent; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceDomainComponent; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceSessionComponent; import org.eclipse.swt.SWT; import org.eclipse.swt.custom.CCombo; import org.eclipse.swt.events.SelectionEvent; diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/IAddContextDialog.java b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/dialogs/IAddContextDialog.java similarity index 95% rename from org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/IAddContextDialog.java rename to org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/dialogs/IAddContextDialog.java index 5711d7dae9..b65c3ba29f 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/IAddContextDialog.java +++ b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/dialogs/IAddContextDialog.java @@ -9,7 +9,7 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs; +package org.eclipse.linuxtools.internal.lttng2.control.ui.views.dialogs; import java.util.List; diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/IConfirmDialog.java b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/dialogs/IConfirmDialog.java similarity index 94% rename from org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/IConfirmDialog.java rename to org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/dialogs/IConfirmDialog.java index 8942e9c2df..4c36519cee 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/IConfirmDialog.java +++ b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/dialogs/IConfirmDialog.java @@ -9,7 +9,7 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs; +package org.eclipse.linuxtools.internal.lttng2.control.ui.views.dialogs; import org.eclipse.swt.widgets.Shell; diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/ICreateSessionDialog.java b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/dialogs/ICreateSessionDialog.java similarity index 88% rename from org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/ICreateSessionDialog.java rename to org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/dialogs/ICreateSessionDialog.java index 872d0f573e..c2c914755b 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/ICreateSessionDialog.java +++ b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/dialogs/ICreateSessionDialog.java @@ -10,10 +10,10 @@ * Bernd Hufmann - Initial API and implementation * Bernd Hufmann - Updated for support of LTTng Tools 2.1 **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs; +package org.eclipse.linuxtools.internal.lttng2.control.ui.views.dialogs; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.ISessionInfo; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceSessionGroup; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.ISessionInfo; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceSessionGroup; /** *

diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/IEnableChannelDialog.java b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/dialogs/IEnableChannelDialog.java similarity index 87% rename from org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/IEnableChannelDialog.java rename to org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/dialogs/IEnableChannelDialog.java index 8024602df0..b0aad194fc 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/IEnableChannelDialog.java +++ b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/dialogs/IEnableChannelDialog.java @@ -9,11 +9,11 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs; +package org.eclipse.linuxtools.internal.lttng2.control.ui.views.dialogs; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.IChannelInfo; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TargetNodeComponent; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceDomainComponent; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.IChannelInfo; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TargetNodeComponent; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceDomainComponent; /** *

diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/IEnableEventsDialog.java b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/dialogs/IEnableEventsDialog.java similarity index 89% rename from org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/IEnableEventsDialog.java rename to org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/dialogs/IEnableEventsDialog.java index 0f7cd6e745..90ac9b4cf5 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/IEnableEventsDialog.java +++ b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/dialogs/IEnableEventsDialog.java @@ -9,10 +9,10 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs; +package org.eclipse.linuxtools.internal.lttng2.control.ui.views.dialogs; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceDomainComponent; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceProviderGroup; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceDomainComponent; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceProviderGroup; /** *

diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/IEnableKernelEvents.java b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/dialogs/IEnableKernelEvents.java similarity index 97% rename from org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/IEnableKernelEvents.java rename to org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/dialogs/IEnableKernelEvents.java index d009a552bd..66a8f59f8f 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/IEnableKernelEvents.java +++ b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/dialogs/IEnableKernelEvents.java @@ -9,7 +9,7 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs; +package org.eclipse.linuxtools.internal.lttng2.control.ui.views.dialogs; import java.util.List; diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/IEnableUstEvents.java b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/dialogs/IEnableUstEvents.java similarity index 91% rename from org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/IEnableUstEvents.java rename to org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/dialogs/IEnableUstEvents.java index 06b4130aad..dfe72fb63d 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/IEnableUstEvents.java +++ b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/dialogs/IEnableUstEvents.java @@ -10,12 +10,12 @@ * Bernd Hufmann - Initial API and implementation * Bernd Hufmann - Updated for support of LTTng Tools 2.1 **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs; +package org.eclipse.linuxtools.internal.lttng2.control.ui.views.dialogs; import java.util.List; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.LogLevelType; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceLogLevel; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.LogLevelType; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.TraceLogLevel; /** *

diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/IGetEventInfoDialog.java b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/dialogs/IGetEventInfoDialog.java similarity index 91% rename from org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/IGetEventInfoDialog.java rename to org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/dialogs/IGetEventInfoDialog.java index 1325f42384..c61a7fe878 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/IGetEventInfoDialog.java +++ b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/dialogs/IGetEventInfoDialog.java @@ -10,10 +10,10 @@ * Bernd Hufmann - Initial API and implementation * Bernd Hufmann - Updated for support of LTTng Tools 2.1 **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs; +package org.eclipse.linuxtools.internal.lttng2.control.ui.views.dialogs; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceChannelComponent; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceSessionComponent; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceChannelComponent; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceSessionComponent; /** *

diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/IImportConfirmationDialog.java b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/dialogs/IImportConfirmationDialog.java similarity index 95% rename from org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/IImportConfirmationDialog.java rename to org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/dialogs/IImportConfirmationDialog.java index 3b2e97305c..59884073c1 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/IImportConfirmationDialog.java +++ b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/dialogs/IImportConfirmationDialog.java @@ -9,7 +9,7 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs; +package org.eclipse.linuxtools.internal.lttng2.control.ui.views.dialogs; /** *

diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/IImportDialog.java b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/dialogs/IImportDialog.java similarity index 93% rename from org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/IImportDialog.java rename to org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/dialogs/IImportDialog.java index bd5ca08828..170b021033 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/IImportDialog.java +++ b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/dialogs/IImportDialog.java @@ -9,12 +9,12 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs; +package org.eclipse.linuxtools.internal.lttng2.control.ui.views.dialogs; import java.util.List; import org.eclipse.core.resources.IProject; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceSessionComponent; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceSessionComponent; /** *

diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/INewConnectionDialog.java b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/dialogs/INewConnectionDialog.java similarity index 93% rename from org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/INewConnectionDialog.java rename to org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/dialogs/INewConnectionDialog.java index fcbaed3710..1bdb9a2019 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/INewConnectionDialog.java +++ b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/dialogs/INewConnectionDialog.java @@ -9,9 +9,9 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs; +package org.eclipse.linuxtools.internal.lttng2.control.ui.views.dialogs; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.ITraceControlComponent; import org.eclipse.rse.core.model.IHost; /** diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/ImportConfirmationDialog.java b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/dialogs/ImportConfirmationDialog.java similarity index 97% rename from org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/ImportConfirmationDialog.java rename to org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/dialogs/ImportConfirmationDialog.java index f66c5d293a..d58d8234d3 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/ImportConfirmationDialog.java +++ b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/dialogs/ImportConfirmationDialog.java @@ -9,13 +9,13 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs; +package org.eclipse.linuxtools.internal.lttng2.control.ui.views.dialogs; import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.jface.dialogs.MessageDialog; -import org.eclipse.linuxtools.internal.lttng2.ui.Activator; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.messages.Messages; +import org.eclipse.linuxtools.internal.lttng2.control.ui.Activator; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.messages.Messages; import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionAdapter; import org.eclipse.swt.events.SelectionEvent; diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/ImportDialog.java b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/dialogs/ImportDialog.java similarity index 98% rename from org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/ImportDialog.java rename to org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/dialogs/ImportDialog.java index 9df737dd22..7256048a46 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/ImportDialog.java +++ b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/dialogs/ImportDialog.java @@ -11,7 +11,7 @@ * Bernd Hufmann - Added handling of streamed traces * Marc-Andre Laperle - Use common method to get opened tmf projects **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs; +package org.eclipse.linuxtools.internal.lttng2.control.ui.views.dialogs; import java.util.ArrayList; import java.util.List; @@ -27,10 +27,10 @@ import org.eclipse.jface.viewers.CheckStateChangedEvent; import org.eclipse.jface.viewers.CheckboxTreeViewer; import org.eclipse.jface.viewers.ICheckStateListener; import org.eclipse.jface.window.Window; -import org.eclipse.linuxtools.internal.lttng2.ui.Activator; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.messages.Messages; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceSessionComponent; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.remote.IRemoteSystemProxy; +import org.eclipse.linuxtools.internal.lttng2.control.ui.Activator; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.messages.Messages; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceSessionComponent; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.remote.IRemoteSystemProxy; import org.eclipse.linuxtools.tmf.ui.project.model.TmfTraceFolder; import org.eclipse.linuxtools.tmf.ui.project.model.TraceUtils; import org.eclipse.rse.core.subsystems.RemoteChildrenContentsType; diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/ImportFileInfo.java b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/dialogs/ImportFileInfo.java similarity index 98% rename from org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/ImportFileInfo.java rename to org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/dialogs/ImportFileInfo.java index d8753c8e31..f21b5076f2 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/ImportFileInfo.java +++ b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/dialogs/ImportFileInfo.java @@ -9,7 +9,7 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs; +package org.eclipse.linuxtools.internal.lttng2.control.ui.views.dialogs; import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile; diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/NewConnectionDialog.java b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/dialogs/NewConnectionDialog.java similarity index 97% rename from org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/NewConnectionDialog.java rename to org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/dialogs/NewConnectionDialog.java index 2bb0c03c9d..24c6f74f55 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/NewConnectionDialog.java +++ b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/dialogs/NewConnectionDialog.java @@ -9,17 +9,17 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs; +package org.eclipse.linuxtools.internal.lttng2.control.ui.views.dialogs; import java.util.Arrays; import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.jface.dialogs.MessageDialog; -import org.eclipse.linuxtools.internal.lttng2.ui.Activator; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.messages.Messages; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.remote.IRemoteSystemProxy; +import org.eclipse.linuxtools.internal.lttng2.control.ui.Activator; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.messages.Messages; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.ITraceControlComponent; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.remote.IRemoteSystemProxy; import org.eclipse.rse.core.model.IHost; import org.eclipse.swt.SWT; import org.eclipse.swt.custom.CCombo; diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/TraceControlDialogFactory.java b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/dialogs/TraceControlDialogFactory.java similarity index 99% rename from org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/TraceControlDialogFactory.java rename to org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/dialogs/TraceControlDialogFactory.java index 21be9478fe..fb87a70a2f 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/TraceControlDialogFactory.java +++ b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/dialogs/TraceControlDialogFactory.java @@ -9,7 +9,7 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs; +package org.eclipse.linuxtools.internal.lttng2.control.ui.views.dialogs; import org.eclipse.ui.PlatformUI; diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/AddContextOnChannelHandler.java b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/handlers/AddContextOnChannelHandler.java similarity index 91% rename from org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/AddContextOnChannelHandler.java rename to org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/handlers/AddContextOnChannelHandler.java index d406c49a84..fc3d28a4a3 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/AddContextOnChannelHandler.java +++ b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/handlers/AddContextOnChannelHandler.java @@ -9,7 +9,7 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.ui.views.control.handlers; +package org.eclipse.linuxtools.internal.lttng2.control.ui.views.handlers; import java.util.Iterator; import java.util.List; @@ -18,10 +18,10 @@ import org.eclipse.core.commands.ExecutionException; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.StructuredSelection; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceSessionState; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.ControlView; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceChannelComponent; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceSessionComponent; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.TraceSessionState; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.ControlView; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceChannelComponent; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceSessionComponent; import org.eclipse.ui.IWorkbenchPage; /** diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/AddContextOnDomainHandler.java b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/handlers/AddContextOnDomainHandler.java similarity index 91% rename from org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/AddContextOnDomainHandler.java rename to org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/handlers/AddContextOnDomainHandler.java index 407599551a..d7df3133ed 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/AddContextOnDomainHandler.java +++ b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/handlers/AddContextOnDomainHandler.java @@ -9,7 +9,7 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.ui.views.control.handlers; +package org.eclipse.linuxtools.internal.lttng2.control.ui.views.handlers; import java.util.Iterator; import java.util.List; @@ -18,10 +18,10 @@ import org.eclipse.core.commands.ExecutionException; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.StructuredSelection; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceSessionState; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.ControlView; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceDomainComponent; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceSessionComponent; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.TraceSessionState; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.ControlView; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceDomainComponent; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceSessionComponent; import org.eclipse.ui.IWorkbenchPage; /** diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/AddContextOnEventHandler.java b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/handlers/AddContextOnEventHandler.java similarity index 91% rename from org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/AddContextOnEventHandler.java rename to org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/handlers/AddContextOnEventHandler.java index 1dbb47c133..62edf0a39f 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/AddContextOnEventHandler.java +++ b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/handlers/AddContextOnEventHandler.java @@ -9,7 +9,7 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.ui.views.control.handlers; +package org.eclipse.linuxtools.internal.lttng2.control.ui.views.handlers; import java.util.Iterator; import java.util.List; @@ -18,10 +18,10 @@ import org.eclipse.core.commands.ExecutionException; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.StructuredSelection; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceSessionState; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.ControlView; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceEventComponent; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceSessionComponent; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.TraceSessionState; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.ControlView; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceEventComponent; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceSessionComponent; import org.eclipse.ui.IWorkbenchPage; /** diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/AssignEventHandler.java b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/handlers/AssignEventHandler.java similarity index 91% rename from org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/AssignEventHandler.java rename to org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/handlers/AssignEventHandler.java index 2304b86833..39ba8fefad 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/AssignEventHandler.java +++ b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/handlers/AssignEventHandler.java @@ -10,7 +10,7 @@ * Bernd Hufmann - Initial API and implementation * Bernd Hufmann - Updated for support of LTTng Tools 2.1 **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.ui.views.control.handlers; +package org.eclipse.linuxtools.internal.lttng2.control.ui.views.handlers; import java.util.ArrayList; import java.util.Arrays; @@ -26,18 +26,18 @@ import org.eclipse.core.runtime.jobs.Job; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.jface.window.Window; -import org.eclipse.linuxtools.internal.lttng2.ui.Activator; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.ControlView; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.IGetEventInfoDialog; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.TraceControlDialogFactory; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.messages.Messages; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.BaseEventComponent; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.KernelProviderComponent; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TargetNodeComponent; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceChannelComponent; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceSessionComponent; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.UstProviderComponent; +import org.eclipse.linuxtools.internal.lttng2.control.ui.Activator; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.ControlView; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.dialogs.IGetEventInfoDialog; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.dialogs.TraceControlDialogFactory; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.messages.Messages; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.ITraceControlComponent; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.BaseEventComponent; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.KernelProviderComponent; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TargetNodeComponent; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceChannelComponent; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceSessionComponent; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.UstProviderComponent; import org.eclipse.ui.IWorkbenchPage; /** diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/BaseAddContextHandler.java b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/handlers/BaseAddContextHandler.java similarity index 93% rename from org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/BaseAddContextHandler.java rename to org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/handlers/BaseAddContextHandler.java index bf4bf64fd6..bba85505b6 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/BaseAddContextHandler.java +++ b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/handlers/BaseAddContextHandler.java @@ -9,7 +9,7 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.ui.views.control.handlers; +package org.eclipse.linuxtools.internal.lttng2.control.ui.views.handlers; import java.util.List; @@ -20,10 +20,10 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.jobs.Job; import org.eclipse.jface.window.Window; -import org.eclipse.linuxtools.internal.lttng2.ui.Activator; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.IAddContextDialog; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.TraceControlDialogFactory; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.messages.Messages; +import org.eclipse.linuxtools.internal.lttng2.control.ui.Activator; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.dialogs.IAddContextDialog; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.dialogs.TraceControlDialogFactory; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.messages.Messages; import org.eclipse.ui.IWorkbenchWindow; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.progress.UIJob; diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/BaseControlViewHandler.java b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/handlers/BaseControlViewHandler.java similarity index 92% rename from org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/BaseControlViewHandler.java rename to org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/handlers/BaseControlViewHandler.java index 8135709af0..8f36de1e6f 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/BaseControlViewHandler.java +++ b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/handlers/BaseControlViewHandler.java @@ -9,7 +9,7 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.ui.views.control.handlers; +package org.eclipse.linuxtools.internal.lttng2.control.ui.views.handlers; import java.util.concurrent.locks.ReentrantLock; @@ -19,9 +19,9 @@ 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.internal.lttng2.ui.Activator; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.ControlView; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.messages.Messages; +import org.eclipse.linuxtools.internal.lttng2.control.ui.Activator; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.ControlView; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.messages.Messages; import org.eclipse.ui.IWorkbenchPage; import org.eclipse.ui.IWorkbenchPart; import org.eclipse.ui.IWorkbenchWindow; diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/BaseEnableChannelHandler.java b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/handlers/BaseEnableChannelHandler.java similarity index 90% rename from org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/BaseEnableChannelHandler.java rename to org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/handlers/BaseEnableChannelHandler.java index a6cf12f3b8..0b3f65d9a2 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/BaseEnableChannelHandler.java +++ b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/handlers/BaseEnableChannelHandler.java @@ -9,7 +9,7 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.ui.views.control.handlers; +package org.eclipse.linuxtools.internal.lttng2.control.ui.views.handlers; import java.util.ArrayList; import java.util.List; @@ -21,12 +21,12 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.jobs.Job; import org.eclipse.jface.window.Window; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.IChannelInfo; -import org.eclipse.linuxtools.internal.lttng2.ui.Activator; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.IEnableChannelDialog; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.TraceControlDialogFactory; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.messages.Messages; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceDomainComponent; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.IChannelInfo; +import org.eclipse.linuxtools.internal.lttng2.control.ui.Activator; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.dialogs.IEnableChannelDialog; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.dialogs.TraceControlDialogFactory; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.messages.Messages; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceDomainComponent; /** *

diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/BaseEnableEventHandler.java b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/handlers/BaseEnableEventHandler.java similarity index 92% rename from org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/BaseEnableEventHandler.java rename to org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/handlers/BaseEnableEventHandler.java index 4e0fb71762..d4a39e90f7 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/BaseEnableEventHandler.java +++ b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/handlers/BaseEnableEventHandler.java @@ -10,7 +10,7 @@ * Bernd Hufmann - Initial API and implementation * Bernd Hufmann - Updated for support of LTTng Tools 2.1 **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.ui.views.control.handlers; +package org.eclipse.linuxtools.internal.lttng2.control.ui.views.handlers; import java.util.List; @@ -21,16 +21,16 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.jobs.Job; import org.eclipse.jface.window.Window; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.LogLevelType; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceLogLevel; -import org.eclipse.linuxtools.internal.lttng2.ui.Activator; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.IEnableEventsDialog; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.TraceControlDialogFactory; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.messages.Messages; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TargetNodeComponent; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceDomainComponent; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceProviderGroup; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.LogLevelType; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.TraceLogLevel; +import org.eclipse.linuxtools.internal.lttng2.control.ui.Activator; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.dialogs.IEnableEventsDialog; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.dialogs.TraceControlDialogFactory; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.messages.Messages; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.ITraceControlComponent; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TargetNodeComponent; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceDomainComponent; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceProviderGroup; import org.eclipse.ui.IWorkbenchWindow; import org.eclipse.ui.PlatformUI; diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/BaseNodeHandler.java b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/handlers/BaseNodeHandler.java similarity index 92% rename from org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/BaseNodeHandler.java rename to org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/handlers/BaseNodeHandler.java index e922fb203e..e3f234c631 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/BaseNodeHandler.java +++ b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/handlers/BaseNodeHandler.java @@ -9,12 +9,12 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.ui.views.control.handlers; +package org.eclipse.linuxtools.internal.lttng2.control.ui.views.handlers; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.StructuredSelection; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.ControlView; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TargetNodeComponent; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.ControlView; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TargetNodeComponent; import org.eclipse.ui.IWorkbenchPage; /** diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/CalibrateHandler.java b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/handlers/CalibrateHandler.java similarity index 91% rename from org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/CalibrateHandler.java rename to org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/handlers/CalibrateHandler.java index d31250afed..521c2ee86a 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/CalibrateHandler.java +++ b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/handlers/CalibrateHandler.java @@ -9,7 +9,7 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.ui.views.control.handlers; +package org.eclipse.linuxtools.internal.lttng2.control.ui.views.handlers; import java.util.Iterator; @@ -21,11 +21,11 @@ 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.internal.lttng2.ui.Activator; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.ControlView; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.messages.Messages; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceDomainComponent; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceSessionComponent; +import org.eclipse.linuxtools.internal.lttng2.control.ui.Activator; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.ControlView; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.messages.Messages; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceDomainComponent; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceSessionComponent; import org.eclipse.ui.IWorkbenchPage; import org.eclipse.ui.IWorkbenchWindow; import org.eclipse.ui.PlatformUI; diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/ChangeChannelStateHandler.java b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/handlers/ChangeChannelStateHandler.java similarity index 95% rename from org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/ChangeChannelStateHandler.java rename to org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/handlers/ChangeChannelStateHandler.java index 2863449cb7..125f06378a 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/ChangeChannelStateHandler.java +++ b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/handlers/ChangeChannelStateHandler.java @@ -9,7 +9,7 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.ui.views.control.handlers; +package org.eclipse.linuxtools.internal.lttng2.control.ui.views.handlers; import java.util.ArrayList; import java.util.Iterator; @@ -23,13 +23,13 @@ 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.internal.lttng2.core.control.model.TraceEnablement; -import org.eclipse.linuxtools.internal.lttng2.ui.Activator; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.ControlView; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.messages.Messages; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceChannelComponent; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceDomainComponent; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceSessionComponent; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.TraceEnablement; +import org.eclipse.linuxtools.internal.lttng2.control.ui.Activator; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.ControlView; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.messages.Messages; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceChannelComponent; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceDomainComponent; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceSessionComponent; import org.eclipse.ui.IWorkbenchPage; import org.eclipse.ui.IWorkbenchWindow; import org.eclipse.ui.PlatformUI; diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/ChangeEventStateHandler.java b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/handlers/ChangeEventStateHandler.java similarity index 94% rename from org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/ChangeEventStateHandler.java rename to org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/handlers/ChangeEventStateHandler.java index 65269be626..72c53c103e 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/ChangeEventStateHandler.java +++ b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/handlers/ChangeEventStateHandler.java @@ -9,7 +9,7 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.ui.views.control.handlers; +package org.eclipse.linuxtools.internal.lttng2.control.ui.views.handlers; import java.util.ArrayList; import java.util.Iterator; @@ -23,13 +23,13 @@ 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.internal.lttng2.core.control.model.TraceEnablement; -import org.eclipse.linuxtools.internal.lttng2.ui.Activator; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.ControlView; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.messages.Messages; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceChannelComponent; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceEventComponent; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceSessionComponent; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.TraceEnablement; +import org.eclipse.linuxtools.internal.lttng2.control.ui.Activator; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.ControlView; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.messages.Messages; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceChannelComponent; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceEventComponent; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceSessionComponent; import org.eclipse.ui.IWorkbenchPage; import org.eclipse.ui.IWorkbenchWindow; import org.eclipse.ui.PlatformUI; diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/ChangeSessionStateHandler.java b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/handlers/ChangeSessionStateHandler.java similarity index 93% rename from org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/ChangeSessionStateHandler.java rename to org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/handlers/ChangeSessionStateHandler.java index bbe1aab9d0..eb43ece9aa 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/ChangeSessionStateHandler.java +++ b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/handlers/ChangeSessionStateHandler.java @@ -9,7 +9,7 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.ui.views.control.handlers; +package org.eclipse.linuxtools.internal.lttng2.control.ui.views.handlers; import java.util.ArrayList; import java.util.Iterator; @@ -23,11 +23,11 @@ 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.internal.lttng2.core.control.model.TraceSessionState; -import org.eclipse.linuxtools.internal.lttng2.ui.Activator; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.ControlView; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.messages.Messages; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceSessionComponent; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.TraceSessionState; +import org.eclipse.linuxtools.internal.lttng2.control.ui.Activator; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.ControlView; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.messages.Messages; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceSessionComponent; import org.eclipse.ui.IWorkbenchPage; import org.eclipse.ui.IWorkbenchWindow; import org.eclipse.ui.PlatformUI; diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/ChannelCommandParameter.java b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/handlers/ChannelCommandParameter.java similarity index 91% rename from org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/ChannelCommandParameter.java rename to org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/handlers/ChannelCommandParameter.java index 0e7a711f29..fc0f7638e5 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/ChannelCommandParameter.java +++ b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/handlers/ChannelCommandParameter.java @@ -9,10 +9,10 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.ui.views.control.handlers; +package org.eclipse.linuxtools.internal.lttng2.control.ui.views.handlers; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceChannelComponent; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceSessionComponent; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceChannelComponent; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceSessionComponent; /** * Class containing parameter for the command execution. diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/CommandParameter.java b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/handlers/CommandParameter.java similarity index 94% rename from org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/CommandParameter.java rename to org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/handlers/CommandParameter.java index e6dc8a10d9..a469561380 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/CommandParameter.java +++ b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/handlers/CommandParameter.java @@ -9,9 +9,9 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.ui.views.control.handlers; +package org.eclipse.linuxtools.internal.lttng2.control.ui.views.handlers; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceSessionComponent; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceSessionComponent; /** * Class containing parameter for the command execution. diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/ConnectHandler.java b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/handlers/ConnectHandler.java similarity index 92% rename from org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/ConnectHandler.java rename to org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/handlers/ConnectHandler.java index 9aac85db08..b779adaab5 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/ConnectHandler.java +++ b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/handlers/ConnectHandler.java @@ -9,11 +9,11 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.ui.views.control.handlers; +package org.eclipse.linuxtools.internal.lttng2.control.ui.views.handlers; import org.eclipse.core.commands.ExecutionEvent; import org.eclipse.core.commands.ExecutionException; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.TargetNodeState; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.TargetNodeState; /** *

diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/CreateSessionHandler.java b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/handlers/CreateSessionHandler.java similarity index 89% rename from org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/CreateSessionHandler.java rename to org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/handlers/CreateSessionHandler.java index 88366bacf2..866670017a 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/CreateSessionHandler.java +++ b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/handlers/CreateSessionHandler.java @@ -10,7 +10,7 @@ * Bernd Hufmann - Initial API and implementation * Bernd Hufmann - Updated for support of LTTng Tools 2.1 **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.ui.views.control.handlers; +package org.eclipse.linuxtools.internal.lttng2.control.ui.views.handlers; import org.eclipse.core.commands.ExecutionEvent; import org.eclipse.core.commands.ExecutionException; @@ -21,12 +21,12 @@ import org.eclipse.core.runtime.jobs.Job; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.jface.window.Window; -import org.eclipse.linuxtools.internal.lttng2.ui.Activator; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.ControlView; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.ICreateSessionDialog; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.TraceControlDialogFactory; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.messages.Messages; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceSessionGroup; +import org.eclipse.linuxtools.internal.lttng2.control.ui.Activator; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.ControlView; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.dialogs.ICreateSessionDialog; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.dialogs.TraceControlDialogFactory; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.messages.Messages; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceSessionGroup; import org.eclipse.ui.IWorkbenchPage; /** diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/DeleteHandler.java b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/handlers/DeleteHandler.java similarity index 90% rename from org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/DeleteHandler.java rename to org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/handlers/DeleteHandler.java index 8ef4676d3b..b9437e5838 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/DeleteHandler.java +++ b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/handlers/DeleteHandler.java @@ -9,12 +9,12 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.ui.views.control.handlers; +package org.eclipse.linuxtools.internal.lttng2.control.ui.views.handlers; import org.eclipse.core.commands.ExecutionEvent; import org.eclipse.core.commands.ExecutionException; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.TargetNodeState; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.TargetNodeState; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.ITraceControlComponent; /** *

diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/DestroySessionHandler.java b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/handlers/DestroySessionHandler.java similarity index 89% rename from org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/DestroySessionHandler.java rename to org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/handlers/DestroySessionHandler.java index 3f341d1c30..2735d930e3 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/DestroySessionHandler.java +++ b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/handlers/DestroySessionHandler.java @@ -9,7 +9,7 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.ui.views.control.handlers; +package org.eclipse.linuxtools.internal.lttng2.control.ui.views.handlers; import java.util.ArrayList; import java.util.Iterator; @@ -23,14 +23,14 @@ 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.internal.lttng2.core.control.model.TraceSessionState; -import org.eclipse.linuxtools.internal.lttng2.ui.Activator; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.ControlView; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.IConfirmDialog; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.TraceControlDialogFactory; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.messages.Messages; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceSessionComponent; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceSessionGroup; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.TraceSessionState; +import org.eclipse.linuxtools.internal.lttng2.control.ui.Activator; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.ControlView; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.dialogs.IConfirmDialog; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.dialogs.TraceControlDialogFactory; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.messages.Messages; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceSessionComponent; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceSessionGroup; import org.eclipse.ui.IWorkbenchPage; import org.eclipse.ui.IWorkbenchWindow; import org.eclipse.ui.PlatformUI; diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/DisableChannelHandler.java b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/handlers/DisableChannelHandler.java similarity index 89% rename from org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/DisableChannelHandler.java rename to org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/handlers/DisableChannelHandler.java index 71c742280e..cc1337fe12 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/DisableChannelHandler.java +++ b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/handlers/DisableChannelHandler.java @@ -9,14 +9,14 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.ui.views.control.handlers; +package org.eclipse.linuxtools.internal.lttng2.control.ui.views.handlers; import java.util.List; import org.eclipse.core.commands.ExecutionException; import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceEnablement; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceDomainComponent; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.TraceEnablement; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceDomainComponent; /** *

diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/DisableEventHandler.java b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/handlers/DisableEventHandler.java similarity index 89% rename from org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/DisableEventHandler.java rename to org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/handlers/DisableEventHandler.java index bf578d4051..8503b8b76c 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/DisableEventHandler.java +++ b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/handlers/DisableEventHandler.java @@ -9,14 +9,14 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.ui.views.control.handlers; +package org.eclipse.linuxtools.internal.lttng2.control.ui.views.handlers; import java.util.List; import org.eclipse.core.commands.ExecutionException; import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceEnablement; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceChannelComponent; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.TraceEnablement; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceChannelComponent; /** *

diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/DisconnectHandler.java b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/handlers/DisconnectHandler.java similarity index 92% rename from org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/DisconnectHandler.java rename to org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/handlers/DisconnectHandler.java index dc1c3d96b3..24c0db0329 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/DisconnectHandler.java +++ b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/handlers/DisconnectHandler.java @@ -9,11 +9,11 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.ui.views.control.handlers; +package org.eclipse.linuxtools.internal.lttng2.control.ui.views.handlers; import org.eclipse.core.commands.ExecutionEvent; import org.eclipse.core.commands.ExecutionException; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.TargetNodeState; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.TargetNodeState; /** *

diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/DomainCommandParameter.java b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/handlers/DomainCommandParameter.java similarity index 91% rename from org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/DomainCommandParameter.java rename to org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/handlers/DomainCommandParameter.java index 424734c746..f233c55572 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/DomainCommandParameter.java +++ b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/handlers/DomainCommandParameter.java @@ -9,10 +9,10 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.ui.views.control.handlers; +package org.eclipse.linuxtools.internal.lttng2.control.ui.views.handlers; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceDomainComponent; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceSessionComponent; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceDomainComponent; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceSessionComponent; /** * Class containing parameter for the command execution. diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/EnableChannelHandler.java b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/handlers/EnableChannelHandler.java similarity index 89% rename from org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/EnableChannelHandler.java rename to org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/handlers/EnableChannelHandler.java index ed9eef6f0f..4c44129966 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/EnableChannelHandler.java +++ b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/handlers/EnableChannelHandler.java @@ -9,14 +9,14 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.ui.views.control.handlers; +package org.eclipse.linuxtools.internal.lttng2.control.ui.views.handlers; import java.util.List; import org.eclipse.core.commands.ExecutionException; import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceEnablement; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceDomainComponent; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.TraceEnablement; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceDomainComponent; /** *

diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/EnableChannelOnDomainHandler.java b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/handlers/EnableChannelOnDomainHandler.java similarity index 90% rename from org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/EnableChannelOnDomainHandler.java rename to org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/handlers/EnableChannelOnDomainHandler.java index fdc750bab0..a718662837 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/EnableChannelOnDomainHandler.java +++ b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/handlers/EnableChannelOnDomainHandler.java @@ -9,7 +9,7 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.ui.views.control.handlers; +package org.eclipse.linuxtools.internal.lttng2.control.ui.views.handlers; import java.util.Iterator; import java.util.List; @@ -18,11 +18,11 @@ import org.eclipse.core.commands.ExecutionException; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.StructuredSelection; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.IChannelInfo; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceSessionState; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.ControlView; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceDomainComponent; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceSessionComponent; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.IChannelInfo; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.TraceSessionState; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.ControlView; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceDomainComponent; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceSessionComponent; import org.eclipse.ui.IWorkbenchPage; /** diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/EnableChannelOnSessionHandler.java b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/handlers/EnableChannelOnSessionHandler.java similarity index 89% rename from org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/EnableChannelOnSessionHandler.java rename to org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/handlers/EnableChannelOnSessionHandler.java index a57f4a7b1d..1f22ff788d 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/EnableChannelOnSessionHandler.java +++ b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/handlers/EnableChannelOnSessionHandler.java @@ -9,7 +9,7 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.ui.views.control.handlers; +package org.eclipse.linuxtools.internal.lttng2.control.ui.views.handlers; import java.util.Iterator; import java.util.List; @@ -18,11 +18,11 @@ import org.eclipse.core.commands.ExecutionException; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.StructuredSelection; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.IChannelInfo; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceSessionState; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.ControlView; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceDomainComponent; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceSessionComponent; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.IChannelInfo; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.TraceSessionState; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.ControlView; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceDomainComponent; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceSessionComponent; import org.eclipse.ui.IWorkbenchPage; /** diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/EnableEventHandler.java b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/handlers/EnableEventHandler.java similarity index 89% rename from org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/EnableEventHandler.java rename to org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/handlers/EnableEventHandler.java index 9f52597e3e..fc59ad9714 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/EnableEventHandler.java +++ b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/handlers/EnableEventHandler.java @@ -9,14 +9,14 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.ui.views.control.handlers; +package org.eclipse.linuxtools.internal.lttng2.control.ui.views.handlers; import java.util.List; import org.eclipse.core.commands.ExecutionException; import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceEnablement; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceChannelComponent; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.TraceEnablement; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceChannelComponent; /** *

diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/EnableEventOnChannelHandler.java b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/handlers/EnableEventOnChannelHandler.java similarity index 91% rename from org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/EnableEventOnChannelHandler.java rename to org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/handlers/EnableEventOnChannelHandler.java index af7ff751bd..538c2b4c3c 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/EnableEventOnChannelHandler.java +++ b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/handlers/EnableEventOnChannelHandler.java @@ -10,7 +10,7 @@ * Bernd Hufmann - Initial API and implementation * Bernd Hufmann - Updated for support of LTTng Tools 2.1 **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.ui.views.control.handlers; +package org.eclipse.linuxtools.internal.lttng2.control.ui.views.handlers; import java.util.Iterator; import java.util.List; @@ -19,12 +19,12 @@ import org.eclipse.core.commands.ExecutionException; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.StructuredSelection; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.LogLevelType; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceLogLevel; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.ControlView; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceChannelComponent; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceDomainComponent; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceSessionComponent; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.LogLevelType; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.TraceLogLevel; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.ControlView; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceChannelComponent; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceDomainComponent; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceSessionComponent; import org.eclipse.ui.IWorkbenchPage; /** diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/EnableEventOnDomainHandler.java b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/handlers/EnableEventOnDomainHandler.java similarity index 91% rename from org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/EnableEventOnDomainHandler.java rename to org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/handlers/EnableEventOnDomainHandler.java index 623713058b..1abb3fcea1 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/EnableEventOnDomainHandler.java +++ b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/handlers/EnableEventOnDomainHandler.java @@ -10,7 +10,7 @@ * Bernd Hufmann - Initial API and implementation * Bernd Hufmann - Updated for support of LTTng Tools 2.1 **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.ui.views.control.handlers; +package org.eclipse.linuxtools.internal.lttng2.control.ui.views.handlers; import java.util.Iterator; import java.util.List; @@ -19,12 +19,12 @@ import org.eclipse.core.commands.ExecutionException; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.StructuredSelection; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.LogLevelType; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceLogLevel; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceSessionState; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.ControlView; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceDomainComponent; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceSessionComponent; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.LogLevelType; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.TraceLogLevel; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.TraceSessionState; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.ControlView; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceDomainComponent; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceSessionComponent; import org.eclipse.ui.IWorkbenchPage; /** diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/EnableEventOnSessionHandler.java b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/handlers/EnableEventOnSessionHandler.java similarity index 90% rename from org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/EnableEventOnSessionHandler.java rename to org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/handlers/EnableEventOnSessionHandler.java index bea127ae73..dc4c89b86c 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/EnableEventOnSessionHandler.java +++ b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/handlers/EnableEventOnSessionHandler.java @@ -10,7 +10,7 @@ * Bernd Hufmann - Initial API and implementation * Bernd Hufmann - Updated for support of LTTng Tools 2.1 **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.ui.views.control.handlers; +package org.eclipse.linuxtools.internal.lttng2.control.ui.views.handlers; import java.util.Iterator; import java.util.List; @@ -19,12 +19,12 @@ import org.eclipse.core.commands.ExecutionException; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.StructuredSelection; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.LogLevelType; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceLogLevel; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceSessionState; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.ControlView; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceDomainComponent; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceSessionComponent; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.LogLevelType; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.TraceLogLevel; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.TraceSessionState; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.ControlView; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceDomainComponent; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceSessionComponent; import org.eclipse.ui.IWorkbenchPage; /** diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/EventCommandParameter.java b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/handlers/EventCommandParameter.java similarity index 91% rename from org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/EventCommandParameter.java rename to org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/handlers/EventCommandParameter.java index e17f7a3ea9..411e061e07 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/EventCommandParameter.java +++ b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/handlers/EventCommandParameter.java @@ -9,10 +9,10 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.ui.views.control.handlers; +package org.eclipse.linuxtools.internal.lttng2.control.ui.views.handlers; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceEventComponent; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceSessionComponent; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceEventComponent; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceSessionComponent; /** * Class containing parameter for a command execution. diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/ImportHandler.java b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/handlers/ImportHandler.java similarity index 95% rename from org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/ImportHandler.java rename to org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/handlers/ImportHandler.java index 838722c1a7..cedf7a4cba 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/ImportHandler.java +++ b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/handlers/ImportHandler.java @@ -11,7 +11,7 @@ * Bernd Hufmann - Updated for support of streamed traces * Patrick Tasse - Add support for source location **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.ui.views.control.handlers; +package org.eclipse.linuxtools.internal.lttng2.control.ui.views.handlers; import java.net.URI; import java.net.URISyntaxException; @@ -37,14 +37,14 @@ import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.jface.window.Window; import org.eclipse.jface.wizard.WizardDialog; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceSessionState; -import org.eclipse.linuxtools.internal.lttng2.ui.Activator; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.ControlView; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.IImportDialog; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.ImportFileInfo; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.TraceControlDialogFactory; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.messages.Messages; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceSessionComponent; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.TraceSessionState; +import org.eclipse.linuxtools.internal.lttng2.control.ui.Activator; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.ControlView; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.dialogs.IImportDialog; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.dialogs.ImportFileInfo; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.dialogs.TraceControlDialogFactory; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.messages.Messages; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceSessionComponent; import org.eclipse.linuxtools.tmf.core.TmfCommonConstants; import org.eclipse.linuxtools.tmf.core.project.model.TmfTraceType; import org.eclipse.linuxtools.tmf.core.project.model.TraceTypeHelper; diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/NewConnectionHandler.java b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/handlers/NewConnectionHandler.java similarity index 93% rename from org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/NewConnectionHandler.java rename to org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/handlers/NewConnectionHandler.java index 00d173c7f5..41271b40dd 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/NewConnectionHandler.java +++ b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/handlers/NewConnectionHandler.java @@ -10,7 +10,7 @@ * Bernd Hufmann - Initial API and implementation * Anna Dushistova(Montavista) - [382684] Allow reusing already defined connections that have Files and Shells subsystems **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.ui.views.control.handlers; +package org.eclipse.linuxtools.internal.lttng2.control.ui.views.handlers; import java.util.ArrayList; import java.util.Arrays; @@ -19,13 +19,13 @@ import org.eclipse.core.commands.ExecutionEvent; import org.eclipse.core.commands.ExecutionException; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.window.Window; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.ControlView; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.INewConnectionDialog; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.TraceControlDialogFactory; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.messages.Messages; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TargetNodeComponent; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.remote.IRemoteSystemProxy; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.ControlView; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.dialogs.INewConnectionDialog; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.dialogs.TraceControlDialogFactory; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.messages.Messages; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.ITraceControlComponent; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TargetNodeComponent; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.remote.IRemoteSystemProxy; import org.eclipse.rse.core.IRSESystemType; import org.eclipse.rse.core.RSECorePlugin; import org.eclipse.rse.core.model.IHost; diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/RefreshHandler.java b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/handlers/RefreshHandler.java similarity index 91% rename from org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/RefreshHandler.java rename to org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/handlers/RefreshHandler.java index 9ef25181aa..ba28a4de72 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/RefreshHandler.java +++ b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/handlers/RefreshHandler.java @@ -9,7 +9,7 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.ui.views.control.handlers; +package org.eclipse.linuxtools.internal.lttng2.control.ui.views.handlers; import java.util.Iterator; @@ -17,10 +17,10 @@ import org.eclipse.core.commands.ExecutionEvent; import org.eclipse.core.commands.ExecutionException; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.StructuredSelection; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.TargetNodeState; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.ControlView; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TargetNodeComponent; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceControlComponent; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.TargetNodeState; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.ControlView; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TargetNodeComponent; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceControlComponent; import org.eclipse.ui.IWorkbenchPage; /** diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/SnaphshotHandler.java b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/handlers/SnaphshotHandler.java similarity index 92% rename from org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/SnaphshotHandler.java rename to org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/handlers/SnaphshotHandler.java index fe0c5e35a4..25b52c4089 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/SnaphshotHandler.java +++ b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/handlers/SnaphshotHandler.java @@ -9,7 +9,7 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.ui.views.control.handlers; +package org.eclipse.linuxtools.internal.lttng2.control.ui.views.handlers; import java.util.ArrayList; import java.util.Iterator; @@ -24,11 +24,11 @@ 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.internal.lttng2.core.control.model.TraceSessionState; -import org.eclipse.linuxtools.internal.lttng2.ui.Activator; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.ControlView; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.messages.Messages; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceSessionComponent; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.TraceSessionState; +import org.eclipse.linuxtools.internal.lttng2.control.ui.Activator; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.ControlView; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.messages.Messages; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceSessionComponent; import org.eclipse.ui.IWorkbenchPage; /** diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/StartHandler.java b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/handlers/StartHandler.java similarity index 88% rename from org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/StartHandler.java rename to org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/handlers/StartHandler.java index 1ab751488c..841cce33f4 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/StartHandler.java +++ b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/handlers/StartHandler.java @@ -9,12 +9,12 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.ui.views.control.handlers; +package org.eclipse.linuxtools.internal.lttng2.control.ui.views.handlers; import org.eclipse.core.commands.ExecutionException; import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceSessionState; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceSessionComponent; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.TraceSessionState; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceSessionComponent; /** *

diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/StopHandler.java b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/handlers/StopHandler.java similarity index 88% rename from org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/StopHandler.java rename to org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/handlers/StopHandler.java index 14ea6035c7..fc44dd676a 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/StopHandler.java +++ b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/handlers/StopHandler.java @@ -9,12 +9,12 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.ui.views.control.handlers; +package org.eclipse.linuxtools.internal.lttng2.control.ui.views.handlers; import org.eclipse.core.commands.ExecutionException; import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceSessionState; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceSessionComponent; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.TraceSessionState; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceSessionComponent; /** *

diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/logging/ControlCommandLogger.java b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/logging/ControlCommandLogger.java similarity index 96% rename from org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/logging/ControlCommandLogger.java rename to org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/logging/ControlCommandLogger.java index 61ecdf8b51..c308483c0b 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/logging/ControlCommandLogger.java +++ b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/logging/ControlCommandLogger.java @@ -9,13 +9,13 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.ui.views.control.logging; +package org.eclipse.linuxtools.internal.lttng2.control.ui.views.logging; import java.io.BufferedWriter; import java.io.FileWriter; import java.io.IOException; -import org.eclipse.linuxtools.internal.lttng2.ui.Activator; +import org.eclipse.linuxtools.internal.lttng2.control.ui.Activator; /** *

diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/messages/Messages.java b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/messages/Messages.java similarity index 98% rename from org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/messages/Messages.java rename to org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/messages/Messages.java index 52982474ef..e1366ef159 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/messages/Messages.java +++ b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/messages/Messages.java @@ -10,7 +10,7 @@ * Bernd Hufmann - Initial API and implementation * Bernd Hufmann - Updated for support of LTTng Tools 2.1 *******************************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.ui.views.control.messages; +package org.eclipse.linuxtools.internal.lttng2.control.ui.views.messages; import org.eclipse.osgi.util.NLS; @@ -22,8 +22,9 @@ import org.eclipse.osgi.util.NLS; * @author Bernd Hufmann */ @SuppressWarnings("javadoc") -final public class Messages extends NLS { - private static final String BUNDLE_NAME = "org.eclipse.linuxtools.internal.lttng2.ui.views.control.messages.messages"; //$NON-NLS-1$ +public final class Messages extends NLS { + + private static final String BUNDLE_NAME = "org.eclipse.linuxtools.internal.lttng2.control.ui.views.messages.messages"; //$NON-NLS-1$ public static String EnableChannelDialog_DefaultMessage; diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/messages/messages.properties b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/messages/messages.properties similarity index 100% rename from org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/messages/messages.properties rename to org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/messages/messages.properties diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/ITraceControlComponent.java b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/model/ITraceControlComponent.java similarity index 96% rename from org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/ITraceControlComponent.java rename to org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/model/ITraceControlComponent.java index b5e348eaf7..0a6dacf2d0 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/ITraceControlComponent.java +++ b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/model/ITraceControlComponent.java @@ -9,13 +9,13 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.ui.views.control.model; +package org.eclipse.linuxtools.internal.lttng2.control.ui.views.model; import java.util.List; import org.eclipse.core.runtime.IAdaptable; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.TargetNodeState; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.service.ILttngControlService; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.TargetNodeState; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.service.ILttngControlService; import org.eclipse.swt.graphics.Image; /** diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/ITraceControlComponentChangedListener.java b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/model/ITraceControlComponentChangedListener.java similarity index 95% rename from org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/ITraceControlComponentChangedListener.java rename to org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/model/ITraceControlComponentChangedListener.java index e11b811478..5e60557cea 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/ITraceControlComponentChangedListener.java +++ b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/model/ITraceControlComponentChangedListener.java @@ -9,7 +9,7 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.ui.views.control.model; +package org.eclipse.linuxtools.internal.lttng2.control.ui.views.model; /** *

diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/BaseEventComponent.java b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/model/impl/BaseEventComponent.java similarity index 90% rename from org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/BaseEventComponent.java rename to org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/model/impl/BaseEventComponent.java index b9ecc27fba..8459b3f900 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/BaseEventComponent.java +++ b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/model/impl/BaseEventComponent.java @@ -10,15 +10,15 @@ * Bernd Hufmann - Initial API and implementation * Bernd Hufmann - Updated for support of LTTng Tools 2.1 **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl; - -import org.eclipse.linuxtools.internal.lttng2.core.control.model.IBaseEventInfo; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.IFieldInfo; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceEventType; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceLogLevel; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.impl.EventInfo; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.property.BaseEventPropertySource; +package org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl; + +import org.eclipse.linuxtools.internal.lttng2.control.core.model.IBaseEventInfo; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.IFieldInfo; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.TraceEventType; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.TraceLogLevel; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.impl.EventInfo; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.ITraceControlComponent; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.property.BaseEventPropertySource; import org.eclipse.ui.views.properties.IPropertySource; /** diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/KernelProviderComponent.java b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/model/impl/KernelProviderComponent.java similarity index 89% rename from org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/KernelProviderComponent.java rename to org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/model/impl/KernelProviderComponent.java index de54fb6571..803b60df98 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/KernelProviderComponent.java +++ b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/model/impl/KernelProviderComponent.java @@ -10,15 +10,15 @@ * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl; +package org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl; import java.util.Iterator; import java.util.List; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.IBaseEventInfo; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.messages.Messages; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.property.KernelProviderPropertySource; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.IBaseEventInfo; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.messages.Messages; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.ITraceControlComponent; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.property.KernelProviderPropertySource; import org.eclipse.ui.views.properties.IPropertySource; /** diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TargetNodeComponent.java b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/model/impl/TargetNodeComponent.java similarity index 95% rename from org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TargetNodeComponent.java rename to org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/model/impl/TargetNodeComponent.java index e6347bccca..f100ca0faf 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TargetNodeComponent.java +++ b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/model/impl/TargetNodeComponent.java @@ -10,7 +10,7 @@ * Bernd Hufmann - Initial API and implementation * Bernd Hufmann - Updated for support of LTTng Tools 2.1 **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl; +package org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl; import java.util.List; @@ -20,16 +20,16 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.jobs.Job; import org.eclipse.jface.dialogs.ErrorDialog; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.TargetNodeState; -import org.eclipse.linuxtools.internal.lttng2.ui.Activator; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.messages.Messages; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.property.TargetNodePropertySource; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.remote.ICommandShell; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.remote.IRemoteSystemProxy; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.remote.RemoteSystemProxy; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.service.ILttngControlService; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.service.LTTngControlServiceFactory; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.TargetNodeState; +import org.eclipse.linuxtools.internal.lttng2.control.ui.Activator; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.messages.Messages; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.ITraceControlComponent; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.property.TargetNodePropertySource; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.remote.ICommandShell; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.remote.IRemoteSystemProxy; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.remote.RemoteSystemProxy; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.service.ILttngControlService; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.service.LTTngControlServiceFactory; import org.eclipse.rse.core.RSECorePlugin; import org.eclipse.rse.core.model.IHost; import org.eclipse.rse.core.model.IRSECallback; diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TraceChannelComponent.java b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/model/impl/TraceChannelComponent.java similarity index 93% rename from org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TraceChannelComponent.java rename to org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/model/impl/TraceChannelComponent.java index fe025c6722..8ad26cf5cd 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TraceChannelComponent.java +++ b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/model/impl/TraceChannelComponent.java @@ -10,24 +10,24 @@ * Bernd Hufmann - Initial API and implementation * Bernd Hufmann - Updated for support of LTTng Tools 2.1 **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl; +package org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl; import java.util.ArrayList; import java.util.List; import org.eclipse.core.commands.ExecutionException; import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.IChannelInfo; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.IEventInfo; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.LogLevelType; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceEnablement; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceLogLevel; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.impl.ChannelInfo; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.impl.ProbeEventInfo; -import org.eclipse.linuxtools.internal.lttng2.ui.Activator; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.messages.Messages; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.property.TraceChannelPropertySource; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.IChannelInfo; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.IEventInfo; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.LogLevelType; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.TraceEnablement; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.TraceLogLevel; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.impl.ChannelInfo; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.impl.ProbeEventInfo; +import org.eclipse.linuxtools.internal.lttng2.control.ui.Activator; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.messages.Messages; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.ITraceControlComponent; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.property.TraceChannelPropertySource; import org.eclipse.swt.graphics.Image; import org.eclipse.ui.views.properties.IPropertySource; diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TraceControlComponent.java b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/model/impl/TraceControlComponent.java similarity index 96% rename from org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TraceControlComponent.java rename to org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/model/impl/TraceControlComponent.java index 1b6573815d..532b47235b 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TraceControlComponent.java +++ b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/model/impl/TraceControlComponent.java @@ -9,18 +9,18 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl; +package org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl; import java.util.ArrayList; import java.util.Iterator; import java.util.List; import org.eclipse.core.runtime.ListenerList; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.TargetNodeState; -import org.eclipse.linuxtools.internal.lttng2.ui.Activator; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponentChangedListener; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.service.ILttngControlService; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.TargetNodeState; +import org.eclipse.linuxtools.internal.lttng2.control.ui.Activator; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.ITraceControlComponent; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.ITraceControlComponentChangedListener; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.service.ILttngControlService; import org.eclipse.swt.graphics.Image; /** diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TraceControlContentProvider.java b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/model/impl/TraceControlContentProvider.java similarity index 93% rename from org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TraceControlContentProvider.java rename to org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/model/impl/TraceControlContentProvider.java index 6ad0cc881b..72ea1a5ed1 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TraceControlContentProvider.java +++ b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/model/impl/TraceControlContentProvider.java @@ -9,11 +9,11 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl; +package org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl; import org.eclipse.jface.viewers.ITreeContentProvider; import org.eclipse.jface.viewers.Viewer; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.ITraceControlComponent; /** *

diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TraceControlLabelProvider.java b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/model/impl/TraceControlLabelProvider.java similarity index 93% rename from org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TraceControlLabelProvider.java rename to org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/model/impl/TraceControlLabelProvider.java index fa97c94451..2364fb56ea 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TraceControlLabelProvider.java +++ b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/model/impl/TraceControlLabelProvider.java @@ -9,10 +9,10 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl; +package org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl; import org.eclipse.jface.viewers.ColumnLabelProvider; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.ITraceControlComponent; import org.eclipse.swt.graphics.Image; /** diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TraceControlPropertyTester.java b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/model/impl/TraceControlPropertyTester.java similarity index 96% rename from org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TraceControlPropertyTester.java rename to org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/model/impl/TraceControlPropertyTester.java index 5937f1920f..0d49b3a9be 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TraceControlPropertyTester.java +++ b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/model/impl/TraceControlPropertyTester.java @@ -10,7 +10,7 @@ * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl; +package org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl; import org.eclipse.core.expressions.PropertyTester; diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TraceControlRoot.java b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/model/impl/TraceControlRoot.java similarity index 95% rename from org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TraceControlRoot.java rename to org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/model/impl/TraceControlRoot.java index 445ed5a3bd..a02c54349a 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TraceControlRoot.java +++ b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/model/impl/TraceControlRoot.java @@ -9,7 +9,7 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl; +package org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl; /** diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TraceDomainComponent.java b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/model/impl/TraceDomainComponent.java similarity index 93% rename from org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TraceDomainComponent.java rename to org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/model/impl/TraceDomainComponent.java index eac9d65f1e..d233d95e2c 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TraceDomainComponent.java +++ b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/model/impl/TraceDomainComponent.java @@ -10,21 +10,21 @@ * Bernd Hufmann - Initial API and implementation * Bernd Hufmann - Updated for support of LTTng Tools 2.1 **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl; +package org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl; import java.util.List; import org.eclipse.core.commands.ExecutionException; import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.IChannelInfo; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.IDomainInfo; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.LogLevelType; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceLogLevel; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.impl.BufferType; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.impl.DomainInfo; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.messages.Messages; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.property.TraceDomainPropertySource; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.IChannelInfo; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.IDomainInfo; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.LogLevelType; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.TraceLogLevel; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.impl.BufferType; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.impl.DomainInfo; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.messages.Messages; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.ITraceControlComponent; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.property.TraceDomainPropertySource; import org.eclipse.ui.views.properties.IPropertySource; /** diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TraceEventComponent.java b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/model/impl/TraceEventComponent.java similarity index 91% rename from org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TraceEventComponent.java rename to org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/model/impl/TraceEventComponent.java index 31ce99c81c..9916d5d4bc 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TraceEventComponent.java +++ b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/model/impl/TraceEventComponent.java @@ -10,21 +10,21 @@ * Bernd Hufmann - Initial API and implementation * Bernd Hufmann - Updated for support of LTTng Tools 2.1 **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl; +package org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl; import java.util.List; import org.eclipse.core.commands.ExecutionException; import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.IEventInfo; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceEnablement; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceEventType; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceLogLevel; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.impl.EventInfo; -import org.eclipse.linuxtools.internal.lttng2.ui.Activator; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.messages.Messages; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.property.TraceEventPropertySource; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.IEventInfo; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.TraceEnablement; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.TraceEventType; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.TraceLogLevel; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.impl.EventInfo; +import org.eclipse.linuxtools.internal.lttng2.control.ui.Activator; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.messages.Messages; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.ITraceControlComponent; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.property.TraceEventPropertySource; import org.eclipse.swt.graphics.Image; import org.eclipse.ui.views.properties.IPropertySource; diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TraceProbeEventComponent.java b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/model/impl/TraceProbeEventComponent.java similarity index 92% rename from org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TraceProbeEventComponent.java rename to org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/model/impl/TraceProbeEventComponent.java index a361e9099a..a473be2478 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TraceProbeEventComponent.java +++ b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/model/impl/TraceProbeEventComponent.java @@ -9,12 +9,12 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl; +package org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.IEventInfo; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.impl.ProbeEventInfo; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.property.TraceProbeEventPropertySource; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.IEventInfo; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.impl.ProbeEventInfo; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.ITraceControlComponent; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.property.TraceProbeEventPropertySource; import org.eclipse.ui.views.properties.IPropertySource; diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TraceProviderGroup.java b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/model/impl/TraceProviderGroup.java similarity index 92% rename from org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TraceProviderGroup.java rename to org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/model/impl/TraceProviderGroup.java index ad513f4e4c..5fd9bc24b8 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TraceProviderGroup.java +++ b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/model/impl/TraceProviderGroup.java @@ -10,17 +10,17 @@ * Bernd Hufmann - Initial API and implementation * Bernd Hufmann - Updated for support of LTTng Tools 2.1 **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl; +package org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl; import java.util.Iterator; import java.util.List; import org.eclipse.core.commands.ExecutionException; import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.IBaseEventInfo; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.IUstProviderInfo; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.messages.Messages; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.IBaseEventInfo; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.IUstProviderInfo; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.messages.Messages; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.ITraceControlComponent; /** *

diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TraceSessionComponent.java b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/model/impl/TraceSessionComponent.java similarity index 94% rename from org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TraceSessionComponent.java rename to org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/model/impl/TraceSessionComponent.java index 471c60cc5a..9ea977406a 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TraceSessionComponent.java +++ b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/model/impl/TraceSessionComponent.java @@ -10,24 +10,24 @@ * Bernd Hufmann - Initial API and implementation * Bernd Hufmann - Updated for support of LTTng Tools 2.1 **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl; +package org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl; import java.util.List; import org.eclipse.core.commands.ExecutionException; import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.IChannelInfo; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.IDomainInfo; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.ISessionInfo; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.ISnapshotInfo; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.LogLevelType; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceLogLevel; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceSessionState; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.impl.SessionInfo; -import org.eclipse.linuxtools.internal.lttng2.ui.Activator; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.messages.Messages; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.property.TraceSessionPropertySource; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.IChannelInfo; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.IDomainInfo; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.ISessionInfo; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.ISnapshotInfo; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.LogLevelType; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.TraceLogLevel; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.TraceSessionState; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.impl.SessionInfo; +import org.eclipse.linuxtools.internal.lttng2.control.ui.Activator; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.messages.Messages; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.ITraceControlComponent; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.property.TraceSessionPropertySource; import org.eclipse.swt.graphics.Image; import org.eclipse.ui.views.properties.IPropertySource; diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TraceSessionGroup.java b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/model/impl/TraceSessionGroup.java similarity index 96% rename from org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TraceSessionGroup.java rename to org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/model/impl/TraceSessionGroup.java index b0563f8f4a..fafa425a26 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TraceSessionGroup.java +++ b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/model/impl/TraceSessionGroup.java @@ -10,13 +10,13 @@ * Bernd Hufmann - Initial API and implementation * Bernd Hufmann - Updated for support of LTTng Tools 2.1 **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl; +package org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl; import org.eclipse.core.commands.ExecutionException; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.NullProgressMonitor; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.ISessionInfo; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.ISessionInfo; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.ITraceControlComponent; /** *

diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/UstProviderComponent.java b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/model/impl/UstProviderComponent.java similarity index 88% rename from org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/UstProviderComponent.java rename to org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/model/impl/UstProviderComponent.java index c44015d11a..2149f725fe 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/UstProviderComponent.java +++ b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/model/impl/UstProviderComponent.java @@ -10,14 +10,14 @@ * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl; +package org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.IBaseEventInfo; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.IUstProviderInfo; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.impl.UstProviderInfo; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.messages.Messages; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.property.UstProviderPropertySource; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.IBaseEventInfo; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.IUstProviderInfo; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.impl.UstProviderInfo; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.messages.Messages; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.ITraceControlComponent; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.property.UstProviderPropertySource; import org.eclipse.ui.views.properties.IPropertySource; /** diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/preferences/ControlPreferenceInitializer.java b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/preferences/ControlPreferenceInitializer.java similarity index 96% rename from org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/preferences/ControlPreferenceInitializer.java rename to org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/preferences/ControlPreferenceInitializer.java index 85d27ea51c..5531645c1e 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/preferences/ControlPreferenceInitializer.java +++ b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/preferences/ControlPreferenceInitializer.java @@ -9,7 +9,7 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.ui.views.control.preferences; +package org.eclipse.linuxtools.internal.lttng2.control.ui.views.preferences; import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer; import org.eclipse.jface.preference.IPreferenceStore; diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/preferences/ControlPreferencePage.java b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/preferences/ControlPreferencePage.java similarity index 97% rename from org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/preferences/ControlPreferencePage.java rename to org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/preferences/ControlPreferencePage.java index 69275a6495..1cea6a322d 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/preferences/ControlPreferencePage.java +++ b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/preferences/ControlPreferencePage.java @@ -9,7 +9,7 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.ui.views.control.preferences; +package org.eclipse.linuxtools.internal.lttng2.control.ui.views.preferences; import org.eclipse.jface.preference.BooleanFieldEditor; import org.eclipse.jface.preference.FieldEditor; @@ -19,8 +19,8 @@ import org.eclipse.jface.preference.IntegerFieldEditor; import org.eclipse.jface.preference.RadioGroupFieldEditor; import org.eclipse.jface.preference.StringFieldEditor; import org.eclipse.jface.util.PropertyChangeEvent; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.logging.ControlCommandLogger; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.messages.Messages; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.logging.ControlCommandLogger; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.messages.Messages; import org.eclipse.ui.IWorkbench; import org.eclipse.ui.IWorkbenchPreferencePage; diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/preferences/ControlPreferences.java b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/preferences/ControlPreferences.java similarity index 98% rename from org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/preferences/ControlPreferences.java rename to org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/preferences/ControlPreferences.java index 261b28f008..8d0c8d0b2f 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/preferences/ControlPreferences.java +++ b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/preferences/ControlPreferences.java @@ -9,12 +9,12 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.ui.views.control.preferences; +package org.eclipse.linuxtools.internal.lttng2.control.ui.views.preferences; import java.io.File; import org.eclipse.jface.preference.IPreferenceStore; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.logging.ControlCommandLogger; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.logging.ControlCommandLogger; /** *

diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/BaseEventPropertySource.java b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/property/BaseEventPropertySource.java similarity index 94% rename from org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/BaseEventPropertySource.java rename to org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/property/BaseEventPropertySource.java index 70f6ed0ece..846bc0989b 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/BaseEventPropertySource.java +++ b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/property/BaseEventPropertySource.java @@ -10,14 +10,14 @@ * Bernd Hufmann - Initial API and implementation * Bernd Hufmann - Updated for support of LTTng Tools 2.1 **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.ui.views.control.property; +package org.eclipse.linuxtools.internal.lttng2.control.ui.views.property; import java.util.ArrayList; import java.util.List; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceLogLevel; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.messages.Messages; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.BaseEventComponent; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.TraceLogLevel; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.messages.Messages; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.BaseEventComponent; import org.eclipse.linuxtools.tmf.ui.properties.ReadOnlyTextPropertyDescriptor; import org.eclipse.ui.views.properties.IPropertyDescriptor; diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/BasePropertySource.java b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/property/BasePropertySource.java similarity index 95% rename from org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/BasePropertySource.java rename to org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/property/BasePropertySource.java index 149416860f..e5c7cede5f 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/BasePropertySource.java +++ b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/property/BasePropertySource.java @@ -9,7 +9,7 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.ui.views.control.property; +package org.eclipse.linuxtools.internal.lttng2.control.ui.views.property; import org.eclipse.ui.views.properties.IPropertyDescriptor; import org.eclipse.ui.views.properties.IPropertySource; diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/KernelProviderPropertySource.java b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/property/KernelProviderPropertySource.java similarity index 93% rename from org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/KernelProviderPropertySource.java rename to org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/property/KernelProviderPropertySource.java index 8a9d2ba763..00ae10c824 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/KernelProviderPropertySource.java +++ b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/property/KernelProviderPropertySource.java @@ -9,10 +9,10 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.ui.views.control.property; +package org.eclipse.linuxtools.internal.lttng2.control.ui.views.property; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.messages.Messages; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.KernelProviderComponent; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.messages.Messages; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.KernelProviderComponent; import org.eclipse.linuxtools.tmf.ui.properties.ReadOnlyTextPropertyDescriptor; import org.eclipse.ui.views.properties.IPropertyDescriptor; diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/TargetNodePropertySource.java b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/property/TargetNodePropertySource.java similarity index 95% rename from org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/TargetNodePropertySource.java rename to org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/property/TargetNodePropertySource.java index 96c67d5e12..e552bb919e 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/TargetNodePropertySource.java +++ b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/property/TargetNodePropertySource.java @@ -9,10 +9,10 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.ui.views.control.property; +package org.eclipse.linuxtools.internal.lttng2.control.ui.views.property; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.messages.Messages; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TargetNodeComponent; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.messages.Messages; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TargetNodeComponent; import org.eclipse.linuxtools.tmf.ui.properties.ReadOnlyTextPropertyDescriptor; import org.eclipse.ui.views.properties.IPropertyDescriptor; diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/TraceChannelPropertySource.java b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/property/TraceChannelPropertySource.java similarity index 97% rename from org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/TraceChannelPropertySource.java rename to org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/property/TraceChannelPropertySource.java index 544c7fa221..d5e640c097 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/TraceChannelPropertySource.java +++ b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/property/TraceChannelPropertySource.java @@ -9,10 +9,10 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.ui.views.control.property; +package org.eclipse.linuxtools.internal.lttng2.control.ui.views.property; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.messages.Messages; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceChannelComponent; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.messages.Messages; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceChannelComponent; import org.eclipse.linuxtools.tmf.ui.properties.ReadOnlyTextPropertyDescriptor; import org.eclipse.ui.views.properties.IPropertyDescriptor; diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/TraceDomainPropertySource.java b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/property/TraceDomainPropertySource.java similarity index 93% rename from org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/TraceDomainPropertySource.java rename to org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/property/TraceDomainPropertySource.java index 43160c8c51..630fe7f064 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/TraceDomainPropertySource.java +++ b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/property/TraceDomainPropertySource.java @@ -9,11 +9,11 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.ui.views.control.property; +package org.eclipse.linuxtools.internal.lttng2.control.ui.views.property; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.impl.BufferType; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.messages.Messages; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceDomainComponent; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.impl.BufferType; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.messages.Messages; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceDomainComponent; import org.eclipse.linuxtools.tmf.ui.properties.ReadOnlyTextPropertyDescriptor; import org.eclipse.ui.views.properties.IPropertyDescriptor; diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/TraceEventPropertySource.java b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/property/TraceEventPropertySource.java similarity index 95% rename from org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/TraceEventPropertySource.java rename to org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/property/TraceEventPropertySource.java index 9a654b7a7d..f7eca901d1 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/TraceEventPropertySource.java +++ b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/property/TraceEventPropertySource.java @@ -10,14 +10,14 @@ * Bernd Hufmann - Initial API and implementation * Bernd Hufmann - Updated for support of LTTng Tools 2.1 **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.ui.views.control.property; +package org.eclipse.linuxtools.internal.lttng2.control.ui.views.property; import java.util.ArrayList; import java.util.List; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceLogLevel; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.messages.Messages; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceEventComponent; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.TraceLogLevel; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.messages.Messages; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceEventComponent; import org.eclipse.linuxtools.tmf.ui.properties.ReadOnlyTextPropertyDescriptor; import org.eclipse.ui.views.properties.IPropertyDescriptor; diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/TraceProbeEventPropertySource.java b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/property/TraceProbeEventPropertySource.java similarity index 95% rename from org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/TraceProbeEventPropertySource.java rename to org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/property/TraceProbeEventPropertySource.java index 171a37f663..759d43b7d2 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/TraceProbeEventPropertySource.java +++ b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/property/TraceProbeEventPropertySource.java @@ -9,15 +9,15 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.ui.views.control.property; +package org.eclipse.linuxtools.internal.lttng2.control.ui.views.property; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.messages.Messages; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceEventComponent; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceProbeEventComponent; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.messages.Messages; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceEventComponent; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceProbeEventComponent; import org.eclipse.linuxtools.tmf.ui.properties.ReadOnlyTextPropertyDescriptor; import org.eclipse.ui.views.properties.IPropertyDescriptor; diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/TraceSessionPropertySource.java b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/property/TraceSessionPropertySource.java similarity index 96% rename from org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/TraceSessionPropertySource.java rename to org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/property/TraceSessionPropertySource.java index 75f1c0f126..0ccb10ec38 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/TraceSessionPropertySource.java +++ b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/property/TraceSessionPropertySource.java @@ -9,13 +9,13 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.ui.views.control.property; +package org.eclipse.linuxtools.internal.lttng2.control.ui.views.property; import java.util.ArrayList; import java.util.List; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.messages.Messages; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceSessionComponent; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.messages.Messages; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.TraceSessionComponent; import org.eclipse.linuxtools.tmf.ui.properties.ReadOnlyTextPropertyDescriptor; import org.eclipse.ui.views.properties.IPropertyDescriptor; diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/UstProviderPropertySource.java b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/property/UstProviderPropertySource.java similarity index 94% rename from org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/UstProviderPropertySource.java rename to org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/property/UstProviderPropertySource.java index 2024346a85..bd2ad61e27 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/UstProviderPropertySource.java +++ b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/property/UstProviderPropertySource.java @@ -9,10 +9,10 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.ui.views.control.property; +package org.eclipse.linuxtools.internal.lttng2.control.ui.views.property; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.messages.Messages; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.UstProviderComponent; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.messages.Messages; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.model.impl.UstProviderComponent; import org.eclipse.linuxtools.tmf.ui.properties.ReadOnlyTextPropertyDescriptor; import org.eclipse.ui.views.properties.IPropertyDescriptor; diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/remote/CommandResult.java b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/remote/CommandResult.java similarity index 97% rename from org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/remote/CommandResult.java rename to org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/remote/CommandResult.java index 339620d189..3ae6cd0af4 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/remote/CommandResult.java +++ b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/remote/CommandResult.java @@ -9,7 +9,7 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.ui.views.control.remote; +package org.eclipse.linuxtools.internal.lttng2.control.ui.views.remote; import java.util.Arrays; diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/remote/CommandShell.java b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/remote/CommandShell.java similarity index 98% rename from org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/remote/CommandShell.java rename to org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/remote/CommandShell.java index dcc17c726b..f13d20e797 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/remote/CommandShell.java +++ b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/remote/CommandShell.java @@ -10,7 +10,7 @@ * Patrick Tasse - Initial API and implementation * Bernd Hufmann - Updated using Executor Framework **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.ui.views.control.remote; +package org.eclipse.linuxtools.internal.lttng2.control.ui.views.remote; import java.io.BufferedReader; import java.io.IOException; @@ -28,8 +28,8 @@ import java.util.concurrent.TimeoutException; import org.eclipse.core.commands.ExecutionException; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.NullProgressMonitor; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.messages.Messages; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.preferences.ControlPreferences; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.messages.Messages; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.preferences.ControlPreferences; import org.eclipse.rse.services.shells.HostShellProcessAdapter; import org.eclipse.rse.services.shells.IHostShell; import org.eclipse.rse.services.shells.IShellService; diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/remote/ICommandResult.java b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/remote/ICommandResult.java similarity index 94% rename from org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/remote/ICommandResult.java rename to org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/remote/ICommandResult.java index b64320a7fb..3b23d358b0 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/remote/ICommandResult.java +++ b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/remote/ICommandResult.java @@ -9,7 +9,7 @@ * Contributors: * Bernd Hufmann - Initial API and implementation *********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.ui.views.control.remote; +package org.eclipse.linuxtools.internal.lttng2.control.ui.views.remote; /** *

diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/remote/ICommandShell.java b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/remote/ICommandShell.java similarity index 97% rename from org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/remote/ICommandShell.java rename to org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/remote/ICommandShell.java index 2919cea517..ea0417c9fb 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/remote/ICommandShell.java +++ b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/remote/ICommandShell.java @@ -9,7 +9,7 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.ui.views.control.remote; +package org.eclipse.linuxtools.internal.lttng2.control.ui.views.remote; import org.eclipse.core.commands.ExecutionException; import org.eclipse.core.runtime.IProgressMonitor; diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/remote/IRemoteSystemProxy.java b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/remote/IRemoteSystemProxy.java similarity index 98% rename from org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/remote/IRemoteSystemProxy.java rename to org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/remote/IRemoteSystemProxy.java index 2f9646b127..56ad98623c 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/remote/IRemoteSystemProxy.java +++ b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/remote/IRemoteSystemProxy.java @@ -9,7 +9,7 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.ui.views.control.remote; +package org.eclipse.linuxtools.internal.lttng2.control.ui.views.remote; import org.eclipse.core.commands.ExecutionException; import org.eclipse.rse.core.model.IRSECallback; diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/remote/RemoteSystemProxy.java b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/remote/RemoteSystemProxy.java similarity index 99% rename from org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/remote/RemoteSystemProxy.java rename to org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/remote/RemoteSystemProxy.java index 873ce13155..5686c3661e 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/remote/RemoteSystemProxy.java +++ b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/remote/RemoteSystemProxy.java @@ -9,7 +9,7 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.ui.views.control.remote; +package org.eclipse.linuxtools.internal.lttng2.control.ui.views.remote; import org.eclipse.core.commands.ExecutionException; import org.eclipse.core.runtime.OperationCanceledException; diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/service/ILttngControlService.java b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/service/ILttngControlService.java similarity index 96% rename from org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/service/ILttngControlService.java rename to org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/service/ILttngControlService.java index c1e3c601bb..ebefe44f49 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/service/ILttngControlService.java +++ b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/service/ILttngControlService.java @@ -10,19 +10,19 @@ * Bernd Hufmann - Initial API and implementation * Bernd Hufmann - Updated for support of LTTng Tools 2.1 **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.ui.views.control.service; +package org.eclipse.linuxtools.internal.lttng2.control.ui.views.service; import java.util.List; import org.eclipse.core.commands.ExecutionException; import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.IBaseEventInfo; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.IChannelInfo; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.ISessionInfo; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.ISnapshotInfo; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.IUstProviderInfo; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.LogLevelType; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceLogLevel; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.IBaseEventInfo; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.IChannelInfo; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.ISessionInfo; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.ISnapshotInfo; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.IUstProviderInfo; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.LogLevelType; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.TraceLogLevel; /** diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/service/LTTngControlService.java b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/service/LTTngControlService.java similarity index 97% rename from org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/service/LTTngControlService.java rename to org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/service/LTTngControlService.java index 1a2bc84a13..32998ebd1f 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/service/LTTngControlService.java +++ b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/service/LTTngControlService.java @@ -11,7 +11,7 @@ * Bernd Hufmann - Updated for support of LTTng Tools 2.1 * Simon Delisle - Updated for support of LTTng Tools 2.2 **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.ui.views.control.service; +package org.eclipse.linuxtools.internal.lttng2.control.ui.views.service; import java.util.ArrayList; import java.util.Iterator; @@ -21,33 +21,33 @@ import java.util.regex.Matcher; import org.eclipse.core.commands.ExecutionException; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.NullProgressMonitor; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.IBaseEventInfo; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.IChannelInfo; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.IDomainInfo; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.IEventInfo; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.IFieldInfo; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.IProbeEventInfo; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.ISessionInfo; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.ISnapshotInfo; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.IUstProviderInfo; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.LogLevelType; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceEventType; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceLogLevel; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.impl.BaseEventInfo; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.impl.BufferType; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.impl.ChannelInfo; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.impl.DomainInfo; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.impl.EventInfo; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.impl.FieldInfo; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.impl.ProbeEventInfo; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.impl.SessionInfo; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.impl.SnapshotInfo; -import org.eclipse.linuxtools.internal.lttng2.core.control.model.impl.UstProviderInfo; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.logging.ControlCommandLogger; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.messages.Messages; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.preferences.ControlPreferences; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.remote.ICommandResult; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.remote.ICommandShell; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.IBaseEventInfo; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.IChannelInfo; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.IDomainInfo; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.IEventInfo; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.IFieldInfo; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.IProbeEventInfo; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.ISessionInfo; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.ISnapshotInfo; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.IUstProviderInfo; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.LogLevelType; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.TraceEventType; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.TraceLogLevel; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.impl.BaseEventInfo; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.impl.BufferType; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.impl.ChannelInfo; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.impl.DomainInfo; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.impl.EventInfo; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.impl.FieldInfo; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.impl.ProbeEventInfo; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.impl.SessionInfo; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.impl.SnapshotInfo; +import org.eclipse.linuxtools.internal.lttng2.control.core.model.impl.UstProviderInfo; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.logging.ControlCommandLogger; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.messages.Messages; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.preferences.ControlPreferences; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.remote.ICommandResult; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.remote.ICommandShell; /** *

diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/service/LTTngControlServiceConstants.java b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/service/LTTngControlServiceConstants.java similarity index 99% rename from org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/service/LTTngControlServiceConstants.java rename to org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/service/LTTngControlServiceConstants.java index 7e844f1fb5..4fe28bbdbf 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/service/LTTngControlServiceConstants.java +++ b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/service/LTTngControlServiceConstants.java @@ -11,7 +11,7 @@ * Bernd Hufmann - Updated for support of LTTng Tools 2.1 * Simon Delisle - Updated for support of LTTng Tools 2.2 **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.ui.views.control.service; +package org.eclipse.linuxtools.internal.lttng2.control.ui.views.service; import java.util.regex.Pattern; diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/service/LTTngControlServiceFactory.java b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/service/LTTngControlServiceFactory.java similarity index 92% rename from org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/service/LTTngControlServiceFactory.java rename to org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/service/LTTngControlServiceFactory.java index 13707aab94..851387f97e 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/service/LTTngControlServiceFactory.java +++ b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/service/LTTngControlServiceFactory.java @@ -9,17 +9,17 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.ui.views.control.service; +package org.eclipse.linuxtools.internal.lttng2.control.ui.views.service; import java.util.regex.Matcher; import org.eclipse.core.commands.ExecutionException; import org.eclipse.core.runtime.NullProgressMonitor; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.logging.ControlCommandLogger; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.messages.Messages; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.preferences.ControlPreferences; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.remote.ICommandResult; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.remote.ICommandShell; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.logging.ControlCommandLogger; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.messages.Messages; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.preferences.ControlPreferences; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.remote.ICommandResult; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.remote.ICommandShell; /** *

diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/service/LttngVersion.java b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/service/LttngVersion.java similarity index 96% rename from org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/service/LttngVersion.java rename to org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/service/LttngVersion.java index 1fe0e4f8a8..a026267acb 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/service/LttngVersion.java +++ b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/service/LttngVersion.java @@ -9,7 +9,7 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.ui.views.control.service; +package org.eclipse.linuxtools.internal.lttng2.control.ui.views.service; import org.osgi.framework.Version; diff --git a/org.eclipse.linuxtools.lttng2.core.tests/.gitignore b/org.eclipse.linuxtools.lttng2.control/.gitignore similarity index 100% rename from org.eclipse.linuxtools.lttng2.core.tests/.gitignore rename to org.eclipse.linuxtools.lttng2.control/.gitignore diff --git a/org.eclipse.linuxtools.lttng2/.project b/org.eclipse.linuxtools.lttng2.control/.project similarity index 86% rename from org.eclipse.linuxtools.lttng2/.project rename to org.eclipse.linuxtools.lttng2.control/.project index 4fac0d3f91..7fb3b6d83b 100644 --- a/org.eclipse.linuxtools.lttng2/.project +++ b/org.eclipse.linuxtools.lttng2.control/.project @@ -1,6 +1,6 @@ - org.eclipse.linuxtools.lttng2 + org.eclipse.linuxtools.lttng2.control diff --git a/org.eclipse.linuxtools.lttng2/.settings/org.eclipse.core.resources.prefs b/org.eclipse.linuxtools.lttng2.control/.settings/org.eclipse.core.resources.prefs similarity index 100% rename from org.eclipse.linuxtools.lttng2/.settings/org.eclipse.core.resources.prefs rename to org.eclipse.linuxtools.lttng2.control/.settings/org.eclipse.core.resources.prefs diff --git a/org.eclipse.linuxtools.lttng2/.settings/org.eclipse.core.runtime.prefs b/org.eclipse.linuxtools.lttng2.control/.settings/org.eclipse.core.runtime.prefs similarity index 100% rename from org.eclipse.linuxtools.lttng2/.settings/org.eclipse.core.runtime.prefs rename to org.eclipse.linuxtools.lttng2.control/.settings/org.eclipse.core.runtime.prefs diff --git a/org.eclipse.linuxtools.lttng2/build.properties b/org.eclipse.linuxtools.lttng2.control/build.properties similarity index 93% rename from org.eclipse.linuxtools.lttng2/build.properties rename to org.eclipse.linuxtools.lttng2.control/build.properties index c0db4e0a72..fc36845ab8 100644 --- a/org.eclipse.linuxtools.lttng2/build.properties +++ b/org.eclipse.linuxtools.lttng2.control/build.properties @@ -13,3 +13,4 @@ bin.includes = feature.xml,\ feature.properties,\ p2.inf +src.includes = sourceTemplateFeature/p2.inf diff --git a/org.eclipse.linuxtools.lttng2/feature.properties b/org.eclipse.linuxtools.lttng2.control/feature.properties similarity index 84% rename from org.eclipse.linuxtools.lttng2/feature.properties rename to org.eclipse.linuxtools.lttng2.control/feature.properties index 3d0a1b303c..b376c5c5ba 100644 --- a/org.eclipse.linuxtools.lttng2/feature.properties +++ b/org.eclipse.linuxtools.lttng2.control/feature.properties @@ -10,9 +10,9 @@ # Ericsson - Initial API and implementation ############################################################################### -featureName=LTTng - Linux Tracing Toolkit +featureName=Linux Tools LTTng Tracer Control -description=Plug-ins to integrate LTTng tools into the workbench. \ +description=Plug-ins to integrate LTTng tracer control into the workbench. \ Includes the TMF (Tracing and Monitoring Framework) and CTF (Common Trace Format) features. featureProvider=Eclipse Linux Tools diff --git a/org.eclipse.linuxtools.lttng2/feature.xml b/org.eclipse.linuxtools.lttng2.control/feature.xml similarity index 85% rename from org.eclipse.linuxtools.lttng2/feature.xml rename to org.eclipse.linuxtools.lttng2.control/feature.xml index 5cf26b6ed6..24aad28015 100644 --- a/org.eclipse.linuxtools.lttng2/feature.xml +++ b/org.eclipse.linuxtools.lttng2.control/feature.xml @@ -1,6 +1,6 @@ - + @@ -40,14 +40,14 @@ 3.0.0-SNAPSHOT - org.eclipse.linuxtools.lttng2 + org.eclipse.linuxtools.lttng2.control 3.0.0-SNAPSHOT eclipse-feature Linux Tools LTTng (Linux Tracing Toolkit) Feature org.eclipse.linuxtools.lttng2 - + diff --git a/org.eclipse.linuxtools.lttng2.control/sourceTemplateFeature/p2.inf b/org.eclipse.linuxtools.lttng2.control/sourceTemplateFeature/p2.inf new file mode 100644 index 0000000000..6fa47c1509 --- /dev/null +++ b/org.eclipse.linuxtools.lttng2.control/sourceTemplateFeature/p2.inf @@ -0,0 +1,8 @@ +instructions.configure=\ +org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(location:http${#58}//download.eclipse.org/linuxtools/updates-nightly,type:0,name:Linux Tools,enabled:false); \ +org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(location:http${#58}//download.eclipse.org/linuxtools/updates-nightly,type:1,name:Linux Tools,enabled:false); + +update.id = org.eclipse.linuxtools.lttng2.source.feature.group +update.range = 0.0.0 +update.severity = 0 +update.description = Transition to the new feature name lttng2.control diff --git a/org.eclipse.linuxtools.lttng2.core.tests/META-INF/MANIFEST.MF b/org.eclipse.linuxtools.lttng2.core.tests/META-INF/MANIFEST.MF deleted file mode 100644 index 5497d26999..0000000000 --- a/org.eclipse.linuxtools.lttng2.core.tests/META-INF/MANIFEST.MF +++ /dev/null @@ -1,15 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: %Bundle-Name -Bundle-Vendor: %Bundle-Vendor -Bundle-Version: 3.0.0.qualifier -Bundle-Localization: plugin -Bundle-SymbolicName: org.eclipse.linuxtools.lttng2.core.tests;singleton:=true -Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: JavaSE-1.7 -Require-Bundle: org.junit;bundle-version="4.0.0", - org.eclipse.core.runtime, - org.eclipse.linuxtools.lttng2.core;bundle-version="3.0.0", - org.eclipse.linuxtools.tmf.core;bundle-version="3.0.0" -Export-Package: org.eclipse.linuxtools.lttng2.core.tests;x-friends:="org.eclipse.linuxtools.lttng.alltests", - org.eclipse.linuxtools.lttng2.core.tests.control.model.impl;x-internal:=true diff --git a/org.eclipse.linuxtools.lttng2.core/.gitignore b/org.eclipse.linuxtools.lttng2.core/.gitignore deleted file mode 100644 index 8d94ef8deb..0000000000 --- a/org.eclipse.linuxtools.lttng2.core/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -bin -@dot -javaCompiler...args -build.xml -target diff --git a/org.eclipse.linuxtools.lttng2.core/.options b/org.eclipse.linuxtools.lttng2.core/.options deleted file mode 100644 index eac992d7cb..0000000000 --- a/org.eclipse.linuxtools.lttng2.core/.options +++ /dev/null @@ -1,3 +0,0 @@ -org.eclipse.linuxtools.lttng.core/debug=false -org.eclipse.linuxtools.lttng.core/info=false -org.eclipse.linuxtools.lttng.core/warn=false diff --git a/org.eclipse.linuxtools.lttng2.core/META-INF/MANIFEST.MF b/org.eclipse.linuxtools.lttng2.core/META-INF/MANIFEST.MF deleted file mode 100644 index 744585be53..0000000000 --- a/org.eclipse.linuxtools.lttng2.core/META-INF/MANIFEST.MF +++ /dev/null @@ -1,16 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: %Bundle-Name -Bundle-Vendor: %Bundle-Vendor -Bundle-Version: 3.0.0.qualifier -Bundle-Localization: plugin -Bundle-SymbolicName: org.eclipse.linuxtools.lttng2.core;singleton:=true -Bundle-Activator: org.eclipse.linuxtools.internal.lttng2.core.Activator -Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: JavaSE-1.7 -Require-Bundle: org.eclipse.core.runtime, - org.eclipse.linuxtools.tmf.core;bundle-version="3.0.0" -Export-Package: org.eclipse.linuxtools.internal.lttng2.core;x-friends:="org.eclipse.linuxtools.lttng2.core.tests", - org.eclipse.linuxtools.internal.lttng2.core.control.model;x-friends:="org.eclipse.linuxtools.lttng2.ui,org.eclipse.linuxtools.lttng2.ui.tests,org.eclipse.linuxtools.lttng2.core.tests", - org.eclipse.linuxtools.internal.lttng2.core.control.model.impl;x-friends:="org.eclipse.linuxtools.lttng2.ui,org.eclipse.linuxtools.lttng2.ui.tests,org.eclipse.linuxtools.lttng2.core.tests", - org.eclipse.linuxtools.lttng2.core.session diff --git a/org.eclipse.linuxtools.lttng2.kernel.ui.swtbot.tests/META-INF/MANIFEST.MF b/org.eclipse.linuxtools.lttng2.kernel.ui.swtbot.tests/META-INF/MANIFEST.MF index 399b51a5a5..c620425aff 100644 --- a/org.eclipse.linuxtools.lttng2.kernel.ui.swtbot.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.linuxtools.lttng2.kernel.ui.swtbot.tests/META-INF/MANIFEST.MF @@ -13,7 +13,7 @@ Require-Bundle: org.apache.log4j, org.eclipse.core.runtime, org.eclipse.linuxtools.lttng2.kernel.core, org.eclipse.linuxtools.lttng2.kernel.ui, - org.eclipse.linuxtools.lttng2.ui, + org.eclipse.linuxtools.lttng2.control.ui, org.eclipse.linuxtools.tmf.core, org.eclipse.linuxtools.tmf.core.tests, org.eclipse.linuxtools.tmf.ctf.core, diff --git a/org.eclipse.linuxtools.lttng2.kernel.ui.swtbot.tests/src/org/eclipse/linuxtools/lttng2/kernel/ui/swtbot/tests/KernelPerspectiveChecker.java b/org.eclipse.linuxtools.lttng2.kernel.ui.swtbot.tests/src/org/eclipse/linuxtools/lttng2/kernel/ui/swtbot/tests/KernelPerspectiveChecker.java index 5d071bf4a1..524f4d1a34 100644 --- a/org.eclipse.linuxtools.lttng2.kernel.ui.swtbot.tests/src/org/eclipse/linuxtools/lttng2/kernel/ui/swtbot/tests/KernelPerspectiveChecker.java +++ b/org.eclipse.linuxtools.lttng2.kernel.ui.swtbot.tests/src/org/eclipse/linuxtools/lttng2/kernel/ui/swtbot/tests/KernelPerspectiveChecker.java @@ -15,10 +15,10 @@ package org.eclipse.linuxtools.lttng2.kernel.ui.swtbot.tests; import java.util.ArrayList; import java.util.Arrays; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.ControlView; import org.eclipse.linuxtools.internal.lttng2.kernel.ui.views.PerspectiveFactory; import org.eclipse.linuxtools.internal.lttng2.kernel.ui.views.controlflow.ControlFlowView; import org.eclipse.linuxtools.internal.lttng2.kernel.ui.views.resources.ResourcesView; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.ControlView; import org.eclipse.linuxtools.tmf.ui.swtbot.tests.AbstractPerspectiveChecker; import org.eclipse.linuxtools.tmf.ui.views.histogram.HistogramView; import org.eclipse.linuxtools.tmf.ui.views.statistics.TmfStatisticsView; diff --git a/org.eclipse.linuxtools.lttng2.kernel.ui/META-INF/MANIFEST.MF b/org.eclipse.linuxtools.lttng2.kernel.ui/META-INF/MANIFEST.MF index 8764a3b2ee..e74f843b1d 100644 --- a/org.eclipse.linuxtools.lttng2.kernel.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.linuxtools.lttng2.kernel.ui/META-INF/MANIFEST.MF @@ -14,8 +14,8 @@ Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, org.eclipse.linuxtools.tmf.core;bundle-version="3.0.0", org.eclipse.linuxtools.tmf.ui;bundle-version="3.0.0", - org.eclipse.linuxtools.lttng2.core;bundle-version="3.0.0", - org.eclipse.linuxtools.lttng2.ui;bundle-version="3.0.0", + org.eclipse.linuxtools.lttng2.control.core;bundle-version="3.0.0", + org.eclipse.linuxtools.lttng2.control.ui;bundle-version="3.0.0", org.eclipse.linuxtools.lttng2.kernel.core;bundle-version="3.0.0" Export-Package: org.eclipse.linuxtools.internal.lttng2.kernel.ui;x-friends:="org.eclipse.linuxtools.lttng2.kernel.ui.tests", org.eclipse.linuxtools.internal.lttng2.kernel.ui.viewers.events;x-internal:=true, diff --git a/org.eclipse.linuxtools.lttng2.kernel.ui/src/org/eclipse/linuxtools/internal/lttng2/kernel/ui/views/PerspectiveFactory.java b/org.eclipse.linuxtools.lttng2.kernel.ui/src/org/eclipse/linuxtools/internal/lttng2/kernel/ui/views/PerspectiveFactory.java index 67629ddaad..13bc181afb 100644 --- a/org.eclipse.linuxtools.lttng2.kernel.ui/src/org/eclipse/linuxtools/internal/lttng2/kernel/ui/views/PerspectiveFactory.java +++ b/org.eclipse.linuxtools.lttng2.kernel.ui/src/org/eclipse/linuxtools/internal/lttng2/kernel/ui/views/PerspectiveFactory.java @@ -12,9 +12,9 @@ package org.eclipse.linuxtools.internal.lttng2.kernel.ui.views; +import org.eclipse.linuxtools.internal.lttng2.control.ui.views.ControlView; import org.eclipse.linuxtools.internal.lttng2.kernel.ui.views.controlflow.ControlFlowView; import org.eclipse.linuxtools.internal.lttng2.kernel.ui.views.resources.ResourcesView; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.ControlView; import org.eclipse.linuxtools.tmf.ui.project.wizards.NewTmfProjectWizard; import org.eclipse.linuxtools.tmf.ui.views.histogram.HistogramView; import org.eclipse.linuxtools.tmf.ui.views.statistics.TmfStatisticsView; diff --git a/org.eclipse.linuxtools.lttng2.kernel/feature.xml b/org.eclipse.linuxtools.lttng2.kernel/feature.xml index 245d6a2df7..74629fbf5c 100644 --- a/org.eclipse.linuxtools.lttng2.kernel/feature.xml +++ b/org.eclipse.linuxtools.lttng2.kernel/feature.xml @@ -25,7 +25,7 @@ @@ -42,8 +42,8 @@ - - + + diff --git a/org.eclipse.linuxtools.lttng2.ui.tests/.gitignore b/org.eclipse.linuxtools.lttng2.ui.tests/.gitignore deleted file mode 100644 index 8d94ef8deb..0000000000 --- a/org.eclipse.linuxtools.lttng2.ui.tests/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -bin -@dot -javaCompiler...args -build.xml -target diff --git a/org.eclipse.linuxtools.lttng2.ui.tests/META-INF/MANIFEST.MF b/org.eclipse.linuxtools.lttng2.ui.tests/META-INF/MANIFEST.MF deleted file mode 100644 index c2e2504508..0000000000 --- a/org.eclipse.linuxtools.lttng2.ui.tests/META-INF/MANIFEST.MF +++ /dev/null @@ -1,29 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: %Bundle-Name -Bundle-Vendor: %Bundle-Vendor -Bundle-Version: 3.0.0.qualifier -Bundle-Localization: plugin -Bundle-SymbolicName: org.eclipse.linuxtools.lttng2.ui.tests;singleton:=true -Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: JavaSE-1.7 -Require-Bundle: org.junit;bundle-version="4.0.0", - org.eclipse.core.commands, - org.eclipse.core.runtime, - org.eclipse.ui, - org.eclipse.ui.ide, - org.eclipse.linuxtools.lttng2.core;bundle-version="3.0.0", - org.eclipse.linuxtools.lttng2.ui;bundle-version="3.0.0" -Import-Package: org.eclipse.rse.core, - org.eclipse.rse.core.model, - org.eclipse.rse.core.subsystems, - org.eclipse.rse.services.shells, - org.eclipse.rse.services.terminals, - org.eclipse.rse.subsystems.files.core, - org.eclipse.rse.subsystems.files.core.servicesubsystem -Export-Package: org.eclipse.linuxtools.internal.lttng2.stubs.dialogs;x-internal:=true, - org.eclipse.linuxtools.internal.lttng2.stubs.service;x-internal:=true, - org.eclipse.linuxtools.internal.lttng2.stubs.shells;x-internal:=true, - org.eclipse.linuxtools.lttng2.ui.tests;x-friends:="org.eclipse.linuxtools.lttng.alltests", - org.eclipse.linuxtools.lttng2.ui.tests.control.model.component;x-internal:=true, - org.eclipse.linuxtools.lttng2.ui.tests.control.service;x-internal:=true diff --git a/org.eclipse.linuxtools.lttng2.ui/.gitignore b/org.eclipse.linuxtools.lttng2.ui/.gitignore deleted file mode 100644 index 8d94ef8deb..0000000000 --- a/org.eclipse.linuxtools.lttng2.ui/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -bin -@dot -javaCompiler...args -build.xml -target diff --git a/org.eclipse.linuxtools.lttng2.ui/.options b/org.eclipse.linuxtools.lttng2.ui/.options deleted file mode 100644 index 07483358d1..0000000000 --- a/org.eclipse.linuxtools.lttng2.ui/.options +++ /dev/null @@ -1,7 +0,0 @@ -org.eclipse.linuxtools.lttng.ui/debug=false -org.eclipse.linuxtools.lttng.ui/info=false -org.eclipse.linuxtools.lttng.ui/warn=false - -org.eclipse.linuxtools.lttng.ui/cfv=false -org.eclipse.linuxtools.lttng.ui/rv=false -org.eclipse.linuxtools.lttng.ui/sv=false diff --git a/org.eclipse.linuxtools.lttng2.ui/META-INF/MANIFEST.MF b/org.eclipse.linuxtools.lttng2.ui/META-INF/MANIFEST.MF deleted file mode 100644 index 625deaa98e..0000000000 --- a/org.eclipse.linuxtools.lttng2.ui/META-INF/MANIFEST.MF +++ /dev/null @@ -1,40 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: %Bundle-Name -Bundle-Vendor: %Bundle-Vendor -Bundle-Version: 3.0.0.qualifier -Bundle-Localization: plugin -Bundle-SymbolicName: org.eclipse.linuxtools.lttng2.ui;singleton:=true -Bundle-Activator: org.eclipse.linuxtools.internal.lttng2.ui.Activator -Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: JavaSE-1.7 -Require-Bundle: org.eclipse.ui, - org.eclipse.ui.ide, - org.eclipse.core.expressions, - org.eclipse.core.resources, - org.eclipse.core.runtime, - org.eclipse.linuxtools.lttng2.core;bundle-version="3.0.0", - org.eclipse.linuxtools.tmf.core;bundle-version="3.0.0", - org.eclipse.linuxtools.tmf.ui;bundle-version="3.0.0" -Export-Package: org.eclipse.linuxtools.internal.lttng2.ui;x-friends:="org.eclipse.linuxtools.lttng2.ui.tests", - org.eclipse.linuxtools.internal.lttng2.ui.views.control;x-friends:="org.eclipse.linuxtools.lttng2.kernel.ui,org.eclipse.linuxtools.lttng2.ui.tests,org.eclipse.linuxtools.lttng2.kernel.ui.swtbot.tests", - org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs;x-friends:="org.eclipse.linuxtools.lttng2.ui.tests", - org.eclipse.linuxtools.internal.lttng2.ui.views.control.handlers;x-internal:=true, - org.eclipse.linuxtools.internal.lttng2.ui.views.control.logging;x-friends:="org.eclipse.linuxtools.lttng2.ui.tests", - org.eclipse.linuxtools.internal.lttng2.ui.views.control.messages;x-internal:=true, - org.eclipse.linuxtools.internal.lttng2.ui.views.control.model;x-friends:="org.eclipse.linuxtools.lttng2.ui.tests", - org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl;x-friends:="org.eclipse.linuxtools.lttng2.ui.tests", - org.eclipse.linuxtools.internal.lttng2.ui.views.control.preferences;x-friends:="org.eclipse.linuxtools.lttng2.ui.tests", - org.eclipse.linuxtools.internal.lttng2.ui.views.control.property;x-friends:="org.eclipse.linuxtools.lttng2.ui.tests", - org.eclipse.linuxtools.internal.lttng2.ui.views.control.remote;x-friends:="org.eclipse.linuxtools.lttng2.ui.tests", - org.eclipse.linuxtools.internal.lttng2.ui.views.control.service;x-friends:="org.eclipse.linuxtools.lttng2.ui.tests" -Import-Package: org.eclipse.rse.core, - org.eclipse.rse.core.model, - org.eclipse.rse.core.subsystems, - org.eclipse.rse.services, - org.eclipse.rse.services.clientserver.messages, - org.eclipse.rse.services.files, - org.eclipse.rse.services.shells, - org.eclipse.rse.services.terminals, - org.eclipse.rse.subsystems.files.core.servicesubsystem, - org.eclipse.rse.subsystems.files.core.subsystems diff --git a/org.eclipse.linuxtools.lttng2.ust/feature.xml b/org.eclipse.linuxtools.lttng2.ust/feature.xml index f12763e437..eeeec30e19 100644 --- a/org.eclipse.linuxtools.lttng2.ust/feature.xml +++ b/org.eclipse.linuxtools.lttng2.ust/feature.xml @@ -25,7 +25,7 @@ diff --git a/org.eclipse.linuxtools.lttng2/.gitignore b/org.eclipse.linuxtools.lttng2/.gitignore deleted file mode 100644 index 8d94ef8deb..0000000000 --- a/org.eclipse.linuxtools.lttng2/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -bin -@dot -javaCompiler...args -build.xml -target diff --git a/org.eclipse.linuxtools.tracing.rcp.product/tracing.product b/org.eclipse.linuxtools.tracing.rcp.product/tracing.product index c1b0c376db..a413bf469e 100644 --- a/org.eclipse.linuxtools.tracing.rcp.product/tracing.product +++ b/org.eclipse.linuxtools.tracing.rcp.product/tracing.product @@ -184,7 +184,7 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U - + diff --git a/pom.xml b/pom.xml index 25e8556c70..cc86913a30 100644 --- a/pom.xml +++ b/pom.xml @@ -117,13 +117,14 @@ org.eclipse.linuxtools.tmf.analysis.xml.ui org.eclipse.linuxtools.tmf.analysis.xml.ui.tests - org.eclipse.linuxtools.lttng2 - org.eclipse.linuxtools.lttng2.core - org.eclipse.linuxtools.lttng2.core.tests - org.eclipse.linuxtools.lttng2.ui - org.eclipse.linuxtools.lttng2.ui.tests org.eclipse.linuxtools.lttng.help + org.eclipse.linuxtools.lttng2.control + org.eclipse.linuxtools.lttng2.control.core + org.eclipse.linuxtools.lttng2.control.core.tests + org.eclipse.linuxtools.lttng2.control.ui + org.eclipse.linuxtools.lttng2.control.ui.tests + org.eclipse.linuxtools.lttng2.kernel org.eclipse.linuxtools.lttng2.kernel.core org.eclipse.linuxtools.lttng2.kernel.core.tests @@ -137,7 +138,6 @@ org.eclipse.linuxtools.lttng2.ust.ui org.eclipse.linuxtools.lttng2.ust.ui.tests - org.eclipse.linuxtools.gdbtrace org.eclipse.linuxtools.gdbtrace.core org.eclipse.linuxtools.gdbtrace.core.tests -- 2.34.1