From 77735e82eeeb3c02006261c96d7fdf84213e7428 Mon Sep 17 00:00:00 2001 From: Bernd Hufmann Date: Thu, 16 May 2013 11:54:58 -0400 Subject: [PATCH] lttng ui: Fix minor sonar warnings Mainly fixes the ordering of modifiers, removes commented-out code and change class with constants to an interface. Change-Id: I6c5b6d7698c92640b4661720e190b77d7c3a7787 Signed-off-by: Bernd Hufmann Reviewed-on: https://git.eclipse.org/r/12888 Tested-by: Hudson CI Reviewed-by: Alexandre Montplaisir IP-Clean: Alexandre Montplaisir --- .../control/dialogs/AddContextDialog.java | 6 +- .../control/dialogs/CreateSessionDialog.java | 4 +- .../dialogs/EnableKernelEventComposite.java | 6 +- .../dialogs/EnableUstEventsComposite.java | 6 +- .../views/control/dialogs/ImportDialog.java | 8 - .../dialogs/TraceControlDialogFactory.java | 50 +++--- .../control/handlers/AssignEventHandler.java | 4 +- .../handlers/BaseAddContextHandler.java | 4 +- .../handlers/BaseControlViewHandler.java | 6 +- .../handlers/BaseEnableChannelHandler.java | 4 +- .../handlers/BaseEnableEventHandler.java | 12 +- .../control/handlers/BaseNodeHandler.java | 2 +- .../handlers/ChangeEventStateHandler.java | 12 +- .../handlers/ChangeSessionStateHandler.java | 2 +- .../handlers/NewConnectionHandler.java | 2 +- .../control/logging/ControlCommandLogger.java | 26 ++- .../model/impl/TraceChannelComponent.java | 1 - .../control/model/impl/TraceControlRoot.java | 16 +- .../preferences/ControlPreferencePage.java | 4 +- .../preferences/ControlPreferences.java | 8 +- .../control/property/BasePropertySource.java | 6 +- .../ui/views/control/remote/CommandShell.java | 16 +- .../control/service/LTTngControlService.java | 21 +-- .../service/LTTngControlServiceConstants.java | 168 +++++++++--------- 24 files changed, 194 insertions(+), 200 deletions(-) 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 f2d6fff9f6..cc7f698b58 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 @@ -174,7 +174,7 @@ public class AddContextDialog extends Dialog implements IAddContextDialog { /** * Content provider for the contexts tree */ - final public static class ContextsContentProvider implements ITreeContentProvider { + public static final class ContextsContentProvider implements ITreeContentProvider { @Override public void dispose() { @@ -217,7 +217,7 @@ public class AddContextDialog extends Dialog implements IAddContextDialog { /** * Label provider for the contexts tree */ - final public static class ContextsLabelProvider extends ColumnLabelProvider { + public static final class ContextsLabelProvider extends ColumnLabelProvider { @Override public String getText(Object element) { @@ -232,7 +232,7 @@ public class AddContextDialog extends Dialog implements IAddContextDialog { /** * Check state listener for the contexts tree. */ - final public class ContextCheckListener implements ICheckStateListener { + public final class ContextCheckListener implements ICheckStateListener { @Override public void checkStateChanged(CheckStateChangedEvent event) { if (event.getChecked()) { 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 4669c9bf88..fe07098566 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 @@ -84,11 +84,11 @@ public class CreateSessionDialog extends Dialog implements ICreateSessionDialog /** * Index of last supported streaming protocol for common URL configuration. */ - private final static int COMMON_URL_LAST_INDEX = 1; + private static final int COMMON_URL_LAST_INDEX = 1; /** * Index of default streaming protocol. */ - private final static int DEFAULT_URL_INDEX = 0; + private static final int DEFAULT_URL_INDEX = 0; // ------------------------------------------------------------------------ // Attributes 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 d848f78125..812e5cfb45 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 @@ -537,7 +537,7 @@ public class EnableKernelEventComposite extends Composite implements IEnableKern /** * Content provider for the tracepoints tree. */ - final static public class KernelContentProvider extends TraceControlContentProvider { + public static final class KernelContentProvider extends TraceControlContentProvider { @Override public Object[] getChildren(Object parentElement) { if (parentElement instanceof TraceProviderGroup) { @@ -554,7 +554,7 @@ public class EnableKernelEventComposite extends Composite implements IEnableKern /** * Content label for the tracepoints tree. */ - final static public class KernelLabelProvider extends TraceControlLabelProvider { + public static final class KernelLabelProvider extends TraceControlLabelProvider { @Override public Image getImage(Object element) { return null; @@ -571,7 +571,7 @@ public class EnableKernelEventComposite extends Composite implements IEnableKern /** * Check state listener for the tracepoints tree. */ - final public class KernelCheckListener implements ICheckStateListener { + public final class KernelCheckListener implements ICheckStateListener { @Override public void checkStateChanged(CheckStateChangedEvent event) { if (event.getChecked()) { 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 9dab9797f1..15f0eb93a4 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 @@ -556,7 +556,7 @@ public class EnableUstEventsComposite extends Composite implements IEnableUstEve /** * Content provider for the tracepoints tree. */ - final static public class UstContentProvider extends TraceControlContentProvider { + public static final class UstContentProvider extends TraceControlContentProvider { @Override public Object[] getChildren(Object parentElement) { if (parentElement instanceof TargetNodeComponent) { @@ -577,7 +577,7 @@ public class EnableUstEventsComposite extends Composite implements IEnableUstEve /** * Content label for the tracepoints tree. */ - final static public class UstLabelProvider extends TraceControlLabelProvider { + public static final class UstLabelProvider extends TraceControlLabelProvider { @Override public Image getImage(Object element) { return null; @@ -598,7 +598,7 @@ public class EnableUstEventsComposite extends Composite implements IEnableUstEve /** * Check state listener for the tracepoints tree. */ - final public class UstCheckStateListener implements ICheckStateListener { + public final class UstCheckStateListener implements ICheckStateListener { @Override public void checkStateChanged(CheckStateChangedEvent event) { if (event.getChecked()) { 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 cb91e07534..e413ec4b06 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 @@ -426,14 +426,6 @@ public class ImportDialog extends Dialog implements IImportDialog { fCombo.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 1, 1)); fCombo.setItems(projectNames.toArray(new String[projectNames.size()])); -// Group overrideGroup = new Group(fDialogComposite, SWT.SHADOW_NONE); -// layout = new GridLayout(1, true); -// overrideGroup.setLayout(layout); -// overrideGroup.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); -// -// fOverwriteButton = new Button(overrideGroup, SWT.CHECK); -// fOverwriteButton.setText(Messages.TraceControl_ImportDialogOverwriteButtonText); - getShell().setMinimumSize(new Point(500, 50)); } } 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 71b3a85634..d871c78ffc 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 @@ -1,12 +1,12 @@ /********************************************************************** * Copyright (c) 2012 Ericsson - * + * * All rights reserved. This program and the accompanying materials are * made available under the terms of the Eclipse Public License v1.0 which * accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: + * + * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ package org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs; @@ -16,13 +16,13 @@ import org.eclipse.ui.PlatformUI; /** *

