From 9315aeeef150e462551af3dcd5eb20f370a6942f Mon Sep 17 00:00:00 2001 From: Bernd Hufmann Date: Fri, 4 May 2012 13:33:27 -0400 Subject: [PATCH] Improve package tangle index for LTTng 2.0 control design --- .../lttng2/core/tests/AllTests.java | 1 + .../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/ModelImplFactory.java | 40 +++++----- .../model/impl/ProbeEventInfoTest.java | 12 +-- .../control/model/impl/SessionInfoTest.java | 10 +-- .../control/model/impl/TraceInfoTest.java | 6 +- .../model/impl/UstProviderInfoTest.java | 10 +-- .../META-INF/MANIFEST.MF | 2 + .../core}/control/model/IBaseEventInfo.java | 2 +- .../core}/control/model/IChannelInfo.java | 2 +- .../core}/control/model/IDomainInfo.java | 2 +- .../core}/control/model/IEventInfo.java | 2 +- .../core}/control/model/IProbeEventInfo.java | 2 +- .../core}/control/model/ISessionInfo.java | 2 +- .../core}/control/model/ITraceInfo.java | 2 +- .../core}/control/model/IUstProviderInfo.java | 2 +- .../core}/control/model/LogLevelType.java | 2 +- .../core}/control/model/TargetNodeState.java | 2 +- .../core}/control/model/TraceEnablement.java | 2 +- .../core}/control/model/TraceEventType.java | 2 +- .../core}/control/model/TraceLogLevel.java | 2 +- .../control/model/TraceSessionState.java | 2 +- .../control/model/impl/BaseEventInfo.java | 8 +- .../core}/control/model/impl/ChannelInfo.java | 8 +- .../core}/control/model/impl/DomainInfo.java | 6 +- .../core}/control/model/impl/EventInfo.java | 6 +- .../control/model/impl/ProbeEventInfo.java | 4 +- .../core}/control/model/impl/SessionInfo.java | 8 +- .../core}/control/model/impl/TraceInfo.java | 4 +- .../control/model/impl/UstProviderInfo.java | 6 +- .../linuxtools/lttng2/ui/tests/AllTests.java | 2 - .../ListenerValidator.java | 2 +- .../component/TraceControlComponentTest.java | 3 +- .../TraceControlKernelProviderTests.java | 10 +-- .../TraceControlKernelSessionTests.java | 12 +-- .../component/TraceControlPropertiesTest.java | 12 +-- .../component/TraceControlTreeModelTest.java | 10 +-- .../TraceControlUstProviderTests.java | 10 +-- .../TraceControlUstSessionTests.java | 14 ++-- .../service/LTTngControlServiceTest.java | 24 +++--- .../dialogs/EnableChannelDialogStub.java | 4 +- .../stubs/dialogs/EnableEventsDialogStub.java | 4 +- .../stubs/service/TestRemoteSystemProxy.java | 2 +- .../stubs/shells/LTTngToolsFileShell.java | 4 +- .../lttng2/stubs/shells/TestCommandShell.java | 6 +- .../internal/lttng2/ui/Activator.java | 2 +- .../lttng2/ui/views/control/ControlView.java | 2 + .../control/dialogs/AddContextDialog.java | 2 +- .../views/control/dialogs/ConfirmDialog.java | 2 +- .../control/dialogs/CreateSessionDialog.java | 2 +- .../control/dialogs/EnableChannelDialog.java | 6 +- .../control/dialogs/EnableEventsDialog.java | 6 +- .../dialogs/EnableKernelEventComposite.java | 6 +- .../dialogs/EnableUstEventsComposite.java | 10 +-- .../control/dialogs/GetEventInfoDialog.java | 2 +- .../control/dialogs/IEnableChannelDialog.java | 2 +- .../control/dialogs/IEnableUstEvents.java | 4 +- .../dialogs/ImportConfirmationDialog.java | 2 +- .../views/control/dialogs/ImportDialog.java | 2 +- .../control/dialogs/NewConnectionDialog.java | 2 +- .../handlers/AddContextOnChannelHandler.java | 2 +- .../handlers/AddContextOnDomainHandler.java | 2 +- .../handlers/AddContextOnEventHandler.java | 2 +- .../control/handlers/AssignEventHandler.java | 2 +- .../handlers/BaseAddContextHandler.java | 2 +- .../handlers/BaseControlViewHandler.java | 2 +- .../handlers/BaseEnableChannelHandler.java | 4 +- .../handlers/BaseEnableEventHandler.java | 6 +- .../control/handlers/CalibrateHandler.java | 2 +- .../handlers/ChangeChannelStateHandler.java | 4 +- .../handlers/ChangeEventStateHandler.java | 4 +- .../handlers/ChangeSessionStateHandler.java | 4 +- .../control/handlers/ConnectHandler.java | 2 +- .../handlers/CreateSessionHandler.java | 2 +- .../views/control/handlers/DeleteHandler.java | 2 +- .../handlers/DestroySessionHandler.java | 4 +- .../handlers/DisableChannelHandler.java | 2 +- .../control/handlers/DisableEventHandler.java | 2 +- .../control/handlers/DisconnectHandler.java | 2 +- .../handlers/EnableChannelHandler.java | 2 +- .../EnableChannelOnDomainHandler.java | 4 +- .../EnableChannelOnSessionHandler.java | 4 +- .../control/handlers/EnableEventHandler.java | 2 +- .../handlers/EnableEventOnChannelHandler.java | 4 +- .../handlers/EnableEventOnDomainHandler.java | 6 +- .../handlers/EnableEventOnSessionHandler.java | 6 +- .../views/control/handlers/ImportHandler.java | 4 +- .../handlers/NewConnectionHandler.java | 2 +- .../control/handlers/RefreshHandler.java | 2 +- .../views/control/handlers/StartHandler.java | 2 +- .../views/control/handlers/StopHandler.java | 2 +- .../control/{ => messages}/Messages.java | 4 +- .../{ => messages}/messages.properties | 0 .../control/model/ITraceControlComponent.java | 1 + .../model/impl/BaseEventComponent.java | 7 +- .../model/impl/KernelProviderComponent.java | 4 +- .../model/impl/TargetNodeComponent.java | 6 +- .../model/impl/TraceChannelComponent.java | 14 ++-- .../model/impl/TraceControlComponent.java | 2 +- .../impl}/TraceControlContentProvider.java | 2 +- .../impl}/TraceControlLabelProvider.java | 2 +- .../model/impl/TraceDomainComponent.java | 11 +-- .../model/impl/TraceEventComponent.java | 11 +-- .../model/impl/TraceProbeEventComponent.java | 3 +- .../model/impl/TraceProviderGroup.java | 6 +- .../model/impl/TraceSessionComponent.java | 15 ++-- .../control/model/impl/TraceSessionGroup.java | 2 +- .../model/impl/UstProviderComponent.java | 7 +- .../ControlPreferenceInitializer.java | 4 +- .../preferences/ControlPreferencePage.java | 5 +- .../preferences/ControlPreferences.java | 78 +++++++++++++++---- .../property/BaseEventPropertySource.java | 4 +- .../KernelProviderPropertySource.java | 2 +- .../property/TargetNodePropertySource.java | 2 +- .../property/TraceChannelPropertySource.java | 2 +- .../property/TraceDomainPropertySource.java | 2 +- .../property/TraceEventPropertySource.java | 4 +- .../TraceProbeEventPropertySource.java | 2 +- .../property/TraceSessionPropertySource.java | 2 +- .../property/UstProviderPropertySource.java | 2 +- .../{service => remote}/CommandResult.java | 2 +- .../{service => remote}/CommandShell.java | 5 +- .../{service => remote}/ICommandResult.java | 2 +- .../{service => remote}/ICommandShell.java | 2 +- .../control/remote/IRemoteSystemProxy.java | 1 - .../control/remote/RemoteSystemProxy.java | 2 - .../control/service/ILttngControlService.java | 12 +-- .../control/service/LTTngControlService.java | 38 ++++----- .../service/LTTngControlServiceFactory.java | 4 +- 133 files changed, 400 insertions(+), 340 deletions(-) rename {org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui => org.eclipse.linuxtools.lttng2.core.tests/src/org/eclipse/linuxtools/lttng2/core}/tests/control/model/impl/AllTests.java (94%) rename {org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui => org.eclipse.linuxtools.lttng2.core.tests/src/org/eclipse/linuxtools/lttng2/core}/tests/control/model/impl/BaseEventInfoTest.java (97%) rename {org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui => org.eclipse.linuxtools.lttng2.core.tests/src/org/eclipse/linuxtools/lttng2/core}/tests/control/model/impl/ChannelInfoTest.java (95%) rename {org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui => org.eclipse.linuxtools.lttng2.core.tests/src/org/eclipse/linuxtools/lttng2/core}/tests/control/model/impl/DomainInfoTest.java (95%) rename {org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui => org.eclipse.linuxtools.lttng2.core.tests/src/org/eclipse/linuxtools/lttng2/core}/tests/control/model/impl/EventInfoTest.java (94%) rename {org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui => org.eclipse.linuxtools.lttng2.core.tests/src/org/eclipse/linuxtools/lttng2/core}/tests/control/model/impl/ModelImplFactory.java (78%) rename {org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui => org.eclipse.linuxtools.lttng2.core.tests/src/org/eclipse/linuxtools/lttng2/core}/tests/control/model/impl/ProbeEventInfoTest.java (93%) rename {org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui => org.eclipse.linuxtools.lttng2.core.tests/src/org/eclipse/linuxtools/lttng2/core}/tests/control/model/impl/SessionInfoTest.java (95%) rename {org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui => org.eclipse.linuxtools.lttng2.core.tests/src/org/eclipse/linuxtools/lttng2/core}/tests/control/model/impl/TraceInfoTest.java (95%) rename {org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui => org.eclipse.linuxtools.lttng2.core.tests/src/org/eclipse/linuxtools/lttng2/core}/tests/control/model/impl/UstProviderInfoTest.java (95%) rename {org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views => org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core}/control/model/IBaseEventInfo.java (95%) rename {org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views => org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core}/control/model/IChannelInfo.java (98%) rename {org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views => org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core}/control/model/IDomainInfo.java (95%) rename {org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views => org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core}/control/model/IEventInfo.java (94%) rename {org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views => org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core}/control/model/IProbeEventInfo.java (95%) rename {org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views => org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core}/control/model/ISessionInfo.java (96%) rename {org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views => org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core}/control/model/ITraceInfo.java (92%) rename {org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views => org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core}/control/model/IUstProviderInfo.java (95%) rename {org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views => org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core}/control/model/LogLevelType.java (92%) rename {org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views => org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core}/control/model/TargetNodeState.java (90%) rename {org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views => org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core}/control/model/TraceEnablement.java (96%) rename {org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views => org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core}/control/model/TraceEventType.java (93%) rename {org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views => org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core}/control/model/TraceLogLevel.java (97%) rename {org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views => org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core}/control/model/TraceSessionState.java (96%) rename {org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views => org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core}/control/model/impl/BaseEventInfo.java (95%) rename {org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views => org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core}/control/model/impl/ChannelInfo.java (97%) rename {org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views => org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core}/control/model/impl/DomainInfo.java (95%) rename {org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views => org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core}/control/model/impl/EventInfo.java (94%) rename {org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views => org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core}/control/model/impl/ProbeEventInfo.java (97%) rename {org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views => org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core}/control/model/impl/SessionInfo.java (95%) rename {org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views => org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core}/control/model/impl/TraceInfo.java (95%) rename {org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views => org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core}/control/model/impl/UstProviderInfo.java (96%) rename org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/{impl => component}/ListenerValidator.java (97%) rename org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/{ => messages}/Messages.java (98%) rename org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/{ => messages}/messages.properties (100%) rename org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/{ => model/impl}/TraceControlContentProvider.java (97%) rename org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/{ => model/impl}/TraceControlLabelProvider.java (96%) rename org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/{service => remote}/CommandResult.java (99%) rename org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/{service => remote}/CommandShell.java (98%) rename org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/{service => remote}/ICommandResult.java (99%) rename org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/{service => remote}/ICommandShell.java (99%) diff --git a/org.eclipse.linuxtools.lttng2.core.tests/src/org/eclipse/linuxtools/lttng2/core/tests/AllTests.java b/org.eclipse.linuxtools.lttng2.core.tests/src/org/eclipse/linuxtools/lttng2/core/tests/AllTests.java index facf0c3d51..cce041eae1 100644 --- a/org.eclipse.linuxtools.lttng2.core.tests/src/org/eclipse/linuxtools/lttng2/core/tests/AllTests.java +++ b/org.eclipse.linuxtools.lttng2.core.tests/src/org/eclipse/linuxtools/lttng2/core/tests/AllTests.java @@ -27,6 +27,7 @@ public class AllTests { // Plug-in suite.addTestSuite(ActivatorTest.class); + suite.addTest(org.eclipse.linuxtools.lttng2.core.tests.control.model.impl.AllTests.suite()); // $JUnit-END$ return suite; diff --git a/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/impl/AllTests.java b/org.eclipse.linuxtools.lttng2.core.tests/src/org/eclipse/linuxtools/lttng2/core/tests/control/model/impl/AllTests.java similarity index 94% rename from org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/impl/AllTests.java rename to org.eclipse.linuxtools.lttng2.core.tests/src/org/eclipse/linuxtools/lttng2/core/tests/control/model/impl/AllTests.java index 75ec977233..bce587572b 100644 --- a/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/impl/AllTests.java +++ b/org.eclipse.linuxtools.lttng2.core.tests/src/org/eclipse/linuxtools/lttng2/core/tests/control/model/impl/AllTests.java @@ -9,7 +9,7 @@ * Contributors: * Bernd Hufmann - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.lttng2.ui.tests.control.model.impl; +package org.eclipse.linuxtools.lttng2.core.tests.control.model.impl; import junit.framework.Test; import junit.framework.TestSuite; diff --git a/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/impl/BaseEventInfoTest.java b/org.eclipse.linuxtools.lttng2.core.tests/src/org/eclipse/linuxtools/lttng2/core/tests/control/model/impl/BaseEventInfoTest.java similarity index 97% rename from org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/impl/BaseEventInfoTest.java rename to org.eclipse.linuxtools.lttng2.core.tests/src/org/eclipse/linuxtools/lttng2/core/tests/control/model/impl/BaseEventInfoTest.java index f53f536245..40f882af7f 100644 --- a/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/impl/BaseEventInfoTest.java +++ b/org.eclipse.linuxtools.lttng2.core.tests/src/org/eclipse/linuxtools/lttng2/core/tests/control/model/impl/BaseEventInfoTest.java @@ -9,14 +9,14 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.lttng2.ui.tests.control.model.impl; +package org.eclipse.linuxtools.lttng2.core.tests.control.model.impl; import junit.framework.TestCase; -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; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.IBaseEventInfo; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceEventType; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceLogLevel; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.impl.BaseEventInfo; /** * The class BaseEventInfoTest contains test for the class {@link BaseEventInfo}. diff --git a/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/impl/ChannelInfoTest.java b/org.eclipse.linuxtools.lttng2.core.tests/src/org/eclipse/linuxtools/lttng2/core/tests/control/model/impl/ChannelInfoTest.java similarity index 95% rename from org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/impl/ChannelInfoTest.java rename to org.eclipse.linuxtools.lttng2.core.tests/src/org/eclipse/linuxtools/lttng2/core/tests/control/model/impl/ChannelInfoTest.java index dd4f053b4e..c3bb233af2 100644 --- a/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/impl/ChannelInfoTest.java +++ b/org.eclipse.linuxtools.lttng2.core.tests/src/org/eclipse/linuxtools/lttng2/core/tests/control/model/impl/ChannelInfoTest.java @@ -9,18 +9,18 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.lttng2.ui.tests.control.model.impl; +package org.eclipse.linuxtools.lttng2.core.tests.control.model.impl; import java.util.LinkedList; import java.util.List; import junit.framework.TestCase; -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; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.IChannelInfo; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.IEventInfo; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceEnablement; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.impl.ChannelInfo; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.impl.EventInfo; /** * The class ChannelInfoTest contains tests for the class {@link ChannelInfo}. diff --git a/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/impl/DomainInfoTest.java b/org.eclipse.linuxtools.lttng2.core.tests/src/org/eclipse/linuxtools/lttng2/core/tests/control/model/impl/DomainInfoTest.java similarity index 95% rename from org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/impl/DomainInfoTest.java rename to org.eclipse.linuxtools.lttng2.core.tests/src/org/eclipse/linuxtools/lttng2/core/tests/control/model/impl/DomainInfoTest.java index 4b77c6b74b..e3be27aa56 100644 --- a/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/impl/DomainInfoTest.java +++ b/org.eclipse.linuxtools.lttng2.core.tests/src/org/eclipse/linuxtools/lttng2/core/tests/control/model/impl/DomainInfoTest.java @@ -9,16 +9,16 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.lttng2.ui.tests.control.model.impl; +package org.eclipse.linuxtools.lttng2.core.tests.control.model.impl; import java.util.LinkedList; import java.util.List; import junit.framework.TestCase; -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; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.IChannelInfo; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.IDomainInfo; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.impl.DomainInfo; /** * The class ChannelInfoTest contains tests for the class {@link DomainInfo}. diff --git a/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/impl/EventInfoTest.java b/org.eclipse.linuxtools.lttng2.core.tests/src/org/eclipse/linuxtools/lttng2/core/tests/control/model/impl/EventInfoTest.java similarity index 94% rename from org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/impl/EventInfoTest.java rename to org.eclipse.linuxtools.lttng2.core.tests/src/org/eclipse/linuxtools/lttng2/core/tests/control/model/impl/EventInfoTest.java index f64fd63754..0a171a0ae0 100644 --- a/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/impl/EventInfoTest.java +++ b/org.eclipse.linuxtools.lttng2.core.tests/src/org/eclipse/linuxtools/lttng2/core/tests/control/model/impl/EventInfoTest.java @@ -9,15 +9,15 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.lttng2.ui.tests.control.model.impl; +package org.eclipse.linuxtools.lttng2.core.tests.control.model.impl; import junit.framework.TestCase; -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; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.IEventInfo; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceEnablement; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceEventType; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.impl.BaseEventInfo; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.impl.EventInfo; /** * The class BaseEventInfoTest contains test for the class {@link BaseEventInfo}. diff --git a/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/impl/ModelImplFactory.java b/org.eclipse.linuxtools.lttng2.core.tests/src/org/eclipse/linuxtools/lttng2/core/tests/control/model/impl/ModelImplFactory.java similarity index 78% rename from org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/impl/ModelImplFactory.java rename to org.eclipse.linuxtools.lttng2.core.tests/src/org/eclipse/linuxtools/lttng2/core/tests/control/model/impl/ModelImplFactory.java index 84a73eba4d..3dad415bcd 100644 --- a/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/impl/ModelImplFactory.java +++ b/org.eclipse.linuxtools.lttng2.core.tests/src/org/eclipse/linuxtools/lttng2/core/tests/control/model/impl/ModelImplFactory.java @@ -9,26 +9,26 @@ * Contributors: * Bernd Hufmann - Initial API and implementation *******************************************************************************/ -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; +package org.eclipse.linuxtools.lttng2.core.tests.control.model.impl; + +import org.eclipse.linuxtools.internal.lttng2.core.control.model.IBaseEventInfo; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.IChannelInfo; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.IDomainInfo; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.IEventInfo; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.IProbeEventInfo; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.ISessionInfo; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.IUstProviderInfo; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceEnablement; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceEventType; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceLogLevel; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceSessionState; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.impl.BaseEventInfo; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.impl.ChannelInfo; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.impl.DomainInfo; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.impl.EventInfo; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.impl.ProbeEventInfo; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.impl.SessionInfo; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.impl.UstProviderInfo; /** * Test facility to constants across test case diff --git a/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/impl/ProbeEventInfoTest.java b/org.eclipse.linuxtools.lttng2.core.tests/src/org/eclipse/linuxtools/lttng2/core/tests/control/model/impl/ProbeEventInfoTest.java similarity index 93% rename from org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/impl/ProbeEventInfoTest.java rename to org.eclipse.linuxtools.lttng2.core.tests/src/org/eclipse/linuxtools/lttng2/core/tests/control/model/impl/ProbeEventInfoTest.java index 022087f6e5..5b8fac676d 100644 --- a/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/impl/ProbeEventInfoTest.java +++ b/org.eclipse.linuxtools.lttng2.core.tests/src/org/eclipse/linuxtools/lttng2/core/tests/control/model/impl/ProbeEventInfoTest.java @@ -9,15 +9,15 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.lttng2.ui.tests.control.model.impl; +package org.eclipse.linuxtools.lttng2.core.tests.control.model.impl; import junit.framework.TestCase; -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.ProbeEventInfo; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.IProbeEventInfo; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceEnablement; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceEventType; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.impl.BaseEventInfo; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.impl.ProbeEventInfo; /** * The class BaseEventInfoTest contains test for the class {@link BaseEventInfo}. diff --git a/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/impl/SessionInfoTest.java b/org.eclipse.linuxtools.lttng2.core.tests/src/org/eclipse/linuxtools/lttng2/core/tests/control/model/impl/SessionInfoTest.java similarity index 95% rename from org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/impl/SessionInfoTest.java rename to org.eclipse.linuxtools.lttng2.core.tests/src/org/eclipse/linuxtools/lttng2/core/tests/control/model/impl/SessionInfoTest.java index e72703fba2..730214610e 100644 --- a/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/impl/SessionInfoTest.java +++ b/org.eclipse.linuxtools.lttng2.core.tests/src/org/eclipse/linuxtools/lttng2/core/tests/control/model/impl/SessionInfoTest.java @@ -9,17 +9,17 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.lttng2.ui.tests.control.model.impl; +package org.eclipse.linuxtools.lttng2.core.tests.control.model.impl; import java.util.LinkedList; import java.util.List; import junit.framework.TestCase; -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; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.IDomainInfo; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.ISessionInfo; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceSessionState; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.impl.SessionInfo; /** * The class ChannelInfoTest contains tests for the class {@link SessionInfo}. diff --git a/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/impl/TraceInfoTest.java b/org.eclipse.linuxtools.lttng2.core.tests/src/org/eclipse/linuxtools/lttng2/core/tests/control/model/impl/TraceInfoTest.java similarity index 95% rename from org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/impl/TraceInfoTest.java rename to org.eclipse.linuxtools.lttng2.core.tests/src/org/eclipse/linuxtools/lttng2/core/tests/control/model/impl/TraceInfoTest.java index dae33be769..b1902f74fb 100644 --- a/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/impl/TraceInfoTest.java +++ b/org.eclipse.linuxtools.lttng2.core.tests/src/org/eclipse/linuxtools/lttng2/core/tests/control/model/impl/TraceInfoTest.java @@ -9,12 +9,12 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.lttng2.ui.tests.control.model.impl; +package org.eclipse.linuxtools.lttng2.core.tests.control.model.impl; import junit.framework.TestCase; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceInfo; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceInfo; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.ITraceInfo; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.impl.TraceInfo; /** * The class TraceInfoTest contains test for the class {@link TraceInfo}. diff --git a/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/impl/UstProviderInfoTest.java b/org.eclipse.linuxtools.lttng2.core.tests/src/org/eclipse/linuxtools/lttng2/core/tests/control/model/impl/UstProviderInfoTest.java similarity index 95% rename from org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/impl/UstProviderInfoTest.java rename to org.eclipse.linuxtools.lttng2.core.tests/src/org/eclipse/linuxtools/lttng2/core/tests/control/model/impl/UstProviderInfoTest.java index 9a7d39bd74..b1d979e283 100644 --- a/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/impl/UstProviderInfoTest.java +++ b/org.eclipse.linuxtools.lttng2.core.tests/src/org/eclipse/linuxtools/lttng2/core/tests/control/model/impl/UstProviderInfoTest.java @@ -9,17 +9,17 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.lttng2.ui.tests.control.model.impl; +package org.eclipse.linuxtools.lttng2.core.tests.control.model.impl; import java.util.LinkedList; import java.util.List; import junit.framework.TestCase; -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; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.IBaseEventInfo; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.IUstProviderInfo; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.impl.BaseEventInfo; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.impl.UstProviderInfo; /** * The class ChannelInfoTest contains tests for the class {@link UstProviderInfo}. diff --git a/org.eclipse.linuxtools.lttng2.core/META-INF/MANIFEST.MF b/org.eclipse.linuxtools.lttng2.core/META-INF/MANIFEST.MF index 279fea1e8d..ce226a29e1 100644 --- a/org.eclipse.linuxtools.lttng2.core/META-INF/MANIFEST.MF +++ b/org.eclipse.linuxtools.lttng2.core/META-INF/MANIFEST.MF @@ -9,3 +9,5 @@ Bundle-Activator: org.eclipse.linuxtools.internal.lttng2.core.Activator Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Require-Bundle: org.eclipse.core.runtime;bundle-version="3.7.0" +Export-Package: org.eclipse.linuxtools.internal.lttng2.core.control.model;x-friends:="org.eclipse.linuxtools.lttng2.ui", + org.eclipse.linuxtools.internal.lttng2.core.control.model.impl;x-friends:="org.eclipse.linuxtools.lttng2.ui" diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/IBaseEventInfo.java b/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/IBaseEventInfo.java similarity index 95% rename from org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/IBaseEventInfo.java rename to org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/IBaseEventInfo.java index 20a3a95ac2..97b9b7b28d 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/IBaseEventInfo.java +++ b/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/IBaseEventInfo.java @@ -9,7 +9,7 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.ui.views.control.model; +package org.eclipse.linuxtools.internal.lttng2.core.control.model; /** * IBaseEventInfo diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/IChannelInfo.java b/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/IChannelInfo.java similarity index 98% rename from org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/IChannelInfo.java rename to org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/IChannelInfo.java index ac58000fc6..974ab74d07 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/IChannelInfo.java +++ b/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/IChannelInfo.java @@ -9,7 +9,7 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.ui.views.control.model; +package org.eclipse.linuxtools.internal.lttng2.core.control.model; import java.util.List; diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/IDomainInfo.java b/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/IDomainInfo.java similarity index 95% rename from org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/IDomainInfo.java rename to org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/IDomainInfo.java index 2f710d0c8c..655f563c20 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/IDomainInfo.java +++ b/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/IDomainInfo.java @@ -9,7 +9,7 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.ui.views.control.model; +package org.eclipse.linuxtools.internal.lttng2.core.control.model; import java.util.List; diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/IEventInfo.java b/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/IEventInfo.java similarity index 94% rename from org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/IEventInfo.java rename to org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/IEventInfo.java index f8db932661..5403b2d98f 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/IEventInfo.java +++ b/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/IEventInfo.java @@ -9,7 +9,7 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.ui.views.control.model; +package org.eclipse.linuxtools.internal.lttng2.core.control.model; /** * IEventInfo diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/IProbeEventInfo.java b/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/IProbeEventInfo.java similarity index 95% rename from org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/IProbeEventInfo.java rename to org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/IProbeEventInfo.java index e954542f37..fcaccd7a1f 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/IProbeEventInfo.java +++ b/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/IProbeEventInfo.java @@ -9,7 +9,7 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.ui.views.control.model; +package org.eclipse.linuxtools.internal.lttng2.core.control.model; /** * IProbeEventInfo diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/ISessionInfo.java b/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/ISessionInfo.java similarity index 96% rename from org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/ISessionInfo.java rename to org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/ISessionInfo.java index fbed707321..69b80a43b6 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/ISessionInfo.java +++ b/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/ISessionInfo.java @@ -9,7 +9,7 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.ui.views.control.model; +package org.eclipse.linuxtools.internal.lttng2.core.control.model; import java.util.List; diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/ITraceInfo.java b/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/ITraceInfo.java similarity index 92% rename from org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/ITraceInfo.java rename to org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/ITraceInfo.java index 1b4ff42fa4..2bab05b429 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/ITraceInfo.java +++ b/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/ITraceInfo.java @@ -9,7 +9,7 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.ui.views.control.model; +package org.eclipse.linuxtools.internal.lttng2.core.control.model; /** * ITraceInfo diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/IUstProviderInfo.java b/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/IUstProviderInfo.java similarity index 95% rename from org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/IUstProviderInfo.java rename to org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/IUstProviderInfo.java index cba0ed1f36..0b20ff4558 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/IUstProviderInfo.java +++ b/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/IUstProviderInfo.java @@ -9,7 +9,7 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.ui.views.control.model; +package org.eclipse.linuxtools.internal.lttng2.core.control.model; import java.util.List; diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/LogLevelType.java b/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/LogLevelType.java similarity index 92% rename from org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/LogLevelType.java rename to org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/LogLevelType.java index b887d689dc..5cc85c84c0 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/LogLevelType.java +++ b/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/LogLevelType.java @@ -9,7 +9,7 @@ * Contributors: * Bernd Hufmann - Initial API and implementation *********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.ui.views.control.model; +package org.eclipse.linuxtools.internal.lttng2.core.control.model; /** * LogLevelType diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/TargetNodeState.java b/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/TargetNodeState.java similarity index 90% rename from org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/TargetNodeState.java rename to org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/TargetNodeState.java index c3b44f25dd..7d358eaa34 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/TargetNodeState.java +++ b/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/TargetNodeState.java @@ -9,7 +9,7 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.ui.views.control.model; +package org.eclipse.linuxtools.internal.lttng2.core.control.model; /** * TargetNodeState diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/TraceEnablement.java b/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/TraceEnablement.java similarity index 96% rename from org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/TraceEnablement.java rename to org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/TraceEnablement.java index 2a875fd789..154295e866 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/TraceEnablement.java +++ b/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/TraceEnablement.java @@ -9,7 +9,7 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.ui.views.control.model; +package org.eclipse.linuxtools.internal.lttng2.core.control.model; /** * TraceEnablement diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/TraceEventType.java b/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/TraceEventType.java similarity index 93% rename from org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/TraceEventType.java rename to org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/TraceEventType.java index 1d1c694afc..477e226936 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/TraceEventType.java +++ b/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/TraceEventType.java @@ -9,7 +9,7 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.ui.views.control.model; +package org.eclipse.linuxtools.internal.lttng2.core.control.model; /** * TraceEventType diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/TraceLogLevel.java b/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/TraceLogLevel.java similarity index 97% rename from org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/TraceLogLevel.java rename to org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/TraceLogLevel.java index b268ec8ef6..fa68212284 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/TraceLogLevel.java +++ b/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/TraceLogLevel.java @@ -9,7 +9,7 @@ * Contributors: * Bernd Hufmann - Initial API and implementation *********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.ui.views.control.model; +package org.eclipse.linuxtools.internal.lttng2.core.control.model; /** * TraceLogLevels diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/TraceSessionState.java b/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/TraceSessionState.java similarity index 96% rename from org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/TraceSessionState.java rename to org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/TraceSessionState.java index 5a8835c578..2a2fb44e61 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/TraceSessionState.java +++ b/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/TraceSessionState.java @@ -9,7 +9,7 @@ * Contributors: * Bernd Hufmann - Initial API and implementation *********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.ui.views.control.model; +package org.eclipse.linuxtools.internal.lttng2.core.control.model; /** * TraceSessionState diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/BaseEventInfo.java b/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/BaseEventInfo.java similarity index 95% rename from org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/BaseEventInfo.java rename to org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/BaseEventInfo.java index dce60ad2b8..6dbb8ec2b7 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/BaseEventInfo.java +++ b/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/BaseEventInfo.java @@ -9,11 +9,11 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl; +package org.eclipse.linuxtools.internal.lttng2.core.control.model.impl; -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.core.control.model.IBaseEventInfo; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceEventType; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceLogLevel; /** * BaseEventInfo diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/ChannelInfo.java b/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/ChannelInfo.java similarity index 97% rename from org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/ChannelInfo.java rename to org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/ChannelInfo.java index f4d30f7fe1..f9b2fc5a2f 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/ChannelInfo.java +++ b/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/ChannelInfo.java @@ -9,15 +9,15 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl; +package org.eclipse.linuxtools.internal.lttng2.core.control.model.impl; import java.util.ArrayList; import java.util.Iterator; import java.util.List; -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.core.control.model.IChannelInfo; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.IEventInfo; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceEnablement; /** * ChannelInfo diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/DomainInfo.java b/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/DomainInfo.java similarity index 95% rename from org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/DomainInfo.java rename to org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/DomainInfo.java index 5e2abfc0f0..bf7c3c9457 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/DomainInfo.java +++ b/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/DomainInfo.java @@ -9,14 +9,14 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl; +package org.eclipse.linuxtools.internal.lttng2.core.control.model.impl; import java.util.ArrayList; import java.util.Iterator; import java.util.List; -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.core.control.model.IChannelInfo; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.IDomainInfo; /** * DomainInfo diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/EventInfo.java b/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/EventInfo.java similarity index 94% rename from org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/EventInfo.java rename to org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/EventInfo.java index 1fd2c89bf1..e11c834222 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/EventInfo.java +++ b/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/EventInfo.java @@ -9,10 +9,10 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl; +package org.eclipse.linuxtools.internal.lttng2.core.control.model.impl; -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.core.control.model.IEventInfo; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceEnablement; /** * EventInfo diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/ProbeEventInfo.java b/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/ProbeEventInfo.java similarity index 97% rename from org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/ProbeEventInfo.java rename to org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/ProbeEventInfo.java index 7827de27ed..d88eb93421 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/ProbeEventInfo.java +++ b/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/ProbeEventInfo.java @@ -9,9 +9,9 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl; +package org.eclipse.linuxtools.internal.lttng2.core.control.model.impl; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IProbeEventInfo; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.IProbeEventInfo; /** * ProbleEventInfo diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/SessionInfo.java b/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/SessionInfo.java similarity index 95% rename from org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/SessionInfo.java rename to org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/SessionInfo.java index f98dca386b..350d6cd101 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/SessionInfo.java +++ b/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/SessionInfo.java @@ -9,15 +9,15 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl; +package org.eclipse.linuxtools.internal.lttng2.core.control.model.impl; import java.util.ArrayList; import java.util.Iterator; import java.util.List; -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.core.control.model.IDomainInfo; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.ISessionInfo; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceSessionState; /** * SessionInfo diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TraceInfo.java b/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/TraceInfo.java similarity index 95% rename from org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TraceInfo.java rename to org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/TraceInfo.java index 955168937c..87d0f8b3bd 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TraceInfo.java +++ b/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/TraceInfo.java @@ -9,9 +9,9 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl; +package org.eclipse.linuxtools.internal.lttng2.core.control.model.impl; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceInfo; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.ITraceInfo; /** * TraceInfo diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/UstProviderInfo.java b/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/UstProviderInfo.java similarity index 96% rename from org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/UstProviderInfo.java rename to org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/UstProviderInfo.java index 41e0bcf6f6..40030e74a1 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/UstProviderInfo.java +++ b/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/UstProviderInfo.java @@ -9,14 +9,14 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl; +package org.eclipse.linuxtools.internal.lttng2.core.control.model.impl; import java.util.ArrayList; import java.util.Iterator; import java.util.List; -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.core.control.model.IBaseEventInfo; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.IUstProviderInfo; /** * UstProviderInfo 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 f1ee19afea..d5aad5b37d 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 @@ -27,8 +27,6 @@ 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()); diff --git a/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/impl/ListenerValidator.java b/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/ListenerValidator.java similarity index 97% rename from org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/impl/ListenerValidator.java rename to org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/ListenerValidator.java index a5ae9f88df..ff87552d6c 100644 --- a/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/impl/ListenerValidator.java +++ b/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/ListenerValidator.java @@ -9,7 +9,7 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.lttng2.ui.tests.control.model.impl; +package org.eclipse.linuxtools.lttng2.ui.tests.control.model.component; import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent; import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponentChangedListener; diff --git a/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/TraceControlComponentTest.java b/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/TraceControlComponentTest.java index c3b6aab2aa..51b4ff8d03 100644 --- a/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/TraceControlComponentTest.java +++ b/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/TraceControlComponentTest.java @@ -18,16 +18,15 @@ import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.TargetNodeState; import org.eclipse.linuxtools.internal.lttng2.stubs.service.TestRemoteSystemProxy; import org.eclipse.linuxtools.internal.lttng2.ui.views.control.ControlView; import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent; import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponentChangedListener; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.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.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/TraceControlKernelProviderTests.java b/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/TraceControlKernelProviderTests.java index 2157fbdc46..373c74f337 100644 --- a/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/TraceControlKernelProviderTests.java +++ b/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/TraceControlKernelProviderTests.java @@ -20,17 +20,17 @@ import junit.framework.TestSuite; import org.eclipse.core.runtime.FileLocator; import org.eclipse.core.runtime.Path; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.TargetNodeState; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceEnablement; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceEventType; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceLogLevel; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceSessionState; import org.eclipse.linuxtools.internal.lttng2.stubs.dialogs.CreateSessionDialogStub; import org.eclipse.linuxtools.internal.lttng2.stubs.dialogs.DestroyConfirmDialogStub; import org.eclipse.linuxtools.internal.lttng2.stubs.dialogs.GetEventInfoDialogStub; import org.eclipse.linuxtools.internal.lttng2.stubs.service.TestRemoteSystemProxy; import org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.TraceControlDialogFactory; import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.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; diff --git a/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/TraceControlKernelSessionTests.java b/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/TraceControlKernelSessionTests.java index f8d710ae86..b5364fbbe7 100644 --- a/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/TraceControlKernelSessionTests.java +++ b/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/TraceControlKernelSessionTests.java @@ -22,6 +22,12 @@ import junit.framework.TestSuite; import org.eclipse.core.runtime.FileLocator; import org.eclipse.core.runtime.Path; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.TargetNodeState; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceEnablement; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceEventType; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceLogLevel; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceSessionState; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.impl.ChannelInfo; import org.eclipse.linuxtools.internal.lttng2.stubs.dialogs.AddContextDialogStub; import org.eclipse.linuxtools.internal.lttng2.stubs.dialogs.CreateSessionDialogStub; import org.eclipse.linuxtools.internal.lttng2.stubs.dialogs.DestroyConfirmDialogStub; @@ -31,12 +37,6 @@ import org.eclipse.linuxtools.internal.lttng2.stubs.dialogs.GetEventInfoDialogSt import org.eclipse.linuxtools.internal.lttng2.stubs.service.TestRemoteSystemProxy; import org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.TraceControlDialogFactory; import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.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.ChannelInfo; 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; diff --git a/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/TraceControlPropertiesTest.java b/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/TraceControlPropertiesTest.java index ccf6caf733..ff63ad9bee 100644 --- a/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/TraceControlPropertiesTest.java +++ b/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/TraceControlPropertiesTest.java @@ -20,14 +20,14 @@ import junit.framework.TestSuite; import org.eclipse.core.runtime.FileLocator; import org.eclipse.core.runtime.Path; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.IChannelInfo; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.TargetNodeState; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceEnablement; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceEventType; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceLogLevel; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceSessionState; import org.eclipse.linuxtools.internal.lttng2.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; diff --git a/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/TraceControlTreeModelTest.java b/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/TraceControlTreeModelTest.java index cbe5a3ed0a..4c23bb34eb 100644 --- a/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/TraceControlTreeModelTest.java +++ b/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/TraceControlTreeModelTest.java @@ -20,13 +20,13 @@ import junit.framework.TestSuite; import org.eclipse.core.runtime.FileLocator; import org.eclipse.core.runtime.Path; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.TargetNodeState; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceEnablement; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceEventType; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceLogLevel; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceSessionState; import org.eclipse.linuxtools.internal.lttng2.stubs.service.TestRemoteSystemProxy; import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.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; diff --git a/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/TraceControlUstProviderTests.java b/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/TraceControlUstProviderTests.java index 35124a3cca..7a29c63e14 100644 --- a/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/TraceControlUstProviderTests.java +++ b/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/TraceControlUstProviderTests.java @@ -20,6 +20,11 @@ import junit.framework.TestSuite; import org.eclipse.core.runtime.FileLocator; import org.eclipse.core.runtime.Path; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.TargetNodeState; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceEnablement; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceEventType; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceLogLevel; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceSessionState; import org.eclipse.linuxtools.internal.lttng2.stubs.dialogs.CreateSessionDialogStub; import org.eclipse.linuxtools.internal.lttng2.stubs.dialogs.DestroyConfirmDialogStub; import org.eclipse.linuxtools.internal.lttng2.stubs.dialogs.EnableChannelDialogStub; @@ -27,11 +32,6 @@ import org.eclipse.linuxtools.internal.lttng2.stubs.dialogs.GetEventInfoDialogSt import org.eclipse.linuxtools.internal.lttng2.stubs.service.TestRemoteSystemProxy; import org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.TraceControlDialogFactory; import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.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; diff --git a/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/TraceControlUstSessionTests.java b/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/TraceControlUstSessionTests.java index a056d2fc92..052ef2cb7a 100644 --- a/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/TraceControlUstSessionTests.java +++ b/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/model/component/TraceControlUstSessionTests.java @@ -22,6 +22,13 @@ import junit.framework.TestSuite; import org.eclipse.core.runtime.FileLocator; import org.eclipse.core.runtime.Path; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.LogLevelType; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.TargetNodeState; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceEnablement; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceEventType; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceLogLevel; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceSessionState; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.impl.ChannelInfo; import org.eclipse.linuxtools.internal.lttng2.stubs.dialogs.CreateSessionDialogStub; import org.eclipse.linuxtools.internal.lttng2.stubs.dialogs.DestroyConfirmDialogStub; import org.eclipse.linuxtools.internal.lttng2.stubs.dialogs.EnableChannelDialogStub; @@ -30,13 +37,6 @@ import org.eclipse.linuxtools.internal.lttng2.stubs.dialogs.GetEventInfoDialogSt import org.eclipse.linuxtools.internal.lttng2.stubs.service.TestRemoteSystemProxy; import org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.TraceControlDialogFactory; import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.LogLevelType; -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.ChannelInfo; 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; diff --git a/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/service/LTTngControlServiceTest.java b/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/service/LTTngControlServiceTest.java index 0b7777b266..6c4cb9819c 100644 --- a/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/service/LTTngControlServiceTest.java +++ b/org.eclipse.linuxtools.lttng2.ui.tests/src/org/eclipse/linuxtools/lttng2/ui/tests/control/service/LTTngControlServiceTest.java @@ -24,20 +24,20 @@ import org.eclipse.core.commands.ExecutionException; import org.eclipse.core.runtime.FileLocator; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.Path; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.IBaseEventInfo; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.IChannelInfo; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.IDomainInfo; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.IEventInfo; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.ISessionInfo; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.IUstProviderInfo; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.LogLevelType; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceEnablement; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceEventType; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceLogLevel; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceSessionState; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.impl.ChannelInfo; 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.internal.lttng2.ui.views.control.service.LTTngControlServiceFactory; diff --git a/org.eclipse.linuxtools.lttng2.ui.tests/stubs/org/eclipse/linuxtools/internal/lttng2/stubs/dialogs/EnableChannelDialogStub.java b/org.eclipse.linuxtools.lttng2.ui.tests/stubs/org/eclipse/linuxtools/internal/lttng2/stubs/dialogs/EnableChannelDialogStub.java index 532d5f4d12..b0d2084cca 100644 --- a/org.eclipse.linuxtools.lttng2.ui.tests/stubs/org/eclipse/linuxtools/internal/lttng2/stubs/dialogs/EnableChannelDialogStub.java +++ b/org.eclipse.linuxtools.lttng2.ui.tests/stubs/org/eclipse/linuxtools/internal/lttng2/stubs/dialogs/EnableChannelDialogStub.java @@ -11,9 +11,9 @@ **********************************************************************/ package org.eclipse.linuxtools.internal.lttng2.stubs.dialogs; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.IChannelInfo; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.impl.ChannelInfo; import org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.IEnableChannelDialog; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.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; /** diff --git a/org.eclipse.linuxtools.lttng2.ui.tests/stubs/org/eclipse/linuxtools/internal/lttng2/stubs/dialogs/EnableEventsDialogStub.java b/org.eclipse.linuxtools.lttng2.ui.tests/stubs/org/eclipse/linuxtools/internal/lttng2/stubs/dialogs/EnableEventsDialogStub.java index 91715ce90f..6812451a97 100644 --- a/org.eclipse.linuxtools.lttng2.ui.tests/stubs/org/eclipse/linuxtools/internal/lttng2/stubs/dialogs/EnableEventsDialogStub.java +++ b/org.eclipse.linuxtools.lttng2.ui.tests/stubs/org/eclipse/linuxtools/internal/lttng2/stubs/dialogs/EnableEventsDialogStub.java @@ -14,9 +14,9 @@ package org.eclipse.linuxtools.internal.lttng2.stubs.dialogs; import java.util.ArrayList; import java.util.List; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.LogLevelType; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceLogLevel; import org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.IEnableEventsDialog; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.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; diff --git a/org.eclipse.linuxtools.lttng2.ui.tests/stubs/org/eclipse/linuxtools/internal/lttng2/stubs/service/TestRemoteSystemProxy.java b/org.eclipse.linuxtools.lttng2.ui.tests/stubs/org/eclipse/linuxtools/internal/lttng2/stubs/service/TestRemoteSystemProxy.java index 033976c349..691f68ba5b 100644 --- a/org.eclipse.linuxtools.lttng2.ui.tests/stubs/org/eclipse/linuxtools/internal/lttng2/stubs/service/TestRemoteSystemProxy.java +++ b/org.eclipse.linuxtools.lttng2.ui.tests/stubs/org/eclipse/linuxtools/internal/lttng2/stubs/service/TestRemoteSystemProxy.java @@ -14,8 +14,8 @@ 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.lttng2.stubs.shells.LTTngToolsFileShell; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.remote.ICommandShell; import org.eclipse.linuxtools.internal.lttng2.ui.views.control.remote.IRemoteSystemProxy; -import org.eclipse.linuxtools.internal.lttng2.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.lttng2.ui.tests/stubs/org/eclipse/linuxtools/internal/lttng2/stubs/shells/LTTngToolsFileShell.java b/org.eclipse.linuxtools.lttng2.ui.tests/stubs/org/eclipse/linuxtools/internal/lttng2/stubs/shells/LTTngToolsFileShell.java index 0aef42a8d7..06e9a4e304 100644 --- a/org.eclipse.linuxtools.lttng2.ui.tests/stubs/org/eclipse/linuxtools/internal/lttng2/stubs/shells/LTTngToolsFileShell.java +++ b/org.eclipse.linuxtools.lttng2.ui.tests/stubs/org/eclipse/linuxtools/internal/lttng2/stubs/shells/LTTngToolsFileShell.java @@ -26,8 +26,8 @@ import java.util.regex.Pattern; import org.eclipse.core.commands.ExecutionException; import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.service.CommandResult; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.service.ICommandResult; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.remote.CommandResult; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.remote.ICommandResult; public class LTTngToolsFileShell extends TestCommandShell { diff --git a/org.eclipse.linuxtools.lttng2.ui.tests/stubs/org/eclipse/linuxtools/internal/lttng2/stubs/shells/TestCommandShell.java b/org.eclipse.linuxtools.lttng2.ui.tests/stubs/org/eclipse/linuxtools/internal/lttng2/stubs/shells/TestCommandShell.java index 5b0575b75a..4f14a8a30b 100644 --- a/org.eclipse.linuxtools.lttng2.ui.tests/stubs/org/eclipse/linuxtools/internal/lttng2/stubs/shells/TestCommandShell.java +++ b/org.eclipse.linuxtools.lttng2.ui.tests/stubs/org/eclipse/linuxtools/internal/lttng2/stubs/shells/TestCommandShell.java @@ -13,9 +13,9 @@ 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.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; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.remote.CommandResult; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.remote.ICommandResult; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.remote.ICommandShell; public class TestCommandShell implements ICommandShell { 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 9b670be139..800abc0f1d 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 @@ -74,7 +74,7 @@ public class Activator extends AbstractUIPlugin { public void start(BundleContext context) throws Exception { super.start(context); plugin = this; - ControlPreferences.getInstance().init(); + ControlPreferences.getInstance().init(getPreferenceStore()); } /* (non-Javadoc) diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/ControlView.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/ControlView.java index 1a2aa5411c..a3765dcfcb 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/ControlView.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/ControlView.java @@ -23,6 +23,8 @@ import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.jface.viewers.TreeViewer; import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent; import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponentChangedListener; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceControlContentProvider; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceControlLabelProvider; import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceControlRoot; import org.eclipse.rse.core.RSECorePlugin; import org.eclipse.swt.SWT; diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/AddContextDialog.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/AddContextDialog.java index dda5375e52..10c8e81304 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/AddContextDialog.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/AddContextDialog.java @@ -24,7 +24,7 @@ import org.eclipse.jface.viewers.ICheckStateListener; import org.eclipse.jface.viewers.ITreeContentProvider; import org.eclipse.jface.viewers.Viewer; import org.eclipse.linuxtools.internal.lttng2.ui.Activator; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.Messages; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.messages.Messages; import org.eclipse.swt.SWT; import org.eclipse.swt.graphics.Point; import org.eclipse.swt.layout.GridData; diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/ConfirmDialog.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/ConfirmDialog.java index c977e54ea9..3be9a31ac8 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/ConfirmDialog.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/ConfirmDialog.java @@ -14,7 +14,7 @@ package org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs; import org.eclipse.jface.dialogs.MessageDialog; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.Messages; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.messages.Messages; import org.eclipse.swt.widgets.Shell; /** diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/CreateSessionDialog.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/CreateSessionDialog.java index 7ecbe421ac..50d06043c4 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/CreateSessionDialog.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/CreateSessionDialog.java @@ -16,7 +16,7 @@ import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.linuxtools.internal.lttng2.ui.Activator; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.Messages; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.messages.Messages; import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TargetNodeComponent; import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceSessionGroup; import org.eclipse.linuxtools.internal.lttng2.ui.views.control.remote.IRemoteSystemProxy; diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/EnableChannelDialog.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/EnableChannelDialog.java index 0d8e03069a..663ecb9145 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/EnableChannelDialog.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/EnableChannelDialog.java @@ -14,10 +14,10 @@ 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.lttng2.core.control.model.IChannelInfo; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.impl.ChannelInfo; import org.eclipse.linuxtools.internal.lttng2.ui.Activator; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.Messages; -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.messages.Messages; import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceDomainComponent; import org.eclipse.swt.SWT; import org.eclipse.swt.events.VerifyEvent; diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/EnableEventsDialog.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/EnableEventsDialog.java index f10b89ad16..57d68ddda7 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/EnableEventsDialog.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/EnableEventsDialog.java @@ -15,10 +15,10 @@ import java.util.List; import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.dialogs.IDialogConstants; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.LogLevelType; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceLogLevel; import org.eclipse.linuxtools.internal.lttng2.ui.Activator; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.Messages; -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.messages.Messages; import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceDomainComponent; import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceProviderGroup; import org.eclipse.swt.SWT; diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/EnableKernelEventComposite.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/EnableKernelEventComposite.java index 126ae04804..5f3fbfe18c 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/EnableKernelEventComposite.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/EnableKernelEventComposite.java @@ -18,12 +18,12 @@ 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.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.messages.Messages; import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent; import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.BaseEventComponent; import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.KernelProviderComponent; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceControlContentProvider; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceControlLabelProvider; import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceProviderGroup; import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionAdapter; diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/EnableUstEventsComposite.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/EnableUstEventsComposite.java index b11e9ce801..8669c5b2d3 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/EnableUstEventsComposite.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/EnableUstEventsComposite.java @@ -20,14 +20,14 @@ 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.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.core.control.model.LogLevelType; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceLogLevel; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.messages.Messages; import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.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.TraceControlContentProvider; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceControlLabelProvider; import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceProviderGroup; import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.UstProviderComponent; import org.eclipse.swt.SWT; diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/GetEventInfoDialog.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/GetEventInfoDialog.java index f43905cbe0..ce7e08fd0c 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/GetEventInfoDialog.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/GetEventInfoDialog.java @@ -17,7 +17,7 @@ import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.linuxtools.internal.lttng2.ui.Activator; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.Messages; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.messages.Messages; import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceChannelComponent; import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceDomainComponent; import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceSessionComponent; diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/IEnableChannelDialog.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/IEnableChannelDialog.java index 84b74167c6..18f8873d44 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/IEnableChannelDialog.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/IEnableChannelDialog.java @@ -11,7 +11,7 @@ **********************************************************************/ package org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IChannelInfo; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.IChannelInfo; import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceDomainComponent; /** diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/IEnableUstEvents.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/IEnableUstEvents.java index 42c1f024df..ad19c58d42 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/IEnableUstEvents.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/IEnableUstEvents.java @@ -13,8 +13,8 @@ package org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs; import java.util.List; -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.core.control.model.LogLevelType; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceLogLevel; /** * IEnableKernelEvents diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/ImportConfirmationDialog.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/ImportConfirmationDialog.java index 43bdf9261a..9a2292d660 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/ImportConfirmationDialog.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/ImportConfirmationDialog.java @@ -15,7 +15,7 @@ import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.linuxtools.internal.lttng2.ui.Activator; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.Messages; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.messages.Messages; import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionAdapter; import org.eclipse.swt.events.SelectionEvent; diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/ImportDialog.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/ImportDialog.java index 46c89a8104..26e1da6a2f 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/ImportDialog.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/ImportDialog.java @@ -27,7 +27,7 @@ import org.eclipse.jface.viewers.CheckboxTreeViewer; import org.eclipse.jface.viewers.ICheckStateListener; import org.eclipse.jface.window.Window; import org.eclipse.linuxtools.internal.lttng2.ui.Activator; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.Messages; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.messages.Messages; import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceSessionComponent; import org.eclipse.linuxtools.internal.lttng2.ui.views.control.remote.IRemoteSystemProxy; import org.eclipse.linuxtools.tmf.core.TmfProjectNature; diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/NewConnectionDialog.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/NewConnectionDialog.java index c591fbc6ec..32b86a9810 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/NewConnectionDialog.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/NewConnectionDialog.java @@ -17,7 +17,7 @@ import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.linuxtools.internal.lttng2.ui.Activator; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.Messages; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.messages.Messages; import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent; import org.eclipse.rse.core.model.IHost; import org.eclipse.swt.SWT; diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/AddContextOnChannelHandler.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/AddContextOnChannelHandler.java index 0deea89562..f96e66bef8 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/AddContextOnChannelHandler.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/AddContextOnChannelHandler.java @@ -18,8 +18,8 @@ import org.eclipse.core.commands.ExecutionException; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.StructuredSelection; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceSessionState; import org.eclipse.linuxtools.internal.lttng2.ui.views.control.ControlView; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.TraceSessionState; 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.ui.IWorkbenchPage; diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/AddContextOnDomainHandler.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/AddContextOnDomainHandler.java index d5e6626d7c..4abca7d250 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/AddContextOnDomainHandler.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/AddContextOnDomainHandler.java @@ -18,8 +18,8 @@ import org.eclipse.core.commands.ExecutionException; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.StructuredSelection; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceSessionState; import org.eclipse.linuxtools.internal.lttng2.ui.views.control.ControlView; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.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.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/AddContextOnEventHandler.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/AddContextOnEventHandler.java index 7611c8e1c5..2c38850103 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/AddContextOnEventHandler.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/AddContextOnEventHandler.java @@ -18,8 +18,8 @@ import org.eclipse.core.commands.ExecutionException; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.StructuredSelection; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceSessionState; import org.eclipse.linuxtools.internal.lttng2.ui.views.control.ControlView; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.TraceSessionState; 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; diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/AssignEventHandler.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/AssignEventHandler.java index 09c9aa2578..d3fc01e4de 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/AssignEventHandler.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/AssignEventHandler.java @@ -27,9 +27,9 @@ import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.jface.window.Window; import org.eclipse.linuxtools.internal.lttng2.ui.Activator; import org.eclipse.linuxtools.internal.lttng2.ui.views.control.ControlView; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.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.messages.Messages; import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent; import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.BaseEventComponent; import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.KernelProviderComponent; diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/BaseAddContextHandler.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/BaseAddContextHandler.java index 4f029b319b..26f55820ab 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/BaseAddContextHandler.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/BaseAddContextHandler.java @@ -21,9 +21,9 @@ import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.jobs.Job; import org.eclipse.jface.window.Window; import org.eclipse.linuxtools.internal.lttng2.ui.Activator; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.Messages; import org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.IAddContextDialog; import org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.TraceControlDialogFactory; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.messages.Messages; import org.eclipse.ui.IWorkbenchWindow; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.progress.UIJob; diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/BaseControlViewHandler.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/BaseControlViewHandler.java index f08ce2781f..17c0e380f2 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/BaseControlViewHandler.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/BaseControlViewHandler.java @@ -21,7 +21,7 @@ import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.jobs.Job; import org.eclipse.linuxtools.internal.lttng2.ui.Activator; import org.eclipse.linuxtools.internal.lttng2.ui.views.control.ControlView; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.Messages; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.messages.Messages; import org.eclipse.ui.IWorkbenchPage; import org.eclipse.ui.IWorkbenchPart; import org.eclipse.ui.IWorkbenchWindow; diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/BaseEnableChannelHandler.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/BaseEnableChannelHandler.java index 9bcd4407ba..6e33ff0a1d 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/BaseEnableChannelHandler.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/BaseEnableChannelHandler.java @@ -21,11 +21,11 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.jobs.Job; import org.eclipse.jface.window.Window; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.IChannelInfo; import org.eclipse.linuxtools.internal.lttng2.ui.Activator; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.Messages; import org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.IEnableChannelDialog; import org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.TraceControlDialogFactory; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IChannelInfo; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.messages.Messages; import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceDomainComponent; /** diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/BaseEnableEventHandler.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/BaseEnableEventHandler.java index 94dc78e4f9..7cf68dfebd 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/BaseEnableEventHandler.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/BaseEnableEventHandler.java @@ -20,13 +20,13 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.jobs.Job; import org.eclipse.jface.window.Window; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.LogLevelType; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceLogLevel; import org.eclipse.linuxtools.internal.lttng2.ui.Activator; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.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.messages.Messages; 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; diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/CalibrateHandler.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/CalibrateHandler.java index 552b6a2d01..fef64dd1fa 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/CalibrateHandler.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/CalibrateHandler.java @@ -23,7 +23,7 @@ import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.linuxtools.internal.lttng2.ui.Activator; import org.eclipse.linuxtools.internal.lttng2.ui.views.control.ControlView; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.Messages; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.messages.Messages; import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceDomainComponent; import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceSessionComponent; import org.eclipse.ui.IWorkbenchPage; diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/ChangeChannelStateHandler.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/ChangeChannelStateHandler.java index 2bc593c851..6268f1fb81 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/ChangeChannelStateHandler.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/ChangeChannelStateHandler.java @@ -23,10 +23,10 @@ import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.jobs.Job; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.StructuredSelection; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceEnablement; import org.eclipse.linuxtools.internal.lttng2.ui.Activator; import org.eclipse.linuxtools.internal.lttng2.ui.views.control.ControlView; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.Messages; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.TraceEnablement; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.messages.Messages; import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceChannelComponent; import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceDomainComponent; import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceSessionComponent; diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/ChangeEventStateHandler.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/ChangeEventStateHandler.java index e2d82ae528..ed93ebc2ca 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/ChangeEventStateHandler.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/ChangeEventStateHandler.java @@ -23,10 +23,10 @@ import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.jobs.Job; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.StructuredSelection; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceEnablement; import org.eclipse.linuxtools.internal.lttng2.ui.Activator; import org.eclipse.linuxtools.internal.lttng2.ui.views.control.ControlView; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.Messages; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.TraceEnablement; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.messages.Messages; import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceChannelComponent; import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceEventComponent; import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceSessionComponent; diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/ChangeSessionStateHandler.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/ChangeSessionStateHandler.java index 002c3c8441..10d3f9ec2c 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/ChangeSessionStateHandler.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/ChangeSessionStateHandler.java @@ -23,10 +23,10 @@ import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.jobs.Job; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.StructuredSelection; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceSessionState; import org.eclipse.linuxtools.internal.lttng2.ui.Activator; import org.eclipse.linuxtools.internal.lttng2.ui.views.control.ControlView; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.Messages; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.TraceSessionState; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.messages.Messages; import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceSessionComponent; import org.eclipse.ui.IWorkbenchPage; import org.eclipse.ui.IWorkbenchWindow; diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/ConnectHandler.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/ConnectHandler.java index 9bede57a2e..5f9f44f48f 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/ConnectHandler.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/ConnectHandler.java @@ -13,7 +13,7 @@ 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.lttng2.ui.views.control.model.TargetNodeState; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.TargetNodeState; /** * ConnectHandler diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/CreateSessionHandler.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/CreateSessionHandler.java index ab53e82340..0159b46687 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/CreateSessionHandler.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/CreateSessionHandler.java @@ -22,9 +22,9 @@ import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.jface.window.Window; import org.eclipse.linuxtools.internal.lttng2.ui.Activator; import org.eclipse.linuxtools.internal.lttng2.ui.views.control.ControlView; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.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.messages.Messages; import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceSessionGroup; import org.eclipse.ui.IWorkbenchPage; diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/DeleteHandler.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/DeleteHandler.java index b694d83719..5ca9e5055d 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/DeleteHandler.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/DeleteHandler.java @@ -13,8 +13,8 @@ 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.lttng2.core.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 diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/DestroySessionHandler.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/DestroySessionHandler.java index 8e6359b63e..942838a8f3 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/DestroySessionHandler.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/DestroySessionHandler.java @@ -23,12 +23,12 @@ import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.jobs.Job; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.StructuredSelection; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceSessionState; import org.eclipse.linuxtools.internal.lttng2.ui.Activator; import org.eclipse.linuxtools.internal.lttng2.ui.views.control.ControlView; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.Messages; 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.messages.Messages; import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceSessionComponent; import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceSessionGroup; import org.eclipse.ui.IWorkbenchPage; diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/DisableChannelHandler.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/DisableChannelHandler.java index c96ef5164b..c48d80b92f 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/DisableChannelHandler.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/DisableChannelHandler.java @@ -15,7 +15,7 @@ import java.util.List; import org.eclipse.core.commands.ExecutionException; import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.TraceEnablement; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceEnablement; import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceDomainComponent; /** diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/DisableEventHandler.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/DisableEventHandler.java index 4a90d3b480..ff135c5829 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/DisableEventHandler.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/DisableEventHandler.java @@ -15,7 +15,7 @@ import java.util.List; import org.eclipse.core.commands.ExecutionException; import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.TraceEnablement; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceEnablement; import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceChannelComponent; /** diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/DisconnectHandler.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/DisconnectHandler.java index 4c3f4d3c74..63b52b2b7a 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/DisconnectHandler.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/DisconnectHandler.java @@ -13,7 +13,7 @@ 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.lttng2.ui.views.control.model.TargetNodeState; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.TargetNodeState; /** * DisconnectHandler diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/EnableChannelHandler.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/EnableChannelHandler.java index 0b9a3ef4b6..000d63010a 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/EnableChannelHandler.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/EnableChannelHandler.java @@ -15,7 +15,7 @@ import java.util.List; import org.eclipse.core.commands.ExecutionException; import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.TraceEnablement; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceEnablement; import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceDomainComponent; /** diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/EnableChannelOnDomainHandler.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/EnableChannelOnDomainHandler.java index 3b925a0f74..50d0dbd2d8 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/EnableChannelOnDomainHandler.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/EnableChannelOnDomainHandler.java @@ -18,9 +18,9 @@ import org.eclipse.core.commands.ExecutionException; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.StructuredSelection; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.IChannelInfo; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceSessionState; import org.eclipse.linuxtools.internal.lttng2.ui.views.control.ControlView; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IChannelInfo; -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.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/EnableChannelOnSessionHandler.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/EnableChannelOnSessionHandler.java index 8602661299..afd3734e45 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/EnableChannelOnSessionHandler.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/EnableChannelOnSessionHandler.java @@ -18,9 +18,9 @@ import org.eclipse.core.commands.ExecutionException; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.StructuredSelection; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.IChannelInfo; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceSessionState; import org.eclipse.linuxtools.internal.lttng2.ui.views.control.ControlView; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IChannelInfo; -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.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/EnableEventHandler.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/EnableEventHandler.java index af0bf72c45..7478e48f50 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/EnableEventHandler.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/EnableEventHandler.java @@ -15,7 +15,7 @@ import java.util.List; import org.eclipse.core.commands.ExecutionException; import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.TraceEnablement; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceEnablement; import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceChannelComponent; /** diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/EnableEventOnChannelHandler.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/EnableEventOnChannelHandler.java index ae2257d8e5..a6348c0c86 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/EnableEventOnChannelHandler.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/EnableEventOnChannelHandler.java @@ -18,9 +18,9 @@ import org.eclipse.core.commands.ExecutionException; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.StructuredSelection; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.LogLevelType; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceLogLevel; import org.eclipse.linuxtools.internal.lttng2.ui.views.control.ControlView; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.LogLevelType; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.TraceLogLevel; 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; diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/EnableEventOnDomainHandler.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/EnableEventOnDomainHandler.java index 17d0355521..dadfda3a03 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/EnableEventOnDomainHandler.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/EnableEventOnDomainHandler.java @@ -18,10 +18,10 @@ import org.eclipse.core.commands.ExecutionException; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.StructuredSelection; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.LogLevelType; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceLogLevel; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceSessionState; import org.eclipse.linuxtools.internal.lttng2.ui.views.control.ControlView; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.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; diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/EnableEventOnSessionHandler.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/EnableEventOnSessionHandler.java index ba455db82f..b1e39df78b 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/EnableEventOnSessionHandler.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/EnableEventOnSessionHandler.java @@ -18,10 +18,10 @@ import org.eclipse.core.commands.ExecutionException; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.StructuredSelection; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.LogLevelType; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceLogLevel; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceSessionState; import org.eclipse.linuxtools.internal.lttng2.ui.views.control.ControlView; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.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; diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/ImportHandler.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/ImportHandler.java index b3b23ef200..f099bc5ac8 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/ImportHandler.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/ImportHandler.java @@ -27,13 +27,13 @@ import org.eclipse.core.runtime.jobs.Job; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.jface.window.Window; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceSessionState; import org.eclipse.linuxtools.internal.lttng2.ui.Activator; import org.eclipse.linuxtools.internal.lttng2.ui.views.control.ControlView; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.Messages; import org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.IImportDialog; import org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.ImportFileInfo; import org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.TraceControlDialogFactory; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.TraceSessionState; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.messages.Messages; import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceSessionComponent; import org.eclipse.linuxtools.tmf.ui.project.model.TmfTraceFolder; import org.eclipse.rse.services.clientserver.messages.SystemMessageException; diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/NewConnectionHandler.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/NewConnectionHandler.java index 0f898eb3c0..80fdeefd7e 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/NewConnectionHandler.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/NewConnectionHandler.java @@ -16,9 +16,9 @@ import org.eclipse.core.commands.ExecutionException; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.window.Window; import org.eclipse.linuxtools.internal.lttng2.ui.views.control.ControlView; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.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.messages.Messages; import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent; import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TargetNodeComponent; import org.eclipse.rse.core.IRSESystemType; diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/RefreshHandler.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/RefreshHandler.java index ab6eae01d3..fbb9451085 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/RefreshHandler.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/RefreshHandler.java @@ -17,8 +17,8 @@ import org.eclipse.core.commands.ExecutionEvent; import org.eclipse.core.commands.ExecutionException; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.StructuredSelection; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.TargetNodeState; import org.eclipse.linuxtools.internal.lttng2.ui.views.control.ControlView; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.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.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/StartHandler.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/StartHandler.java index 6dda08baeb..8287a1adf0 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/StartHandler.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/StartHandler.java @@ -13,7 +13,7 @@ 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.lttng2.ui.views.control.model.TraceSessionState; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceSessionState; import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceSessionComponent; /** diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/StopHandler.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/StopHandler.java index 792014779d..61971a7c13 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/StopHandler.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/StopHandler.java @@ -13,7 +13,7 @@ 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.lttng2.ui.views.control.model.TraceSessionState; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceSessionState; import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceSessionComponent; /** diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/Messages.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/messages/Messages.java similarity index 98% rename from org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/Messages.java rename to org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/messages/Messages.java index 0100b2a570..0b5af158da 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/Messages.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/messages/Messages.java @@ -10,7 +10,7 @@ * Bernd Hufmann - Initial API and implementation * *******************************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.ui.views.control; +package org.eclipse.linuxtools.internal.lttng2.ui.views.control.messages; 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.lttng2.ui.views.control.messages"; //$NON-NLS-1$ + private static final String BUNDLE_NAME = "org.eclipse.linuxtools.internal.lttng2.ui.views.control.messages.messages"; //$NON-NLS-1$ // Failures public static String TraceControl_ConnectionFailure; diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/messages.properties b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/messages/messages.properties similarity index 100% rename from org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/messages.properties rename to org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/messages/messages.properties diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/ITraceControlComponent.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/ITraceControlComponent.java index 2a827cf0ff..5bd065c0fc 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/ITraceControlComponent.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/ITraceControlComponent.java @@ -14,6 +14,7 @@ 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.lttng2.core.control.model.TargetNodeState; import org.eclipse.linuxtools.internal.lttng2.ui.views.control.service.ILttngControlService; import org.eclipse.swt.graphics.Image; diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/BaseEventComponent.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/BaseEventComponent.java index 494ec791b0..ac79ad31f3 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/BaseEventComponent.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/BaseEventComponent.java @@ -11,10 +11,11 @@ **********************************************************************/ package org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IBaseEventInfo; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.IBaseEventInfo; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceEventType; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceLogLevel; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.impl.EventInfo; import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.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; diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/KernelProviderComponent.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/KernelProviderComponent.java index 990465e5c9..a0ce710d4c 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/KernelProviderComponent.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/KernelProviderComponent.java @@ -15,8 +15,8 @@ package org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl; import java.util.Iterator; import java.util.List; -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.core.control.model.IBaseEventInfo; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.messages.Messages; import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent; import org.eclipse.linuxtools.internal.lttng2.ui.views.control.property.KernelProviderPropertySource; import org.eclipse.ui.views.properties.IPropertySource; diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TargetNodeComponent.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TargetNodeComponent.java index 3f1639f6c9..05b56c01fb 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TargetNodeComponent.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TargetNodeComponent.java @@ -18,14 +18,14 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.jobs.Job; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.TargetNodeState; 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.messages.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.ICommandShell; import org.eclipse.linuxtools.internal.lttng2.ui.views.control.remote.IRemoteSystemProxy; import org.eclipse.linuxtools.internal.lttng2.ui.views.control.remote.RemoteSystemProxy; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.service.ICommandShell; import org.eclipse.linuxtools.internal.lttng2.ui.views.control.service.ILttngControlService; import org.eclipse.linuxtools.internal.lttng2.ui.views.control.service.LTTngControlServiceFactory; import org.eclipse.rse.core.RSECorePlugin; diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TraceChannelComponent.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TraceChannelComponent.java index 20f9909387..f3755cc9a1 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TraceChannelComponent.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TraceChannelComponent.java @@ -17,14 +17,16 @@ 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.lttng2.core.control.model.IChannelInfo; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.IEventInfo; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.LogLevelType; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceEnablement; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceLogLevel; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.impl.ChannelInfo; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.impl.ProbeEventInfo; import org.eclipse.linuxtools.internal.lttng2.ui.Activator; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.Messages; -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.messages.Messages; 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; diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TraceControlComponent.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TraceControlComponent.java index 0e6b056696..485717ba56 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TraceControlComponent.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TraceControlComponent.java @@ -16,10 +16,10 @@ import java.util.Iterator; import java.util.List; import org.eclipse.core.runtime.ListenerList; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.TargetNodeState; import org.eclipse.linuxtools.internal.lttng2.ui.Activator; import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent; import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponentChangedListener; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.TargetNodeState; import org.eclipse.linuxtools.internal.lttng2.ui.views.control.service.ILttngControlService; import org.eclipse.swt.graphics.Image; diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/TraceControlContentProvider.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TraceControlContentProvider.java similarity index 97% rename from org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/TraceControlContentProvider.java rename to org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TraceControlContentProvider.java index 0c0041a98f..a366946063 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/TraceControlContentProvider.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TraceControlContentProvider.java @@ -9,7 +9,7 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.ui.views.control; +package org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl; import org.eclipse.jface.viewers.ITreeContentProvider; import org.eclipse.jface.viewers.Viewer; diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/TraceControlLabelProvider.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TraceControlLabelProvider.java similarity index 96% rename from org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/TraceControlLabelProvider.java rename to org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TraceControlLabelProvider.java index 8ebecf5f89..c910a92e7b 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/TraceControlLabelProvider.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TraceControlLabelProvider.java @@ -9,7 +9,7 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.ui.views.control; +package org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl; import org.eclipse.jface.viewers.ColumnLabelProvider; import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent; diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TraceDomainComponent.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TraceDomainComponent.java index 3970e21aaf..99ed035776 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TraceDomainComponent.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TraceDomainComponent.java @@ -16,12 +16,13 @@ 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.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.core.control.model.IChannelInfo; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.IDomainInfo; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.LogLevelType; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceLogLevel; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.impl.DomainInfo; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.messages.Messages; import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.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; diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TraceEventComponent.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TraceEventComponent.java index 7c2f85a224..e68556d98f 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TraceEventComponent.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TraceEventComponent.java @@ -16,13 +16,14 @@ 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.lttng2.core.control.model.IEventInfo; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceEnablement; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceEventType; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceLogLevel; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.impl.EventInfo; import org.eclipse.linuxtools.internal.lttng2.ui.Activator; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.Messages; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IEventInfo; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.messages.Messages; import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.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; diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TraceProbeEventComponent.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TraceProbeEventComponent.java index b795982617..603e2aacf7 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TraceProbeEventComponent.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TraceProbeEventComponent.java @@ -11,7 +11,8 @@ **********************************************************************/ package org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IEventInfo; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.IEventInfo; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.impl.ProbeEventInfo; import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent; import org.eclipse.linuxtools.internal.lttng2.ui.views.control.property.TraceProbeEventPropertySource; import org.eclipse.ui.views.properties.IPropertySource; diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TraceProviderGroup.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TraceProviderGroup.java index dce14be391..4635e5d5f5 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TraceProviderGroup.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TraceProviderGroup.java @@ -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.lttng2.ui.views.control.Messages; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IBaseEventInfo; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.IBaseEventInfo; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.IUstProviderInfo; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.messages.Messages; import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IUstProviderInfo; /** * TraceProviderGroup diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TraceSessionComponent.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TraceSessionComponent.java index f1d1476dd1..cf72d0546b 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TraceSessionComponent.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TraceSessionComponent.java @@ -16,15 +16,16 @@ 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.lttng2.core.control.model.IChannelInfo; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.IDomainInfo; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.ISessionInfo; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.LogLevelType; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceLogLevel; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceSessionState; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.impl.SessionInfo; import org.eclipse.linuxtools.internal.lttng2.ui.Activator; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.Messages; -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.ISessionInfo; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.messages.Messages; import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.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; diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TraceSessionGroup.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TraceSessionGroup.java index bfcee063f1..286f6e3d9a 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TraceSessionGroup.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TraceSessionGroup.java @@ -14,7 +14,7 @@ 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.lttng2.ui.views.control.model.ISessionInfo; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.ISessionInfo; import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent; /** diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/UstProviderComponent.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/UstProviderComponent.java index f4e325a73c..70000ab426 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/UstProviderComponent.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/UstProviderComponent.java @@ -12,10 +12,11 @@ package org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl; -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.core.control.model.IBaseEventInfo; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.IUstProviderInfo; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.impl.UstProviderInfo; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.messages.Messages; import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IUstProviderInfo; import org.eclipse.linuxtools.internal.lttng2.ui.views.control.property.UstProviderPropertySource; import org.eclipse.ui.views.properties.IPropertySource; diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/preferences/ControlPreferenceInitializer.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/preferences/ControlPreferenceInitializer.java index 7777bd5c9b..a7aa3cd560 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/preferences/ControlPreferenceInitializer.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/preferences/ControlPreferenceInitializer.java @@ -13,7 +13,6 @@ package org.eclipse.linuxtools.internal.lttng2.ui.views.control.preferences; import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer; import org.eclipse.jface.preference.IPreferenceStore; -import org.eclipse.linuxtools.internal.lttng2.ui.Activator; /** * ControlPreferenceInitializer @@ -28,7 +27,8 @@ public class ControlPreferenceInitializer extends AbstractPreferenceInitializer */ @Override public void initializeDefaultPreferences() { - final IPreferenceStore store = Activator.getDefault().getPreferenceStore(); + final IPreferenceStore store = ControlPreferences.getInstance().getPreferenceStore(); + //Set default User ID if none already stored in preferences store.setDefault(ControlPreferences.TRACE_CONTROL_TRACING_GROUP_PREF, ControlPreferences.TRACE_CONTROL_DEFAULT_TRACING_GROUP); store.setDefault(ControlPreferences.TRACE_CONTROL_LOG_APPEND_PREF, false); diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/preferences/ControlPreferencePage.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/preferences/ControlPreferencePage.java index 8a7f8a682e..5a6d010847 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/preferences/ControlPreferencePage.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/preferences/ControlPreferencePage.java @@ -18,9 +18,8 @@ import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.jface.preference.RadioGroupFieldEditor; import org.eclipse.jface.preference.StringFieldEditor; import org.eclipse.jface.util.PropertyChangeEvent; -import org.eclipse.linuxtools.internal.lttng2.ui.Activator; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.Messages; import org.eclipse.linuxtools.internal.lttng2.ui.views.control.logging.ControlCommandLogger; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.messages.Messages; import org.eclipse.ui.IWorkbench; import org.eclipse.ui.IWorkbenchPreferencePage; @@ -45,7 +44,7 @@ public class ControlPreferencePage extends FieldEditorPreferencePage implements super(FieldEditorPreferencePage.GRID); // Set the preference store for the preference page. - IPreferenceStore store = Activator.getDefault().getPreferenceStore(); + IPreferenceStore store = ControlPreferences.getInstance().getPreferenceStore(); setPreferenceStore(store); } diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/preferences/ControlPreferences.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/preferences/ControlPreferences.java index 35c7ba8708..61e57df2f0 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/preferences/ControlPreferences.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/preferences/ControlPreferences.java @@ -14,7 +14,6 @@ package org.eclipse.linuxtools.internal.lttng2.ui.views.control.preferences; import java.io.File; import org.eclipse.jface.preference.IPreferenceStore; -import org.eclipse.linuxtools.internal.lttng2.ui.Activator; import org.eclipse.linuxtools.internal.lttng2.ui.views.control.logging.ControlCommandLogger; /** @@ -28,36 +27,86 @@ public class ControlPreferences { // ------------------------------------------------------------------------ // Constants // ------------------------------------------------------------------------ + /** + * Trace control log file + */ public static final String TRACE_CONTROL_LOG_FILENAME = "lttng_tracer_control.log"; //$NON-NLS-1$ // Preference strings + /** + * The tracing group preference + */ public static final String TRACE_CONTROL_TRACING_GROUP_PREF = "trace.control.tracing.group"; //$NON-NLS-1$ + /** + * The log commands preference + */ public static final String TRACE_CONTROL_LOG_COMMANDS_PREF = "trace.control.log.commands"; //$NON-NLS-1$ + /** + * The log append preference + */ public static final String TRACE_CONTROL_LOG_APPEND_PREF = "trace.control.log.append"; //$NON-NLS-1$ - public static final String TRACE_CONTROL_LOG_FILE_PATH_PREF = "trace.control.log.path"; //$NON-NLS-1$ + /** + * The log file path preference + */ + public static final String TRACE_CONTROL_LOG_FILE_PATH_PREF = "trace.control.log.path"; //$NON-NLS-1$ + /** + * The verbose level preference + */ public static final String TRACE_CONTROL_VERBOSE_LEVEL_PREF = "trace.control.verbose.level"; //$NON-NLS-1$ + /** + * The verbose level value for none + */ public static final String TRACE_CONTROL_VERBOSE_LEVEL_NONE = "trace.control.verbose.level.none"; //$NON-NLS-1$ + /** + * The verbose level value for level 1 (-v) + */ public static final String TRACE_CONTROL_VERBOSE_LEVEL_VERBOSE = "trace.control.verbose.level.v"; //$NON-NLS-1$ + /** + * The verbose level value for level 2 (-vv) + */ public static final String TRACE_CONTROL_VERBOSE_LEVEL_V_VERBOSE = "trace.control.verbose.level.vv"; //$NON-NLS-1$ + /** + * The verbose level value for level 3 (-vvv) + */ public static final String TRACE_CONTROL_VERBOSE_LEVEL_V_V_VERBOSE = "trace.control.verbose.level.vvv"; //$NON-NLS-1$ - - public static final String TRACE_CONTROL_DEFAULT_TRACING_GROUP = "tracing"; //$NON-NLS-1$ + /** + * The default tracing group + */ + public static final String TRACE_CONTROL_DEFAULT_TRACING_GROUP = "tracing"; //$NON-NLS-1$ + /** + * The default tracing log file name with absolute path + */ public static final String TRACE_CONTROL_DEFAULT_LOG_PATH = System.getProperty("user.home") + File.separator + TRACE_CONTROL_LOG_FILENAME; //$NON-NLS-1$ // ------------------------------------------------------------------------ // Attributes // ------------------------------------------------------------------------ + /** + * The trace control preferences singleton instance. + */ private static ControlPreferences fInstance = null; + /** + * The preference store reference + */ + private IPreferenceStore fPreferenceStore = null; // ------------------------------------------------------------------------ // Constructor // ------------------------------------------------------------------------ + /** + * Private constructor + */ private ControlPreferences() { } // ------------------------------------------------------------------------ // Accessors // ------------------------------------------------------------------------ + /** + * Returns the trace control preferences singleton instance + * + * @return the trace control preferences singleton instance + */ public synchronized static ControlPreferences getInstance() { if (fInstance == null) { fInstance = new ControlPreferences(); @@ -69,50 +118,49 @@ public class ControlPreferences { * @return the preference store */ public IPreferenceStore getPreferenceStore() { - return Activator.getDefault().getPreferenceStore(); + return fPreferenceStore; } /** * @return true if tracing group is set to default */ public boolean isDefaultTracingGroup() { - IPreferenceStore store = getPreferenceStore(); - return store.getString(TRACE_CONTROL_TRACING_GROUP_PREF).equals(store.getDefaultString(TRACE_CONTROL_TRACING_GROUP_PREF)); + return fPreferenceStore.getString(TRACE_CONTROL_TRACING_GROUP_PREF).equals(fPreferenceStore.getDefaultString(TRACE_CONTROL_TRACING_GROUP_PREF)); } /** * @return value of tracing group preference */ public String getTracingGroup() { - return getPreferenceStore().getString(TRACE_CONTROL_TRACING_GROUP_PREF); + return fPreferenceStore.getString(TRACE_CONTROL_TRACING_GROUP_PREF); } /** * @return whether is logging is enabled */ public boolean isLoggingEnabled() { - return getPreferenceStore().getBoolean(TRACE_CONTROL_LOG_COMMANDS_PREF); + return fPreferenceStore.getBoolean(TRACE_CONTROL_LOG_COMMANDS_PREF); } /** * @return whether an existing log file will appended or not */ public boolean isAppend() { - return getPreferenceStore().getBoolean(ControlPreferences.TRACE_CONTROL_LOG_APPEND_PREF); + return fPreferenceStore.getBoolean(ControlPreferences.TRACE_CONTROL_LOG_APPEND_PREF); } /** * @return verbose level preference */ public String getVerboseLevel() { - return getPreferenceStore().getString(TRACE_CONTROL_VERBOSE_LEVEL_PREF); + return fPreferenceStore.getString(TRACE_CONTROL_VERBOSE_LEVEL_PREF); } /** * @return absolute log file path */ public String getLogfilePath() { - return getPreferenceStore().getString(TRACE_CONTROL_LOG_FILE_PATH_PREF); + return fPreferenceStore.getString(TRACE_CONTROL_LOG_FILE_PATH_PREF); } // ------------------------------------------------------------------------ @@ -121,8 +169,10 @@ public class ControlPreferences { /** * Initializes the control preferences (e.g. enable open log file) */ - public void init() { - if (getPreferenceStore().getBoolean(ControlPreferences.TRACE_CONTROL_LOG_COMMANDS_PREF)) { + public void init(IPreferenceStore preferenceStore) { + fPreferenceStore = preferenceStore; + + if (fPreferenceStore.getBoolean(ControlPreferences.TRACE_CONTROL_LOG_COMMANDS_PREF)) { ControlCommandLogger.init(getLogfilePath(), isAppend()); } } diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/BaseEventPropertySource.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/BaseEventPropertySource.java index 3c55169f6a..ed556ec79f 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/BaseEventPropertySource.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/BaseEventPropertySource.java @@ -14,8 +14,8 @@ package org.eclipse.linuxtools.internal.lttng2.ui.views.control.property; import java.util.ArrayList; import java.util.List; -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.core.control.model.TraceLogLevel; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.messages.Messages; import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.BaseEventComponent; import org.eclipse.ui.views.properties.IPropertyDescriptor; import org.eclipse.ui.views.properties.TextPropertyDescriptor; diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/KernelProviderPropertySource.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/KernelProviderPropertySource.java index 31694a2559..da6a94fbb9 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/KernelProviderPropertySource.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/KernelProviderPropertySource.java @@ -11,7 +11,7 @@ **********************************************************************/ package org.eclipse.linuxtools.internal.lttng2.ui.views.control.property; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.Messages; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.messages.Messages; import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.KernelProviderComponent; import org.eclipse.ui.views.properties.IPropertyDescriptor; import org.eclipse.ui.views.properties.TextPropertyDescriptor; diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/TargetNodePropertySource.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/TargetNodePropertySource.java index 025766c0a5..319f02fcf9 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/TargetNodePropertySource.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/TargetNodePropertySource.java @@ -11,7 +11,7 @@ **********************************************************************/ package org.eclipse.linuxtools.internal.lttng2.ui.views.control.property; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.Messages; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.messages.Messages; import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TargetNodeComponent; import org.eclipse.ui.views.properties.IPropertyDescriptor; import org.eclipse.ui.views.properties.TextPropertyDescriptor; diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/TraceChannelPropertySource.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/TraceChannelPropertySource.java index 1243e3eead..034c319ea2 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/TraceChannelPropertySource.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/TraceChannelPropertySource.java @@ -11,7 +11,7 @@ **********************************************************************/ package org.eclipse.linuxtools.internal.lttng2.ui.views.control.property; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.Messages; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.messages.Messages; import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceChannelComponent; import org.eclipse.ui.views.properties.IPropertyDescriptor; import org.eclipse.ui.views.properties.TextPropertyDescriptor; diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/TraceDomainPropertySource.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/TraceDomainPropertySource.java index 8b649c61c1..40a228f9eb 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/TraceDomainPropertySource.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/TraceDomainPropertySource.java @@ -11,7 +11,7 @@ **********************************************************************/ package org.eclipse.linuxtools.internal.lttng2.ui.views.control.property; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.Messages; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.messages.Messages; import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceDomainComponent; import org.eclipse.ui.views.properties.IPropertyDescriptor; import org.eclipse.ui.views.properties.TextPropertyDescriptor; diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/TraceEventPropertySource.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/TraceEventPropertySource.java index 0a31ec3722..4c0b5c7b64 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/TraceEventPropertySource.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/TraceEventPropertySource.java @@ -14,8 +14,8 @@ package org.eclipse.linuxtools.internal.lttng2.ui.views.control.property; import java.util.ArrayList; import java.util.List; -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.core.control.model.TraceLogLevel; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.messages.Messages; import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceEventComponent; import org.eclipse.ui.views.properties.IPropertyDescriptor; import org.eclipse.ui.views.properties.TextPropertyDescriptor; diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/TraceProbeEventPropertySource.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/TraceProbeEventPropertySource.java index 75234ad07d..d82dabcf30 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/TraceProbeEventPropertySource.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/TraceProbeEventPropertySource.java @@ -15,7 +15,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.Messages; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.messages.Messages; import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceEventComponent; import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceProbeEventComponent; import org.eclipse.ui.views.properties.IPropertyDescriptor; diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/TraceSessionPropertySource.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/TraceSessionPropertySource.java index 227fe23227..246a004705 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/TraceSessionPropertySource.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/TraceSessionPropertySource.java @@ -11,7 +11,7 @@ **********************************************************************/ package org.eclipse.linuxtools.internal.lttng2.ui.views.control.property; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.Messages; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.messages.Messages; import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceSessionComponent; import org.eclipse.ui.views.properties.IPropertyDescriptor; import org.eclipse.ui.views.properties.TextPropertyDescriptor; diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/UstProviderPropertySource.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/UstProviderPropertySource.java index 2221bf423c..e8ff6a9ba2 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/UstProviderPropertySource.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/UstProviderPropertySource.java @@ -11,7 +11,7 @@ **********************************************************************/ package org.eclipse.linuxtools.internal.lttng2.ui.views.control.property; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.Messages; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.messages.Messages; import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.UstProviderComponent; import org.eclipse.ui.views.properties.IPropertyDescriptor; import org.eclipse.ui.views.properties.TextPropertyDescriptor; diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/service/CommandResult.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/remote/CommandResult.java similarity index 99% rename from org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/service/CommandResult.java rename to org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/remote/CommandResult.java index 840bd47e06..92985df483 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/service/CommandResult.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/remote/CommandResult.java @@ -9,7 +9,7 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.ui.views.control.service; +package org.eclipse.linuxtools.internal.lttng2.ui.views.control.remote; import java.util.Arrays; diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/service/CommandShell.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/remote/CommandShell.java similarity index 98% rename from org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/service/CommandShell.java rename to org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/remote/CommandShell.java index 1e833019a6..ea2b110813 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/service/CommandShell.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/remote/CommandShell.java @@ -10,7 +10,7 @@ * Patrick Tasse - Initial API and implementation * Bernd Hufmann - Updated using Executor Framework **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.ui.views.control.service; +package org.eclipse.linuxtools.internal.lttng2.ui.views.control.remote; import java.io.BufferedReader; import java.io.IOException; @@ -27,8 +27,7 @@ import java.util.concurrent.TimeoutException; import org.eclipse.core.commands.ExecutionException; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.NullProgressMonitor; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.Messages; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.remote.IRemoteSystemProxy; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.messages.Messages; import org.eclipse.rse.services.shells.HostShellProcessAdapter; import org.eclipse.rse.services.shells.IHostShell; import org.eclipse.rse.services.shells.IShellService; diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/service/ICommandResult.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/remote/ICommandResult.java similarity index 99% rename from org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/service/ICommandResult.java rename to org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/remote/ICommandResult.java index f64824d7f6..f96fa26b4a 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/service/ICommandResult.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/remote/ICommandResult.java @@ -9,7 +9,7 @@ * Contributors: * Bernd Hufmann - Initial API and implementation *********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.ui.views.control.service; +package org.eclipse.linuxtools.internal.lttng2.ui.views.control.remote; /** * IommandResult diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/service/ICommandShell.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/remote/ICommandShell.java similarity index 99% rename from org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/service/ICommandShell.java rename to org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/remote/ICommandShell.java index 95aabc6769..1f1046ba62 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/service/ICommandShell.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/remote/ICommandShell.java @@ -9,7 +9,7 @@ * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.lttng2.ui.views.control.service; +package org.eclipse.linuxtools.internal.lttng2.ui.views.control.remote; import org.eclipse.core.commands.ExecutionException; import org.eclipse.core.runtime.IProgressMonitor; diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/remote/IRemoteSystemProxy.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/remote/IRemoteSystemProxy.java index 697a5a1dd8..d187d215a0 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/remote/IRemoteSystemProxy.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/remote/IRemoteSystemProxy.java @@ -12,7 +12,6 @@ package org.eclipse.linuxtools.internal.lttng2.ui.views.control.remote; import org.eclipse.core.commands.ExecutionException; -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.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/remote/RemoteSystemProxy.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/remote/RemoteSystemProxy.java index b9f07836a2..de88e7b6a6 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/remote/RemoteSystemProxy.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/remote/RemoteSystemProxy.java @@ -13,8 +13,6 @@ 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.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; diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/service/ILttngControlService.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/service/ILttngControlService.java index 30400dc0c1..c6f49755c4 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/service/ILttngControlService.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/service/ILttngControlService.java @@ -15,12 +15,12 @@ import java.util.List; import org.eclipse.core.commands.ExecutionException; import org.eclipse.core.runtime.IProgressMonitor; -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; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.IBaseEventInfo; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.IChannelInfo; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.ISessionInfo; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.IUstProviderInfo; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.LogLevelType; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceLogLevel; /** ILttngControlService diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/service/LTTngControlService.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/service/LTTngControlService.java index 3604d8fa01..b87474eadd 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/service/LTTngControlService.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/service/LTTngControlService.java @@ -19,26 +19,28 @@ import java.util.regex.Matcher; import org.eclipse.core.commands.ExecutionException; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.NullProgressMonitor; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.Messages; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.IBaseEventInfo; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.IChannelInfo; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.IDomainInfo; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.IEventInfo; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.IProbeEventInfo; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.ISessionInfo; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.IUstProviderInfo; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.LogLevelType; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceEventType; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceLogLevel; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.impl.BaseEventInfo; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.impl.ChannelInfo; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.impl.DomainInfo; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.impl.EventInfo; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.impl.ProbeEventInfo; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.impl.SessionInfo; +import org.eclipse.linuxtools.internal.lttng2.core.control.model.impl.UstProviderInfo; import org.eclipse.linuxtools.internal.lttng2.ui.views.control.logging.ControlCommandLogger; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.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; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.messages.Messages; import org.eclipse.linuxtools.internal.lttng2.ui.views.control.preferences.ControlPreferences; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.remote.ICommandResult; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.remote.ICommandShell; /** * LTTngControlService diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/service/LTTngControlServiceFactory.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/service/LTTngControlServiceFactory.java index 340fdfc2cc..ebf19ed2a8 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/service/LTTngControlServiceFactory.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/service/LTTngControlServiceFactory.java @@ -15,7 +15,9 @@ import java.util.regex.Matcher; import org.eclipse.core.commands.ExecutionException; import org.eclipse.core.runtime.NullProgressMonitor; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.Messages; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.messages.Messages; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.remote.ICommandResult; +import org.eclipse.linuxtools.internal.lttng2.ui.views.control.remote.ICommandShell; /** * LTTngControlServiceFactory -- 2.34.1