From d62bfa55b9869503b62adb576f50bf8743129ab0 Mon Sep 17 00:00:00 2001 From: Bernd Hufmann Date: Mon, 23 Apr 2012 15:21:19 -0400 Subject: [PATCH] Update enable channel and event dialogs and handlers --- .../TraceControlKernelSessionTests.java | 12 +++--- .../TraceControlUstProviderTests.java | 10 ++--- .../TraceControlUstSessionTests.java | 10 ++--- ...Stub.java => EnableChannelDialogStub.java} | 6 +-- .../icons/elcl16/disable_event.gif | Bin 0 -> 130 bytes .../icons/elcl16/enable_event.gif | Bin 0 -> 140 bytes .../plugin.properties | 7 ++- org.eclipse.linuxtools.lttng2.ui/plugin.xml | 40 +++++++++--------- ...elDialog.java => EnableChannelDialog.java} | 24 +++++------ .../control/dialogs/EnableEventsDialog.java | 2 +- .../control/dialogs/GetEventInfoDialog.java | 2 +- ...lDialog.java => IEnableChannelDialog.java} | 6 +-- .../dialogs/TraceControlDialogFactory.java | 22 +++++----- ...ler.java => BaseEnableChannelHandler.java} | 10 ++--- ...java => EnableChannelOnDomainHandler.java} | 6 +-- ...ava => EnableChannelOnSessionHandler.java} | 6 +-- 16 files changed, 81 insertions(+), 82 deletions(-) rename org.eclipse.linuxtools.lttng2.ui.tests/stubs/org/eclipse/linuxtools/internal/lttng2/stubs/dialogs/{CreateChannelDialogStub.java => EnableChannelDialogStub.java} (94%) create mode 100644 org.eclipse.linuxtools.lttng2.ui/icons/elcl16/disable_event.gif create mode 100644 org.eclipse.linuxtools.lttng2.ui/icons/elcl16/enable_event.gif rename org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/{CreateChannelDialog.java => EnableChannelDialog.java} (95%) rename org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/{ICreateChannelDialog.java => IEnableChannelDialog.java} (91%) rename org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/{BaseCreateChannelHandler.java => BaseEnableChannelHandler.java} (93%) rename org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/{CreateChannelOnDomainHandler.java => EnableChannelOnDomainHandler.java} (96%) rename org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/{CreateChannelOnSessionHandler.java => EnableChannelOnSessionHandler.java} (96%) 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 ac70305ced..4843b4f9f9 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 @@ -23,7 +23,7 @@ import junit.framework.TestSuite; import org.eclipse.core.runtime.FileLocator; import org.eclipse.core.runtime.Path; import org.eclipse.linuxtools.internal.lttng2.stubs.dialogs.AddContextDialogStub; -import org.eclipse.linuxtools.internal.lttng2.stubs.dialogs.CreateChannelDialogStub; +import org.eclipse.linuxtools.internal.lttng2.stubs.dialogs.EnableChannelDialogStub; 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.EnableEventsDialogStub; @@ -173,13 +173,13 @@ public class TraceControlKernelSessionTests extends TestCase { fProxy.setScenario(SCEN_SCENARIO3_TEST); // ------------------------------------------------------------------------ - // Create channel on session + // Enable channel on session // ------------------------------------------------------------------------ - CreateChannelDialogStub channelStub = new CreateChannelDialogStub(); + EnableChannelDialogStub channelStub = new EnableChannelDialogStub(); channelStub.setIsKernel(true); - TraceControlDialogFactory.getInstance().setCreateChannelDialog(channelStub); + TraceControlDialogFactory.getInstance().setEnableChannelDialog(channelStub); - fFacility.executeCommand(session, "createChannelOnSession"); + fFacility.executeCommand(session, "enableChannelOnSession"); // Verify that Kernel domain was created ITraceControlComponent[] domains = session.getChildren(); @@ -216,7 +216,7 @@ public class TraceControlKernelSessionTests extends TestCase { info.setReadTimer(200); channelStub.setChannelInfo(info); - fFacility.executeCommand(domains[0], "createChannelOnDomain"); + fFacility.executeCommand(domains[0], "enableChannelOnDomain"); // Get Kernel domain component instance domains = session.getChildren(); 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 0994ffe057..3aeba2ab39 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,7 +20,7 @@ import junit.framework.TestSuite; import org.eclipse.core.runtime.FileLocator; import org.eclipse.core.runtime.Path; -import org.eclipse.linuxtools.internal.lttng2.stubs.dialogs.CreateChannelDialogStub; +import org.eclipse.linuxtools.internal.lttng2.stubs.dialogs.EnableChannelDialogStub; 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; @@ -183,18 +183,18 @@ public class TraceControlUstProviderTests extends TestCase { assertEquals(TraceSessionState.INACTIVE, session.getSessionState()); // ------------------------------------------------------------------------ - // Create Channel on UST global domain + // Enable Channel on UST global domain // ------------------------------------------------------------------------ fProxy.setScenario(SCEN_SCENARIO2_TEST); - CreateChannelDialogStub channelDialogStub = new CreateChannelDialogStub(); + EnableChannelDialogStub channelDialogStub = new EnableChannelDialogStub(); channelDialogStub.setIsKernel(false); channelDialogStub.getChannelInfo().setOverwriteMode(false); channelDialogStub.getChannelInfo().setSwitchTimer(200); channelDialogStub.getChannelInfo().setReadTimer(100); channelDialogStub.getChannelInfo().setNumberOfSubBuffers(2); - TraceControlDialogFactory.getInstance().setCreateChannelDialog(channelDialogStub); + TraceControlDialogFactory.getInstance().setEnableChannelDialog(channelDialogStub); - fFacility.executeCommand(session, "createChannelOnSession"); + fFacility.executeCommand(session, "enableChannelOnSession"); // Verify that UST domain was created ITraceControlComponent[] domains = session.getChildren(); 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 5b6d320630..d5189bddd3 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,7 +22,7 @@ import junit.framework.TestSuite; import org.eclipse.core.runtime.FileLocator; import org.eclipse.core.runtime.Path; -import org.eclipse.linuxtools.internal.lttng2.stubs.dialogs.CreateChannelDialogStub; +import org.eclipse.linuxtools.internal.lttng2.stubs.dialogs.EnableChannelDialogStub; 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.EnableEventsDialogStub; @@ -170,11 +170,11 @@ public class TraceControlUstSessionTests extends TestCase { // ------------------------------------------------------------------------ // Enable default channel on created session above // ------------------------------------------------------------------------ - CreateChannelDialogStub channelStub = new CreateChannelDialogStub(); + EnableChannelDialogStub channelStub = new EnableChannelDialogStub(); channelStub.setIsKernel(false); - TraceControlDialogFactory.getInstance().setCreateChannelDialog(channelStub); + TraceControlDialogFactory.getInstance().setEnableChannelDialog(channelStub); - fFacility.executeCommand(session, "createChannelOnSession"); + fFacility.executeCommand(session, "enableChannelOnSession"); // Verify that Kernel domain was created ITraceControlComponent[] domains = session.getChildren(); @@ -211,7 +211,7 @@ public class TraceControlUstSessionTests extends TestCase { info.setReadTimer(200); channelStub.setChannelInfo(info); - fFacility.executeCommand(domains[0], "createChannelOnDomain"); + fFacility.executeCommand(domains[0], "enableChannelOnDomain"); // Get Kernel domain component instance domains = session.getChildren(); diff --git a/org.eclipse.linuxtools.lttng2.ui.tests/stubs/org/eclipse/linuxtools/internal/lttng2/stubs/dialogs/CreateChannelDialogStub.java b/org.eclipse.linuxtools.lttng2.ui.tests/stubs/org/eclipse/linuxtools/internal/lttng2/stubs/dialogs/EnableChannelDialogStub.java similarity index 94% rename from org.eclipse.linuxtools.lttng2.ui.tests/stubs/org/eclipse/linuxtools/internal/lttng2/stubs/dialogs/CreateChannelDialogStub.java rename to org.eclipse.linuxtools.lttng2.ui.tests/stubs/org/eclipse/linuxtools/internal/lttng2/stubs/dialogs/EnableChannelDialogStub.java index 187f9cc40e..532d5f4d12 100644 --- a/org.eclipse.linuxtools.lttng2.ui.tests/stubs/org/eclipse/linuxtools/internal/lttng2/stubs/dialogs/CreateChannelDialogStub.java +++ b/org.eclipse.linuxtools.lttng2.ui.tests/stubs/org/eclipse/linuxtools/internal/lttng2/stubs/dialogs/EnableChannelDialogStub.java @@ -11,7 +11,7 @@ **********************************************************************/ package org.eclipse.linuxtools.internal.lttng2.stubs.dialogs; -import org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.ICreateChannelDialog; +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; @@ -19,7 +19,7 @@ import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceD /** * Create channel dialog stub implementation. */ -public class CreateChannelDialogStub implements ICreateChannelDialog { +public class EnableChannelDialogStub implements IEnableChannelDialog { // ------------------------------------------------------------------------ // Attributes @@ -31,7 +31,7 @@ public class CreateChannelDialogStub implements ICreateChannelDialog { // ------------------------------------------------------------------------ // Constructor // ------------------------------------------------------------------------ - public CreateChannelDialogStub() { + public EnableChannelDialogStub() { fChannelInfo = new ChannelInfo("mychannel"); //$NON-NLS-1$ fChannelInfo.setNumberOfSubBuffers(4); fChannelInfo.setOverwriteMode(true); diff --git a/org.eclipse.linuxtools.lttng2.ui/icons/elcl16/disable_event.gif b/org.eclipse.linuxtools.lttng2.ui/icons/elcl16/disable_event.gif new file mode 100644 index 0000000000000000000000000000000000000000..2966a281637b99909c8f57c8f884be9f16db2d27 GIT binary patch literal 130 zcmZ?wbhEHb6krfw*v!E2`1KF}0RR90|DQa0a@)3T?d|PVRaKdpnd#~2Nl8hep`k!2 z1|*>PlZBCiftx`GBnC2rfknUIr043r7O!L7EsrkX zKn03FSr|bgIv@gMh69VGzzNT6-=kBUJUp&V=}GpOxO8P3XOhgV1r1?~cVG literal 0 HcmV?d00001 diff --git a/org.eclipse.linuxtools.lttng2.ui/plugin.properties b/org.eclipse.linuxtools.lttng2.ui/plugin.properties index e99ca54713..6009a23ad8 100644 --- a/org.eclipse.linuxtools.lttng2.ui/plugin.properties +++ b/org.eclipse.linuxtools.lttng2.ui/plugin.properties @@ -90,8 +90,11 @@ commands.control.create.session.description=Create a Trace Session commands.control.destroy.session=Destroy Session... commands.control.destroy.session.description=Destroy a Trace Session -commands.control.create.channel=Create Channel... -commands.control.create.channel.description=Create a Trace Channel +commands.control.enable.channelOnSession=Enable Channel... +commands.control.enable.channelOnSession.description=Enable a Trace Channel + +commands.control.enable.channelOnDomain=Enable Channel... +commands.control.enable.channelOnDomain.description=Enable a Trace Channel commands.control.enable.channel=Enable Channel commands.control.enable.channel.description=Enable a Trace Channel diff --git a/org.eclipse.linuxtools.lttng2.ui/plugin.xml b/org.eclipse.linuxtools.lttng2.ui/plugin.xml index 48379557b5..e686aa0ae4 100644 --- a/org.eclipse.linuxtools.lttng2.ui/plugin.xml +++ b/org.eclipse.linuxtools.lttng2.ui/plugin.xml @@ -86,15 +86,15 @@ + description="%commands.control.enable.channelOnSession.description" + id="org.eclipse.linuxtools.internal.lttng2.ui.commands.control.enableChannelOnSession" + name="%commands.control.enable.channelOnSession"> + description="%commands.control.enable.channelOnDomain.description" + id="org.eclipse.linuxtools.internal.lttng2.ui.commands.control.enableChannelOnDomain" + name="%commands.control.enable.channelOnDomain"> @@ -473,7 +473,7 @@ @@ -527,7 +527,7 @@ + class="org.eclipse.linuxtools.internal.lttng2.ui.views.control.handlers.EnableChannelOnSessionHandler" + commandId="org.eclipse.linuxtools.internal.lttng2.ui.commands.control.enableChannelOnSession"> @@ -901,8 +901,8 @@ + class="org.eclipse.linuxtools.internal.lttng2.ui.views.control.handlers.EnableChannelOnDomainHandler" + commandId="org.eclipse.linuxtools.internal.lttng2.ui.commands.control.enableChannelOnDomain"> diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/CreateChannelDialog.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/EnableChannelDialog.java similarity index 95% rename from org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/CreateChannelDialog.java rename to org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/EnableChannelDialog.java index b250711f51..0d8e03069a 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/CreateChannelDialog.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/EnableChannelDialog.java @@ -22,7 +22,6 @@ import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceD import org.eclipse.swt.SWT; import org.eclipse.swt.events.VerifyEvent; import org.eclipse.swt.events.VerifyListener; -import org.eclipse.swt.graphics.Point; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Button; @@ -34,12 +33,12 @@ import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Text; /** - * CreateChannelDialog + * EnableChannelDialog *

- * Dialog box for collecting channel creation information. + * Dialog box for collecting channel information when enabling a channel (which will be created). *

*/ -public class CreateChannelDialog extends Dialog implements ICreateChannelDialog { +public class EnableChannelDialog extends Dialog implements IEnableChannelDialog { // ------------------------------------------------------------------------ // Constants @@ -122,7 +121,7 @@ public class CreateChannelDialog extends Dialog implements ICreateChannelDialog * Constructor * @param shell - a shell for the display of the dialog */ - public CreateChannelDialog(Shell shell) { + public EnableChannelDialog(Shell shell) { super(shell); fIsKernel = true; @@ -134,6 +133,7 @@ public class CreateChannelDialog extends Dialog implements ICreateChannelDialog e.doit = e.text.matches("[0-9]*"); //$NON-NLS-1$ } }; + setShellStyle(SWT.RESIZE); } // ------------------------------------------------------------------------ @@ -194,7 +194,7 @@ public class CreateChannelDialog extends Dialog implements ICreateChannelDialog // Main dialog panel fDialogComposite = new Composite(parent, SWT.NONE); - GridLayout layout = new GridLayout(2, true); + GridLayout layout = new GridLayout(3, true); fDialogComposite.setLayout(layout); Label channelNameLabel = new Label(fDialogComposite, SWT.RIGHT); @@ -259,14 +259,14 @@ public class CreateChannelDialog extends Dialog implements ICreateChannelDialog } // layout widgets - GridData data = new GridData(GridData.FILL, GridData.CENTER, false, false, 2, 1); + GridData data = new GridData(GridData.FILL, GridData.CENTER, false, false, 3, 1); discardModeGroup.setLayoutData(data); data = new GridData(SWT.BEGINNING, SWT.BEGINNING, true, true); fDiscardModeButton.setLayoutData(data); data = new GridData(SWT.BEGINNING, SWT.BEGINNING, true, true); fOverwriteModeButton.setLayoutData(data); - data = new GridData(GridData.FILL, GridData.CENTER, false, false, 2, 1); + data = new GridData(GridData.FILL, GridData.CENTER, false, false, 3, 1); fDomainGroup.setLayoutData(data); data = new GridData(SWT.BEGINNING, SWT.BEGINNING, true, true); @@ -274,10 +274,8 @@ public class CreateChannelDialog extends Dialog implements ICreateChannelDialog data = new GridData(SWT.BEGINNING, SWT.BEGINNING, true, true); fUstButton.setLayoutData(data); - data = new GridData(GridData.HORIZONTAL_ALIGN_FILL); - fSubBufferSizeText.setText("666.666.666.666"); //$NON-NLS-1$ - Point minSize = fSubBufferSizeText.computeSize(SWT.DEFAULT, SWT.DEFAULT, true); - data.widthHint = minSize.x + 5; + data = new GridData(GridData.FILL_HORIZONTAL); + data.horizontalSpan = 2; fChannelNameText.setLayoutData(data); fSubBufferSizeText.setLayoutData(data); @@ -285,8 +283,6 @@ public class CreateChannelDialog extends Dialog implements ICreateChannelDialog fSwitchTimerText.setLayoutData(data); fReadTimerText.setLayoutData(data); - fSubBufferSizeText.setText(""); //$NON-NLS-1$ - setDefaults(); return fDialogComposite; 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 53cd10c3ed..f10b89ad16 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 @@ -48,7 +48,7 @@ public class EnableEventsDialog extends Dialog implements IEnableEventsDialog { /** * The icon file for this dialog box. */ - public static final String ENABLE_EVENT_ICON_FILE = "icons/elcl16/enable.gif"; //$NON-NLS-1$ + public static final String ENABLE_EVENT_ICON_FILE = "icons/elcl16/enable_event.gif"; //$NON-NLS-1$ // ------------------------------------------------------------------------ // Attributes 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 e2ad1fb9a4..f43905cbe0 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 @@ -47,7 +47,7 @@ public class GetEventInfoDialog extends Dialog implements IGetEventInfoDialog { /** * The icon file for this dialog box. */ - public static final String TARGET_NEW_CONNECTION_ICON_FILE = "icons/elcl16/enable.gif"; //$NON-NLS-1$ + public static final String TARGET_NEW_CONNECTION_ICON_FILE = "icons/elcl16/enable_event.gif"; //$NON-NLS-1$ // ------------------------------------------------------------------------ // Attributes diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/ICreateChannelDialog.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/IEnableChannelDialog.java similarity index 91% rename from org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/ICreateChannelDialog.java rename to org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/IEnableChannelDialog.java index 49679e89d4..84b74167c6 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/ICreateChannelDialog.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/IEnableChannelDialog.java @@ -15,12 +15,12 @@ import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IChannelInf import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceDomainComponent; /** - * ICreateChannelDialog + * IEnableChannelDialog *

- * Interface for the create channel dialog when domain is known. + * Interface for the enable channel dialog when domain is known. *

*/ -public interface ICreateChannelDialog { +public interface IEnableChannelDialog { // ------------------------------------------------------------------------ // Accessors diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/TraceControlDialogFactory.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/TraceControlDialogFactory.java index 695a0f7ca8..8ef9e7c261 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/TraceControlDialogFactory.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/TraceControlDialogFactory.java @@ -20,9 +20,9 @@ final public class TraceControlDialogFactory { private INewConnectionDialog fNewConnectionDialog; /** - * The create channel dialog (on domain level) + * The enable channel dialog */ - private ICreateChannelDialog fCreateChannelDialog; + private IEnableChannelDialog fEnableChannelDialog; /** * The create session dialog. @@ -102,21 +102,21 @@ final public class TraceControlDialogFactory { } /** - * @return create channel dialog (on domain level) + * @return enable channel dialog */ - public ICreateChannelDialog getCreateChannelDialog() { - if (fCreateChannelDialog == null) { - fCreateChannelDialog = new CreateChannelDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell()); + public IEnableChannelDialog getEnableChannelDialog() { + if (fEnableChannelDialog == null) { + fEnableChannelDialog = new EnableChannelDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell()); } - return fCreateChannelDialog; + return fEnableChannelDialog; } /** - * Sets a create channel dialog implementation (on domain level). - * @param createChannelDialog - a create channel dialog implementation + * Sets a enable channel dialog implementation. + * @param createEnableDialog - a create channel dialog implementation */ - public void setCreateChannelDialog(ICreateChannelDialog createChannelDialog) { - fCreateChannelDialog = createChannelDialog; + public void setEnableChannelDialog(IEnableChannelDialog createEnableDialog) { + fEnableChannelDialog = createEnableDialog; } /** diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/BaseCreateChannelHandler.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/BaseEnableChannelHandler.java similarity index 93% rename from org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/BaseCreateChannelHandler.java rename to org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/BaseEnableChannelHandler.java index 1bb2298bbe..9bcd4407ba 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/BaseCreateChannelHandler.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/BaseEnableChannelHandler.java @@ -23,18 +23,18 @@ 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.ICreateChannelDialog; +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.model.impl.TraceDomainComponent; /** - * BaseCreateChannelHandler + * BaseEnableChannelHandler *

- * Base implementation of aCommand handler implementation to create a trace channel. + * Base implementation of a command handler to enable a trace channel. *

*/ -abstract class BaseCreateChannelHandler extends BaseControlViewHandler { +abstract class BaseEnableChannelHandler extends BaseControlViewHandler { // ------------------------------------------------------------------------ // Attributes @@ -73,7 +73,7 @@ abstract class BaseCreateChannelHandler extends BaseControlViewHandler { try { final CommandParameter param = fParam.clone(); - final ICreateChannelDialog dialog = TraceControlDialogFactory.getInstance().getCreateChannelDialog(); + final IEnableChannelDialog dialog = TraceControlDialogFactory.getInstance().getEnableChannelDialog(); dialog.setDomainComponent(getDomain(param)); if (dialog.open() != Window.OK) { diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/CreateChannelOnDomainHandler.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/EnableChannelOnDomainHandler.java similarity index 96% rename from org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/CreateChannelOnDomainHandler.java rename to org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/EnableChannelOnDomainHandler.java index 56b51c10bf..3b925a0f74 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/CreateChannelOnDomainHandler.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/EnableChannelOnDomainHandler.java @@ -26,12 +26,12 @@ import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceS import org.eclipse.ui.IWorkbenchPage; /** - * CreateChannelOnDomainHandler + * EnableChannelOnDomainHandler *

- * Command handler implementation to create a trace channel for known domain. + * Command handler implementation to enable a trace channel for known domain. *

*/ -public class CreateChannelOnDomainHandler extends BaseCreateChannelHandler { +public class EnableChannelOnDomainHandler extends BaseEnableChannelHandler { // ------------------------------------------------------------------------ // Attributes diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/CreateChannelOnSessionHandler.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/EnableChannelOnSessionHandler.java similarity index 96% rename from org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/CreateChannelOnSessionHandler.java rename to org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/EnableChannelOnSessionHandler.java index 425d814f9b..8602661299 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/CreateChannelOnSessionHandler.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/EnableChannelOnSessionHandler.java @@ -26,13 +26,13 @@ import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceS import org.eclipse.ui.IWorkbenchPage; /** - * CreateChannelOnSessionHandler + * EnableChannelOnSessionHandler *

- * Command handler implementation to create a trace channel for unknown domain + * Command handler implementation to enable a trace channel for unknown domain * (on session level). *

*/ -public class CreateChannelOnSessionHandler extends BaseCreateChannelHandler { +public class EnableChannelOnSessionHandler extends BaseEnableChannelHandler { // ------------------------------------------------------------------------ // Attributes -- 2.34.1