Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lttng/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/AddContextDialog.java23
-rw-r--r--lttng/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/EnableChannelDialog.java48
-rw-r--r--lttng/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/GetEventInfoDialog.java42
-rw-r--r--lttng/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/ImportConfirmationDialog.java20
-rw-r--r--lttng/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/ImportDialog.java8
-rw-r--r--lttng/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/NewConnectionDialog.java50
-rw-r--r--lttng/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/TraceControlDialogFactory.java2
-rw-r--r--lttng/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/ChangeChannelStateHandler.java16
-rw-r--r--lttng/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/ChangeSessionStateHandler.java4
-rw-r--r--lttng/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/logging/ControlCommandLogger.java3
-rw-r--r--lttng/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/remote/IRemoteSystemProxy.java2
-rw-r--r--lttng/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/service/ILttngControlService.java42
-rw-r--r--lttng/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/service/LTTngControlService.java2
-rw-r--r--lttng/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/service/LTTngControlServiceConstants.java164
14 files changed, 190 insertions, 236 deletions
diff --git a/lttng/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/AddContextDialog.java b/lttng/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/AddContextDialog.java
index cc7f698b58..662efbdc5e 100644
--- a/lttng/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/AddContextDialog.java
+++ b/lttng/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/AddContextDialog.java
@@ -57,11 +57,6 @@ public class AddContextDialog extends Dialog implements IAddContextDialog {
// ------------------------------------------------------------------------
/**
- * The dialog composite.
- */
- private Composite fDialogComposite;
-
- /**
* A tree viewer for displaying and selection of available contexts.
*/
private CheckboxTreeViewer fContextsViewer;
@@ -120,13 +115,13 @@ public class AddContextDialog extends Dialog implements IAddContextDialog {
protected Control createDialogArea(Composite parent) {
// Main dialog panel
- fDialogComposite = new Composite(parent, SWT.NONE);
+ Composite dialogComposite = new Composite(parent, SWT.NONE);
GridLayout layout = new GridLayout(1, true);
- fDialogComposite.setLayout(layout);
- fDialogComposite.setLayoutData(new GridData(GridData.FILL_BOTH));
+ dialogComposite.setLayout(layout);
+ dialogComposite.setLayoutData(new GridData(GridData.FILL_BOTH));
// Contexts list
- Group contextGroup = new Group(fDialogComposite, SWT.SHADOW_NONE);
+ Group contextGroup = new Group(dialogComposite, SWT.SHADOW_NONE);
contextGroup.setText(Messages.TraceControl_AddContextAvailableContextsLabel);
layout = new GridLayout(1, true);
contextGroup.setLayout(layout);
@@ -143,7 +138,7 @@ public class AddContextDialog extends Dialog implements IAddContextDialog {
getShell().setMinimumSize(new Point(500, 450));
- return fDialogComposite;
+ return dialogComposite;
}
@Override
@@ -405,21 +400,21 @@ public class AddContextDialog extends Dialog implements IAddContextDialog {
/**
* @return The name of this component
*/
- public String getName();
+ String getName();
/**
* @return The parent component
*/
- public Object getParent();
+ Object getParent();
/**
* @return The array of children of this component
*/
- public Object[] getChildren();
+ Object[] getChildren();
/**
* @return If this component has children or not
*/
- public boolean hasChildren();
+ boolean hasChildren();
}
}
diff --git a/lttng/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/EnableChannelDialog.java b/lttng/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/EnableChannelDialog.java
index 56ce875872..ae92efb5c7 100644
--- a/lttng/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/EnableChannelDialog.java
+++ b/lttng/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/EnableChannelDialog.java
@@ -53,10 +53,6 @@ public class EnableChannelDialog extends Dialog implements IEnableChannelDialog
// Attributes
// ------------------------------------------------------------------------
/**
- * The dialog composite.
- */
- private Composite fDialogComposite = null;
- /**
* The text widget for the channel name
*/
private Text fChannelNameText = null;
@@ -85,10 +81,6 @@ public class EnableChannelDialog extends Dialog implements IEnableChannelDialog
*/
private Text fReadTimerText = null;
/**
- * Group composite for domain selection.
- */
- private Group fDomainGroup = null;
- /**
* Radio button for selecting kernel domain.
*/
private Button fKernelButton = null;
@@ -191,40 +183,40 @@ public class EnableChannelDialog extends Dialog implements IEnableChannelDialog
protected Control createDialogArea(Composite parent) {
// Main dialog panel
- fDialogComposite = new Composite(parent, SWT.NONE);
+ Composite dialogComposite = new Composite(parent, SWT.NONE);
GridLayout layout = new GridLayout(3, true);
- fDialogComposite.setLayout(layout);
+ dialogComposite.setLayout(layout);
- Label channelNameLabel = new Label(fDialogComposite, SWT.RIGHT);
+ Label channelNameLabel = new Label(dialogComposite, SWT.RIGHT);
channelNameLabel.setText(Messages.TraceControl_EnableChannelNameLabel);
- fChannelNameText = new Text(fDialogComposite, SWT.NONE);
+ fChannelNameText = new Text(dialogComposite, SWT.NONE);
fChannelNameText.setToolTipText(Messages.TraceControl_EnableChannelNameTooltip);
- Label subBufferSizeLabel = new Label(fDialogComposite, SWT.RIGHT);
+ Label subBufferSizeLabel = new Label(dialogComposite, SWT.RIGHT);
subBufferSizeLabel.setText(Messages.TraceControl_SubBufferSizePropertyName);
- fSubBufferSizeText = new Text(fDialogComposite, SWT.NONE);
+ fSubBufferSizeText = new Text(dialogComposite, SWT.NONE);
fSubBufferSizeText.setToolTipText(Messages.TraceControl_EnableChannelSubBufferSizeTooltip);
fSubBufferSizeText.addVerifyListener(fVerifyListener);
- Label numSubBufferLabel = new Label(fDialogComposite, SWT.RIGHT);
+ Label numSubBufferLabel = new Label(dialogComposite, SWT.RIGHT);
numSubBufferLabel.setText(Messages.TraceControl_NbSubBuffersPropertyName);
- fNumberOfSubBuffersText = new Text(fDialogComposite, SWT.NONE);
+ fNumberOfSubBuffersText = new Text(dialogComposite, SWT.NONE);
fNumberOfSubBuffersText.setToolTipText(Messages.TraceControl_EnableChannelNbSubBuffersTooltip);
fNumberOfSubBuffersText.addVerifyListener(fVerifyListener);
- Label switchTimerLabel = new Label(fDialogComposite, SWT.RIGHT);
+ Label switchTimerLabel = new Label(dialogComposite, SWT.RIGHT);
switchTimerLabel.setText(Messages.TraceControl_SwitchTimerPropertyName);
- fSwitchTimerText = new Text(fDialogComposite, SWT.NONE);
+ fSwitchTimerText = new Text(dialogComposite, SWT.NONE);
fSwitchTimerText.setToolTipText(Messages.TraceControl_EnableChannelSwitchTimerTooltip);
fSwitchTimerText.addVerifyListener(fVerifyListener);
- Label readTimerLabel = new Label(fDialogComposite, SWT.RIGHT);
+ Label readTimerLabel = new Label(dialogComposite, SWT.RIGHT);
readTimerLabel.setText(Messages.TraceControl_ReadTimerPropertyName);
- fReadTimerText = new Text(fDialogComposite, SWT.NONE);
+ fReadTimerText = new Text(dialogComposite, SWT.NONE);
fReadTimerText.setToolTipText(Messages.TraceControl_EnableChannelReadTimerTooltip);
fReadTimerText.addVerifyListener(fVerifyListener);
- Group discardModeGroup = new Group(fDialogComposite, SWT.SHADOW_NONE);
+ Group discardModeGroup = new Group(dialogComposite, SWT.SHADOW_NONE);
discardModeGroup.setText(Messages.TraceControl_EnableChannelDiscardModeGroupName);
layout = new GridLayout(2, true);
discardModeGroup.setLayout(layout);
@@ -239,15 +231,15 @@ public class EnableChannelDialog extends Dialog implements IEnableChannelDialog
fOverwriteModeButton.setToolTipText(Messages.TraceControl_EnableChannelOverwriteModeTooltip);
fOverwriteModeButton.setSelection(false);
- fDomainGroup = new Group(fDialogComposite, SWT.SHADOW_NONE);
- fDomainGroup.setText(Messages.TraceControl_DomainDisplayName);
+ Group domainGroup = new Group(dialogComposite, SWT.SHADOW_NONE);
+ domainGroup.setText(Messages.TraceControl_DomainDisplayName);
layout = new GridLayout(2, true);
- fDomainGroup.setLayout(layout);
+ domainGroup.setLayout(layout);
- fKernelButton = new Button(fDomainGroup, SWT.RADIO);
+ fKernelButton = new Button(domainGroup, SWT.RADIO);
fKernelButton.setText(Messages.TraceControl_KernelDomainDisplayName);
fKernelButton.setSelection(fIsKernel);
- fUstButton = new Button(fDomainGroup, SWT.RADIO);
+ fUstButton = new Button(domainGroup, SWT.RADIO);
fUstButton.setText(Messages.TraceControl_UstDisplayName);
fUstButton.setSelection(!fIsKernel);
@@ -265,7 +257,7 @@ public class EnableChannelDialog extends Dialog implements IEnableChannelDialog
fOverwriteModeButton.setLayoutData(data);
data = new GridData(GridData.FILL, GridData.CENTER, false, false, 3, 1);
- fDomainGroup.setLayoutData(data);
+ domainGroup.setLayoutData(data);
data = new GridData(SWT.BEGINNING, SWT.BEGINNING, true, true);
fKernelButton.setLayoutData(data);
@@ -283,7 +275,7 @@ public class EnableChannelDialog extends Dialog implements IEnableChannelDialog
setDefaults();
- return fDialogComposite;
+ return dialogComposite;
}
@Override
diff --git a/lttng/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/GetEventInfoDialog.java b/lttng/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/GetEventInfoDialog.java
index e71ce19ab3..28ebd7fb4c 100644
--- a/lttng/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/GetEventInfoDialog.java
+++ b/lttng/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/GetEventInfoDialog.java
@@ -56,18 +56,6 @@ public class GetEventInfoDialog extends Dialog implements IGetEventInfoDialog {
// Attributes
// ------------------------------------------------------------------------
/**
- * The dialog composite.
- */
- private Composite fDialogComposite = null;
- /**
- * The Group for the session combo box.
- */
- private Group fSessionsGroup = null;
- /**
- * The Group for the channel combo box.
- */
- private Group fChannelsGroup = null;
- /**
* The session combo box.
*/
private CCombo fSessionsCombo = null;
@@ -160,19 +148,19 @@ public class GetEventInfoDialog extends Dialog implements IGetEventInfoDialog {
protected Control createDialogArea(Composite parent) {
// Main dialog panel
- fDialogComposite = new Composite(parent, SWT.NONE);
+ Composite dialogComposite = new Composite(parent, SWT.NONE);
GridLayout layout = new GridLayout(1, true);
- fDialogComposite.setLayout(layout);
- fDialogComposite.setLayoutData(new GridData(GridData.FILL_BOTH));
+ dialogComposite.setLayout(layout);
+ dialogComposite.setLayoutData(new GridData(GridData.FILL_BOTH));
- fSessionsGroup = new Group(fDialogComposite, SWT.SHADOW_NONE);
- fSessionsGroup.setText(Messages.TraceControl_EnableEventsSessionGroupName);
+ Group sessionsGroup = new Group(dialogComposite, SWT.SHADOW_NONE);
+ sessionsGroup.setText(Messages.TraceControl_EnableEventsSessionGroupName);
layout = new GridLayout(1, true);
- fSessionsGroup.setLayout(layout);
+ sessionsGroup.setLayout(layout);
GridData data = new GridData(GridData.FILL_HORIZONTAL);
- fSessionsGroup.setLayoutData(data);
+ sessionsGroup.setLayoutData(data);
- fSessionsCombo = new CCombo(fSessionsGroup, SWT.READ_ONLY);
+ fSessionsCombo = new CCombo(sessionsGroup, SWT.READ_ONLY);
fSessionsCombo.setToolTipText(Messages.TraceControl_EnableEventsSessionsTooltip);
fSessionsCombo.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
@@ -184,14 +172,14 @@ public class GetEventInfoDialog extends Dialog implements IGetEventInfoDialog {
fSessionsCombo.setItems(items);
fSessionsCombo.setEnabled(fSessions.length > 0);
- fChannelsGroup = new Group(fDialogComposite, SWT.SHADOW_NONE);
- fChannelsGroup.setText(Messages.TraceControl_EnableEventsChannelGroupName);
+ Group channelsGroup = new Group(dialogComposite, SWT.SHADOW_NONE);
+ channelsGroup.setText(Messages.TraceControl_EnableEventsChannelGroupName);
layout = new GridLayout(1, true);
- fChannelsGroup.setLayout(layout);
+ channelsGroup.setLayout(layout);
data = new GridData(GridData.FILL_HORIZONTAL);
- fChannelsGroup.setLayoutData(data);
+ channelsGroup.setLayoutData(data);
- fChannelsCombo = new CCombo(fChannelsGroup, SWT.READ_ONLY);
+ fChannelsCombo = new CCombo(channelsGroup, SWT.READ_ONLY);
fChannelsCombo.setToolTipText(Messages.TraceControl_EnableEventsChannelsTooltip);
fChannelsCombo.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
fChannelsCombo.setEnabled(false);
@@ -236,7 +224,7 @@ public class GetEventInfoDialog extends Dialog implements IGetEventInfoDialog {
// take first session to test whether events filtering is supported or not
if (fSessions[0].isEventFilteringSupported() && !fIsKernel) {
- Group filterMainGroup = new Group(fDialogComposite, SWT.SHADOW_NONE);
+ Group filterMainGroup = new Group(dialogComposite, SWT.SHADOW_NONE);
filterMainGroup.setText(Messages.TraceControl_EnableEventsFilterGroupName);
layout = new GridLayout(2, false);
filterMainGroup.setLayout(layout);
@@ -251,7 +239,7 @@ public class GetEventInfoDialog extends Dialog implements IGetEventInfoDialog {
getShell().setMinimumSize(new Point(300, 200));
- return fDialogComposite;
+ return dialogComposite;
}
@Override
diff --git a/lttng/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/ImportConfirmationDialog.java b/lttng/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/ImportConfirmationDialog.java
index 2f53cc2e94..df24ddcea5 100644
--- a/lttng/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/ImportConfirmationDialog.java
+++ b/lttng/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/ImportConfirmationDialog.java
@@ -50,10 +50,6 @@ public class ImportConfirmationDialog extends Dialog implements IImportConfirmat
// Attributes
// ------------------------------------------------------------------------
/**
- * The dialog composite.
- */
- private Composite fDialogComposite = null;
- /**
* The radio button for selecting the overwrite action
*/
private Button fOverwriteButton = null;
@@ -124,15 +120,15 @@ public class ImportConfirmationDialog extends Dialog implements IImportConfirmat
protected Control createDialogArea(Composite parent) {
// Main dialog panel
- fDialogComposite = new Composite(parent, SWT.NONE);
+ Composite dialogComposite = new Composite(parent, SWT.NONE);
GridLayout layout = new GridLayout(1, true);
- fDialogComposite.setLayout(layout);
- fDialogComposite.setLayoutData(new GridData(GridData.FILL_BOTH));
+ dialogComposite.setLayout(layout);
+ dialogComposite.setLayoutData(new GridData(GridData.FILL_BOTH));
- Label sessionNameLabel = new Label(fDialogComposite, SWT.RIGHT);
+ Label sessionNameLabel = new Label(dialogComposite, SWT.RIGHT);
sessionNameLabel.setText(Messages.TraceControl_ImportDialogTraceAlreadyExistError + ": " + fTraceName); //$NON-NLS-1$
- fOverwriteButton = new Button(fDialogComposite, SWT.RADIO);
+ fOverwriteButton = new Button(dialogComposite, SWT.RADIO);
fOverwriteButton.setText(Messages.TraceControl_ImportDialogConfirmationOverwriteLabel);
fOverwriteButton.addSelectionListener(new SelectionAdapter() {
@@ -143,7 +139,7 @@ public class ImportConfirmationDialog extends Dialog implements IImportConfirmat
}
});
- fRenameButton = new Button(fDialogComposite, SWT.RADIO);
+ fRenameButton = new Button(dialogComposite, SWT.RADIO);
fRenameButton.setText(Messages.TraceControl_ImportDialogConfirmationRenameLabel);
fRenameButton.addSelectionListener(new SelectionAdapter() {
@@ -153,7 +149,7 @@ public class ImportConfirmationDialog extends Dialog implements IImportConfirmat
}
});
- fNewTraceNameText = new Text(fDialogComposite, SWT.NONE);
+ fNewTraceNameText = new Text(dialogComposite, SWT.NONE);
fNewTraceNameText.setToolTipText(Messages.TraceControl_ImportDialogConfirmationNewNameLabel);
fNewTraceNameText.setText(fTraceName);
@@ -169,7 +165,7 @@ public class ImportConfirmationDialog extends Dialog implements IImportConfirmat
getShell().setMinimumSize(new Point(300, 150));
- return fDialogComposite;
+ return dialogComposite;
}
@Override
diff --git a/lttng/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/ImportDialog.java b/lttng/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/ImportDialog.java
index e413ec4b06..7afd124f3d 100644
--- a/lttng/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/ImportDialog.java
+++ b/lttng/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/ImportDialog.java
@@ -93,10 +93,6 @@ public class ImportDialog extends Dialog implements IImportDialog {
*/
private Button fOverwriteButton;
/**
- * The button to open import wizard for import locally.
- */
- private Button fImportLocallyButton;
- /**
* List of available LTTng 2.0 projects
*/
private List<IProject> fProjects;
@@ -189,9 +185,9 @@ public class ImportDialog extends Dialog implements IImportDialog {
@Override
protected void createButtonsForButtonBar(Composite parent) {
createButton(parent, IDialogConstants.CANCEL_ID, "&Cancel", true); //$NON-NLS-1$
- fImportLocallyButton = createButton(parent, IDialogConstants.OK_ID, "&Ok", true); //$NON-NLS-1$
+ Button importLocallyButton = createButton(parent, IDialogConstants.OK_ID, "&Ok", true); //$NON-NLS-1$
if (fSession.isStreamedTrace()) {
- fImportLocallyButton.setText("&Next..."); //$NON-NLS-1$
+ importLocallyButton.setText("&Next..."); //$NON-NLS-1$
}
}
diff --git a/lttng/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/NewConnectionDialog.java b/lttng/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/NewConnectionDialog.java
index 5eec5a93d5..6b4404727b 100644
--- a/lttng/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/NewConnectionDialog.java
+++ b/lttng/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/NewConnectionDialog.java
@@ -59,18 +59,6 @@ public class NewConnectionDialog extends Dialog implements INewConnectionDialog
// Attributes
// ------------------------------------------------------------------------
/**
- * The dialog composite.
- */
- private Composite fDialogComposite = null;
- /**
- * The Group for the host combo box.
- */
- private Group fComboGroup = null;
- /**
- * The Group for the text input.
- */
- private Group fTextGroup = null;
- /**
* The host combo box.
*/
private CCombo fExistingHostsCombo = null;
@@ -176,20 +164,20 @@ public class NewConnectionDialog extends Dialog implements INewConnectionDialog
protected Control createDialogArea(Composite parent) {
// Main dialog panel
- fDialogComposite = new Composite(parent, SWT.NONE);
+ Composite dialogComposite = new Composite(parent, SWT.NONE);
GridLayout layout = new GridLayout(1, true);
- fDialogComposite.setLayout(layout);
- fDialogComposite.setLayoutData(new GridData(GridData.FILL_BOTH));
+ dialogComposite.setLayout(layout);
+ dialogComposite.setLayoutData(new GridData(GridData.FILL_BOTH));
// Existing connections group
- fComboGroup = new Group(fDialogComposite, SWT.SHADOW_NONE);
- fComboGroup.setText(Messages.TraceControl_NewNodeExistingConnectionGroupName);
+ Group comboGroup = new Group(dialogComposite, SWT.SHADOW_NONE);
+ comboGroup.setText(Messages.TraceControl_NewNodeExistingConnectionGroupName);
layout = new GridLayout(2, true);
- fComboGroup.setLayout(layout);
+ comboGroup.setLayout(layout);
GridData data = new GridData(GridData.FILL_HORIZONTAL);
- fComboGroup.setLayoutData(data);
+ comboGroup.setLayoutData(data);
- fExistingHostsCombo = new CCombo(fComboGroup, SWT.READ_ONLY);
+ fExistingHostsCombo = new CCombo(comboGroup, SWT.READ_ONLY);
fExistingHostsCombo.setToolTipText(Messages.TraceControl_NewNodeComboToolTip);
fExistingHostsCombo.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1));
@@ -202,32 +190,32 @@ public class NewConnectionDialog extends Dialog implements INewConnectionDialog
fExistingHostsCombo.setEnabled(fExistingHosts.length > 0);
// Node information grop
- fTextGroup = new Group(fDialogComposite, SWT.SHADOW_NONE);
+ Group textGroup = new Group(dialogComposite, SWT.SHADOW_NONE);
layout = new GridLayout(3, true);
- fTextGroup.setLayout(layout);
+ textGroup.setLayout(layout);
data = new GridData(GridData.FILL_HORIZONTAL);
- fTextGroup.setLayoutData(data);
+ textGroup.setLayoutData(data);
- fButton = new Button(fTextGroup, SWT.CHECK);
+ fButton = new Button(textGroup, SWT.CHECK);
fButton.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 3, 1));
fButton.setText(Messages.TraceControl_NewNodeEditButtonName);
fButton.setEnabled(fExistingHosts.length > 0);
- Label connectionNameLabel = new Label(fTextGroup, SWT.RIGHT);
+ Label connectionNameLabel = new Label(textGroup, SWT.RIGHT);
connectionNameLabel.setText(Messages.TraceControl_NewNodeConnectionNameLabel);
- fConnectionNameText = new Text(fTextGroup, SWT.NONE);
+ fConnectionNameText = new Text(textGroup, SWT.NONE);
fConnectionNameText.setToolTipText(Messages.TraceControl_NewNodeConnectionNameTooltip);
fConnectionNameText.setEnabled(fExistingHosts.length == 0);
- Label hostNameLabel = new Label(fTextGroup, SWT.RIGHT);
+ Label hostNameLabel = new Label(textGroup, SWT.RIGHT);
hostNameLabel.setText(Messages.TraceControl_NewNodeHostNameLabel);
- fHostNameText = new Text(fTextGroup, SWT.NONE);
+ fHostNameText = new Text(textGroup, SWT.NONE);
fHostNameText.setToolTipText(Messages.TraceControl_NewNodeHostNameTooltip);
fHostNameText.setEnabled(fExistingHosts.length == 0);
- Label portLabel = new Label(fTextGroup, SWT.RIGHT);
+ Label portLabel = new Label(textGroup, SWT.RIGHT);
portLabel.setText(Messages.TraceControl_NewNodePortLabel);
- fPortText = new Text(fTextGroup, SWT.NONE);
+ fPortText = new Text(textGroup, SWT.NONE);
fPortText.setToolTipText(Messages.TraceControl_NewNodePortTooltip);
fPortText.setEnabled(fExistingHosts.length == 0);
fPortText.addVerifyListener(new VerifyListener() {
@@ -295,7 +283,7 @@ public class NewConnectionDialog extends Dialog implements INewConnectionDialog
fHostNameText.setText(""); //$NON-NLS-1$
- return fDialogComposite;
+ return dialogComposite;
}
@Override
diff --git a/lttng/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/TraceControlDialogFactory.java b/lttng/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/TraceControlDialogFactory.java
index d871c78ffc..9fc1abb5cb 100644
--- a/lttng/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/TraceControlDialogFactory.java
+++ b/lttng/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/TraceControlDialogFactory.java
@@ -95,7 +95,7 @@ public final class TraceControlDialogFactory {
/**
* @return TraceControlDialogFactory instance
*/
- public synchronized static TraceControlDialogFactory getInstance() {
+ public static synchronized TraceControlDialogFactory getInstance() {
if (fInstance == null) {
fInstance = new TraceControlDialogFactory();
}
diff --git a/lttng/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/ChangeChannelStateHandler.java b/lttng/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/ChangeChannelStateHandler.java
index 35a63dcd88..0696653c09 100644
--- a/lttng/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/ChangeChannelStateHandler.java
+++ b/lttng/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/ChangeChannelStateHandler.java
@@ -41,7 +41,7 @@ import org.eclipse.ui.PlatformUI;
*
* @author Bernd Hufmann
*/
-abstract public class ChangeChannelStateHandler extends BaseControlViewHandler {
+public abstract class ChangeChannelStateHandler extends BaseControlViewHandler {
// ------------------------------------------------------------------------
// Attributes
@@ -57,7 +57,7 @@ abstract public class ChangeChannelStateHandler extends BaseControlViewHandler {
/**
* @return the new state to set
*/
- abstract protected TraceEnablement getNewState();
+ protected abstract TraceEnablement getNewState();
// ------------------------------------------------------------------------
// Operations
@@ -69,7 +69,7 @@ abstract public class ChangeChannelStateHandler extends BaseControlViewHandler {
* @param monitor - a progress monitor
* @throws ExecutionException If the command fails
*/
- abstract protected void changeState(TraceDomainComponent domain, List<String> channelNames, IProgressMonitor monitor) throws ExecutionException;
+ protected abstract void changeState(TraceDomainComponent domain, List<String> channelNames, IProgressMonitor monitor) throws ExecutionException;
@Override
public Object execute(ExecutionEvent event) throws ExecutionException {
@@ -230,23 +230,23 @@ abstract public class ChangeChannelStateHandler extends BaseControlViewHandler {
/**
* Class containing parameter for the command execution.
*/
- static protected class Parameter {
+ protected static class Parameter {
/**
* Kernel domain component reference.
*/
- final protected TraceDomainComponent fKernelDomain;
+ protected final TraceDomainComponent fKernelDomain;
/**
* UST domain component reference.
*/
- final protected TraceDomainComponent fUstDomain;
+ protected final TraceDomainComponent fUstDomain;
/**
* The list of kernel channel components the command is to be executed on.
*/
- final protected List<TraceChannelComponent> fKernelChannels;
+ protected final List<TraceChannelComponent> fKernelChannels;
/**
* The list of UST channel components the command is to be executed on.
*/
- final protected List<TraceChannelComponent> fUstChannels;
+ protected final List<TraceChannelComponent> fUstChannels;
/**
* Constructor
diff --git a/lttng/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/ChangeSessionStateHandler.java b/lttng/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/ChangeSessionStateHandler.java
index 9cac43fdd6..74d846fe81 100644
--- a/lttng/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/ChangeSessionStateHandler.java
+++ b/lttng/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/ChangeSessionStateHandler.java
@@ -39,7 +39,7 @@ import org.eclipse.ui.PlatformUI;
*
* @author Bernd Hufmann
*/
-abstract public class ChangeSessionStateHandler extends BaseControlViewHandler {
+public abstract class ChangeSessionStateHandler extends BaseControlViewHandler {
// ------------------------------------------------------------------------
// Attributes
@@ -56,7 +56,7 @@ abstract public class ChangeSessionStateHandler extends BaseControlViewHandler {
/**
* @return new required state.
*/
- abstract TraceSessionState getNewState();
+ public abstract TraceSessionState getNewState();
// ------------------------------------------------------------------------
// Operations
diff --git a/lttng/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/logging/ControlCommandLogger.java b/lttng/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/logging/ControlCommandLogger.java
index ec0a4ac26b..ad62843fc6 100644
--- a/lttng/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/logging/ControlCommandLogger.java
+++ b/lttng/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/logging/ControlCommandLogger.java
@@ -24,7 +24,7 @@ import org.eclipse.linuxtools.internal.lttng2.ui.Activator;
*
* @author Bernd Hufmann
*/
-public class ControlCommandLogger {
+final public class ControlCommandLogger {
// ------------------------------------------------------------------------
// Attributes
@@ -38,7 +38,6 @@ public class ControlCommandLogger {
// Constructor
// ------------------------------------------------------------------------
private ControlCommandLogger() {
-
}
// ------------------------------------------------------------------------
diff --git a/lttng/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/remote/IRemoteSystemProxy.java b/lttng/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/remote/IRemoteSystemProxy.java
index 295a5cdf87..2f9646b127 100644
--- a/lttng/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/remote/IRemoteSystemProxy.java
+++ b/lttng/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/remote/IRemoteSystemProxy.java
@@ -34,7 +34,7 @@ public interface IRemoteSystemProxy {
/**
* Invalid port number for IP based connections.
*/
- public final static int INVALID_PORT_NUMBER = -1;
+ static final int INVALID_PORT_NUMBER = -1;
// ------------------------------------------------------------------------
// Operations
diff --git a/lttng/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/service/ILttngControlService.java b/lttng/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/service/ILttngControlService.java
index cecee4fd6d..96c4196560 100644
--- a/lttng/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/service/ILttngControlService.java
+++ b/lttng/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/service/ILttngControlService.java
@@ -36,7 +36,7 @@ public interface ILttngControlService {
/**
* @return the version string.
*/
- public String getVersion();
+ String getVersion();
/**
* Checks if given version is supported by this ILTTngControlService implementation.
@@ -44,7 +44,7 @@ public interface ILttngControlService {
* @param version The version to check
* @return <code>true</code> if version is supported else <code>false</code>
*/
- public boolean isVersionSupported(String version);
+ boolean isVersionSupported(String version);
/**
* Retrieves the existing sessions names from the node.
@@ -55,7 +55,7 @@ public interface ILttngControlService {
* @throws ExecutionException
* If the command fails
*/
- public String[] getSessionNames(IProgressMonitor monitor)
+ String[] getSessionNames(IProgressMonitor monitor)
throws ExecutionException;
/**
@@ -69,7 +69,7 @@ public interface ILttngControlService {
* @throws ExecutionException
* If the command fails
*/
- public ISessionInfo getSession(String sessionName, IProgressMonitor monitor)
+ ISessionInfo getSession(String sessionName, IProgressMonitor monitor)
throws ExecutionException;
/**
@@ -81,7 +81,7 @@ public interface ILttngControlService {
* @throws ExecutionException
* If the command fails
*/
- public List<IBaseEventInfo> getKernelProvider(IProgressMonitor monitor)
+ List<IBaseEventInfo> getKernelProvider(IProgressMonitor monitor)
throws ExecutionException;
/**
@@ -102,7 +102,7 @@ public interface ILttngControlService {
* @throws ExecutionException
* If the command fails
*/
- public List<IUstProviderInfo> getUstProvider(IProgressMonitor monitor)
+ List<IUstProviderInfo> getUstProvider(IProgressMonitor monitor)
throws ExecutionException;
/**
@@ -118,7 +118,7 @@ public interface ILttngControlService {
* @throws ExecutionException
* If the command fails
*/
- public ISessionInfo createSession(String sessionName, String sessionPath, IProgressMonitor monitor) throws ExecutionException;
+ ISessionInfo createSession(String sessionName, String sessionPath, IProgressMonitor monitor) throws ExecutionException;
/**
* Creates a session with given session name and location.
@@ -138,7 +138,7 @@ public interface ILttngControlService {
* @throws ExecutionException
* If the command fails
*/
- public ISessionInfo createSession(String sessionName, String networkUrl, String controlUrl, String dataUrl, IProgressMonitor monitor) throws ExecutionException;
+ ISessionInfo createSession(String sessionName, String networkUrl, String controlUrl, String dataUrl, IProgressMonitor monitor) throws ExecutionException;
/**
* Destroys a session with given session name.
@@ -150,7 +150,7 @@ public interface ILttngControlService {
* @throws ExecutionException
* If the command fails
*/
- public void destroySession(String sessionName, IProgressMonitor monitor)
+ void destroySession(String sessionName, IProgressMonitor monitor)
throws ExecutionException;
/**
@@ -163,7 +163,7 @@ public interface ILttngControlService {
* @throws ExecutionException
* If the command fails
*/
- public void startSession(String sessionName, IProgressMonitor monitor)
+ void startSession(String sessionName, IProgressMonitor monitor)
throws ExecutionException;
/**
@@ -176,7 +176,7 @@ public interface ILttngControlService {
* @throws ExecutionException
* If the command fails
*/
- public void stopSession(String sessionName, IProgressMonitor monitor)
+ void stopSession(String sessionName, IProgressMonitor monitor)
throws ExecutionException;
/**
@@ -198,7 +198,7 @@ public interface ILttngControlService {
* @throws ExecutionException
* If the command fails
*/
- public void enableChannels(String sessionName, List<String> channelNames,
+ void enableChannels(String sessionName, List<String> channelNames,
boolean isKernel, IChannelInfo info, IProgressMonitor monitor)
throws ExecutionException;
@@ -218,7 +218,7 @@ public interface ILttngControlService {
* @throws ExecutionException
* If the command fails
*/
- public void disableChannels(String sessionName, List<String> channelNames,
+ void disableChannels(String sessionName, List<String> channelNames,
boolean isKernel, IProgressMonitor monitor)
throws ExecutionException;
@@ -241,7 +241,7 @@ public interface ILttngControlService {
* @throws ExecutionException
* If the command fails
*/
- public void enableEvents(String sessionName, String channelName,
+ void enableEvents(String sessionName, String channelName,
List<String> eventNames, boolean isKernel, String filterExpression,
IProgressMonitor monitor)
throws ExecutionException;
@@ -259,7 +259,7 @@ public interface ILttngControlService {
* @throws ExecutionException
* If the command fails
*/
- public void enableSyscalls(String sessionName, String channelName,
+ void enableSyscalls(String sessionName, String channelName,
IProgressMonitor monitor) throws ExecutionException;
/**
@@ -280,7 +280,7 @@ public interface ILttngControlService {
* @throws ExecutionException
* If the command fails
*/
- public void enableProbe(String sessionName, String channelName,
+ void enableProbe(String sessionName, String channelName,
String eventName, boolean isFunction, String probe,
IProgressMonitor monitor) throws ExecutionException;
@@ -304,7 +304,7 @@ public interface ILttngControlService {
* @throws ExecutionException
* If the command fails
*/
- public void enableLogLevel(String sessionName, String channelName,
+ void enableLogLevel(String sessionName, String channelName,
String eventName, LogLevelType logLevelType, TraceLogLevel level,
String filterExpression,
IProgressMonitor monitor) throws ExecutionException;
@@ -325,7 +325,7 @@ public interface ILttngControlService {
* @throws ExecutionException
* If the command fails
*/
- public void disableEvent(String sessionName, String channelName,
+ void disableEvent(String sessionName, String channelName,
List<String> eventNames, boolean isKernel, IProgressMonitor monitor)
throws ExecutionException;
@@ -338,7 +338,7 @@ public interface ILttngControlService {
* @throws ExecutionException
* If the command fails
*/
- public List<String> getContextList(IProgressMonitor monitor)
+ List<String> getContextList(IProgressMonitor monitor)
throws ExecutionException;
/**
@@ -359,7 +359,7 @@ public interface ILttngControlService {
* @throws ExecutionException
* If the command fails
*/
- public void addContexts(String sessionName, String channelName,
+ void addContexts(String sessionName, String channelName,
String eventName, boolean isKernel, List<String> contexts,
IProgressMonitor monitor) throws ExecutionException;
@@ -373,6 +373,6 @@ public interface ILttngControlService {
* @throws ExecutionException
* If the command fails
*/
- public void calibrate(boolean isKernel, IProgressMonitor monitor)
+ void calibrate(boolean isKernel, IProgressMonitor monitor)
throws ExecutionException;
}
diff --git a/lttng/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/service/LTTngControlService.java b/lttng/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/service/LTTngControlService.java
index d660dcfdbb..2eb8fba79d 100644
--- a/lttng/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/service/LTTngControlService.java
+++ b/lttng/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/service/LTTngControlService.java
@@ -926,7 +926,7 @@ public class LTTngControlService implements ILttngControlService {
ret.append(result.getResult());
ret.append("\n"); //$NON-NLS-1$
for (int i = 0; i < output.length; i++) {
- ret.append(output[i] + "\n"); //$NON-NLS-1$
+ ret.append(output[i]).append("\n"); //$NON-NLS-1$
}
return ret.toString();
}
diff --git a/lttng/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/service/LTTngControlServiceConstants.java b/lttng/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/service/LTTngControlServiceConstants.java
index ee54d7b6df..bc3216fa2d 100644
--- a/lttng/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/service/LTTngControlServiceConstants.java
+++ b/lttng/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/service/LTTngControlServiceConstants.java
@@ -21,7 +21,7 @@ import java.util.regex.Pattern;
*
* @author Bernd Hufmann
*/
-interface LTTngControlServiceConstants {
+public interface LTTngControlServiceConstants {
// ------------------------------------------------------------------------
// Version constants
@@ -29,7 +29,7 @@ interface LTTngControlServiceConstants {
/**
* Pattern to match the LTTng toolchain version 2.x.y.
*/
- public static final Pattern VERSION_2_PATTERN = Pattern.compile("(2\\.\\d+\\.\\d+).*"); //$NON-NLS-1$
+ static final Pattern VERSION_2_PATTERN = Pattern.compile("(2\\.\\d+\\.\\d+).*"); //$NON-NLS-1$
// ------------------------------------------------------------------------
// Command constants
@@ -37,63 +37,63 @@ interface LTTngControlServiceConstants {
/**
* The lttng tools command.
*/
- public static final String CONTROL_COMMAND = "lttng"; //$NON-NLS-1$
+ static final String CONTROL_COMMAND = "lttng"; //$NON-NLS-1$
/**
* Command: lttng version.
*/
- public static final String COMMAND_VERSION = " version "; //$NON-NLS-1$
+ static final String COMMAND_VERSION = " version "; //$NON-NLS-1$
/**
* Command: lttng list.
*/
- public static final String COMMAND_LIST = " list "; //$NON-NLS-1$
+ static final String COMMAND_LIST = " list "; //$NON-NLS-1$
/**
* Command to list kernel tracer information.
*/
- public static final String COMMAND_LIST_KERNEL = COMMAND_LIST + "-k"; //$NON-NLS-1$
+ static final String COMMAND_LIST_KERNEL = COMMAND_LIST + "-k"; //$NON-NLS-1$
/**
* Command to list user space trace information.
*/
- public static final String COMMAND_LIST_UST = COMMAND_LIST + "-u"; //$NON-NLS-1$
+ static final String COMMAND_LIST_UST = COMMAND_LIST + "-u"; //$NON-NLS-1$
/**
* Command to create a session.
*/
- public static final String COMMAND_CREATE_SESSION = " create "; //$NON-NLS-1$
+ static final String COMMAND_CREATE_SESSION = " create "; //$NON-NLS-1$
/**
* Command to destroy a session.
*/
- public static final String COMMAND_DESTROY_SESSION = " destroy "; //$NON-NLS-1$
+ static final String COMMAND_DESTROY_SESSION = " destroy "; //$NON-NLS-1$
/**
* Command to destroy a session.
*/
- public static final String COMMAND_START_SESSION = " start "; //$NON-NLS-1$
+ static final String COMMAND_START_SESSION = " start "; //$NON-NLS-1$
/**
* Command to destroy a session.
*/
- public static final String COMMAND_STOP_SESSION = " stop "; //$NON-NLS-1$
+ static final String COMMAND_STOP_SESSION = " stop "; //$NON-NLS-1$
/**
* Command to enable a channel.
*/
- public static final String COMMAND_ENABLE_CHANNEL = " enable-channel "; //$NON-NLS-1$
+ static final String COMMAND_ENABLE_CHANNEL = " enable-channel "; //$NON-NLS-1$
/**
* Command to disable a channel.
*/
- public static final String COMMAND_DISABLE_CHANNEL = " disable-channel "; //$NON-NLS-1$
+ static final String COMMAND_DISABLE_CHANNEL = " disable-channel "; //$NON-NLS-1$
/**
* Command to enable a event.
*/
- public static final String COMMAND_ENABLE_EVENT = " enable-event "; //$NON-NLS-1$
+ static final String COMMAND_ENABLE_EVENT = " enable-event "; //$NON-NLS-1$
/**
* Command to disable a event.
*/
- public static final String COMMAND_DISABLE_EVENT = " disable-event "; //$NON-NLS-1$
+ static final String COMMAND_DISABLE_EVENT = " disable-event "; //$NON-NLS-1$
/**
* Command to add a context to channels and/or events
*/
- public static final String COMMAND_ADD_CONTEXT = " add-context "; //$NON-NLS-1$
+ static final String COMMAND_ADD_CONTEXT = " add-context "; //$NON-NLS-1$
/**
* Command to execute calibrate command to quantify LTTng overhead
*/
- public static final String COMMAND_CALIBRATE = " calibrate "; //$NON-NLS-1$
+ static final String COMMAND_CALIBRATE = " calibrate "; //$NON-NLS-1$
// ------------------------------------------------------------------------
// Command line options constants
@@ -101,119 +101,119 @@ interface LTTngControlServiceConstants {
/**
* Command line option to add tracing group of user.
*/
- public static final String OPTION_TRACING_GROUP = " -g "; //$NON-NLS-1$
+ static final String OPTION_TRACING_GROUP = " -g "; //$NON-NLS-1$
/**
* Command line option for verbose output.
*/
- public static final String OPTION_VERBOSE = " -v "; //$NON-NLS-1$
+ static final String OPTION_VERBOSE = " -v "; //$NON-NLS-1$
/**
* Command line option for verbose output.
*/
- public static final String OPTION_VERY_VERBOSE = " -vv "; //$NON-NLS-1$
+ static final String OPTION_VERY_VERBOSE = " -vv "; //$NON-NLS-1$
/**
* Command line option for verbose output.
*/
- public static final String OPTION_VERY_VERY_VERBOSE = " -vvv "; //$NON-NLS-1$
+ static final String OPTION_VERY_VERY_VERBOSE = " -vvv "; //$NON-NLS-1$
/**
* Command line option for output path.
*/
- public static final String OPTION_OUTPUT_PATH = " -o "; //$NON-NLS-1$
+ static final String OPTION_OUTPUT_PATH = " -o "; //$NON-NLS-1$
/**
* Command line option for kernel tracer.
*/
- public static final String OPTION_KERNEL = " -k "; //$NON-NLS-1$
+ static final String OPTION_KERNEL = " -k "; //$NON-NLS-1$
/**
* Command line option for UST tracer.
*/
- public static final String OPTION_UST = " -u "; //$NON-NLS-1$
+ static final String OPTION_UST = " -u "; //$NON-NLS-1$
/**
* Command line option for specifying a session.
*/
- public static final String OPTION_SESSION = " -s "; //$NON-NLS-1$
+ static final String OPTION_SESSION = " -s "; //$NON-NLS-1$
/**
* Command line option for specifying a channel.
*/
- public static final String OPTION_CHANNEL = " -c "; //$NON-NLS-1$
+ static final String OPTION_CHANNEL = " -c "; //$NON-NLS-1$
/**
* Command line option for specifying a event.
*/
- public static final String OPTION_EVENT = " -e "; //$NON-NLS-1$
+ static final String OPTION_EVENT = " -e "; //$NON-NLS-1$
/**
* Command line option for specifying all events.
*/
- public static final String OPTION_ALL = " -a "; //$NON-NLS-1$
+ static final String OPTION_ALL = " -a "; //$NON-NLS-1$
/**
* Command line option for specifying a context.
*/
- public static final String OPTION_CONTEXT_TYPE = " -t "; //$NON-NLS-1$
+ static final String OPTION_CONTEXT_TYPE = " -t "; //$NON-NLS-1$
/**
* Command line option for specifying tracepoint events.
*/
- public static final String OPTION_TRACEPOINT = " --tracepoint "; //$NON-NLS-1$
+ static final String OPTION_TRACEPOINT = " --tracepoint "; //$NON-NLS-1$
/**
* Command line option for specifying syscall events.
*/
- public static final String OPTION_SYSCALL = " --syscall "; //$NON-NLS-1$
+ static final String OPTION_SYSCALL = " --syscall "; //$NON-NLS-1$
/**
* Command line option for specifying a dynamic probe.
*/
- public static final String OPTION_PROBE = " --probe "; //$NON-NLS-1$
+ static final String OPTION_PROBE = " --probe "; //$NON-NLS-1$
/**
* Command line option for specifying a dynamic function entry/return probe.
*/
- public static final String OPTION_FUNCTION_PROBE = " --function "; //$NON-NLS-1$
+ static final String OPTION_FUNCTION_PROBE = " --function "; //$NON-NLS-1$
/**
* Command line option for specifying a log level range.
*/
- public static final String OPTION_LOGLEVEL = " --loglevel "; //$NON-NLS-1$
+ static final String OPTION_LOGLEVEL = " --loglevel "; //$NON-NLS-1$
/**
* Command line option for specifying a specific log level.
*/
- public static final String OPTION_LOGLEVEL_ONLY = " --loglevel-only "; //$NON-NLS-1$
+ static final String OPTION_LOGLEVEL_ONLY = " --loglevel-only "; //$NON-NLS-1$
/**
* Optional command line option for configuring a channel's overwrite mode.
*/
- public static final String OPTION_OVERWRITE = " --overwrite "; //$NON-NLS-1$
+ static final String OPTION_OVERWRITE = " --overwrite "; //$NON-NLS-1$
/**
* Optional command line option for configuring a channel's number of sub buffers.
*/
- public static final String OPTION_NUM_SUB_BUFFERS = " --num-subbuf "; //$NON-NLS-1$
+ static final String OPTION_NUM_SUB_BUFFERS = " --num-subbuf "; //$NON-NLS-1$
/**
* Optional command line option for configuring a channel's sub buffer size.
*/
- public static final String OPTION_SUB_BUFFER_SIZE = " --subbuf-size "; //$NON-NLS-1$
+ static final String OPTION_SUB_BUFFER_SIZE = " --subbuf-size "; //$NON-NLS-1$
/**
* Optional command line option for configuring a channel's switch timer interval.
*/
- public static final String OPTION_SWITCH_TIMER = " --switch-timer "; //$NON-NLS-1$
+ static final String OPTION_SWITCH_TIMER = " --switch-timer "; //$NON-NLS-1$
/**
* Optional command line option for configuring a channel's read timer interval.
*/
- public static final String OPTION_READ_TIMER = " --read-timer "; //$NON-NLS-1$
+ static final String OPTION_READ_TIMER = " --read-timer "; //$NON-NLS-1$
/**
* Command line option for printing the help of a specif command
*/
- public static final String OPTION_HELP = " -h "; //$NON-NLS-1$
+ static final String OPTION_HELP = " -h "; //$NON-NLS-1$
/**
* Command line option for listing the fields of UST tracepoints
*/
- public static final String OPTION_FIELDS = " -f "; //$NON-NLS-1$
+ static final String OPTION_FIELDS = " -f "; //$NON-NLS-1$
/**
* Command line option for configuring event's filter
*/
- public static final String OPTION_FILTER = " --filter "; //$NON-NLS-1$
+ static final String OPTION_FILTER = " --filter "; //$NON-NLS-1$
/**
* Command line option for configuring the streaming network URL (common for control and data channel).
*/
- public static final String OPTION_NETWORK_URL = " -U "; //$NON-NLS-1$
+ static final String OPTION_NETWORK_URL = " -U "; //$NON-NLS-1$
/**
* Command line option for configuring the streaming control URL.
*/
- public static final String OPTION_CONTROL_URL = " -C "; //$NON-NLS-1$
+ static final String OPTION_CONTROL_URL = " -C "; //$NON-NLS-1$
/**
* Command line option for configuring the streaming data URL.
*/
- public static final String OPTION_DATA_URL = " -D "; //$NON-NLS-1$
+ static final String OPTION_DATA_URL = " -D "; //$NON-NLS-1$
// ------------------------------------------------------------------------
// Parsing constants
@@ -221,146 +221,146 @@ interface LTTngControlServiceConstants {
/**
* Pattern to match the version.
*/
- public static final Pattern VERSION_PATTERN = Pattern.compile(".*lttng\\s+version\\s+(\\d+\\.\\d+\\.\\d+).*"); //$NON-NLS-1$
+ static final Pattern VERSION_PATTERN = Pattern.compile(".*lttng\\s+version\\s+(\\d+\\.\\d+\\.\\d+).*"); //$NON-NLS-1$
/**
* Pattern to match for error output
*/
- public static final Pattern ERROR_PATTERN = Pattern.compile("\\s*Error\\:.*"); //$NON-NLS-1$
+ static final Pattern ERROR_PATTERN = Pattern.compile("\\s*Error\\:.*"); //$NON-NLS-1$
/**
* Pattern to match for session information (lttng list)
*/
- public static final Pattern SESSION_PATTERN = Pattern.compile("\\s+(\\d+)\\)\\s+(.*)\\s+\\((.*)\\)\\s+\\[(active|inactive)\\].*"); //$NON-NLS-1$
+ static final Pattern SESSION_PATTERN = Pattern.compile("\\s+(\\d+)\\)\\s+(.*)\\s+\\((.*)\\)\\s+\\[(active|inactive)\\].*"); //$NON-NLS-1$
/**
* Pattern to match for session information (lttng list <session>)
*/
- public static final Pattern TRACE_SESSION_PATTERN = Pattern.compile("\\s*Tracing\\s+session\\s+(.*)\\:\\s+\\[(active|inactive)\\].*"); //$NON-NLS-1$
+ static final Pattern TRACE_SESSION_PATTERN = Pattern.compile("\\s*Tracing\\s+session\\s+(.*)\\:\\s+\\[(active|inactive)\\].*"); //$NON-NLS-1$
/**
* Pattern to match for session path information (lttng list <session>)
*/
- public static final Pattern TRACE_SESSION_PATH_PATTERN = Pattern.compile("\\s*Trace\\s+path\\:\\s+(.*)"); //$NON-NLS-1$
+ static final Pattern TRACE_SESSION_PATH_PATTERN = Pattern.compile("\\s*Trace\\s+path\\:\\s+(.*)"); //$NON-NLS-1$
/**
* Pattern to match session path for network tracing (lttng list <session>)
* Note: file for protocol is not considered as network trace since local consumer will be used.
*/
- public static final Pattern TRACE_NETWORK_PATH_PATTERN = Pattern.compile("\\s*Trace\\s+path\\:\\s+(net|net6|tcp|tcp6)\\:\\/\\/(.*)(\\:(\\d*)\\/(.*)\\[data\\:\\s+(\\d*)\\]){0,1}"); //$NON-NLS-1$
+ static final Pattern TRACE_NETWORK_PATH_PATTERN = Pattern.compile("\\s*Trace\\s+path\\:\\s+(net|net6|tcp|tcp6)\\:\\/\\/(.*)(\\:(\\d*)\\/(.*)\\[data\\:\\s+(\\d*)\\]){0,1}"); //$NON-NLS-1$
/**
* Sub-pattern to pattern TRACE_NETWORK_PATH_PATTERN to match file protocol
*/
- public static final Pattern TRACE_FILE_PROTOCOL_PATTERN = Pattern.compile("(file)\\:\\/\\/(.*)"); //$NON-NLS-1$
+ static final Pattern TRACE_FILE_PROTOCOL_PATTERN = Pattern.compile("(file)\\:\\/\\/(.*)"); //$NON-NLS-1$
/**
* Pattern to match for kernel domain information (lttng list <session>)
*/
- public static final Pattern DOMAIN_KERNEL_PATTERN = Pattern.compile("=== Domain: Kernel ==="); //$NON-NLS-1$
+ static final Pattern DOMAIN_KERNEL_PATTERN = Pattern.compile("=== Domain: Kernel ==="); //$NON-NLS-1$
/**
* Pattern to match for ust domain information (lttng list <session>)
*/
- public static final Pattern DOMAIN_UST_GLOBAL_PATTERN = Pattern.compile("=== Domain: UST global ==="); //$NON-NLS-1$
+ static final Pattern DOMAIN_UST_GLOBAL_PATTERN = Pattern.compile("=== Domain: UST global ==="); //$NON-NLS-1$
/**
* Pattern to match for matching warning about no kernel channel
*/
- public static final Pattern DOMAIN_NO_KERNEL_CHANNEL_PATTERN = Pattern.compile("\\s*Warning\\:\\s+No kernel\\s+channel.*"); //$NON-NLS-1$
+ static final Pattern DOMAIN_NO_KERNEL_CHANNEL_PATTERN = Pattern.compile("\\s*Warning\\:\\s+No kernel\\s+channel.*"); //$NON-NLS-1$
/**
* Pattern to match for matching warning about no UST channel
*/
- public static final Pattern DOMAIN_NO_UST_CHANNEL_PATTERN = Pattern.compile("\\s*Error\\:\\s+UST\\s+channel\\s+not\\s+found.*"); //$NON-NLS-1$
+ static final Pattern DOMAIN_NO_UST_CHANNEL_PATTERN = Pattern.compile("\\s*Error\\:\\s+UST\\s+channel\\s+not\\s+found.*"); //$NON-NLS-1$
/**
* Pattern to match for channels section (lttng list <session>)
*/
- public static final Pattern CHANNELS_SECTION_PATTERN = Pattern.compile("\\s*Channels\\:"); //$NON-NLS-1$
+ static final Pattern CHANNELS_SECTION_PATTERN = Pattern.compile("\\s*Channels\\:"); //$NON-NLS-1$
/**
* Pattern to match for channel information (lttng list <session>)
*/
- public static final Pattern CHANNEL_PATTERN = Pattern.compile("\\s*-\\s+(.*)\\:\\s+\\[(enabled|disabled)\\]"); //$NON-NLS-1$
+ static final Pattern CHANNEL_PATTERN = Pattern.compile("\\s*-\\s+(.*)\\:\\s+\\[(enabled|disabled)\\]"); //$NON-NLS-1$
/**
* Pattern to match for events section information (lttng list <session>)
*/
- public static final Pattern EVENT_SECTION_PATTERN = Pattern.compile("\\s*Events\\:"); //$NON-NLS-1$
+ static final Pattern EVENT_SECTION_PATTERN = Pattern.compile("\\s*Events\\:"); //$NON-NLS-1$
/**
* Pattern to match for event information (lttng list <session>)
*/
- public static final Pattern EVENT_PATTERN = Pattern.compile("\\s+(.*)\\s+\\(loglevel:\\s+(.*)\\s+\\(\\d*\\)\\)\\s+\\(type:\\s+(.*)\\)\\s+\\[(enabled|disabled)\\]\\s*(\\[.*\\]){0,1}.*"); //$NON-NLS-1$
+ static final Pattern EVENT_PATTERN = Pattern.compile("\\s+(.*)\\s+\\(loglevel:\\s+(.*)\\s+\\(\\d*\\)\\)\\s+\\(type:\\s+(.*)\\)\\s+\\[(enabled|disabled)\\]\\s*(\\[.*\\]){0,1}.*"); //$NON-NLS-1$
/**
* Pattern to match a wildcarded event information (lttng list <session>)
*/
- public static final Pattern WILDCARD_EVENT_PATTERN = Pattern.compile("\\s+(.*)\\s+\\(type:\\s+(.*)\\)\\s+\\[(enabled|disabled)\\]\\s*(\\[.*\\]){0,1}.*"); //$NON-NLS-1$
+ static final Pattern WILDCARD_EVENT_PATTERN = Pattern.compile("\\s+(.*)\\s+\\(type:\\s+(.*)\\)\\s+\\[(enabled|disabled)\\]\\s*(\\[.*\\]){0,1}.*"); //$NON-NLS-1$
/**
* Pattern to match a probe address information (lttng list <session>)
*/
- public static final Pattern PROBE_ADDRESS_PATTERN = Pattern.compile("\\s+(addr)\\:\\s+(0x[0-9a-fA-F]{1,8})"); //$NON-NLS-1$
+ static final Pattern PROBE_ADDRESS_PATTERN = Pattern.compile("\\s+(addr)\\:\\s+(0x[0-9a-fA-F]{1,8})"); //$NON-NLS-1$
/**
* Pattern to match a probe OFFSET information (lttng list <session>)
*/
- public static final Pattern PROBE_OFFSET_PATTERN = Pattern.compile("\\s+(offset)\\:\\s+(0x[0-9a-fA-F]{1,8})"); //$NON-NLS-1$
+ static final Pattern PROBE_OFFSET_PATTERN = Pattern.compile("\\s+(offset)\\:\\s+(0x[0-9a-fA-F]{1,8})"); //$NON-NLS-1$
/**
* Pattern to match a probe SYMBOL information (lttng list <session>)
*/
- public static final Pattern PROBE_SYMBOL_PATTERN = Pattern.compile("\\s+(symbol)\\:\\s+(.+)"); //$NON-NLS-1$
+ static final Pattern PROBE_SYMBOL_PATTERN = Pattern.compile("\\s+(symbol)\\:\\s+(.+)"); //$NON-NLS-1$
/**
* Pattern to match for channel (overwite mode) information (lttng list <session>)
*/
- public static final Pattern OVERWRITE_MODE_ATTRIBUTE = Pattern.compile("\\s+overwrite\\s+mode\\:.*"); //$NON-NLS-1$
+ static final Pattern OVERWRITE_MODE_ATTRIBUTE = Pattern.compile("\\s+overwrite\\s+mode\\:.*"); //$NON-NLS-1$
/**
* Pattern to match indicating false for overwrite mode
*/
- public static final String OVERWRITE_MODE_ATTRIBUTE_FALSE = "0"; //$NON-NLS-1$
+ static final String OVERWRITE_MODE_ATTRIBUTE_FALSE = "0"; //$NON-NLS-1$
/**
* Pattern to match for channel (sub-buffer size) information (lttng list <session>)
*/
- public static final Pattern SUBBUFFER_SIZE_ATTRIBUTE = Pattern.compile("\\s+subbufers\\s+size\\:.*"); //$NON-NLS-1$
+ static final Pattern SUBBUFFER_SIZE_ATTRIBUTE = Pattern.compile("\\s+subbufers\\s+size\\:.*"); //$NON-NLS-1$
/**
* Pattern to match for channel (number of sub-buffers) information (lttng list <session>)
*/
- public static final Pattern NUM_SUBBUFFERS_ATTRIBUTE = Pattern.compile("\\s+number\\s+of\\s+subbufers\\:.*"); //$NON-NLS-1$
+ static final Pattern NUM_SUBBUFFERS_ATTRIBUTE = Pattern.compile("\\s+number\\s+of\\s+subbufers\\:.*"); //$NON-NLS-1$
/**
* Pattern to match for channel (switch timer) information (lttng list <session>)
*/
- public static final Pattern SWITCH_TIMER_ATTRIBUTE = Pattern.compile("\\s+switch\\s+timer\\s+interval\\:.*"); //$NON-NLS-1$
+ static final Pattern SWITCH_TIMER_ATTRIBUTE = Pattern.compile("\\s+switch\\s+timer\\s+interval\\:.*"); //$NON-NLS-1$
/**
* Pattern to match for channel (read timer) information (lttng list <session>)
*/
- public static final Pattern READ_TIMER_ATTRIBUTE = Pattern.compile("\\s+read\\s+timer\\s+interval\\:.*"); //$NON-NLS-1$
+ static final Pattern READ_TIMER_ATTRIBUTE = Pattern.compile("\\s+read\\s+timer\\s+interval\\:.*"); //$NON-NLS-1$
/**
* Pattern to match for channel (output type) information (lttng list <session>)
*/
- public static final Pattern OUTPUT_ATTRIBUTE = Pattern.compile("\\s+output\\:.*"); //$NON-NLS-1$
+ static final Pattern OUTPUT_ATTRIBUTE = Pattern.compile("\\s+output\\:.*"); //$NON-NLS-1$
/**
* Pattern to match for provider information (lttng list -k/-u)
*/
- public static final Pattern PROVIDER_EVENT_PATTERN = Pattern.compile("\\s*(.*)\\s+\\(loglevel:\\s+(.*)\\s+\\(\\d*\\)\\)\\s+\\(type:\\s+(.*)\\)"); //$NON-NLS-1$
+ static final Pattern PROVIDER_EVENT_PATTERN = Pattern.compile("\\s*(.*)\\s+\\(loglevel:\\s+(.*)\\s+\\(\\d*\\)\\)\\s+\\(type:\\s+(.*)\\)"); //$NON-NLS-1$
/**
* Pattern to match event fields
*/
- public static final Pattern EVENT_FIELD_PATTERN = Pattern.compile("\\s*(field:)\\s+(.*)\\s+\\((.*)\\)"); //$NON-NLS-1$
+ static final Pattern EVENT_FIELD_PATTERN = Pattern.compile("\\s*(field:)\\s+(.*)\\s+\\((.*)\\)"); //$NON-NLS-1$
/**
* Pattern to match for UST provider information (lttng list -u)
*/
- public static final Pattern UST_PROVIDER_PATTERN = Pattern.compile("\\s*PID\\:\\s+(\\d+)\\s+-\\s+Name\\:\\s+(.*)"); //$NON-NLS-1$
+ static final Pattern UST_PROVIDER_PATTERN = Pattern.compile("\\s*PID\\:\\s+(\\d+)\\s+-\\s+Name\\:\\s+(.*)"); //$NON-NLS-1$
/**
* Pattern to match for session information (lttng create <session name>)
*/
- public static final Pattern CREATE_SESSION_NAME_PATTERN = Pattern.compile(".*Session\\s+(.*)\\s+created\\."); //$NON-NLS-1$
+ static final Pattern CREATE_SESSION_NAME_PATTERN = Pattern.compile(".*Session\\s+(.*)\\s+created\\."); //$NON-NLS-1$
/**
* Pattern to match for session path information (lttng create <session name>)
*/
- public static final Pattern CREATE_SESSION_PATH_PATTERN = Pattern.compile("\\s*Traces\\s+will\\s+be\\s+written\\s+in\\s+(.*).*"); //$NON-NLS-1$
+ static final Pattern CREATE_SESSION_PATH_PATTERN = Pattern.compile("\\s*Traces\\s+will\\s+be\\s+written\\s+in\\s+(.*).*"); //$NON-NLS-1$
/**
* Pattern to match for session command output for "session name not found".
*/
- public static final Pattern SESSION_NOT_FOUND_ERROR_PATTERN = Pattern.compile("\\s*Error:\\s+Session\\s+name\\s+not\\s+found"); //$NON-NLS-1$
+ static final Pattern SESSION_NOT_FOUND_ERROR_PATTERN = Pattern.compile("\\s*Error:\\s+Session\\s+name\\s+not\\s+found"); //$NON-NLS-1$
/**
* Pattern to match introduction line of context list.
*/
- public static final Pattern ADD_CONTEXT_HELP_CONTEXTS_INTRO = Pattern.compile("\\s*TYPE can\\s+be\\s+one\\s+of\\s+the\\s+strings\\s+below.*"); //$NON-NLS-1$
+ static final Pattern ADD_CONTEXT_HELP_CONTEXTS_INTRO = Pattern.compile("\\s*TYPE can\\s+be\\s+one\\s+of\\s+the\\s+strings\\s+below.*"); //$NON-NLS-1$
/**
* Pattern to match introduction line of context list.
*/
- public static final Pattern ADD_CONTEXT_HELP_CONTEXTS_END_LINE = Pattern.compile("\\s*Example.*"); //$NON-NLS-1$
+ static final Pattern ADD_CONTEXT_HELP_CONTEXTS_END_LINE = Pattern.compile("\\s*Example.*"); //$NON-NLS-1$
/**
* Pattern to match error line if no kernel tracer is available or installed.
*/
- public static final Pattern LIST_KERNEL_NO_KERNEL_PROVIDER_PATTERN = Pattern.compile("\\s*Error:\\s+Unable\\s+to\\s+list\\s+kernel\\s+events.*"); //$NON-NLS-1$;
+ static final Pattern LIST_KERNEL_NO_KERNEL_PROVIDER_PATTERN = Pattern.compile("\\s*Error:\\s+Unable\\s+to\\s+list\\s+kernel\\s+events.*"); //$NON-NLS-1$;
/**
* Pattern to match error line if no ust tracer is available or installed.
*/
- public static final Pattern LIST_UST_NO_UST_PROVIDER_PATTERN = Pattern.compile(".*Unable\\s*to\\s*list\\s*UST\\s*event.*"); //$NON-NLS-1$;
+ static final Pattern LIST_UST_NO_UST_PROVIDER_PATTERN = Pattern.compile(".*Unable\\s*to\\s*list\\s*UST\\s*event.*"); //$NON-NLS-1$;
}

Back to the top