* Factory for generating dialog boxes. It allows to overwrite the dialog implementation. - * Useful also for testing purposes. + * Useful also for testing purposes. *

- * + * * @author Bernd Hufmann * */ -final public class TraceControlDialogFactory { +public final class TraceControlDialogFactory { // ------------------------------------------------------------------------ // Members @@ -37,42 +37,42 @@ final public class TraceControlDialogFactory { * The new connection dialog reference. */ private INewConnectionDialog fNewConnectionDialog; - + /** * The enable channel dialog */ private IEnableChannelDialog fEnableChannelDialog; - + /** * The create session dialog. */ private ICreateSessionDialog fCreateSessionDialog; - + /** * The enable events dialog. */ private IEnableEventsDialog fEnableEventsDialog; - + /** * The get event info dialog. */ private IGetEventInfoDialog fGetEventInfoDialog; - + /** * The confirmation dialog implementation. */ private IConfirmDialog fConfirmDialog; - + /** * The add context dialog implementation. */ private IAddContextDialog fAddContextDialog; - + /** * The import dialog implementation. */ private IImportDialog fImportDialog; - + /** * The import confirmation dialog. */ @@ -119,7 +119,7 @@ final public class TraceControlDialogFactory { public void setNewConnectionDialog(INewConnectionDialog newConnectionDialog) { fNewConnectionDialog = newConnectionDialog; } - + /** * @return enable channel dialog */ @@ -137,7 +137,7 @@ final public class TraceControlDialogFactory { public void setEnableChannelDialog(IEnableChannelDialog createEnableDialog) { fEnableChannelDialog = createEnableDialog; } - + /** * @return create session dialog implementation */ @@ -191,7 +191,7 @@ final public class TraceControlDialogFactory { public void setGetEventInfoDialog(IGetEventInfoDialog getEventInfoDialog) { fGetEventInfoDialog = getEventInfoDialog; } - + /** * @return the confirmation dialog implementation */ @@ -201,7 +201,7 @@ final public class TraceControlDialogFactory { } return fConfirmDialog; } - + /** * Sets the confirmation dialog implementation * @param confirmDialog - a confirmation dialog implementation @@ -209,7 +209,7 @@ final public class TraceControlDialogFactory { public void setConfirmDialog(IConfirmDialog confirmDialog) { fConfirmDialog = confirmDialog; } - + /** * @return the add context dialog implementation */ @@ -219,7 +219,7 @@ final public class TraceControlDialogFactory { } return fAddContextDialog; } - + /** * Sets the add context dialog information * @param addContextDialog - a add context dialog implementation @@ -227,7 +227,7 @@ final public class TraceControlDialogFactory { public void setAddContextDialog(IAddContextDialog addContextDialog) { fAddContextDialog = addContextDialog; } - + /** * @return the import dialog implementation */ @@ -237,7 +237,7 @@ final public class TraceControlDialogFactory { } return fImportDialog; } - + /** * Sets the import dialog implementation. * @param importDialog - a import dialog implementation @@ -245,7 +245,7 @@ final public class TraceControlDialogFactory { public void setImportDialog(IImportDialog importDialog) { fImportDialog = importDialog; } - + /** * @return the import confirmation dialog implementation. */ @@ -255,10 +255,10 @@ final public class TraceControlDialogFactory { } return fImportConfirmationDialog; } - + /** * Sets the import confirmation dialog implementation. - * @param confirmDialog - a import confirmation dialog implementation. + * @param confirmDialog - a import confirmation dialog implementation. */ public void setImportConfirmationDialog(IImportConfirmationDialog confirmDialog) { fImportConfirmationDialog = confirmDialog; 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 df1d34287a..f3e8d375f1 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 @@ -199,7 +199,7 @@ public class AssignEventHandler extends BaseControlViewHandler { /** * Class containing parameter for the command execution. */ - final static private class Parameter { + private static final class Parameter { /** * The list of event components the command is to be executed on. @@ -214,7 +214,7 @@ public class AssignEventHandler extends BaseControlViewHandler { /** * Flag for indicating Kernel or UST. */ - final private boolean fIsKernel; + private final boolean fIsKernel; /** * Constructor 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 f400947a3d..bf4bf64fd6 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 @@ -35,7 +35,7 @@ import org.eclipse.ui.progress.UIJob; * * @author Bernd Hufmann */ -abstract public class BaseAddContextHandler extends BaseControlViewHandler { +public abstract class BaseAddContextHandler extends BaseControlViewHandler { // ------------------------------------------------------------------------ // Attributes @@ -62,7 +62,7 @@ abstract public class BaseAddContextHandler extends BaseControlViewHandler { * @throws ExecutionException * If something goes wrong */ - abstract public void addContexts(CommandParameter param, List contextNames, IProgressMonitor monitor) throws ExecutionException; + public abstract void addContexts(CommandParameter param, List contextNames, IProgressMonitor monitor) throws ExecutionException; @Override public Object execute(ExecutionEvent event) throws ExecutionException { 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 336e8e548f..8135709af0 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 @@ -1,5 +1,5 @@ /********************************************************************** - * Copyright (c) 2012 Ericsson + * Copyright (c) 2012, 2013 Ericsson * * All rights reserved. This program and the accompanying materials are * made available under the terms of the Eclipse Public License v1.0 which @@ -34,7 +34,7 @@ import org.eclipse.ui.PlatformUI; * * @author Bernd Hufmann */ -abstract public class BaseControlViewHandler extends AbstractHandler { +public abstract class BaseControlViewHandler extends AbstractHandler { // ------------------------------------------------------------------------ // Attributes @@ -42,7 +42,7 @@ abstract public class BaseControlViewHandler extends AbstractHandler { /** * The synchronization lock. */ - final protected ReentrantLock fLock = new ReentrantLock(); + protected final ReentrantLock fLock = new ReentrantLock(); // ------------------------------------------------------------------------ // Operations 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 f04753ee5f..358d0c9ba8 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 @@ -65,7 +65,7 @@ abstract class BaseEnableChannelHandler extends BaseControlViewHandler { * @throws ExecutionException * If something goes wrong when enabling the channel */ - abstract public void enableChannel(CommandParameter param, + public abstract void enableChannel(CommandParameter param, List channelNames, IChannelInfo info, boolean isKernel, IProgressMonitor monitor) throws ExecutionException; @@ -73,7 +73,7 @@ abstract class BaseEnableChannelHandler extends BaseControlViewHandler { * @param param - a parameter instance with data for the command execution * @return returns the relevant domain (null if domain is not known) */ - abstract public TraceDomainComponent getDomain(CommandParameter param); + public abstract TraceDomainComponent getDomain(CommandParameter param); @Override public Object execute(ExecutionEvent event) throws ExecutionException { 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 f969368431..4e0fb71762 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 @@ -41,7 +41,7 @@ import org.eclipse.ui.PlatformUI; * * @author Bernd Hufmann */ -abstract public class BaseEnableEventHandler extends BaseControlViewHandler { +public abstract class BaseEnableEventHandler extends BaseControlViewHandler { // ------------------------------------------------------------------------ // Attributes @@ -71,7 +71,7 @@ abstract public class BaseEnableEventHandler extends BaseControlViewHandler { * @throws ExecutionException * If the command fails for some reason */ - abstract public void enableEvents(CommandParameter param, List eventNames, boolean isKernel, String filterExpression, IProgressMonitor monitor) throws ExecutionException; + public abstract void enableEvents(CommandParameter param, List eventNames, boolean isKernel, String filterExpression, IProgressMonitor monitor) throws ExecutionException; /** * Enables all syscall events. @@ -83,7 +83,7 @@ abstract public class BaseEnableEventHandler extends BaseControlViewHandler { * @throws ExecutionException * If the command fails for some reason */ - abstract public void enableSyscalls(CommandParameter param, IProgressMonitor monitor) throws ExecutionException; + public abstract void enableSyscalls(CommandParameter param, IProgressMonitor monitor) throws ExecutionException; /** * Enables a dynamic probe. @@ -101,7 +101,7 @@ abstract public class BaseEnableEventHandler extends BaseControlViewHandler { * @throws ExecutionException * If the command fails for some reason */ - abstract public void enableProbe(CommandParameter param, String eventName, boolean isFunction, String probe, IProgressMonitor monitor) throws ExecutionException; + public abstract void enableProbe(CommandParameter param, String eventName, boolean isFunction, String probe, IProgressMonitor monitor) throws ExecutionException; /** * Enables events using log level @@ -121,14 +121,14 @@ abstract public class BaseEnableEventHandler extends BaseControlViewHandler { * @throws ExecutionException * If the command fails for some reason */ - abstract public void enableLogLevel(CommandParameter param, String eventName, LogLevelType logLevelType, TraceLogLevel level, String filterExpression, IProgressMonitor monitor) throws ExecutionException; + public abstract void enableLogLevel(CommandParameter param, String eventName, LogLevelType logLevelType, TraceLogLevel level, String filterExpression, IProgressMonitor monitor) throws ExecutionException; /** * @param param * - a parameter instance with data for the command execution * @return returns the relevant domain (null if domain is not known) */ - abstract TraceDomainComponent getDomain(CommandParameter param); + public abstract TraceDomainComponent getDomain(CommandParameter param); @Override public Object execute(ExecutionEvent event) throws ExecutionException { diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/BaseNodeHandler.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/BaseNodeHandler.java index 3217e4b006..e922fb203e 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/BaseNodeHandler.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/BaseNodeHandler.java @@ -24,7 +24,7 @@ import org.eclipse.ui.IWorkbenchPage; * * @author Bernd Hufmann */ -abstract public class BaseNodeHandler extends BaseControlViewHandler { +public abstract class BaseNodeHandler extends BaseControlViewHandler { // ------------------------------------------------------------------------ // Attributes 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 ea2a5c478e..e4c65f845c 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 @@ -41,7 +41,7 @@ import org.eclipse.ui.PlatformUI; * * @author Bernd Hufmann */ -abstract public class ChangeEventStateHandler extends BaseControlViewHandler { +public abstract class ChangeEventStateHandler extends BaseControlViewHandler { // ------------------------------------------------------------------------ // Attributes @@ -57,7 +57,7 @@ abstract public class ChangeEventStateHandler extends BaseControlViewHandler { /** * @return the new state to set */ - abstract protected TraceEnablement getNewState(); + protected abstract TraceEnablement getNewState(); // ------------------------------------------------------------------------ // Operations @@ -69,7 +69,7 @@ abstract public class ChangeEventStateHandler extends BaseControlViewHandler { * @param monitor - a progress monitor * @throws ExecutionException If the command fails */ - abstract protected void changeState(TraceChannelComponent channel, List eventNames, IProgressMonitor monitor) throws ExecutionException; + protected abstract void changeState(TraceChannelComponent channel, List eventNames, IProgressMonitor monitor) throws ExecutionException; @Override public Object execute(ExecutionEvent event) throws ExecutionException { @@ -216,15 +216,15 @@ abstract public class ChangeEventStateHandler extends BaseControlViewHandler { /** * Class containing parameter for the command execution. */ - static protected class Parameter { + protected static class Parameter { /** * Channel component reference. */ - final private TraceChannelComponent fChannel; + private final TraceChannelComponent fChannel; /** * The list of kernel channel components the command is to be executed on. */ - final private List fEvents = new ArrayList(); + private final List fEvents = new ArrayList(); /** * Constructor 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 000df4420f..9cac43fdd6 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 @@ -72,7 +72,7 @@ abstract public class ChangeSessionStateHandler extends BaseControlViewHandler { * @throws ExecutionException * If the command fails */ - abstract public void changeState(TraceSessionComponent session, IProgressMonitor monitor) throws ExecutionException; + public abstract void changeState(TraceSessionComponent session, IProgressMonitor monitor) throws ExecutionException; @Override public Object execute(ExecutionEvent event) throws ExecutionException { 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 3714354100..ce15e5d512 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 @@ -53,7 +53,7 @@ public class NewConnectionHandler extends BaseControlViewHandler { /** * The trace control system type defined for LTTng version 2.0 and later. */ - public final static String TRACE_CONTROL_SYSTEM_TYPE = "org.eclipse.linuxtools.internal.lttng2.ui.control.systemType"; //$NON-NLS-1$ + public static final String TRACE_CONTROL_SYSTEM_TYPE = "org.eclipse.linuxtools.internal.lttng2.ui.control.systemType"; //$NON-NLS-1$ // ------------------------------------------------------------------------ // Attributes diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/logging/ControlCommandLogger.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/logging/ControlCommandLogger.java index 77dc4dbc57..ec0a4ac26b 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/logging/ControlCommandLogger.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/logging/ControlCommandLogger.java @@ -1,12 +1,12 @@ /********************************************************************** * Copyright (c) 2012 Ericsson - * + * * All rights reserved. This program and the accompanying materials are * made available under the terms of the Eclipse Public License v1.0 which * accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: + * + * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ package org.eclipse.linuxtools.internal.lttng2.ui.views.control.logging; @@ -21,7 +21,7 @@ import org.eclipse.linuxtools.internal.lttng2.ui.Activator; *

* Class to log control commands. *

- * + * * @author Bernd Hufmann */ public class ControlCommandLogger { @@ -33,12 +33,19 @@ public class ControlCommandLogger { * The bufferd writer reference */ private static BufferedWriter fTraceLog = null; - + + // ------------------------------------------------------------------------ + // Constructor + // ------------------------------------------------------------------------ + private ControlCommandLogger() { + + } + // ------------------------------------------------------------------------ // Operations // ------------------------------------------------------------------------ /** - * Initializes the logger class and opens the log file with the given parameter. + * Initializes the logger class and opens the log file with the given parameter. * @param filename - file name of logger output * @param append - true to open log file in append mode else false (overwrite) */ @@ -48,13 +55,14 @@ public class ControlCommandLogger { } fTraceLog = openLogFile(filename, append); } - + /** * Closes the log file if open. */ public static void close() { - if (fTraceLog == null) + if (fTraceLog == null) { return; + } try { fTraceLog.close(); @@ -63,7 +71,7 @@ public class ControlCommandLogger { Activator.getDefault().logWarning("Can't close log file of the trace control", e); //$NON-NLS-1$ } } - + /** * Logs a message to the log file. * @param msg - message (e.g. command or command result) to log 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 2be087ac39..30123cce00 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 @@ -116,7 +116,6 @@ public class TraceChannelComponent extends TraceControlComponent { eventComponents.add(event); event.setEventInfo(events[i]); -// addChild(event); } if (!eventComponents.isEmpty()) { setChildren(eventComponents); diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TraceControlRoot.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TraceControlRoot.java index a381a331ca..445ed5a3bd 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TraceControlRoot.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TraceControlRoot.java @@ -1,12 +1,12 @@ /********************************************************************** - * Copyright (c) 2012 Ericsson - * + * Copyright (c) 2012, 2013 Ericsson + * * All rights reserved. This program and the accompanying materials are * made available under the terms of the Eclipse Public License v1.0 which * accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: + * + * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ package org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl; @@ -16,7 +16,7 @@ package org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl; *

* Root element in trace control tree. *

- * + * * @author Bernd Hufmann */ public class TraceControlRoot extends TraceControlComponent { @@ -27,8 +27,8 @@ public class TraceControlRoot extends TraceControlComponent { /** * The name of the root component */ - public final static String TRACE_CONTROL_ROOT_NAME = "trace_control_root"; //$NON-NLS-1$ - + public static final String TRACE_CONTROL_ROOT_NAME = "trace_control_root"; //$NON-NLS-1$ + // ------------------------------------------------------------------------ // Constructors // ------------------------------------------------------------------------ @@ -38,5 +38,5 @@ public class TraceControlRoot extends TraceControlComponent { public TraceControlRoot() { super(TRACE_CONTROL_ROOT_NAME); } - + } 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 12eca09f25..69275a6495 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 @@ -36,8 +36,8 @@ public class ControlPreferencePage extends FieldEditorPreferencePage implements // ------------------------------------------------------------------------ // Attributes // ------------------------------------------------------------------------ - RadioGroupFieldEditor fVerboseLevel; - BooleanFieldEditor fIsAppend; + private RadioGroupFieldEditor fVerboseLevel; + private BooleanFieldEditor fIsAppend; // ------------------------------------------------------------------------ // Constructors 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 393578035c..261b28f008 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 @@ -85,15 +85,15 @@ public class ControlPreferences { /** * Default timeout value used for executing commands, in seconds */ - public final static int TRACE_CONTROL_DEFAULT_TIMEOUT_VALUE = 15; + public static final int TRACE_CONTROL_DEFAULT_TIMEOUT_VALUE = 15; /** * Minimum timeout value used for executing commands, in seconds */ - public final static int TRACE_CONTROL_MIN_TIMEOUT_VALUE = 5; + public static final int TRACE_CONTROL_MIN_TIMEOUT_VALUE = 5; /** * Maximum timeout value used for executing commands, in seconds */ - public final static int TRACE_CONTROL_MAX_TIMEOUT_VALUE = 600; + public static final int TRACE_CONTROL_MAX_TIMEOUT_VALUE = 600; // ------------------------------------------------------------------------ // Attributes @@ -124,7 +124,7 @@ public class ControlPreferences { * * @return the trace control preferences singleton instance */ - public synchronized static ControlPreferences getInstance() { + public static synchronized ControlPreferences getInstance() { if (fInstance == null) { fInstance = new ControlPreferences(); } diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/BasePropertySource.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/BasePropertySource.java index f27f27e354..149416860f 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/BasePropertySource.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/BasePropertySource.java @@ -21,7 +21,7 @@ import org.eclipse.ui.views.properties.IPropertySource; * * @author Bernd Hufmann */ -abstract public class BasePropertySource implements IPropertySource { +public abstract class BasePropertySource implements IPropertySource { // ------------------------------------------------------------------------ // Operations @@ -33,10 +33,10 @@ abstract public class BasePropertySource implements IPropertySource { } @Override - abstract public IPropertyDescriptor[] getPropertyDescriptors(); + public abstract IPropertyDescriptor[] getPropertyDescriptors(); @Override - abstract public Object getPropertyValue(Object id); + public abstract Object getPropertyValue(Object id); @Override public boolean isPropertySet(Object id) { diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/remote/CommandShell.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/remote/CommandShell.java index 95b50a6d81..8c56874811 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/remote/CommandShell.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/remote/CommandShell.java @@ -49,19 +49,19 @@ public class CommandShell implements ICommandShell { // ------------------------------------------------------------------------ /** Sub-string to be echo'ed when running command in shell, used to indicate that the command has finished running */ - public final static String DONE_MARKUP_STRING = "--RSE:donedonedone:--"; //$NON-NLS-1$ + public static final String DONE_MARKUP_STRING = "--RSE:donedonedone:--"; //$NON-NLS-1$ /** Sub-string to be echoed when running a command in shell. */ - public final static String BEGIN_END_TAG = "BEGIN-END-TAG:"; //$NON-NLS-1$ + public static final String BEGIN_END_TAG = "BEGIN-END-TAG:"; //$NON-NLS-1$ /** Command delimiter for shell */ - public final static String CMD_DELIMITER = "\n"; //$NON-NLS-1$ + public static final String CMD_DELIMITER = "\n"; //$NON-NLS-1$ /** Shell "echo" command */ - public final static String SHELL_ECHO_CMD = " echo "; //$NON-NLS-1$ + public static final String SHELL_ECHO_CMD = " echo "; //$NON-NLS-1$ /** Default command separator */ - public final static char CMD_SEPARATOR = ';'; + public static final char CMD_SEPARATOR = ';'; // ------------------------------------------------------------------------ // Attributes @@ -292,10 +292,8 @@ public class CommandShell implements ICommandShell { return true; } int index = line.indexOf(expected); - if (index > 0) { - if (line.indexOf(SHELL_ECHO_CMD) == -1) { - return true; - } + if ((index > 0) && (line.indexOf(SHELL_ECHO_CMD) == -1)) { + return true; } return false; 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 429d4a55db..d660dcfdbb 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 @@ -60,12 +60,12 @@ public class LTTngControlService implements ILttngControlService { /** * The command shell implementation */ - protected ICommandShell fCommandShell = null; + private final ICommandShell fCommandShell; /** * The version string. */ - protected LttngVersion fVersion = null; + private LttngVersion fVersion = null; // ------------------------------------------------------------------------ // Constructors @@ -107,6 +107,15 @@ public class LTTngControlService implements ILttngControlService { return (fVersion != null && fVersion.compareTo(tmp) >= 0) ? true : false; } + /** + * Returns the command shell implementation. + * + * @return the command shell implementation + */ + protected ICommandShell getCommandShell() { + return fCommandShell; + } + // ------------------------------------------------------------------------ // Operations // ------------------------------------------------------------------------ @@ -856,11 +865,7 @@ public class LTTngControlService implements ILttngControlService { @Override public void calibrate(boolean isKernel, IProgressMonitor monitor) throws ExecutionException { -// String newSessionName = formatParameter(sessionName); StringBuffer command = createCommand(LTTngControlServiceConstants.COMMAND_CALIBRATE); -// -// command.append(OPTION_SESSION); -// command.append(newSessionName); if (isKernel) { command.append(LTTngControlServiceConstants.OPTION_KERNEL); @@ -1137,10 +1142,6 @@ public class LTTngControlService implements ILttngControlService { } else { index++; } -// else if (line.matches(EVENT_NONE_PATTERN)) { - // do nothing -// } else - } return index; diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/service/LTTngControlServiceConstants.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/service/LTTngControlServiceConstants.java index 1f0eade689..ee54d7b6df 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/service/LTTngControlServiceConstants.java +++ b/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 */ -public class LTTngControlServiceConstants { +interface LTTngControlServiceConstants { // ------------------------------------------------------------------------ // Version constants @@ -29,7 +29,7 @@ public class LTTngControlServiceConstants { /** * Pattern to match the LTTng toolchain version 2.x.y. */ - public final static Pattern VERSION_2_PATTERN = Pattern.compile("(2\\.\\d+\\.\\d+).*"); //$NON-NLS-1$ + public static final Pattern VERSION_2_PATTERN = Pattern.compile("(2\\.\\d+\\.\\d+).*"); //$NON-NLS-1$ // ------------------------------------------------------------------------ // Command constants @@ -37,63 +37,63 @@ public class LTTngControlServiceConstants { /** * The lttng tools command. */ - public final static String CONTROL_COMMAND = "lttng"; //$NON-NLS-1$ + public static final String CONTROL_COMMAND = "lttng"; //$NON-NLS-1$ /** * Command: lttng version. */ - public final static String COMMAND_VERSION = " version "; //$NON-NLS-1$ + public static final String COMMAND_VERSION = " version "; //$NON-NLS-1$ /** * Command: lttng list. */ - public final static String COMMAND_LIST = " list "; //$NON-NLS-1$ + public static final String COMMAND_LIST = " list "; //$NON-NLS-1$ /** * Command to list kernel tracer information. */ - public final static String COMMAND_LIST_KERNEL = COMMAND_LIST + "-k"; //$NON-NLS-1$ + public static final String COMMAND_LIST_KERNEL = COMMAND_LIST + "-k"; //$NON-NLS-1$ /** * Command to list user space trace information. */ - public final static String COMMAND_LIST_UST = COMMAND_LIST + "-u"; //$NON-NLS-1$ + public static final String COMMAND_LIST_UST = COMMAND_LIST + "-u"; //$NON-NLS-1$ /** * Command to create a session. */ - public final static String COMMAND_CREATE_SESSION = " create "; //$NON-NLS-1$ + public static final String COMMAND_CREATE_SESSION = " create "; //$NON-NLS-1$ /** * Command to destroy a session. */ - public final static String COMMAND_DESTROY_SESSION = " destroy "; //$NON-NLS-1$ + public static final String COMMAND_DESTROY_SESSION = " destroy "; //$NON-NLS-1$ /** * Command to destroy a session. */ - public final static String COMMAND_START_SESSION = " start "; //$NON-NLS-1$ + public static final String COMMAND_START_SESSION = " start "; //$NON-NLS-1$ /** * Command to destroy a session. */ - public final static String COMMAND_STOP_SESSION = " stop "; //$NON-NLS-1$ + public static final String COMMAND_STOP_SESSION = " stop "; //$NON-NLS-1$ /** * Command to enable a channel. */ - public final static String COMMAND_ENABLE_CHANNEL = " enable-channel "; //$NON-NLS-1$ + public static final String COMMAND_ENABLE_CHANNEL = " enable-channel "; //$NON-NLS-1$ /** * Command to disable a channel. */ - public final static String COMMAND_DISABLE_CHANNEL = " disable-channel "; //$NON-NLS-1$ + public static final String COMMAND_DISABLE_CHANNEL = " disable-channel "; //$NON-NLS-1$ /** * Command to enable a event. */ - public final static String COMMAND_ENABLE_EVENT = " enable-event "; //$NON-NLS-1$ + public static final String COMMAND_ENABLE_EVENT = " enable-event "; //$NON-NLS-1$ /** * Command to disable a event. */ - public final static String COMMAND_DISABLE_EVENT = " disable-event "; //$NON-NLS-1$ + public static final String COMMAND_DISABLE_EVENT = " disable-event "; //$NON-NLS-1$ /** * Command to add a context to channels and/or events */ - public final static String COMMAND_ADD_CONTEXT = " add-context "; //$NON-NLS-1$ + public static final String COMMAND_ADD_CONTEXT = " add-context "; //$NON-NLS-1$ /** * Command to execute calibrate command to quantify LTTng overhead */ - public final static String COMMAND_CALIBRATE = " calibrate "; //$NON-NLS-1$ + public static final String COMMAND_CALIBRATE = " calibrate "; //$NON-NLS-1$ // ------------------------------------------------------------------------ // Command line options constants @@ -101,119 +101,119 @@ public class LTTngControlServiceConstants { /** * Command line option to add tracing group of user. */ - public final static String OPTION_TRACING_GROUP = " -g "; //$NON-NLS-1$ + public static final String OPTION_TRACING_GROUP = " -g "; //$NON-NLS-1$ /** * Command line option for verbose output. */ - public final static String OPTION_VERBOSE = " -v "; //$NON-NLS-1$ + public static final String OPTION_VERBOSE = " -v "; //$NON-NLS-1$ /** * Command line option for verbose output. */ - public final static String OPTION_VERY_VERBOSE = " -vv "; //$NON-NLS-1$ + public static final String OPTION_VERY_VERBOSE = " -vv "; //$NON-NLS-1$ /** * Command line option for verbose output. */ - public final static String OPTION_VERY_VERY_VERBOSE = " -vvv "; //$NON-NLS-1$ + public static final String OPTION_VERY_VERY_VERBOSE = " -vvv "; //$NON-NLS-1$ /** * Command line option for output path. */ - public final static String OPTION_OUTPUT_PATH = " -o "; //$NON-NLS-1$ + public static final String OPTION_OUTPUT_PATH = " -o "; //$NON-NLS-1$ /** * Command line option for kernel tracer. */ - public final static String OPTION_KERNEL = " -k "; //$NON-NLS-1$ + public static final String OPTION_KERNEL = " -k "; //$NON-NLS-1$ /** * Command line option for UST tracer. */ - public final static String OPTION_UST = " -u "; //$NON-NLS-1$ + public static final String OPTION_UST = " -u "; //$NON-NLS-1$ /** * Command line option for specifying a session. */ - public final static String OPTION_SESSION = " -s "; //$NON-NLS-1$ + public static final String OPTION_SESSION = " -s "; //$NON-NLS-1$ /** * Command line option for specifying a channel. */ - public final static String OPTION_CHANNEL = " -c "; //$NON-NLS-1$ + public static final String OPTION_CHANNEL = " -c "; //$NON-NLS-1$ /** * Command line option for specifying a event. */ - public final static String OPTION_EVENT = " -e "; //$NON-NLS-1$ + public static final String OPTION_EVENT = " -e "; //$NON-NLS-1$ /** * Command line option for specifying all events. */ - public final static String OPTION_ALL = " -a "; //$NON-NLS-1$ + public static final String OPTION_ALL = " -a "; //$NON-NLS-1$ /** * Command line option for specifying a context. */ - public final static String OPTION_CONTEXT_TYPE = " -t "; //$NON-NLS-1$ + public static final String OPTION_CONTEXT_TYPE = " -t "; //$NON-NLS-1$ /** * Command line option for specifying tracepoint events. */ - public final static String OPTION_TRACEPOINT = " --tracepoint "; //$NON-NLS-1$ + public static final String OPTION_TRACEPOINT = " --tracepoint "; //$NON-NLS-1$ /** * Command line option for specifying syscall events. */ - public final static String OPTION_SYSCALL = " --syscall "; //$NON-NLS-1$ + public static final String OPTION_SYSCALL = " --syscall "; //$NON-NLS-1$ /** * Command line option for specifying a dynamic probe. */ - public final static String OPTION_PROBE = " --probe "; //$NON-NLS-1$ + public static final String OPTION_PROBE = " --probe "; //$NON-NLS-1$ /** * Command line option for specifying a dynamic function entry/return probe. */ - public final static String OPTION_FUNCTION_PROBE = " --function "; //$NON-NLS-1$ + public static final String OPTION_FUNCTION_PROBE = " --function "; //$NON-NLS-1$ /** * Command line option for specifying a log level range. */ - public final static String OPTION_LOGLEVEL = " --loglevel "; //$NON-NLS-1$ + public static final String OPTION_LOGLEVEL = " --loglevel "; //$NON-NLS-1$ /** * Command line option for specifying a specific log level. */ - public final static String OPTION_LOGLEVEL_ONLY = " --loglevel-only "; //$NON-NLS-1$ + public static final String OPTION_LOGLEVEL_ONLY = " --loglevel-only "; //$NON-NLS-1$ /** * Optional command line option for configuring a channel's overwrite mode. */ - public final static String OPTION_OVERWRITE = " --overwrite "; //$NON-NLS-1$ + public static final String OPTION_OVERWRITE = " --overwrite "; //$NON-NLS-1$ /** * Optional command line option for configuring a channel's number of sub buffers. */ - public final static String OPTION_NUM_SUB_BUFFERS = " --num-subbuf "; //$NON-NLS-1$ + public 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 final static String OPTION_SUB_BUFFER_SIZE = " --subbuf-size "; //$NON-NLS-1$ + public 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 final static String OPTION_SWITCH_TIMER = " --switch-timer "; //$NON-NLS-1$ + public static final String OPTION_SWITCH_TIMER = " --switch-timer "; //$NON-NLS-1$ /** * Optional command line option for configuring a channel's read timer interval. */ - public final static String OPTION_READ_TIMER = " --read-timer "; //$NON-NLS-1$ + public static final String OPTION_READ_TIMER = " --read-timer "; //$NON-NLS-1$ /** * Command line option for printing the help of a specif command */ - public final static String OPTION_HELP = " -h "; //$NON-NLS-1$ + public static final String OPTION_HELP = " -h "; //$NON-NLS-1$ /** * Command line option for listing the fields of UST tracepoints */ - public final static String OPTION_FIELDS = " -f "; //$NON-NLS-1$ + public static final String OPTION_FIELDS = " -f "; //$NON-NLS-1$ /** * Command line option for configuring event's filter */ - public final static String OPTION_FILTER = " --filter "; //$NON-NLS-1$ + public 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 final static String OPTION_NETWORK_URL = " -U "; //$NON-NLS-1$ + public static final String OPTION_NETWORK_URL = " -U "; //$NON-NLS-1$ /** * Command line option for configuring the streaming control URL. */ - public final static String OPTION_CONTROL_URL = " -C "; //$NON-NLS-1$ + public static final String OPTION_CONTROL_URL = " -C "; //$NON-NLS-1$ /** * Command line option for configuring the streaming data URL. */ - public final static String OPTION_DATA_URL = " -D "; //$NON-NLS-1$ + public static final String OPTION_DATA_URL = " -D "; //$NON-NLS-1$ // ------------------------------------------------------------------------ // Parsing constants @@ -221,150 +221,146 @@ public class LTTngControlServiceConstants { /** * Pattern to match the version. */ - public final static Pattern VERSION_PATTERN = Pattern.compile(".*lttng\\s+version\\s+(\\d+\\.\\d+\\.\\d+).*"); //$NON-NLS-1$ + public static final Pattern VERSION_PATTERN = Pattern.compile(".*lttng\\s+version\\s+(\\d+\\.\\d+\\.\\d+).*"); //$NON-NLS-1$ /** * Pattern to match for error output */ - public final static Pattern ERROR_PATTERN = Pattern.compile("\\s*Error\\:.*"); //$NON-NLS-1$ + public static final Pattern ERROR_PATTERN = Pattern.compile("\\s*Error\\:.*"); //$NON-NLS-1$ /** * Pattern to match for session information (lttng list) */ - public final static Pattern SESSION_PATTERN = Pattern.compile("\\s+(\\d+)\\)\\s+(.*)\\s+\\((.*)\\)\\s+\\[(active|inactive)\\].*"); //$NON-NLS-1$ + public 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 ) */ - public final static Pattern TRACE_SESSION_PATTERN = Pattern.compile("\\s*Tracing\\s+session\\s+(.*)\\:\\s+\\[(active|inactive)\\].*"); //$NON-NLS-1$ + public 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 ) */ - public final static Pattern TRACE_SESSION_PATH_PATTERN = Pattern.compile("\\s*Trace\\s+path\\:\\s+(.*)"); //$NON-NLS-1$ + public 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 ) * Note: file for protocol is not considered as network trace since local consumer will be used. */ - public final static 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$ + 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$ /** * Sub-pattern to pattern TRACE_NETWORK_PATH_PATTERN to match file protocol */ - public final static Pattern TRACE_FILE_PROTOCOL_PATTERN = Pattern.compile("(file)\\:\\/\\/(.*)"); //$NON-NLS-1$ + public static final Pattern TRACE_FILE_PROTOCOL_PATTERN = Pattern.compile("(file)\\:\\/\\/(.*)"); //$NON-NLS-1$ /** * Pattern to match for kernel domain information (lttng list ) */ - public final static Pattern DOMAIN_KERNEL_PATTERN = Pattern.compile("=== Domain: Kernel ==="); //$NON-NLS-1$ + public static final Pattern DOMAIN_KERNEL_PATTERN = Pattern.compile("=== Domain: Kernel ==="); //$NON-NLS-1$ /** * Pattern to match for ust domain information (lttng list ) */ - public final static Pattern DOMAIN_UST_GLOBAL_PATTERN = Pattern.compile("=== Domain: UST global ==="); //$NON-NLS-1$ + public 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 final static Pattern DOMAIN_NO_KERNEL_CHANNEL_PATTERN = Pattern.compile("\\s*Warning\\:\\s+No kernel\\s+channel.*"); //$NON-NLS-1$ + public 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 final static Pattern DOMAIN_NO_UST_CHANNEL_PATTERN = Pattern.compile("\\s*Error\\:\\s+UST\\s+channel\\s+not\\s+found.*"); //$NON-NLS-1$ + public 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 ) */ - public final static Pattern CHANNELS_SECTION_PATTERN = Pattern.compile("\\s*Channels\\:"); //$NON-NLS-1$ + public static final Pattern CHANNELS_SECTION_PATTERN = Pattern.compile("\\s*Channels\\:"); //$NON-NLS-1$ /** * Pattern to match for channel information (lttng list ) */ - public final static Pattern CHANNEL_PATTERN = Pattern.compile("\\s*-\\s+(.*)\\:\\s+\\[(enabled|disabled)\\]"); //$NON-NLS-1$ + public static final Pattern CHANNEL_PATTERN = Pattern.compile("\\s*-\\s+(.*)\\:\\s+\\[(enabled|disabled)\\]"); //$NON-NLS-1$ /** * Pattern to match for events section information (lttng list ) */ - public final static Pattern EVENT_SECTION_PATTERN = Pattern.compile("\\s*Events\\:"); //$NON-NLS-1$ - /** - * Pattern to match for event information (no enabled events) (lttng list ) - */ - // public final static String EVENT_NONE_PATTERN = "\\s+None"; //$NON-NLS-1$ + public static final Pattern EVENT_SECTION_PATTERN = Pattern.compile("\\s*Events\\:"); //$NON-NLS-1$ /** * Pattern to match for event information (lttng list ) */ - public final static Pattern EVENT_PATTERN = Pattern.compile("\\s+(.*)\\s+\\(loglevel:\\s+(.*)\\s+\\(\\d*\\)\\)\\s+\\(type:\\s+(.*)\\)\\s+\\[(enabled|disabled)\\]\\s*(\\[.*\\]){0,1}.*"); //$NON-NLS-1$ + 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$ /** * Pattern to match a wildcarded event information (lttng list ) */ - public final static Pattern WILDCARD_EVENT_PATTERN = Pattern.compile("\\s+(.*)\\s+\\(type:\\s+(.*)\\)\\s+\\[(enabled|disabled)\\]\\s*(\\[.*\\]){0,1}.*"); //$NON-NLS-1$ + public 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 ) */ - public final static Pattern PROBE_ADDRESS_PATTERN = Pattern.compile("\\s+(addr)\\:\\s+(0x[0-9a-fA-F]{1,8})"); //$NON-NLS-1$ + public 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 ) */ - public final static Pattern PROBE_OFFSET_PATTERN = Pattern.compile("\\s+(offset)\\:\\s+(0x[0-9a-fA-F]{1,8})"); //$NON-NLS-1$ + public 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 ) */ - public final static Pattern PROBE_SYMBOL_PATTERN = Pattern.compile("\\s+(symbol)\\:\\s+(.+)"); //$NON-NLS-1$ + public static final Pattern PROBE_SYMBOL_PATTERN = Pattern.compile("\\s+(symbol)\\:\\s+(.+)"); //$NON-NLS-1$ /** * Pattern to match for channel (overwite mode) information (lttng list ) */ - public final static Pattern OVERWRITE_MODE_ATTRIBUTE = Pattern.compile("\\s+overwrite\\s+mode\\:.*"); //$NON-NLS-1$ + public static final Pattern OVERWRITE_MODE_ATTRIBUTE = Pattern.compile("\\s+overwrite\\s+mode\\:.*"); //$NON-NLS-1$ /** * Pattern to match indicating false for overwrite mode */ - public final static String OVERWRITE_MODE_ATTRIBUTE_FALSE = "0"; //$NON-NLS-1$ + public static final String OVERWRITE_MODE_ATTRIBUTE_FALSE = "0"; //$NON-NLS-1$ /** * Pattern to match for channel (sub-buffer size) information (lttng list ) */ - public final static Pattern SUBBUFFER_SIZE_ATTRIBUTE = Pattern.compile("\\s+subbufers\\s+size\\:.*"); //$NON-NLS-1$ + public 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 ) */ - public final static Pattern NUM_SUBBUFFERS_ATTRIBUTE = Pattern.compile("\\s+number\\s+of\\s+subbufers\\:.*"); //$NON-NLS-1$ + public 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 ) */ - public final static Pattern SWITCH_TIMER_ATTRIBUTE = Pattern.compile("\\s+switch\\s+timer\\s+interval\\:.*"); //$NON-NLS-1$ + public 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 ) */ - public final static Pattern READ_TIMER_ATTRIBUTE = Pattern.compile("\\s+read\\s+timer\\s+interval\\:.*"); //$NON-NLS-1$ + public 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 ) */ - public final static Pattern OUTPUT_ATTRIBUTE = Pattern.compile("\\s+output\\:.*"); //$NON-NLS-1$ + public static final Pattern OUTPUT_ATTRIBUTE = Pattern.compile("\\s+output\\:.*"); //$NON-NLS-1$ /** * Pattern to match for provider information (lttng list -k/-u) */ - public final static Pattern PROVIDER_EVENT_PATTERN = Pattern.compile("\\s*(.*)\\s+\\(loglevel:\\s+(.*)\\s+\\(\\d*\\)\\)\\s+\\(type:\\s+(.*)\\)"); //$NON-NLS-1$ + public 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 final static Pattern EVENT_FIELD_PATTERN = Pattern.compile("\\s*(field:)\\s+(.*)\\s+\\((.*)\\)"); //$NON-NLS-1$ + public 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 final static Pattern UST_PROVIDER_PATTERN = Pattern.compile("\\s*PID\\:\\s+(\\d+)\\s+-\\s+Name\\:\\s+(.*)"); //$NON-NLS-1$ + public 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 ) */ - public final static Pattern CREATE_SESSION_NAME_PATTERN = Pattern.compile(".*Session\\s+(.*)\\s+created\\."); //$NON-NLS-1$ + public 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 ) */ - public final static Pattern CREATE_SESSION_PATH_PATTERN = Pattern.compile("\\s*Traces\\s+will\\s+be\\s+written\\s+in\\s+(.*).*"); //$NON-NLS-1$ + public 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 final static Pattern SESSION_NOT_FOUND_ERROR_PATTERN = Pattern.compile("\\s*Error:\\s+Session\\s+name\\s+not\\s+found"); //$NON-NLS-1$ + public 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 final static 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$ + 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$ /** * Pattern to match introduction line of context list. */ - public final static Pattern ADD_CONTEXT_HELP_CONTEXTS_END_LINE = Pattern.compile("\\s*Example.*"); //$NON-NLS-1$ + public 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 final static Pattern LIST_KERNEL_NO_KERNEL_PROVIDER_PATTERN = Pattern.compile("\\s*Error:\\s+Unable\\s+to\\s+list\\s+kernel\\s+events.*"); //$NON-NLS-1$; + 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$; /** * Pattern to match error line if no ust tracer is available or installed. */ - public final static Pattern LIST_UST_NO_UST_PROVIDER_PATTERN = Pattern.compile(".*Unable\\s*to\\s*list\\s*UST\\s*event.*"); //$NON-NLS-1$; + public static final Pattern LIST_UST_NO_UST_PROVIDER_PATTERN = Pattern.compile(".*Unable\\s*to\\s*list\\s*UST\\s*event.*"); //$NON-NLS-1$; } -- 2.34.1