From 115b4a011a6d454d317b035d616f649c75a9943c Mon Sep 17 00:00:00 2001 From: Bernd Hufmann Date: Thu, 15 Mar 2012 13:49:35 -0400 Subject: [PATCH] Internalize API for trace control and move control to lttng2 --- .../META-INF/MANIFEST.MF | 5 +- .../lttng/ui/tests/AllLTTngUITests.java | 3 - .../META-INF/MANIFEST.MF | 8 - .../plugin.properties | 56 -- org.eclipse.linuxtools.lttng.ui/plugin.xml | 874 ----------------- .../lttng/ui/views/PerspectiveFactory.java | 4 +- .../.classpath | 1 + .../META-INF/MANIFEST.MF | 14 +- .../linuxtools/lttng2/ui/tests/AllTests.java | 4 + .../control/model/component/AllTests.java | 2 +- .../model/component/ModelImplTestSetup.java | 2 +- .../component/TraceControlComponentTest.java | 22 +- .../component/TraceControlPropertiesTest.java | 59 +- .../component/TraceControlProviderTests.java | 52 +- .../component/TraceControlTestFacility.java | 9 +- .../component/TraceControlTreeModelTest.java | 45 +- .../ui/tests/control/model/impl/AllTests.java | 2 +- .../control/model/impl/BaseEventInfoTest.java | 10 +- .../control/model/impl/ChannelInfoTest.java | 12 +- .../control/model/impl/DomainInfoTest.java | 8 +- .../control/model/impl/EventInfoTest.java | 12 +- .../control/model/impl/ListenerValidator.java | 6 +- .../control/model/impl/ModelImplFactory.java | 40 +- .../model/impl/ProbeEventInfoTest.java | 14 +- .../control/model/impl/SessionInfoTest.java | 10 +- .../control/model/impl/TraceInfoTest.java | 6 +- .../model/impl/UstProviderInfoTest.java | 10 +- .../ui/tests/control/service/AllTests.java | 2 +- .../service/LTTngControlServiceTest.java | 38 +- .../stubs/service/CommandShellFactory.java | 4 +- .../stubs/service/TestRemoteSystemProxy.java | 9 +- .../stubs}/shells/LTTngToolsFileShell.java | 6 +- .../stubs}/shells/TestCommandShell.java | 8 +- .../testfiles/CreateTreeTest.cfg | 0 .../testfiles/LTTngServiceTest.cfg | 0 .../testfiles/ListInfoTest.cfg | 0 .../META-INF/MANIFEST.MF | 18 +- .../icons/elcl16/add_button.gif | Bin 0 -> 308 bytes .../icons/elcl16/connect.gif | Bin .../icons/elcl16/delete_trace.gif | Bin 0 -> 351 bytes .../icons/elcl16/disconnect.gif | Bin .../icons/elcl16/edit.gif | Bin 0 -> 210 bytes .../icons/elcl16/pause_trace.gif | Bin 0 -> 338 bytes .../icons/elcl16/refresh.gif | Bin .../icons/elcl16/start_trace.gif | Bin 0 -> 528 bytes .../icons/elcl16/stop_trace.gif | Bin 0 -> 215 bytes .../icons/elcl16/target_add.gif | Bin .../icons/elcl16/target_delete.gif | Bin .../icons/eview16/control_view.gif | Bin 0 -> 152 bytes .../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/providers.gif | Bin 0 -> 224 bytes .../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 0 -> 243 bytes .../plugin.properties | 56 ++ org.eclipse.linuxtools.lttng2.ui/plugin.xml | 891 +++++++++++++++++- .../internal/lttng2/ui/Activator.java | 19 + .../lttng2/ui/views/PerspectiveFactory.java | 3 + .../lttng2}/ui/views/control/ControlView.java | 16 +- .../lttng2}/ui/views/control/Messages.java | 4 +- .../control/TraceControlContentProvider.java | 4 +- .../control/TraceControlLabelProvider.java | 4 +- .../views/control/dialogs/ConfirmDialog.java | 6 +- .../control/dialogs/CreateChannelDialog.java | 18 +- .../control/dialogs/CreateSessionDialog.java | 20 +- .../control/dialogs/EnableEventsDialog.java | 54 +- .../dialogs/EnableKernelEventComposite.java | 38 +- .../dialogs/EnableUstEventsComposite.java | 40 +- .../control/dialogs/GetEventInfoDialog.java | 20 +- .../views/control/dialogs/IConfirmDialog.java | 2 +- .../control/dialogs/ICreateChannelDialog.java | 6 +- .../ICreateChannelOnSessionDialog.java | 2 +- .../control/dialogs/ICreateSessionDialog.java | 4 +- .../control/dialogs/IEnableEventsDialog.java | 6 +- .../control/dialogs/IEnableKernelEvents.java | 2 +- .../control/dialogs/IEnableUstEvents.java | 6 +- .../control/dialogs/IGetEventInfoDialog.java | 6 +- .../control/dialogs/INewConnectionDialog.java | 4 +- .../control/dialogs/NewConnectionDialog.java | 16 +- .../dialogs/TraceControlDialogFactory.java | 2 +- .../control/handlers/AssignEventHandler.java | 26 +- .../handlers/BaseControlViewHandler.java | 4 +- .../handlers/BaseEnableEventHandler.java | 24 +- .../control/handlers/BaseNodeHandler.java | 6 +- .../handlers/ChangeChannelStateHandler.java | 16 +- .../handlers/ChangeEventStateHandler.java | 16 +- .../handlers/ChangeSessionStateHandler.java | 12 +- .../control/handlers/ConnectHandler.java | 8 +- .../CreateChannelOnDomainHandler.java | 18 +- .../CreateChannelOnSessionHandler.java | 18 +- .../handlers/CreateSessionHandler.java | 14 +- .../views/control/handlers/DeleteHandler.java | 10 +- .../handlers/DestroySessionHandler.java | 18 +- .../handlers/DisableChannelHandler.java | 10 +- .../control/handlers/DisableEventHandler.java | 10 +- .../control/handlers/DisconnectHandler.java | 8 +- .../handlers/EnableChannelHandler.java | 10 +- .../control/handlers/EnableEventHandler.java | 10 +- .../handlers/EnableEventOnChannelHandler.java | 26 +- .../handlers/EnableEventOnDomainHandler.java | 24 +- .../handlers/EnableEventOnSessionHandler.java | 24 +- .../handlers/NewConnectionHandler.java | 16 +- .../control/handlers/RefreshHandler.java | 10 +- .../views/control/handlers/StartHandler.java | 10 +- .../views/control/handlers/StopHandler.java | 10 +- .../ui/views/control/messages.properties | 0 .../views/control/model/IBaseEventInfo.java | 2 +- .../ui/views/control/model/IChannelInfo.java | 2 +- .../ui/views/control/model/IDomainInfo.java | 2 +- .../ui/views/control/model/IEventInfo.java | 2 +- .../views/control/model/IProbeEventInfo.java | 2 +- .../ui/views/control/model/ISessionInfo.java | 2 +- .../control/model/ITraceControlComponent.java | 4 +- ...ITraceControlComponentChangedListener.java | 2 +- .../ui/views/control/model/ITraceInfo.java | 2 +- .../views/control/model/IUstProviderInfo.java | 2 +- .../ui/views/control/model/LogLevelType.java | 2 +- .../views/control/model/TargetNodeState.java | 2 +- .../views/control/model/TraceEnablement.java | 2 +- .../views/control/model/TraceEventType.java | 2 +- .../ui/views/control/model/TraceLogLevel.java | 2 +- .../control/model/TraceSessionState.java | 2 +- .../model/impl/BaseEventComponent.java | 14 +- .../control/model/impl/BaseEventInfo.java | 28 +- .../views/control/model/impl/ChannelInfo.java | 52 +- .../views/control/model/impl/DomainInfo.java | 24 +- .../views/control/model/impl/EventInfo.java | 20 +- .../model/impl/KernelProviderComponent.java | 10 +- .../control/model/impl/ProbeEventInfo.java | 24 +- .../views/control/model/impl/SessionInfo.java | 32 +- .../model/impl/TargetNodeComponent.java | 45 +- .../model/impl/TraceChannelComponent.java | 24 +- .../model/impl/TraceControlComponent.java | 68 +- .../control/model/impl/TraceControlRoot.java | 2 +- .../model/impl/TraceDomainComponent.java | 18 +- .../model/impl/TraceEventComponent.java | 22 +- .../views/control/model/impl/TraceInfo.java | 10 +- .../model/impl/TraceProbeEventComponent.java | 10 +- .../model/impl/TraceProviderGroup.java | 10 +- .../model/impl/TraceSessionComponent.java | 24 +- .../control/model/impl/TraceSessionGroup.java | 6 +- .../model/impl/UstProviderComponent.java | 12 +- .../control/model/impl/UstProviderInfo.java | 24 +- .../property/BaseEventPropertySource.java | 12 +- .../control/property/BasePropertySource.java | 2 +- .../KernelProviderPropertySource.java | 10 +- .../property/TargetNodePropertySource.java | 10 +- .../property/TraceChannelPropertySource.java | 10 +- .../property/TraceDomainPropertySource.java | 10 +- .../property/TraceEventPropertySource.java | 12 +- .../TraceProbeEventPropertySource.java | 12 +- .../property/TraceSessionPropertySource.java | 6 +- .../property/UstProviderPropertySource.java | 10 +- .../control/remote/IRemoteSystemProxy.java | 4 +- .../control/remote/RemoteSystemProxy.java | 26 +- .../views/control/service/CommandResult.java | 10 +- .../views/control/service/CommandShell.java | 14 +- .../views/control/service/ICommandResult.java | 2 +- .../views/control/service/ICommandShell.java | 2 +- .../control/service/ILttngControlService.java | 14 +- .../control/service/LTTngControlService.java | 68 +- 171 files changed, 1891 insertions(+), 1838 deletions(-) rename {org.eclipse.linuxtools.lttng.ui.tests/src/org/eclipse/linuxtools/lttng => org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2}/ui/tests/control/model/component/AllTests.java (93%) rename {org.eclipse.linuxtools.lttng.ui.tests/src/org/eclipse/linuxtools/lttng => org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2}/ui/tests/control/model/component/ModelImplTestSetup.java (94%) rename {org.eclipse.linuxtools.lttng.ui.tests/src/org/eclipse/linuxtools/lttng => org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2}/ui/tests/control/model/component/TraceControlComponentTest.java (95%) rename {org.eclipse.linuxtools.lttng.ui.tests/src/org/eclipse/linuxtools/lttng => org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2}/ui/tests/control/model/component/TraceControlPropertiesTest.java (85%) rename {org.eclipse.linuxtools.lttng.ui.tests/src/org/eclipse/linuxtools/lttng => org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2}/ui/tests/control/model/component/TraceControlProviderTests.java (94%) rename {org.eclipse.linuxtools.lttng.ui.tests/src/org/eclipse/linuxtools/lttng => org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2}/ui/tests/control/model/component/TraceControlTestFacility.java (95%) rename {org.eclipse.linuxtools.lttng.ui.tests/src/org/eclipse/linuxtools/lttng => org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2}/ui/tests/control/model/component/TraceControlTreeModelTest.java (92%) rename {org.eclipse.linuxtools.lttng.ui.tests/src/org/eclipse/linuxtools/lttng => org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2}/ui/tests/control/model/impl/AllTests.java (94%) rename {org.eclipse.linuxtools.lttng.ui.tests/src/org/eclipse/linuxtools/lttng => org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2}/ui/tests/control/model/impl/BaseEventInfoTest.java (97%) rename {org.eclipse.linuxtools.lttng.ui.tests/src/org/eclipse/linuxtools/lttng => org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2}/ui/tests/control/model/impl/ChannelInfoTest.java (95%) rename {org.eclipse.linuxtools.lttng.ui.tests/src/org/eclipse/linuxtools/lttng => org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2}/ui/tests/control/model/impl/DomainInfoTest.java (95%) rename {org.eclipse.linuxtools.lttng.ui.tests/src/org/eclipse/linuxtools/lttng => org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2}/ui/tests/control/model/impl/EventInfoTest.java (94%) rename {org.eclipse.linuxtools.lttng.ui.tests/src/org/eclipse/linuxtools/lttng => org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2}/ui/tests/control/model/impl/ListenerValidator.java (91%) rename {org.eclipse.linuxtools.lttng.ui.tests/src/org/eclipse/linuxtools/lttng => org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2}/ui/tests/control/model/impl/ModelImplFactory.java (78%) rename {org.eclipse.linuxtools.lttng.ui.tests/src/org/eclipse/linuxtools/lttng => org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2}/ui/tests/control/model/impl/ProbeEventInfoTest.java (92%) rename {org.eclipse.linuxtools.lttng.ui.tests/src/org/eclipse/linuxtools/lttng => org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2}/ui/tests/control/model/impl/SessionInfoTest.java (95%) rename {org.eclipse.linuxtools.lttng.ui.tests/src/org/eclipse/linuxtools/lttng => org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2}/ui/tests/control/model/impl/TraceInfoTest.java (95%) rename {org.eclipse.linuxtools.lttng.ui.tests/src/org/eclipse/linuxtools/lttng => org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2}/ui/tests/control/model/impl/UstProviderInfoTest.java (95%) rename {org.eclipse.linuxtools.lttng.ui.tests/src/org/eclipse/linuxtools/lttng => org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2}/ui/tests/control/service/AllTests.java (92%) rename {org.eclipse.linuxtools.lttng.ui.tests/src/org/eclipse/linuxtools/lttng => org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2}/ui/tests/control/service/LTTngControlServiceTest.java (94%) rename {org.eclipse.linuxtools.lttng.ui.tests/stubs/org/eclipse/linuxtools/lttng => org.eclipse.linuxtools.lttng2.ui.tests/stubs/org/eclipse/linuxtools/internal/lttng2}/stubs/service/CommandShellFactory.java (90%) rename {org.eclipse.linuxtools.lttng.ui.tests/stubs/org/eclipse/linuxtools/lttng => org.eclipse.linuxtools.lttng2.ui.tests/stubs/org/eclipse/linuxtools/internal/lttng2}/stubs/service/TestRemoteSystemProxy.java (90%) rename {org.eclipse.linuxtools.lttng.ui.tests/stubs/org/eclipse/linuxtools/lttng/stubs/service => org.eclipse.linuxtools.lttng2.ui.tests/stubs/org/eclipse/linuxtools/internal/lttng2/stubs}/shells/LTTngToolsFileShell.java (97%) rename {org.eclipse.linuxtools.lttng.ui.tests/stubs/org/eclipse/linuxtools/lttng/stubs/service => org.eclipse.linuxtools.lttng2.ui.tests/stubs/org/eclipse/linuxtools/internal/lttng2/stubs}/shells/TestCommandShell.java (80%) rename {org.eclipse.linuxtools.lttng.ui.tests => org.eclipse.linuxtools.lttng2.ui.tests}/testfiles/CreateTreeTest.cfg (100%) rename {org.eclipse.linuxtools.lttng.ui.tests => org.eclipse.linuxtools.lttng2.ui.tests}/testfiles/LTTngServiceTest.cfg (100%) rename {org.eclipse.linuxtools.lttng.ui.tests => org.eclipse.linuxtools.lttng2.ui.tests}/testfiles/ListInfoTest.cfg (100%) create mode 100644 org.eclipse.linuxtools.lttng2.ui/icons/elcl16/add_button.gif rename {org.eclipse.linuxtools.lttng.ui => org.eclipse.linuxtools.lttng2.ui}/icons/elcl16/connect.gif (100%) create mode 100644 org.eclipse.linuxtools.lttng2.ui/icons/elcl16/delete_trace.gif rename {org.eclipse.linuxtools.lttng.ui => org.eclipse.linuxtools.lttng2.ui}/icons/elcl16/disconnect.gif (100%) create mode 100644 org.eclipse.linuxtools.lttng2.ui/icons/elcl16/edit.gif create mode 100644 org.eclipse.linuxtools.lttng2.ui/icons/elcl16/pause_trace.gif rename {org.eclipse.linuxtools.lttng.ui => org.eclipse.linuxtools.lttng2.ui}/icons/elcl16/refresh.gif (100%) create mode 100644 org.eclipse.linuxtools.lttng2.ui/icons/elcl16/start_trace.gif create mode 100644 org.eclipse.linuxtools.lttng2.ui/icons/elcl16/stop_trace.gif rename {org.eclipse.linuxtools.lttng.ui => org.eclipse.linuxtools.lttng2.ui}/icons/elcl16/target_add.gif (100%) rename {org.eclipse.linuxtools.lttng.ui => org.eclipse.linuxtools.lttng2.ui}/icons/elcl16/target_delete.gif (100%) create mode 100644 org.eclipse.linuxtools.lttng2.ui/icons/eview16/control_view.gif rename {org.eclipse.linuxtools.lttng.ui => org.eclipse.linuxtools.lttng2.ui}/icons/obj16/channel.gif (100%) rename {org.eclipse.linuxtools.lttng.ui => org.eclipse.linuxtools.lttng2.ui}/icons/obj16/channel_disabled.gif (100%) rename {org.eclipse.linuxtools.lttng.ui => org.eclipse.linuxtools.lttng2.ui}/icons/obj16/domain.gif (100%) rename {org.eclipse.linuxtools.lttng.ui => org.eclipse.linuxtools.lttng2.ui}/icons/obj16/event_disabled.gif (100%) rename {org.eclipse.linuxtools.lttng.ui => org.eclipse.linuxtools.lttng2.ui}/icons/obj16/event_enabled.gif (100%) create mode 100644 org.eclipse.linuxtools.lttng2.ui/icons/obj16/providers.gif rename {org.eclipse.linuxtools.lttng.ui => org.eclipse.linuxtools.lttng2.ui}/icons/obj16/session_active.gif (100%) rename {org.eclipse.linuxtools.lttng.ui => org.eclipse.linuxtools.lttng2.ui}/icons/obj16/session_destroyed.gif (100%) rename {org.eclipse.linuxtools.lttng.ui => org.eclipse.linuxtools.lttng2.ui}/icons/obj16/session_inactive.gif (100%) rename {org.eclipse.linuxtools.lttng.ui => org.eclipse.linuxtools.lttng2.ui}/icons/obj16/sessions.gif (100%) rename {org.eclipse.linuxtools.lttng.ui => org.eclipse.linuxtools.lttng2.ui}/icons/obj16/systemlttng2-live.gif (100%) rename {org.eclipse.linuxtools.lttng.ui => org.eclipse.linuxtools.lttng2.ui}/icons/obj16/systemlttng2.gif (100%) rename {org.eclipse.linuxtools.lttng.ui => org.eclipse.linuxtools.lttng2.ui}/icons/obj16/target_connected.gif (100%) rename {org.eclipse.linuxtools.lttng.ui => org.eclipse.linuxtools.lttng2.ui}/icons/obj16/target_disconnected.gif (100%) create mode 100644 org.eclipse.linuxtools.lttng2.ui/icons/obj16/targets.gif rename {org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng => org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2}/ui/views/control/ControlView.java (83%) rename {org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng => org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2}/ui/views/control/Messages.java (98%) rename {org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng => org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2}/ui/views/control/TraceControlContentProvider.java (94%) rename {org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng => org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2}/ui/views/control/TraceControlLabelProvider.java (92%) rename {org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng => org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2}/ui/views/control/dialogs/ConfirmDialog.java (76%) rename {org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng => org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2}/ui/views/control/dialogs/CreateChannelDialog.java (93%) rename {org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng => org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2}/ui/views/control/dialogs/CreateSessionDialog.java (89%) rename {org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng => org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2}/ui/views/control/dialogs/EnableEventsDialog.java (82%) rename {org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng => org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2}/ui/views/control/dialogs/EnableKernelEventComposite.java (91%) rename {org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng => org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2}/ui/views/control/dialogs/EnableUstEventsComposite.java (91%) rename {org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng => org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2}/ui/views/control/dialogs/GetEventInfoDialog.java (90%) rename {org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng => org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2}/ui/views/control/dialogs/IConfirmDialog.java (91%) rename {org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng => org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2}/ui/views/control/dialogs/ICreateChannelDialog.java (84%) rename {org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng => org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2}/ui/views/control/dialogs/ICreateChannelOnSessionDialog.java (93%) rename {org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng => org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2}/ui/views/control/dialogs/ICreateSessionDialog.java (90%) rename {org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng => org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2}/ui/views/control/dialogs/IEnableEventsDialog.java (86%) rename {org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng => org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2}/ui/views/control/dialogs/IEnableKernelEvents.java (97%) rename {org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng => org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2}/ui/views/control/dialogs/IEnableUstEvents.java (88%) rename {org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng => org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2}/ui/views/control/dialogs/IGetEventInfoDialog.java (86%) rename {org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng => org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2}/ui/views/control/dialogs/INewConnectionDialog.java (90%) rename {org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng => org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2}/ui/views/control/dialogs/NewConnectionDialog.java (92%) rename {org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng => org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2}/ui/views/control/dialogs/TraceControlDialogFactory.java (98%) rename {org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng => org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2}/ui/views/control/handlers/AssignEventHandler.java (85%) rename {org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng => org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2}/ui/views/control/handlers/BaseControlViewHandler.java (92%) rename {org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng => org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2}/ui/views/control/handlers/BaseEnableEventHandler.java (87%) rename {org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng => org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2}/ui/views/control/handlers/BaseNodeHandler.java (89%) rename {org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng => org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2}/ui/views/control/handlers/ChangeChannelStateHandler.java (93%) rename {org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng => org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2}/ui/views/control/handlers/ChangeEventStateHandler.java (91%) rename {org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng => org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2}/ui/views/control/handlers/ChangeSessionStateHandler.java (91%) rename {org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng => org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2}/ui/views/control/handlers/ConnectHandler.java (76%) rename {org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng => org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2}/ui/views/control/handlers/CreateChannelOnDomainHandler.java (87%) rename {org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng => org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2}/ui/views/control/handlers/CreateChannelOnSessionHandler.java (86%) rename {org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng => org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2}/ui/views/control/handlers/CreateSessionHandler.java (86%) rename {org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng => org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2}/ui/views/control/handlers/DeleteHandler.java (74%) rename {org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng => org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2}/ui/views/control/handlers/DestroySessionHandler.java (87%) rename {org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng => org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2}/ui/views/control/handlers/DisableChannelHandler.java (71%) rename {org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng => org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2}/ui/views/control/handlers/DisableEventHandler.java (71%) rename {org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng => org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2}/ui/views/control/handlers/DisconnectHandler.java (76%) rename {org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng => org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2}/ui/views/control/handlers/EnableChannelHandler.java (71%) rename {org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng => org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2}/ui/views/control/handlers/EnableEventHandler.java (71%) rename {org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng => org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2}/ui/views/control/handlers/EnableEventOnChannelHandler.java (70%) rename {org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng => org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2}/ui/views/control/handlers/EnableEventOnDomainHandler.java (71%) rename {org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng => org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2}/ui/views/control/handlers/EnableEventOnSessionHandler.java (70%) rename {org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng => org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2}/ui/views/control/handlers/NewConnectionHandler.java (88%) rename {org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng => org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2}/ui/views/control/handlers/RefreshHandler.java (88%) rename {org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng => org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2}/ui/views/control/handlers/StartHandler.java (70%) rename {org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng => org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2}/ui/views/control/handlers/StopHandler.java (70%) rename {org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng => org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2}/ui/views/control/messages.properties (100%) rename {org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng => org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2}/ui/views/control/model/IBaseEventInfo.java (95%) rename {org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng => org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2}/ui/views/control/model/IChannelInfo.java (98%) rename {org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng => org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2}/ui/views/control/model/IDomainInfo.java (95%) rename {org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng => org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2}/ui/views/control/model/IEventInfo.java (94%) rename {org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng => org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2}/ui/views/control/model/IProbeEventInfo.java (95%) rename {org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng => org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2}/ui/views/control/model/ISessionInfo.java (96%) rename {org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng => org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2}/ui/views/control/model/ITraceControlComponent.java (97%) rename {org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng => org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2}/ui/views/control/model/ITraceControlComponentChangedListener.java (95%) rename {org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng => org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2}/ui/views/control/model/ITraceInfo.java (93%) rename {org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng => org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2}/ui/views/control/model/IUstProviderInfo.java (95%) rename {org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng => org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2}/ui/views/control/model/LogLevelType.java (92%) rename {org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng => org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2}/ui/views/control/model/TargetNodeState.java (90%) rename {org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng => org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2}/ui/views/control/model/TraceEnablement.java (96%) rename {org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng => org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2}/ui/views/control/model/TraceEventType.java (93%) rename {org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng => org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2}/ui/views/control/model/TraceLogLevel.java (97%) rename {org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng => org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2}/ui/views/control/model/TraceSessionState.java (96%) rename {org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng => org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2}/ui/views/control/model/impl/BaseEventComponent.java (86%) rename {org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng => org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2}/ui/views/control/model/impl/BaseEventInfo.java (82%) rename {org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng => org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2}/ui/views/control/model/impl/ChannelInfo.java (79%) rename {org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng => org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2}/ui/views/control/model/impl/DomainInfo.java (82%) rename {org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng => org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2}/ui/views/control/model/impl/EventInfo.java (78%) rename {org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng => org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2}/ui/views/control/model/impl/KernelProviderComponent.java (85%) rename {org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng => org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2}/ui/views/control/model/impl/ProbeEventInfo.java (81%) rename {org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng => org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2}/ui/views/control/model/impl/SessionInfo.java (79%) rename {org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng => org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2}/ui/views/control/model/impl/TargetNodeComponent.java (80%) rename {org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng => org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2}/ui/views/control/model/impl/TraceChannelComponent.java (91%) rename {org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng => org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2}/ui/views/control/model/impl/TraceControlComponent.java (68%) rename {org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng => org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2}/ui/views/control/model/impl/TraceControlRoot.java (94%) rename {org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng => org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2}/ui/views/control/model/impl/TraceDomainComponent.java (92%) rename {org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng => org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2}/ui/views/control/model/impl/TraceEventComponent.java (85%) rename {org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng => org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2}/ui/views/control/model/impl/TraceInfo.java (88%) rename {org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng => org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2}/ui/views/control/model/impl/TraceProbeEventComponent.java (88%) rename {org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng => org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2}/ui/views/control/model/impl/TraceProviderGroup.java (89%) rename {org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng => org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2}/ui/views/control/model/impl/TraceSessionComponent.java (91%) rename {org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng => org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2}/ui/views/control/model/impl/TraceSessionGroup.java (95%) rename {org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng => org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2}/ui/views/control/model/impl/UstProviderComponent.java (85%) rename {org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng => org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2}/ui/views/control/model/impl/UstProviderInfo.java (81%) rename {org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng => org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2}/ui/views/control/property/BaseEventPropertySource.java (87%) rename {org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng => org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2}/ui/views/control/property/BasePropertySource.java (96%) rename {org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng => org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2}/ui/views/control/property/KernelProviderPropertySource.java (84%) rename {org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng => org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2}/ui/views/control/property/TargetNodePropertySource.java (88%) rename {org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng => org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2}/ui/views/control/property/TraceChannelPropertySource.java (93%) rename {org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng => org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2}/ui/views/control/property/TraceDomainPropertySource.java (84%) rename {org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng => org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2}/ui/views/control/property/TraceEventPropertySource.java (88%) rename {org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng => org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2}/ui/views/control/property/TraceProbeEventPropertySource.java (89%) rename {org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng => org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2}/ui/views/control/property/TraceSessionPropertySource.java (94%) rename {org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng => org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2}/ui/views/control/property/UstProviderPropertySource.java (86%) rename {org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng => org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2}/ui/views/control/remote/IRemoteSystemProxy.java (95%) rename {org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng => org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2}/ui/views/control/remote/RemoteSystemProxy.java (79%) rename {org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng => org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2}/ui/views/control/service/CommandResult.java (81%) rename {org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng => org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2}/ui/views/control/service/CommandShell.java (91%) rename {org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng => org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2}/ui/views/control/service/ICommandResult.java (93%) rename {org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng => org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2}/ui/views/control/service/ICommandShell.java (96%) rename {org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng => org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2}/ui/views/control/service/ILttngControlService.java (92%) rename {org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng => org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2}/ui/views/control/service/LTTngControlService.java (92%) diff --git a/org.eclipse.linuxtools.lttng.ui.tests/META-INF/MANIFEST.MF b/org.eclipse.linuxtools.lttng.ui.tests/META-INF/MANIFEST.MF index ab9b698075..808c1efb2b 100644 --- a/org.eclipse.linuxtools.lttng.ui.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.linuxtools.lttng.ui.tests/META-INF/MANIFEST.MF @@ -12,10 +12,7 @@ Require-Bundle: org.junit;bundle-version="3.8.2", org.eclipse.ui;bundle-version="3.7.0", org.eclipse.core.resources;bundle-version="3.7.0", org.eclipse.core.runtime;bundle-version="3.7.0", - org.eclipse.rse.core;bundle-version="3.2.0", - org.eclipse.rse.services;bundle-version="3.2.100", - org.eclipse.ui.views;bundle-version="3.6.0", - org.eclipse.rse.subsystems.files.core;bundle-version="3.2.100" + org.eclipse.ui.views;bundle-version="3.6.0" Bundle-Localization: plugin Bundle-Activator: org.eclipse.linuxtools.lttng.ui.tests.LTTngUITestPlugin Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.linuxtools.lttng.ui.tests/src/org/eclipse/linuxtools/lttng/ui/tests/AllLTTngUITests.java b/org.eclipse.linuxtools.lttng.ui.tests/src/org/eclipse/linuxtools/lttng/ui/tests/AllLTTngUITests.java index e5f235ad0d..87e6a9f557 100644 --- a/org.eclipse.linuxtools.lttng.ui.tests/src/org/eclipse/linuxtools/lttng/ui/tests/AllLTTngUITests.java +++ b/org.eclipse.linuxtools.lttng.ui.tests/src/org/eclipse/linuxtools/lttng/ui/tests/AllLTTngUITests.java @@ -7,10 +7,7 @@ public class AllLTTngUITests { public static Test suite() { TestSuite suite = new TestSuite(AllLTTngUITests.class.getName()); //$JUnit-BEGIN$ - suite.addTest(org.eclipse.linuxtools.lttng.ui.tests.control.model.impl.AllTests.suite()); - suite.addTest(org.eclipse.linuxtools.lttng.ui.tests.control.service.AllTests.suite()); suite.addTest(org.eclipse.linuxtools.lttng.ui.tests.distribution.AllTests.suite()); - suite.addTest(org.eclipse.linuxtools.lttng.ui.tests.control.model.component.AllTests.suite()); //$JUnit-END$ return suite; } diff --git a/org.eclipse.linuxtools.lttng.ui/META-INF/MANIFEST.MF b/org.eclipse.linuxtools.lttng.ui/META-INF/MANIFEST.MF index c322109fac..116321da1e 100644 --- a/org.eclipse.linuxtools.lttng.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.linuxtools.lttng.ui/META-INF/MANIFEST.MF @@ -34,14 +34,6 @@ Export-Package: org.eclipse.linuxtools.internal.lttng.ui;x-friends:="org.eclipse org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.wizards;x-friends:="org.eclipse.linuxtools.lttng.ui.tests", org.eclipse.linuxtools.internal.lttng.ui.views;x-friends:="org.eclipse.linuxtools.lttng.ui.tests", org.eclipse.linuxtools.internal.lttng.ui.views.common;x-friends:="org.eclipse.linuxtools.lttng.ui.tests", - org.eclipse.linuxtools.internal.lttng.ui.views.control;x-friends:="org.eclipse.linuxtools.lttng.ui.tests", - org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs;x-friends:="org.eclipse.linuxtools.lttng.ui.tests", - org.eclipse.linuxtools.internal.lttng.ui.views.control.handlers;x-friends:="org.eclipse.linuxtools.lttng.ui.tests", - org.eclipse.linuxtools.internal.lttng.ui.views.control.model;x-friends:="org.eclipse.linuxtools.lttng.ui.tests", - org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl;x-friends:="org.eclipse.linuxtools.lttng.ui.tests", - org.eclipse.linuxtools.internal.lttng.ui.views.control.property;x-friends:="org.eclipse.linuxtools.lttng.ui.tests", - org.eclipse.linuxtools.internal.lttng.ui.views.control.remote;x-friends:="org.eclipse.linuxtools.lttng.ui.tests", - org.eclipse.linuxtools.internal.lttng.ui.views.control.service;x-friends:="org.eclipse.linuxtools.lttng.ui.tests", org.eclipse.linuxtools.internal.lttng.ui.views.controlflow;x-friends:="org.eclipse.linuxtools.lttng.ui.tests", org.eclipse.linuxtools.internal.lttng.ui.views.controlflow.evProcessor;x-friends:="org.eclipse.linuxtools.lttng.ui.tests", org.eclipse.linuxtools.internal.lttng.ui.views.controlflow.model;x-friends:="org.eclipse.linuxtools.lttng.ui.tests", diff --git a/org.eclipse.linuxtools.lttng.ui/plugin.properties b/org.eclipse.linuxtools.lttng.ui/plugin.properties index f97faa6791..60f3a58d6a 100644 --- a/org.eclipse.linuxtools.lttng.ui/plugin.properties +++ b/org.eclipse.linuxtools.lttng.ui/plugin.properties @@ -52,62 +52,6 @@ commands.experiment.rename.description = Rename an LTTng Experiment commands.experiment.delete = Delete Experiment commands.experiment.delete.description = Delete an LTTng Experiment -# LTTng 2.0 trace control commands -trace.control.rse.system.type.name=LTTng (v2.0 or later) -trace.control.rse.system.type.description=LTTng Trace Control (v2.0 or later) - -commands.control.category=LTTng Trace Control Commands -commands.control.category.description=LTTng Trace Control Commands - -commands.control.new=New Connection -commands.control.new.description=New Connection to Target Node - -commands.control.connect=Connect -commands.control.connect.description=Connect to Target Node - -commands.control.disconnect=Disconnect -commands.control.discconnect.description=Disconnect to Target Node - -commands.control.refresh=Refresh -commands.control.refresh.description=Refresh Node Configuration - - -commands.control.delete=Delete -commands.control.deleete.description=Delete Target Node - -commands.control.create.session=Create Session -commands.control.create.session.description=Create a Trace Session - -commands.control.destroy.session=Destroy Session -commands.control.destroy.session.description=Destroy a Trace Session - -commands.control.create.channel=Create Channel -commands.control.create.channel.description=Create a Trace Channel - -commands.control.enable.channel=Enable Channel -commands.control.enable.channel.description=Enable a Trace Channel - -commands.control.disable.channel=Disable Channel -commands.control.disable.channel.description=Disable a Trace Channel - -commands.control.start=Start -commands.control.start.description=Start Trace Session - -commands.control.stop=Stop -commands.control.stop.description=Stop Trace Session - -#commands.control.enable.event=Enable -commands.control.enable.assign.description=Assign Event to Session and Channel and Enable Event - -commands.control.enable.event=Enable Event -commands.control.enable.event.description=Enable Event - -commands.control.enable.eventOnDomain=Enable Event (default channel) -commands.control.enable.eventOnDomain.description=Enable Event on Default Channel - -commands.control.disable.event=Disable Event -commands.control.disable.event.description=Disable Event - # trace control (RSE) properties (LTTng 0.x) lttng.rse.subsystem.type.name=LTTng (v0.x) lttng.rse.subsystem.type.description=LTTng Trace Control (v0.x) diff --git a/org.eclipse.linuxtools.lttng.ui/plugin.xml b/org.eclipse.linuxtools.lttng.ui/plugin.xml index 53a113c28a..a140c2ec3c 100644 --- a/org.eclipse.linuxtools.lttng.ui/plugin.xml +++ b/org.eclipse.linuxtools.lttng.ui/plugin.xml @@ -18,15 +18,6 @@ id="org.eclipse.linuxtools.lttng.ui.views.category" name="%views.category.name"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1000,15 +135,6 @@ name="org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.systemType" subsystemConfigurationIds="org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.subsystems.TraceSubSystemConfiguration;org.eclipse.tm.tcf.rse.Processes;org.eclipse.tm.tcf.rse.Shells;org.eclipse.tm.tcf.rse.Files;org.eclipse.tm.tcf.rse.Terminals"> - - diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/PerspectiveFactory.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/PerspectiveFactory.java index 9d3e6810f5..32eac7e678 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/PerspectiveFactory.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/PerspectiveFactory.java @@ -12,7 +12,6 @@ package org.eclipse.linuxtools.internal.lttng.ui.views; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.ControlView; import org.eclipse.linuxtools.internal.lttng.ui.views.controlflow.ControlFlowView; import org.eclipse.linuxtools.internal.lttng.ui.views.resources.ResourcesView; import org.eclipse.linuxtools.internal.lttng.ui.views.statistics.StatisticsView; @@ -38,7 +37,7 @@ public class PerspectiveFactory implements IPerspectiveFactory { private static final String RESOURCES_VIEW_ID = ResourcesView.ID; private static final String STATISTICS_VIEW_ID = StatisticsView.ID; private static final String HISTOGRAM_VIEW_ID = HistogramView.ID; - private static final String CONTROL_VIEW_ID = ControlView.ID; + // Standard Eclipse views private static final String PROJECT_VIEW_ID = IPageLayout.ID_PROJECT_EXPLORER; @@ -63,7 +62,6 @@ public class PerspectiveFactory implements IPerspectiveFactory { IFolderLayout topLeftFolder = layout.createFolder( "topLeftFolder", IPageLayout.LEFT, 0.15f, IPageLayout.ID_EDITOR_AREA); //$NON-NLS-1$ topLeftFolder.addView(PROJECT_VIEW_ID); - topLeftFolder.addView(CONTROL_VIEW_ID); // Create the top right folder IFolderLayout topRightFolder = layout.createFolder( diff --git a/org.eclipse.linuxtools.lttng2.ui.tests/.classpath b/org.eclipse.linuxtools.lttng2.ui.tests/.classpath index 1fa3e6803d..2a987e2854 100644 --- a/org.eclipse.linuxtools.lttng2.ui.tests/.classpath +++ b/org.eclipse.linuxtools.lttng2.ui.tests/.classpath @@ -3,5 +3,6 @@ + diff --git a/org.eclipse.linuxtools.lttng2.ui.tests/META-INF/MANIFEST.MF b/org.eclipse.linuxtools.lttng2.ui.tests/META-INF/MANIFEST.MF index 99227e83f9..b1db7ca585 100644 --- a/org.eclipse.linuxtools.lttng2.ui.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.linuxtools.lttng2.ui.tests/META-INF/MANIFEST.MF @@ -6,12 +6,20 @@ Bundle-Version: 0.1.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-Vendor: %Bundle-Vendor Require-Bundle: org.junit;bundle-version="3.8.2", + org.eclipse.core.resources;bundle-version="3.7.0", + org.eclipse.core.runtime;bundle-version="3.7.0", + org.eclipse.core.resources;bundle-version="3.7.0", + org.eclipse.core.runtime;bundle-version="3.7.0", org.eclipse.linuxtools.lttng2.core;bundle-version="0.1.0", org.eclipse.linuxtools.lttng2.ui;bundle-version="0.1.0", - org.eclipse.core.resources;bundle-version="3.7.0", - org.eclipse.core.runtime;bundle-version="3.7.0" + org.eclipse.rse.core;bundle-version="3.2.0", + org.eclipse.rse.services;bundle-version="3.2.100", + org.eclipse.rse.subsystems.files.core;bundle-version="3.2.100", + org.eclipse.ui;bundle-version="3.7.0", + org.eclipse.ui.views;bundle-version="3.6.0" Bundle-Localization: plugin Bundle-Activator: org.eclipse.linuxtools.lttng2.ui.tests.Activator Bundle-ActivationPolicy: lazy -Import-Package: org.eclipse.ui.plugin +Import-Package: org.eclipse.ui, + org.eclipse.ui.plugin diff --git a/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/AllTests.java b/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/AllTests.java index fc756593ac..f1ee19afea 100644 --- a/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/AllTests.java +++ b/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/AllTests.java @@ -28,6 +28,10 @@ public class AllTests { // Plug-in suite.addTestSuite(ActivatorTest.class); + suite.addTest(org.eclipse.linuxtools.lttng2.ui.tests.control.model.impl.AllTests.suite()); + suite.addTest(org.eclipse.linuxtools.lttng2.ui.tests.control.service.AllTests.suite()); + suite.addTest(org.eclipse.linuxtools.lttng2.ui.tests.control.model.component.AllTests.suite()); + // $JUnit-END$ return suite; } diff --git a/org.eclipse.linuxtools.lttng.ui.tests/src/org/eclipse/linuxtools/lttng/ui/tests/control/model/component/AllTests.java b/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/AllTests.java similarity index 93% rename from org.eclipse.linuxtools.lttng.ui.tests/src/org/eclipse/linuxtools/lttng/ui/tests/control/model/component/AllTests.java rename to org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/AllTests.java index a6258d9f35..4de04d23c7 100644 --- a/org.eclipse.linuxtools.lttng.ui.tests/src/org/eclipse/linuxtools/lttng/ui/tests/control/model/component/AllTests.java +++ b/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/AllTests.java @@ -9,7 +9,7 @@ * Contributors: * Bernd Hufmann - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.lttng.ui.tests.control.model.component; +package org.eclipse.linuxtools.lttng2.ui.tests.control.model.component; import junit.framework.Test; import junit.framework.TestSuite; diff --git a/org.eclipse.linuxtools.lttng.ui.tests/src/org/eclipse/linuxtools/lttng/ui/tests/control/model/component/ModelImplTestSetup.java b/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/ModelImplTestSetup.java similarity index 94% rename from org.eclipse.linuxtools.lttng.ui.tests/src/org/eclipse/linuxtools/lttng/ui/tests/control/model/component/ModelImplTestSetup.java rename to org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/ModelImplTestSetup.java index cbd215e0f2..1fbd76ad68 100644 --- a/org.eclipse.linuxtools.lttng.ui.tests/src/org/eclipse/linuxtools/lttng/ui/tests/control/model/component/ModelImplTestSetup.java +++ b/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/ModelImplTestSetup.java @@ -9,7 +9,7 @@ * Contributors: * Bernd Hufmann - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.lttng.ui.tests.control.model.component; +package org.eclipse.linuxtools.lttng2.ui.tests.control.model.component; import junit.extensions.TestSetup; import junit.framework.Test; diff --git a/org.eclipse.linuxtools.lttng.ui.tests/src/org/eclipse/linuxtools/lttng/ui/tests/control/model/component/TraceControlComponentTest.java b/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/TraceControlComponentTest.java similarity index 95% rename from org.eclipse.linuxtools.lttng.ui.tests/src/org/eclipse/linuxtools/lttng/ui/tests/control/model/component/TraceControlComponentTest.java rename to org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/TraceControlComponentTest.java index 97b9fd031a..c3b6aab2aa 100644 --- a/org.eclipse.linuxtools.lttng.ui.tests/src/org/eclipse/linuxtools/lttng/ui/tests/control/model/component/TraceControlComponentTest.java +++ b/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/TraceControlComponentTest.java @@ -9,7 +9,7 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.lttng.ui.tests.control.model.component; +package org.eclipse.linuxtools.lttng2.ui.tests.control.model.component; import java.util.LinkedList; import java.util.List; @@ -18,16 +18,16 @@ import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.ControlView; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceControlComponent; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceControlComponentChangedListener; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.TargetNodeState; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceControlComponent; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceControlRoot; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.service.ILttngControlService; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.service.LTTngControlService; -import org.eclipse.linuxtools.lttng.stubs.service.TestRemoteSystemProxy; -import org.eclipse.linuxtools.lttng.ui.tests.control.model.impl.ListenerValidator; +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.TargetNodeState; +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.lttng2.ui.tests.control.model.impl.ListenerValidator; import org.eclipse.swt.graphics.Image; import org.eclipse.ui.ISharedImages; import org.eclipse.ui.PlatformUI; diff --git a/org.eclipse.linuxtools.lttng.ui.tests/src/org/eclipse/linuxtools/lttng/ui/tests/control/model/component/TraceControlPropertiesTest.java b/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/TraceControlPropertiesTest.java similarity index 85% rename from org.eclipse.linuxtools.lttng.ui.tests/src/org/eclipse/linuxtools/lttng/ui/tests/control/model/component/TraceControlPropertiesTest.java rename to org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/TraceControlPropertiesTest.java index d25071997e..23e4a18a55 100644 --- a/org.eclipse.linuxtools.lttng.ui.tests/src/org/eclipse/linuxtools/lttng/ui/tests/control/model/component/TraceControlPropertiesTest.java +++ b/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/TraceControlPropertiesTest.java @@ -9,7 +9,7 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.lttng.ui.tests.control.model.component; +package org.eclipse.linuxtools.lttng2.ui.tests.control.model.component; import java.io.File; import java.net.URL; @@ -20,33 +20,33 @@ import junit.framework.TestSuite; import org.eclipse.core.runtime.FileLocator; import org.eclipse.core.runtime.Path; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IChannelInfo; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceControlComponent; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.TargetNodeState; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.TraceEnablement; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.TraceEventType; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.TraceLogLevel; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.TraceSessionState; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.BaseEventComponent; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.KernelProviderComponent; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TargetNodeComponent; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceChannelComponent; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceDomainComponent; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceEventComponent; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceProbeEventComponent; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceSessionComponent; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.UstProviderComponent; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.property.BaseEventPropertySource; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.property.KernelProviderPropertySource; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.property.TargetNodePropertySource; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.property.TraceChannelPropertySource; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.property.TraceDomainPropertySource; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.property.TraceEventPropertySource; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.property.TraceProbeEventPropertySource; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.property.TraceSessionPropertySource; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.property.UstProviderPropertySource; -import org.eclipse.linuxtools.lttng.stubs.service.TestRemoteSystemProxy; -import org.eclipse.linuxtools.lttng.ui.tests.LTTngUITestPlugin; +import org.eclipse.linuxtools.internal.lttng2.stubs.service.TestRemoteSystemProxy; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IChannelInfo; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.TargetNodeState; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.TraceEnablement; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.TraceEventType; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.TraceLogLevel; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.TraceSessionState; +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.lttng2.ui.tests.Activator; import org.eclipse.rse.core.model.Host; import org.eclipse.rse.core.model.IHost; import org.eclipse.rse.internal.core.model.SystemProfile; @@ -54,6 +54,7 @@ import org.eclipse.ui.views.properties.IPropertySource; import org.junit.After; import org.junit.Before; + /** * The class TraceControlPropertiesTest contains tests for the all property class. * @@ -121,7 +122,7 @@ public class TraceControlPropertiesTest extends TestCase { TestRemoteSystemProxy proxy = new TestRemoteSystemProxy(); - URL location = FileLocator.find(LTTngUITestPlugin.getDefault().getBundle(), new Path(DIRECTORY + File.separator + TEST_STREAM), null); + URL location = FileLocator.find(Activator.getDefault().getBundle(), new Path(DIRECTORY + File.separator + TEST_STREAM), null); File testfile = new File(FileLocator.toFileURL(location).toURI()); proxy.setTestFile(testfile.getAbsolutePath()); proxy.setScenario(SCEN_LIST_INFO_TEST); diff --git a/org.eclipse.linuxtools.lttng.ui.tests/src/org/eclipse/linuxtools/lttng/ui/tests/control/model/component/TraceControlProviderTests.java b/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/TraceControlProviderTests.java similarity index 94% rename from org.eclipse.linuxtools.lttng.ui.tests/src/org/eclipse/linuxtools/lttng/ui/tests/control/model/component/TraceControlProviderTests.java rename to org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/TraceControlProviderTests.java index b70cf858fc..706ffc69ca 100644 --- a/org.eclipse.linuxtools.lttng.ui.tests/src/org/eclipse/linuxtools/lttng/ui/tests/control/model/component/TraceControlProviderTests.java +++ b/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/TraceControlProviderTests.java @@ -9,7 +9,7 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.lttng.ui.tests.control.model.component; +package org.eclipse.linuxtools.lttng2.ui.tests.control.model.component; import java.io.File; import java.net.URL; @@ -24,30 +24,30 @@ import org.eclipse.core.commands.NotHandledException; import org.eclipse.core.commands.common.NotDefinedException; import org.eclipse.core.runtime.FileLocator; import org.eclipse.core.runtime.Path; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs.IConfirmDialog; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs.ICreateChannelOnSessionDialog; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs.ICreateSessionDialog; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs.IGetEventInfoDialog; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs.TraceControlDialogFactory; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IChannelInfo; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceControlComponent; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.TargetNodeState; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.TraceEnablement; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.TraceEventType; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.TraceLogLevel; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.TraceSessionState; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.BaseEventComponent; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.ChannelInfo; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.KernelProviderComponent; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TargetNodeComponent; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceChannelComponent; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceDomainComponent; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceEventComponent; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceSessionComponent; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceSessionGroup; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.UstProviderComponent; -import org.eclipse.linuxtools.lttng.stubs.service.TestRemoteSystemProxy; -import org.eclipse.linuxtools.lttng.ui.tests.LTTngUITestPlugin; +import org.eclipse.linuxtools.internal.lttng2.stubs.service.TestRemoteSystemProxy; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.IConfirmDialog; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.ICreateChannelOnSessionDialog; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.ICreateSessionDialog; +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.model.IChannelInfo; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.TargetNodeState; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.TraceEnablement; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.TraceEventType; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.TraceLogLevel; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.TraceSessionState; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.BaseEventComponent; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.ChannelInfo; +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.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.lttng2.ui.tests.Activator; import org.eclipse.rse.core.model.Host; import org.eclipse.rse.core.model.IHost; import org.eclipse.rse.internal.core.model.SystemProfile; @@ -102,7 +102,7 @@ public class TraceControlProviderTests extends TestCase { public void setUp() throws Exception { fFacility = TraceControlTestFacility.getInstance(); fProxy = new TestRemoteSystemProxy(); - URL location = FileLocator.find(LTTngUITestPlugin.getDefault().getBundle(), new Path(DIRECTORY + File.separator + TEST_STREAM), null); + URL location = FileLocator.find(Activator.getDefault().getBundle(), new Path(DIRECTORY + File.separator + TEST_STREAM), null); File testfile = new File(FileLocator.toFileURL(location).toURI()); fTestFile = testfile.getAbsolutePath(); } diff --git a/org.eclipse.linuxtools.lttng.ui.tests/src/org/eclipse/linuxtools/lttng/ui/tests/control/model/component/TraceControlTestFacility.java b/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/TraceControlTestFacility.java similarity index 95% rename from org.eclipse.linuxtools.lttng.ui.tests/src/org/eclipse/linuxtools/lttng/ui/tests/control/model/component/TraceControlTestFacility.java rename to org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/TraceControlTestFacility.java index 3f1d78daa8..aeb3a09576 100644 --- a/org.eclipse.linuxtools.lttng.ui.tests/src/org/eclipse/linuxtools/lttng/ui/tests/control/model/component/TraceControlTestFacility.java +++ b/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/TraceControlTestFacility.java @@ -9,14 +9,14 @@ * Contributors: * Bernd Hufmann - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.lttng.ui.tests.control.model.component; +package org.eclipse.linuxtools.lttng2.ui.tests.control.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.lttng.ui.views.control.ControlView; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.ControlView; import org.eclipse.swt.widgets.Display; import org.eclipse.ui.IViewPart; import org.eclipse.ui.PartInitException; @@ -32,11 +32,10 @@ public class TraceControlTestFacility { // ------------------------------------------------------------------------ // Constants // ------------------------------------------------------------------------ - final static public int WAIT_FOR_JOBS_DELAY = 1000; final static public int GUI_REFESH_DELAY = 500; - - final static public String COMMAND_CATEGORY_PREFIX = "org.eclipse.linuxtools.internal.lttng.ui.commands.control."; //$NON-NLS-1$ + + final static public String COMMAND_CATEGORY_PREFIX = "org.eclipse.linuxtools.internal.lttng2.ui.commands.control."; //$NON-NLS-1$ // ------------------------------------------------------------------------ // Attributes diff --git a/org.eclipse.linuxtools.lttng.ui.tests/src/org/eclipse/linuxtools/lttng/ui/tests/control/model/component/TraceControlTreeModelTest.java b/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/TraceControlTreeModelTest.java similarity index 92% rename from org.eclipse.linuxtools.lttng.ui.tests/src/org/eclipse/linuxtools/lttng/ui/tests/control/model/component/TraceControlTreeModelTest.java rename to org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/TraceControlTreeModelTest.java index b97c7239f3..677e3d3ce0 100644 --- a/org.eclipse.linuxtools.lttng.ui.tests/src/org/eclipse/linuxtools/lttng/ui/tests/control/model/component/TraceControlTreeModelTest.java +++ b/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/TraceControlTreeModelTest.java @@ -9,7 +9,7 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.lttng.ui.tests.control.model.component; +package org.eclipse.linuxtools.lttng2.ui.tests.control.model.component; import java.io.File; import java.net.URL; @@ -20,26 +20,26 @@ import junit.framework.TestSuite; import org.eclipse.core.runtime.FileLocator; import org.eclipse.core.runtime.Path; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceControlComponent; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.TargetNodeState; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.TraceEnablement; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.TraceEventType; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.TraceLogLevel; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.TraceSessionState; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.BaseEventComponent; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.KernelProviderComponent; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TargetNodeComponent; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceChannelComponent; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceEventComponent; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceProbeEventComponent; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceProviderGroup; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceSessionComponent; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceSessionGroup; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.UstProviderComponent; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.service.ILttngControlService; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.service.LTTngControlService; -import org.eclipse.linuxtools.lttng.stubs.service.TestRemoteSystemProxy; -import org.eclipse.linuxtools.lttng.ui.tests.LTTngUITestPlugin; +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.TargetNodeState; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.TraceEnablement; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.TraceEventType; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.TraceLogLevel; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.TraceSessionState; +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.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.lttng2.ui.tests.Activator; import org.eclipse.rse.core.model.Host; import org.eclipse.rse.core.model.IHost; import org.eclipse.rse.internal.core.model.SystemProfile; @@ -47,6 +47,7 @@ import org.eclipse.swt.graphics.Image; import org.junit.After; import org.junit.Before; + /** * The class TraceControlTreeModelTest contains tests for the tree component classes. */ @@ -91,7 +92,7 @@ public class TraceControlTreeModelTest extends TestCase { @Before public void setUp() throws Exception { fProxy = new TestRemoteSystemProxy(); - URL location = FileLocator.find(LTTngUITestPlugin.getDefault().getBundle(), new Path(DIRECTORY + File.separator + TEST_STREAM), null); + URL location = FileLocator.find(Activator.getDefault().getBundle(), new Path(DIRECTORY + File.separator + TEST_STREAM), null); File testfile = new File(FileLocator.toFileURL(location).toURI()); fTestFile = testfile.getAbsolutePath(); } diff --git a/org.eclipse.linuxtools.lttng.ui.tests/src/org/eclipse/linuxtools/lttng/ui/tests/control/model/impl/AllTests.java b/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/impl/AllTests.java similarity index 94% rename from org.eclipse.linuxtools.lttng.ui.tests/src/org/eclipse/linuxtools/lttng/ui/tests/control/model/impl/AllTests.java rename to org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/impl/AllTests.java index 059bc9b6e3..75ec977233 100644 --- a/org.eclipse.linuxtools.lttng.ui.tests/src/org/eclipse/linuxtools/lttng/ui/tests/control/model/impl/AllTests.java +++ b/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/impl/AllTests.java @@ -9,7 +9,7 @@ * Contributors: * Bernd Hufmann - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.lttng.ui.tests.control.model.impl; +package org.eclipse.linuxtools.lttng2.ui.tests.control.model.impl; import junit.framework.Test; import junit.framework.TestSuite; diff --git a/org.eclipse.linuxtools.lttng.ui.tests/src/org/eclipse/linuxtools/lttng/ui/tests/control/model/impl/BaseEventInfoTest.java b/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/impl/BaseEventInfoTest.java similarity index 97% rename from org.eclipse.linuxtools.lttng.ui.tests/src/org/eclipse/linuxtools/lttng/ui/tests/control/model/impl/BaseEventInfoTest.java rename to org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/impl/BaseEventInfoTest.java index ff1bd805be..f53f536245 100644 --- a/org.eclipse.linuxtools.lttng.ui.tests/src/org/eclipse/linuxtools/lttng/ui/tests/control/model/impl/BaseEventInfoTest.java +++ b/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/impl/BaseEventInfoTest.java @@ -9,14 +9,14 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.lttng.ui.tests.control.model.impl; +package org.eclipse.linuxtools.lttng2.ui.tests.control.model.impl; import junit.framework.TestCase; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IBaseEventInfo; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.TraceEventType; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.TraceLogLevel; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.BaseEventInfo; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IBaseEventInfo; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.TraceEventType; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.TraceLogLevel; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.BaseEventInfo; /** * The class BaseEventInfoTest contains test for the class {@link BaseEventInfo}. diff --git a/org.eclipse.linuxtools.lttng.ui.tests/src/org/eclipse/linuxtools/lttng/ui/tests/control/model/impl/ChannelInfoTest.java b/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/impl/ChannelInfoTest.java similarity index 95% rename from org.eclipse.linuxtools.lttng.ui.tests/src/org/eclipse/linuxtools/lttng/ui/tests/control/model/impl/ChannelInfoTest.java rename to org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/impl/ChannelInfoTest.java index 481b91f9b8..dd4f053b4e 100644 --- a/org.eclipse.linuxtools.lttng.ui.tests/src/org/eclipse/linuxtools/lttng/ui/tests/control/model/impl/ChannelInfoTest.java +++ b/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/impl/ChannelInfoTest.java @@ -9,18 +9,18 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.lttng.ui.tests.control.model.impl; +package org.eclipse.linuxtools.lttng2.ui.tests.control.model.impl; import java.util.LinkedList; import java.util.List; import junit.framework.TestCase; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IChannelInfo; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IEventInfo; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.TraceEnablement; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.ChannelInfo; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.EventInfo; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IChannelInfo; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IEventInfo; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.TraceEnablement; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.ChannelInfo; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.EventInfo; /** * The class ChannelInfoTest contains tests for the class {@link ChannelInfo}. diff --git a/org.eclipse.linuxtools.lttng.ui.tests/src/org/eclipse/linuxtools/lttng/ui/tests/control/model/impl/DomainInfoTest.java b/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/impl/DomainInfoTest.java similarity index 95% rename from org.eclipse.linuxtools.lttng.ui.tests/src/org/eclipse/linuxtools/lttng/ui/tests/control/model/impl/DomainInfoTest.java rename to org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/impl/DomainInfoTest.java index cb18cf466d..4b77c6b74b 100644 --- a/org.eclipse.linuxtools.lttng.ui.tests/src/org/eclipse/linuxtools/lttng/ui/tests/control/model/impl/DomainInfoTest.java +++ b/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/impl/DomainInfoTest.java @@ -9,16 +9,16 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.lttng.ui.tests.control.model.impl; +package org.eclipse.linuxtools.lttng2.ui.tests.control.model.impl; import java.util.LinkedList; import java.util.List; import junit.framework.TestCase; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IChannelInfo; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IDomainInfo; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.DomainInfo; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IChannelInfo; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IDomainInfo; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.DomainInfo; /** * The class ChannelInfoTest contains tests for the class {@link DomainInfo}. diff --git a/org.eclipse.linuxtools.lttng.ui.tests/src/org/eclipse/linuxtools/lttng/ui/tests/control/model/impl/EventInfoTest.java b/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/impl/EventInfoTest.java similarity index 94% rename from org.eclipse.linuxtools.lttng.ui.tests/src/org/eclipse/linuxtools/lttng/ui/tests/control/model/impl/EventInfoTest.java rename to org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/impl/EventInfoTest.java index 7d4d3d176b..f64fd63754 100644 --- a/org.eclipse.linuxtools.lttng.ui.tests/src/org/eclipse/linuxtools/lttng/ui/tests/control/model/impl/EventInfoTest.java +++ b/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/impl/EventInfoTest.java @@ -9,15 +9,15 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.lttng.ui.tests.control.model.impl; +package org.eclipse.linuxtools.lttng2.ui.tests.control.model.impl; import junit.framework.TestCase; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IEventInfo; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.TraceEnablement; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.TraceEventType; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.BaseEventInfo; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.EventInfo; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IEventInfo; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.TraceEnablement; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.TraceEventType; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.BaseEventInfo; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.EventInfo; /** * The class BaseEventInfoTest contains test for the class {@link BaseEventInfo}. diff --git a/org.eclipse.linuxtools.lttng.ui.tests/src/org/eclipse/linuxtools/lttng/ui/tests/control/model/impl/ListenerValidator.java b/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/impl/ListenerValidator.java similarity index 91% rename from org.eclipse.linuxtools.lttng.ui.tests/src/org/eclipse/linuxtools/lttng/ui/tests/control/model/impl/ListenerValidator.java rename to org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/impl/ListenerValidator.java index cf78d1cb5f..a5ae9f88df 100644 --- a/org.eclipse.linuxtools.lttng.ui.tests/src/org/eclipse/linuxtools/lttng/ui/tests/control/model/impl/ListenerValidator.java +++ b/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/impl/ListenerValidator.java @@ -9,10 +9,10 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.lttng.ui.tests.control.model.impl; +package org.eclipse.linuxtools.lttng2.ui.tests.control.model.impl; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceControlComponent; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceControlComponentChangedListener; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponentChangedListener; /** * The class can be used to validate the listener interface. diff --git a/org.eclipse.linuxtools.lttng.ui.tests/src/org/eclipse/linuxtools/lttng/ui/tests/control/model/impl/ModelImplFactory.java b/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/impl/ModelImplFactory.java similarity index 78% rename from org.eclipse.linuxtools.lttng.ui.tests/src/org/eclipse/linuxtools/lttng/ui/tests/control/model/impl/ModelImplFactory.java rename to org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/impl/ModelImplFactory.java index 70048ffdae..84a73eba4d 100644 --- a/org.eclipse.linuxtools.lttng.ui.tests/src/org/eclipse/linuxtools/lttng/ui/tests/control/model/impl/ModelImplFactory.java +++ b/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/impl/ModelImplFactory.java @@ -9,26 +9,26 @@ * Contributors: * Bernd Hufmann - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.lttng.ui.tests.control.model.impl; - -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IBaseEventInfo; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IChannelInfo; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IDomainInfo; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IEventInfo; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IProbeEventInfo; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ISessionInfo; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IUstProviderInfo; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.TraceEnablement; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.TraceEventType; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.TraceLogLevel; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.TraceSessionState; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.BaseEventInfo; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.ChannelInfo; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.DomainInfo; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.EventInfo; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.ProbeEventInfo; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.SessionInfo; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.UstProviderInfo; +package org.eclipse.linuxtools.lttng2.ui.tests.control.model.impl; + +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IBaseEventInfo; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IChannelInfo; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IDomainInfo; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IEventInfo; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IProbeEventInfo; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ISessionInfo; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IUstProviderInfo; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.TraceEnablement; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.TraceEventType; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.TraceLogLevel; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.TraceSessionState; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.BaseEventInfo; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.ChannelInfo; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.DomainInfo; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.EventInfo; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.ProbeEventInfo; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.SessionInfo; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.UstProviderInfo; /** * Test facility to constants across test case diff --git a/org.eclipse.linuxtools.lttng.ui.tests/src/org/eclipse/linuxtools/lttng/ui/tests/control/model/impl/ProbeEventInfoTest.java b/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/impl/ProbeEventInfoTest.java similarity index 92% rename from org.eclipse.linuxtools.lttng.ui.tests/src/org/eclipse/linuxtools/lttng/ui/tests/control/model/impl/ProbeEventInfoTest.java rename to org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/impl/ProbeEventInfoTest.java index 1ffdbf630d..b877ab2072 100644 --- a/org.eclipse.linuxtools.lttng.ui.tests/src/org/eclipse/linuxtools/lttng/ui/tests/control/model/impl/ProbeEventInfoTest.java +++ b/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/impl/ProbeEventInfoTest.java @@ -9,16 +9,16 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.lttng.ui.tests.control.model.impl; +package org.eclipse.linuxtools.lttng2.ui.tests.control.model.impl; import junit.framework.TestCase; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IProbeEventInfo; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.TraceEnablement; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.TraceEventType; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.BaseEventInfo; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.EventInfo; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.ProbeEventInfo; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IProbeEventInfo; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.TraceEnablement; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.TraceEventType; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.BaseEventInfo; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.EventInfo; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.ProbeEventInfo; /** * The class BaseEventInfoTest contains test for the class {@link BaseEventInfo}. diff --git a/org.eclipse.linuxtools.lttng.ui.tests/src/org/eclipse/linuxtools/lttng/ui/tests/control/model/impl/SessionInfoTest.java b/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/impl/SessionInfoTest.java similarity index 95% rename from org.eclipse.linuxtools.lttng.ui.tests/src/org/eclipse/linuxtools/lttng/ui/tests/control/model/impl/SessionInfoTest.java rename to org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/impl/SessionInfoTest.java index d9854125eb..e72703fba2 100644 --- a/org.eclipse.linuxtools.lttng.ui.tests/src/org/eclipse/linuxtools/lttng/ui/tests/control/model/impl/SessionInfoTest.java +++ b/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/impl/SessionInfoTest.java @@ -9,17 +9,17 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.lttng.ui.tests.control.model.impl; +package org.eclipse.linuxtools.lttng2.ui.tests.control.model.impl; import java.util.LinkedList; import java.util.List; import junit.framework.TestCase; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IDomainInfo; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ISessionInfo; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.TraceSessionState; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.SessionInfo; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IDomainInfo; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ISessionInfo; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.TraceSessionState; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.SessionInfo; /** * The class ChannelInfoTest contains tests for the class {@link SessionInfo}. diff --git a/org.eclipse.linuxtools.lttng.ui.tests/src/org/eclipse/linuxtools/lttng/ui/tests/control/model/impl/TraceInfoTest.java b/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/impl/TraceInfoTest.java similarity index 95% rename from org.eclipse.linuxtools.lttng.ui.tests/src/org/eclipse/linuxtools/lttng/ui/tests/control/model/impl/TraceInfoTest.java rename to org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/impl/TraceInfoTest.java index 229af6d8b2..dae33be769 100644 --- a/org.eclipse.linuxtools.lttng.ui.tests/src/org/eclipse/linuxtools/lttng/ui/tests/control/model/impl/TraceInfoTest.java +++ b/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/impl/TraceInfoTest.java @@ -9,12 +9,12 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.lttng.ui.tests.control.model.impl; +package org.eclipse.linuxtools.lttng2.ui.tests.control.model.impl; import junit.framework.TestCase; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceInfo; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceInfo; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceInfo; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceInfo; /** * The class TraceInfoTest contains test for the class {@link TraceInfo}. diff --git a/org.eclipse.linuxtools.lttng.ui.tests/src/org/eclipse/linuxtools/lttng/ui/tests/control/model/impl/UstProviderInfoTest.java b/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/impl/UstProviderInfoTest.java similarity index 95% rename from org.eclipse.linuxtools.lttng.ui.tests/src/org/eclipse/linuxtools/lttng/ui/tests/control/model/impl/UstProviderInfoTest.java rename to org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/impl/UstProviderInfoTest.java index b4315ea4af..6f96f2a404 100644 --- a/org.eclipse.linuxtools.lttng.ui.tests/src/org/eclipse/linuxtools/lttng/ui/tests/control/model/impl/UstProviderInfoTest.java +++ b/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/impl/UstProviderInfoTest.java @@ -9,17 +9,17 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.lttng.ui.tests.control.model.impl; +package org.eclipse.linuxtools.lttng2.ui.tests.control.model.impl; import java.util.LinkedList; import java.util.List; import junit.framework.TestCase; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IBaseEventInfo; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IUstProviderInfo; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.BaseEventInfo; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.UstProviderInfo; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IBaseEventInfo; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IUstProviderInfo; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.BaseEventInfo; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.UstProviderInfo; /** * The class ChannelInfoTest contains tests for the class {@link UstProviderInfo}. diff --git a/org.eclipse.linuxtools.lttng.ui.tests/src/org/eclipse/linuxtools/lttng/ui/tests/control/service/AllTests.java b/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/service/AllTests.java similarity index 92% rename from org.eclipse.linuxtools.lttng.ui.tests/src/org/eclipse/linuxtools/lttng/ui/tests/control/service/AllTests.java rename to org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/service/AllTests.java index f8867947c2..c259c15e08 100644 --- a/org.eclipse.linuxtools.lttng.ui.tests/src/org/eclipse/linuxtools/lttng/ui/tests/control/service/AllTests.java +++ b/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/service/AllTests.java @@ -9,7 +9,7 @@ * Contributors: * Bernd Hufmann - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.lttng.ui.tests.control.service; +package org.eclipse.linuxtools.lttng2.ui.tests.control.service; import junit.framework.Test; import junit.framework.TestSuite; diff --git a/org.eclipse.linuxtools.lttng.ui.tests/src/org/eclipse/linuxtools/lttng/ui/tests/control/service/LTTngControlServiceTest.java b/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/service/LTTngControlServiceTest.java similarity index 94% rename from org.eclipse.linuxtools.lttng.ui.tests/src/org/eclipse/linuxtools/lttng/ui/tests/control/service/LTTngControlServiceTest.java rename to org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/service/LTTngControlServiceTest.java index ed4edb4ede..9da01c692b 100644 --- a/org.eclipse.linuxtools.lttng.ui.tests/src/org/eclipse/linuxtools/lttng/ui/tests/control/service/LTTngControlServiceTest.java +++ b/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/service/LTTngControlServiceTest.java @@ -9,7 +9,7 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.lttng.ui.tests.control.service; +package org.eclipse.linuxtools.lttng2.ui.tests.control.service; import java.io.File; import java.net.URL; @@ -22,23 +22,23 @@ 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.lttng.ui.views.control.model.IBaseEventInfo; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IChannelInfo; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IDomainInfo; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IEventInfo; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ISessionInfo; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IUstProviderInfo; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.LogLevelType; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.TraceEnablement; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.TraceEventType; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.TraceLogLevel; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.TraceSessionState; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.ChannelInfo; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.service.ILttngControlService; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.service.LTTngControlService; -import org.eclipse.linuxtools.lttng.stubs.service.CommandShellFactory; -import org.eclipse.linuxtools.lttng.stubs.service.shells.LTTngToolsFileShell; -import org.eclipse.linuxtools.lttng.ui.tests.LTTngUITestPlugin; +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.views.control.model.IBaseEventInfo; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IChannelInfo; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IDomainInfo; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IEventInfo; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ISessionInfo; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IUstProviderInfo; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.LogLevelType; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.TraceEnablement; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.TraceEventType; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.TraceLogLevel; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.TraceSessionState; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.ChannelInfo; +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.lttng2.ui.tests.Activator; /** * The class LTTngControlServiceTest contains test for the class {@link LTTngControlService}. */ @@ -90,7 +90,7 @@ public class LTTngControlServiceTest extends TestCase { super.setUp(); fShellFactory = CommandShellFactory.getInstance(); - URL location = FileLocator.find(LTTngUITestPlugin.getDefault().getBundle(), new Path(DIRECTORY + File.separator + TEST_STREAM), null); + URL location = FileLocator.find(Activator.getDefault().getBundle(), new Path(DIRECTORY + File.separator + TEST_STREAM), null); File testfile = new File(FileLocator.toFileURL(location).toURI()); fTestfile = testfile.getAbsolutePath(); diff --git a/org.eclipse.linuxtools.lttng.ui.tests/stubs/org/eclipse/linuxtools/lttng/stubs/service/CommandShellFactory.java b/org.eclipse.linuxtools.lttng2.ui.tests/stubs/org/eclipse/linuxtools/internal/lttng2/stubs/service/CommandShellFactory.java similarity index 90% rename from org.eclipse.linuxtools.lttng.ui.tests/stubs/org/eclipse/linuxtools/lttng/stubs/service/CommandShellFactory.java rename to org.eclipse.linuxtools.lttng2.ui.tests/stubs/org/eclipse/linuxtools/internal/lttng2/stubs/service/CommandShellFactory.java index e10b595ed2..ec88c1168f 100644 --- a/org.eclipse.linuxtools.lttng.ui.tests/stubs/org/eclipse/linuxtools/lttng/stubs/service/CommandShellFactory.java +++ b/org.eclipse.linuxtools.lttng2.ui.tests/stubs/org/eclipse/linuxtools/internal/lttng2/stubs/service/CommandShellFactory.java @@ -9,9 +9,9 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.lttng.stubs.service; +package org.eclipse.linuxtools.internal.lttng2.stubs.service; -import org.eclipse.linuxtools.lttng.stubs.service.shells.LTTngToolsFileShell; +import org.eclipse.linuxtools.internal.lttng2.stubs.shells.LTTngToolsFileShell; public class CommandShellFactory { diff --git a/org.eclipse.linuxtools.lttng.ui.tests/stubs/org/eclipse/linuxtools/lttng/stubs/service/TestRemoteSystemProxy.java b/org.eclipse.linuxtools.lttng2.ui.tests/stubs/org/eclipse/linuxtools/internal/lttng2/stubs/service/TestRemoteSystemProxy.java similarity index 90% rename from org.eclipse.linuxtools.lttng.ui.tests/stubs/org/eclipse/linuxtools/lttng/stubs/service/TestRemoteSystemProxy.java rename to org.eclipse.linuxtools.lttng2.ui.tests/stubs/org/eclipse/linuxtools/internal/lttng2/stubs/service/TestRemoteSystemProxy.java index 75afa011e8..1c6c450b77 100644 --- a/org.eclipse.linuxtools.lttng.ui.tests/stubs/org/eclipse/linuxtools/lttng/stubs/service/TestRemoteSystemProxy.java +++ b/org.eclipse.linuxtools.lttng2.ui.tests/stubs/org/eclipse/linuxtools/internal/lttng2/stubs/service/TestRemoteSystemProxy.java @@ -9,13 +9,13 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.lttng.stubs.service; +package org.eclipse.linuxtools.internal.lttng2.stubs.service; import org.eclipse.core.commands.ExecutionException; import org.eclipse.core.runtime.Status; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.remote.IRemoteSystemProxy; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.service.ICommandShell; -import org.eclipse.linuxtools.lttng.stubs.service.shells.LTTngToolsFileShell; +import org.eclipse.linuxtools.internal.lttng2.stubs.shells.LTTngToolsFileShell; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.remote.IRemoteSystemProxy; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.service.ICommandShell; import org.eclipse.rse.core.model.IRSECallback; import org.eclipse.rse.core.subsystems.ICommunicationsListener; import org.eclipse.rse.core.subsystems.ISubSystem; @@ -23,6 +23,7 @@ import org.eclipse.rse.services.shells.IShellService; import org.eclipse.rse.services.terminals.ITerminalService; import org.eclipse.rse.subsystems.files.core.servicesubsystem.IFileServiceSubSystem; + public class TestRemoteSystemProxy implements IRemoteSystemProxy { private LTTngToolsFileShell fShell = null; diff --git a/org.eclipse.linuxtools.lttng.ui.tests/stubs/org/eclipse/linuxtools/lttng/stubs/service/shells/LTTngToolsFileShell.java b/org.eclipse.linuxtools.lttng2.ui.tests/stubs/org/eclipse/linuxtools/internal/lttng2/stubs/shells/LTTngToolsFileShell.java similarity index 97% rename from org.eclipse.linuxtools.lttng.ui.tests/stubs/org/eclipse/linuxtools/lttng/stubs/service/shells/LTTngToolsFileShell.java rename to org.eclipse.linuxtools.lttng2.ui.tests/stubs/org/eclipse/linuxtools/internal/lttng2/stubs/shells/LTTngToolsFileShell.java index 70d553d778..d106410a5a 100644 --- a/org.eclipse.linuxtools.lttng.ui.tests/stubs/org/eclipse/linuxtools/lttng/stubs/service/shells/LTTngToolsFileShell.java +++ b/org.eclipse.linuxtools.lttng2.ui.tests/stubs/org/eclipse/linuxtools/internal/lttng2/stubs/shells/LTTngToolsFileShell.java @@ -9,7 +9,7 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.lttng.stubs.service.shells; +package org.eclipse.linuxtools.internal.lttng2.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.lttng.ui.views.control.service.CommandResult; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.service.ICommandResult; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.service.CommandResult; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.service.ICommandResult; public class LTTngToolsFileShell extends TestCommandShell { diff --git a/org.eclipse.linuxtools.lttng.ui.tests/stubs/org/eclipse/linuxtools/lttng/stubs/service/shells/TestCommandShell.java b/org.eclipse.linuxtools.lttng2.ui.tests/stubs/org/eclipse/linuxtools/internal/lttng2/stubs/shells/TestCommandShell.java similarity index 80% rename from org.eclipse.linuxtools.lttng.ui.tests/stubs/org/eclipse/linuxtools/lttng/stubs/service/shells/TestCommandShell.java rename to org.eclipse.linuxtools.lttng2.ui.tests/stubs/org/eclipse/linuxtools/internal/lttng2/stubs/shells/TestCommandShell.java index fd26d8543a..5b0575b75a 100644 --- a/org.eclipse.linuxtools.lttng.ui.tests/stubs/org/eclipse/linuxtools/lttng/stubs/service/shells/TestCommandShell.java +++ b/org.eclipse.linuxtools.lttng2.ui.tests/stubs/org/eclipse/linuxtools/internal/lttng2/stubs/shells/TestCommandShell.java @@ -9,13 +9,13 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.lttng.stubs.service.shells; +package org.eclipse.linuxtools.internal.lttng2.stubs.shells; import org.eclipse.core.commands.ExecutionException; import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.service.CommandResult; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.service.ICommandResult; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.service.ICommandShell; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.service.CommandResult; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.service.ICommandResult; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.service.ICommandShell; public class TestCommandShell implements ICommandShell { diff --git a/org.eclipse.linuxtools.lttng.ui.tests/testfiles/CreateTreeTest.cfg b/org.eclipse.linuxtools.lttng2.ui.tests/testfiles/CreateTreeTest.cfg similarity index 100% rename from org.eclipse.linuxtools.lttng.ui.tests/testfiles/CreateTreeTest.cfg rename to org.eclipse.linuxtools.lttng2.ui.tests/testfiles/CreateTreeTest.cfg diff --git a/org.eclipse.linuxtools.lttng.ui.tests/testfiles/LTTngServiceTest.cfg b/org.eclipse.linuxtools.lttng2.ui.tests/testfiles/LTTngServiceTest.cfg similarity index 100% rename from org.eclipse.linuxtools.lttng.ui.tests/testfiles/LTTngServiceTest.cfg rename to org.eclipse.linuxtools.lttng2.ui.tests/testfiles/LTTngServiceTest.cfg diff --git a/org.eclipse.linuxtools.lttng.ui.tests/testfiles/ListInfoTest.cfg b/org.eclipse.linuxtools.lttng2.ui.tests/testfiles/ListInfoTest.cfg similarity index 100% rename from org.eclipse.linuxtools.lttng.ui.tests/testfiles/ListInfoTest.cfg rename to org.eclipse.linuxtools.lttng2.ui.tests/testfiles/ListInfoTest.cfg diff --git a/org.eclipse.linuxtools.lttng2.ui/META-INF/MANIFEST.MF b/org.eclipse.linuxtools.lttng2.ui/META-INF/MANIFEST.MF index 515a837612..69adc136b6 100644 --- a/org.eclipse.linuxtools.lttng2.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.linuxtools.lttng2.ui/META-INF/MANIFEST.MF @@ -7,11 +7,25 @@ Bundle-Activator: org.eclipse.linuxtools.internal.lttng2.ui.Activator Bundle-Vendor: %Bundle-Vendor Require-Bundle: org.eclipse.ui;bundle-version="3.7.0", org.eclipse.ui.ide;bundle-version="3.7.0", + org.eclipse.core.resources;bundle-version="3.7.100", + org.eclipse.core.filesystem;bundle-version="1.3.100", org.eclipse.core.runtime;bundle-version="3.7.0", org.eclipse.linuxtools.lttng2.core;bundle-version="0.1.0", - org.eclipse.linuxtools.tmf.ui;bundle-version="0.5.0" + org.eclipse.linuxtools.tmf.ui;bundle-version="0.5.0", + org.eclipse.rse.core;bundle-version="3.2.0", + org.eclipse.rse.services;bundle-version="3.2.100", + org.eclipse.rse.subsystems.files.core;bundle-version="3.2.100", + org.eclipse.rse.ui;bundle-version="3.2.0" Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-ActivationPolicy: lazy Bundle-Localization: plugin -Export-Package: org.eclipse.linuxtools.internal.lttng2.ui;x-friends:="org.eclipse.linuxtools.lttng2.ui.tests" +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.ui.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-friends:="org.eclipse.linuxtools.lttng2.ui.tests", + 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.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" diff --git a/org.eclipse.linuxtools.lttng2.ui/icons/elcl16/add_button.gif b/org.eclipse.linuxtools.lttng2.ui/icons/elcl16/add_button.gif new file mode 100644 index 0000000000000000000000000000000000000000..ae9543c6e76539c99f5f0ffd5c172045bd3b63b0 GIT binary patch literal 308 zcmZ?wbhEHbd=(Ze15;Qy1mX8t2lT^ zHOHgY9FJamJZkN+sI|wVk6ueSb}ixP)r4bLfn?%^+sU^crQUj&`rv8Wf69R3PZmZ7 z273k_1|R_WiGeNf!2A#4nqh4oi@ZvGxHL7V9MzoSqI$xU<&#CFfB%QWib69zo?TjT yC!xh@0iVW`pEtzYTAVgM%rWEQU}yJWm6T!)v1gGGXYOL`W$I#>%HZM1U=09-MWlfM literal 0 HcmV?d00001 diff --git a/org.eclipse.linuxtools.lttng.ui/icons/elcl16/connect.gif b/org.eclipse.linuxtools.lttng2.ui/icons/elcl16/connect.gif similarity index 100% rename from org.eclipse.linuxtools.lttng.ui/icons/elcl16/connect.gif rename to org.eclipse.linuxtools.lttng2.ui/icons/elcl16/connect.gif diff --git a/org.eclipse.linuxtools.lttng2.ui/icons/elcl16/delete_trace.gif b/org.eclipse.linuxtools.lttng2.ui/icons/elcl16/delete_trace.gif new file mode 100644 index 0000000000000000000000000000000000000000..b6922ac11cf64e16a15cf2976cdaa1e40118abed GIT binary patch literal 351 zcmZ?wbhEHb6krfwxXQqA+}QL>Vab=`lFvmYpNmUxXz4%DF}bf}d|cDunVH>FGrOY- z+D{EEKZPcINzVS9ob?$uHn=&y~n$8D`1 z2l;<(sQc1T_xQ+>|Ns9p5DgT6vM@3*7&7R9bb$QCz*ci$MuCTpRKNR-^bncK1eb^v zqDfrti^MpzbSB1VUt0b}aql73M;xvKD|}WtK1fk5iV!?;_@hVR1O_f%UNKGv4?_+f zX(=fl4i6boi78XK>s@7pr?3jKN=S;#aFP{YATA>-vrJN4*4aRuZH4n{cJUaejf3}qW>||i|S5WC&^1~)I%ZztbpMSDM&+22x z8g1h{UcG=1Rx&Cu+mXtS?asfSPXGIM zbH^0by|dJJO;_7DN8{42%s-E(|9(8<@0+cE-)#E}Qgd#7r^2RQrEL?Hf8TBX^LXZ; z=PUlc-v0OXj(?xdEw7VV+bX}RN$$|H#6wFH|NsBbKy9G-lZBCiL4`pFWH8823~c!h zlL|a^r20=R`S>uy&ci4Dq96lroeQDw<8S7rIN QN-AsCd2QaJ;>chP02(!ZIRF3v literal 0 HcmV?d00001 diff --git a/org.eclipse.linuxtools.lttng.ui/icons/elcl16/refresh.gif b/org.eclipse.linuxtools.lttng2.ui/icons/elcl16/refresh.gif similarity index 100% rename from org.eclipse.linuxtools.lttng.ui/icons/elcl16/refresh.gif rename to org.eclipse.linuxtools.lttng2.ui/icons/elcl16/refresh.gif diff --git a/org.eclipse.linuxtools.lttng2.ui/icons/elcl16/start_trace.gif b/org.eclipse.linuxtools.lttng2.ui/icons/elcl16/start_trace.gif new file mode 100644 index 0000000000000000000000000000000000000000..d6b3bdcc3774b7802d93ef9348847b239e3af383 GIT binary patch literal 528 zcmZ?wbhEHb6krfwc*elMo9x7&<}8rrER^9Ql;J9z;U<#lCR6AqoZ%vt?JkkyE}7$@ zSQe;M9wbxXC6ntRSLCf&>aSEDs8SWITo#~I;;&K}tWg`LSsSKZAE{FxsaqeZRvoNf z6|7bsXwVcDvZ^q2bz#WL!q8QPp373bmZy0xO^sS#61BcGVs(+%@)W<-8F8D-eO9FU zuS`qcUKzM9J#|xJ%ErWut;rn+S~9jJb{uGG+t=8>zp49RYtGK3z9X&uN7|>H>@3-x zShgo|`iYLp{fQO(5@(#~n0K~&*2&I!XL=T2=<7J1)N>+n&Bgw8mnLkyGI7hbiHGh^ zKX7~6|Ns9P1`|;H$->CM5Wt`Vaug^|7}#?g0-BmzTHD$?I$PzXCA*rX{QQL_`o(>` zynTgaJH=d_9bDbqd1Tsot?Cc#`IXjs>Js4Q}IhYvxU%qN@WUvMR;#iN0 literal 0 HcmV?d00001 diff --git a/org.eclipse.linuxtools.lttng2.ui/icons/elcl16/stop_trace.gif b/org.eclipse.linuxtools.lttng2.ui/icons/elcl16/stop_trace.gif new file mode 100644 index 0000000000000000000000000000000000000000..dc47edf06955eca15fee8118b3be43f019cae3f4 GIT binary patch literal 215 zcmZ?wbhEHb6krfwIKsg2!ocE%g~JO6j~5;RA2JFK2q?TzFgT%MaUr4LM1aGI2#+5d zR-ACK*kNJuA|T*HMa7R5D{jn~@&EsS2I7F?PZmZ71|bF=kaCcn46GpwRQggf=VfHM zdA;5hI8&!2R^8~yn?1}ARoqe>boi8dCIuYG;hM1Y7_-A#COOZb=7bkjye)1o4Ymf! gw+AT-W$b32*d*n&{`ylDm&EhWl|vdDg%laA0bm40+yDRo literal 0 HcmV?d00001 diff --git a/org.eclipse.linuxtools.lttng.ui/icons/elcl16/target_add.gif b/org.eclipse.linuxtools.lttng2.ui/icons/elcl16/target_add.gif similarity index 100% rename from org.eclipse.linuxtools.lttng.ui/icons/elcl16/target_add.gif rename to org.eclipse.linuxtools.lttng2.ui/icons/elcl16/target_add.gif diff --git a/org.eclipse.linuxtools.lttng.ui/icons/elcl16/target_delete.gif b/org.eclipse.linuxtools.lttng2.ui/icons/elcl16/target_delete.gif similarity index 100% rename from org.eclipse.linuxtools.lttng.ui/icons/elcl16/target_delete.gif rename to org.eclipse.linuxtools.lttng2.ui/icons/elcl16/target_delete.gif diff --git a/org.eclipse.linuxtools.lttng2.ui/icons/eview16/control_view.gif b/org.eclipse.linuxtools.lttng2.ui/icons/eview16/control_view.gif new file mode 100644 index 0000000000000000000000000000000000000000..0dc862cbd7d883765b71f5d377a3aed0d13f3645 GIT binary patch literal 152 zcmZ?wbhEHb6krfw*v!BnlDS$Sv}@D-znky>op$N_rU!pFKlpp@&HrhazaM<@|J>XE z=imN+`0YOgFfcGE{$ycfVBllW0kVN62rw|PxL&YySiPrW(^-de2MTq%rq6l7%F`5B z;i$8k#Yy1a@~|oIyr!8T q?^Yp8(X^KE-sYOKetWi;bkx31ef>U4kfWKSAyhE0vnEQB!5RQjK2eqc literal 0 HcmV?d00001 diff --git a/org.eclipse.linuxtools.lttng.ui/icons/obj16/session_active.gif b/org.eclipse.linuxtools.lttng2.ui/icons/obj16/session_active.gif similarity index 100% rename from org.eclipse.linuxtools.lttng.ui/icons/obj16/session_active.gif rename to org.eclipse.linuxtools.lttng2.ui/icons/obj16/session_active.gif diff --git a/org.eclipse.linuxtools.lttng.ui/icons/obj16/session_destroyed.gif b/org.eclipse.linuxtools.lttng2.ui/icons/obj16/session_destroyed.gif similarity index 100% rename from org.eclipse.linuxtools.lttng.ui/icons/obj16/session_destroyed.gif rename to org.eclipse.linuxtools.lttng2.ui/icons/obj16/session_destroyed.gif diff --git a/org.eclipse.linuxtools.lttng.ui/icons/obj16/session_inactive.gif b/org.eclipse.linuxtools.lttng2.ui/icons/obj16/session_inactive.gif similarity index 100% rename from org.eclipse.linuxtools.lttng.ui/icons/obj16/session_inactive.gif rename to org.eclipse.linuxtools.lttng2.ui/icons/obj16/session_inactive.gif diff --git a/org.eclipse.linuxtools.lttng.ui/icons/obj16/sessions.gif b/org.eclipse.linuxtools.lttng2.ui/icons/obj16/sessions.gif similarity index 100% rename from org.eclipse.linuxtools.lttng.ui/icons/obj16/sessions.gif rename to org.eclipse.linuxtools.lttng2.ui/icons/obj16/sessions.gif diff --git a/org.eclipse.linuxtools.lttng.ui/icons/obj16/systemlttng2-live.gif b/org.eclipse.linuxtools.lttng2.ui/icons/obj16/systemlttng2-live.gif similarity index 100% rename from org.eclipse.linuxtools.lttng.ui/icons/obj16/systemlttng2-live.gif rename to org.eclipse.linuxtools.lttng2.ui/icons/obj16/systemlttng2-live.gif diff --git a/org.eclipse.linuxtools.lttng.ui/icons/obj16/systemlttng2.gif b/org.eclipse.linuxtools.lttng2.ui/icons/obj16/systemlttng2.gif similarity index 100% rename from org.eclipse.linuxtools.lttng.ui/icons/obj16/systemlttng2.gif rename to org.eclipse.linuxtools.lttng2.ui/icons/obj16/systemlttng2.gif diff --git a/org.eclipse.linuxtools.lttng.ui/icons/obj16/target_connected.gif b/org.eclipse.linuxtools.lttng2.ui/icons/obj16/target_connected.gif similarity index 100% rename from org.eclipse.linuxtools.lttng.ui/icons/obj16/target_connected.gif rename to org.eclipse.linuxtools.lttng2.ui/icons/obj16/target_connected.gif diff --git a/org.eclipse.linuxtools.lttng.ui/icons/obj16/target_disconnected.gif b/org.eclipse.linuxtools.lttng2.ui/icons/obj16/target_disconnected.gif similarity index 100% rename from org.eclipse.linuxtools.lttng.ui/icons/obj16/target_disconnected.gif rename to org.eclipse.linuxtools.lttng2.ui/icons/obj16/target_disconnected.gif diff --git a/org.eclipse.linuxtools.lttng2.ui/icons/obj16/targets.gif b/org.eclipse.linuxtools.lttng2.ui/icons/obj16/targets.gif new file mode 100644 index 0000000000000000000000000000000000000000..c1e4ee3a59d2d69570c2023bf953fcb8b5cf3158 GIT binary patch literal 243 zcmZ?wbhEHb6krfwIKsftv-Hy8b9dM5K9|zAjKQy$!6uI(bUK4y4})9n|Nry<-;duv z-~Rva5C8Yu&+09{Ki@vjSM|`AC37;uLM#ma|NqZG2q^w!VPs$sVbB371lh^JTA-lX zmlDb4Z0I#PM2W$OMTEuoWJ>=L#-0hSNjn;PcsvBXAI`84(G^a;l;I;0@>=UumWgcG zbl&CNEb=cFX;_4aoSoc$ZpR;|Se@w_)la>5$0sUzusLvN@MkG8u(LRr7g;kh8*r#r PDzh>(1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/Activator.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/Activator.java index 3c161c9fea..1b92b9844f 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/Activator.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/Activator.java @@ -12,6 +12,8 @@ package org.eclipse.linuxtools.internal.lttng2.ui; +import java.net.URL; + import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.resource.ImageRegistry; import org.eclipse.swt.graphics.Image; @@ -109,5 +111,22 @@ public class Activator extends AbstractUIPlugin { } return icon; } + + /** + * Loads the image in the plug-ins image registry (if necessary) and returns the image + * @param url - URL relative to the Bundle + * @return the image + */ + public Image loadIcon(String url) { + String key = plugin.getBundle().getSymbolicName() + "/" + url; //$NON-NLS-1$ + Image icon = plugin.getImageRegistry().get(key); + if (icon == null) { + URL imageURL = plugin.getBundle().getResource(url); + ImageDescriptor descriptor = ImageDescriptor.createFromURL(imageURL); + icon = descriptor.createImage(); + plugin.getImageRegistry().put(key, icon); + } + return icon; + } } diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/PerspectiveFactory.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/PerspectiveFactory.java index 2c6450ce23..1128fae7ff 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/PerspectiveFactory.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/PerspectiveFactory.java @@ -12,6 +12,7 @@ package org.eclipse.linuxtools.internal.lttng2.ui.views; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.ControlView; import org.eclipse.linuxtools.tmf.ui.views.events.TmfEventsView; import org.eclipse.linuxtools.tmf.ui.views.histogram.HistogramView; import org.eclipse.ui.IFolderLayout; @@ -31,6 +32,7 @@ public class PerspectiveFactory implements IPerspectiveFactory { // LTTng views private static final String EVENTS_VIEW_ID = TmfEventsView.ID; private static final String HISTOGRAM_VIEW_ID = HistogramView.ID; + private static final String CONTROL_VIEW_ID = ControlView.ID; // Standard Eclipse views private static final String PROJECT_VIEW_ID = IPageLayout.ID_PROJECT_EXPLORER; @@ -55,6 +57,7 @@ public class PerspectiveFactory implements IPerspectiveFactory { IFolderLayout topLeftFolder = layout.createFolder( "topLeftFolder", IPageLayout.LEFT, 0.15f, IPageLayout.ID_EDITOR_AREA); //$NON-NLS-1$ topLeftFolder.addView(PROJECT_VIEW_ID); + topLeftFolder.addView(CONTROL_VIEW_ID); // // Create the top right folder // IFolderLayout topRightFolder = layout.createFolder( diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/ControlView.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/ControlView.java similarity index 83% rename from org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/ControlView.java rename to org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/ControlView.java index 6ea813ba55..eb0dc3ff94 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/ControlView.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/ControlView.java @@ -11,16 +11,16 @@ * Bernd Hufmann - Filled with content *******************************************************************************/ -package org.eclipse.linuxtools.internal.lttng.ui.views.control; +package org.eclipse.linuxtools.internal.lttng2.ui.views.control; import org.eclipse.jface.action.MenuManager; 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.lttng.ui.views.control.model.ITraceControlComponent; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceControlComponentChangedListener; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceControlRoot; +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.TraceControlRoot; import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Menu; @@ -40,7 +40,7 @@ public class ControlView extends ViewPart implements ITraceControlComponentChang /** * View ID. */ - public static final String ID = "org.eclipse.linuxtools.internal.lttng.ui.views.control"; //$NON-NLS-1$ + public static final String ID = "org.eclipse.linuxtools.internal.lttng2.ui.views.control"; //$NON-NLS-1$ // ------------------------------------------------------------------------ // Attributes @@ -112,7 +112,7 @@ public class ControlView extends ViewPart implements ITraceControlComponentChang /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceControlComponentChangedListener#componentAdded(org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceControlComponent, org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceControlComponent) + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponentChangedListener#componentAdded(org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent, org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent) */ @Override public void componentAdded(ITraceControlComponent parent, ITraceControlComponent component) { @@ -121,7 +121,7 @@ public class ControlView extends ViewPart implements ITraceControlComponentChang /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceControlComponentChangedListener#componentRemoved(org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceControlComponent, org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceControlComponent) + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponentChangedListener#componentRemoved(org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent, org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent) */ @Override public void componentRemoved(ITraceControlComponent parent, ITraceControlComponent component) { @@ -130,7 +130,7 @@ public class ControlView extends ViewPart implements ITraceControlComponentChang /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceControlComponentChangedListener#componentChanged(org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceControlComponent) + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponentChangedListener#componentChanged(org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent) */ @Override public void componentChanged(ITraceControlComponent component) { diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/Messages.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/Messages.java similarity index 98% rename from org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/Messages.java rename to org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/Messages.java index c269c9974b..05548466f1 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/Messages.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/Messages.java @@ -10,7 +10,7 @@ * Bernd Hufmann - Initial API and implementation * *******************************************************************************/ -package org.eclipse.linuxtools.internal.lttng.ui.views.control; +package org.eclipse.linuxtools.internal.lttng2.ui.views.control; import org.eclipse.osgi.util.NLS; @@ -21,7 +21,7 @@ import org.eclipse.osgi.util.NLS; *

*/ final public class Messages extends NLS { - private static final String BUNDLE_NAME = "org.eclipse.linuxtools.internal.lttng.ui.views.control.messages"; //$NON-NLS-1$ + private static final String BUNDLE_NAME = "org.eclipse.linuxtools.internal.lttng2.ui.views.control.messages"; //$NON-NLS-1$ // Failures public static String TraceControl_ConnectionFailure; diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/TraceControlContentProvider.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/TraceControlContentProvider.java similarity index 94% rename from org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/TraceControlContentProvider.java rename to org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/TraceControlContentProvider.java index ab9ebef02f..0c0041a98f 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/TraceControlContentProvider.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/TraceControlContentProvider.java @@ -9,11 +9,11 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng.ui.views.control; +package org.eclipse.linuxtools.internal.lttng2.ui.views.control; import org.eclipse.jface.viewers.ITreeContentProvider; import org.eclipse.jface.viewers.Viewer; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceControlComponent; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent; /** * TraceControlContentProvider diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/TraceControlLabelProvider.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/TraceControlLabelProvider.java similarity index 92% rename from org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/TraceControlLabelProvider.java rename to org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/TraceControlLabelProvider.java index 71b2fb45d3..8ebecf5f89 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/TraceControlLabelProvider.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/TraceControlLabelProvider.java @@ -9,10 +9,10 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng.ui.views.control; +package org.eclipse.linuxtools.internal.lttng2.ui.views.control; import org.eclipse.jface.viewers.ColumnLabelProvider; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceControlComponent; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent; import org.eclipse.swt.graphics.Image; /** diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/dialogs/ConfirmDialog.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/ConfirmDialog.java similarity index 76% rename from org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/dialogs/ConfirmDialog.java rename to org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/ConfirmDialog.java index 5a2be187e1..c977e54ea9 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/dialogs/ConfirmDialog.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/ConfirmDialog.java @@ -10,11 +10,11 @@ * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs; +package org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs; import org.eclipse.jface.dialogs.MessageDialog; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.Messages; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.Messages; import org.eclipse.swt.widgets.Shell; /** @@ -28,7 +28,7 @@ public class ConfirmDialog implements IConfirmDialog { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs.IConfirmDialog#openConfirm(org.eclipse.swt.widgets.Shell, java.lang.String, java.lang.String) + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.IConfirmDialog#openConfirm(org.eclipse.swt.widgets.Shell, java.lang.String, java.lang.String) */ @Override public boolean openConfirm(Shell parent, String title, String message) { diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/dialogs/CreateChannelDialog.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/CreateChannelDialog.java similarity index 93% rename from org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/dialogs/CreateChannelDialog.java rename to org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/CreateChannelDialog.java index 4275ab2dd0..10e9c2d126 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/dialogs/CreateChannelDialog.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/CreateChannelDialog.java @@ -9,16 +9,16 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs; +package org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs; import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.jface.dialogs.MessageDialog; -import org.eclipse.linuxtools.internal.lttng.ui.Activator; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.Messages; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IChannelInfo; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.ChannelInfo; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceDomainComponent; +import org.eclipse.linuxtools.internal.lttng2.ui.Activator; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.Messages; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IChannelInfo; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.ChannelInfo; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceDomainComponent; import org.eclipse.swt.SWT; import org.eclipse.swt.events.VerifyEvent; import org.eclipse.swt.events.VerifyListener; @@ -137,7 +137,7 @@ public class CreateChannelDialog extends Dialog implements ICreateChannelOnSessi // ------------------------------------------------------------------------ /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs.ICreateChannelDialog#getChannelInfo() + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.ICreateChannelDialog#getChannelInfo() */ @Override public IChannelInfo getChannelInfo() { @@ -146,7 +146,7 @@ public class CreateChannelDialog extends Dialog implements ICreateChannelOnSessi /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs.ICreateChannelDialog#setDomainComponent(org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceDomainComponent) + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.ICreateChannelDialog#setDomainComponent(org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceDomainComponent) */ @Override public void setDomainComponent(TraceDomainComponent domain) { @@ -160,7 +160,7 @@ public class CreateChannelDialog extends Dialog implements ICreateChannelOnSessi /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs.ICreateChannelOnSessionDialog#isKernel() + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.ICreateChannelOnSessionDialog#isKernel() */ @Override public boolean isKernel() { diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/dialogs/CreateSessionDialog.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/CreateSessionDialog.java similarity index 89% rename from org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/dialogs/CreateSessionDialog.java rename to org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/CreateSessionDialog.java index 286ed5b903..f4ce9c440e 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/dialogs/CreateSessionDialog.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/CreateSessionDialog.java @@ -9,17 +9,17 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs; +package org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.jface.dialogs.MessageDialog; -import org.eclipse.linuxtools.internal.lttng.ui.Activator; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.Messages; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TargetNodeComponent; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceSessionGroup; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.remote.IRemoteSystemProxy; +import org.eclipse.linuxtools.internal.lttng2.ui.Activator; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.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.rse.services.clientserver.messages.SystemMessageException; import org.eclipse.rse.subsystems.files.core.servicesubsystem.IFileServiceSubSystem; import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile; @@ -97,7 +97,7 @@ public class CreateSessionDialog extends Dialog implements ICreateSessionDialog // ------------------------------------------------------------------------ /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs.ICreateSessionDialog#getSessionName() + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.ICreateSessionDialog#getSessionName() */ @Override public String getSessionName() { @@ -106,7 +106,7 @@ public class CreateSessionDialog extends Dialog implements ICreateSessionDialog /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs.ICreateSessionDialog#getSessionPath() + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.ICreateSessionDialog#getSessionPath() */ @Override public String getSessionPath() { @@ -115,7 +115,7 @@ public class CreateSessionDialog extends Dialog implements ICreateSessionDialog /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs.ICreateSessionDialog#isDefaultSessionPath() + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.ICreateSessionDialog#isDefaultSessionPath() */ @Override public boolean isDefaultSessionPath() { @@ -124,7 +124,7 @@ public class CreateSessionDialog extends Dialog implements ICreateSessionDialog /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs.ICreateSessionDialog#setTraceSessionGroup(org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceSessionGroup) + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.ICreateSessionDialog#setTraceSessionGroup(org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceSessionGroup) */ @Override public void setTraceSessionGroup(TraceSessionGroup group) { diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/dialogs/EnableEventsDialog.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/EnableEventsDialog.java similarity index 82% rename from org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/dialogs/EnableEventsDialog.java rename to org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/EnableEventsDialog.java index 38137ac24a..28e961f376 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/dialogs/EnableEventsDialog.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/EnableEventsDialog.java @@ -9,18 +9,18 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs; +package org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs; import java.util.List; import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.dialogs.IDialogConstants; -import org.eclipse.linuxtools.internal.lttng.ui.Activator; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.Messages; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.LogLevelType; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.TraceLogLevel; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceDomainComponent; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceProviderGroup; +import org.eclipse.linuxtools.internal.lttng2.ui.Activator; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.Messages; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.LogLevelType; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.TraceLogLevel; +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.swt.SWT; import org.eclipse.swt.events.SelectionAdapter; import org.eclipse.swt.events.SelectionEvent; @@ -107,7 +107,7 @@ public class EnableEventsDialog extends Dialog implements IEnableEventsDialog { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs.IEnableKernelEvents#isTracpoints() + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.IEnableKernelEvents#isTracpoints() */ @Override public boolean isTracepoints() { @@ -118,7 +118,7 @@ public class EnableEventsDialog extends Dialog implements IEnableEventsDialog { } /* (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs.IEnableKernelEvents#isAllTracePoints() + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.IEnableKernelEvents#isAllTracePoints() */ @Override public boolean isAllTracePoints() { @@ -130,7 +130,7 @@ public class EnableEventsDialog extends Dialog implements IEnableEventsDialog { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs.IEnableKernelEvents#isSysCalls() + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.IEnableKernelEvents#isSysCalls() */ @Override public boolean isSysCalls() { @@ -141,7 +141,7 @@ public class EnableEventsDialog extends Dialog implements IEnableEventsDialog { } /* (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs.IEnableKernelEvents#isAllSysCalls() + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.IEnableKernelEvents#isAllSysCalls() */ @Override public boolean isAllSysCalls() { @@ -152,7 +152,7 @@ public class EnableEventsDialog extends Dialog implements IEnableEventsDialog { } /* (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs.IEnableKernelEvents#getEventNames() + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.IEnableKernelEvents#getEventNames() */ @Override public List getEventNames() { @@ -163,7 +163,7 @@ public class EnableEventsDialog extends Dialog implements IEnableEventsDialog { } /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs.IEnableKernelEvents#isDynamicProbe() + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.IEnableKernelEvents#isDynamicProbe() */ @Override public boolean isDynamicProbe() { @@ -174,7 +174,7 @@ public class EnableEventsDialog extends Dialog implements IEnableEventsDialog { } /* (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs.IEnableKernelEvents#getProbeName() + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.IEnableKernelEvents#getProbeName() */ @Override public String getProbeName() { @@ -185,7 +185,7 @@ public class EnableEventsDialog extends Dialog implements IEnableEventsDialog { } /* (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs.IEnableKernelEvents#getProbeEventName() + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.IEnableKernelEvents#getProbeEventName() */ @Override public String getProbeEventName() { @@ -197,7 +197,7 @@ public class EnableEventsDialog extends Dialog implements IEnableEventsDialog { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs.IEnableKernelEvents#isDynamicFunctionProbe() + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.IEnableKernelEvents#isDynamicFunctionProbe() */ @Override public boolean isDynamicFunctionProbe() { @@ -208,7 +208,7 @@ public class EnableEventsDialog extends Dialog implements IEnableEventsDialog { } /* (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs.IEnableKernelEvents#getFunctionEventName() + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.IEnableKernelEvents#getFunctionEventName() */ @Override public String getFunctionEventName() { @@ -220,7 +220,7 @@ public class EnableEventsDialog extends Dialog implements IEnableEventsDialog { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs.IEnableKernelEvents#getFunction() + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.IEnableKernelEvents#getFunction() */ @Override public String getFunction() { @@ -232,7 +232,7 @@ public class EnableEventsDialog extends Dialog implements IEnableEventsDialog { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs.IEnableUstEvents#isWildcard() + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.IEnableUstEvents#isWildcard() */ @Override public boolean isWildcard() { @@ -244,7 +244,7 @@ public class EnableEventsDialog extends Dialog implements IEnableEventsDialog { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs.IEnableUstEvents#getWildcard() + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.IEnableUstEvents#getWildcard() */ @Override public String getWildcard() { @@ -257,7 +257,7 @@ public class EnableEventsDialog extends Dialog implements IEnableEventsDialog { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs.IEnableUstEvents#isLogLevel() + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.IEnableUstEvents#isLogLevel() */ @Override public boolean isLogLevel() { @@ -270,7 +270,7 @@ public class EnableEventsDialog extends Dialog implements IEnableEventsDialog { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs.IEnableUstEvents#getLogLevelType() + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.IEnableUstEvents#getLogLevelType() */ @Override public LogLevelType getLogLevelType() { @@ -283,7 +283,7 @@ public class EnableEventsDialog extends Dialog implements IEnableEventsDialog { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs.IEnableUstEvents#getLogLevel() + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.IEnableUstEvents#getLogLevel() */ @Override public TraceLogLevel getLogLevel() { @@ -296,7 +296,7 @@ public class EnableEventsDialog extends Dialog implements IEnableEventsDialog { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs.IEnableUstEvents#getLogLevelEventName() + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.IEnableUstEvents#getLogLevelEventName() */ @Override public String getLogLevelEventName() { @@ -308,7 +308,7 @@ public class EnableEventsDialog extends Dialog implements IEnableEventsDialog { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs.IEnableEventsDialog#isKernel() + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.IEnableEventsDialog#isKernel() */ @Override public boolean isKernel() { @@ -317,7 +317,7 @@ public class EnableEventsDialog extends Dialog implements IEnableEventsDialog { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs.IEnableEventsDialog#setTraceProviderGroup(org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceProviderGroup) + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.IEnableEventsDialog#setTraceProviderGroup(org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceProviderGroup) */ @Override public void setTraceProviderGroup(TraceProviderGroup providerGroup) { @@ -326,7 +326,7 @@ public class EnableEventsDialog extends Dialog implements IEnableEventsDialog { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs.IEnableEventsDialog#setTraceDomainComponent(org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceDomainComponent) + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.IEnableEventsDialog#setTraceDomainComponent(org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceDomainComponent) */ @Override public void setTraceDomainComponent(TraceDomainComponent domain) { diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/dialogs/EnableKernelEventComposite.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/EnableKernelEventComposite.java similarity index 91% rename from org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/dialogs/EnableKernelEventComposite.java rename to org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/EnableKernelEventComposite.java index e1e01f8cea..cb1a0b5b69 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/dialogs/EnableKernelEventComposite.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/EnableKernelEventComposite.java @@ -9,7 +9,7 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs; +package org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs; import java.util.ArrayList; import java.util.List; @@ -18,13 +18,13 @@ import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.viewers.CheckStateChangedEvent; import org.eclipse.jface.viewers.CheckboxTreeViewer; import org.eclipse.jface.viewers.ICheckStateListener; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.Messages; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.TraceControlContentProvider; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.TraceControlLabelProvider; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceControlComponent; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.BaseEventComponent; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.KernelProviderComponent; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceProviderGroup; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.Messages; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.TraceControlContentProvider; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.TraceControlLabelProvider; +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.TraceProviderGroup; import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionAdapter; import org.eclipse.swt.events.SelectionEvent; @@ -150,7 +150,7 @@ public class EnableKernelEventComposite extends Composite implements IEnableKern // ------------------------------------------------------------------------ /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs.IEnableKernelEvents#isTracpoints() + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.IEnableKernelEvents#isTracpoints() */ @Override public boolean isTracepoints() { @@ -158,7 +158,7 @@ public class EnableKernelEventComposite extends Composite implements IEnableKern } /* (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs.IEnableKernelEvents#isAllTracePoints() + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.IEnableKernelEvents#isAllTracePoints() */ @Override public boolean isAllTracePoints() { @@ -167,7 +167,7 @@ public class EnableKernelEventComposite extends Composite implements IEnableKern /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs.IEnableKernelEvents#isSysCalls() + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.IEnableKernelEvents#isSysCalls() */ @Override public boolean isSysCalls() { @@ -175,7 +175,7 @@ public class EnableKernelEventComposite extends Composite implements IEnableKern } /* (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs.IEnableKernelEvents#isAllSysCalls() + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.IEnableKernelEvents#isAllSysCalls() */ @Override public boolean isAllSysCalls() { @@ -183,7 +183,7 @@ public class EnableKernelEventComposite extends Composite implements IEnableKern } /* (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs.IEnableKernelEvents#getEventNames() + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.IEnableKernelEvents#getEventNames() */ @Override public List getEventNames() { @@ -191,7 +191,7 @@ public class EnableKernelEventComposite extends Composite implements IEnableKern } /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs.IEnableKernelEvents#isDynamicProbe() + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.IEnableKernelEvents#isDynamicProbe() */ @Override public boolean isDynamicProbe() { @@ -199,7 +199,7 @@ public class EnableKernelEventComposite extends Composite implements IEnableKern } /* (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs.IEnableKernelEvents#getProbeName() + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.IEnableKernelEvents#getProbeName() */ @Override public String getProbeName() { @@ -207,7 +207,7 @@ public class EnableKernelEventComposite extends Composite implements IEnableKern } /* (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs.IEnableKernelEvents#getProbeEventName() + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.IEnableKernelEvents#getProbeEventName() */ @Override public String getProbeEventName() { @@ -216,7 +216,7 @@ public class EnableKernelEventComposite extends Composite implements IEnableKern /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs.IEnableKernelEvents#isDynamicFunctionProbe() + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.IEnableKernelEvents#isDynamicFunctionProbe() */ @Override public boolean isDynamicFunctionProbe() { @@ -224,7 +224,7 @@ public class EnableKernelEventComposite extends Composite implements IEnableKern } /* (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs.IEnableKernelEvents#getFunctionEventName() + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.IEnableKernelEvents#getFunctionEventName() */ @Override public String getFunctionEventName() { @@ -232,7 +232,7 @@ public class EnableKernelEventComposite extends Composite implements IEnableKern } /* (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs.IEnableKernelEvents#getFunction() + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.IEnableKernelEvents#getFunction() */ @Override public String getFunction() { diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/dialogs/EnableUstEventsComposite.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/EnableUstEventsComposite.java similarity index 91% rename from org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/dialogs/EnableUstEventsComposite.java rename to org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/EnableUstEventsComposite.java index f7954a407e..b76856868e 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/dialogs/EnableUstEventsComposite.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/EnableUstEventsComposite.java @@ -9,7 +9,7 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs; +package org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs; import java.util.ArrayList; import java.util.HashSet; @@ -20,16 +20,16 @@ import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.viewers.CheckStateChangedEvent; import org.eclipse.jface.viewers.CheckboxTreeViewer; import org.eclipse.jface.viewers.ICheckStateListener; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.Messages; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.TraceControlContentProvider; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.TraceControlLabelProvider; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceControlComponent; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.LogLevelType; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.TraceLogLevel; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.BaseEventComponent; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TargetNodeComponent; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceProviderGroup; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.UstProviderComponent; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.Messages; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.TraceControlContentProvider; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.TraceControlLabelProvider; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.LogLevelType; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.TraceLogLevel; +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.TraceProviderGroup; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.UstProviderComponent; import org.eclipse.swt.SWT; import org.eclipse.swt.custom.CCombo; import org.eclipse.swt.events.SelectionAdapter; @@ -159,7 +159,7 @@ public class EnableUstEventsComposite extends Composite implements IEnableUstEve /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs.IEnableUstEvents#isTracepoints() + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.IEnableUstEvents#isTracepoints() */ @Override public boolean isTracepoints() { @@ -168,7 +168,7 @@ public class EnableUstEventsComposite extends Composite implements IEnableUstEve /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs.IEnableUstEvents#isAllTracePoints() + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.IEnableUstEvents#isAllTracePoints() */ @Override public boolean isAllTracePoints() { @@ -177,7 +177,7 @@ public class EnableUstEventsComposite extends Composite implements IEnableUstEve /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs.IEnableUstEvents#getEventNames() + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.IEnableUstEvents#getEventNames() */ @Override public List getEventNames() { @@ -186,7 +186,7 @@ public class EnableUstEventsComposite extends Composite implements IEnableUstEve /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs.IEnableUstEvents#isWildcard() + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.IEnableUstEvents#isWildcard() */ @Override public boolean isWildcard() { @@ -195,7 +195,7 @@ public class EnableUstEventsComposite extends Composite implements IEnableUstEve /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs.IEnableUstEvents#getWildcard() + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.IEnableUstEvents#getWildcard() */ @Override public String getWildcard() { @@ -204,7 +204,7 @@ public class EnableUstEventsComposite extends Composite implements IEnableUstEve /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs.IEnableUstEvents#isLogLevel() + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.IEnableUstEvents#isLogLevel() */ @Override public boolean isLogLevel() { @@ -213,7 +213,7 @@ public class EnableUstEventsComposite extends Composite implements IEnableUstEve /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs.IEnableUstEvents#getLogLevelType() + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.IEnableUstEvents#getLogLevelType() */ @Override public LogLevelType getLogLevelType() { @@ -222,7 +222,7 @@ public class EnableUstEventsComposite extends Composite implements IEnableUstEve /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs.IEnableUstEvents#getLogLevel() + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.IEnableUstEvents#getLogLevel() */ @Override public TraceLogLevel getLogLevel() { @@ -231,7 +231,7 @@ public class EnableUstEventsComposite extends Composite implements IEnableUstEve /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs.IEnableUstEvents#getLogLevelEventName() + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.IEnableUstEvents#getLogLevelEventName() */ @Override public String getLogLevelEventName() { diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/dialogs/GetEventInfoDialog.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/GetEventInfoDialog.java similarity index 90% rename from org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/dialogs/GetEventInfoDialog.java rename to org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/GetEventInfoDialog.java index 6ee4f28a3f..2392d3604a 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/dialogs/GetEventInfoDialog.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/GetEventInfoDialog.java @@ -9,18 +9,18 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs; +package org.eclipse.linuxtools.internal.lttng2.ui.views.control.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.lttng.ui.Activator; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.Messages; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceChannelComponent; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceDomainComponent; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceSessionComponent; +import org.eclipse.linuxtools.internal.lttng2.ui.Activator; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.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.swt.SWT; import org.eclipse.swt.custom.CCombo; import org.eclipse.swt.events.SelectionEvent; @@ -109,7 +109,7 @@ public class GetEventInfoDialog extends Dialog implements IGetEventInfoDialog { // ------------------------------------------------------------------------ /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs.IEnableEventsDialog#getSession() + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.IEnableEventsDialog#getSession() */ @Override public TraceSessionComponent getSession() { @@ -118,7 +118,7 @@ public class GetEventInfoDialog extends Dialog implements IGetEventInfoDialog { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs.IEnableEventsDialog#getChannel() + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.IEnableEventsDialog#getChannel() */ @Override public TraceChannelComponent getChannel() { @@ -127,7 +127,7 @@ public class GetEventInfoDialog extends Dialog implements IGetEventInfoDialog { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs.IGetEventInfoDialog#setIsKernel(boolean) + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.IGetEventInfoDialog#setIsKernel(boolean) */ @Override public void setIsKernel(boolean isKernel) { @@ -136,7 +136,7 @@ public class GetEventInfoDialog extends Dialog implements IGetEventInfoDialog { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs.IGetEventInfoDialog#setSessions(org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceSessionComponent[]) + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.IGetEventInfoDialog#setSessions(org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceSessionComponent[]) */ @Override public void setSessions(TraceSessionComponent[] sessions) { diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/dialogs/IConfirmDialog.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/IConfirmDialog.java similarity index 91% rename from org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/dialogs/IConfirmDialog.java rename to org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/IConfirmDialog.java index 6838ca38e3..70f0cdf677 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/dialogs/IConfirmDialog.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/IConfirmDialog.java @@ -9,7 +9,7 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs; +package org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs; import org.eclipse.swt.widgets.Shell; diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/dialogs/ICreateChannelDialog.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/ICreateChannelDialog.java similarity index 84% rename from org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/dialogs/ICreateChannelDialog.java rename to org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/ICreateChannelDialog.java index aff4d57e72..94910801ff 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/dialogs/ICreateChannelDialog.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/ICreateChannelDialog.java @@ -9,10 +9,10 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs; +package org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IChannelInfo; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceDomainComponent; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IChannelInfo; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceDomainComponent; /** * ICreateChannelDialog diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/dialogs/ICreateChannelOnSessionDialog.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/ICreateChannelOnSessionDialog.java similarity index 93% rename from org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/dialogs/ICreateChannelOnSessionDialog.java rename to org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/ICreateChannelOnSessionDialog.java index 3db45c3353..426230c4b7 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/dialogs/ICreateChannelOnSessionDialog.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/ICreateChannelOnSessionDialog.java @@ -9,7 +9,7 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs; +package org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs; /** diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/dialogs/ICreateSessionDialog.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/ICreateSessionDialog.java similarity index 90% rename from org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/dialogs/ICreateSessionDialog.java rename to org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/ICreateSessionDialog.java index 2f6a3d1716..7b4e24e02f 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/dialogs/ICreateSessionDialog.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/ICreateSessionDialog.java @@ -9,9 +9,9 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs; +package org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceSessionGroup; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceSessionGroup; /** * ICreateSessionDialog diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/dialogs/IEnableEventsDialog.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/IEnableEventsDialog.java similarity index 86% rename from org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/dialogs/IEnableEventsDialog.java rename to org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/IEnableEventsDialog.java index e73d326ffe..434da29b6b 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/dialogs/IEnableEventsDialog.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/IEnableEventsDialog.java @@ -9,10 +9,10 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs; +package org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceDomainComponent; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceProviderGroup; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceDomainComponent; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceProviderGroup; /** * IEnableKernelEvents diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/dialogs/IEnableKernelEvents.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/IEnableKernelEvents.java similarity index 97% rename from org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/dialogs/IEnableKernelEvents.java rename to org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/IEnableKernelEvents.java index b491595662..02266a117d 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/dialogs/IEnableKernelEvents.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/IEnableKernelEvents.java @@ -9,7 +9,7 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs; +package org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs; import java.util.List; diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/dialogs/IEnableUstEvents.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/IEnableUstEvents.java similarity index 88% rename from org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/dialogs/IEnableUstEvents.java rename to org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/IEnableUstEvents.java index 4bed38b1cd..42c1f024df 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/dialogs/IEnableUstEvents.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/IEnableUstEvents.java @@ -9,12 +9,12 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs; +package org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs; import java.util.List; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.LogLevelType; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.TraceLogLevel; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.LogLevelType; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.TraceLogLevel; /** * IEnableKernelEvents diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/dialogs/IGetEventInfoDialog.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/IGetEventInfoDialog.java similarity index 86% rename from org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/dialogs/IGetEventInfoDialog.java rename to org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/IGetEventInfoDialog.java index dce1c172c6..42c6bef3aa 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/dialogs/IGetEventInfoDialog.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/IGetEventInfoDialog.java @@ -9,10 +9,10 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs; +package org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceChannelComponent; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceSessionComponent; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceChannelComponent; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceSessionComponent; /** * IEnableEventsDialog diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/dialogs/INewConnectionDialog.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/INewConnectionDialog.java similarity index 90% rename from org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/dialogs/INewConnectionDialog.java rename to org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/INewConnectionDialog.java index 57726ba1b9..52e0919ba6 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/dialogs/INewConnectionDialog.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/INewConnectionDialog.java @@ -9,9 +9,9 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs; +package org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceControlComponent; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent; import org.eclipse.rse.core.model.IHost; /** diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/dialogs/NewConnectionDialog.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/NewConnectionDialog.java similarity index 92% rename from org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/dialogs/NewConnectionDialog.java rename to org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/NewConnectionDialog.java index 4e4c66ae3a..103c0ec8fe 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/dialogs/NewConnectionDialog.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/NewConnectionDialog.java @@ -9,16 +9,16 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs; +package org.eclipse.linuxtools.internal.lttng2.ui.views.control.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.lttng.ui.Activator; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.Messages; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceControlComponent; +import org.eclipse.linuxtools.internal.lttng2.ui.Activator; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.Messages; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent; import org.eclipse.rse.core.model.IHost; import org.eclipse.swt.SWT; import org.eclipse.swt.custom.CCombo; @@ -113,7 +113,7 @@ public class NewConnectionDialog extends Dialog implements INewConnectionDialog // ------------------------------------------------------------------------ /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs.INewConnectionDialog#getConnectionName() + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.INewConnectionDialog#getConnectionName() */ @Override public String getConnectionName() { @@ -122,7 +122,7 @@ public class NewConnectionDialog extends Dialog implements INewConnectionDialog /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs.INewConnectionDialog#getHostName() + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.INewConnectionDialog#getHostName() */ @Override public String getHostName() { @@ -131,7 +131,7 @@ public class NewConnectionDialog extends Dialog implements INewConnectionDialog /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs.INewConnectionDialog#setTraceControlParent(org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceControlComponent) + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.INewConnectionDialog#setTraceControlParent(org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent) */ @Override public void setTraceControlParent(ITraceControlComponent parent) { @@ -140,7 +140,7 @@ public class NewConnectionDialog extends Dialog implements INewConnectionDialog /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs.INewConnectionDialog#setHosts(org.eclipse.rse.core.model.IHost[]) + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.INewConnectionDialog#setHosts(org.eclipse.rse.core.model.IHost[]) */ @Override public void setHosts(IHost[] hosts) { diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/dialogs/TraceControlDialogFactory.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/TraceControlDialogFactory.java similarity index 98% rename from org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/dialogs/TraceControlDialogFactory.java rename to org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/TraceControlDialogFactory.java index 9db24b1a36..2c26f2afed 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/dialogs/TraceControlDialogFactory.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/TraceControlDialogFactory.java @@ -1,4 +1,4 @@ -package org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs; +package org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs; import org.eclipse.ui.PlatformUI; diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/handlers/AssignEventHandler.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/AssignEventHandler.java similarity index 85% rename from org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/handlers/AssignEventHandler.java rename to org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/AssignEventHandler.java index 2e8d8ae8bf..94cabd8941 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/handlers/AssignEventHandler.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/AssignEventHandler.java @@ -9,7 +9,7 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng.ui.views.control.handlers; +package org.eclipse.linuxtools.internal.lttng2.ui.views.control.handlers; import java.util.ArrayList; import java.util.Iterator; @@ -24,18 +24,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.lttng.ui.Activator; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.ControlView; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.Messages; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs.IGetEventInfoDialog; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs.TraceControlDialogFactory; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceControlComponent; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.BaseEventComponent; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.KernelProviderComponent; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TargetNodeComponent; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceChannelComponent; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceSessionComponent; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.UstProviderComponent; +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; +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.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.ui.IWorkbenchPage; /** diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/handlers/BaseControlViewHandler.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/BaseControlViewHandler.java similarity index 92% rename from org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/handlers/BaseControlViewHandler.java rename to org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/BaseControlViewHandler.java index faca375b26..d25f03e709 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/handlers/BaseControlViewHandler.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/BaseControlViewHandler.java @@ -9,10 +9,10 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng.ui.views.control.handlers; +package org.eclipse.linuxtools.internal.lttng2.ui.views.control.handlers; import org.eclipse.core.commands.AbstractHandler; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.ControlView; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.ControlView; import org.eclipse.ui.IWorkbenchPage; import org.eclipse.ui.IWorkbenchPart; import org.eclipse.ui.IWorkbenchWindow; diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/handlers/BaseEnableEventHandler.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/BaseEnableEventHandler.java similarity index 87% rename from org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/handlers/BaseEnableEventHandler.java rename to org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/BaseEnableEventHandler.java index 5f8e03a4c2..af1e743b53 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/handlers/BaseEnableEventHandler.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/BaseEnableEventHandler.java @@ -9,7 +9,7 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng.ui.views.control.handlers; +package org.eclipse.linuxtools.internal.lttng2.ui.views.control.handlers; import java.util.List; @@ -20,17 +20,17 @@ 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.lttng.ui.Activator; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.Messages; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs.IEnableEventsDialog; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs.TraceControlDialogFactory; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceControlComponent; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.LogLevelType; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.TraceLogLevel; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TargetNodeComponent; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceDomainComponent; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceProviderGroup; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceSessionComponent; +import org.eclipse.linuxtools.internal.lttng2.ui.Activator; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.Messages; +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.model.ITraceControlComponent; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.LogLevelType; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.TraceLogLevel; +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.ui.views.control.model.impl.TraceSessionComponent; import org.eclipse.ui.IWorkbenchWindow; import org.eclipse.ui.PlatformUI; diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/handlers/BaseNodeHandler.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/BaseNodeHandler.java similarity index 89% rename from org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/handlers/BaseNodeHandler.java rename to org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/BaseNodeHandler.java index f18cc4d1cf..b22ac58994 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/handlers/BaseNodeHandler.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/BaseNodeHandler.java @@ -9,12 +9,12 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng.ui.views.control.handlers; +package org.eclipse.linuxtools.internal.lttng2.ui.views.control.handlers; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.StructuredSelection; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.ControlView; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TargetNodeComponent; +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.ui.IWorkbenchPage; /** diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/handlers/ChangeChannelStateHandler.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/ChangeChannelStateHandler.java similarity index 93% rename from org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/handlers/ChangeChannelStateHandler.java rename to org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/ChangeChannelStateHandler.java index 91ec391d96..d18afee822 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/handlers/ChangeChannelStateHandler.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/ChangeChannelStateHandler.java @@ -9,7 +9,7 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng.ui.views.control.handlers; +package org.eclipse.linuxtools.internal.lttng2.ui.views.control.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.lttng.ui.Activator; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.ControlView; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.Messages; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.TraceEnablement; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceChannelComponent; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceDomainComponent; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceSessionComponent; +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; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.TraceEnablement; +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.ui.IWorkbenchPage; import org.eclipse.ui.IWorkbenchWindow; import org.eclipse.ui.PlatformUI; diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/handlers/ChangeEventStateHandler.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/ChangeEventStateHandler.java similarity index 91% rename from org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/handlers/ChangeEventStateHandler.java rename to org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/ChangeEventStateHandler.java index 3126415e3f..b0647a4a6d 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/handlers/ChangeEventStateHandler.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/ChangeEventStateHandler.java @@ -9,7 +9,7 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng.ui.views.control.handlers; +package org.eclipse.linuxtools.internal.lttng2.ui.views.control.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.lttng.ui.Activator; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.ControlView; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.Messages; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.TraceEnablement; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceChannelComponent; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceEventComponent; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceSessionComponent; +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; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.TraceEnablement; +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.ui.IWorkbenchPage; import org.eclipse.ui.IWorkbenchWindow; import org.eclipse.ui.PlatformUI; diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/handlers/ChangeSessionStateHandler.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/ChangeSessionStateHandler.java similarity index 91% rename from org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/handlers/ChangeSessionStateHandler.java rename to org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/ChangeSessionStateHandler.java index 7360383e49..6ed94399f9 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/handlers/ChangeSessionStateHandler.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/ChangeSessionStateHandler.java @@ -9,7 +9,7 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng.ui.views.control.handlers; +package org.eclipse.linuxtools.internal.lttng2.ui.views.control.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.lttng.ui.Activator; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.ControlView; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.Messages; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.TraceSessionState; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceSessionComponent; +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; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.TraceSessionState; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceSessionComponent; import org.eclipse.ui.IWorkbenchPage; import org.eclipse.ui.IWorkbenchWindow; import org.eclipse.ui.PlatformUI; diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/handlers/ConnectHandler.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/ConnectHandler.java similarity index 76% rename from org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/handlers/ConnectHandler.java rename to org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/ConnectHandler.java index 3a4b8f9b79..6a7794e40a 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/handlers/ConnectHandler.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/ConnectHandler.java @@ -9,11 +9,11 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng.ui.views.control.handlers; +package org.eclipse.linuxtools.internal.lttng2.ui.views.control.handlers; import org.eclipse.core.commands.ExecutionEvent; import org.eclipse.core.commands.ExecutionException; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.TargetNodeState; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.TargetNodeState; /** * ConnectHandler @@ -29,7 +29,7 @@ public class ConnectHandler extends BaseNodeHandler { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.handlers.BaseNodeHandler#execute(org.eclipse.core.commands.ExecutionEvent) + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.handlers.BaseNodeHandler#execute(org.eclipse.core.commands.ExecutionEvent) */ @Override public Object execute(ExecutionEvent event) throws ExecutionException { @@ -39,7 +39,7 @@ public class ConnectHandler extends BaseNodeHandler { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.handlers.BaseNodeHandler#isEnabled() + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.handlers.BaseNodeHandler#isEnabled() */ @Override public boolean isEnabled() { diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/handlers/CreateChannelOnDomainHandler.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/CreateChannelOnDomainHandler.java similarity index 87% rename from org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/handlers/CreateChannelOnDomainHandler.java rename to org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/CreateChannelOnDomainHandler.java index dc4c81daa5..b7d5c537ac 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/handlers/CreateChannelOnDomainHandler.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/CreateChannelOnDomainHandler.java @@ -9,7 +9,7 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng.ui.views.control.handlers; +package org.eclipse.linuxtools.internal.lttng2.ui.views.control.handlers; import java.util.ArrayList; import java.util.Iterator; @@ -24,14 +24,14 @@ 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.lttng.ui.Activator; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.ControlView; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.Messages; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs.ICreateChannelDialog; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs.TraceControlDialogFactory; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.TraceSessionState; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceDomainComponent; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceSessionComponent; +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; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.ICreateChannelDialog; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.TraceControlDialogFactory; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.TraceSessionState; +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.ui.IWorkbenchPage; /** diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/handlers/CreateChannelOnSessionHandler.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/CreateChannelOnSessionHandler.java similarity index 86% rename from org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/handlers/CreateChannelOnSessionHandler.java rename to org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/CreateChannelOnSessionHandler.java index edd6633af0..a0ab18da03 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/handlers/CreateChannelOnSessionHandler.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/CreateChannelOnSessionHandler.java @@ -9,7 +9,7 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng.ui.views.control.handlers; +package org.eclipse.linuxtools.internal.lttng2.ui.views.control.handlers; import java.util.ArrayList; import java.util.Iterator; @@ -24,14 +24,14 @@ 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.lttng.ui.Activator; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.ControlView; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.Messages; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs.ICreateChannelOnSessionDialog; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs.TraceControlDialogFactory; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.TraceSessionState; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceDomainComponent; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceSessionComponent; +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; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.ICreateChannelOnSessionDialog; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.TraceControlDialogFactory; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.TraceSessionState; +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.ui.IWorkbenchPage; /** diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/handlers/CreateSessionHandler.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/CreateSessionHandler.java similarity index 86% rename from org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/handlers/CreateSessionHandler.java rename to org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/CreateSessionHandler.java index 3a02c0212c..f7756f11d7 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/handlers/CreateSessionHandler.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/CreateSessionHandler.java @@ -9,7 +9,7 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng.ui.views.control.handlers; +package org.eclipse.linuxtools.internal.lttng2.ui.views.control.handlers; import org.eclipse.core.commands.ExecutionEvent; import org.eclipse.core.commands.ExecutionException; @@ -20,12 +20,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.lttng.ui.Activator; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.ControlView; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.Messages; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs.ICreateSessionDialog; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs.TraceControlDialogFactory; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceSessionGroup; +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; +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.model.impl.TraceSessionGroup; import org.eclipse.ui.IWorkbenchPage; /** diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/handlers/DeleteHandler.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/DeleteHandler.java similarity index 74% rename from org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/handlers/DeleteHandler.java rename to org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/DeleteHandler.java index cadbf56f0d..ffff78ef78 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/handlers/DeleteHandler.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/DeleteHandler.java @@ -9,12 +9,12 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng.ui.views.control.handlers; +package org.eclipse.linuxtools.internal.lttng2.ui.views.control.handlers; import org.eclipse.core.commands.ExecutionEvent; import org.eclipse.core.commands.ExecutionException; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceControlComponent; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.TargetNodeState; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.TargetNodeState; /** * DeleteHandler @@ -29,7 +29,7 @@ public class DeleteHandler extends BaseNodeHandler { // ------------------------------------------------------------------------ /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.handlers.BaseNodeHandler#execute(org.eclipse.core.commands.ExecutionEvent) + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.handlers.BaseNodeHandler#execute(org.eclipse.core.commands.ExecutionEvent) */ @Override public Object execute(ExecutionEvent event) throws ExecutionException { @@ -41,7 +41,7 @@ public class DeleteHandler extends BaseNodeHandler { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.handlers.BaseNodeHandler#isEnabled() + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.handlers.BaseNodeHandler#isEnabled() */ @Override public boolean isEnabled() { diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/handlers/DestroySessionHandler.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/DestroySessionHandler.java similarity index 87% rename from org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/handlers/DestroySessionHandler.java rename to org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/DestroySessionHandler.java index b5b36d96c9..99c2cc75e0 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/handlers/DestroySessionHandler.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/DestroySessionHandler.java @@ -9,7 +9,7 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng.ui.views.control.handlers; +package org.eclipse.linuxtools.internal.lttng2.ui.views.control.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.lttng.ui.Activator; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.ControlView; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.Messages; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs.IConfirmDialog; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs.TraceControlDialogFactory; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.TraceSessionState; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceSessionComponent; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceSessionGroup; +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; +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.model.TraceSessionState; +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.ui.IWorkbenchPage; import org.eclipse.ui.IWorkbenchWindow; import org.eclipse.ui.PlatformUI; diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/handlers/DisableChannelHandler.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/DisableChannelHandler.java similarity index 71% rename from org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/handlers/DisableChannelHandler.java rename to org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/DisableChannelHandler.java index 086e502461..c96ef5164b 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/handlers/DisableChannelHandler.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/DisableChannelHandler.java @@ -9,14 +9,14 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng.ui.views.control.handlers; +package org.eclipse.linuxtools.internal.lttng2.ui.views.control.handlers; import java.util.List; import org.eclipse.core.commands.ExecutionException; import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.TraceEnablement; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceDomainComponent; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.TraceEnablement; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceDomainComponent; /** * DisableChannelHandler @@ -31,7 +31,7 @@ public class DisableChannelHandler extends ChangeChannelStateHandler { // ------------------------------------------------------------------------ /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.handlers.BaseChangeChannelStateHandler#getNewState() + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.handlers.BaseChangeChannelStateHandler#getNewState() */ @Override protected TraceEnablement getNewState() { @@ -43,7 +43,7 @@ public class DisableChannelHandler extends ChangeChannelStateHandler { // ------------------------------------------------------------------------ /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.handlers.BaseChangeChannelStateHandler#changeState(org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceDomainComponent, java.util.List, org.eclipse.core.runtime.IProgressMonitor) + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.handlers.BaseChangeChannelStateHandler#changeState(org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceDomainComponent, java.util.List, org.eclipse.core.runtime.IProgressMonitor) */ @Override protected void changeState(TraceDomainComponent domain, List channelNames, IProgressMonitor monitor) throws ExecutionException { diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/handlers/DisableEventHandler.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/DisableEventHandler.java similarity index 71% rename from org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/handlers/DisableEventHandler.java rename to org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/DisableEventHandler.java index 45d8e3a690..4a90d3b480 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/handlers/DisableEventHandler.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/DisableEventHandler.java @@ -9,14 +9,14 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng.ui.views.control.handlers; +package org.eclipse.linuxtools.internal.lttng2.ui.views.control.handlers; import java.util.List; import org.eclipse.core.commands.ExecutionException; import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.TraceEnablement; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceChannelComponent; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.TraceEnablement; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceChannelComponent; /** * DisableEventHandler @@ -31,7 +31,7 @@ public class DisableEventHandler extends ChangeEventStateHandler { // ------------------------------------------------------------------------ /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.handlers.ChangeEventStateHandler#getNewState() + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.handlers.ChangeEventStateHandler#getNewState() */ @Override protected TraceEnablement getNewState() { @@ -43,7 +43,7 @@ public class DisableEventHandler extends ChangeEventStateHandler { // ------------------------------------------------------------------------ /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.handlers.ChangeEventStateHandler#changeState(org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceChannelComponent, java.util.List, org.eclipse.core.runtime.IProgressMonitor) + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.handlers.ChangeEventStateHandler#changeState(org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceChannelComponent, java.util.List, org.eclipse.core.runtime.IProgressMonitor) */ @Override protected void changeState(TraceChannelComponent channel, List eventNames, IProgressMonitor monitor) throws ExecutionException{ diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/handlers/DisconnectHandler.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/DisconnectHandler.java similarity index 76% rename from org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/handlers/DisconnectHandler.java rename to org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/DisconnectHandler.java index 0e275e630c..25e3cc6e44 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/handlers/DisconnectHandler.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/DisconnectHandler.java @@ -9,11 +9,11 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng.ui.views.control.handlers; +package org.eclipse.linuxtools.internal.lttng2.ui.views.control.handlers; import org.eclipse.core.commands.ExecutionEvent; import org.eclipse.core.commands.ExecutionException; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.TargetNodeState; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.TargetNodeState; /** * DisconnectHandler @@ -29,7 +29,7 @@ public class DisconnectHandler extends BaseNodeHandler { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.handlers.BaseNodeHandler#execute(org.eclipse.core.commands.ExecutionEvent) + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.handlers.BaseNodeHandler#execute(org.eclipse.core.commands.ExecutionEvent) */ @Override public Object execute(ExecutionEvent event) throws ExecutionException { @@ -39,7 +39,7 @@ public class DisconnectHandler extends BaseNodeHandler { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.handlers.BaseNodeHandler#isEnabled() + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.handlers.BaseNodeHandler#isEnabled() */ @Override public boolean isEnabled() { diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/handlers/EnableChannelHandler.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/EnableChannelHandler.java similarity index 71% rename from org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/handlers/EnableChannelHandler.java rename to org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/EnableChannelHandler.java index 45e1da6562..0b9a3ef4b6 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/handlers/EnableChannelHandler.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/EnableChannelHandler.java @@ -9,14 +9,14 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng.ui.views.control.handlers; +package org.eclipse.linuxtools.internal.lttng2.ui.views.control.handlers; import java.util.List; import org.eclipse.core.commands.ExecutionException; import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.TraceEnablement; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceDomainComponent; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.TraceEnablement; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceDomainComponent; /** * EnableChannelHandler @@ -31,7 +31,7 @@ public class EnableChannelHandler extends ChangeChannelStateHandler { // ------------------------------------------------------------------------ /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.handlers.BaseChangeChannelStateHandler#getNewState() + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.handlers.BaseChangeChannelStateHandler#getNewState() */ @Override protected TraceEnablement getNewState() { @@ -43,7 +43,7 @@ public class EnableChannelHandler extends ChangeChannelStateHandler { // ------------------------------------------------------------------------ /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.handlers.BaseChangeChannelStateHandler#changeState(org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceDomainComponent, java.util.List, org.eclipse.core.runtime.IProgressMonitor) + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.handlers.BaseChangeChannelStateHandler#changeState(org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceDomainComponent, java.util.List, org.eclipse.core.runtime.IProgressMonitor) */ @Override protected void changeState(TraceDomainComponent domain, List channelNames, IProgressMonitor monitor) throws ExecutionException { diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/handlers/EnableEventHandler.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/EnableEventHandler.java similarity index 71% rename from org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/handlers/EnableEventHandler.java rename to org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/EnableEventHandler.java index 4b336d8bdf..af0bf72c45 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/handlers/EnableEventHandler.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/EnableEventHandler.java @@ -9,14 +9,14 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng.ui.views.control.handlers; +package org.eclipse.linuxtools.internal.lttng2.ui.views.control.handlers; import java.util.List; import org.eclipse.core.commands.ExecutionException; import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.TraceEnablement; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceChannelComponent; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.TraceEnablement; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceChannelComponent; /** * EnableEventHandler @@ -31,7 +31,7 @@ public class EnableEventHandler extends ChangeEventStateHandler { // ------------------------------------------------------------------------ /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.handlers.ChangeEventStateHandler#getNewState() + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.handlers.ChangeEventStateHandler#getNewState() */ @Override protected TraceEnablement getNewState() { @@ -43,7 +43,7 @@ public class EnableEventHandler extends ChangeEventStateHandler { // ------------------------------------------------------------------------ /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.handlers.ChangeEventStateHandler#changeState(org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceChannelComponent, java.util.List, org.eclipse.core.runtime.IProgressMonitor) + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.handlers.ChangeEventStateHandler#changeState(org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceChannelComponent, java.util.List, org.eclipse.core.runtime.IProgressMonitor) */ @Override protected void changeState(TraceChannelComponent channel, List eventNames, IProgressMonitor monitor) throws ExecutionException{ diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/handlers/EnableEventOnChannelHandler.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/EnableEventOnChannelHandler.java similarity index 70% rename from org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/handlers/EnableEventOnChannelHandler.java rename to org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/EnableEventOnChannelHandler.java index 753aaff4aa..596e19371d 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/handlers/EnableEventOnChannelHandler.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/EnableEventOnChannelHandler.java @@ -9,7 +9,7 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng.ui.views.control.handlers; +package org.eclipse.linuxtools.internal.lttng2.ui.views.control.handlers; import java.util.Iterator; import java.util.List; @@ -18,13 +18,13 @@ 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.lttng.ui.views.control.ControlView; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.LogLevelType; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.TraceLogLevel; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.TraceSessionState; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceChannelComponent; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceDomainComponent; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceSessionComponent; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.ControlView; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.LogLevelType; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.TraceLogLevel; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.TraceSessionState; +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.ui.IWorkbenchPage; /** @@ -48,7 +48,7 @@ public class EnableEventOnChannelHandler extends BaseEnableEventHandler { // ------------------------------------------------------------------------ /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.handlers.BaseEnableEventHandler#enableEvents(java.util.List, boolean, org.eclipse.core.runtime.IProgressMonitor) + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.handlers.BaseEnableEventHandler#enableEvents(java.util.List, boolean, org.eclipse.core.runtime.IProgressMonitor) */ @Override public void enableEvents(List eventNames, boolean isKernel, IProgressMonitor monitor) throws ExecutionException { @@ -57,7 +57,7 @@ public class EnableEventOnChannelHandler extends BaseEnableEventHandler { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.handlers.BaseEnableEventHandler#enableSyscalls(org.eclipse.core.runtime.IProgressMonitor) + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.handlers.BaseEnableEventHandler#enableSyscalls(org.eclipse.core.runtime.IProgressMonitor) */ @Override public void enableSyscalls(IProgressMonitor monitor) throws ExecutionException { @@ -66,7 +66,7 @@ public class EnableEventOnChannelHandler extends BaseEnableEventHandler { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.handlers.BaseEnableEventHandler#enableProbe(java.lang.String, boolean, java.lang.String, org.eclipse.core.runtime.IProgressMonitor) + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.handlers.BaseEnableEventHandler#enableProbe(java.lang.String, boolean, java.lang.String, org.eclipse.core.runtime.IProgressMonitor) */ @Override public void enableProbe(String eventName, boolean isFunction, String probe, IProgressMonitor monitor) throws ExecutionException { @@ -75,7 +75,7 @@ public class EnableEventOnChannelHandler extends BaseEnableEventHandler { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.handlers.BaseEnableEventHandler#enableLogLevel(java.lang.String, org.eclipse.linuxtools.internal.lttng.ui.views.control.model.LogLevelType, org.eclipse.linuxtools.internal.lttng.ui.views.control.model.TraceLogLevel, org.eclipse.core.runtime.IProgressMonitor) + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.handlers.BaseEnableEventHandler#enableLogLevel(java.lang.String, org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.LogLevelType, org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.TraceLogLevel, org.eclipse.core.runtime.IProgressMonitor) */ @Override public void enableLogLevel(String eventName, LogLevelType logLevelType, TraceLogLevel level, IProgressMonitor monitor) throws ExecutionException { @@ -84,7 +84,7 @@ public class EnableEventOnChannelHandler extends BaseEnableEventHandler { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.handlers.BaseEnableEventHandler#getDomain() + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.handlers.BaseEnableEventHandler#getDomain() */ @Override public TraceDomainComponent getDomain() { diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/handlers/EnableEventOnDomainHandler.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/EnableEventOnDomainHandler.java similarity index 71% rename from org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/handlers/EnableEventOnDomainHandler.java rename to org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/EnableEventOnDomainHandler.java index 252e03e2e4..b01a7b0f8c 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/handlers/EnableEventOnDomainHandler.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/EnableEventOnDomainHandler.java @@ -9,7 +9,7 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng.ui.views.control.handlers; +package org.eclipse.linuxtools.internal.lttng2.ui.views.control.handlers; import java.util.Iterator; import java.util.List; @@ -18,12 +18,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.lttng.ui.views.control.ControlView; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.LogLevelType; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.TraceLogLevel; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.TraceSessionState; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceDomainComponent; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceSessionComponent; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.ControlView; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.LogLevelType; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.TraceLogLevel; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.TraceSessionState; +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.ui.IWorkbenchPage; /** @@ -48,7 +48,7 @@ public class EnableEventOnDomainHandler extends BaseEnableEventHandler { // ------------------------------------------------------------------------ /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.handlers.BaseEnableEventHandler#enableEvents(java.util.List, boolean, org.eclipse.core.runtime.IProgressMonitor) + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.handlers.BaseEnableEventHandler#enableEvents(java.util.List, boolean, org.eclipse.core.runtime.IProgressMonitor) */ @Override public void enableEvents(List eventNames, boolean isKernel, IProgressMonitor monitor) throws ExecutionException { @@ -57,7 +57,7 @@ public class EnableEventOnDomainHandler extends BaseEnableEventHandler { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.handlers.BaseEnableEventHandler#enableSyscalls(org.eclipse.core.runtime.IProgressMonitor) + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.handlers.BaseEnableEventHandler#enableSyscalls(org.eclipse.core.runtime.IProgressMonitor) */ @Override public void enableSyscalls(IProgressMonitor monitor) throws ExecutionException { @@ -66,7 +66,7 @@ public class EnableEventOnDomainHandler extends BaseEnableEventHandler { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.handlers.BaseEnableEventHandler#enableProbe(java.lang.String, boolean, java.lang.String, org.eclipse.core.runtime.IProgressMonitor) + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.handlers.BaseEnableEventHandler#enableProbe(java.lang.String, boolean, java.lang.String, org.eclipse.core.runtime.IProgressMonitor) */ @Override public void enableProbe(String eventName, boolean isFunction, String probe, IProgressMonitor monitor) throws ExecutionException { @@ -75,7 +75,7 @@ public class EnableEventOnDomainHandler extends BaseEnableEventHandler { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.handlers.BaseEnableEventHandler#enableLogLevel(java.lang.String, org.eclipse.linuxtools.internal.lttng.ui.views.control.model.LogLevelType, org.eclipse.linuxtools.internal.lttng.ui.views.control.model.TraceLogLevel, org.eclipse.core.runtime.IProgressMonitor) + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.handlers.BaseEnableEventHandler#enableLogLevel(java.lang.String, org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.LogLevelType, org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.TraceLogLevel, org.eclipse.core.runtime.IProgressMonitor) */ @Override public void enableLogLevel(String eventName, LogLevelType logLevelType, TraceLogLevel level, IProgressMonitor monitor) throws ExecutionException { @@ -84,7 +84,7 @@ public class EnableEventOnDomainHandler extends BaseEnableEventHandler { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.handlers.BaseEnableEventHandler#getDomain() + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.handlers.BaseEnableEventHandler#getDomain() */ @Override public TraceDomainComponent getDomain() { diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/handlers/EnableEventOnSessionHandler.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/EnableEventOnSessionHandler.java similarity index 70% rename from org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/handlers/EnableEventOnSessionHandler.java rename to org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/EnableEventOnSessionHandler.java index 888b72054e..5aa9deb84a 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/handlers/EnableEventOnSessionHandler.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/EnableEventOnSessionHandler.java @@ -9,7 +9,7 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng.ui.views.control.handlers; +package org.eclipse.linuxtools.internal.lttng2.ui.views.control.handlers; import java.util.Iterator; import java.util.List; @@ -18,12 +18,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.lttng.ui.views.control.ControlView; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.LogLevelType; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.TraceLogLevel; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.TraceSessionState; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceDomainComponent; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceSessionComponent; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.ControlView; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.LogLevelType; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.TraceLogLevel; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.TraceSessionState; +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.ui.IWorkbenchPage; /** @@ -44,7 +44,7 @@ public class EnableEventOnSessionHandler extends BaseEnableEventHandler { // ------------------------------------------------------------------------ /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.handlers.BaseEnableEventHandler#enableEvents(java.util.List, boolean, org.eclipse.core.runtime.IProgressMonitor) + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.handlers.BaseEnableEventHandler#enableEvents(java.util.List, boolean, org.eclipse.core.runtime.IProgressMonitor) */ @Override public void enableEvents(List eventNames, boolean isKernel, IProgressMonitor monitor) throws ExecutionException { @@ -53,7 +53,7 @@ public class EnableEventOnSessionHandler extends BaseEnableEventHandler { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.handlers.BaseEnableEventHandler#enableSyscalls(org.eclipse.core.runtime.IProgressMonitor) + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.handlers.BaseEnableEventHandler#enableSyscalls(org.eclipse.core.runtime.IProgressMonitor) */ @Override public void enableSyscalls(IProgressMonitor monitor) throws ExecutionException { @@ -62,7 +62,7 @@ public class EnableEventOnSessionHandler extends BaseEnableEventHandler { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.handlers.BaseEnableEventHandler#enableProbe(java.lang.String, boolean, java.lang.String, org.eclipse.core.runtime.IProgressMonitor) + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.handlers.BaseEnableEventHandler#enableProbe(java.lang.String, boolean, java.lang.String, org.eclipse.core.runtime.IProgressMonitor) */ @Override public void enableProbe(String eventName, boolean isFunction, String probe, IProgressMonitor monitor) throws ExecutionException { @@ -71,7 +71,7 @@ public class EnableEventOnSessionHandler extends BaseEnableEventHandler { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.handlers.BaseEnableEventHandler#enableLogLevel(java.lang.String, org.eclipse.linuxtools.internal.lttng.ui.views.control.model.LogLevelType, org.eclipse.linuxtools.internal.lttng.ui.views.control.model.TraceLogLevel, org.eclipse.core.runtime.IProgressMonitor) + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.handlers.BaseEnableEventHandler#enableLogLevel(java.lang.String, org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.LogLevelType, org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.TraceLogLevel, org.eclipse.core.runtime.IProgressMonitor) */ @Override public void enableLogLevel(String eventName, LogLevelType logLevelType, TraceLogLevel level, IProgressMonitor monitor) throws ExecutionException { @@ -81,7 +81,7 @@ public class EnableEventOnSessionHandler extends BaseEnableEventHandler { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.handlers.BaseEnableEventHandler#getDomain() + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.handlers.BaseEnableEventHandler#getDomain() */ @Override public TraceDomainComponent getDomain() { diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/handlers/NewConnectionHandler.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/NewConnectionHandler.java similarity index 88% rename from org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/handlers/NewConnectionHandler.java rename to org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/NewConnectionHandler.java index 13fb350f1d..f635102a35 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/handlers/NewConnectionHandler.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/NewConnectionHandler.java @@ -9,18 +9,18 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng.ui.views.control.handlers; +package org.eclipse.linuxtools.internal.lttng2.ui.views.control.handlers; 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.lttng.ui.views.control.ControlView; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.Messages; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs.INewConnectionDialog; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.dialogs.TraceControlDialogFactory; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceControlComponent; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TargetNodeComponent; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.ControlView; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.Messages; +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.model.ITraceControlComponent; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TargetNodeComponent; import org.eclipse.rse.core.IRSESystemType; import org.eclipse.rse.core.RSECorePlugin; import org.eclipse.rse.core.model.IHost; @@ -44,7 +44,7 @@ public class NewConnectionHandler extends BaseControlViewHandler { /** * The trace control system type defined for LTTng version 2.0 and later. */ - public final static String TRACE_CONTROL_SYSTEM_TYPE = "org.eclipse.linuxtools.internal.lttng.ui.control.systemType"; //$NON-NLS-1$ + public final static String TRACE_CONTROL_SYSTEM_TYPE = "org.eclipse.linuxtools.internal.lttng2.ui.control.systemType"; //$NON-NLS-1$ // ------------------------------------------------------------------------ // Attributes diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/handlers/RefreshHandler.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/RefreshHandler.java similarity index 88% rename from org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/handlers/RefreshHandler.java rename to org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/RefreshHandler.java index f9b60ae312..2a477972ba 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/handlers/RefreshHandler.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/RefreshHandler.java @@ -9,7 +9,7 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng.ui.views.control.handlers; +package org.eclipse.linuxtools.internal.lttng2.ui.views.control.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.lttng.ui.views.control.ControlView; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.TargetNodeState; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TargetNodeComponent; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceControlComponent; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.ControlView; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.TargetNodeState; +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.ui.IWorkbenchPage; /** diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/handlers/StartHandler.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/StartHandler.java similarity index 70% rename from org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/handlers/StartHandler.java rename to org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/StartHandler.java index b224c21c42..6dda08baeb 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/handlers/StartHandler.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/StartHandler.java @@ -9,12 +9,12 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng.ui.views.control.handlers; +package org.eclipse.linuxtools.internal.lttng2.ui.views.control.handlers; import org.eclipse.core.commands.ExecutionException; import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.TraceSessionState; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceSessionComponent; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.TraceSessionState; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceSessionComponent; /** * StartHandler @@ -29,7 +29,7 @@ public class StartHandler extends ChangeSessionStateHandler { // ------------------------------------------------------------------------ /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.handlers.ChangeSessionStateHandler#getNewState() + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.handlers.ChangeSessionStateHandler#getNewState() */ @Override public TraceSessionState getNewState() { @@ -41,7 +41,7 @@ public class StartHandler extends ChangeSessionStateHandler { // ------------------------------------------------------------------------ /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.handlers.ChangeSessionStateHandler#changeState(org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceSessionComponent, org.eclipse.core.runtime.IProgressMonitor) + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.handlers.ChangeSessionStateHandler#changeState(org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceSessionComponent, org.eclipse.core.runtime.IProgressMonitor) */ @Override public void changeState(TraceSessionComponent session, IProgressMonitor monitor) throws ExecutionException { diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/handlers/StopHandler.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/StopHandler.java similarity index 70% rename from org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/handlers/StopHandler.java rename to org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/StopHandler.java index ff0a322daa..792014779d 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/handlers/StopHandler.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/StopHandler.java @@ -9,12 +9,12 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng.ui.views.control.handlers; +package org.eclipse.linuxtools.internal.lttng2.ui.views.control.handlers; import org.eclipse.core.commands.ExecutionException; import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.TraceSessionState; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceSessionComponent; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.TraceSessionState; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceSessionComponent; /** * StopHandler @@ -29,7 +29,7 @@ public class StopHandler extends ChangeSessionStateHandler { // ------------------------------------------------------------------------ /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.handlers.ChangeSessionStateHandler#getNewState() + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.handlers.ChangeSessionStateHandler#getNewState() */ @Override public TraceSessionState getNewState() { @@ -41,7 +41,7 @@ public class StopHandler extends ChangeSessionStateHandler { // ------------------------------------------------------------------------ /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.handlers.ChangeSessionStateHandler#changeState(org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceSessionComponent, org.eclipse.core.runtime.IProgressMonitor) + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.handlers.ChangeSessionStateHandler#changeState(org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceSessionComponent, org.eclipse.core.runtime.IProgressMonitor) */ @Override public void changeState(TraceSessionComponent session, IProgressMonitor monitor) throws ExecutionException { diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/messages.properties b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/messages.properties similarity index 100% rename from org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/messages.properties rename to org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/messages.properties diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/IBaseEventInfo.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/IBaseEventInfo.java similarity index 95% rename from org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/IBaseEventInfo.java rename to org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/IBaseEventInfo.java index f3dfe60663..20a3a95ac2 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/IBaseEventInfo.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/IBaseEventInfo.java @@ -9,7 +9,7 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng.ui.views.control.model; +package org.eclipse.linuxtools.internal.lttng2.ui.views.control.model; /** * IBaseEventInfo diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/IChannelInfo.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/IChannelInfo.java similarity index 98% rename from org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/IChannelInfo.java rename to org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/IChannelInfo.java index 017f262b87..ac58000fc6 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/IChannelInfo.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/IChannelInfo.java @@ -9,7 +9,7 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng.ui.views.control.model; +package org.eclipse.linuxtools.internal.lttng2.ui.views.control.model; import java.util.List; diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/IDomainInfo.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/IDomainInfo.java similarity index 95% rename from org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/IDomainInfo.java rename to org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/IDomainInfo.java index c5a0b483df..2f710d0c8c 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/IDomainInfo.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/IDomainInfo.java @@ -9,7 +9,7 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng.ui.views.control.model; +package org.eclipse.linuxtools.internal.lttng2.ui.views.control.model; import java.util.List; diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/IEventInfo.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/IEventInfo.java similarity index 94% rename from org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/IEventInfo.java rename to org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/IEventInfo.java index ff810724db..f8db932661 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/IEventInfo.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/IEventInfo.java @@ -9,7 +9,7 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng.ui.views.control.model; +package org.eclipse.linuxtools.internal.lttng2.ui.views.control.model; /** * IEventInfo diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/IProbeEventInfo.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/IProbeEventInfo.java similarity index 95% rename from org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/IProbeEventInfo.java rename to org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/IProbeEventInfo.java index 7d95a3e419..e954542f37 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/IProbeEventInfo.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/IProbeEventInfo.java @@ -9,7 +9,7 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng.ui.views.control.model; +package org.eclipse.linuxtools.internal.lttng2.ui.views.control.model; /** * IProbeEventInfo diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/ISessionInfo.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/ISessionInfo.java similarity index 96% rename from org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/ISessionInfo.java rename to org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/ISessionInfo.java index 2d1505bc94..fbed707321 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/ISessionInfo.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/ISessionInfo.java @@ -9,7 +9,7 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng.ui.views.control.model; +package org.eclipse.linuxtools.internal.lttng2.ui.views.control.model; import java.util.List; diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/ITraceControlComponent.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/ITraceControlComponent.java similarity index 97% rename from org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/ITraceControlComponent.java rename to org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/ITraceControlComponent.java index c26d85da77..fb2c5916ae 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/ITraceControlComponent.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/ITraceControlComponent.java @@ -9,12 +9,12 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng.ui.views.control.model; +package org.eclipse.linuxtools.internal.lttng2.ui.views.control.model; import java.util.List; import org.eclipse.core.runtime.IAdaptable; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.service.ILttngControlService; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.service.ILttngControlService; import org.eclipse.swt.graphics.Image; /** diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/ITraceControlComponentChangedListener.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/ITraceControlComponentChangedListener.java similarity index 95% rename from org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/ITraceControlComponentChangedListener.java rename to org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/ITraceControlComponentChangedListener.java index 70fffd531d..ac196580c7 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/ITraceControlComponentChangedListener.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/ITraceControlComponentChangedListener.java @@ -9,7 +9,7 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng.ui.views.control.model; +package org.eclipse.linuxtools.internal.lttng2.ui.views.control.model; /** * ITraceControlComponentChangedListener diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/ITraceInfo.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/ITraceInfo.java similarity index 93% rename from org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/ITraceInfo.java rename to org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/ITraceInfo.java index dab6c8df7f..ceb7081bf5 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/ITraceInfo.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/ITraceInfo.java @@ -9,7 +9,7 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng.ui.views.control.model; +package org.eclipse.linuxtools.internal.lttng2.ui.views.control.model; /** * ITraceInfo diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/IUstProviderInfo.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/IUstProviderInfo.java similarity index 95% rename from org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/IUstProviderInfo.java rename to org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/IUstProviderInfo.java index dc52cdb3b3..cba0ed1f36 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/IUstProviderInfo.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/IUstProviderInfo.java @@ -9,7 +9,7 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng.ui.views.control.model; +package org.eclipse.linuxtools.internal.lttng2.ui.views.control.model; import java.util.List; diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/LogLevelType.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/LogLevelType.java similarity index 92% rename from org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/LogLevelType.java rename to org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/LogLevelType.java index cc6a245135..b887d689dc 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/LogLevelType.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/LogLevelType.java @@ -9,7 +9,7 @@ * Contributors: * Bernd Hufmann - Initial API and implementation *********************************************************************/ -package org.eclipse.linuxtools.internal.lttng.ui.views.control.model; +package org.eclipse.linuxtools.internal.lttng2.ui.views.control.model; /** * LogLevelType diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/TargetNodeState.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/TargetNodeState.java similarity index 90% rename from org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/TargetNodeState.java rename to org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/TargetNodeState.java index 2bc295b00e..c3b44f25dd 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/TargetNodeState.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/TargetNodeState.java @@ -9,7 +9,7 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng.ui.views.control.model; +package org.eclipse.linuxtools.internal.lttng2.ui.views.control.model; /** * TargetNodeState diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/TraceEnablement.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/TraceEnablement.java similarity index 96% rename from org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/TraceEnablement.java rename to org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/TraceEnablement.java index 5df344e535..2a875fd789 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/TraceEnablement.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/TraceEnablement.java @@ -9,7 +9,7 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng.ui.views.control.model; +package org.eclipse.linuxtools.internal.lttng2.ui.views.control.model; /** * TraceEnablement diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/TraceEventType.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/TraceEventType.java similarity index 93% rename from org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/TraceEventType.java rename to org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/TraceEventType.java index 2bac58fb97..1d1c694afc 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/TraceEventType.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/TraceEventType.java @@ -9,7 +9,7 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng.ui.views.control.model; +package org.eclipse.linuxtools.internal.lttng2.ui.views.control.model; /** * TraceEventType diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/TraceLogLevel.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/TraceLogLevel.java similarity index 97% rename from org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/TraceLogLevel.java rename to org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/TraceLogLevel.java index b237bc221a..b268ec8ef6 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/TraceLogLevel.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/TraceLogLevel.java @@ -9,7 +9,7 @@ * Contributors: * Bernd Hufmann - Initial API and implementation *********************************************************************/ -package org.eclipse.linuxtools.internal.lttng.ui.views.control.model; +package org.eclipse.linuxtools.internal.lttng2.ui.views.control.model; /** * TraceLogLevels diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/TraceSessionState.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/TraceSessionState.java similarity index 96% rename from org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/TraceSessionState.java rename to org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/TraceSessionState.java index 78814bdd66..5a8835c578 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/TraceSessionState.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/TraceSessionState.java @@ -9,7 +9,7 @@ * Contributors: * Bernd Hufmann - Initial API and implementation *********************************************************************/ -package org.eclipse.linuxtools.internal.lttng.ui.views.control.model; +package org.eclipse.linuxtools.internal.lttng2.ui.views.control.model; /** * TraceSessionState diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/impl/BaseEventComponent.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/BaseEventComponent.java similarity index 86% rename from org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/impl/BaseEventComponent.java rename to org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/BaseEventComponent.java index 63e09ab8b5..494ec791b0 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/impl/BaseEventComponent.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/BaseEventComponent.java @@ -9,13 +9,13 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl; +package org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IBaseEventInfo; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceControlComponent; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.TraceEventType; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.TraceLogLevel; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.property.BaseEventPropertySource; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IBaseEventInfo; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.TraceEventType; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.TraceLogLevel; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.property.BaseEventPropertySource; import org.eclipse.ui.views.properties.IPropertySource; /** @@ -115,7 +115,7 @@ public class BaseEventComponent extends TraceControlComponent { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceControlComponent#getAdapter(java.lang.Class) + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceControlComponent#getAdapter(java.lang.Class) */ @SuppressWarnings("rawtypes") @Override diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/impl/BaseEventInfo.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/BaseEventInfo.java similarity index 82% rename from org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/impl/BaseEventInfo.java rename to org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/BaseEventInfo.java index d49d00b575..2f4aa662c8 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/impl/BaseEventInfo.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/BaseEventInfo.java @@ -9,11 +9,11 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl; +package org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IBaseEventInfo; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.TraceEventType; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.TraceLogLevel; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IBaseEventInfo; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.TraceEventType; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.TraceLogLevel; /** * BaseEventInfo @@ -61,7 +61,7 @@ public class BaseEventInfo extends TraceInfo implements IBaseEventInfo { // ------------------------------------------------------------------------ /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IBaseEventInfo#getEventType() + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IBaseEventInfo#getEventType() */ @Override public TraceEventType getEventType() { @@ -70,7 +70,7 @@ public class BaseEventInfo extends TraceInfo implements IBaseEventInfo { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IBaseEventInfo#setEventType(org.eclipse.linuxtools.internal.lttng.ui.views.control.model.TraceEventType) + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IBaseEventInfo#setEventType(org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.TraceEventType) */ @Override public void setEventType(TraceEventType type) { @@ -79,7 +79,7 @@ public class BaseEventInfo extends TraceInfo implements IBaseEventInfo { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IBaseEventInfo#setEventType(java.lang.String) + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IBaseEventInfo#setEventType(java.lang.String) */ @Override public void setEventType(String typeName) { @@ -96,7 +96,7 @@ public class BaseEventInfo extends TraceInfo implements IBaseEventInfo { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IBaseEventInfo#getLogLevel() + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IBaseEventInfo#getLogLevel() */ @Override public TraceLogLevel getLogLevel() { @@ -105,7 +105,7 @@ public class BaseEventInfo extends TraceInfo implements IBaseEventInfo { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IBaseEventInfo#setLogLevel(org.eclipse.linuxtools.internal.lttng.ui.views.control.model.TraceLogLevel) + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IBaseEventInfo#setLogLevel(org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.TraceLogLevel) */ @Override public void setLogLevel(TraceLogLevel level) { @@ -114,7 +114,7 @@ public class BaseEventInfo extends TraceInfo implements IBaseEventInfo { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IBaseEventInfo#setLogLevel(java.lang.String) + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IBaseEventInfo#setLogLevel(java.lang.String) */ @Override public void setLogLevel(String levelName) { @@ -157,7 +157,7 @@ public class BaseEventInfo extends TraceInfo implements IBaseEventInfo { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceInfo#formatString() + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceInfo#formatString() */ @SuppressWarnings("nls") @Override @@ -181,7 +181,7 @@ public class BaseEventInfo extends TraceInfo implements IBaseEventInfo { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceInfo#hashCode() + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceInfo#hashCode() */ @Override public int hashCode() { @@ -194,7 +194,7 @@ public class BaseEventInfo extends TraceInfo implements IBaseEventInfo { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceInfo#equals(java.lang.Object) + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceInfo#equals(java.lang.Object) */ @Override public boolean equals(Object obj) { @@ -219,7 +219,7 @@ public class BaseEventInfo extends TraceInfo implements IBaseEventInfo { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceInfo#toString() + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceInfo#toString() */ @SuppressWarnings("nls") @Override diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/impl/ChannelInfo.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/ChannelInfo.java similarity index 79% rename from org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/impl/ChannelInfo.java rename to org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/ChannelInfo.java index 3d1cfa65b6..549bb31f8d 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/impl/ChannelInfo.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/ChannelInfo.java @@ -9,15 +9,15 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl; +package org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl; import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IChannelInfo; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IEventInfo; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.TraceEnablement; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IChannelInfo; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IEventInfo; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.TraceEnablement; /** * ChannelInfo @@ -104,7 +104,7 @@ public class ChannelInfo extends TraceInfo implements IChannelInfo { // ------------------------------------------------------------------------ /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IChannelInfo#getOverwriteMode() + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IChannelInfo#getOverwriteMode() */ @Override public boolean isOverwriteMode() { @@ -113,7 +113,7 @@ public class ChannelInfo extends TraceInfo implements IChannelInfo { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IChannelInfo#setOverwriteMode(boolean) + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IChannelInfo#setOverwriteMode(boolean) */ @Override public void setOverwriteMode(boolean mode) { @@ -122,7 +122,7 @@ public class ChannelInfo extends TraceInfo implements IChannelInfo { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IChannelInfo#getSubBufferSize() + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IChannelInfo#getSubBufferSize() */ @Override public long getSubBufferSize() { @@ -131,7 +131,7 @@ public class ChannelInfo extends TraceInfo implements IChannelInfo { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IChannelInfo#setSubBufferSize(long) + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IChannelInfo#setSubBufferSize(long) */ @Override public void setSubBufferSize(long bufferSize) { @@ -141,7 +141,7 @@ public class ChannelInfo extends TraceInfo implements IChannelInfo { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IChannelInfo#getNumberOfSubBuffers() + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IChannelInfo#getNumberOfSubBuffers() */ @Override public int getNumberOfSubBuffers() { @@ -150,7 +150,7 @@ public class ChannelInfo extends TraceInfo implements IChannelInfo { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IChannelInfo#setNumberOfSubBuffers(int) + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IChannelInfo#setNumberOfSubBuffers(int) */ @Override public void setNumberOfSubBuffers(int numberOfSubBuffers) { @@ -159,7 +159,7 @@ public class ChannelInfo extends TraceInfo implements IChannelInfo { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IChannelInfo#getSwitchTimer() + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IChannelInfo#getSwitchTimer() */ @Override public long getSwitchTimer() { @@ -168,7 +168,7 @@ public class ChannelInfo extends TraceInfo implements IChannelInfo { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IChannelInfo#setSwitchTimer(long) + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IChannelInfo#setSwitchTimer(long) */ @Override public void setSwitchTimer(long timer) { @@ -177,7 +177,7 @@ public class ChannelInfo extends TraceInfo implements IChannelInfo { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IChannelInfo#getReadTimer() + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IChannelInfo#getReadTimer() */ @Override public long getReadTimer() { @@ -186,7 +186,7 @@ public class ChannelInfo extends TraceInfo implements IChannelInfo { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IChannelInfo#setReadTimer(long) + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IChannelInfo#setReadTimer(long) */ @Override public void setReadTimer(long timer) { @@ -195,7 +195,7 @@ public class ChannelInfo extends TraceInfo implements IChannelInfo { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IChannelInfo#getOutputType() + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IChannelInfo#getOutputType() */ @Override public String getOutputType() { @@ -204,7 +204,7 @@ public class ChannelInfo extends TraceInfo implements IChannelInfo { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IChannelInfo#setOutputType(java.lang.String) + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IChannelInfo#setOutputType(java.lang.String) */ @Override public void setOutputType(String type) { @@ -213,7 +213,7 @@ public class ChannelInfo extends TraceInfo implements IChannelInfo { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IChannelInfo#getState() + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IChannelInfo#getState() */ @Override public TraceEnablement getState() { @@ -222,7 +222,7 @@ public class ChannelInfo extends TraceInfo implements IChannelInfo { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IChannelInfo#setState(org.eclipse.linuxtools.internal.lttng.ui.views.control.model.TraceEnablement) + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IChannelInfo#setState(org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.TraceEnablement) */ @Override public void setState(TraceEnablement state) { @@ -231,7 +231,7 @@ public class ChannelInfo extends TraceInfo implements IChannelInfo { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IChannelInfo#setState(java.lang.String) + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IChannelInfo#setState(java.lang.String) */ @Override public void setState(String stateName) { @@ -245,7 +245,7 @@ public class ChannelInfo extends TraceInfo implements IChannelInfo { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IChannelInfo#getEvents() + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IChannelInfo#getEvents() */ @Override public IEventInfo[] getEvents() { @@ -254,7 +254,7 @@ public class ChannelInfo extends TraceInfo implements IChannelInfo { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IChannelInfo#setEvents(java.util.List) + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IChannelInfo#setEvents(java.util.List) */ @Override public void setEvents(List events) { @@ -266,7 +266,7 @@ public class ChannelInfo extends TraceInfo implements IChannelInfo { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IChannelInfo#addEvent(org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IEventInfo) + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IChannelInfo#addEvent(org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IEventInfo) */ @Override public void addEvent(IEventInfo channel) { @@ -275,7 +275,7 @@ public class ChannelInfo extends TraceInfo implements IChannelInfo { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceInfo#formatString() + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceInfo#formatString() */ @SuppressWarnings("nls") @Override @@ -325,7 +325,7 @@ public class ChannelInfo extends TraceInfo implements IChannelInfo { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceInfo#hashCode() + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceInfo#hashCode() */ @Override public int hashCode() { @@ -344,7 +344,7 @@ public class ChannelInfo extends TraceInfo implements IChannelInfo { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceInfo#equals(java.lang.Object) + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceInfo#equals(java.lang.Object) */ @Override public boolean equals(Object obj) { @@ -395,7 +395,7 @@ public class ChannelInfo extends TraceInfo implements IChannelInfo { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceInfo#toString() + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceInfo#toString() */ @SuppressWarnings("nls") @Override diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/impl/DomainInfo.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/DomainInfo.java similarity index 82% rename from org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/impl/DomainInfo.java rename to org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/DomainInfo.java index f8bba8cb6c..375e960386 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/impl/DomainInfo.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/DomainInfo.java @@ -9,14 +9,14 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl; +package org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl; import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IChannelInfo; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IDomainInfo; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IChannelInfo; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IDomainInfo; /** * DomainInfo @@ -65,7 +65,7 @@ public class DomainInfo extends TraceInfo implements IDomainInfo { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IDomainInfo#isKernel() + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IDomainInfo#isKernel() */ @Override public boolean isKernel() { @@ -74,7 +74,7 @@ public class DomainInfo extends TraceInfo implements IDomainInfo { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IDomainInfo#setIsKernel(boolean) + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IDomainInfo#setIsKernel(boolean) */ @Override public void setIsKernel(boolean isKernel) { @@ -86,7 +86,7 @@ public class DomainInfo extends TraceInfo implements IDomainInfo { // ------------------------------------------------------------------------ /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IDomainInfo#getChannels() + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IDomainInfo#getChannels() */ @Override public IChannelInfo[] getChannels() { @@ -95,7 +95,7 @@ public class DomainInfo extends TraceInfo implements IDomainInfo { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IDomainInfo#setChannels(java.util.List) + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IDomainInfo#setChannels(java.util.List) */ @Override public void setChannels(List channels) { @@ -107,7 +107,7 @@ public class DomainInfo extends TraceInfo implements IDomainInfo { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IDomainInfo#addChannel(org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IChannelInfo) + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IDomainInfo#addChannel(org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IChannelInfo) */ @Override public void addChannel(IChannelInfo channel) { @@ -116,7 +116,7 @@ public class DomainInfo extends TraceInfo implements IDomainInfo { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceInfo#formatString() + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceInfo#formatString() */ @SuppressWarnings("nls") @Override @@ -145,7 +145,7 @@ public class DomainInfo extends TraceInfo implements IDomainInfo { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceInfo#hashCode() + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceInfo#hashCode() */ @Override public int hashCode() { @@ -158,7 +158,7 @@ public class DomainInfo extends TraceInfo implements IDomainInfo { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceInfo#equals(java.lang.Object) + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceInfo#equals(java.lang.Object) */ @Override public boolean equals(Object obj) { @@ -187,7 +187,7 @@ public class DomainInfo extends TraceInfo implements IDomainInfo { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceInfo#toString() + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceInfo#toString() */ @SuppressWarnings("nls") @Override diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/impl/EventInfo.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/EventInfo.java similarity index 78% rename from org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/impl/EventInfo.java rename to org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/EventInfo.java index af11b77577..0e7265b5ca 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/impl/EventInfo.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/EventInfo.java @@ -9,10 +9,10 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl; +package org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IEventInfo; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.TraceEnablement; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IEventInfo; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.TraceEnablement; /** * EventInfo @@ -56,7 +56,7 @@ public class EventInfo extends BaseEventInfo implements IEventInfo { // ------------------------------------------------------------------------ /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IEventInfo#getState() + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IEventInfo#getState() */ @Override public TraceEnablement getState() { @@ -65,7 +65,7 @@ public class EventInfo extends BaseEventInfo implements IEventInfo { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IEventInfo#setState(org.eclipse.linuxtools.internal.lttng.ui.views.control.model.TraceEnablement) + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IEventInfo#setState(org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.TraceEnablement) */ @Override public void setState(TraceEnablement state) { @@ -74,7 +74,7 @@ public class EventInfo extends BaseEventInfo implements IEventInfo { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceInfo#formatString() + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceInfo#formatString() */ @SuppressWarnings("nls") @Override @@ -90,7 +90,7 @@ public class EventInfo extends BaseEventInfo implements IEventInfo { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IEventInfo#setState(java.lang.String) + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IEventInfo#setState(java.lang.String) */ @Override public void setState(String stateName) { @@ -104,7 +104,7 @@ public class EventInfo extends BaseEventInfo implements IEventInfo { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.BaseEventInfo#hashCode() + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.BaseEventInfo#hashCode() */ @Override public int hashCode() { @@ -116,7 +116,7 @@ public class EventInfo extends BaseEventInfo implements IEventInfo { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.BaseEventInfo#equals(java.lang.Object) + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.BaseEventInfo#equals(java.lang.Object) */ @Override public boolean equals(Object obj) { @@ -138,7 +138,7 @@ public class EventInfo extends BaseEventInfo implements IEventInfo { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.BaseEventInfo#toString() + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.BaseEventInfo#toString() */ @SuppressWarnings("nls") @Override diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/impl/KernelProviderComponent.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/KernelProviderComponent.java similarity index 85% rename from org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/impl/KernelProviderComponent.java rename to org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/KernelProviderComponent.java index c41f8ad60d..75319d1272 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/impl/KernelProviderComponent.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/KernelProviderComponent.java @@ -10,14 +10,14 @@ * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl; +package org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl; import java.util.Iterator; import java.util.List; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IBaseEventInfo; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceControlComponent; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.property.KernelProviderPropertySource; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IBaseEventInfo; +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.ui.views.properties.IPropertySource; /** @@ -71,7 +71,7 @@ public class KernelProviderComponent extends TraceControlComponent { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceControlComponent#getAdapter(java.lang.Class) + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceControlComponent#getAdapter(java.lang.Class) */ @SuppressWarnings("rawtypes") @Override diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/impl/ProbeEventInfo.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/ProbeEventInfo.java similarity index 81% rename from org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/impl/ProbeEventInfo.java rename to org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/ProbeEventInfo.java index 48a6da2d2d..2cf38dfd3f 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/impl/ProbeEventInfo.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/ProbeEventInfo.java @@ -9,9 +9,9 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl; +package org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IProbeEventInfo; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IProbeEventInfo; /** * ProbleEventInfo @@ -68,7 +68,7 @@ public class ProbeEventInfo extends EventInfo implements IProbeEventInfo { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IProbeEventInfo#getAddress() + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IProbeEventInfo#getAddress() */ @Override public String getAddress() { @@ -77,7 +77,7 @@ public class ProbeEventInfo extends EventInfo implements IProbeEventInfo { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IProbeEventInfo#setAddress(java.lang.String) + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IProbeEventInfo#setAddress(java.lang.String) */ @Override public void setAddress(String address) { @@ -86,7 +86,7 @@ public class ProbeEventInfo extends EventInfo implements IProbeEventInfo { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IProbeEventInfo#getOffset() + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IProbeEventInfo#getOffset() */ @Override public String getOffset() { @@ -95,7 +95,7 @@ public class ProbeEventInfo extends EventInfo implements IProbeEventInfo { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IProbeEventInfo#setOffset(java.lang.String) + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IProbeEventInfo#setOffset(java.lang.String) */ @Override public void setOffset(String offset) { @@ -104,7 +104,7 @@ public class ProbeEventInfo extends EventInfo implements IProbeEventInfo { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IProbeEventInfo#getSymbol() + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IProbeEventInfo#getSymbol() */ @Override public String getSymbol() { @@ -113,7 +113,7 @@ public class ProbeEventInfo extends EventInfo implements IProbeEventInfo { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IProbeEventInfo#setSymbol(java.lang.String) + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IProbeEventInfo#setSymbol(java.lang.String) */ @Override public void setSymbol(String symbol) { @@ -125,7 +125,7 @@ public class ProbeEventInfo extends EventInfo implements IProbeEventInfo { // ------------------------------------------------------------------------ /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceInfo#formatString() + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceInfo#formatString() */ @SuppressWarnings("nls") @Override @@ -149,7 +149,7 @@ public class ProbeEventInfo extends EventInfo implements IProbeEventInfo { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.BaseEventInfo#hashCode() + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.BaseEventInfo#hashCode() */ @Override public int hashCode() { @@ -163,7 +163,7 @@ public class ProbeEventInfo extends EventInfo implements IProbeEventInfo { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.BaseEventInfo#equals(java.lang.Object) + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.BaseEventInfo#equals(java.lang.Object) */ @Override public boolean equals(Object obj) { @@ -204,7 +204,7 @@ public class ProbeEventInfo extends EventInfo implements IProbeEventInfo { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.EventInfo#toString() + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.EventInfo#toString() */ @SuppressWarnings("nls") @Override diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/impl/SessionInfo.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/SessionInfo.java similarity index 79% rename from org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/impl/SessionInfo.java rename to org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/SessionInfo.java index d76fb5c454..61e01936e5 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/impl/SessionInfo.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/SessionInfo.java @@ -9,15 +9,15 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl; +package org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl; import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IDomainInfo; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ISessionInfo; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.TraceSessionState; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IDomainInfo; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ISessionInfo; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.TraceSessionState; /** * SessionInfo @@ -79,7 +79,7 @@ public class SessionInfo extends TraceInfo implements ISessionInfo { // ------------------------------------------------------------------------ /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ISessionInfo#getSessionState() + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ISessionInfo#getSessionState() */ @Override public TraceSessionState getSessionState() { @@ -88,7 +88,7 @@ public class SessionInfo extends TraceInfo implements ISessionInfo { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ISessionInfo#setSessionState(org.eclipse.linuxtools.internal.lttng.ui.views.control.model.TraceSessionState) + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ISessionInfo#setSessionState(org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.TraceSessionState) */ @Override public void setSessionState(TraceSessionState state) { @@ -97,7 +97,7 @@ public class SessionInfo extends TraceInfo implements ISessionInfo { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ISessionInfo#setSessionState(java.lang.String) + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ISessionInfo#setSessionState(java.lang.String) */ @Override public void setSessionState(String stateName) { @@ -110,7 +110,7 @@ public class SessionInfo extends TraceInfo implements ISessionInfo { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ISessionInfo#getSessionPath() + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ISessionInfo#getSessionPath() */ @Override public String getSessionPath() { @@ -119,7 +119,7 @@ public class SessionInfo extends TraceInfo implements ISessionInfo { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ISessionInfo#setSessionPath(java.lang.String) + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ISessionInfo#setSessionPath(java.lang.String) */ @Override public void setSessionPath(String path) { @@ -128,7 +128,7 @@ public class SessionInfo extends TraceInfo implements ISessionInfo { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ISessionInfo#getDomains() + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ISessionInfo#getDomains() */ @Override public IDomainInfo[] getDomains() { @@ -137,7 +137,7 @@ public class SessionInfo extends TraceInfo implements ISessionInfo { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ISessionInfo#setDomains(java.util.List) + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ISessionInfo#setDomains(java.util.List) */ @Override public void setDomains(List domains) { @@ -152,7 +152,7 @@ public class SessionInfo extends TraceInfo implements ISessionInfo { // ------------------------------------------------------------------------ /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ISessionInfo#addDomain(org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IDomainInfo) + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ISessionInfo#addDomain(org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IDomainInfo) */ @Override public void addDomain(IDomainInfo domainInfo) { @@ -161,7 +161,7 @@ public class SessionInfo extends TraceInfo implements ISessionInfo { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceInfo#formatString() + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceInfo#formatString() */ @Override @SuppressWarnings("nls") @@ -188,7 +188,7 @@ public class SessionInfo extends TraceInfo implements ISessionInfo { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceInfo#hashCode() + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceInfo#hashCode() */ @Override public int hashCode() { @@ -202,7 +202,7 @@ public class SessionInfo extends TraceInfo implements ISessionInfo { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceInfo#equals(java.lang.Object) + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceInfo#equals(java.lang.Object) */ @Override public boolean equals(Object obj) { @@ -238,7 +238,7 @@ public class SessionInfo extends TraceInfo implements ISessionInfo { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceInfo#toString() + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceInfo#toString() */ @SuppressWarnings("nls") @Override diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/impl/TargetNodeComponent.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TargetNodeComponent.java similarity index 80% rename from org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/impl/TargetNodeComponent.java rename to org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TargetNodeComponent.java index 1fb7d4601e..ab5b160a90 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/impl/TargetNodeComponent.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TargetNodeComponent.java @@ -9,7 +9,7 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl; +package org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl; import java.util.List; @@ -18,16 +18,16 @@ 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.lttng.ui.Activator; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.Messages; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceControlComponent; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.TargetNodeState; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.property.TargetNodePropertySource; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.remote.IRemoteSystemProxy; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.remote.RemoteSystemProxy; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.service.ICommandShell; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.service.ILttngControlService; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.service.LTTngControlService; +import org.eclipse.linuxtools.internal.lttng2.ui.Activator; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.Messages; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.TargetNodeState; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.property.TargetNodePropertySource; +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.ICommandShell; +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.rse.core.model.IHost; import org.eclipse.rse.core.model.IRSECallback; import org.eclipse.rse.core.subsystems.CommunicationsEvent; @@ -117,7 +117,7 @@ public class TargetNodeComponent extends TraceControlComponent implements ICommu // ------------------------------------------------------------------------ /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceControlComponent#getImage() + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceControlComponent#getImage() */ @Override public Image getImage() { @@ -129,7 +129,7 @@ public class TargetNodeComponent extends TraceControlComponent implements ICommu /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceControlComponent#getTargetNodeState() + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceControlComponent#getTargetNodeState() */ @Override public TargetNodeState getTargetNodeState() { @@ -138,7 +138,7 @@ public class TargetNodeComponent extends TraceControlComponent implements ICommu /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceControlComponent#setTargetNodeState(org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceControlComponent.TargetNodeState) + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceControlComponent#setTargetNodeState(org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent.TargetNodeState) */ @Override public void setTargetNodeState(TargetNodeState state) { @@ -148,7 +148,7 @@ public class TargetNodeComponent extends TraceControlComponent implements ICommu /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceControlComponent#getControlService() + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceControlComponent#getControlService() */ @Override public ILttngControlService getControlService() { @@ -157,7 +157,7 @@ public class TargetNodeComponent extends TraceControlComponent implements ICommu /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceControlComponent#setControlService(org.eclipse.linuxtools.internal.lttng.ui.views.control.service.ILttngControlService) + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceControlComponent#setControlService(org.eclipse.linuxtools.internal.lttng2.ui.views.control.service.ILttngControlService) */ @Override public void setControlService(ILttngControlService service) { @@ -166,7 +166,7 @@ public class TargetNodeComponent extends TraceControlComponent implements ICommu /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceControlComponent#getAdapter(java.lang.Class) + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceControlComponent#getAdapter(java.lang.Class) */ @SuppressWarnings("rawtypes") @Override @@ -231,7 +231,7 @@ public class TargetNodeComponent extends TraceControlComponent implements ICommu /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.TraceControlComponent#dispose() + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.TraceControlComponent#dispose() */ @Override public void dispose() { @@ -258,7 +258,8 @@ public class TargetNodeComponent extends TraceControlComponent implements ICommu }); } catch (Exception e) { setTargetNodeState(TargetNodeState.DISCONNECTED); - Activator.logError(Messages.TraceControl_ConnectionFailure + " (" + getName() + ").", e); //$NON-NLS-1$ //$NON-NLS-2$ + Activator.getDefault().getLog().log( + new Status(IStatus.ERROR, Activator.PLUGIN_ID, Messages.TraceControl_ConnectionFailure + " (" + getName() + "). \n" + e)); //$NON-NLS-1$ //$NON-NLS-2$ } } } @@ -272,7 +273,8 @@ public class TargetNodeComponent extends TraceControlComponent implements ICommu setTargetNodeState(TargetNodeState.DISCONNECTING); fRemoteProxy.disconnect(); } catch (Exception e) { - Activator.logError(Messages.TraceControl_DisconnectionFailure + getName(), e); + Activator.getDefault().getLog().log( + new Status(IStatus.ERROR, Activator.PLUGIN_ID, Messages.TraceControl_DisconnectionFailure + " (" + getName() + "). \n" + e)); //$NON-NLS-1$ //$NON-NLS-2$ } finally { handleDisconnected(); } @@ -342,7 +344,8 @@ public class TargetNodeComponent extends TraceControlComponent implements ICommu createControlService(); getConfigurationFromNode(); } catch (ExecutionException e) { - Activator.logError(Messages.TraceControl_ListSessionFailure, e); + Activator.getDefault().getLog().log( + new Status(IStatus.ERROR, Activator.PLUGIN_ID, Messages.TraceControl_ListSessionFailure + " (" + getName() + "). \n" + e)); //$NON-NLS-1$ //$NON-NLS-2$ } } diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/impl/TraceChannelComponent.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TraceChannelComponent.java similarity index 91% rename from org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/impl/TraceChannelComponent.java rename to org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TraceChannelComponent.java index 7019307c58..bf0438e037 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/impl/TraceChannelComponent.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TraceChannelComponent.java @@ -9,22 +9,22 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl; +package org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl; import java.util.List; import org.eclipse.core.commands.ExecutionException; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.NullProgressMonitor; -import org.eclipse.linuxtools.internal.lttng.ui.Activator; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.Messages; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IChannelInfo; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IEventInfo; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceControlComponent; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.LogLevelType; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.TraceEnablement; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.TraceLogLevel; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.property.TraceChannelPropertySource; +import org.eclipse.linuxtools.internal.lttng2.ui.Activator; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.Messages; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IChannelInfo; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IEventInfo; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.LogLevelType; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.TraceEnablement; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.TraceLogLevel; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.property.TraceChannelPropertySource; import org.eclipse.swt.graphics.Image; import org.eclipse.ui.views.properties.IPropertySource; @@ -81,7 +81,7 @@ public class TraceChannelComponent extends TraceControlComponent { // ------------------------------------------------------------------------ /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceControlComponent#getImage() + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceControlComponent#getImage() */ @Override public Image getImage() { @@ -211,7 +211,7 @@ public class TraceChannelComponent extends TraceControlComponent { } /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceControlComponent#getAdapter(java.lang.Class) + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceControlComponent#getAdapter(java.lang.Class) */ @SuppressWarnings("rawtypes") @Override diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/impl/TraceControlComponent.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TraceControlComponent.java similarity index 68% rename from org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/impl/TraceControlComponent.java rename to org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TraceControlComponent.java index d3a20e5ba1..cc040534b0 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/impl/TraceControlComponent.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TraceControlComponent.java @@ -9,18 +9,18 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl; +package org.eclipse.linuxtools.internal.lttng2.ui.views.control.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.lttng.ui.Activator; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceControlComponent; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceControlComponentChangedListener; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.TargetNodeState; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.service.ILttngControlService; +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.model.TargetNodeState; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.service.ILttngControlService; import org.eclipse.swt.graphics.Image; /** @@ -90,7 +90,7 @@ public class TraceControlComponent implements ITraceControlComponent { // ------------------------------------------------------------------------ /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceControlComponent#getName() + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent#getName() */ @Override public String getName() { @@ -99,7 +99,7 @@ public class TraceControlComponent implements ITraceControlComponent { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceControlComponent#setName(java.lang.String) + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent#setName(java.lang.String) */ @Override public void setName(String name) { @@ -108,7 +108,7 @@ public class TraceControlComponent implements ITraceControlComponent { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceControlComponent#getImage() + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent#getImage() */ @Override public Image getImage() { @@ -117,7 +117,7 @@ public class TraceControlComponent implements ITraceControlComponent { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceControlComponent#setImage(java.lang.String) + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent#setImage(java.lang.String) */ @Override public void setImage(String path) { @@ -126,7 +126,7 @@ public class TraceControlComponent implements ITraceControlComponent { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceControlComponent#setImage(org.eclipse.swt.graphics.Image) + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent#setImage(org.eclipse.swt.graphics.Image) */ @Override public void setImage(Image image) { @@ -135,7 +135,7 @@ public class TraceControlComponent implements ITraceControlComponent { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceControlComponent#getToolTip() + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent#getToolTip() */ @Override public String getToolTip() { @@ -144,7 +144,7 @@ public class TraceControlComponent implements ITraceControlComponent { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceControlComponent#setToolTip(java.lang.String) + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent#setToolTip(java.lang.String) */ @Override public void setToolTip(String toolTip) { @@ -153,7 +153,7 @@ public class TraceControlComponent implements ITraceControlComponent { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceControlComponent#getTargetNodeState() + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent#getTargetNodeState() */ @Override public TargetNodeState getTargetNodeState() { @@ -165,7 +165,7 @@ public class TraceControlComponent implements ITraceControlComponent { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceControlComponent#setTargetNodeState(org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceControlComponent.TargetNodeState) + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent#setTargetNodeState(org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent.TargetNodeState) */ @Override public void setTargetNodeState(TargetNodeState state) { @@ -176,7 +176,7 @@ public class TraceControlComponent implements ITraceControlComponent { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceControlComponent#getParent() + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent#getParent() */ @Override public ITraceControlComponent getParent() { @@ -185,7 +185,7 @@ public class TraceControlComponent implements ITraceControlComponent { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceControlComponent#setParent(org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceControlComponent) + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent#setParent(org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent) */ @Override public void setParent(ITraceControlComponent parent) { @@ -194,7 +194,7 @@ public class TraceControlComponent implements ITraceControlComponent { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceControlComponent#getChildren() + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent#getChildren() */ @Override public ITraceControlComponent[] getChildren() { @@ -203,7 +203,7 @@ public class TraceControlComponent implements ITraceControlComponent { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceControlComponent#setChildren(java.util.List) + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent#setChildren(java.util.List) */ @Override public void setChildren(List children) { @@ -215,7 +215,7 @@ public class TraceControlComponent implements ITraceControlComponent { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceControlComponent#getChild(java.lang.String) + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent#getChild(java.lang.String) */ @Override public ITraceControlComponent getChild(String name) { @@ -230,7 +230,7 @@ public class TraceControlComponent implements ITraceControlComponent { } /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceControlComponent#getChildren(java.lang.Class) + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent#getChildren(java.lang.Class) */ @Override public List getChildren(Class clazz) { @@ -247,7 +247,7 @@ public class TraceControlComponent implements ITraceControlComponent { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceControlComponent#getControlService() + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent#getControlService() */ @Override public ILttngControlService getControlService() { @@ -259,7 +259,7 @@ public class TraceControlComponent implements ITraceControlComponent { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceControlComponent#setControlService(org.eclipse.linuxtools.internal.lttng.ui.views.control.service.ILttngControlService) + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent#setControlService(org.eclipse.linuxtools.internal.lttng2.ui.views.control.service.ILttngControlService) */ @Override public void setControlService(ILttngControlService service) { @@ -273,7 +273,7 @@ public class TraceControlComponent implements ITraceControlComponent { // ------------------------------------------------------------------------ /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceControlComponent#dispose() + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent#dispose() */ @Override public void dispose() { @@ -282,7 +282,7 @@ public class TraceControlComponent implements ITraceControlComponent { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceControlComponent#addChild(org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceControlComponent) + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent#addChild(org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent) */ @Override public void addChild(ITraceControlComponent component) { @@ -294,7 +294,7 @@ public class TraceControlComponent implements ITraceControlComponent { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceControlComponent#removeChild(org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceControlComponent) + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent#removeChild(org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent) */ @Override public void removeChild(ITraceControlComponent component) { @@ -307,7 +307,7 @@ public class TraceControlComponent implements ITraceControlComponent { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceControlComponent#removeAllChildren() + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent#removeAllChildren() */ @Override public void removeAllChildren() { @@ -321,7 +321,7 @@ public class TraceControlComponent implements ITraceControlComponent { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceControlComponent#containsChild(java.lang.String) + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent#containsChild(java.lang.String) */ @Override public boolean containsChild(String name) { @@ -337,7 +337,7 @@ public class TraceControlComponent implements ITraceControlComponent { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceControlComponent#hasChildren() + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent#hasChildren() */ @Override public boolean hasChildren() { @@ -346,7 +346,7 @@ public class TraceControlComponent implements ITraceControlComponent { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceControlComponent#addComponentListener(org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceControlComponentChangedListener) + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent#addComponentListener(org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponentChangedListener) */ @Override public void addComponentListener(ITraceControlComponentChangedListener listener) { @@ -359,7 +359,7 @@ public class TraceControlComponent implements ITraceControlComponent { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceControlComponent#removeComponentListener(org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceControlComponentChangedListener) + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent#removeComponentListener(org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponentChangedListener) */ @Override public void removeComponentListener(ITraceControlComponentChangedListener listener) { @@ -372,7 +372,7 @@ public class TraceControlComponent implements ITraceControlComponent { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceControlComponent#fireCompenentAdded(org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceControlComponent, org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceControlComponent) + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent#fireCompenentAdded(org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent, org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent) */ @Override public void fireComponentAdded(ITraceControlComponent parent, ITraceControlComponent component) { @@ -393,7 +393,7 @@ public class TraceControlComponent implements ITraceControlComponent { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceControlComponent#fireCompenentRemoved(org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceControlComponent, org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceControlComponent) + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent#fireCompenentRemoved(org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent, org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent) */ @Override public void fireComponentRemoved(ITraceControlComponent parent, ITraceControlComponent component) { @@ -414,7 +414,7 @@ public class TraceControlComponent implements ITraceControlComponent { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceControlComponent#fireCompenentChanged(org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceControlComponent) + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent#fireCompenentChanged(org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent) */ @Override public void fireComponentChanged(ITraceControlComponent component) { diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/impl/TraceControlRoot.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TraceControlRoot.java similarity index 94% rename from org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/impl/TraceControlRoot.java rename to org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TraceControlRoot.java index bec0dc1106..8239cdbdeb 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/impl/TraceControlRoot.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TraceControlRoot.java @@ -9,7 +9,7 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl; +package org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl; /** diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/impl/TraceDomainComponent.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TraceDomainComponent.java similarity index 92% rename from org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/impl/TraceDomainComponent.java rename to org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TraceDomainComponent.java index 7ac9deedb7..c88f90a83c 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/impl/TraceDomainComponent.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TraceDomainComponent.java @@ -9,20 +9,20 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl; +package org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl; import java.util.List; import org.eclipse.core.commands.ExecutionException; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.NullProgressMonitor; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.Messages; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IChannelInfo; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IDomainInfo; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceControlComponent; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.LogLevelType; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.TraceLogLevel; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.property.TraceDomainPropertySource; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.Messages; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IChannelInfo; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IDomainInfo; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.LogLevelType; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.TraceLogLevel; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.property.TraceDomainPropertySource; import org.eclipse.ui.views.properties.IPropertySource; /** @@ -82,7 +82,7 @@ public class TraceDomainComponent extends TraceControlComponent { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceControlComponent#getAdapter(java.lang.Class) + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceControlComponent#getAdapter(java.lang.Class) */ @SuppressWarnings("rawtypes") @Override diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/impl/TraceEventComponent.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TraceEventComponent.java similarity index 85% rename from org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/impl/TraceEventComponent.java rename to org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TraceEventComponent.java index 297f9169fb..f67b3cff0c 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/impl/TraceEventComponent.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TraceEventComponent.java @@ -9,16 +9,16 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl; +package org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl; -import org.eclipse.linuxtools.internal.lttng.ui.Activator; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.Messages; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IEventInfo; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceControlComponent; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.TraceEnablement; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.TraceEventType; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.TraceLogLevel; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.property.TraceEventPropertySource; +import org.eclipse.linuxtools.internal.lttng2.ui.Activator; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.Messages; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IEventInfo; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.TraceEnablement; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.TraceEventType; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.TraceLogLevel; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.property.TraceEventPropertySource; import org.eclipse.swt.graphics.Image; import org.eclipse.ui.views.properties.IPropertySource; @@ -75,7 +75,7 @@ public class TraceEventComponent extends TraceControlComponent { // ------------------------------------------------------------------------ /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceControlComponent#getImage() + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceControlComponent#getImage() */ @Override public Image getImage() { @@ -164,7 +164,7 @@ public class TraceEventComponent extends TraceControlComponent { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceControlComponent#getAdapter(java.lang.Class) + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceControlComponent#getAdapter(java.lang.Class) */ @SuppressWarnings("rawtypes") @Override diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/impl/TraceInfo.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TraceInfo.java similarity index 88% rename from org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/impl/TraceInfo.java rename to org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TraceInfo.java index 47ff1cbecf..e26824b95f 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/impl/TraceInfo.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TraceInfo.java @@ -9,9 +9,9 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl; +package org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceInfo; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceInfo; /** * TraceInfo @@ -61,7 +61,7 @@ public class TraceInfo implements ITraceInfo { // ------------------------------------------------------------------------ /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceInfo#getName() + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceInfo#getName() */ @Override public String getName() { @@ -70,7 +70,7 @@ public class TraceInfo implements ITraceInfo { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceInfo#setName(java.lang.String) + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceInfo#setName(java.lang.String) */ @Override public void setName(String name) { @@ -79,7 +79,7 @@ public class TraceInfo implements ITraceInfo { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceInfo#formatString() + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceInfo#formatString() */ @Override public String formatString() { diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/impl/TraceProbeEventComponent.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TraceProbeEventComponent.java similarity index 88% rename from org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/impl/TraceProbeEventComponent.java rename to org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TraceProbeEventComponent.java index a2f65e147f..b795982617 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/impl/TraceProbeEventComponent.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TraceProbeEventComponent.java @@ -9,11 +9,11 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl; +package org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IEventInfo; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceControlComponent; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.property.TraceProbeEventPropertySource; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IEventInfo; +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.ui.views.properties.IPropertySource; @@ -64,7 +64,7 @@ public class TraceProbeEventComponent extends TraceEventComponent { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceControlComponent#getAdapter(java.lang.Class) + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceControlComponent#getAdapter(java.lang.Class) */ @SuppressWarnings("rawtypes") @Override diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/impl/TraceProviderGroup.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TraceProviderGroup.java similarity index 89% rename from org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/impl/TraceProviderGroup.java rename to org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TraceProviderGroup.java index 0fe949d41e..dce14be391 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/impl/TraceProviderGroup.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TraceProviderGroup.java @@ -9,7 +9,7 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl; +package org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl; import java.util.Iterator; import java.util.List; @@ -17,10 +17,10 @@ import java.util.List; import org.eclipse.core.commands.ExecutionException; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.NullProgressMonitor; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.Messages; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IBaseEventInfo; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceControlComponent; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IUstProviderInfo; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.Messages; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IBaseEventInfo; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IUstProviderInfo; /** * TraceProviderGroup diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/impl/TraceSessionComponent.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TraceSessionComponent.java similarity index 91% rename from org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/impl/TraceSessionComponent.java rename to org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TraceSessionComponent.java index 532925a38c..2203c73aed 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/impl/TraceSessionComponent.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TraceSessionComponent.java @@ -9,22 +9,22 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl; +package org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl; import java.util.List; import org.eclipse.core.commands.ExecutionException; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.NullProgressMonitor; -import org.eclipse.linuxtools.internal.lttng.ui.Activator; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.Messages; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IDomainInfo; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ISessionInfo; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceControlComponent; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.LogLevelType; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.TraceLogLevel; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.TraceSessionState; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.property.TraceSessionPropertySource; +import org.eclipse.linuxtools.internal.lttng2.ui.Activator; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.Messages; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IDomainInfo; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ISessionInfo; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.LogLevelType; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.TraceLogLevel; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.TraceSessionState; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.property.TraceSessionPropertySource; import org.eclipse.swt.graphics.Image; import org.eclipse.ui.views.properties.IPropertySource; @@ -94,7 +94,7 @@ public class TraceSessionComponent extends TraceControlComponent { // ------------------------------------------------------------------------ /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceControlComponent#getImage() + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceControlComponent#getImage() */ @Override public Image getImage() { @@ -164,7 +164,7 @@ public class TraceSessionComponent extends TraceControlComponent { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceControlComponent#getAdapter(java.lang.Class) + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceControlComponent#getAdapter(java.lang.Class) */ @SuppressWarnings("rawtypes") @Override diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/impl/TraceSessionGroup.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TraceSessionGroup.java similarity index 95% rename from org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/impl/TraceSessionGroup.java rename to org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TraceSessionGroup.java index 1be8633bdd..bfcee063f1 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/impl/TraceSessionGroup.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TraceSessionGroup.java @@ -9,13 +9,13 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl; +package org.eclipse.linuxtools.internal.lttng2.ui.views.control.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.lttng.ui.views.control.model.ISessionInfo; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceControlComponent; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ISessionInfo; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent; /** * TraceSessionGroup diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/impl/UstProviderComponent.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/UstProviderComponent.java similarity index 85% rename from org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/impl/UstProviderComponent.java rename to org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/UstProviderComponent.java index a16eb27d4c..4647d23533 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/impl/UstProviderComponent.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/UstProviderComponent.java @@ -10,12 +10,12 @@ * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl; +package org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IBaseEventInfo; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceControlComponent; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IUstProviderInfo; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.property.UstProviderPropertySource; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IBaseEventInfo; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IUstProviderInfo; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.property.UstProviderPropertySource; import org.eclipse.ui.views.properties.IPropertySource; /** @@ -91,7 +91,7 @@ public class UstProviderComponent extends TraceControlComponent { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceControlComponent#getAdapter(java.lang.Class) + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceControlComponent#getAdapter(java.lang.Class) */ @SuppressWarnings("rawtypes") @Override diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/impl/UstProviderInfo.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/UstProviderInfo.java similarity index 81% rename from org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/impl/UstProviderInfo.java rename to org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/UstProviderInfo.java index 3e5be8e54e..b730e1ef81 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/model/impl/UstProviderInfo.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/UstProviderInfo.java @@ -9,14 +9,14 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl; +package org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl; import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IBaseEventInfo; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IUstProviderInfo; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IBaseEventInfo; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IUstProviderInfo; /** * UstProviderInfo @@ -73,7 +73,7 @@ public class UstProviderInfo extends TraceInfo implements IUstProviderInfo { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IUstProviderInfo#getPid() + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IUstProviderInfo#getPid() */ @Override public int getPid() { @@ -82,7 +82,7 @@ public class UstProviderInfo extends TraceInfo implements IUstProviderInfo { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IUstProviderInfo#setPid(int) + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IUstProviderInfo#setPid(int) */ @Override public void setPid(int pid) { @@ -91,7 +91,7 @@ public class UstProviderInfo extends TraceInfo implements IUstProviderInfo { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IUstProviderInfo#getEvents() + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IUstProviderInfo#getEvents() */ @Override public IBaseEventInfo[] getEvents() { @@ -100,7 +100,7 @@ public class UstProviderInfo extends TraceInfo implements IUstProviderInfo { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IUstProviderInfo#setEvents(java.util.List) + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IUstProviderInfo#setEvents(java.util.List) */ @Override public void setEvents(List events) { @@ -112,7 +112,7 @@ public class UstProviderInfo extends TraceInfo implements IUstProviderInfo { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IUstProviderInfo#addEvent(org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IBaseEventInfo) + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IUstProviderInfo#addEvent(org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IBaseEventInfo) */ @Override public void addEvent(IBaseEventInfo event) { @@ -125,7 +125,7 @@ public class UstProviderInfo extends TraceInfo implements IUstProviderInfo { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ITraceInfo#formatString() + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceInfo#formatString() */ @SuppressWarnings("nls") @Override @@ -148,7 +148,7 @@ public class UstProviderInfo extends TraceInfo implements IUstProviderInfo { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceInfo#hashCode() + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceInfo#hashCode() */ @Override public int hashCode() { @@ -161,7 +161,7 @@ public class UstProviderInfo extends TraceInfo implements IUstProviderInfo { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceInfo#equals(java.lang.Object) + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceInfo#equals(java.lang.Object) */ @Override public boolean equals(Object obj) { @@ -190,7 +190,7 @@ public class UstProviderInfo extends TraceInfo implements IUstProviderInfo { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceInfo#toString() + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceInfo#toString() */ @SuppressWarnings("nls") @Override diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/property/BaseEventPropertySource.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/BaseEventPropertySource.java similarity index 87% rename from org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/property/BaseEventPropertySource.java rename to org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/BaseEventPropertySource.java index 18c277f813..3c55169f6a 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/property/BaseEventPropertySource.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/BaseEventPropertySource.java @@ -9,14 +9,14 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng.ui.views.control.property; +package org.eclipse.linuxtools.internal.lttng2.ui.views.control.property; import java.util.ArrayList; import java.util.List; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.Messages; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.TraceLogLevel; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.BaseEventComponent; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.Messages; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.TraceLogLevel; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.BaseEventComponent; import org.eclipse.ui.views.properties.IPropertyDescriptor; import org.eclipse.ui.views.properties.TextPropertyDescriptor; @@ -81,7 +81,7 @@ public class BaseEventPropertySource extends BasePropertySource { // ------------------------------------------------------------------------ /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.property.BasePropertySource#getPropertyDescriptors() + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.property.BasePropertySource#getPropertyDescriptors() */ @Override public IPropertyDescriptor[] getPropertyDescriptors() { @@ -96,7 +96,7 @@ public class BaseEventPropertySource extends BasePropertySource { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.property.BasePropertySource#getPropertyValue(java.lang.Object) + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.property.BasePropertySource#getPropertyValue(java.lang.Object) */ @Override public Object getPropertyValue(Object id) { diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/property/BasePropertySource.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/BasePropertySource.java similarity index 96% rename from org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/property/BasePropertySource.java rename to org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/BasePropertySource.java index a390174594..4b3fc0a58b 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/property/BasePropertySource.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/BasePropertySource.java @@ -9,7 +9,7 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng.ui.views.control.property; +package org.eclipse.linuxtools.internal.lttng2.ui.views.control.property; import org.eclipse.ui.views.properties.IPropertyDescriptor; import org.eclipse.ui.views.properties.IPropertySource; diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/property/KernelProviderPropertySource.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/KernelProviderPropertySource.java similarity index 84% rename from org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/property/KernelProviderPropertySource.java rename to org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/KernelProviderPropertySource.java index 7804f589aa..31694a2559 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/property/KernelProviderPropertySource.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/KernelProviderPropertySource.java @@ -9,10 +9,10 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng.ui.views.control.property; +package org.eclipse.linuxtools.internal.lttng2.ui.views.control.property; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.Messages; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.KernelProviderComponent; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.Messages; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.KernelProviderComponent; import org.eclipse.ui.views.properties.IPropertyDescriptor; import org.eclipse.ui.views.properties.TextPropertyDescriptor; @@ -60,7 +60,7 @@ public class KernelProviderPropertySource extends BasePropertySource { // ------------------------------------------------------------------------ /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.property.BasePropertySource#getPropertyDescriptors() + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.property.BasePropertySource#getPropertyDescriptors() */ @Override public IPropertyDescriptor[] getPropertyDescriptors() { @@ -70,7 +70,7 @@ public class KernelProviderPropertySource extends BasePropertySource { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.property.BasePropertySource#getPropertyValue(java.lang.Object) + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.property.BasePropertySource#getPropertyValue(java.lang.Object) */ @Override public Object getPropertyValue(Object id) { diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/property/TargetNodePropertySource.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/TargetNodePropertySource.java similarity index 88% rename from org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/property/TargetNodePropertySource.java rename to org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/TargetNodePropertySource.java index fda02c6b47..025766c0a5 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/property/TargetNodePropertySource.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/TargetNodePropertySource.java @@ -9,10 +9,10 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng.ui.views.control.property; +package org.eclipse.linuxtools.internal.lttng2.ui.views.control.property; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.Messages; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TargetNodeComponent; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.Messages; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TargetNodeComponent; import org.eclipse.ui.views.properties.IPropertyDescriptor; import org.eclipse.ui.views.properties.TextPropertyDescriptor; @@ -76,7 +76,7 @@ public class TargetNodePropertySource extends BasePropertySource { // ------------------------------------------------------------------------ /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.property.BasePropertySource#getPropertyDescriptors() + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.property.BasePropertySource#getPropertyDescriptors() */ @Override public IPropertyDescriptor[] getPropertyDescriptors() { @@ -88,7 +88,7 @@ public class TargetNodePropertySource extends BasePropertySource { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.property.BasePropertySource#getPropertyValue(java.lang.Object) + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.property.BasePropertySource#getPropertyValue(java.lang.Object) */ @Override public Object getPropertyValue(Object id) { diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/property/TraceChannelPropertySource.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/TraceChannelPropertySource.java similarity index 93% rename from org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/property/TraceChannelPropertySource.java rename to org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/TraceChannelPropertySource.java index 8c7e0bacf3..1243e3eead 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/property/TraceChannelPropertySource.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/TraceChannelPropertySource.java @@ -9,10 +9,10 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng.ui.views.control.property; +package org.eclipse.linuxtools.internal.lttng2.ui.views.control.property; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.Messages; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceChannelComponent; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.Messages; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceChannelComponent; import org.eclipse.ui.views.properties.IPropertyDescriptor; import org.eclipse.ui.views.properties.TextPropertyDescriptor; @@ -117,7 +117,7 @@ public class TraceChannelPropertySource extends BasePropertySource { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.property.BasePropertySource#getPropertyDescriptors() + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.property.BasePropertySource#getPropertyDescriptors() */ @Override public IPropertyDescriptor[] getPropertyDescriptors() { @@ -134,7 +134,7 @@ public class TraceChannelPropertySource extends BasePropertySource { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.property.BasePropertySource#getPropertyValue(java.lang.Object) + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.property.BasePropertySource#getPropertyValue(java.lang.Object) */ @Override public Object getPropertyValue(Object id) { diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/property/TraceDomainPropertySource.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/TraceDomainPropertySource.java similarity index 84% rename from org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/property/TraceDomainPropertySource.java rename to org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/TraceDomainPropertySource.java index 1da8d2ef9e..8b649c61c1 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/property/TraceDomainPropertySource.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/TraceDomainPropertySource.java @@ -9,10 +9,10 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng.ui.views.control.property; +package org.eclipse.linuxtools.internal.lttng2.ui.views.control.property; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.Messages; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceDomainComponent; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.Messages; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceDomainComponent; import org.eclipse.ui.views.properties.IPropertyDescriptor; import org.eclipse.ui.views.properties.TextPropertyDescriptor; @@ -61,7 +61,7 @@ public class TraceDomainPropertySource extends BasePropertySource { // ------------------------------------------------------------------------ /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.property.BasePropertySource#getPropertyDescriptors() + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.property.BasePropertySource#getPropertyDescriptors() */ @Override public IPropertyDescriptor[] getPropertyDescriptors() { @@ -71,7 +71,7 @@ public class TraceDomainPropertySource extends BasePropertySource { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.property.BasePropertySource#getPropertyValue(java.lang.Object) + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.property.BasePropertySource#getPropertyValue(java.lang.Object) */ @Override public Object getPropertyValue(Object id) { diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/property/TraceEventPropertySource.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/TraceEventPropertySource.java similarity index 88% rename from org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/property/TraceEventPropertySource.java rename to org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/TraceEventPropertySource.java index 8ff89be5c7..0a31ec3722 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/property/TraceEventPropertySource.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/TraceEventPropertySource.java @@ -9,14 +9,14 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng.ui.views.control.property; +package org.eclipse.linuxtools.internal.lttng2.ui.views.control.property; import java.util.ArrayList; import java.util.List; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.Messages; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.TraceLogLevel; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceEventComponent; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.Messages; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.TraceLogLevel; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceEventComponent; import org.eclipse.ui.views.properties.IPropertyDescriptor; import org.eclipse.ui.views.properties.TextPropertyDescriptor; @@ -88,7 +88,7 @@ public class TraceEventPropertySource extends BasePropertySource { // ------------------------------------------------------------------------ /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.property.BasePropertySource#getPropertyDescriptors() + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.property.BasePropertySource#getPropertyDescriptors() */ @Override public IPropertyDescriptor[] getPropertyDescriptors() { @@ -104,7 +104,7 @@ public class TraceEventPropertySource extends BasePropertySource { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.property.BasePropertySource#getPropertyValue(java.lang.Object) + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.property.BasePropertySource#getPropertyValue(java.lang.Object) */ @Override public Object getPropertyValue(Object id) { diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/property/TraceProbeEventPropertySource.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/TraceProbeEventPropertySource.java similarity index 89% rename from org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/property/TraceProbeEventPropertySource.java rename to org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/TraceProbeEventPropertySource.java index 8c1a8f14e3..d33938eeba 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/property/TraceProbeEventPropertySource.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/TraceProbeEventPropertySource.java @@ -9,14 +9,14 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng.ui.views.control.property; +package org.eclipse.linuxtools.internal.lttng2.ui.views.control.property; import java.util.ArrayList; import java.util.List; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.Messages; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceEventComponent; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceProbeEventComponent; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.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.ui.views.properties.IPropertyDescriptor; import org.eclipse.ui.views.properties.TextPropertyDescriptor; @@ -75,7 +75,7 @@ public class TraceProbeEventPropertySource extends TraceEventPropertySource { // ------------------------------------------------------------------------ /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.property.BasePropertySource#getPropertyDescriptors() + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.property.BasePropertySource#getPropertyDescriptors() */ @Override public IPropertyDescriptor[] getPropertyDescriptors() { @@ -104,7 +104,7 @@ public class TraceProbeEventPropertySource extends TraceEventPropertySource { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.property.BasePropertySource#getPropertyValue(java.lang.Object) + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.property.BasePropertySource#getPropertyValue(java.lang.Object) */ @Override public Object getPropertyValue(Object id) { diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/property/TraceSessionPropertySource.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/TraceSessionPropertySource.java similarity index 94% rename from org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/property/TraceSessionPropertySource.java rename to org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/TraceSessionPropertySource.java index 7f96e90e63..227fe23227 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/property/TraceSessionPropertySource.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/TraceSessionPropertySource.java @@ -9,10 +9,10 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng.ui.views.control.property; +package org.eclipse.linuxtools.internal.lttng2.ui.views.control.property; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.Messages; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.TraceSessionComponent; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.Messages; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceSessionComponent; import org.eclipse.ui.views.properties.IPropertyDescriptor; import org.eclipse.ui.views.properties.TextPropertyDescriptor; diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/property/UstProviderPropertySource.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/UstProviderPropertySource.java similarity index 86% rename from org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/property/UstProviderPropertySource.java rename to org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/UstProviderPropertySource.java index b0ab83058b..2221bf423c 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/property/UstProviderPropertySource.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/UstProviderPropertySource.java @@ -9,10 +9,10 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng.ui.views.control.property; +package org.eclipse.linuxtools.internal.lttng2.ui.views.control.property; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.Messages; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.UstProviderComponent; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.Messages; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.UstProviderComponent; import org.eclipse.ui.views.properties.IPropertyDescriptor; import org.eclipse.ui.views.properties.TextPropertyDescriptor; @@ -68,7 +68,7 @@ public class UstProviderPropertySource extends BasePropertySource { // ------------------------------------------------------------------------ /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.property.BasePropertySource#getPropertyDescriptors() + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.property.BasePropertySource#getPropertyDescriptors() */ @Override public IPropertyDescriptor[] getPropertyDescriptors() { @@ -79,7 +79,7 @@ public class UstProviderPropertySource extends BasePropertySource { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.property.BasePropertySource#getPropertyValue(java.lang.Object) + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.property.BasePropertySource#getPropertyValue(java.lang.Object) */ @Override public Object getPropertyValue(Object id) { diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/remote/IRemoteSystemProxy.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/remote/IRemoteSystemProxy.java similarity index 95% rename from org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/remote/IRemoteSystemProxy.java rename to org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/remote/IRemoteSystemProxy.java index 467b27ec46..697a5a1dd8 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/remote/IRemoteSystemProxy.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/remote/IRemoteSystemProxy.java @@ -9,10 +9,10 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng.ui.views.control.remote; +package org.eclipse.linuxtools.internal.lttng2.ui.views.control.remote; import org.eclipse.core.commands.ExecutionException; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.service.ICommandShell; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.service.ICommandShell; 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.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/remote/RemoteSystemProxy.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/remote/RemoteSystemProxy.java similarity index 79% rename from org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/remote/RemoteSystemProxy.java rename to org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/remote/RemoteSystemProxy.java index b2ae463fd6..b9f07836a2 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/remote/RemoteSystemProxy.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/remote/RemoteSystemProxy.java @@ -9,12 +9,12 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng.ui.views.control.remote; +package org.eclipse.linuxtools.internal.lttng2.ui.views.control.remote; import org.eclipse.core.commands.ExecutionException; import org.eclipse.core.runtime.Status; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.service.CommandShell; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.service.ICommandShell; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.service.CommandShell; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.service.ICommandShell; import org.eclipse.rse.core.model.IHost; import org.eclipse.rse.core.model.IRSECallback; import org.eclipse.rse.core.subsystems.ICommunicationsListener; @@ -49,7 +49,7 @@ public class RemoteSystemProxy implements IRemoteSystemProxy { // Operations // ------------------------------------------------------------------------ /* (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.util.IRemoteSystemProxy#getShellService(org.eclipse.rse.core.model.IHost) + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.util.IRemoteSystemProxy#getShellService(org.eclipse.rse.core.model.IHost) */ @Override public IShellService getShellService() { @@ -61,7 +61,7 @@ public class RemoteSystemProxy implements IRemoteSystemProxy { } /* (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.util.IRemoteSystemProxy#getTerminalService() + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.util.IRemoteSystemProxy#getTerminalService() */ @Override public ITerminalService getTerminalService() { @@ -73,7 +73,7 @@ public class RemoteSystemProxy implements IRemoteSystemProxy { } /* (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.util.IRemoteSystemProxy#getShellServiceSubSystem() + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.util.IRemoteSystemProxy#getShellServiceSubSystem() */ @Override public ISubSystem getShellServiceSubSystem() { @@ -95,7 +95,7 @@ public class RemoteSystemProxy implements IRemoteSystemProxy { } /* (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.util.IRemoteSystemProxy#getTerminalServiceSubSystem() + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.util.IRemoteSystemProxy#getTerminalServiceSubSystem() */ @Override public ISubSystem getTerminalServiceSubSystem() { @@ -118,7 +118,7 @@ public class RemoteSystemProxy implements IRemoteSystemProxy { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.remote.IRemoteSystemProxy#getFileServiceSubSystem() + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.remote.IRemoteSystemProxy#getFileServiceSubSystem() */ @Override public IFileServiceSubSystem getFileServiceSubSystem() { @@ -135,7 +135,7 @@ public class RemoteSystemProxy implements IRemoteSystemProxy { } /* (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.util.IRemoteSystemProxy#connect(org.eclipse.rse.core.model.IRSECallback) + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.util.IRemoteSystemProxy#connect(org.eclipse.rse.core.model.IRSECallback) */ @Override public void connect(IRSECallback callback) throws ExecutionException { @@ -154,7 +154,7 @@ public class RemoteSystemProxy implements IRemoteSystemProxy { } /* (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.util.IRemoteSystemProxy#disconnect() + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.util.IRemoteSystemProxy#disconnect() */ @Override public void disconnect() throws ExecutionException { @@ -169,7 +169,7 @@ public class RemoteSystemProxy implements IRemoteSystemProxy { } /* (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.util.IRemoteSystemProxy#createCommandShell() + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.util.IRemoteSystemProxy#createCommandShell() */ @Override public ICommandShell createCommandShell() throws ExecutionException { @@ -179,7 +179,7 @@ public class RemoteSystemProxy implements IRemoteSystemProxy { } /* (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.util.IRemoteSystemProxy#addCommunicationListener(org.eclipse.rse.core.subsystems.ICommunicationsListener) + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.util.IRemoteSystemProxy#addCommunicationListener(org.eclipse.rse.core.subsystems.ICommunicationsListener) */ @Override public void addCommunicationListener(ICommunicationsListener listener) { @@ -190,7 +190,7 @@ public class RemoteSystemProxy implements IRemoteSystemProxy { } /* (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.util.IRemoteSystemProxy#removeCommunicationListener(org.eclipse.rse.core.subsystems.ICommunicationsListener) + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.util.IRemoteSystemProxy#removeCommunicationListener(org.eclipse.rse.core.subsystems.ICommunicationsListener) */ @Override public void removeCommunicationListener(ICommunicationsListener listener) { diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/service/CommandResult.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/service/CommandResult.java similarity index 81% rename from org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/service/CommandResult.java rename to org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/service/CommandResult.java index a7f91ecb87..840bd47e06 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/service/CommandResult.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/service/CommandResult.java @@ -9,7 +9,7 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng.ui.views.control.service; +package org.eclipse.linuxtools.internal.lttng2.ui.views.control.service; import java.util.Arrays; @@ -49,7 +49,7 @@ public class CommandResult implements ICommandResult { // ------------------------------------------------------------------------ /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.service.ICommandResult#getResult() + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.service.ICommandResult#getResult() */ @Override public int getResult() { @@ -58,7 +58,7 @@ public class CommandResult implements ICommandResult { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.service.ICommandResult#setResult(int) + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.service.ICommandResult#setResult(int) */ @Override public void setResult(int result) { @@ -67,7 +67,7 @@ public class CommandResult implements ICommandResult { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.service.ICommandResult#getOutput() + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.service.ICommandResult#getOutput() */ @Override public String[] getOutput() { @@ -76,7 +76,7 @@ public class CommandResult implements ICommandResult { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.service.ICommandResult#setOutput(java.lang.String[]) + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.service.ICommandResult#setOutput(java.lang.String[]) */ @Override public void setOutput(String[] output) { diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/service/CommandShell.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/service/CommandShell.java similarity index 91% rename from org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/service/CommandShell.java rename to org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/service/CommandShell.java index f0be32936c..1e833019a6 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/service/CommandShell.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/service/CommandShell.java @@ -10,7 +10,7 @@ * Patrick Tasse - Initial API and implementation * Bernd Hufmann - Updated using Executor Framework **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng.ui.views.control.service; +package org.eclipse.linuxtools.internal.lttng2.ui.views.control.service; import java.io.BufferedReader; import java.io.IOException; @@ -27,8 +27,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.lttng.ui.views.control.Messages; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.remote.IRemoteSystemProxy; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.Messages; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.remote.IRemoteSystemProxy; import org.eclipse.rse.services.shells.HostShellProcessAdapter; import org.eclipse.rse.services.shells.IHostShell; import org.eclipse.rse.services.shells.IShellService; @@ -76,7 +76,7 @@ public class CommandShell implements ICommandShell { // ------------------------------------------------------------------------ /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.service.ICommandShell#connect() + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.service.ICommandShell#connect() */ @Override public void connect() throws ExecutionException { @@ -97,7 +97,7 @@ public class CommandShell implements ICommandShell { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.service.ICommandShell#disconnect() + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.service.ICommandShell#disconnect() */ @Override public void disconnect() { @@ -111,7 +111,7 @@ public class CommandShell implements ICommandShell { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.service.ICommandShell#executeCommand(java.lang.String, org.eclipse.core.runtime.IProgressMonitor) + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.service.ICommandShell#executeCommand(java.lang.String, org.eclipse.core.runtime.IProgressMonitor) */ @Override public ICommandResult executeCommand(String command, IProgressMonitor monitor) throws ExecutionException { @@ -120,7 +120,7 @@ public class CommandShell implements ICommandShell { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.service.ICommandShell#executeCommand(java.lang.String, org.eclipse.core.runtime.IProgressMonitor, boolean) + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.service.ICommandShell#executeCommand(java.lang.String, org.eclipse.core.runtime.IProgressMonitor, boolean) */ @Override public ICommandResult executeCommand(final String command, final IProgressMonitor monitor, final boolean checkReturnValue) throws ExecutionException { diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/service/ICommandResult.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/service/ICommandResult.java similarity index 93% rename from org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/service/ICommandResult.java rename to org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/service/ICommandResult.java index 172603b3fc..f64824d7f6 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/service/ICommandResult.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/service/ICommandResult.java @@ -9,7 +9,7 @@ * Contributors: * Bernd Hufmann - Initial API and implementation *********************************************************************/ -package org.eclipse.linuxtools.internal.lttng.ui.views.control.service; +package org.eclipse.linuxtools.internal.lttng2.ui.views.control.service; /** * IommandResult diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/service/ICommandShell.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/service/ICommandShell.java similarity index 96% rename from org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/service/ICommandShell.java rename to org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/service/ICommandShell.java index 1f85330282..95aabc6769 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/service/ICommandShell.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/service/ICommandShell.java @@ -9,7 +9,7 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng.ui.views.control.service; +package org.eclipse.linuxtools.internal.lttng2.ui.views.control.service; import org.eclipse.core.commands.ExecutionException; import org.eclipse.core.runtime.IProgressMonitor; diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/service/ILttngControlService.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/service/ILttngControlService.java similarity index 92% rename from org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/service/ILttngControlService.java rename to org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/service/ILttngControlService.java index 4554c270a9..2824c2f4b9 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/service/ILttngControlService.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/service/ILttngControlService.java @@ -9,18 +9,18 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng.ui.views.control.service; +package org.eclipse.linuxtools.internal.lttng2.ui.views.control.service; import java.util.List; import org.eclipse.core.commands.ExecutionException; import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IBaseEventInfo; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IChannelInfo; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ISessionInfo; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IUstProviderInfo; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.LogLevelType; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.TraceLogLevel; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IBaseEventInfo; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IChannelInfo; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ISessionInfo; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IUstProviderInfo; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.LogLevelType; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.TraceLogLevel; /** ILttngControlService diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/service/LTTngControlService.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/service/LTTngControlService.java similarity index 92% rename from org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/service/LTTngControlService.java rename to org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/service/LTTngControlService.java index 51dd0b653c..69aea44014 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/control/service/LTTngControlService.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/service/LTTngControlService.java @@ -9,7 +9,7 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng.ui.views.control.service; +package org.eclipse.linuxtools.internal.lttng2.ui.views.control.service; import java.util.ArrayList; import java.util.Iterator; @@ -20,24 +20,24 @@ import java.util.regex.Pattern; import org.eclipse.core.commands.ExecutionException; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.NullProgressMonitor; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.Messages; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IBaseEventInfo; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IChannelInfo; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IDomainInfo; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IEventInfo; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IProbeEventInfo; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.ISessionInfo; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IUstProviderInfo; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.LogLevelType; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.TraceEventType; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.TraceLogLevel; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.BaseEventInfo; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.ChannelInfo; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.DomainInfo; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.EventInfo; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.ProbeEventInfo; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.SessionInfo; -import org.eclipse.linuxtools.internal.lttng.ui.views.control.model.impl.UstProviderInfo; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.Messages; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IBaseEventInfo; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IChannelInfo; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IDomainInfo; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IEventInfo; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IProbeEventInfo; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ISessionInfo; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IUstProviderInfo; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.LogLevelType; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.TraceEventType; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.TraceLogLevel; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.BaseEventInfo; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.ChannelInfo; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.DomainInfo; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.EventInfo; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.ProbeEventInfo; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.SessionInfo; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.UstProviderInfo; /** * LTTngControlService @@ -311,7 +311,7 @@ public class LTTngControlService implements ILttngControlService { * (non-Javadoc) * * @see - * org.eclipse.linuxtools.internal.lttng.ui.views.control.service.ILttngControlService + * org.eclipse.linuxtools.internal.lttng2.ui.views.control.service.ILttngControlService * #getSessionNames(org.eclipse.core.runtime.IProgressMonitor) */ @Override @@ -350,7 +350,7 @@ public class LTTngControlService implements ILttngControlService { * (non-Javadoc) * * @see - * org.eclipse.linuxtools.internal.lttng.ui.views.control.service.ILttngControlService + * org.eclipse.linuxtools.internal.lttng2.ui.views.control.service.ILttngControlService * #getSession(java.lang.String, org.eclipse.core.runtime.IProgressMonitor) */ @Override @@ -435,7 +435,7 @@ public class LTTngControlService implements ILttngControlService { * (non-Javadoc) * * @see - * org.eclipse.linuxtools.internal.lttng.ui.views.control.service.ILttngControlService + * org.eclipse.linuxtools.internal.lttng2.ui.views.control.service.ILttngControlService * #getKernelProvider(org.eclipse.core.runtime.IProgressMonitor) */ @Override @@ -458,7 +458,7 @@ public class LTTngControlService implements ILttngControlService { * (non-Javadoc) * * @see - * org.eclipse.linuxtools.internal.lttng.ui.views.control.service.ILttngControlService + * org.eclipse.linuxtools.internal.lttng2.ui.views.control.service.ILttngControlService * #getUstProvider() */ @Override @@ -470,7 +470,7 @@ public class LTTngControlService implements ILttngControlService { * (non-Javadoc) * * @see - * org.eclipse.linuxtools.internal.lttng.ui.views.control.service.ILttngControlService + * org.eclipse.linuxtools.internal.lttng2.ui.views.control.service.ILttngControlService * #getUstProvider(org.eclipse.core.runtime.IProgressMonitor) */ @Override @@ -523,7 +523,7 @@ public class LTTngControlService implements ILttngControlService { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.service.ILttngControlService#createSession(java.lang.String, java.lang.String, org.eclipse.core.runtime.IProgressMonitor) + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.service.ILttngControlService#createSession(java.lang.String, java.lang.String, org.eclipse.core.runtime.IProgressMonitor) */ @Override public ISessionInfo createSession(String sessionName, String sessionPath, IProgressMonitor monitor) throws ExecutionException { @@ -608,7 +608,7 @@ public class LTTngControlService implements ILttngControlService { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.service.ILttngControlService#startSession(java.lang.String, org.eclipse.core.runtime.IProgressMonitor) + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.service.ILttngControlService#startSession(java.lang.String, org.eclipse.core.runtime.IProgressMonitor) */ @Override public void startSession(String sessionName, IProgressMonitor monitor) throws ExecutionException { @@ -627,7 +627,7 @@ public class LTTngControlService implements ILttngControlService { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.service.ILttngControlService#stopSession(java.lang.String, org.eclipse.core.runtime.IProgressMonitor) + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.service.ILttngControlService#stopSession(java.lang.String, org.eclipse.core.runtime.IProgressMonitor) */ @Override public void stopSession(String sessionName, IProgressMonitor monitor) throws ExecutionException { @@ -645,7 +645,7 @@ public class LTTngControlService implements ILttngControlService { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.service.ILttngControlService#enableChannel(java.lang.String, java.util.List, boolean, org.eclipse.linuxtools.internal.lttng.ui.views.control.model.IChannelInfo, org.eclipse.core.runtime.IProgressMonitor) + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.service.ILttngControlService#enableChannel(java.lang.String, java.util.List, boolean, org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IChannelInfo, org.eclipse.core.runtime.IProgressMonitor) */ @Override public void enableChannels(String sessionName, List channelNames, boolean isKernel, IChannelInfo info, IProgressMonitor monitor) throws ExecutionException { @@ -711,7 +711,7 @@ public class LTTngControlService implements ILttngControlService { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.service.ILttngControlService#disableChannel(java.lang.String, java.util.List, org.eclipse.core.runtime.IProgressMonitor) + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.service.ILttngControlService#disableChannel(java.lang.String, java.util.List, org.eclipse.core.runtime.IProgressMonitor) */ @Override public void disableChannels(String sessionName, List channelNames, boolean isKernel, IProgressMonitor monitor) throws ExecutionException { @@ -751,7 +751,7 @@ public class LTTngControlService implements ILttngControlService { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.service.ILttngControlService#enableEvent(java.lang.String, java.lang.String, java.util.List, boolean, org.eclipse.core.runtime.IProgressMonitor) + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.service.ILttngControlService#enableEvent(java.lang.String, java.lang.String, java.util.List, boolean, org.eclipse.core.runtime.IProgressMonitor) */ @Override public void enableEvents(String sessionName, String channelName, List eventNames, boolean isKernel, IProgressMonitor monitor) throws ExecutionException { @@ -798,7 +798,7 @@ public class LTTngControlService implements ILttngControlService { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.service.ILttngControlService#enableSyscalls(java.lang.String, java.lang.String, org.eclipse.core.runtime.IProgressMonitor) + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.service.ILttngControlService#enableSyscalls(java.lang.String, java.lang.String, org.eclipse.core.runtime.IProgressMonitor) */ @Override public void enableSyscalls(String sessionName, String channelName, IProgressMonitor monitor) throws ExecutionException { @@ -828,7 +828,7 @@ public class LTTngControlService implements ILttngControlService { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.service.ILttngControlService#enableProbe(java.lang.String, java.lang.String, java.lang.String, java.lang.String, org.eclipse.core.runtime.IProgressMonitor) + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.service.ILttngControlService#enableProbe(java.lang.String, java.lang.String, java.lang.String, java.lang.String, org.eclipse.core.runtime.IProgressMonitor) */ @Override public void enableProbe(String sessionName, String channelName, String eventName, boolean isFunction, String probe, IProgressMonitor monitor) throws ExecutionException { @@ -863,7 +863,7 @@ public class LTTngControlService implements ILttngControlService { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.service.ILttngControlService#enableLogLevel(java.lang.String, java.lang.String, java.lang.String, org.eclipse.linuxtools.internal.lttng.ui.views.control.model.LogLevelType, org.eclipse.linuxtools.internal.lttng.ui.views.control.model.TraceLogLevel, org.eclipse.core.runtime.IProgressMonitor) + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.service.ILttngControlService#enableLogLevel(java.lang.String, java.lang.String, java.lang.String, org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.LogLevelType, org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.TraceLogLevel, org.eclipse.core.runtime.IProgressMonitor) */ @Override public void enableLogLevel(String sessionName, String channelName, String eventName, LogLevelType logLevelType, TraceLogLevel level, IProgressMonitor monitor) throws ExecutionException { @@ -901,7 +901,7 @@ public class LTTngControlService implements ILttngControlService { /* * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng.ui.views.control.service.ILttngControlService#disableEvent(java.lang.String, java.lang.String, java.util.List, boolean, org.eclipse.core.runtime.IProgressMonitor) + * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.service.ILttngControlService#disableEvent(java.lang.String, java.lang.String, java.util.List, boolean, org.eclipse.core.runtime.IProgressMonitor) */ @Override public void disableEvent(String sessionName, String channelName, List eventNames, boolean isKernel, IProgressMonitor monitor) throws ExecutionException { -- 2.34.1