From 112523422233867587c313bdc26b21bde93931d0 Mon Sep 17 00:00:00 2001 From: Alexandre Montplaisir Date: Tue, 9 Apr 2013 13:06:46 -0400 Subject: [PATCH] tmf/lttng: Remove unneeded (non-Javadoc) comments Those comments are not needed anymore. With Java >= 6, overriding classes marked with @Override also inherit the Javadoc from the base class. Also: - Some auto-formatter actions, to remove those pesky tabs. - Ran the copyright tool. Might have updated unrelated files. Change-Id: I93f699efa075a5629f31f478b7045247388f58fe Signed-off-by: Alexandre Montplaisir Reviewed-on: https://git.eclipse.org/r/12141 Tested-by: Hudson CI --- .../ctf/core/tests/headless/ReadTrace.java | 2 +- .../ctf/core/event/CTFCallsite.java | 8 +- .../core/event/types/IntegerDefinition.java | 8 +- .../core/event/types/StructDeclaration.java | 10 - .../ctf/core/trace/CTFReaderException.java | 2 +- .../linuxtools/ctf/core/trace/CTFTrace.java | 5 - .../ctf/core/trace/CTFTraceReader.java | 5 - .../linuxtools/ctf/core/trace/Metadata.java | 2 +- .../linuxtools/ctf/core/trace/Stream.java | 4 - .../ctf/core/trace/StreamInput.java | 12 +- .../ctf/core/trace/StreamInputReader.java | 10 - .../metadata/exceptions/ParseException.java | 2 +- .../trace/StreamInputPacketIndexEntry.java | 7 +- .../internal/lttng2/core/Activator.java | 100 +++-- .../control/model/impl/BaseEventInfo.java | 58 +-- .../core/control/model/impl/ChannelInfo.java | 88 +---- .../core/control/model/impl/DomainInfo.java | 33 +- .../core/control/model/impl/EventInfo.java | 43 +- .../core/control/model/impl/FieldInfo.java | 20 - .../control/model/impl/ProbeEventInfo.java | 59 +-- .../core/control/model/impl/SessionInfo.java | 55 +-- .../core/control/model/impl/TraceInfo.java | 24 +- .../control/model/impl/UstProviderInfo.java | 36 +- .../lttng2/kernel/core/Activator.java | 100 +++-- .../lttng2/kernel/core/Attributes.java | 2 +- .../internal/lttng2/kernel/ui/Activator.java | 11 +- .../ui/viewers/events/LTTng2EventsTable.java | 2 +- .../kernel/ui/views/PerspectiveFactory.java | 7 +- .../ui/views/controlflow/ControlFlowView.java | 6 - .../ui/views/resources/ResourcesView.java | 6 - .../dialogs/EnableChannelDialogStub.java | 2 +- .../stubs/shells/LTTngToolsFileShell.java | 5 +- .../internal/lttng2/ui/Activator.java | 53 ++- .../lttng2/ui/views/control/ControlView.java | 29 +- .../control/dialogs/AddContextDialog.java | 32 +- .../views/control/dialogs/ConfirmDialog.java | 18 +- .../control/dialogs/CreateSessionDialog.java | 38 +- .../control/dialogs/EnableChannelDialog.java | 41 +- .../control/dialogs/EnableEventsDialog.java | 102 +---- .../dialogs/EnableKernelEventComposite.java | 42 +- .../dialogs/EnableUstEventsComposite.java | 47 +-- .../control/dialogs/GetEventInfoDialog.java | 39 +- .../dialogs/ImportConfirmationDialog.java | 60 +-- .../views/control/dialogs/ImportDialog.java | 31 +- .../control/dialogs/NewConnectionDialog.java | 34 +- .../handlers/AddContextOnChannelHandler.java | 11 +- .../handlers/AddContextOnDomainHandler.java | 11 +- .../handlers/AddContextOnEventHandler.java | 11 +- .../control/handlers/AssignEventHandler.java | 9 +- .../handlers/BaseAddContextHandler.java | 7 +- .../handlers/BaseEnableChannelHandler.java | 6 +- .../handlers/BaseEnableEventHandler.java | 4 - .../control/handlers/BaseNodeHandler.java | 21 +- .../control/handlers/CalibrateHandler.java | 10 +- .../handlers/ChangeChannelStateHandler.java | 10 +- .../handlers/ChangeEventStateHandler.java | 10 +- .../handlers/ChangeSessionStateHandler.java | 10 +- .../handlers/ChannelCommandParameter.java | 6 +- .../control/handlers/CommandParameter.java | 18 +- .../control/handlers/ConnectHandler.java | 18 +- .../handlers/CreateSessionHandler.java | 10 +- .../views/control/handlers/DeleteHandler.java | 19 +- .../handlers/DestroySessionHandler.java | 11 +- .../handlers/DisableChannelHandler.java | 20 +- .../control/handlers/DisableEventHandler.java | 22 +- .../control/handlers/DisconnectHandler.java | 18 +- .../handlers/DomainCommandParameter.java | 16 +- .../handlers/EnableChannelHandler.java | 20 +- .../EnableChannelOnDomainHandler.java | 15 +- .../EnableChannelOnSessionHandler.java | 15 +- .../control/handlers/EnableEventHandler.java | 22 +- .../handlers/EnableEventOnChannelHandler.java | 25 +- .../handlers/EnableEventOnDomainHandler.java | 29 +- .../handlers/EnableEventOnSessionHandler.java | 25 +- .../handlers/EventCommandParameter.java | 17 +- .../views/control/handlers/ImportHandler.java | 13 +- .../handlers/NewConnectionHandler.java | 10 +- .../control/handlers/RefreshHandler.java | 11 +- .../views/control/handlers/StartHandler.java | 22 +- .../views/control/handlers/StopHandler.java | 22 +- .../model/impl/BaseEventComponent.java | 4 - .../model/impl/KernelProviderComponent.java | 17 +- .../model/impl/TargetNodeComponent.java | 39 +- .../model/impl/TraceChannelComponent.java | 14 +- .../model/impl/TraceControlComponent.java | 120 +----- .../impl/TraceControlContentProvider.java | 38 +- .../model/impl/TraceControlLabelProvider.java | 21 +- .../model/impl/TraceDomainComponent.java | 4 - .../model/impl/TraceEventComponent.java | 9 +- .../model/impl/TraceProbeEventComponent.java | 6 +- .../model/impl/TraceSessionComponent.java | 9 +- .../model/impl/UstProviderComponent.java | 12 +- .../ControlPreferenceInitializer.java | 5 +- .../preferences/ControlPreferencePage.java | 21 +- .../property/BaseEventPropertySource.java | 9 +- .../control/property/BasePropertySource.java | 35 +- .../KernelProviderPropertySource.java | 14 +- .../property/TargetNodePropertySource.java | 11 +- .../property/TraceChannelPropertySource.java | 10 +- .../property/TraceDomainPropertySource.java | 13 +- .../property/TraceEventPropertySource.java | 11 +- .../TraceProbeEventPropertySource.java | 11 +- .../property/TraceSessionPropertySource.java | 13 +- .../property/UstProviderPropertySource.java | 13 +- .../views/control/remote/CommandResult.java | 19 +- .../ui/views/control/remote/CommandShell.java | 17 +- .../control/remote/RemoteSystemProxy.java | 34 +- .../control/service/LTTngControlService.java | 103 +---- .../service/LTTngControlServiceFactory.java | 2 +- .../tmf/core/tests/TmfCoreTestPlugin.java | 2 +- .../core/tests/trace/TmfStringLocation.java | 5 +- .../tmf/tests/stubs/CreateTestFiles.java | 2 +- .../tests/stubs/component/TmfClientStub.java | 2 +- .../tests/stubs/event/TmfEventTypeStub.java | 2 +- .../stubs/request/TmfDataRequestStub.java | 3 - .../stubs/request/TmfEventRequestStub.java | 3 - .../internal/tmf/core/Activator.java | 124 +++--- .../tmf/core/component/TmfEventThread.java | 3 - .../tmf/core/request/TmfRequestExecutor.java | 114 +++--- .../tmf/core/statesystem/AttributeTree.java | 2 +- .../tmf/core/trace/TmfExperimentContext.java | 3 - .../tmf/core/trace/TmfExperimentLocation.java | 12 - .../tmf/core/trace/TmfLocationArray.java | 9 - .../linuxtools/tmf/core/TmfProjectNature.java | 57 ++- .../tmf/core/component/TmfComponent.java | 101 +++-- .../tmf/core/ctfadaptor/CtfEnumPair.java | 6 +- .../tmf/core/ctfadaptor/CtfIterator.java | 14 - .../tmf/core/ctfadaptor/CtfTmfTrace.java | 5 - .../tmf/core/event/ITmfEventType.java | 2 +- .../tmf/core/event/TmfEventField.java | 30 -- .../tmf/core/event/TmfEventType.java | 24 -- .../tmf/core/event/TmfEventTypeManager.java | 23 +- .../core/filter/model/TmfFilterTreeNode.java | 244 +++++------- .../filter/xml/TmfFilterContentHandler.java | 67 ++-- .../core/signal/TmfClearExperimentSignal.java | 5 +- .../tmf/core/signal/TmfSignalManager.java | 2 +- .../tmf/core/signal/TmfTimeSynchSignal.java | 5 - .../signal/TmfTraceRangeUpdatedSignal.java | 3 - .../core/signal/TmfTraceUpdatedSignal.java | 5 - .../tmf/core/statevalue/ITmfStateValue.java | 2 +- .../core/statevalue/IntegerStateValue.java | 2 +- .../tmf/core/statevalue/NullStateValue.java | 2 +- .../tmf/core/statevalue/StringStateValue.java | 2 +- .../tmf/core/statevalue/TmfStateValue.java | 2 +- .../core/timestamp/TmfSimpleTimestamp.java | 15 - .../tmf/core/timestamp/TmfTimeRange.java | 9 - .../tmf/core/timestamp/TmfTimestamp.java | 33 -- .../tmf/core/timestamp/TmfTimestampDelta.java | 10 - .../core/timestamp/TmfTimestampFormat.java | 6 - .../tmf/core/trace/TmfCheckpoint.java | 18 - .../tmf/core/trace/TmfCheckpointIndexer.java | 9 - .../linuxtools/tmf/core/trace/TmfContext.java | 30 -- .../tmf/core/trace/TmfExperiment.java | 40 -- .../tmf/core/trace/TmfLongLocation.java | 5 +- .../tmf/core/trace/TmfTimestampLocation.java | 3 - .../linuxtools/tmf/core/trace/TmfTrace.java | 18 - .../uml2sd/TmfSyncSequenceDiagramEvent.java | 13 +- .../doc/User-Guide.mediawiki | 53 +-- .../uml2sd/loader/IUml2SDTestConstants.java | 2 +- .../views/uml2sd/loader/Uml2SDTestSetup.java | 10 +- .../tmf/ui/tests/uml2sd/load/TestLoaders.java | 8 - .../test/stub/adaption/TsfImplProvider.java | 2 +- .../timegraph/test/stub/model/TraceImpl.java | 2 +- .../stub/model/TraceModelImplFactory.java | 2 +- .../linuxtools/internal/tmf/ui/Activator.java | 157 ++++---- .../ui/dialogs/ManageCustomParsersDialog.java | 6 - .../tmf/ui/dialogs/MultiLineInputDialog.java | 12 - .../tmf/ui/parsers/custom/CustomTxtTrace.java | 3 - .../parsers/custom/CustomTxtTraceContext.java | 6 - .../tmf/ui/parsers/custom/CustomXmlTrace.java | 3 - .../parsers/custom/CustomXmlTraceContext.java | 6 - .../CustomTxtParserInputWizardPage.java | 3 - .../CustomTxtParserOutputWizardPage.java | 3 - .../CustomXmlParserInputWizardPage.java | 10 - .../CustomXmlParserOutputWizardPage.java | 3 - .../preferences/TmfTracingPreferencePage.java | 26 +- .../SelectSupplementaryResourcesDialog.java | 8 - .../tmf/ui/project/handlers/DeleteAction.java | 10 +- .../handlers/DropAdapterAssistant.java | 9 - .../tmf/ui/project/handlers/OpenAction.java | 10 +- .../ui/project/handlers/RefreshAction.java | 10 +- .../project/handlers/TmfActionProvider.java | 8 - .../project/handlers/TracePropertyTester.java | 3 - .../ui/project/model/TmfEditorLinkHelper.java | 8 - .../tmf/ui/editors/TmfEditorInput.java | 8 +- .../tmf/ui/editors/TmfEventsEditor.java | 36 -- .../ui/editors/UnsortedPropertySheetPage.java | 5 +- .../project/model/TmfExperimentElement.java | 37 +- .../ui/project/model/TmfExperimentFolder.java | 49 +-- .../model/TmfNavigatorContentProvider.java | 69 +--- .../model/TmfNavigatorLabelProvider.java | 41 +- .../ui/project/model/TmfProjectElement.java | 23 +- .../project/model/TmfProjectModelElement.java | 65 +--- .../tmf/ui/project/model/TmfTraceElement.java | 34 +- .../tmf/ui/project/model/TmfTraceFolder.java | 41 +- .../model/TraceFolderContentProvider.java | 14 +- .../model/TraceFolderLabelProvider.java | 10 +- .../project/wizards/CopyExperimentDialog.java | 43 +- .../ui/project/wizards/CopyTraceDialog.java | 17 +- .../ui/project/wizards/ImportTraceWizard.java | 14 +- .../wizards/ImportTraceWizardPage.java | 57 +-- .../tmf/ui/project/wizards/Messages.java | 2 +- .../project/wizards/NewExperimentDialog.java | 43 +- .../project/wizards/NewTmfProjectWizard.java | 24 +- .../wizards/RenameExperimentDialog.java | 50 +-- .../ui/project/wizards/RenameTraceDialog.java | 22 +- .../project/wizards/SelectTracesWizard.java | 15 +- .../wizards/SelectTracesWizardPage.java | 7 +- .../ui/properties/TmfTimestampFormatPage.java | 26 -- .../tmf/ui/viewers/events/TmfEventsTable.java | 17 - .../tmf/ui/viewers/statistics/Messages.java | 2 +- .../statistics/TmfStatisticsViewer.java | 5 - .../ui/viewers/statistics/model/Messages.java | 2 +- .../statistics/model/TmfBaseColumnData.java | 30 +- .../model/TmfTreeContentProvider.java | 32 +- .../linuxtools/tmf/ui/views/TmfView.java | 2 +- .../tmf/ui/views/colors/ColorSettingsXML.java | 321 ++++++++------- .../tmf/ui/views/colors/ColorsView.java | 8 +- .../views/environment/TmfEnvironmentView.java | 5 +- .../tmf/ui/views/filter/FilterDialog.java | 68 ++-- .../filter/FilterTreeContentProvider.java | 82 ++-- .../views/filter/FilterTreeLabelProvider.java | 158 ++++---- .../tmf/ui/views/filter/FilterView.java | 366 +++++++++--------- .../views/histogram/FullTraceHistogram.java | 8 +- .../HistogramCurrentTimeControl.java | 3 - .../views/histogram/HistogramDataModel.java | 6 +- .../views/histogram/HistogramTextControl.java | 18 +- .../histogram/HistogramTimeRangeControl.java | 7 - .../tmf/ui/views/histogram/Messages.java | 2 +- .../views/histogram/TimeRangeHistogram.java | 10 +- .../tmf/ui/views/statistics/Messages.java | 2 +- .../views/statistics/TmfStatisticsView.java | 18 +- .../TimeChartDecorationProvider.java | 2 +- .../tmf/ui/views/uml2sd/DrawableToolTip.java | 4 - .../linuxtools/tmf/ui/views/uml2sd/NGC.java | 160 +------- .../tmf/ui/views/uml2sd/SDView.java | 31 +- .../tmf/ui/views/uml2sd/SDWidget.java | 123 +----- .../uml2sd/SDWidgetSelectionProvider.java | 20 +- .../tmf/ui/views/uml2sd/ScrollView.java | 48 --- .../ui/views/uml2sd/TimeCompressionBar.java | 62 --- .../ui/views/uml2sd/core/AsyncMessage.java | 53 +-- .../views/uml2sd/core/AsyncMessageReturn.java | 10 +- .../tmf/ui/views/uml2sd/core/BaseMessage.java | 35 +- .../uml2sd/core/BasicExecutionOccurrence.java | 40 -- .../tmf/ui/views/uml2sd/core/BasicFrame.java | 33 -- .../ui/views/uml2sd/core/EllipsisMessage.java | 22 +- .../uml2sd/core/ExecutionOccurrence.java | 22 +- .../tmf/ui/views/uml2sd/core/Frame.java | 12 - .../tmf/ui/views/uml2sd/core/HotSpot.java | 34 +- .../tmf/ui/views/uml2sd/core/Lifeline.java | 37 +- .../tmf/ui/views/uml2sd/core/Stop.java | 30 +- .../tmf/ui/views/uml2sd/core/SyncMessage.java | 24 -- .../views/uml2sd/core/SyncMessageReturn.java | 10 +- .../views/uml2sd/dialogs/FilterCriteria.java | 7 +- .../uml2sd/dialogs/FilterListDialog.java | 50 +-- .../ui/views/uml2sd/dialogs/MinMaxDialog.java | 21 +- .../ui/views/uml2sd/dialogs/PagesDialog.java | 9 +- .../views/uml2sd/dialogs/SDPrintDialog.java | 25 +- .../views/uml2sd/dialogs/SDPrintDialogUI.java | 78 ---- .../uml2sd/dialogs/SearchFilterDialog.java | 64 +-- .../ui/views/uml2sd/dialogs/TabContents.java | 15 +- .../views/uml2sd/drawings/impl/ColorImpl.java | 8 - .../views/uml2sd/drawings/impl/FontImpl.java | 11 +- .../views/uml2sd/drawings/impl/ImageImpl.java | 10 +- .../uml2sd/handlers/ConfigureMinMax.java | 6 +- .../ui/views/uml2sd/handlers/FirstPage.java | 24 +- .../ui/views/uml2sd/handlers/LastPage.java | 20 +- .../ui/views/uml2sd/handlers/MoveSDDown.java | 7 +- .../ui/views/uml2sd/handlers/MoveSDLeft.java | 7 +- .../ui/views/uml2sd/handlers/MoveSDRight.java | 7 +- .../ui/views/uml2sd/handlers/MoveSDUp.java | 7 +- .../views/uml2sd/handlers/MoveToMessage.java | 6 +- .../ui/views/uml2sd/handlers/NextPage.java | 7 +- .../uml2sd/handlers/OpenSDFiltersDialog.java | 7 +- .../uml2sd/handlers/OpenSDFindDialog.java | 7 +- .../uml2sd/handlers/OpenSDPagesDialog.java | 10 +- .../ui/views/uml2sd/handlers/PrevPage.java | 7 +- .../tmf/ui/views/uml2sd/handlers/Print.java | 10 +- .../ui/views/uml2sd/handlers/ShowNodeEnd.java | 7 +- .../views/uml2sd/handlers/ShowNodeStart.java | 33 +- .../tmf/ui/views/uml2sd/handlers/Zoom.java | 7 +- .../views/uml2sd/loader/TmfAsyncMessage.java | 12 +- .../views/uml2sd/loader/TmfSyncMessage.java | 15 +- .../uml2sd/loader/TmfUml2SDSyncLoader.java | 101 ----- .../views/uml2sd/preferences/SDViewPref.java | 38 +- .../uml2sd/preferences/SDViewerPage.java | 28 -- .../uml2sd/util/SortAsyncForBackward.java | 6 +- .../util/SortAsyncMessageComparator.java | 7 +- .../util/SortSyncMessageComparator.java | 8 +- .../uml2sd/util/TimeEventComparator.java | 6 +- .../ui/widgets/tabsview/TmfViewerFolder.java | 7 +- .../ui/widgets/timegraph/TimeGraphCombo.java | 3 - .../TimeGraphPresentationProvider.java | 46 +-- .../ui/widgets/timegraph/TimeGraphViewer.java | 18 - .../timegraph/dialogs/TimeGraphLegend.java | 2 +- 295 files changed, 1610 insertions(+), 5839 deletions(-) diff --git a/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/headless/ReadTrace.java b/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/headless/ReadTrace.java index 739218f9cd..8cc24803bf 100644 --- a/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/headless/ReadTrace.java +++ b/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/headless/ReadTrace.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 diff --git a/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/ctf/core/event/CTFCallsite.java b/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/ctf/core/event/CTFCallsite.java index 26dd7ff7ee..7b55d934ad 100644 --- a/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/ctf/core/event/CTFCallsite.java +++ b/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/ctf/core/event/CTFCallsite.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 @@ -143,12 +143,6 @@ public class CTFCallsite implements Comparable { return 0; } - - /* - * (non-Javadoc) - * - * @see java.lang.Object#toString() - */ @Override public String toString() { return FileName + "/" + FunctionName + ":" + LineNumber; //$NON-NLS-1$ //$NON-NLS-2$ diff --git a/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/ctf/core/event/types/IntegerDefinition.java b/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/ctf/core/event/types/IntegerDefinition.java index 1a420e6a43..e0718b2c24 100644 --- a/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/ctf/core/event/types/IntegerDefinition.java +++ b/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/ctf/core/event/types/IntegerDefinition.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011-2012 Ericsson, Ecole Polytechnique de Montreal and others + * Copyright (c) 2011, 2013 Ericsson, Ecole Polytechnique de Montreal and others * * All rights reserved. This program and the accompanying materials are made * available under the terms of the Eclipse Public License v1.0 which @@ -82,17 +82,11 @@ public class IntegerDefinition extends SimpleDatatypeDefinition { // Operations // ------------------------------------------------------------------------ - /* (non-Javadoc) - * @see org.eclipse.linuxtools.ctf.core.event.types.SimpleDatatypeDefinition#getLongValue() - */ @Override public Long getIntegerValue() { return getValue(); } - /* (non-Javadoc) - * @see org.eclipse.linuxtools.ctf.core.event.types.SimpleDatatypeDefinition#getStringValue() - */ @Override public String getStringValue() { return this.toString(); diff --git a/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/ctf/core/event/types/StructDeclaration.java b/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/ctf/core/event/types/StructDeclaration.java index 9c5fa0a999..eefbb61c86 100644 --- a/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/ctf/core/event/types/StructDeclaration.java +++ b/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/ctf/core/event/types/StructDeclaration.java @@ -125,11 +125,6 @@ public class StructDeclaration implements IDeclaration { return "[declaration] struct[" + Integer.toHexString(hashCode()) + ']'; //$NON-NLS-1$ } - /* - * (non-Javadoc) - * - * @see java.lang.Object#hashCode() - */ @Override public int hashCode() { final int prime = 31; @@ -139,11 +134,6 @@ public class StructDeclaration implements IDeclaration { return result; } - /* - * (non-Javadoc) - * - * @see java.lang.Object#equals(java.lang.Object) - */ @Override public boolean equals(Object obj) { if (this == obj) { diff --git a/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/ctf/core/trace/CTFReaderException.java b/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/ctf/core/trace/CTFReaderException.java index 179829d2aa..f43d81b4c4 100644 --- a/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/ctf/core/trace/CTFReaderException.java +++ b/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/ctf/core/trace/CTFReaderException.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011-2012 Ericsson, Ecole Polytechnique de Montreal and others + * Copyright (c) 2011, 2013 Ericsson, Ecole Polytechnique de Montreal and others * * All rights reserved. This program and the accompanying materials are made * available under the terms of the Eclipse Public License v1.0 which diff --git a/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/ctf/core/trace/CTFTrace.java b/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/ctf/core/trace/CTFTrace.java index e02c58b01a..35737332d7 100644 --- a/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/ctf/core/trace/CTFTrace.java +++ b/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/ctf/core/trace/CTFTrace.java @@ -62,11 +62,6 @@ import org.eclipse.linuxtools.internal.ctf.core.trace.StreamInputPacketIndex; */ public class CTFTrace implements IDefinitionScope { - /* - * (non-Javadoc) - * - * @see java.lang.Object#toString() - */ @SuppressWarnings("nls") @Override public String toString() { diff --git a/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/ctf/core/trace/CTFTraceReader.java b/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/ctf/core/trace/CTFTraceReader.java index 98aaa2498d..d18145a870 100644 --- a/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/ctf/core/trace/CTFTraceReader.java +++ b/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/ctf/core/trace/CTFTraceReader.java @@ -448,11 +448,6 @@ public class CTFTraceReader { return true; } - /* - * (non-Javadoc) - * - * @see java.lang.Object#toString() - */ @Override public String toString() { /* Only for debugging, shouldn't be externalized */ diff --git a/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/ctf/core/trace/Metadata.java b/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/ctf/core/trace/Metadata.java index 27ca681d63..5daf5da74c 100644 --- a/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/ctf/core/trace/Metadata.java +++ b/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/ctf/core/trace/Metadata.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011-2012 Ericsson, Ecole Polytechnique de Montreal and others + * Copyright (c) 2011, 2013 Ericsson, Ecole Polytechnique de Montreal and others * * All rights reserved. This program and the accompanying materials are made * available under the terms of the Eclipse Public License v1.0 which diff --git a/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/ctf/core/trace/Stream.java b/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/ctf/core/trace/Stream.java index 8994926837..5fb6de2f22 100644 --- a/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/ctf/core/trace/Stream.java +++ b/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/ctf/core/trace/Stream.java @@ -257,10 +257,6 @@ public class Stream { inputs.add(input); } - - /* (non-Javadoc) - * @see java.lang.Object#toString() - */ @Override public String toString() { return "Stream [id=" + id + ", packetContextDecl=" + packetContextDecl //$NON-NLS-1$ //$NON-NLS-2$ diff --git a/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/ctf/core/trace/StreamInput.java b/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/ctf/core/trace/StreamInput.java index 6e15940ddb..407db54586 100644 --- a/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/ctf/core/trace/StreamInput.java +++ b/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/ctf/core/trace/StreamInput.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011-2012 Ericsson, Ecole Polytechnique de Montreal and others + * Copyright (c) 2011, 2013 Ericsson, Ecole Polytechnique de Montreal and others * * All rights reserved. This program and the accompanying materials are made * available under the terms of the Eclipse Public License v1.0 which @@ -479,11 +479,6 @@ public class StreamInput implements IDefinitionScope { } } - /* - * (non-Javadoc) - * - * @see java.lang.Object#hashCode() - */ @Override public int hashCode() { final int prime = 31; @@ -492,11 +487,6 @@ public class StreamInput implements IDefinitionScope { return result; } - /* - * (non-Javadoc) - * - * @see java.lang.Object#equals(java.lang.Object) - */ @Override public boolean equals(Object obj) { if (this == obj) { diff --git a/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/ctf/core/trace/StreamInputReader.java b/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/ctf/core/trace/StreamInputReader.java index da5a6b41cf..0c77abef53 100644 --- a/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/ctf/core/trace/StreamInputReader.java +++ b/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/ctf/core/trace/StreamInputReader.java @@ -381,11 +381,6 @@ public class StreamInputReader { return packetReader; } - /* - * (non-Javadoc) - * - * @see java.lang.Object#hashCode() - */ @Override public int hashCode() { final int prime = 31; @@ -396,11 +391,6 @@ public class StreamInputReader { return result; } - /* - * (non-Javadoc) - * - * @see java.lang.Object#equals(java.lang.Object) - */ @Override public boolean equals(Object obj) { if (this == obj) { diff --git a/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/internal/ctf/core/event/metadata/exceptions/ParseException.java b/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/internal/ctf/core/event/metadata/exceptions/ParseException.java index b365b87ca4..9b11d06271 100644 --- a/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/internal/ctf/core/event/metadata/exceptions/ParseException.java +++ b/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/internal/ctf/core/event/metadata/exceptions/ParseException.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011-2012 Ericsson, Ecole Polytechnique de Montreal and others + * Copyright (c) 2011, 2013 Ericsson, Ecole Polytechnique de Montreal and others * * All rights reserved. This program and the accompanying materials are made * available under the terms of the Eclipse Public License v1.0 which diff --git a/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/internal/ctf/core/trace/StreamInputPacketIndexEntry.java b/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/internal/ctf/core/trace/StreamInputPacketIndexEntry.java index 3a03790823..0cb19ab50f 100644 --- a/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/internal/ctf/core/trace/StreamInputPacketIndexEntry.java +++ b/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/internal/ctf/core/trace/StreamInputPacketIndexEntry.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011-2012 Ericsson, Ecole Polytechnique de Montreal and others + * Copyright (c) 2011, 2013 Ericsson, Ecole Polytechnique de Montreal and others * * All rights reserved. This program and the accompanying materials are made * available under the terms of the Eclipse Public License v1.0 which @@ -104,11 +104,6 @@ public class StreamInputPacketIndexEntry { return (ts >= timestampBegin) && (ts <= timestampEnd); } - /* - * (non-Javadoc) - * - * @see java.lang.Object#toString() - */ @Override public String toString() { return "StreamInputPacketIndexEntry [offsetBytes=" + offsetBytes //$NON-NLS-1$ diff --git a/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/Activator.java b/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/Activator.java index c01d55c311..3c6199dc48 100644 --- a/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/Activator.java +++ b/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/Activator.java @@ -1,11 +1,11 @@ /******************************************************************************* - * 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: * Francois Chouinard - Initial API and implementation *******************************************************************************/ @@ -28,75 +28,67 @@ public class Activator extends Plugin { // Attributes // ------------------------------------------------------------------------ - /** - * The plug-in ID - */ - public static final String PLUGIN_ID = "org.eclipse.linuxtools.lttng2.core"; //$NON-NLS-1$ + /** + * The plug-in ID + */ + public static final String PLUGIN_ID = "org.eclipse.linuxtools.lttng2.core"; //$NON-NLS-1$ + + /** + * The shared instance + */ + private static Activator plugin; - /** - * The shared instance - */ - private static Activator plugin; - // ------------------------------------------------------------------------ // Constructors // ------------------------------------------------------------------------ - /** - * The constructor - */ - public Activator() { - } + /** + * The constructor + */ + public Activator() { + } // ------------------------------------------------------------------------ // Accessors // ------------------------------------------------------------------------ - /** - * Returns the shared instance - * - * @return the shared instance - */ - public static Activator getDefault() { - return plugin; - } + /** + * Returns the shared instance + * + * @return the shared instance + */ + public static Activator getDefault() { + return plugin; + } // ------------------------------------------------------------------------ // Operators // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see org.eclipse.core.runtime.Plugins#start(org.osgi.framework.BundleContext) - */ - @Override - public void start(BundleContext context) throws Exception { - super.start(context); - plugin = this; - } - - /* - * (non-Javadoc) - * @see org.eclipse.core.runtime.Plugin#stop(org.osgi.framework.BundleContext) - */ - @Override - public void stop(BundleContext context) throws Exception { - plugin = null; - super.stop(context); - } - + @Override + public void start(BundleContext context) throws Exception { + super.start(context); + plugin = this; + } + + @Override + public void stop(BundleContext context) throws Exception { + plugin = null; + super.stop(context); + } + /** * Logs a message with severity INFO in the runtime log of the plug-in. - * + * * @param message A message to log */ public void logInfo(String message) { getLog().log(new Status(IStatus.INFO, PLUGIN_ID, message)); } - + /** * Logs a message and exception with severity INFO in the runtime log of the plug-in. - * + * * @param message A message to log * @param exception A exception to log */ @@ -106,16 +98,16 @@ public class Activator extends Plugin { /** * Logs a message and exception with severity WARNING in the runtime log of the plug-in. - * + * * @param message A message to log */ public void logWarning(String message) { getLog().log(new Status(IStatus.WARNING, PLUGIN_ID, message)); } - + /** * Logs a message and exception with severity WARNING in the runtime log of the plug-in. - * + * * @param message A message to log * @param exception A exception to log */ @@ -125,16 +117,16 @@ public class Activator extends Plugin { /** * Logs a message and exception with severity ERROR in the runtime log of the plug-in. - * + * * @param message A message to log */ public void logError(String message) { getLog().log(new Status(IStatus.ERROR, PLUGIN_ID, message)); } - + /** * Logs a message and exception with severity ERROR in the runtime log of the plug-in. - * + * * @param message A message to log * @param exception A exception to log */ diff --git a/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/BaseEventInfo.java b/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/BaseEventInfo.java index e14c5ec631..cfc1ef9285 100644 --- a/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/BaseEventInfo.java +++ b/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/BaseEventInfo.java @@ -82,28 +82,17 @@ public class BaseEventInfo extends TraceInfo implements IBaseEventInfo { // ------------------------------------------------------------------------ // Accessors // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IBaseEventInfo#getEventType() - */ + @Override public TraceEventType getEventType() { return fEventType; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IBaseEventInfo#setEventType(org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.TraceEventType) - */ @Override public void setEventType(TraceEventType type) { fEventType = type; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IBaseEventInfo#setEventType(java.lang.String) - */ @Override public void setEventType(String typeName) { if(TraceEventType.TRACEPOINT.getInName().equals(typeName)) { @@ -117,28 +106,16 @@ public class BaseEventInfo extends TraceInfo implements IBaseEventInfo { } } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IBaseEventInfo#getLogLevel() - */ @Override public TraceLogLevel getLogLevel() { return fLogLevel; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IBaseEventInfo#setLogLevel(org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.TraceLogLevel) - */ @Override public void setLogLevel(TraceLogLevel level) { fLogLevel = level; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IBaseEventInfo#setLogLevel(java.lang.String) - */ @Override public void setLogLevel(String levelName) { if(TraceLogLevel.TRACE_EMERG.getInName().equals(levelName)) { @@ -178,28 +155,16 @@ public class BaseEventInfo extends TraceInfo implements IBaseEventInfo { } } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.core.control.model.IBaseEventInfo#getFields() - */ @Override public IFieldInfo[] getFields() { return fFields.toArray(new IFieldInfo[fFields.size()]); } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.core.control.model.IBaseEventInfo#addField(org.eclipse.linuxtools.internal.lttng2.core.control.model.IFieldInfo) - */ @Override public void addField(IFieldInfo field) { fFields.add(field); } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.core.control.model.IBaseEventInfo#setFields(java.util.List) - */ @Override public void setFields(List fields) { fFields.clear(); @@ -209,29 +174,16 @@ public class BaseEventInfo extends TraceInfo implements IBaseEventInfo { } } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.core.control.model.IBaseEventInfo#getFilterExpression() - */ @Override public String getFilterExpression() { return fFilterExpression; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.core.control.model.IBaseEventInfo#setFilterExpression(java.lang.String) - */ @Override public void setFilterExpression(String filter) { fFilterExpression = filter; } - - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.core.control.model.impl.TraceInfo#hashCode() - */ @Override public int hashCode() { final int prime = 31; @@ -243,10 +195,6 @@ public class BaseEventInfo extends TraceInfo implements IBaseEventInfo { return result; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.core.control.model.impl.TraceInfo#equals(java.lang.Object) - */ @Override public boolean equals(Object obj) { if (this == obj) { @@ -278,10 +226,6 @@ public class BaseEventInfo extends TraceInfo implements IBaseEventInfo { return true; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceInfo#toString() - */ @SuppressWarnings("nls") @Override public String toString() { diff --git a/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/ChannelInfo.java b/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/ChannelInfo.java index 8f873fe354..641d00c961 100644 --- a/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/ChannelInfo.java +++ b/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/ChannelInfo.java @@ -103,137 +103,77 @@ public class ChannelInfo extends TraceInfo implements IChannelInfo { // ------------------------------------------------------------------------ // Accessors // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IChannelInfo#getOverwriteMode() - */ + @Override public boolean isOverwriteMode() { return fOverwriteMode; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IChannelInfo#setOverwriteMode(boolean) - */ @Override public void setOverwriteMode(boolean mode) { fOverwriteMode = mode; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IChannelInfo#getSubBufferSize() - */ @Override public long getSubBufferSize() { return fSubBufferSize; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IChannelInfo#setSubBufferSize(long) - */ @Override public void setSubBufferSize(long bufferSize) { fSubBufferSize = bufferSize; - } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IChannelInfo#getNumberOfSubBuffers() - */ @Override public int getNumberOfSubBuffers() { return fNumberOfSubBuffers; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IChannelInfo#setNumberOfSubBuffers(int) - */ @Override public void setNumberOfSubBuffers(int numberOfSubBuffers) { fNumberOfSubBuffers = numberOfSubBuffers; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IChannelInfo#getSwitchTimer() - */ @Override public long getSwitchTimer() { return fSwitchTimer; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IChannelInfo#setSwitchTimer(long) - */ @Override public void setSwitchTimer(long timer) { fSwitchTimer = timer; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IChannelInfo#getReadTimer() - */ @Override public long getReadTimer() { return fReadTimer; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IChannelInfo#setReadTimer(long) - */ @Override public void setReadTimer(long timer) { fReadTimer = timer; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IChannelInfo#getOutputType() - */ @Override public String getOutputType() { return fOutputType; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IChannelInfo#setOutputType(java.lang.String) - */ @Override public void setOutputType(String type) { fOutputType = type; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IChannelInfo#getState() - */ @Override public TraceEnablement getState() { return fState; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IChannelInfo#setState(org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.TraceEnablement) - */ @Override public void setState(TraceEnablement state) { fState = state; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IChannelInfo#setState(java.lang.String) - */ @Override public void setState(String stateName) { fState = TraceEnablement.ENABLED; @@ -244,19 +184,11 @@ public class ChannelInfo extends TraceInfo implements IChannelInfo { } } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IChannelInfo#getEvents() - */ @Override public IEventInfo[] getEvents() { return fEvents.toArray(new IEventInfo[fEvents.size()]); } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IChannelInfo#setEvents(java.util.List) - */ @Override public void setEvents(List events) { fEvents.clear(); @@ -266,19 +198,11 @@ public class ChannelInfo extends TraceInfo implements IChannelInfo { } } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IChannelInfo#addEvent(org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IEventInfo) - */ @Override public void addEvent(IEventInfo channel) { fEvents.add(channel); } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceInfo#hashCode() - */ @Override public int hashCode() { final int prime = 31; @@ -294,10 +218,6 @@ public class ChannelInfo extends TraceInfo implements IChannelInfo { return result; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceInfo#equals(java.lang.Object) - */ @Override public boolean equals(Object obj) { if (this == obj) { @@ -341,10 +261,6 @@ public class ChannelInfo extends TraceInfo implements IChannelInfo { return true; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceInfo#toString() - */ @SuppressWarnings("nls") @Override public String toString() { @@ -377,6 +293,4 @@ public class ChannelInfo extends TraceInfo implements IChannelInfo { output.append(")]"); return output.toString(); } - - } diff --git a/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/DomainInfo.java b/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/DomainInfo.java index fda6fc9e11..8a39349d26 100644 --- a/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/DomainInfo.java +++ b/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/DomainInfo.java @@ -64,19 +64,11 @@ public class DomainInfo extends TraceInfo implements IDomainInfo { fIsKernel = other.fIsKernel; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IDomainInfo#isKernel() - */ @Override public boolean isKernel() { return fIsKernel; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IDomainInfo#setIsKernel(boolean) - */ @Override public void setIsKernel(boolean isKernel) { fIsKernel = isKernel; @@ -85,19 +77,12 @@ public class DomainInfo extends TraceInfo implements IDomainInfo { // ------------------------------------------------------------------------ // Accessors // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IDomainInfo#getChannels() - */ + @Override public IChannelInfo[] getChannels() { return fChannels.toArray(new IChannelInfo[fChannels.size()]); } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IDomainInfo#setChannels(java.util.List) - */ @Override public void setChannels(List channels) { fChannels.clear(); @@ -107,19 +92,11 @@ public class DomainInfo extends TraceInfo implements IDomainInfo { } } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IDomainInfo#addChannel(org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IChannelInfo) - */ @Override public void addChannel(IChannelInfo channel) { fChannels.add(channel); } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceInfo#hashCode() - */ @Override public int hashCode() { final int prime = 31; @@ -129,10 +106,6 @@ public class DomainInfo extends TraceInfo implements IDomainInfo { return result; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceInfo#equals(java.lang.Object) - */ @Override public boolean equals(Object obj) { if (this == obj) { @@ -154,10 +127,6 @@ public class DomainInfo extends TraceInfo implements IDomainInfo { return true; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceInfo#toString() - */ @SuppressWarnings("nls") @Override public String toString() { diff --git a/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/EventInfo.java b/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/EventInfo.java index c0bf36dc57..a872b065d1 100644 --- a/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/EventInfo.java +++ b/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/EventInfo.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.core.control.model.impl; @@ -17,9 +17,9 @@ import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceEnablement /** *

* Implementation of the trace event interface (IEventInfo) to store event -* related data. +* related data. *

-* +* * @author Bernd Hufmann */ public class EventInfo extends BaseEventInfo implements IEventInfo { @@ -31,7 +31,7 @@ public class EventInfo extends BaseEventInfo implements IEventInfo { * The enable state of the event. */ private TraceEnablement fState = TraceEnablement.DISABLED; - + // ------------------------------------------------------------------------ // Constructors // ------------------------------------------------------------------------ @@ -42,7 +42,7 @@ public class EventInfo extends BaseEventInfo implements IEventInfo { public EventInfo(String name) { super(name); } - + /** * Copy constructor * @param other - the instance to copy @@ -51,32 +51,21 @@ public class EventInfo extends BaseEventInfo implements IEventInfo { super(other); fState = other.fState; } - + // ------------------------------------------------------------------------ // Accessors // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IEventInfo#getState() - */ + @Override public TraceEnablement getState() { return fState; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IEventInfo#setState(org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.TraceEnablement) - */ @Override public void setState(TraceEnablement state) { fState = state; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IEventInfo#setState(java.lang.String) - */ @Override public void setState(String stateName) { fState = TraceEnablement.DISABLED; @@ -87,10 +76,6 @@ public class EventInfo extends BaseEventInfo implements IEventInfo { } } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.BaseEventInfo#hashCode() - */ @Override public int hashCode() { final int prime = 31; @@ -99,10 +84,6 @@ public class EventInfo extends BaseEventInfo implements IEventInfo { return result; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.BaseEventInfo#equals(java.lang.Object) - */ @Override public boolean equals(Object obj) { if (this == obj) { @@ -121,10 +102,6 @@ public class EventInfo extends BaseEventInfo implements IEventInfo { return true; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.BaseEventInfo#toString() - */ @SuppressWarnings("nls") @Override public String toString() { diff --git a/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/FieldInfo.java b/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/FieldInfo.java index 8471b852b1..300796f95e 100644 --- a/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/FieldInfo.java +++ b/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/FieldInfo.java @@ -55,28 +55,16 @@ public class FieldInfo extends TraceInfo implements IFieldInfo { // Accessors // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.core.control.model.IFieldInfo#getFieldType() - */ @Override public String getFieldType() { return fFieldType; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.core.control.model.IFieldInfo#setFieldType(java.lang.String) - */ @Override public void setFieldType(String fieldType) { fFieldType = fieldType; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.core.control.model.impl.TraceInfo#hashCode() - */ @Override public int hashCode() { final int prime = 31; @@ -86,10 +74,6 @@ public class FieldInfo extends TraceInfo implements IFieldInfo { return result; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.core.control.model.impl.TraceInfo#equals(java.lang.Object) - */ @Override public boolean equals(Object obj) { if (this == obj) { @@ -112,10 +96,6 @@ public class FieldInfo extends TraceInfo implements IFieldInfo { return true; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceInfo#toString() - */ @SuppressWarnings("nls") @Override public String toString() { diff --git a/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/ProbeEventInfo.java b/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/ProbeEventInfo.java index dc6d00cc9f..462297b193 100644 --- a/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/ProbeEventInfo.java +++ b/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/ProbeEventInfo.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.core.control.model.impl; @@ -16,9 +16,9 @@ import org.eclipse.linuxtools.internal.lttng2.core.control.model.IProbeEventInfo /** *

* Implementation of the trace event interface (IProbeEventInfo) to store probe event -* related data. +* related data. *

-* +* * @author Bernd Hufmann */ public class ProbeEventInfo extends EventInfo implements IProbeEventInfo { @@ -34,13 +34,13 @@ public class ProbeEventInfo extends EventInfo implements IProbeEventInfo { * The dynamic probe offset (if symbol is used). */ private String fOffset; - + /** * The symbol name (null if address is used) */ private String fSymbol; - - + + // ------------------------------------------------------------------------ // Constructors // ------------------------------------------------------------------------ @@ -51,7 +51,7 @@ public class ProbeEventInfo extends EventInfo implements IProbeEventInfo { public ProbeEventInfo(String name) { super(name); } - + /** * Copy constructor * @param other - the instance to copy @@ -62,60 +62,36 @@ public class ProbeEventInfo extends EventInfo implements IProbeEventInfo { fOffset = other.fOffset; fSymbol = other.fSymbol; } - + // ------------------------------------------------------------------------ // Accessors // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IProbeEventInfo#getAddress() - */ @Override public String getAddress() { return fAddress; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IProbeEventInfo#setAddress(java.lang.String) - */ @Override public void setAddress(String address) { fAddress = address; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IProbeEventInfo#getOffset() - */ @Override public String getOffset() { return fOffset; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IProbeEventInfo#setOffset(java.lang.String) - */ @Override public void setOffset(String offset) { fOffset = offset; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IProbeEventInfo#getSymbol() - */ @Override public String getSymbol() { return fSymbol; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IProbeEventInfo#setSymbol(java.lang.String) - */ @Override public void setSymbol(String symbol) { fSymbol = symbol; @@ -125,10 +101,6 @@ public class ProbeEventInfo extends EventInfo implements IProbeEventInfo { // Operation // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.BaseEventInfo#hashCode() - */ @Override public int hashCode() { final int prime = 31; @@ -139,10 +111,6 @@ public class ProbeEventInfo extends EventInfo implements IProbeEventInfo { return result; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.BaseEventInfo#equals(java.lang.Object) - */ @Override public boolean equals(Object obj) { if (this == obj) { @@ -179,11 +147,6 @@ public class ProbeEventInfo extends EventInfo implements IProbeEventInfo { return true; } - - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.EventInfo#toString() - */ @SuppressWarnings("nls") @Override public String toString() { diff --git a/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/SessionInfo.java b/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/SessionInfo.java index 87fb4ea862..ec6b953442 100644 --- a/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/SessionInfo.java +++ b/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/SessionInfo.java @@ -84,28 +84,17 @@ public class SessionInfo extends TraceInfo implements ISessionInfo { // ------------------------------------------------------------------------ // Accessors // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ISessionInfo#getSessionState() - */ + @Override public TraceSessionState getSessionState() { return fState; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ISessionInfo#setSessionState(org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.TraceSessionState) - */ @Override public void setSessionState(TraceSessionState state) { fState = state; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ISessionInfo#setSessionState(java.lang.String) - */ @Override public void setSessionState(String stateName) { if (TraceSessionState.INACTIVE.getInName().equals(stateName)) { @@ -115,37 +104,21 @@ public class SessionInfo extends TraceInfo implements ISessionInfo { } } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ISessionInfo#getSessionPath() - */ @Override public String getSessionPath() { return fSessionPath; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ISessionInfo#setSessionPath(java.lang.String) - */ @Override public void setSessionPath(String path) { fSessionPath = path; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ISessionInfo#getDomains() - */ @Override public IDomainInfo[] getDomains() { return fDomains.toArray(new IDomainInfo[fDomains.size()]); } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ISessionInfo#setDomains(java.util.List) - */ @Override public void setDomains(List domains) { fDomains.clear(); @@ -155,20 +128,11 @@ public class SessionInfo extends TraceInfo implements ISessionInfo { } } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.core.control.model.ISessionInfo#isStreamedTrace() - */ @Override public boolean isStreamedTrace() { return fIsStreamedTrace; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.core.control.model.ISessionInfo#setIsStreamedTrace(boolean) - */ - @Override public void setStreamedTrace(boolean isStreamedTrace) { fIsStreamedTrace = isStreamedTrace; @@ -177,19 +141,12 @@ public class SessionInfo extends TraceInfo implements ISessionInfo { // ------------------------------------------------------------------------ // Operations // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ISessionInfo#addDomain(org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IDomainInfo) - */ + @Override public void addDomain(IDomainInfo domainInfo) { fDomains.add(domainInfo); } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.core.control.model.impl.TraceInfo#hashCode() - */ @Override public int hashCode() { final int prime = 31; @@ -201,10 +158,6 @@ public class SessionInfo extends TraceInfo implements ISessionInfo { return result; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.core.control.model.impl.TraceInfo#equals(java.lang.Object) - */ @Override public boolean equals(Object obj) { if (this == obj) { @@ -236,10 +189,6 @@ public class SessionInfo extends TraceInfo implements ISessionInfo { return true; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceInfo#toString() - */ @SuppressWarnings("nls") @Override public String toString() { diff --git a/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/TraceInfo.java b/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/TraceInfo.java index 604f03264b..70ddf82994 100644 --- a/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/TraceInfo.java +++ b/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/TraceInfo.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 @@ -59,28 +59,17 @@ public class TraceInfo implements ITraceInfo { // ------------------------------------------------------------------------ // Accessors // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceInfo#getName() - */ + @Override public String getName() { return fName; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceInfo#setName(java.lang.String) - */ @Override public void setName(String name) { fName = name; } - /* - * (non-Javadoc) - * @see java.lang.Object#hashCode() - */ @Override public int hashCode() { final int prime = 31; @@ -89,10 +78,6 @@ public class TraceInfo implements ITraceInfo { return result; } - /* - * (non-Javadoc) - * @see java.lang.Object#equals(java.lang.Object) - */ @Override public boolean equals(Object obj) { if (this == obj) { @@ -114,10 +99,7 @@ public class TraceInfo implements ITraceInfo { } return true; } - /* - * (non-Javadoc) - * @see java.lang.Object#toString() - */ + @SuppressWarnings("nls") @Override public String toString() { diff --git a/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/UstProviderInfo.java b/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/UstProviderInfo.java index 23d76e0fe2..400b6af1c4 100644 --- a/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/UstProviderInfo.java +++ b/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/UstProviderInfo.java @@ -31,10 +31,12 @@ public class UstProviderInfo extends TraceInfo implements IUstProviderInfo { // ------------------------------------------------------------------------ // Attributes // ------------------------------------------------------------------------ + /** * The process ID of the UST provider. */ private int fPid = 0; + /** * List of event information. */ @@ -43,6 +45,7 @@ public class UstProviderInfo extends TraceInfo implements IUstProviderInfo { // ------------------------------------------------------------------------ // Constructors // ------------------------------------------------------------------------ + /** * Constructor * @param name - name of UST provider @@ -72,37 +75,21 @@ public class UstProviderInfo extends TraceInfo implements IUstProviderInfo { // Accessors // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IUstProviderInfo#getPid() - */ @Override public int getPid() { return fPid; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IUstProviderInfo#setPid(int) - */ @Override public void setPid(int pid) { fPid = pid; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IUstProviderInfo#getEvents() - */ @Override public IBaseEventInfo[] getEvents() { return fEvents.toArray(new IBaseEventInfo[fEvents.size()]); } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IUstProviderInfo#setEvents(java.util.List) - */ @Override public void setEvents(List events) { fEvents.clear(); @@ -112,10 +99,6 @@ public class UstProviderInfo extends TraceInfo implements IUstProviderInfo { } } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IUstProviderInfo#addEvent(org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IBaseEventInfo) - */ @Override public void addEvent(IBaseEventInfo event) { fEvents.add(event); @@ -125,10 +108,6 @@ public class UstProviderInfo extends TraceInfo implements IUstProviderInfo { // Operations // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceInfo#hashCode() - */ @Override public int hashCode() { final int prime = 31; @@ -138,10 +117,6 @@ public class UstProviderInfo extends TraceInfo implements IUstProviderInfo { return result; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceInfo#equals(java.lang.Object) - */ @Override public boolean equals(Object obj) { if (this == obj) { @@ -163,10 +138,6 @@ public class UstProviderInfo extends TraceInfo implements IUstProviderInfo { return true; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceInfo#toString() - */ @SuppressWarnings("nls") @Override public String toString() { @@ -188,5 +159,4 @@ public class UstProviderInfo extends TraceInfo implements IUstProviderInfo { return output.toString(); } - } diff --git a/org.eclipse.linuxtools.lttng2.kernel.core/src/org/eclipse/linuxtools/internal/lttng2/kernel/core/Activator.java b/org.eclipse.linuxtools.lttng2.kernel.core/src/org/eclipse/linuxtools/internal/lttng2/kernel/core/Activator.java index 17e918f4f5..d0270fdc24 100644 --- a/org.eclipse.linuxtools.lttng2.kernel.core/src/org/eclipse/linuxtools/internal/lttng2/kernel/core/Activator.java +++ b/org.eclipse.linuxtools.lttng2.kernel.core/src/org/eclipse/linuxtools/internal/lttng2/kernel/core/Activator.java @@ -1,11 +1,11 @@ /******************************************************************************* - * 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: * Francois Chouinard - Initial API and implementation *******************************************************************************/ @@ -28,75 +28,67 @@ public class Activator extends Plugin { // Attributes // ------------------------------------------------------------------------ - /** - * The plug-in ID - */ - public static final String PLUGIN_ID = "org.eclipse.linuxtools.lttng2.core"; //$NON-NLS-1$ + /** + * The plug-in ID + */ + public static final String PLUGIN_ID = "org.eclipse.linuxtools.lttng2.core"; //$NON-NLS-1$ + + /** + * The shared instance + */ + private static Activator plugin; - /** - * The shared instance - */ - private static Activator plugin; - // ------------------------------------------------------------------------ // Constructors // ------------------------------------------------------------------------ - /** - * The constructor - */ - public Activator() { - } + /** + * The constructor + */ + public Activator() { + } // ------------------------------------------------------------------------ // Accessors // ------------------------------------------------------------------------ - /** - * Returns the shared instance - * - * @return the shared instance - */ - public static Activator getDefault() { - return plugin; - } + /** + * Returns the shared instance + * + * @return the shared instance + */ + public static Activator getDefault() { + return plugin; + } // ------------------------------------------------------------------------ // Operators // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see org.eclipse.core.runtime.Plugins#start(org.osgi.framework.BundleContext) - */ - @Override - public void start(BundleContext context) throws Exception { - super.start(context); - plugin = this; - } - - /* - * (non-Javadoc) - * @see org.eclipse.core.runtime.Plugin#stop(org.osgi.framework.BundleContext) - */ - @Override - public void stop(BundleContext context) throws Exception { - plugin = null; - super.stop(context); - } - + @Override + public void start(BundleContext context) throws Exception { + super.start(context); + plugin = this; + } + + @Override + public void stop(BundleContext context) throws Exception { + plugin = null; + super.stop(context); + } + /** * Logs a message with severity INFO in the runtime log of the plug-in. - * + * * @param message A message to log */ public void logInfo(String message) { getLog().log(new Status(IStatus.INFO, PLUGIN_ID, message)); } - + /** * Logs a message and exception with severity INFO in the runtime log of the plug-in. - * + * * @param message A message to log * @param exception A exception to log */ @@ -106,16 +98,16 @@ public class Activator extends Plugin { /** * Logs a message and exception with severity WARNING in the runtime log of the plug-in. - * + * * @param message A message to log */ public void logWarning(String message) { getLog().log(new Status(IStatus.WARNING, PLUGIN_ID, message)); } - + /** * Logs a message and exception with severity WARNING in the runtime log of the plug-in. - * + * * @param message A message to log * @param exception A exception to log */ @@ -125,16 +117,16 @@ public class Activator extends Plugin { /** * Logs a message and exception with severity ERROR in the runtime log of the plug-in. - * + * * @param message A message to log */ public void logError(String message) { getLog().log(new Status(IStatus.ERROR, PLUGIN_ID, message)); } - + /** * Logs a message and exception with severity ERROR in the runtime log of the plug-in. - * + * * @param message A message to log * @param exception A exception to log */ diff --git a/org.eclipse.linuxtools.lttng2.kernel.core/src/org/eclipse/linuxtools/internal/lttng2/kernel/core/Attributes.java b/org.eclipse.linuxtools.lttng2.kernel.core/src/org/eclipse/linuxtools/internal/lttng2/kernel/core/Attributes.java index 4864b59650..1df281e8c8 100644 --- a/org.eclipse.linuxtools.lttng2.kernel.core/src/org/eclipse/linuxtools/internal/lttng2/kernel/core/Attributes.java +++ b/org.eclipse.linuxtools.lttng2.kernel.core/src/org/eclipse/linuxtools/internal/lttng2/kernel/core/Attributes.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 diff --git a/org.eclipse.linuxtools.lttng2.kernel.ui/src/org/eclipse/linuxtools/internal/lttng2/kernel/ui/Activator.java b/org.eclipse.linuxtools.lttng2.kernel.ui/src/org/eclipse/linuxtools/internal/lttng2/kernel/ui/Activator.java index 0a2e626df9..1dd6e7b579 100644 --- a/org.eclipse.linuxtools.lttng2.kernel.ui/src/org/eclipse/linuxtools/internal/lttng2/kernel/ui/Activator.java +++ b/org.eclipse.linuxtools.lttng2.kernel.ui/src/org/eclipse/linuxtools/internal/lttng2/kernel/ui/Activator.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 @@ -66,27 +66,18 @@ public class Activator extends AbstractUIPlugin { // AbstractUIPlugin // ------------------------------------------------------------------------ - /* (non-Javadoc) - * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext) - */ @Override public void start(BundleContext context) throws Exception { super.start(context); plugin = this; } - /* (non-Javadoc) - * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext) - */ @Override public void stop(BundleContext context) throws Exception { plugin = null; super.stop(context); } - /* (non-Javadoc) - * @see org.eclipse.ui.plugin.AbstractUIPlugin#initializeImageRegistry(org.eclipse.jface.resource.ImageRegistry) - */ @Override protected void initializeImageRegistry(ImageRegistry reg) { } diff --git a/org.eclipse.linuxtools.lttng2.kernel.ui/src/org/eclipse/linuxtools/internal/lttng2/kernel/ui/viewers/events/LTTng2EventsTable.java b/org.eclipse.linuxtools.lttng2.kernel.ui/src/org/eclipse/linuxtools/internal/lttng2/kernel/ui/viewers/events/LTTng2EventsTable.java index 9027bd732f..fa2ca56eee 100644 --- a/org.eclipse.linuxtools.lttng2.kernel.ui/src/org/eclipse/linuxtools/internal/lttng2/kernel/ui/viewers/events/LTTng2EventsTable.java +++ b/org.eclipse.linuxtools.lttng2.kernel.ui/src/org/eclipse/linuxtools/internal/lttng2/kernel/ui/viewers/events/LTTng2EventsTable.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 diff --git a/org.eclipse.linuxtools.lttng2.kernel.ui/src/org/eclipse/linuxtools/internal/lttng2/kernel/ui/views/PerspectiveFactory.java b/org.eclipse.linuxtools.lttng2.kernel.ui/src/org/eclipse/linuxtools/internal/lttng2/kernel/ui/views/PerspectiveFactory.java index 97a4f74ab5..b32a5ceffa 100644 --- a/org.eclipse.linuxtools.lttng2.kernel.ui/src/org/eclipse/linuxtools/internal/lttng2/kernel/ui/views/PerspectiveFactory.java +++ b/org.eclipse.linuxtools.lttng2.kernel.ui/src/org/eclipse/linuxtools/internal/lttng2/kernel/ui/views/PerspectiveFactory.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 @@ -41,11 +41,6 @@ public class PerspectiveFactory implements IPerspectiveFactory { private static final String PROPERTIES_VIEW_ID = IPageLayout.ID_PROP_SHEET; private static final String BOOKMARKS_VIEW_ID = IPageLayout.ID_BOOKMARKS; - /* - * (non-Javadoc) - * - * @see org.eclipse.ui.IPerspectiveFactory#createInitialLayout(org.eclipse.ui.IPageLayout) - */ @Override public void createInitialLayout(IPageLayout layout) { diff --git a/org.eclipse.linuxtools.lttng2.kernel.ui/src/org/eclipse/linuxtools/internal/lttng2/kernel/ui/views/controlflow/ControlFlowView.java b/org.eclipse.linuxtools.lttng2.kernel.ui/src/org/eclipse/linuxtools/internal/lttng2/kernel/ui/views/controlflow/ControlFlowView.java index 25845b645e..9b39ee6ab7 100644 --- a/org.eclipse.linuxtools.lttng2.kernel.ui/src/org/eclipse/linuxtools/internal/lttng2/kernel/ui/views/controlflow/ControlFlowView.java +++ b/org.eclipse.linuxtools.lttng2.kernel.ui/src/org/eclipse/linuxtools/internal/lttng2/kernel/ui/views/controlflow/ControlFlowView.java @@ -356,9 +356,6 @@ public class ControlFlowView extends TmfView { // ViewPart // ------------------------------------------------------------------------ - /* (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.TmfView#createPartControl(org.eclipse.swt.widgets.Composite) - */ @Override public void createPartControl(Composite parent) { fTimeGraphCombo = new TimeGraphCombo(parent, SWT.NONE); @@ -422,9 +419,6 @@ public class ControlFlowView extends TmfView { getSite().setSelectionProvider(fTimeGraphCombo.getTreeViewer()); } - /* (non-Javadoc) - * @see org.eclipse.ui.part.WorkbenchPart#setFocus() - */ @Override public void setFocus() { fTimeGraphCombo.setFocus(); diff --git a/org.eclipse.linuxtools.lttng2.kernel.ui/src/org/eclipse/linuxtools/internal/lttng2/kernel/ui/views/resources/ResourcesView.java b/org.eclipse.linuxtools.lttng2.kernel.ui/src/org/eclipse/linuxtools/internal/lttng2/kernel/ui/views/resources/ResourcesView.java index 2ed9e30f05..2af610e138 100644 --- a/org.eclipse.linuxtools.lttng2.kernel.ui/src/org/eclipse/linuxtools/internal/lttng2/kernel/ui/views/resources/ResourcesView.java +++ b/org.eclipse.linuxtools.lttng2.kernel.ui/src/org/eclipse/linuxtools/internal/lttng2/kernel/ui/views/resources/ResourcesView.java @@ -308,9 +308,6 @@ public class ResourcesView extends TmfView { // ViewPart // ------------------------------------------------------------------------ - /* (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.TmfView#createPartControl(org.eclipse.swt.widgets.Composite) - */ @Override public void createPartControl(Composite parent) { fTimeGraphViewer = new TimeGraphViewer(parent, SWT.NONE); @@ -349,9 +346,6 @@ public class ResourcesView extends TmfView { } } - /* (non-Javadoc) - * @see org.eclipse.ui.part.WorkbenchPart#setFocus() - */ @Override public void setFocus() { fTimeGraphViewer.setFocus(); diff --git a/org.eclipse.linuxtools.lttng2.ui.tests/stubs/org/eclipse/linuxtools/internal/lttng2/stubs/dialogs/EnableChannelDialogStub.java b/org.eclipse.linuxtools.lttng2.ui.tests/stubs/org/eclipse/linuxtools/internal/lttng2/stubs/dialogs/EnableChannelDialogStub.java index d5a1a5602b..cc8b34c032 100644 --- a/org.eclipse.linuxtools.lttng2.ui.tests/stubs/org/eclipse/linuxtools/internal/lttng2/stubs/dialogs/EnableChannelDialogStub.java +++ b/org.eclipse.linuxtools.lttng2.ui.tests/stubs/org/eclipse/linuxtools/internal/lttng2/stubs/dialogs/EnableChannelDialogStub.java @@ -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 diff --git a/org.eclipse.linuxtools.lttng2.ui.tests/stubs/org/eclipse/linuxtools/internal/lttng2/stubs/shells/LTTngToolsFileShell.java b/org.eclipse.linuxtools.lttng2.ui.tests/stubs/org/eclipse/linuxtools/internal/lttng2/stubs/shells/LTTngToolsFileShell.java index 39ccc27448..93b0e21b9f 100644 --- a/org.eclipse.linuxtools.lttng2.ui.tests/stubs/org/eclipse/linuxtools/internal/lttng2/stubs/shells/LTTngToolsFileShell.java +++ b/org.eclipse.linuxtools.lttng2.ui.tests/stubs/org/eclipse/linuxtools/internal/lttng2/stubs/shells/LTTngToolsFileShell.java @@ -226,10 +226,6 @@ public class LTTngToolsFileShell extends TestCommandShell { } } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.lttng.stubs.service.shells.TestCommandShell#executeCommand(java.lang.String, org.eclipse.core.runtime.IProgressMonitor, boolean) - */ @Override public synchronized ICommandResult executeCommand(String command, IProgressMonitor monitor, boolean checkReturnValue) throws ExecutionException { Map commands = fScenarioMap.get(fScenario); @@ -264,6 +260,7 @@ public class LTTngToolsFileShell extends TestCommandShell { // ------------------------------------------------------------------------ // Helper methods // ------------------------------------------------------------------------ + private static boolean isComment(String line) { if (line == null) { throw new RuntimeException("line is null"); diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/Activator.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/Activator.java index d5d7106ec8..dcdb081760 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/Activator.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/Activator.java @@ -1,11 +1,11 @@ /******************************************************************************* - * 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: * Francois Chouinard - Initial API and implementation *******************************************************************************/ @@ -69,9 +69,6 @@ public class Activator extends AbstractUIPlugin { // AbstractUIPlugin // ------------------------------------------------------------------------ - /* (non-Javadoc) - * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext) - */ @Override public void start(BundleContext context) throws Exception { super.start(context); @@ -79,9 +76,6 @@ public class Activator extends AbstractUIPlugin { ControlPreferences.getInstance().init(getPreferenceStore()); } - /* (non-Javadoc) - * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext) - */ @Override public void stop(BundleContext context) throws Exception { ControlPreferences.getInstance().dispose(); @@ -89,9 +83,6 @@ public class Activator extends AbstractUIPlugin { super.stop(context); } - /* (non-Javadoc) - * @see org.eclipse.ui.plugin.AbstractUIPlugin#initializeImageRegistry(org.eclipse.jface.resource.ImageRegistry) - */ @Override protected void initializeImageRegistry(ImageRegistry reg) { } @@ -102,9 +93,9 @@ public class Activator extends AbstractUIPlugin { /** * Gets an image object using given path within plug-in. - * + * * @param path path to image file - * + * * @return image object */ public Image getImageFromPath(String path) { @@ -113,9 +104,9 @@ public class Activator extends AbstractUIPlugin { /** * Gets an image descriptor using given path within plug-in. - * - * @param path path to image file - * + * + * @param path path to image file + * * @return image descriptor object */ public ImageDescriptor getImageDescripterFromPath(String path) { @@ -124,9 +115,9 @@ public class Activator extends AbstractUIPlugin { /** * Gets a image object from the image registry based on the given path. - * If the image is not in the registry it will be registered. - * - * @param path to the image file + * If the image is not in the registry it will be registered. + * + * @param path to the image file * @return image object */ public Image getImageFromImageRegistry(String path) { @@ -137,7 +128,7 @@ public class Activator extends AbstractUIPlugin { } return icon; } - + /** * Loads the image in the plug-ins image registry (if necessary) and returns the image * @param url - URL relative to the Bundle @@ -154,19 +145,19 @@ public class Activator extends AbstractUIPlugin { } return icon; } - + /** * Logs a message with severity INFO in the runtime log of the plug-in. - * + * * @param message A message to log */ public void logInfo(String message) { getLog().log(new Status(IStatus.INFO, PLUGIN_ID, message)); } - + /** * Logs a message and exception with severity INFO in the runtime log of the plug-in. - * + * * @param message A message to log * @param exception A exception to log */ @@ -176,16 +167,16 @@ public class Activator extends AbstractUIPlugin { /** * Logs a message and exception with severity WARNING in the runtime log of the plug-in. - * + * * @param message A message to log */ public void logWarning(String message) { getLog().log(new Status(IStatus.WARNING, PLUGIN_ID, message)); } - + /** * Logs a message and exception with severity WARNING in the runtime log of the plug-in. - * + * * @param message A message to log * @param exception A exception to log */ @@ -195,16 +186,16 @@ public class Activator extends AbstractUIPlugin { /** * Logs a message and exception with severity ERROR in the runtime log of the plug-in. - * + * * @param message A message to log */ public void logError(String message) { getLog().log(new Status(IStatus.ERROR, PLUGIN_ID, message)); } - + /** * Logs a message and exception with severity ERROR in the runtime log of the plug-in. - * + * * @param message A message to log * @param exception A exception to log */ diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/ControlView.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/ControlView.java index 972ce5a395..558088d513 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/ControlView.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/ControlView.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2012 Ericsson + * Copyright (c) 2009, 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 @@ -45,6 +45,7 @@ public class ControlView extends ViewPart implements ITraceControlComponentChang // ------------------------------------------------------------------------ // Constants // ------------------------------------------------------------------------ + /** * View ID. */ @@ -64,10 +65,6 @@ public class ControlView extends ViewPart implements ITraceControlComponentChang */ private ITraceControlComponent fRoot = null; - // ------------------------------------------------------------------------ - // Constructors - // ------------------------------------------------------------------------ - // ------------------------------------------------------------------------ // Accessors // ------------------------------------------------------------------------ @@ -85,11 +82,6 @@ public class ControlView extends ViewPart implements ITraceControlComponentChang // Operations // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * - * @see org.eclipse.ui.part.WorkbenchPart#createPartControl(org.eclipse.swt.widgets.Composite) - */ @Override public void createPartControl(Composite parent) { // Create tree viewer @@ -112,38 +104,21 @@ public class ControlView extends ViewPart implements ITraceControlComponentChang RSECorePlugin.getTheSystemRegistry(); // to load RSE } - /* - * (non-Javadoc) - * - * @see org.eclipse.ui.part.WorkbenchPart#setFocus() - */ @Override public void setFocus() { fTreeViewer.getControl().setFocus(); } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponentChangedListener#componentAdded(org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent, org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent) - */ @Override public void componentAdded(ITraceControlComponent parent, ITraceControlComponent component) { componentChanged(parent); } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponentChangedListener#componentRemoved(org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent, org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent) - */ @Override public void componentRemoved(ITraceControlComponent parent, ITraceControlComponent component) { componentChanged(parent); } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponentChangedListener#componentChanged(org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent) - */ @Override public void componentChanged(final ITraceControlComponent component) { if (fTreeViewer.getTree().isDisposed()) { 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 fb5ddb204a..f2d6fff9f6 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 @@ -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 @@ -55,18 +55,22 @@ public class AddContextDialog extends Dialog implements IAddContextDialog { // ------------------------------------------------------------------------ // Attributes // ------------------------------------------------------------------------ + /** * The dialog composite. */ private Composite fDialogComposite; + /** * A tree viewer for displaying and selection of available contexts. */ private CheckboxTreeViewer fContextsViewer; + /** * A Tree model for the checkbox tree viewer. */ private final ContextModel fContextModel = new ContextModel(); + /** * The contexts to add. */ @@ -75,6 +79,7 @@ public class AddContextDialog extends Dialog implements IAddContextDialog { // ------------------------------------------------------------------------ // Constructors // ------------------------------------------------------------------------ + /** * Constructor * @param shell - a shell for the display of the dialog @@ -88,19 +93,11 @@ public class AddContextDialog extends Dialog implements IAddContextDialog { // Accessors // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.IAddContextDialog#setAvalibleContexts(java.util.List) - */ @Override public void setAvalibleContexts(List contexts) { fContextModel.setAvalibleContexts(contexts); } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.IAddContextDialog#getContexts() - */ @Override public List getContexts() { List ret = new ArrayList(); @@ -111,10 +108,7 @@ public class AddContextDialog extends Dialog implements IAddContextDialog { // ------------------------------------------------------------------------ // Operations // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see org.eclipse.jface.window.Window#configureShell(org.eclipse.swt.widgets.Shell) - */ + @Override protected void configureShell(Shell newShell) { super.configureShell(newShell); @@ -122,10 +116,6 @@ public class AddContextDialog extends Dialog implements IAddContextDialog { newShell.setImage(Activator.getDefault().loadIcon(ADD_CONTEXT_ICON_FILE)); } - /* - * (non-Javadoc) - * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite) - */ @Override protected Control createDialogArea(Composite parent) { @@ -156,20 +146,12 @@ public class AddContextDialog extends Dialog implements IAddContextDialog { return fDialogComposite; } - /* - * (non-Javadoc) - * @see org.eclipse.jface.dialogs.Dialog#createButtonsForButtonBar(org.eclipse.swt.widgets.Composite) - */ @Override protected void createButtonsForButtonBar(Composite parent) { createButton(parent, IDialogConstants.CANCEL_ID, "&Cancel", true); //$NON-NLS-1$ createButton(parent, IDialogConstants.OK_ID, "&Ok", true); //$NON-NLS-1$ } - /* - * (non-Javadoc) - * @see org.eclipse.jface.dialogs.Dialog#okPressed() - */ @Override protected void okPressed() { fSelectedContexts.clear(); diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/ConfirmDialog.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/ConfirmDialog.java index 213e3d9d9f..a94003a93b 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/ConfirmDialog.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/ConfirmDialog.java @@ -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 **********************************************************************/ @@ -21,20 +21,16 @@ import org.eclipse.swt.widgets.Shell; *

* Confirmation dialog implementation. *

- * + * * @author Bernd Hufmann */ public class ConfirmDialog implements IConfirmDialog { - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.IConfirmDialog#openConfirm(org.eclipse.swt.widgets.Shell, java.lang.String, java.lang.String) - */ @Override public boolean openConfirm(Shell parent, String title, String message) { - return MessageDialog.openConfirm(parent, - Messages.TraceControl_DestroyConfirmationTitle, + return MessageDialog.openConfirm(parent, + Messages.TraceControl_DestroyConfirmationTitle, Messages.TraceControl_DestroyConfirmationMessage); } } 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 fb61d3d1ee..4669c9bf88 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 @@ -226,37 +226,22 @@ public class CreateSessionDialog extends Dialog implements ICreateSessionDialog // ------------------------------------------------------------------------ // Accessors // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.ICreateSessionDialog#getSessionName() - */ + @Override public String getSessionName() { return fSessionName; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.ICreateSessionDialog#getSessionPath() - */ @Override public String getSessionPath() { return fSessionPath; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.ICreateSessionDialog#isDefaultSessionPath() - */ @Override public boolean isDefaultSessionPath() { return fIsDefaultPath; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.ICreateSessionDialog#initialze(org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceSessionGroup) - */ @Override public void initialize(TraceSessionGroup group) { fParent = group; @@ -291,10 +276,6 @@ public class CreateSessionDialog extends Dialog implements ICreateSessionDialog // Operations // ------------------------------------------------------------------------ - - /* (non-Javadoc) - * @see org.eclipse.jface.dialogs.Dialog#createContents(org.eclipse.swt.widgets.Composite) - */ @Override protected Control createContents(Composite parent) { fControl = super.createContents(parent); @@ -306,10 +287,7 @@ public class CreateSessionDialog extends Dialog implements ICreateSessionDialog return fControl; } - /* - * (non-Javadoc) - * @see org.eclipse.jface.window.Window#configureShell(org.eclipse.swt.widgets.Shell) - */ + @Override protected void configureShell(Shell newShell) { super.configureShell(newShell); @@ -317,10 +295,6 @@ public class CreateSessionDialog extends Dialog implements ICreateSessionDialog newShell.setImage(Activator.getDefault().loadIcon(CREATE_SESSION_ICON_FILE)); } - /* - * (non-Javadoc) - * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite) - */ @Override protected Control createDialogArea(Composite parent) { @@ -616,20 +590,12 @@ public class CreateSessionDialog extends Dialog implements ICreateSessionDialog } } - /* - * (non-Javadoc) - * @see org.eclipse.jface.dialogs.Dialog#createButtonsForButtonBar(org.eclipse.swt.widgets.Composite) - */ @Override protected void createButtonsForButtonBar(Composite parent) { createButton(parent, IDialogConstants.CANCEL_ID, "&Cancel", true); //$NON-NLS-1$ createButton(parent, IDialogConstants.OK_ID, "&Ok", true); //$NON-NLS-1$ } - /* - * (non-Javadoc) - * @see org.eclipse.jface.dialogs.Dialog#okPressed() - */ @Override protected void okPressed() { // Validate input data diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/EnableChannelDialog.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/EnableChannelDialog.java index d1dea91f06..56ce875872 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/EnableChannelDialog.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/EnableChannelDialog.java @@ -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 @@ -144,19 +144,12 @@ public class EnableChannelDialog extends Dialog implements IEnableChannelDialog // ------------------------------------------------------------------------ // Accessors // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.ICreateChannelDialog#getChannelInfo() - */ + @Override public IChannelInfo getChannelInfo() { return fChannelInfo; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.ICreateChannelDialog#setDomainComponent(org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceDomainComponent) - */ @Override public void setDomainComponent(TraceDomainComponent domain) { fDomain = domain; @@ -167,19 +160,11 @@ public class EnableChannelDialog extends Dialog implements IEnableChannelDialog } } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.ICreateChannelDialog#isKernel() - */ @Override public boolean isKernel() { return fIsKernel; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.IEnableChannelDialog#setHasKernel(boolean) - */ @Override public void setHasKernel(boolean hasKernel) { if (fDomain != null) { @@ -194,10 +179,7 @@ public class EnableChannelDialog extends Dialog implements IEnableChannelDialog // ------------------------------------------------------------------------ // Operations // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see org.eclipse.jface.window.Window#configureShell(org.eclipse.swt.widgets.Shell) - */ + @Override protected void configureShell(Shell newShell) { super.configureShell(newShell); @@ -205,10 +187,6 @@ public class EnableChannelDialog extends Dialog implements IEnableChannelDialog newShell.setImage(Activator.getDefault().loadIcon(ENABLE_CHANNEL_ICON_FILE)); } - /* - * (non-Javadoc) - * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite) - */ @Override protected Control createDialogArea(Composite parent) { @@ -308,10 +286,6 @@ public class EnableChannelDialog extends Dialog implements IEnableChannelDialog return fDialogComposite; } - /* - * (non-Javadoc) - * @see org.eclipse.jface.dialogs.Dialog#createButtonsForButtonBar(org.eclipse.swt.widgets.Composite) - */ @Override protected void createButtonsForButtonBar(Composite parent) { createButton(parent, IDialogConstants.DETAILS_ID, "&Default", true); //$NON-NLS-1$ @@ -319,10 +293,6 @@ public class EnableChannelDialog extends Dialog implements IEnableChannelDialog createButton(parent, IDialogConstants.OK_ID, "&Ok", true); //$NON-NLS-1$ } - /* - * (non-Javadoc) - * @see org.eclipse.jface.dialogs.Dialog#okPressed() - */ @Override protected void okPressed() { // Set channel information @@ -355,10 +325,6 @@ public class EnableChannelDialog extends Dialog implements IEnableChannelDialog super.okPressed(); } - /* - * (non-Javadoc) - * @see org.eclipse.jface.dialogs.Dialog#buttonPressed(int) - */ @Override protected void buttonPressed(int buttonId) { if (buttonId == IDialogConstants.DETAILS_ID) { @@ -371,6 +337,7 @@ public class EnableChannelDialog extends Dialog implements IEnableChannelDialog // ------------------------------------------------------------------------ // Helper methods // ------------------------------------------------------------------------ + /** * Sets default value depending on Kernel or UST */ diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/EnableEventsDialog.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/EnableEventsDialog.java index d6e4da0788..987e2d4944 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/EnableEventsDialog.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/EnableEventsDialog.java @@ -106,10 +106,6 @@ public class EnableEventsDialog extends Dialog implements IEnableEventsDialog { // Accessors // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.IEnableKernelEvents#isTracpoints() - */ @Override public boolean isTracepoints() { if (fIsKernel) { @@ -118,9 +114,6 @@ public class EnableEventsDialog extends Dialog implements IEnableEventsDialog { return fUstComposite.isTracepoints(); } - /* (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.IEnableKernelEvents#isAllTracePoints() - */ @Override public boolean isAllTracePoints() { if (fIsKernel) { @@ -129,10 +122,6 @@ public class EnableEventsDialog extends Dialog implements IEnableEventsDialog { return fUstComposite.isAllTracePoints(); } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.IEnableKernelEvents#isSysCalls() - */ @Override public boolean isSysCalls() { if (fIsKernel) { @@ -141,9 +130,6 @@ public class EnableEventsDialog extends Dialog implements IEnableEventsDialog { return false; } - /* (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.IEnableKernelEvents#isAllSysCalls() - */ @Override public boolean isAllSysCalls() { if (fIsKernel) { @@ -152,9 +138,6 @@ public class EnableEventsDialog extends Dialog implements IEnableEventsDialog { return false; } - /* (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.IEnableKernelEvents#getEventNames() - */ @Override public List getEventNames() { if (fIsKernel) { @@ -162,10 +145,7 @@ public class EnableEventsDialog extends Dialog implements IEnableEventsDialog { } return fUstComposite.getEventNames(); } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.IEnableKernelEvents#isDynamicProbe() - */ + @Override public boolean isDynamicProbe() { if (fIsKernel) { @@ -174,9 +154,6 @@ public class EnableEventsDialog extends Dialog implements IEnableEventsDialog { return false; } - /* (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.IEnableKernelEvents#getProbeName() - */ @Override public String getProbeName() { if (fIsKernel) { @@ -185,9 +162,6 @@ public class EnableEventsDialog extends Dialog implements IEnableEventsDialog { return null; } - /* (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.IEnableKernelEvents#getProbeEventName() - */ @Override public String getProbeEventName() { if (fIsKernel) { @@ -196,10 +170,6 @@ public class EnableEventsDialog extends Dialog implements IEnableEventsDialog { return null; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.IEnableKernelEvents#isDynamicFunctionProbe() - */ @Override public boolean isDynamicFunctionProbe() { if (fIsKernel) { @@ -208,9 +178,6 @@ public class EnableEventsDialog extends Dialog implements IEnableEventsDialog { return false; } - /* (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.IEnableKernelEvents#getFunctionEventName() - */ @Override public String getFunctionEventName() { if (fIsKernel) { @@ -219,10 +186,6 @@ public class EnableEventsDialog extends Dialog implements IEnableEventsDialog { return null; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.IEnableKernelEvents#getFunction() - */ @Override public String getFunction() { if (fIsKernel) { @@ -231,10 +194,6 @@ public class EnableEventsDialog extends Dialog implements IEnableEventsDialog { return null; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.IEnableUstEvents#isWildcard() - */ @Override public boolean isWildcard() { if (!fIsKernel) { @@ -243,62 +202,38 @@ public class EnableEventsDialog extends Dialog implements IEnableEventsDialog { return false; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.IEnableUstEvents#getWildcard() - */ @Override public String getWildcard() { if (!fIsKernel) { return fUstComposite.getWildcard(); } return null; - } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.IEnableUstEvents#isLogLevel() - */ @Override public boolean isLogLevel() { if (!fIsKernel) { return fUstComposite.isLogLevel(); } return false; - } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.IEnableUstEvents#getLogLevelType() - */ @Override public LogLevelType getLogLevelType() { if (!fIsKernel) { return fUstComposite.getLogLevelType(); } return null; - } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.IEnableUstEvents#getLogLevel() - */ @Override public TraceLogLevel getLogLevel() { if (!fIsKernel) { return fUstComposite.getLogLevel(); } return null; - } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.IEnableUstEvents#getLogLevelEventName() - */ @Override public String getLogLevelEventName() { if (!fIsKernel) { @@ -307,28 +242,16 @@ public class EnableEventsDialog extends Dialog implements IEnableEventsDialog { return null; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.IEnableEventsDialog#isKernel() - */ @Override public boolean isKernel() { return fIsKernel; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.IEnableEventsDialog#setTraceProviderGroup(org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceProviderGroup) - */ @Override public void setTraceProviderGroup(TraceProviderGroup providerGroup) { fProviderGroup = providerGroup; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.IEnableEventsDialog#setTraceDomainComponent(org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceDomainComponent) - */ @Override public void setTraceDomainComponent(TraceDomainComponent domain) { fDomain = domain; @@ -339,10 +262,6 @@ public class EnableEventsDialog extends Dialog implements IEnableEventsDialog { } } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.IEnableUstEvents#getFilterExpression() - */ @Override public String getFilterExpression() { if (!fIsKernel) { @@ -354,10 +273,7 @@ public class EnableEventsDialog extends Dialog implements IEnableEventsDialog { // ------------------------------------------------------------------------ // Operations // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see org.eclipse.jface.window.Window#configureShell(org.eclipse.swt.widgets.Shell) - */ + @Override protected void configureShell(Shell newShell) { super.configureShell(newShell); @@ -365,10 +281,6 @@ public class EnableEventsDialog extends Dialog implements IEnableEventsDialog { newShell.setImage(Activator.getDefault().loadIcon(ENABLE_EVENT_ICON_FILE)); } - /* - * (non-Javadoc) - * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite) - */ @Override protected Control createDialogArea(Composite parent) { @@ -448,21 +360,12 @@ public class EnableEventsDialog extends Dialog implements IEnableEventsDialog { return fDialogComposite; } - - /* - * (non-Javadoc) - * @see org.eclipse.jface.dialogs.Dialog#createButtonsForButtonBar(org.eclipse.swt.widgets.Composite) - */ @Override protected void createButtonsForButtonBar(Composite parent) { createButton(parent, IDialogConstants.CANCEL_ID, "&Cancel", true); //$NON-NLS-1$ createButton(parent, IDialogConstants.OK_ID, "&Ok", true); //$NON-NLS-1$ } - /* - * (non-Javadoc) - * @see org.eclipse.jface.dialogs.Dialog#okPressed() - */ @Override protected void okPressed() { fIsKernel = fKernelButton.getSelection(); @@ -484,6 +387,7 @@ public class EnableEventsDialog extends Dialog implements IEnableEventsDialog { // ------------------------------------------------------------------------ // Helper methods // ------------------------------------------------------------------------ + /** * Creates the kernel composite (if not existing) */ 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 8135db3f02..d848f78125 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 @@ -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 @@ -159,92 +159,57 @@ public class EnableKernelEventComposite extends Composite implements IEnableKern // ------------------------------------------------------------------------ // Acessors // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.IEnableKernelEvents#isTracpoints() - */ + @Override public boolean isTracepoints() { return fIsTracepoints; } - /* (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.IEnableKernelEvents#isAllTracePoints() - */ @Override public boolean isAllTracePoints() { return fIsAllTracepoints; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.IEnableKernelEvents#isSysCalls() - */ @Override public boolean isSysCalls() { return fIsSysCalls; } - /* (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.IEnableKernelEvents#isAllSysCalls() - */ @Override public boolean isAllSysCalls() { return fIsSysCalls; } - /* (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.IEnableKernelEvents#getEventNames() - */ @Override public List getEventNames() { return new ArrayList(fSelectedEvents); } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.IEnableKernelEvents#isDynamicProbe() - */ + @Override public boolean isDynamicProbe() { return fIsDynamicProbe; } - /* (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.IEnableKernelEvents#getProbeName() - */ @Override public String getProbeName() { return fProbeString; } - /* (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.IEnableKernelEvents#getProbeEventName() - */ @Override public String getProbeEventName() { return fProbeEventName; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.IEnableKernelEvents#isDynamicFunctionProbe() - */ @Override public boolean isDynamicFunctionProbe() { return fIsDynamicFunctionProbe; } - /* (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.IEnableKernelEvents#getFunctionEventName() - */ @Override public String getFunctionEventName() { return fFunctionEventName; } - /* (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.IEnableKernelEvents#getFunction() - */ @Override public String getFunction() { return fFunctionString; @@ -253,6 +218,7 @@ public class EnableKernelEventComposite extends Composite implements IEnableKern // ------------------------------------------------------------------------ // Operations // ------------------------------------------------------------------------ + /** * Creates the composite content */ 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 70ea0eb82b..9dab9797f1 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 @@ -168,91 +168,51 @@ public class EnableUstEventsComposite extends Composite implements IEnableUstEve // Accessors // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.IEnableUstEvents#isTracepoints() - */ @Override public boolean isTracepoints() { return fIsTracepoints; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.IEnableUstEvents#isAllTracePoints() - */ @Override public boolean isAllTracePoints() { return fIsAllTracepoints; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.IEnableUstEvents#getEventNames() - */ @Override public List getEventNames() { return new ArrayList(fSelectedEvents); } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.IEnableUstEvents#isWildcard() - */ @Override public boolean isWildcard() { return fIsWildcard; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.IEnableUstEvents#getWildcard() - */ @Override public String getWildcard() { return fWildcard; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.IEnableUstEvents#isLogLevel() - */ @Override public boolean isLogLevel() { return fIsLogLevel; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.IEnableUstEvents#getLogLevelType() - */ @Override public LogLevelType getLogLevelType() { return fLogLevelType; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.IEnableUstEvents#getLogLevel() - */ @Override public TraceLogLevel getLogLevel() { return fLogLevel; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.IEnableUstEvents#getLogLevelEventName() - */ @Override public String getLogLevelEventName() { return fLogLevelEventName; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.IEnableUstEvents#getFilterExpression() - */ @Override public String getFilterExpression() { return fFilterExpression; @@ -284,9 +244,10 @@ public class EnableUstEventsComposite extends Composite implements IEnableUstEve } /** - * Validates the UST composite input data. - * @return true if configured data is valid and can be retrieved. - */ + * Validates the UST composite input data. + * + * @return true if configured data is valid and can be retrieved. + */ public boolean isValid() { fIsTracepoints = fTracepointsActivateButton.getSelection(); diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/GetEventInfoDialog.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/GetEventInfoDialog.java index 02e7ad3de2..e71ce19ab3 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/GetEventInfoDialog.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/GetEventInfoDialog.java @@ -119,45 +119,27 @@ public class GetEventInfoDialog extends Dialog implements IGetEventInfoDialog { // ------------------------------------------------------------------------ // Accessors // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.IEnableEventsDialog#getSession() - */ + @Override public TraceSessionComponent getSession() { return fSessions[fSessionIndex]; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.IEnableEventsDialog#getChannel() - */ @Override public TraceChannelComponent getChannel() { return fChannel; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.IGetEventInfoDialog#setIsKernel(boolean) - */ @Override public void setIsKernel(boolean isKernel) { fIsKernel = isKernel; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.IGetEventInfoDialog#setSessions(org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceSessionComponent[]) - */ @Override public void setSessions(TraceSessionComponent[] sessions) { fSessions = Arrays.copyOf(sessions, sessions.length); } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.IGetEventInfoDialog#getFilterExpression() - */ + @Override public String getFilterExpression() { return fFilterExpression; @@ -166,10 +148,7 @@ public class GetEventInfoDialog extends Dialog implements IGetEventInfoDialog { // ------------------------------------------------------------------------ // Operations // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see org.eclipse.jface.window.Window#configureShell(org.eclipse.swt.widgets.Shell) - */ + @Override protected void configureShell(Shell newShell) { super.configureShell(newShell); @@ -177,10 +156,6 @@ public class GetEventInfoDialog extends Dialog implements IGetEventInfoDialog { newShell.setImage(Activator.getDefault().loadIcon(TARGET_NEW_CONNECTION_ICON_FILE)); } - /* - * (non-Javadoc) - * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite) - */ @Override protected Control createDialogArea(Composite parent) { @@ -279,20 +254,12 @@ public class GetEventInfoDialog extends Dialog implements IGetEventInfoDialog { return fDialogComposite; } - /* - * (non-Javadoc) - * @see org.eclipse.jface.dialogs.Dialog#createButtonsForButtonBar(org.eclipse.swt.widgets.Composite) - */ @Override protected void createButtonsForButtonBar(Composite parent) { createButton(parent, IDialogConstants.CANCEL_ID, "&Cancel", true); //$NON-NLS-1$ createButton(parent, IDialogConstants.OK_ID, "&Ok", true); //$NON-NLS-1$ } - /* - * (non-Javadoc) - * @see org.eclipse.jface.dialogs.Dialog#okPressed() - */ @Override protected void okPressed() { diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/ImportConfirmationDialog.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/ImportConfirmationDialog.java index 75b035c467..2f53cc2e94 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/ImportConfirmationDialog.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/ImportConfirmationDialog.java @@ -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.dialogs; @@ -33,7 +33,7 @@ import org.eclipse.swt.widgets.Text; *

* Dialog box for collecting session creation information. *

- * + * * @author Bernd Hufmann */ public class ImportConfirmationDialog extends Dialog implements IImportConfirmationDialog { @@ -66,7 +66,7 @@ public class ImportConfirmationDialog extends Dialog implements IImportConfirmat */ private Text fNewTraceNameText = null; /** - * The trace name which already exists in the project + * The trace name which already exists in the project */ private String fTraceName = null; /** @@ -93,28 +93,17 @@ public class ImportConfirmationDialog extends Dialog implements IImportConfirmat // ------------------------------------------------------------------------ // Accessors // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.IImportConfirmationDialog#setTraceName(java.lang.String) - */ + @Override public void setTraceName(String name) { fTraceName = name; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.IImportConfirmationDialog#getNewTraceName() - */ @Override public String getNewTraceName() { return fNewTraceName; } - - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.IImportConfirmationDialog#isOverwrite() - */ + @Override public boolean isOverwrite() { return fIsOverride; @@ -123,10 +112,7 @@ public class ImportConfirmationDialog extends Dialog implements IImportConfirmat // ------------------------------------------------------------------------ // Operations // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see org.eclipse.jface.window.Window#configureShell(org.eclipse.swt.widgets.Shell) - */ + @Override protected void configureShell(Shell newShell) { super.configureShell(newShell); @@ -134,13 +120,9 @@ public class ImportConfirmationDialog extends Dialog implements IImportConfirmat newShell.setImage(Activator.getDefault().loadIcon(IMPORT_ICON_FILE)); } - /* - * (non-Javadoc) - * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite) - */ @Override protected Control createDialogArea(Composite parent) { - + // Main dialog panel fDialogComposite = new Composite(parent, SWT.NONE); GridLayout layout = new GridLayout(1, true); @@ -152,7 +134,7 @@ public class ImportConfirmationDialog extends Dialog implements IImportConfirmat fOverwriteButton = new Button(fDialogComposite, SWT.RADIO); fOverwriteButton.setText(Messages.TraceControl_ImportDialogConfirmationOverwriteLabel); - + fOverwriteButton.addSelectionListener(new SelectionAdapter() { @Override public void widgetSelected(SelectionEvent e) { @@ -160,17 +142,17 @@ public class ImportConfirmationDialog extends Dialog implements IImportConfirmat fNewTraceNameText.setText(fTraceName); } }); - + fRenameButton = new Button(fDialogComposite, SWT.RADIO); fRenameButton.setText(Messages.TraceControl_ImportDialogConfirmationRenameLabel); - + fRenameButton.addSelectionListener(new SelectionAdapter() { @Override public void widgetSelected(SelectionEvent e) { fNewTraceNameText.setEnabled(true); } }); - + fNewTraceNameText = new Text(fDialogComposite, SWT.NONE); fNewTraceNameText.setToolTipText(Messages.TraceControl_ImportDialogConfirmationNewNameLabel); fNewTraceNameText.setText(fTraceName); @@ -178,32 +160,24 @@ public class ImportConfirmationDialog extends Dialog implements IImportConfirmat // Default fOverwriteButton.setSelection(true); fNewTraceNameText.setEnabled(false); - + // layout widgets GridData data = new GridData(GridData.FILL_HORIZONTAL); - + fNewTraceNameText.setLayoutData(data); getShell().setMinimumSize(new Point(300, 150)); - + return fDialogComposite; } - /* - * (non-Javadoc) - * @see org.eclipse.jface.dialogs.Dialog#createButtonsForButtonBar(org.eclipse.swt.widgets.Composite) - */ @Override protected void createButtonsForButtonBar(Composite parent) { createButton(parent, IDialogConstants.CANCEL_ID, "&Cancel", true); //$NON-NLS-1$ createButton(parent, IDialogConstants.OK_ID, "&Ok", true); //$NON-NLS-1$ } - /* - * (non-Javadoc) - * @see org.eclipse.jface.dialogs.Dialog#okPressed() - */ @Override protected void okPressed() { 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 16b0cfdb95..89eb0a7120 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 @@ -132,10 +132,7 @@ public class ImportDialog extends Dialog implements IImportDialog { // ------------------------------------------------------------------------ // Accessors // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.IImportDialog#getTracePathes() - */ + @Override public List getTracePathes() { List retList = new ArrayList(); @@ -143,19 +140,11 @@ public class ImportDialog extends Dialog implements IImportDialog { return retList; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.IImportDialog#getProject() - */ @Override public IProject getProject() { return fProjects.get(fProjectIndex); } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.IImportDialog#setSession(org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceSessionComponent) - */ @Override public void setSession(TraceSessionComponent session) { fSession = session; @@ -164,10 +153,7 @@ public class ImportDialog extends Dialog implements IImportDialog { // ------------------------------------------------------------------------ // Operations // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see org.eclipse.jface.window.Window#configureShell(org.eclipse.swt.widgets.Shell) - */ + @Override protected void configureShell(Shell newShell) { super.configureShell(newShell); @@ -175,10 +161,6 @@ public class ImportDialog extends Dialog implements IImportDialog { newShell.setImage(Activator.getDefault().loadIcon(IMPORT_ICON_FILE)); } - /* - * (non-Javadoc) - * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite) - */ @Override protected Control createDialogArea(Composite parent) { @@ -204,10 +186,6 @@ public class ImportDialog extends Dialog implements IImportDialog { return fDialogComposite; } - /* - * (non-Javadoc) - * @see org.eclipse.jface.dialogs.Dialog#createButtonsForButtonBar(org.eclipse.swt.widgets.Composite) - */ @Override protected void createButtonsForButtonBar(Composite parent) { createButton(parent, IDialogConstants.CANCEL_ID, "&Cancel", true); //$NON-NLS-1$ @@ -217,10 +195,6 @@ public class ImportDialog extends Dialog implements IImportDialog { } } - /* - * (non-Javadoc) - * @see org.eclipse.jface.dialogs.Dialog#okPressed() - */ @Override protected void okPressed() { if (!fIsError) { @@ -311,6 +285,7 @@ public class ImportDialog extends Dialog implements IImportDialog { // ------------------------------------------------------------------------ // Helper methods and classes // ------------------------------------------------------------------------ + /** * Helper class for the contents of a folder in a tracing project * diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/NewConnectionDialog.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/NewConnectionDialog.java index e5a0c867a3..5eec5a93d5 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/NewConnectionDialog.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/NewConnectionDialog.java @@ -128,19 +128,12 @@ public class NewConnectionDialog extends Dialog implements INewConnectionDialog // ------------------------------------------------------------------------ // Accessors // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.INewConnectionDialog#getConnectionName() - */ + @Override public String getConnectionName() { return fConnectionName; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.INewConnectionDialog#getHostName() - */ @Override public String getHostName() { return fHostName; @@ -151,19 +144,11 @@ public class NewConnectionDialog extends Dialog implements INewConnectionDialog return fPort; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.INewConnectionDialog#setTraceControlParent(org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent) - */ @Override public void setTraceControlParent(ITraceControlComponent parent) { fParent = parent; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.INewConnectionDialog#setHosts(org.eclipse.rse.core.model.IHost[]) - */ @Override public void setHosts(IHost[] hosts) { if (hosts != null) { @@ -179,10 +164,7 @@ public class NewConnectionDialog extends Dialog implements INewConnectionDialog // ------------------------------------------------------------------------ // Operations // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see org.eclipse.jface.window.Window#configureShell(org.eclipse.swt.widgets.Shell) - */ + @Override protected void configureShell(Shell newShell) { super.configureShell(newShell); @@ -190,10 +172,6 @@ public class NewConnectionDialog extends Dialog implements INewConnectionDialog newShell.setImage(Activator.getDefault().loadIcon(TARGET_NEW_CONNECTION_ICON_FILE)); } - /* - * (non-Javadoc) - * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite) - */ @Override protected Control createDialogArea(Composite parent) { @@ -320,20 +298,12 @@ public class NewConnectionDialog extends Dialog implements INewConnectionDialog return fDialogComposite; } - /* - * (non-Javadoc) - * @see org.eclipse.jface.dialogs.Dialog#createButtonsForButtonBar(org.eclipse.swt.widgets.Composite) - */ @Override protected void createButtonsForButtonBar(Composite parent) { createButton(parent, IDialogConstants.CANCEL_ID, "&Cancel", true); //$NON-NLS-1$ createButton(parent, IDialogConstants.OK_ID, "&Ok", true); //$NON-NLS-1$ } - /* - * (non-Javadoc) - * @see org.eclipse.jface.dialogs.Dialog#okPressed() - */ @Override protected void okPressed() { // Validate input data diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/AddContextOnChannelHandler.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/AddContextOnChannelHandler.java index 9036b616a1..d406c49a84 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/AddContextOnChannelHandler.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/AddContextOnChannelHandler.java @@ -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 @@ -40,10 +40,7 @@ public class AddContextOnChannelHandler extends BaseAddContextHandler { // ------------------------------------------------------------------------ // Operations // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.handlers.BaseAddContextHandler#addContexts(org.eclipse.linuxtools.internal.lttng2.ui.views.control.handlers.CommandParameter, java.util.List, org.eclipse.core.runtime.IProgressMonitor) - */ + @Override public void addContexts(CommandParameter param, List contextNames, IProgressMonitor monitor) throws ExecutionException { if (param instanceof ChannelCommandParameter) { @@ -52,10 +49,6 @@ public class AddContextOnChannelHandler extends BaseAddContextHandler { } } - /* - * (non-Javadoc) - * @see org.eclipse.core.commands.AbstractHandler#isEnabled() - */ @Override public boolean isEnabled() { // Get workbench page for the Control View diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/AddContextOnDomainHandler.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/AddContextOnDomainHandler.java index 9badc1d50e..407599551a 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/AddContextOnDomainHandler.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/AddContextOnDomainHandler.java @@ -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 @@ -40,10 +40,7 @@ public class AddContextOnDomainHandler extends BaseAddContextHandler { // ------------------------------------------------------------------------ // Operations // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.handlers.BaseAddContextHandler#addContexts(org.eclipse.linuxtools.internal.lttng2.ui.views.control.handlers.CommandParameter, java.util.List, org.eclipse.core.runtime.IProgressMonitor) - */ + @Override public void addContexts(CommandParameter param, List contextNames, IProgressMonitor monitor) throws ExecutionException { if (param instanceof DomainCommandParameter) { @@ -52,10 +49,6 @@ public class AddContextOnDomainHandler extends BaseAddContextHandler { } } - /* - * (non-Javadoc) - * @see org.eclipse.core.commands.AbstractHandler#isEnabled() - */ @Override public boolean isEnabled() { diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/AddContextOnEventHandler.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/AddContextOnEventHandler.java index 63a38398f8..1dbb47c133 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/AddContextOnEventHandler.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/AddContextOnEventHandler.java @@ -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 @@ -40,10 +40,7 @@ public class AddContextOnEventHandler extends BaseAddContextHandler { // ------------------------------------------------------------------------ // Operations // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.handlers.BaseAddContextHandler#addContexts(org.eclipse.linuxtools.internal.lttng2.ui.views.control.handlers.CommandParameter, java.util.List, org.eclipse.core.runtime.IProgressMonitor) - */ + @Override public void addContexts(CommandParameter param, List contextNames, IProgressMonitor monitor) throws ExecutionException { if (param instanceof EventCommandParameter) { @@ -52,10 +49,6 @@ public class AddContextOnEventHandler extends BaseAddContextHandler { } } - /* - * (non-Javadoc) - * @see org.eclipse.core.commands.AbstractHandler#isEnabled() - */ @Override public boolean isEnabled() { // Get workbench page for the Control View 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 a065b0796f..df1d34287a 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 @@ -53,6 +53,7 @@ public class AssignEventHandler extends BaseControlViewHandler { // ------------------------------------------------------------------------ // Attributes // ------------------------------------------------------------------------ + /** * The command execution parameter. */ @@ -62,10 +63,6 @@ public class AssignEventHandler extends BaseControlViewHandler { // Operations // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands.ExecutionEvent) - */ @Override public Object execute(ExecutionEvent event) throws ExecutionException { @@ -128,10 +125,6 @@ public class AssignEventHandler extends BaseControlViewHandler { return null; } - /* - * (non-Javadoc) - * @see org.eclipse.core.commands.AbstractHandler#isEnabled() - */ @Override public boolean isEnabled() { ArrayList events = new ArrayList(); 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 04633e118c..f400947a3d 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 @@ -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 @@ -40,6 +40,7 @@ abstract public class BaseAddContextHandler extends BaseControlViewHandler { // ------------------------------------------------------------------------ // Attributes // ------------------------------------------------------------------------ + /** * The command execution parameter. */ @@ -63,10 +64,6 @@ abstract public class BaseAddContextHandler extends BaseControlViewHandler { */ abstract public void addContexts(CommandParameter param, List contextNames, IProgressMonitor monitor) throws ExecutionException; - /* - * (non-Javadoc) - * @see org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands.ExecutionEvent) - */ @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/BaseEnableChannelHandler.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/BaseEnableChannelHandler.java index 727de650f4..f04753ee5f 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 @@ -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 @@ -75,10 +75,6 @@ abstract class BaseEnableChannelHandler extends BaseControlViewHandler { */ abstract public TraceDomainComponent getDomain(CommandParameter param); - /* - * (non-Javadoc) - * @see org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands.ExecutionEvent) - */ @Override public Object execute(ExecutionEvent event) throws ExecutionException { fLock.lock(); 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 658e5545ea..f969368431 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 @@ -130,10 +130,6 @@ abstract public class BaseEnableEventHandler extends BaseControlViewHandler { */ abstract TraceDomainComponent getDomain(CommandParameter param); - /* - * (non-Javadoc) - * @see org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands.ExecutionEvent) - */ @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 80dbe64ebc..3217e4b006 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 @@ -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.handlers; @@ -21,7 +21,7 @@ import org.eclipse.ui.IWorkbenchPage; *

* Command handler implementation to delete a target host. *

- * + * * @author Bernd Hufmann */ abstract public class BaseNodeHandler extends BaseControlViewHandler { @@ -30,17 +30,14 @@ abstract public class BaseNodeHandler extends BaseControlViewHandler { // Attributes // ------------------------------------------------------------------------ /** - * The target node component the command is to be executed on. + * The target node component the command is to be executed on. */ protected TargetNodeComponent fTargetNode = null; - + // ------------------------------------------------------------------------ // Operations // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see org.eclipse.core.commands.AbstractHandler#isEnabled() - */ + @Override public boolean isEnabled() { @@ -69,5 +66,5 @@ abstract public class BaseNodeHandler extends BaseControlViewHandler { return isEnabled; } - + } \ No newline at end of file diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/CalibrateHandler.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/CalibrateHandler.java index dd670631d5..d31250afed 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/CalibrateHandler.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/CalibrateHandler.java @@ -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 @@ -51,10 +51,6 @@ public class CalibrateHandler extends BaseControlViewHandler { // Operations // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands.ExecutionEvent) - */ @Override public Object execute(ExecutionEvent event) throws ExecutionException { @@ -89,10 +85,6 @@ public class CalibrateHandler extends BaseControlViewHandler { return Status.OK_STATUS; } - /* - * (non-Javadoc) - * @see org.eclipse.core.commands.AbstractHandler#isEnabled() - */ @Override public boolean isEnabled() { diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/ChangeChannelStateHandler.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/ChangeChannelStateHandler.java index 742220a658..35a63dcd88 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/ChangeChannelStateHandler.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/ChangeChannelStateHandler.java @@ -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 @@ -71,10 +71,6 @@ abstract public class ChangeChannelStateHandler extends BaseControlViewHandler { */ abstract protected void changeState(TraceDomainComponent domain, List channelNames, IProgressMonitor monitor) throws ExecutionException; - /* - * (non-Javadoc) - * @see org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands.ExecutionEvent) - */ @Override public Object execute(ExecutionEvent event) throws ExecutionException { @@ -164,10 +160,6 @@ abstract public class ChangeChannelStateHandler extends BaseControlViewHandler { return null; } - /* - * (non-Javadoc) - * @see org.eclipse.core.commands.AbstractHandler#isEnabled() - */ @Override public boolean isEnabled() { 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 97639212a0..ea2a5c478e 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 @@ -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 @@ -71,10 +71,6 @@ abstract public class ChangeEventStateHandler extends BaseControlViewHandler { */ abstract protected void changeState(TraceChannelComponent channel, List eventNames, IProgressMonitor monitor) throws ExecutionException; - /* - * (non-Javadoc) - * @see org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands.ExecutionEvent) - */ @Override public Object execute(ExecutionEvent event) throws ExecutionException { @@ -152,10 +148,6 @@ abstract public class ChangeEventStateHandler extends BaseControlViewHandler { return null; } - /* - * (non-Javadoc) - * @see org.eclipse.core.commands.AbstractHandler#isEnabled() - */ @Override public boolean isEnabled() { // Get workbench page for the Control View 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 bc7b3f6c94..000df4420f 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 @@ -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 @@ -74,10 +74,6 @@ abstract public class ChangeSessionStateHandler extends BaseControlViewHandler { */ abstract public void changeState(TraceSessionComponent session, IProgressMonitor monitor) throws ExecutionException; - /* - * (non-Javadoc) - * @see org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands.ExecutionEvent) - */ @Override public Object execute(ExecutionEvent event) throws ExecutionException { @@ -121,10 +117,6 @@ abstract public class ChangeSessionStateHandler extends BaseControlViewHandler { return null; } - /* - * (non-Javadoc) - * @see org.eclipse.core.commands.AbstractHandler#isEnabled() - */ @Override public boolean isEnabled() { // Get workbench page for the Control View diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/ChannelCommandParameter.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/ChannelCommandParameter.java index 9d3faff9fd..0e7a711f29 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/ChannelCommandParameter.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/ChannelCommandParameter.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 @@ -57,10 +57,6 @@ public class ChannelCommandParameter extends CommandParameter { // Operations // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see java.lang.Object#clone() - */ @Override public ChannelCommandParameter clone() { ChannelCommandParameter clone = (ChannelCommandParameter) super.clone(); diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/CommandParameter.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/CommandParameter.java index 029346d41b..e6dc8a10d9 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/CommandParameter.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/CommandParameter.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.handlers; @@ -15,8 +15,8 @@ import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceS /** * Class containing parameter for the command execution. - * - * @author Bernd Hufmann + * + * @author Bernd Hufmann */ public class CommandParameter implements Cloneable { @@ -34,7 +34,7 @@ public class CommandParameter implements Cloneable { // ------------------------------------------------------------------------ /** - * Constructor + * Constructor * @param session a trace session component. */ public CommandParameter(TraceSessionComponent session) { @@ -56,10 +56,6 @@ public class CommandParameter implements Cloneable { // Operations // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see java.lang.Object#clone() - */ @Override public CommandParameter clone() { CommandParameter clone = null; diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/ConnectHandler.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/ConnectHandler.java index 0569674e66..9aac85db08 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/ConnectHandler.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/ConnectHandler.java @@ -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.handlers; @@ -19,7 +19,7 @@ import org.eclipse.linuxtools.internal.lttng2.core.control.model.TargetNodeState *

* Command handler implementation to connect to a target host. *

- * + * * @author Bernd Hufmann */ public class ConnectHandler extends BaseNodeHandler { @@ -28,10 +28,6 @@ public class ConnectHandler extends BaseNodeHandler { // Operations // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.handlers.BaseNodeHandler#execute(org.eclipse.core.commands.ExecutionEvent) - */ @Override public Object execute(ExecutionEvent event) throws ExecutionException { fLock.lock(); @@ -43,10 +39,6 @@ public class ConnectHandler extends BaseNodeHandler { return null; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.handlers.BaseNodeHandler#isEnabled() - */ @Override public boolean isEnabled() { boolean isEnabled = false; diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/CreateSessionHandler.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/CreateSessionHandler.java index e42d9c31f4..ac0521d533 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/CreateSessionHandler.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/CreateSessionHandler.java @@ -41,6 +41,7 @@ public class CreateSessionHandler extends BaseControlViewHandler { // ------------------------------------------------------------------------ // Attributes // ------------------------------------------------------------------------ + /** * The trace session group the command is to be executed on. */ @@ -49,10 +50,7 @@ public class CreateSessionHandler extends BaseControlViewHandler { // ------------------------------------------------------------------------ // Operations // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands.ExecutionEvent) - */ + @Override public Object execute(ExecutionEvent event) throws ExecutionException { @@ -93,10 +91,6 @@ public class CreateSessionHandler extends BaseControlViewHandler { return null; } - /* - * (non-Javadoc) - * @see org.eclipse.core.commands.AbstractHandler#isEnabled() - */ @Override public boolean isEnabled() { diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/DeleteHandler.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/DeleteHandler.java index fa196e5787..8ef4676d3b 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/DeleteHandler.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/DeleteHandler.java @@ -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.handlers; @@ -20,7 +20,7 @@ import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceContr *

* Command handler implementation to delete a target host. *

- * + * * @author Bernd Hufmann */ public class DeleteHandler extends BaseNodeHandler { @@ -28,10 +28,7 @@ public class DeleteHandler extends BaseNodeHandler { // ------------------------------------------------------------------------ // Operations // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.handlers.BaseNodeHandler#execute(org.eclipse.core.commands.ExecutionEvent) - */ + @Override public Object execute(ExecutionEvent event) throws ExecutionException { fLock.lock(); @@ -46,10 +43,6 @@ public class DeleteHandler extends BaseNodeHandler { return null; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.handlers.BaseNodeHandler#isEnabled() - */ @Override public boolean isEnabled() { boolean isEnabled = false; diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/DestroySessionHandler.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/DestroySessionHandler.java index 24525042b9..3f250754ff 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/DestroySessionHandler.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/DestroySessionHandler.java @@ -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 @@ -55,10 +55,7 @@ public class DestroySessionHandler extends BaseControlViewHandler { // ------------------------------------------------------------------------ // Operations // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands.ExecutionEvent) - */ + @Override public Object execute(ExecutionEvent event) throws ExecutionException { @@ -103,10 +100,6 @@ public class DestroySessionHandler extends BaseControlViewHandler { return null; } - /* - * (non-Javadoc) - * @see org.eclipse.core.commands.AbstractHandler#isEnabled() - */ @Override public boolean isEnabled() { // Get workbench page for the Control View diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/DisableChannelHandler.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/DisableChannelHandler.java index 413e54383d..71c742280e 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/DisableChannelHandler.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/DisableChannelHandler.java @@ -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.handlers; @@ -22,7 +22,7 @@ import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceD *

* Command handler implementation to disable one or more trace channels per session and domain. *

- * + * * @author Bernd Hufmann */ public class DisableChannelHandler extends ChangeChannelStateHandler { @@ -30,10 +30,7 @@ public class DisableChannelHandler extends ChangeChannelStateHandler { // ------------------------------------------------------------------------ // Accessors // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.handlers.BaseChangeChannelStateHandler#getNewState() - */ + @Override protected TraceEnablement getNewState() { return TraceEnablement.DISABLED; @@ -42,10 +39,7 @@ public class DisableChannelHandler extends ChangeChannelStateHandler { // ------------------------------------------------------------------------ // Operations // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.handlers.BaseChangeChannelStateHandler#changeState(org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceDomainComponent, java.util.List, org.eclipse.core.runtime.IProgressMonitor) - */ + @Override protected void changeState(TraceDomainComponent domain, List channelNames, IProgressMonitor monitor) throws ExecutionException { domain.disableChannels(channelNames, monitor); diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/DisableEventHandler.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/DisableEventHandler.java index 5020bbd8de..bf578d4051 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/DisableEventHandler.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/DisableEventHandler.java @@ -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.handlers; @@ -22,7 +22,7 @@ import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceC *

* Command handler implementation to disable one or more events session, domain and channel. *

- * + * * @author Bernd Hufmann */ public class DisableEventHandler extends ChangeEventStateHandler { @@ -30,10 +30,7 @@ public class DisableEventHandler extends ChangeEventStateHandler { // ------------------------------------------------------------------------ // Accessors // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.handlers.ChangeEventStateHandler#getNewState() - */ + @Override protected TraceEnablement getNewState() { return TraceEnablement.DISABLED; @@ -42,12 +39,9 @@ public class DisableEventHandler extends ChangeEventStateHandler { // ------------------------------------------------------------------------ // Operations // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.handlers.ChangeEventStateHandler#changeState(org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceChannelComponent, java.util.List, org.eclipse.core.runtime.IProgressMonitor) - */ + @Override - protected void changeState(TraceChannelComponent channel, List eventNames, IProgressMonitor monitor) throws ExecutionException{ + protected void changeState(TraceChannelComponent channel, List eventNames, IProgressMonitor monitor) throws ExecutionException{ channel.disableEvent(eventNames, monitor); } } diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/DisconnectHandler.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/DisconnectHandler.java index f6129ee261..dc1c3d96b3 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/DisconnectHandler.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/DisconnectHandler.java @@ -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.handlers; @@ -19,7 +19,7 @@ import org.eclipse.linuxtools.internal.lttng2.core.control.model.TargetNodeState *

* Command handler implementation to disconnect from a target host. *

- * + * * @author Bernd Hufmann */ public class DisconnectHandler extends BaseNodeHandler { @@ -28,10 +28,6 @@ public class DisconnectHandler extends BaseNodeHandler { // Operations // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.handlers.BaseNodeHandler#execute(org.eclipse.core.commands.ExecutionEvent) - */ @Override public Object execute(ExecutionEvent event) throws ExecutionException { fLock.lock(); @@ -43,10 +39,6 @@ public class DisconnectHandler extends BaseNodeHandler { return null; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.handlers.BaseNodeHandler#isEnabled() - */ @Override public boolean isEnabled() { boolean isEnabled = false; diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/DomainCommandParameter.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/DomainCommandParameter.java index e7a90e428b..424734c746 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/DomainCommandParameter.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/DomainCommandParameter.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.handlers; @@ -16,7 +16,7 @@ import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceS /** * Class containing parameter for the command execution. - * + * * @author Bernd Hufmann */ public class DomainCommandParameter extends CommandParameter { @@ -52,15 +52,11 @@ public class DomainCommandParameter extends CommandParameter { public TraceDomainComponent getDomain() { return fDomain; } - + // ------------------------------------------------------------------------ // Operations // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see java.lang.Object#clone() - */ @Override public DomainCommandParameter clone() { DomainCommandParameter clone = (DomainCommandParameter) super.clone(); diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/EnableChannelHandler.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/EnableChannelHandler.java index a266386d93..ed9eef6f0f 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/EnableChannelHandler.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/EnableChannelHandler.java @@ -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.handlers; @@ -22,7 +22,7 @@ import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceD *

* Command handler implementation to enable one or more trace channels per session and domain. *

- * + * * @author Bernd Hufmann */ public class EnableChannelHandler extends ChangeChannelStateHandler { @@ -30,10 +30,7 @@ public class EnableChannelHandler extends ChangeChannelStateHandler { // ------------------------------------------------------------------------ // Accessors // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.handlers.BaseChangeChannelStateHandler#getNewState() - */ + @Override protected TraceEnablement getNewState() { return TraceEnablement.ENABLED; @@ -42,10 +39,7 @@ public class EnableChannelHandler extends ChangeChannelStateHandler { // ------------------------------------------------------------------------ // Operations // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.handlers.BaseChangeChannelStateHandler#changeState(org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceDomainComponent, java.util.List, org.eclipse.core.runtime.IProgressMonitor) - */ + @Override protected void changeState(TraceDomainComponent domain, List channelNames, IProgressMonitor monitor) throws ExecutionException { domain.enableChannels(channelNames, null, monitor); diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/EnableChannelOnDomainHandler.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/EnableChannelOnDomainHandler.java index 7cb1f38cb7..fdc750bab0 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/EnableChannelOnDomainHandler.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/EnableChannelOnDomainHandler.java @@ -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 @@ -41,10 +41,7 @@ public class EnableChannelOnDomainHandler extends BaseEnableChannelHandler { // ------------------------------------------------------------------------ // Operations // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.handlers.BaseCreateChannelHandler#enableChannel(org.eclipse.linuxtools.internal.lttng2.ui.views.control.handlers.CommandParameter, java.util.List, org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IChannelInfo, boolean, org.eclipse.core.runtime.IProgressMonitor) - */ + @Override public void enableChannel(CommandParameter param, List channelNames, IChannelInfo info, boolean isKernel, IProgressMonitor monitor) throws ExecutionException { if (param instanceof DomainCommandParameter) { @@ -52,10 +49,6 @@ public class EnableChannelOnDomainHandler extends BaseEnableChannelHandler { } } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.handlers.BaseCreateChannelHandler#getDomain(org.eclipse.linuxtools.internal.lttng2.ui.views.control.handlers.CommandParameter) - */ @Override public TraceDomainComponent getDomain(CommandParameter param) { if (param instanceof DomainCommandParameter) { @@ -64,10 +57,6 @@ public class EnableChannelOnDomainHandler extends BaseEnableChannelHandler { return null; } - /* - * (non-Javadoc) - * @see org.eclipse.core.commands.AbstractHandler#isEnabled() - */ @Override public boolean isEnabled() { diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/EnableChannelOnSessionHandler.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/EnableChannelOnSessionHandler.java index b4d43ab0f1..a57f4a7b1d 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/EnableChannelOnSessionHandler.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/EnableChannelOnSessionHandler.java @@ -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 @@ -38,19 +38,12 @@ public class EnableChannelOnSessionHandler extends BaseEnableChannelHandler { // ------------------------------------------------------------------------ // Attributes // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.handlers.BaseCreateChannelHandler#enableChannel(org.eclipse.linuxtools.internal.lttng2.ui.views.control.handlers.CommandParameter, java.util.List, org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IChannelInfo, boolean, org.eclipse.core.runtime.IProgressMonitor) - */ + @Override public void enableChannel(CommandParameter param, List channelNames, IChannelInfo info, boolean isKernel, IProgressMonitor monitor) throws ExecutionException { param.getSession().enableChannels(channelNames, info, isKernel, monitor); } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.handlers.BaseCreateChannelHandler#getDomain(org.eclipse.linuxtools.internal.lttng2.ui.views.control.handlers.CommandParameter) - */ @Override public TraceDomainComponent getDomain(CommandParameter param) { return null; @@ -60,10 +53,6 @@ public class EnableChannelOnSessionHandler extends BaseEnableChannelHandler { // Operations // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see org.eclipse.core.commands.AbstractHandler#isEnabled() - */ @Override public boolean isEnabled() { // Get workbench page for the Control View diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/EnableEventHandler.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/EnableEventHandler.java index 61aa27693a..9f52597e3e 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/EnableEventHandler.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/EnableEventHandler.java @@ -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.handlers; @@ -22,7 +22,7 @@ import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceC *

* Command handler implementation to enable one or more events session, domain and channel. *

- * + * * @author Bernd Hufmann */ public class EnableEventHandler extends ChangeEventStateHandler { @@ -30,10 +30,7 @@ public class EnableEventHandler extends ChangeEventStateHandler { // ------------------------------------------------------------------------ // Accessors // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.handlers.ChangeEventStateHandler#getNewState() - */ + @Override protected TraceEnablement getNewState() { return TraceEnablement.ENABLED; @@ -42,12 +39,9 @@ public class EnableEventHandler extends ChangeEventStateHandler { // ------------------------------------------------------------------------ // Operations // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.handlers.ChangeEventStateHandler#changeState(org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceChannelComponent, java.util.List, org.eclipse.core.runtime.IProgressMonitor) - */ + @Override - protected void changeState(TraceChannelComponent channel, List eventNames, IProgressMonitor monitor) throws ExecutionException{ + protected void changeState(TraceChannelComponent channel, List eventNames, IProgressMonitor monitor) throws ExecutionException{ channel.enableEvents(eventNames, monitor); } } diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/EnableEventOnChannelHandler.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/EnableEventOnChannelHandler.java index 21575940e9..af7ff751bd 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/EnableEventOnChannelHandler.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/EnableEventOnChannelHandler.java @@ -43,10 +43,7 @@ public class EnableEventOnChannelHandler extends BaseEnableEventHandler { // ------------------------------------------------------------------------ // Operations // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.handlers.BaseEnableEventHandler#enableEvents(org.eclipse.linuxtools.internal.lttng2.ui.views.control.handlers.CommandParameter, java.util.List, boolean, java.lang.String, org.eclipse.core.runtime.IProgressMonitor) - */ + @Override public void enableEvents(CommandParameter param, List eventNames, boolean isKernel, String filterExression, IProgressMonitor monitor) throws ExecutionException { if (param instanceof ChannelCommandParameter) { @@ -54,10 +51,6 @@ public class EnableEventOnChannelHandler extends BaseEnableEventHandler { } } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.handlers.BaseEnableEventHandler#enableSyscalls(org.eclipse.linuxtools.internal.lttng2.ui.views.control.handlers.CommandParameter, org.eclipse.core.runtime.IProgressMonitor) - */ @Override public void enableSyscalls(CommandParameter param, IProgressMonitor monitor) throws ExecutionException { if (param instanceof ChannelCommandParameter) { @@ -65,10 +58,6 @@ public class EnableEventOnChannelHandler extends BaseEnableEventHandler { } } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.handlers.BaseEnableEventHandler#enableProbe(org.eclipse.linuxtools.internal.lttng2.ui.views.control.handlers.CommandParameter, java.lang.String, boolean, java.lang.String, org.eclipse.core.runtime.IProgressMonitor) - */ @Override public void enableProbe(CommandParameter param, String eventName, boolean isFunction, String probe, IProgressMonitor monitor) throws ExecutionException { if (param instanceof ChannelCommandParameter) { @@ -76,10 +65,6 @@ public class EnableEventOnChannelHandler extends BaseEnableEventHandler { } } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.handlers.BaseEnableEventHandler#enableLogLevel(org.eclipse.linuxtools.internal.lttng2.ui.views.control.handlers.CommandParameter, java.lang.String, org.eclipse.linuxtools.internal.lttng2.core.control.model.LogLevelType, org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceLogLevel, java.lang.String, org.eclipse.core.runtime.IProgressMonitor) - */ @Override public void enableLogLevel(CommandParameter param, String eventName, LogLevelType logLevelType, TraceLogLevel level, String filterExression, IProgressMonitor monitor) throws ExecutionException { if (param instanceof ChannelCommandParameter) { @@ -87,10 +72,6 @@ public class EnableEventOnChannelHandler extends BaseEnableEventHandler { } } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.handlers.BaseEnableEventHandler#getDomain(org.eclipse.linuxtools.internal.lttng2.ui.views.control.handlers.CommandParameter) - */ @Override public TraceDomainComponent getDomain(CommandParameter param) { if (param instanceof ChannelCommandParameter) { @@ -99,10 +80,6 @@ public class EnableEventOnChannelHandler extends BaseEnableEventHandler { return null; } - /* - * (non-Javadoc) - * @see org.eclipse.core.commands.AbstractHandler#isEnabled() - */ @Override public boolean isEnabled() { // Get workbench page for the Control View diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/EnableEventOnDomainHandler.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/EnableEventOnDomainHandler.java index d7452cc3c3..623713058b 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/EnableEventOnDomainHandler.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/EnableEventOnDomainHandler.java @@ -37,17 +37,10 @@ import org.eclipse.ui.IWorkbenchPage; */ public class EnableEventOnDomainHandler extends BaseEnableEventHandler { - // ------------------------------------------------------------------------ - // Attributes - // ------------------------------------------------------------------------ - // ------------------------------------------------------------------------ // Operations // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.handlers.BaseEnableEventHandler#enableEvents(org.eclipse.linuxtools.internal.lttng2.ui.views.control.handlers.CommandParameter, java.util.List, boolean, java.lang.String, org.eclipse.core.runtime.IProgressMonitor) - */ + @Override public void enableEvents(CommandParameter param, List eventNames, boolean isKernel, String filterExression, IProgressMonitor monitor) throws ExecutionException { if (param instanceof DomainCommandParameter) { @@ -55,10 +48,6 @@ public class EnableEventOnDomainHandler extends BaseEnableEventHandler { } } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.handlers.BaseEnableEventHandler#enableSyscalls(org.eclipse.linuxtools.internal.lttng2.ui.views.control.handlers.CommandParameter, org.eclipse.core.runtime.IProgressMonitor) - */ @Override public void enableSyscalls(CommandParameter param, IProgressMonitor monitor) throws ExecutionException { if (param instanceof DomainCommandParameter) { @@ -66,10 +55,6 @@ public class EnableEventOnDomainHandler extends BaseEnableEventHandler { } } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.handlers.BaseEnableEventHandler#enableProbe(org.eclipse.linuxtools.internal.lttng2.ui.views.control.handlers.CommandParameter, java.lang.String, boolean, java.lang.String, org.eclipse.core.runtime.IProgressMonitor) - */ @Override public void enableProbe(CommandParameter param, String eventName, boolean isFunction, String probe, IProgressMonitor monitor) throws ExecutionException { if (param instanceof DomainCommandParameter) { @@ -77,10 +62,6 @@ public class EnableEventOnDomainHandler extends BaseEnableEventHandler { } } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.handlers.BaseEnableEventHandler#enableLogLevel(org.eclipse.linuxtools.internal.lttng2.ui.views.control.handlers.CommandParameter, java.lang.String, org.eclipse.linuxtools.internal.lttng2.core.control.model.LogLevelType, org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceLogLevel, java.lang.String, org.eclipse.core.runtime.IProgressMonitor) - */ @Override public void enableLogLevel(CommandParameter param, String eventName, LogLevelType logLevelType, TraceLogLevel level, String filterExression, IProgressMonitor monitor) throws ExecutionException { if (param instanceof DomainCommandParameter) { @@ -88,10 +69,6 @@ public class EnableEventOnDomainHandler extends BaseEnableEventHandler { } } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.handlers.BaseEnableEventHandler#getDomain(org.eclipse.linuxtools.internal.lttng2.ui.views.control.handlers.CommandParameter) - */ @Override public TraceDomainComponent getDomain(CommandParameter param) { if (param instanceof DomainCommandParameter) { @@ -100,10 +77,6 @@ public class EnableEventOnDomainHandler extends BaseEnableEventHandler { return null; } - /* - * (non-Javadoc) - * @see org.eclipse.core.commands.AbstractHandler#isEnabled() - */ @Override public boolean isEnabled() { // Get workbench page for the Control View diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/EnableEventOnSessionHandler.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/EnableEventOnSessionHandler.java index c291c756e9..bea127ae73 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/EnableEventOnSessionHandler.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/EnableEventOnSessionHandler.java @@ -44,55 +44,32 @@ public class EnableEventOnSessionHandler extends BaseEnableEventHandler { //------------------------------------------------------------------------- // Operations // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.handlers.BaseEnableEventHandler#enableEvents(org.eclipse.linuxtools.internal.lttng2.ui.views.control.handlers.CommandParameter, java.util.List, boolean, java.lang.String, org.eclipse.core.runtime.IProgressMonitor) - */ + @Override public void enableEvents(CommandParameter param, List eventNames, boolean isKernel, String filterExpression, IProgressMonitor monitor) throws ExecutionException { param.getSession().enableEvents(eventNames, isKernel, filterExpression, monitor); } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.handlers.BaseEnableEventHandler#enableSyscalls(org.eclipse.linuxtools.internal.lttng2.ui.views.control.handlers.CommandParameter, org.eclipse.core.runtime.IProgressMonitor) - */ @Override public void enableSyscalls(CommandParameter param, IProgressMonitor monitor) throws ExecutionException { param.getSession().enableSyscalls(monitor); } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.handlers.BaseEnableEventHandler#enableProbe(org.eclipse.linuxtools.internal.lttng2.ui.views.control.handlers.CommandParameter, java.lang.String, boolean, java.lang.String, org.eclipse.core.runtime.IProgressMonitor) - */ @Override public void enableProbe(CommandParameter param, String eventName, boolean isFunction, String probe, IProgressMonitor monitor) throws ExecutionException { param.getSession().enableProbe(eventName, isFunction, probe, monitor); } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.handlers.BaseEnableEventHandler#enableLogLevel(org.eclipse.linuxtools.internal.lttng2.ui.views.control.handlers.CommandParameter, java.lang.String, org.eclipse.linuxtools.internal.lttng2.core.control.model.LogLevelType, org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceLogLevel, java.lang.String, org.eclipse.core.runtime.IProgressMonitor) - */ @Override public void enableLogLevel(CommandParameter param, String eventName, LogLevelType logLevelType, TraceLogLevel level, String filterExpression, IProgressMonitor monitor) throws ExecutionException { param.getSession().enableLogLevel(eventName, logLevelType, level, filterExpression, monitor); } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.handlers.BaseEnableEventHandler#getDomain(org.eclipse.linuxtools.internal.lttng2.ui.views.control.handlers.CommandParameter) - */ @Override public TraceDomainComponent getDomain(CommandParameter param) { return null; } - /* - * (non-Javadoc) - * @see org.eclipse.core.commands.AbstractHandler#isEnabled() - */ @Override public boolean isEnabled() { // Get workbench page for the Control View diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/EventCommandParameter.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/EventCommandParameter.java index 56a9295332..e17f7a3ea9 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/EventCommandParameter.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/EventCommandParameter.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.handlers; @@ -16,7 +16,7 @@ import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceS /** * Class containing parameter for a command execution. - * + * * @author Bernd Hufmann */ public class EventCommandParameter extends CommandParameter { @@ -24,6 +24,7 @@ public class EventCommandParameter extends CommandParameter { // ------------------------------------------------------------------------ // Attributes // ------------------------------------------------------------------------ + private TraceEventComponent fEvent; // ------------------------------------------------------------------------ @@ -50,15 +51,11 @@ public class EventCommandParameter extends CommandParameter { public TraceEventComponent getEvent() { return fEvent; } - + // ------------------------------------------------------------------------ // Operations // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see java.lang.Object#clone() - */ @Override public EventCommandParameter clone() { EventCommandParameter clone = (EventCommandParameter) super.clone(); diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/ImportHandler.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/ImportHandler.java index 2be0125084..be6bc700ba 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/ImportHandler.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/ImportHandler.java @@ -63,18 +63,10 @@ public class ImportHandler extends BaseControlViewHandler { */ protected CommandParameter fParam; - // ------------------------------------------------------------------------ - // Accessors - // ------------------------------------------------------------------------ - // ------------------------------------------------------------------------ // Operations // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands.ExecutionEvent) - */ @Override public Object execute(ExecutionEvent event) throws ExecutionException { @@ -121,10 +113,6 @@ public class ImportHandler extends BaseControlViewHandler { return null; } - /* - * (non-Javadoc) - * @see org.eclipse.core.commands.AbstractHandler#isEnabled() - */ @Override public boolean isEnabled() { // Get workbench page for the Control View @@ -166,6 +154,7 @@ public class ImportHandler extends BaseControlViewHandler { // ------------------------------------------------------------------------ // Helper methods // ------------------------------------------------------------------------ + /** * Downloads a trace from the remote host to the given project. * 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 65e4f85a8e..3714354100 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 @@ -49,6 +49,7 @@ public class NewConnectionHandler extends BaseControlViewHandler { // ------------------------------------------------------------------------ // Constants // ------------------------------------------------------------------------ + /** * The trace control system type defined for LTTng version 2.0 and later. */ @@ -57,15 +58,12 @@ public class NewConnectionHandler extends BaseControlViewHandler { // ------------------------------------------------------------------------ // Attributes // ------------------------------------------------------------------------ + /** * The parent trace control component the new node will be added to. */ private ITraceControlComponent fRoot = null; - /* - * (non-Javadoc) - * @see org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands.ExecutionEvent) - */ @Override public Object execute(ExecutionEvent event) throws ExecutionException { assert (fRoot != null); @@ -169,10 +167,6 @@ public class NewConnectionHandler extends BaseControlViewHandler { return result.toArray(new IHost[result.size()]); } - /* - * (non-Javadoc) - * @see org.eclipse.core.commands.AbstractHandler#isEnabled() - */ @Override public boolean isEnabled() { diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/RefreshHandler.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/RefreshHandler.java index 43eb113170..9ef25181aa 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/RefreshHandler.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/RefreshHandler.java @@ -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 @@ -35,6 +35,7 @@ public class RefreshHandler extends BaseControlViewHandler { // ------------------------------------------------------------------------ // Attributes // ------------------------------------------------------------------------ + /** * The node component reference. */ @@ -44,10 +45,6 @@ public class RefreshHandler extends BaseControlViewHandler { // Operations // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands.ExecutionEvent) - */ @Override public Object execute(ExecutionEvent event) throws ExecutionException { fLock.lock(); @@ -59,10 +56,6 @@ public class RefreshHandler extends BaseControlViewHandler { return null; } - /* - * (non-Javadoc) - * @see org.eclipse.core.commands.AbstractHandler#isEnabled() - */ @Override public boolean isEnabled() { diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/StartHandler.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/StartHandler.java index 4722163534..1ab751488c 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/StartHandler.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/StartHandler.java @@ -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.handlers; @@ -20,7 +20,7 @@ import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceS *

* Command handler implementation to start one or more trace sessions. *

- * + * * @author Bernd Hufmann */ public class StartHandler extends ChangeSessionStateHandler { @@ -28,22 +28,16 @@ public class StartHandler extends ChangeSessionStateHandler { // ------------------------------------------------------------------------ // Accessors // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.handlers.ChangeSessionStateHandler#getNewState() - */ + @Override public TraceSessionState getNewState() { return TraceSessionState.ACTIVE; } - + // ------------------------------------------------------------------------ // Operations // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.handlers.ChangeSessionStateHandler#changeState(org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceSessionComponent, org.eclipse.core.runtime.IProgressMonitor) - */ + @Override public void changeState(TraceSessionComponent session, IProgressMonitor monitor) throws ExecutionException { session.startSession(monitor); diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/StopHandler.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/StopHandler.java index 8db9d33890..14ea6035c7 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/StopHandler.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/StopHandler.java @@ -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.handlers; @@ -20,7 +20,7 @@ import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceS *

* Command handler implementation to stop one or more trace sessions. *

- * + * * @author Bernd Hufmann */ public class StopHandler extends ChangeSessionStateHandler { @@ -28,22 +28,16 @@ public class StopHandler extends ChangeSessionStateHandler { // ------------------------------------------------------------------------ // Accessors // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.handlers.ChangeSessionStateHandler#getNewState() - */ + @Override public TraceSessionState getNewState() { return TraceSessionState.INACTIVE; } - + // ------------------------------------------------------------------------ // Operations // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.handlers.ChangeSessionStateHandler#changeState(org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceSessionComponent, org.eclipse.core.runtime.IProgressMonitor) - */ + @Override public void changeState(TraceSessionComponent session, IProgressMonitor monitor) throws ExecutionException { session.stopSession(monitor); diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/BaseEventComponent.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/BaseEventComponent.java index efc3f1c7b0..b9ecc27fba 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/BaseEventComponent.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/BaseEventComponent.java @@ -137,10 +137,6 @@ public class BaseEventComponent extends TraceControlComponent { return null; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceControlComponent#getAdapter(java.lang.Class) - */ @Override public Object getAdapter(Class adapter) { if (adapter == IPropertySource.class) { diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/KernelProviderComponent.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/KernelProviderComponent.java index 3c0b342b38..de54fb6571 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/KernelProviderComponent.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/KernelProviderComponent.java @@ -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 @@ -33,18 +33,16 @@ public class KernelProviderComponent extends TraceControlComponent { // ------------------------------------------------------------------------ // Constants // ------------------------------------------------------------------------ + /** * Path to icon file for this component. */ public static final String KERNEL_PROVIDER_ICON_FILE = "icons/obj16/targets.gif"; //$NON-NLS-1$ - // ------------------------------------------------------------------------ - // Attributes - // ------------------------------------------------------------------------ - // ------------------------------------------------------------------------ // Constructors // ------------------------------------------------------------------------ + /** * Constructor * @param name - the name of the component. @@ -59,6 +57,7 @@ public class KernelProviderComponent extends TraceControlComponent { // ------------------------------------------------------------------------ // Accessors // ------------------------------------------------------------------------ + /** * Sets the events information for this component. * @param eventInfos - events information to set. @@ -72,10 +71,6 @@ public class KernelProviderComponent extends TraceControlComponent { } } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceControlComponent#getAdapter(java.lang.Class) - */ @Override public Object getAdapter(Class adapter) { if (adapter == IPropertySource.class) { @@ -84,8 +79,4 @@ public class KernelProviderComponent extends TraceControlComponent { return null; } - // ------------------------------------------------------------------------ - // Operations - // ------------------------------------------------------------------------ - } diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TargetNodeComponent.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TargetNodeComponent.java index 907390d70b..5b01e7b291 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TargetNodeComponent.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TargetNodeComponent.java @@ -53,6 +53,7 @@ public class TargetNodeComponent extends TraceControlComponent implements ICommu // ------------------------------------------------------------------------ // Constants // ------------------------------------------------------------------------ + /** * Path to icon file for this component (state connected). */ @@ -65,6 +66,7 @@ public class TargetNodeComponent extends TraceControlComponent implements ICommu // ------------------------------------------------------------------------ // Attributes // ------------------------------------------------------------------------ + /** * The node connection state. */ @@ -93,6 +95,7 @@ public class TargetNodeComponent extends TraceControlComponent implements ICommu // ------------------------------------------------------------------------ // Constructors // ------------------------------------------------------------------------ + /** * Constructor * @param name - the name of the component @@ -122,10 +125,7 @@ public class TargetNodeComponent extends TraceControlComponent implements ICommu // ------------------------------------------------------------------------ // Accessors // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceControlComponent#getImage() - */ + @Override public Image getImage() { if (fState == TargetNodeState.CONNECTED) { @@ -134,47 +134,27 @@ public class TargetNodeComponent extends TraceControlComponent implements ICommu return fDisconnectedImage; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceControlComponent#getTargetNodeState() - */ @Override public TargetNodeState getTargetNodeState() { return fState; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceControlComponent#setTargetNodeState(org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent.TargetNodeState) - */ @Override public void setTargetNodeState(TargetNodeState state) { fState = state; fireComponentChanged(TargetNodeComponent.this); } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceControlComponent#getControlService() - */ @Override public ILttngControlService getControlService() { return fService; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceControlComponent#setControlService(org.eclipse.linuxtools.internal.lttng2.ui.views.control.service.ILttngControlService) - */ @Override public void setControlService(ILttngControlService service) { fService = service; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceControlComponent#getAdapter(java.lang.Class) - */ @Override public Object getAdapter(Class adapter) { if (adapter == IPropertySource.class) { @@ -257,9 +237,6 @@ public class TargetNodeComponent extends TraceControlComponent implements ICommu // Operations // ------------------------------------------------------------------------ - /* - * @see org.eclipse.rse.core.subsystems.ICommunicationsListener#communicationsStateChange(org.eclipse.rse.core.subsystems.CommunicationsEvent) - */ @Override public void communicationsStateChange(CommunicationsEvent e) { if (e.getState() == CommunicationsEvent.AFTER_DISCONNECT || @@ -270,18 +247,11 @@ public class TargetNodeComponent extends TraceControlComponent implements ICommu } } - /* (non-Javadoc) - * @see org.eclipse.rse.core.subsystems.ICommunicationsListener#isPassiveCommunicationsListener() - */ @Override public boolean isPassiveCommunicationsListener() { return true; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.TraceControlComponent#dispose() - */ @Override public void dispose() { fRemoteProxy.removeCommunicationListener(this); @@ -378,6 +348,7 @@ public class TargetNodeComponent extends TraceControlComponent implements ICommu // ------------------------------------------------------------------------ // Helper function // ------------------------------------------------------------------------ + /** * @return returns the control service for LTTng specific commands. * @throws ExecutionException 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 484c2b8713..2be087ac39 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 @@ -40,9 +40,11 @@ import org.eclipse.ui.views.properties.IPropertySource; * @author Bernd Hufmann */ public class TraceChannelComponent extends TraceControlComponent { + // ------------------------------------------------------------------------ // Constants // ------------------------------------------------------------------------ + /** * Path to icon file for this component (state enabled). */ @@ -55,6 +57,7 @@ public class TraceChannelComponent extends TraceControlComponent { // ------------------------------------------------------------------------ // Attributes // ------------------------------------------------------------------------ + /** * The channel information. */ @@ -67,6 +70,7 @@ public class TraceChannelComponent extends TraceControlComponent { // ------------------------------------------------------------------------ // Constructors // ------------------------------------------------------------------------ + /** * Constructor * @param name - the name of the component. @@ -83,10 +87,7 @@ public class TraceChannelComponent extends TraceControlComponent { // ------------------------------------------------------------------------ // Accessors // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceControlComponent#getImage() - */ + @Override public Image getImage() { if (fChannelInfo.getState() == TraceEnablement.DISABLED) { @@ -220,10 +221,7 @@ public class TraceChannelComponent extends TraceControlComponent { public void setState(String stateName) { fChannelInfo.setState(stateName); } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceControlComponent#getAdapter(java.lang.Class) - */ + @Override public Object getAdapter(Class adapter) { if (adapter == IPropertySource.class) { diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TraceControlComponent.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TraceControlComponent.java index 5154d4b010..823ae10007 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TraceControlComponent.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TraceControlComponent.java @@ -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 @@ -89,73 +89,42 @@ public class TraceControlComponent implements ITraceControlComponent { // ------------------------------------------------------------------------ // Accessors // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent#getName() - */ + @Override public String getName() { return fName; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent#setName(java.lang.String) - */ @Override public void setName(String name) { fName = name; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent#getImage() - */ @Override public Image getImage() { return fImage; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent#setImage(java.lang.String) - */ @Override public void setImage(String path) { fImage = Activator.getDefault().loadIcon(path); } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent#setImage(org.eclipse.swt.graphics.Image) - */ @Override public void setImage(Image image) { fImage = image; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent#getToolTip() - */ @Override public String getToolTip() { return fToolTip; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent#setToolTip(java.lang.String) - */ @Override public void setToolTip(String toolTip) { fToolTip = toolTip; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent#getTargetNodeState() - */ @Override public TargetNodeState getTargetNodeState() { if (getParent() != null) { @@ -164,10 +133,6 @@ public class TraceControlComponent implements ITraceControlComponent { return TargetNodeState.DISCONNECTED; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent#setTargetNodeState(org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent.TargetNodeState) - */ @Override public void setTargetNodeState(TargetNodeState state) { if (getParent() != null) { @@ -175,36 +140,21 @@ public class TraceControlComponent implements ITraceControlComponent { } } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent#getParent() - */ @Override public ITraceControlComponent getParent() { return fParent; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent#setParent(org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent) - */ @Override public void setParent(ITraceControlComponent parent) { fParent = parent; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent#getChildren() - */ @Override public ITraceControlComponent[] getChildren() { return fChildren.toArray(new ITraceControlComponent[fChildren.size()]); } - /* - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponents#etChildren(java.util.List) - */ @Override public void setChildren(List children) { for (Iterator iterator = children.iterator(); iterator.hasNext();) { @@ -214,10 +164,6 @@ public class TraceControlComponent implements ITraceControlComponent { } } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent#getChild(java.lang.String) - */ @Override public ITraceControlComponent getChild(String name) { ITraceControlComponent child = null; @@ -229,10 +175,7 @@ public class TraceControlComponent implements ITraceControlComponent { } return child; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent#getChildren(java.lang.Class) - */ + @Override public List getChildren(Class clazz) { List list = new ArrayList(); @@ -246,10 +189,6 @@ public class TraceControlComponent implements ITraceControlComponent { return list; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent#getControlService() - */ @Override public ILttngControlService getControlService() { if (getParent() != null) { @@ -258,10 +197,6 @@ public class TraceControlComponent implements ITraceControlComponent { return null; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent#setControlService(org.eclipse.linuxtools.internal.lttng2.ui.views.control.service.ILttngControlService) - */ @Override public void setControlService(ILttngControlService service) { if (getParent() != null) { @@ -272,19 +207,12 @@ public class TraceControlComponent implements ITraceControlComponent { // ------------------------------------------------------------------------ // Operations // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent#dispose() - */ + @Override public void dispose() { // default implementation } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent#addChild(org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent) - */ @Override public void addChild(ITraceControlComponent component) { if (component != null) { @@ -293,10 +221,6 @@ public class TraceControlComponent implements ITraceControlComponent { fireComponentAdded(this, component); } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent#removeChild(org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent) - */ @Override public void removeChild(ITraceControlComponent component) { if (component != null) { @@ -306,10 +230,6 @@ public class TraceControlComponent implements ITraceControlComponent { fireComponentRemoved(this, component); } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent#removeAllChildren() - */ @Override public void removeAllChildren() { for (Iterator iterator = fChildren.iterator(); iterator.hasNext();) { @@ -320,10 +240,6 @@ public class TraceControlComponent implements ITraceControlComponent { // fireCompenentChanged(this); } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent#containsChild(java.lang.String) - */ @Override public boolean containsChild(String name) { boolean retValue = false; @@ -336,19 +252,11 @@ public class TraceControlComponent implements ITraceControlComponent { return retValue; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent#hasChildren() - */ @Override public boolean hasChildren() { return !fChildren.isEmpty(); } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent#addComponentListener(org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponentChangedListener) - */ @Override public void addComponentListener(ITraceControlComponentChangedListener listener) { if (fParent != null) { @@ -358,10 +266,6 @@ public class TraceControlComponent implements ITraceControlComponent { } } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent#removeComponentListener(org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponentChangedListener) - */ @Override public void removeComponentListener(ITraceControlComponentChangedListener listener) { if (fParent != null) { @@ -371,10 +275,6 @@ public class TraceControlComponent implements ITraceControlComponent { } } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent#fireCompenentAdded(org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent, org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent) - */ @Override public void fireComponentAdded(ITraceControlComponent parent, ITraceControlComponent component) { if (component == null) { @@ -392,10 +292,6 @@ public class TraceControlComponent implements ITraceControlComponent { } } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent#fireCompenentRemoved(org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent, org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent) - */ @Override public void fireComponentRemoved(ITraceControlComponent parent, ITraceControlComponent component) { if (component == null) { @@ -413,10 +309,6 @@ public class TraceControlComponent implements ITraceControlComponent { } } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent#fireCompenentChanged(org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceControlComponent) - */ @Override public void fireComponentChanged(ITraceControlComponent component) { if (component == null) { @@ -434,10 +326,6 @@ public class TraceControlComponent implements ITraceControlComponent { } } - /* - * (non-Javadoc) - * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class) - */ @Override public Object getAdapter(Class adapter) { return null; diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TraceControlContentProvider.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TraceControlContentProvider.java index 87ac1dfe17..6ad0cc881b 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TraceControlContentProvider.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TraceControlContentProvider.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; @@ -19,55 +19,37 @@ import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.ITraceContr *

* Tree content provider implementation for trace control view. *

- * + * * @author Bernd Hufmann */ public class TraceControlContentProvider implements ITreeContentProvider { + // ------------------------------------------------------------------------ // Operations // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see org.eclipse.jface.viewers.IContentProvider#dispose() - */ + @Override public void dispose() { } - /* - * (non-Javadoc) - * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object) - */ @Override public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { } - /* - * (non-Javadoc) - * @see org.eclipse.jface.viewers.ITreeContentProvider#getElements(java.lang.Object) - */ @Override public Object[] getElements(Object inputElement) { return getChildren(inputElement); } - /* - * (non-Javadoc) - * @see org.eclipse.jface.viewers.ITreeContentProvider#getChildren(java.lang.Object) - */ @Override public Object[] getChildren(Object parentElement) { - + if (parentElement instanceof ITraceControlComponent) { return ((ITraceControlComponent)parentElement).getChildren(); } return new Object[0]; } - /* - * (non-Javadoc) - * @see org.eclipse.jface.viewers.ITreeContentProvider#getParent(java.lang.Object) - */ @Override public Object getParent(Object element) { if (element instanceof ITraceControlComponent) { @@ -76,10 +58,6 @@ public class TraceControlContentProvider implements ITreeContentProvider { return null; } - /* - * (non-Javadoc) - * @see org.eclipse.jface.viewers.ITreeContentProvider#hasChildren(java.lang.Object) - */ @Override public boolean hasChildren(Object element) { if (element instanceof ITraceControlComponent) { diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TraceControlLabelProvider.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TraceControlLabelProvider.java index bcad582765..fa97c94451 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TraceControlLabelProvider.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TraceControlLabelProvider.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; @@ -19,7 +19,7 @@ import org.eclipse.swt.graphics.Image; *

* Label provider for trace control tree viewer. *

- * + * * @author Bernd Hufmann */ public class TraceControlLabelProvider extends ColumnLabelProvider { @@ -27,9 +27,7 @@ public class TraceControlLabelProvider extends ColumnLabelProvider { // ------------------------------------------------------------------------ // Operations // ------------------------------------------------------------------------ - /* (non-Javadoc) - * @see org.eclipse.jface.viewers.ILabelProvider#getImage(java.lang.Object) - */ + @Override public Image getImage(Object element) { if ((element != null) && (element instanceof ITraceControlComponent)) { @@ -38,9 +36,6 @@ public class TraceControlLabelProvider extends ColumnLabelProvider { return null; } - /* (non-Javadoc) - * @see org.eclipse.jface.viewers.ILabelProvider#getText(java.lang.Object) - */ @Override public String getText(Object element) { if ((element != null) && (element instanceof ITraceControlComponent)) { @@ -49,10 +44,6 @@ public class TraceControlLabelProvider extends ColumnLabelProvider { return "";//$NON-NLS-1$ } - /* - * (non-Javadoc) - * @see org.eclipse.jface.viewers.CellLabelProvider#getToolTipText(java.lang.Object) - */ @Override public String getToolTipText(Object element) { if ((element != null) && (element instanceof ITraceControlComponent)) { diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TraceDomainComponent.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TraceDomainComponent.java index 54b20a59f5..6db060992f 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TraceDomainComponent.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TraceDomainComponent.java @@ -82,10 +82,6 @@ public class TraceDomainComponent extends TraceControlComponent { } } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceControlComponent#getAdapter(java.lang.Class) - */ @Override public Object getAdapter(Class adapter) { if (adapter == IPropertySource.class) { diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TraceEventComponent.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TraceEventComponent.java index a5aad23157..e7ffbc702d 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TraceEventComponent.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TraceEventComponent.java @@ -80,10 +80,7 @@ public class TraceEventComponent extends TraceControlComponent { // ------------------------------------------------------------------------ // Accessors // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceControlComponent#getImage() - */ + @Override public Image getImage() { if (fEventInfo.getState() == TraceEnablement.DISABLED) { @@ -185,10 +182,6 @@ public class TraceEventComponent extends TraceControlComponent { fEventInfo.setFilterExpression(filter); } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceControlComponent#getAdapter(java.lang.Class) - */ @Override public Object getAdapter(Class adapter) { if (adapter == IPropertySource.class) { diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TraceProbeEventComponent.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TraceProbeEventComponent.java index b6c2028350..a361e9099a 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TraceProbeEventComponent.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TraceProbeEventComponent.java @@ -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 @@ -64,10 +64,6 @@ public class TraceProbeEventComponent extends TraceEventComponent { throw new IllegalArgumentException("Invalid type passed. Only class of type ProbeEventInfo allowed:\n" + eventInfo.getClass()); //$NON-NLS-1$ } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceControlComponent#getAdapter(java.lang.Class) - */ @Override public Object getAdapter(Class adapter) { if (adapter == IPropertySource.class) { diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TraceSessionComponent.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TraceSessionComponent.java index 698d4842cc..86de1fa590 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TraceSessionComponent.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/TraceSessionComponent.java @@ -95,10 +95,7 @@ public class TraceSessionComponent extends TraceControlComponent { // ------------------------------------------------------------------------ // Accessors // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceControlComponent#getImage() - */ + @Override public Image getImage() { if (fIsDestroyed) { @@ -181,10 +178,6 @@ public class TraceSessionComponent extends TraceControlComponent { fSessionInfo.setStreamedTrace(isStreamedTrace); } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceControlComponent#getAdapter(java.lang.Class) - */ @Override public Object getAdapter(Class adapter) { if (adapter == IPropertySource.class) { diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/UstProviderComponent.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/UstProviderComponent.java index 86f2ea0ab5..c44015d11a 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/UstProviderComponent.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/model/impl/UstProviderComponent.java @@ -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 @@ -93,10 +93,6 @@ public class UstProviderComponent extends TraceControlComponent { fProviderInfo.setPid(pid); } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceControlComponent#getAdapter(java.lang.Class) - */ @Override public Object getAdapter(Class adapter) { if (adapter == IPropertySource.class) { @@ -105,10 +101,4 @@ public class UstProviderComponent extends TraceControlComponent { return null; } - // ------------------------------------------------------------------------ - // Operations - // ------------------------------------------------------------------------ - } - - diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/preferences/ControlPreferenceInitializer.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/preferences/ControlPreferenceInitializer.java index a317e63862..85d27ea51c 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/preferences/ControlPreferenceInitializer.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/preferences/ControlPreferenceInitializer.java @@ -22,10 +22,7 @@ import org.eclipse.jface.preference.IPreferenceStore; * @author Bernd Hufmann */ public class ControlPreferenceInitializer extends AbstractPreferenceInitializer { - /* - * (non-Javadoc) - * @see org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer#initializeDefaultPreferences() - */ + @Override public void initializeDefaultPreferences() { final IPreferenceStore store = ControlPreferences.getInstance().getPreferenceStore(); 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 98ab40da72..12eca09f25 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 @@ -57,18 +57,11 @@ public class ControlPreferencePage extends FieldEditorPreferencePage implements // ------------------------------------------------------------------------ // Operations // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see org.eclipse.ui.IWorkbenchPreferencePage#init(org.eclipse.ui.IWorkbench) - */ + @Override public void init(IWorkbench workbench) { } - /* - * (non-Javadoc) - * @see org.eclipse.jface.preference.FieldEditorPreferencePage#createFieldEditors() - */ @Override protected void createFieldEditors() { @@ -121,10 +114,6 @@ public class ControlPreferencePage extends FieldEditorPreferencePage implements addField(commandTimeout); } - /* - * (non-Javadoc) - * @see org.eclipse.jface.preference.FieldEditorPreferencePage#propertyChange(org.eclipse.jface.util.PropertyChangeEvent) - */ @Override public void propertyChange(PropertyChangeEvent event) { @@ -141,10 +130,6 @@ public class ControlPreferencePage extends FieldEditorPreferencePage implements super.propertyChange(event); } - /* - * (non-Javadoc) - * @see org.eclipse.jface.preference.FieldEditorPreferencePage#performDefaults() - */ @Override protected void performDefaults() { super.performDefaults(); @@ -152,10 +137,6 @@ public class ControlPreferencePage extends FieldEditorPreferencePage implements fIsAppend.setEnabled(false, getFieldEditorParent()); } - /* - * (non-Javadoc) - * @see org.eclipse.jface.preference.FieldEditorPreferencePage#performOk() - */ @Override public boolean performOk() { boolean ret = super.performOk(); diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/BaseEventPropertySource.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/BaseEventPropertySource.java index 2a76dc9fa8..1021bf8041 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/BaseEventPropertySource.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/BaseEventPropertySource.java @@ -89,10 +89,7 @@ public class BaseEventPropertySource extends BasePropertySource { // ------------------------------------------------------------------------ // Operations // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.property.BasePropertySource#getPropertyDescriptors() - */ + @Override public IPropertyDescriptor[] getPropertyDescriptors() { List list = new ArrayList (); @@ -107,10 +104,6 @@ public class BaseEventPropertySource extends BasePropertySource { return list.toArray(new IPropertyDescriptor[list.size()]); } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.property.BasePropertySource#getPropertyValue(java.lang.Object) - */ @Override public Object getPropertyValue(Object id) { if(BASE_EVENT_NAME_PROPERTY_ID.equals(id)) { 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 87fb40b7ea..f27f27e354 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 @@ -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.property; @@ -18,7 +18,7 @@ import org.eclipse.ui.views.properties.IPropertySource; *

* Base property source implementation. *

- * + * * @author Bernd Hufmann */ abstract public class BasePropertySource implements IPropertySource { @@ -26,50 +26,27 @@ abstract public class BasePropertySource implements IPropertySource { // ------------------------------------------------------------------------ // Operations // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see org.eclipse.ui.views.properties.IPropertySource#getEditableValue() - */ + @Override public Object getEditableValue() { return null; } - /* - * (non-Javadoc) - * @see org.eclipse.ui.views.properties.IPropertySource#getPropertyDescriptors() - */ @Override abstract public IPropertyDescriptor[] getPropertyDescriptors(); - /* - * (non-Javadoc) - * @see org.eclipse.ui.views.properties.IPropertySource#getPropertyValue(java.lang.Object) - */ @Override abstract public Object getPropertyValue(Object id); - /* - * (non-Javadoc) - * @see org.eclipse.ui.views.properties.IPropertySource#isPropertySet(java.lang.Object) - */ @Override public boolean isPropertySet(Object id) { return false; } - /* - * (non-Javadoc) - * @see org.eclipse.ui.views.properties.IPropertySource#resetPropertyValue(java.lang.Object) - */ @Override public void resetPropertyValue(Object id) { } - /* - * (non-Javadoc) - * @see org.eclipse.ui.views.properties.IPropertySource#setPropertyValue(java.lang.Object, java.lang.Object) - */ @Override public void setPropertyValue(Object id, Object value) { } diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/KernelProviderPropertySource.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/KernelProviderPropertySource.java index fb9d2eb92b..d093967456 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/KernelProviderPropertySource.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/KernelProviderPropertySource.java @@ -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 @@ -28,6 +28,7 @@ public class KernelProviderPropertySource extends BasePropertySource { // ------------------------------------------------------------------------ // Constants // ------------------------------------------------------------------------ + /** * The kernel provider 'name' property ID. */ @@ -40,6 +41,7 @@ public class KernelProviderPropertySource extends BasePropertySource { // ------------------------------------------------------------------------ // Attributes // ------------------------------------------------------------------------ + /** * The kernel provider component which this property source is for. */ @@ -48,6 +50,7 @@ public class KernelProviderPropertySource extends BasePropertySource { // ------------------------------------------------------------------------ // Constructors // ------------------------------------------------------------------------ + /** * Constructor * @param component - the kernel provider component @@ -59,20 +62,13 @@ public class KernelProviderPropertySource extends BasePropertySource { // ------------------------------------------------------------------------ // Operations // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.property.BasePropertySource#getPropertyDescriptors() - */ + @Override public IPropertyDescriptor[] getPropertyDescriptors() { return new IPropertyDescriptor[] { new ReadOnlyTextPropertyDescriptor(KERNEL_PROVIDER_NAME_PROPERTY_ID, KERNEL_PROVIDER_NAME_PROPERTY_NAME)}; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.property.BasePropertySource#getPropertyValue(java.lang.Object) - */ @Override public Object getPropertyValue(Object id) { if(KERNEL_PROVIDER_NAME_PROPERTY_ID.equals(id)) { diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/TargetNodePropertySource.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/TargetNodePropertySource.java index 656f4f20b7..a4c586d86e 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/TargetNodePropertySource.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/TargetNodePropertySource.java @@ -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 @@ -84,10 +84,7 @@ public class TargetNodePropertySource extends BasePropertySource { // ------------------------------------------------------------------------ // Operations // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.property.BasePropertySource#getPropertyDescriptors() - */ + @Override public IPropertyDescriptor[] getPropertyDescriptors() { return new IPropertyDescriptor[] { @@ -97,10 +94,6 @@ public class TargetNodePropertySource extends BasePropertySource { new ReadOnlyTextPropertyDescriptor(TARGET_NODE_VERSION_PROPERTY_ID, TARGET_NODE_VERSION_PROPERTY_NAME)}; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.property.BasePropertySource#getPropertyValue(java.lang.Object) - */ @Override public Object getPropertyValue(Object id) { if(TARGET_NODE_NAME_PROPERTY_ID.equals(id)) { diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/TraceChannelPropertySource.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/TraceChannelPropertySource.java index ef1a2c52a8..f6eb24ca0d 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/TraceChannelPropertySource.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/TraceChannelPropertySource.java @@ -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 @@ -116,10 +116,6 @@ public class TraceChannelPropertySource extends BasePropertySource { // Operations // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.property.BasePropertySource#getPropertyDescriptors() - */ @Override public IPropertyDescriptor[] getPropertyDescriptors() { return new IPropertyDescriptor[] { @@ -133,10 +129,6 @@ public class TraceChannelPropertySource extends BasePropertySource { new ReadOnlyTextPropertyDescriptor(TRACE_CHANNEL_OUTPUT_TYPE_PROPERTY_ID, TRACE_CHANNEL_OUTPUT_TYPEPROPERTY_NAME)}; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.property.BasePropertySource#getPropertyValue(java.lang.Object) - */ @Override public Object getPropertyValue(Object id) { if(TRACE_CHANNEL_NAME_PROPERTY_ID.equals(id)) { diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/TraceDomainPropertySource.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/TraceDomainPropertySource.java index 37e585787b..8e5de7f7a7 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/TraceDomainPropertySource.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/TraceDomainPropertySource.java @@ -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 @@ -41,6 +41,7 @@ public class TraceDomainPropertySource extends BasePropertySource { // ------------------------------------------------------------------------ // Attributes // ------------------------------------------------------------------------ + /** * The trace domain component which this property source is for. */ @@ -49,6 +50,7 @@ public class TraceDomainPropertySource extends BasePropertySource { // ------------------------------------------------------------------------ // Constructors // ------------------------------------------------------------------------ + /** * Constructor * @param component - the trace domain component @@ -60,20 +62,13 @@ public class TraceDomainPropertySource extends BasePropertySource { // ------------------------------------------------------------------------ // Operations // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.property.BasePropertySource#getPropertyDescriptors() - */ + @Override public IPropertyDescriptor[] getPropertyDescriptors() { return new IPropertyDescriptor[] { new ReadOnlyTextPropertyDescriptor(TRACE_DOMAIN_NAME_PROPERTY_ID, TRACE_DOMAIN_NAME_PROPERTY_NAME)}; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.property.BasePropertySource#getPropertyValue(java.lang.Object) - */ @Override public Object getPropertyValue(Object id) { if(TRACE_DOMAIN_NAME_PROPERTY_ID.equals(id)) { diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/TraceEventPropertySource.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/TraceEventPropertySource.java index 911a40b7ce..51f3d14e2c 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/TraceEventPropertySource.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/TraceEventPropertySource.java @@ -78,6 +78,7 @@ public class TraceEventPropertySource extends BasePropertySource { // ------------------------------------------------------------------------ // Attributes // ------------------------------------------------------------------------ + /** * The event component which this property source is for. */ @@ -86,6 +87,7 @@ public class TraceEventPropertySource extends BasePropertySource { // ------------------------------------------------------------------------ // Constructors // ------------------------------------------------------------------------ + /** * Constructor * @param component - the base event component @@ -97,10 +99,7 @@ public class TraceEventPropertySource extends BasePropertySource { // ------------------------------------------------------------------------ // Operations // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.property.BasePropertySource#getPropertyDescriptors() - */ + @Override public IPropertyDescriptor[] getPropertyDescriptors() { List list = new ArrayList (); @@ -116,10 +115,6 @@ public class TraceEventPropertySource extends BasePropertySource { return list.toArray(new IPropertyDescriptor[list.size()]); } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.property.BasePropertySource#getPropertyValue(java.lang.Object) - */ @Override public Object getPropertyValue(Object id) { if(TRACE_EVENT_NAME_PROPERTY_ID.equals(id)) { diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/TraceProbeEventPropertySource.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/TraceProbeEventPropertySource.java index 3bcf2685f7..4f07ff9c70 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/TraceProbeEventPropertySource.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/TraceProbeEventPropertySource.java @@ -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 @@ -82,10 +82,7 @@ public class TraceProbeEventPropertySource extends TraceEventPropertySource { // ------------------------------------------------------------------------ // Operations // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.property.BasePropertySource#getPropertyDescriptors() - */ + @Override public IPropertyDescriptor[] getPropertyDescriptors() { IPropertyDescriptor[] superProperties = super.getPropertyDescriptors(); @@ -111,10 +108,6 @@ public class TraceProbeEventPropertySource extends TraceEventPropertySource { return list.toArray(new IPropertyDescriptor[list.size()]); } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.property.BasePropertySource#getPropertyValue(java.lang.Object) - */ @Override public Object getPropertyValue(Object id) { if(TRACE_EVENT_PROBE_ADDRESS_PROPERTY_ID.equals(id)) { diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/TraceSessionPropertySource.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/TraceSessionPropertySource.java index 44a768bed7..ef6cab6325 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/TraceSessionPropertySource.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/TraceSessionPropertySource.java @@ -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 @@ -56,6 +56,7 @@ public class TraceSessionPropertySource extends BasePropertySource { // ------------------------------------------------------------------------ // Attributes // ------------------------------------------------------------------------ + /** * The session component which this property source is for. */ @@ -64,6 +65,7 @@ public class TraceSessionPropertySource extends BasePropertySource { // ------------------------------------------------------------------------ // Constructors // ------------------------------------------------------------------------ + /** * Constructor * @param component - the session component @@ -75,10 +77,7 @@ public class TraceSessionPropertySource extends BasePropertySource { // ------------------------------------------------------------------------ // Operations // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see org.eclipse.ui.views.properties.IPropertySource#getPropertyDescriptors() - */ + @Override public IPropertyDescriptor[] getPropertyDescriptors() { return new IPropertyDescriptor[] { @@ -87,10 +86,6 @@ public class TraceSessionPropertySource extends BasePropertySource { new ReadOnlyTextPropertyDescriptor(TRACE_SESSION_STATE_PROPERTY_ID, TRACE_SESSION_STATE_PROPERTY_NAME)}; } - /* - * (non-Javadoc) - * @see org.eclipse.ui.views.properties.IPropertySource#getPropertyValue(java.lang.Object) - */ @Override public Object getPropertyValue(Object id) { if(TRACE_SESSION_NAME_PROPERTY_ID.equals(id)) { diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/UstProviderPropertySource.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/UstProviderPropertySource.java index a275c32e4a..1bb4f518b7 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/UstProviderPropertySource.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/UstProviderPropertySource.java @@ -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 @@ -48,6 +48,7 @@ public class UstProviderPropertySource extends BasePropertySource { // ------------------------------------------------------------------------ // Attributes // ------------------------------------------------------------------------ + /** * The UST provider component which this property source is for. */ @@ -56,6 +57,7 @@ public class UstProviderPropertySource extends BasePropertySource { // ------------------------------------------------------------------------ // Constructors // ------------------------------------------------------------------------ + /** * Constructor * @param component - the UST provider component @@ -67,10 +69,7 @@ public class UstProviderPropertySource extends BasePropertySource { // ------------------------------------------------------------------------ // Operations // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.property.BasePropertySource#getPropertyDescriptors() - */ + @Override public IPropertyDescriptor[] getPropertyDescriptors() { return new IPropertyDescriptor[] { @@ -78,10 +77,6 @@ public class UstProviderPropertySource extends BasePropertySource { new ReadOnlyTextPropertyDescriptor(UST_PROVIDER_PID_PROPERTY_ID, UST_PROVIDER_PID_PROPERTY_NAME)}; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.property.BasePropertySource#getPropertyValue(java.lang.Object) - */ @Override public Object getPropertyValue(Object id) { if(UST_PROVIDER_NAME_PROPERTY_ID.equals(id)) { diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/remote/CommandResult.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/remote/CommandResult.java index 6a5beb3098..339620d189 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/remote/CommandResult.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/remote/CommandResult.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 @@ -57,37 +57,22 @@ public class CommandResult implements ICommandResult { // ------------------------------------------------------------------------ // Accessors // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.service.ICommandResult#getResult() - */ + @Override public int getResult() { return fResult; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.service.ICommandResult#setResult(int) - */ @Override public void setResult(int result) { fResult = result; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.service.ICommandResult#getOutput() - */ @Override public String[] getOutput() { return Arrays.copyOf(fOutput, fOutput.length); } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.service.ICommandResult#setOutput(java.lang.String[]) - */ @Override public void setOutput(String[] output) { fOutput = new String[0]; 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 16fb5fadaf..95b50a6d81 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 @@ -92,10 +92,7 @@ public class CommandShell implements ICommandShell { // ------------------------------------------------------------------------ // Operations // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.service.ICommandShell#connect() - */ + @Override public void connect() throws ExecutionException { IShellService shellService = fProxy.getShellService(); @@ -111,10 +108,6 @@ public class CommandShell implements ICommandShell { fIsConnected = true; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.service.ICommandShell#disconnect() - */ @Override public void disconnect() { fIsConnected = false; @@ -126,19 +119,11 @@ public class CommandShell implements ICommandShell { } } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.service.ICommandShell#executeCommand(java.lang.String, org.eclipse.core.runtime.IProgressMonitor) - */ @Override public ICommandResult executeCommand(String command, IProgressMonitor monitor) throws ExecutionException { return executeCommand(command, monitor, true); } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.service.ICommandShell#executeCommand(java.lang.String, org.eclipse.core.runtime.IProgressMonitor, boolean) - */ @Override public ICommandResult executeCommand(final String command, final IProgressMonitor monitor, final boolean checkReturnValue) throws ExecutionException { if (fIsConnected) { diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/remote/RemoteSystemProxy.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/remote/RemoteSystemProxy.java index e03adeb224..873ce13155 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/remote/RemoteSystemProxy.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/remote/RemoteSystemProxy.java @@ -36,6 +36,7 @@ public class RemoteSystemProxy implements IRemoteSystemProxy { // ------------------------------------------------------------------------ // Attributes // ------------------------------------------------------------------------ + private final IHost fHost; // ------------------------------------------------------------------------ @@ -55,9 +56,7 @@ public class RemoteSystemProxy implements IRemoteSystemProxy { // ------------------------------------------------------------------------ // Operations // ------------------------------------------------------------------------ - /* (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.util.IRemoteSystemProxy#getShellService(org.eclipse.rse.core.model.IHost) - */ + @Override public IShellService getShellService() { ISubSystem ss = getShellServiceSubSystem(); @@ -67,9 +66,6 @@ public class RemoteSystemProxy implements IRemoteSystemProxy { return null; } - /* (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.util.IRemoteSystemProxy#getTerminalService() - */ @Override public ITerminalService getTerminalService() { ISubSystem ss = getTerminalServiceSubSystem(); @@ -79,9 +75,6 @@ public class RemoteSystemProxy implements IRemoteSystemProxy { return null; } - /* (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.util.IRemoteSystemProxy#getShellServiceSubSystem() - */ @Override public ISubSystem getShellServiceSubSystem() { if (fHost == null) { @@ -101,9 +94,6 @@ public class RemoteSystemProxy implements IRemoteSystemProxy { return null; } - /* (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.util.IRemoteSystemProxy#getTerminalServiceSubSystem() - */ @Override public ISubSystem getTerminalServiceSubSystem() { if (fHost == null) { @@ -123,10 +113,6 @@ public class RemoteSystemProxy implements IRemoteSystemProxy { return null; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.remote.IRemoteSystemProxy#getFileServiceSubSystem() - */ @Override public IFileServiceSubSystem getFileServiceSubSystem() { if (fHost == null) { @@ -156,10 +142,6 @@ public class RemoteSystemProxy implements IRemoteSystemProxy { } } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.remote.IRemoteSystemProxy#connect(org.eclipse.rse.core.model.IRSECallback) - */ @Override public void connect(IRSECallback callback) throws ExecutionException { ISubSystem shellSubSystem = getShellServiceSubSystem(); @@ -179,9 +161,6 @@ public class RemoteSystemProxy implements IRemoteSystemProxy { } } - /* (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.util.IRemoteSystemProxy#disconnect() - */ @Override public void disconnect() throws ExecutionException { ISubSystem shellSubSystem = getShellServiceSubSystem(); @@ -194,9 +173,6 @@ public class RemoteSystemProxy implements IRemoteSystemProxy { } } - /* (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.util.IRemoteSystemProxy#createCommandShell() - */ @Override public ICommandShell createCommandShell() throws ExecutionException { ICommandShell shell = new CommandShell(this); @@ -204,9 +180,6 @@ public class RemoteSystemProxy implements IRemoteSystemProxy { return shell; } - /* (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.util.IRemoteSystemProxy#addCommunicationListener(org.eclipse.rse.core.subsystems.ICommunicationsListener) - */ @Override public void addCommunicationListener(ICommunicationsListener listener) { IConnectorService[] css = fHost.getConnectorServices(); @@ -215,9 +188,6 @@ public class RemoteSystemProxy implements IRemoteSystemProxy { } } - /* (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.util.IRemoteSystemProxy#removeCommunicationListener(org.eclipse.rse.core.subsystems.ICommunicationsListener) - */ @Override public void removeCommunicationListener(ICommunicationsListener listener) { IConnectorService[] css = fHost.getConnectorServices(); 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 476f1532f3..e6f2439a57 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 @@ -85,10 +85,7 @@ public class LTTngControlService implements ILttngControlService { // ------------------------------------------------------------------------ // Accessors // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.service.ILttngControlService#getVersion() - */ + @Override public String getVersion() { if (fVersion == null) { @@ -105,10 +102,6 @@ public class LTTngControlService implements ILttngControlService { fVersion = new Version(version); } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.service.ILttngControlService#isVersionSupported(java.lang.String) - */ @Override public boolean isVersionSupported(String version) { Version tmp = new Version(version); @@ -119,13 +112,6 @@ public class LTTngControlService implements ILttngControlService { // Operations // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * - * @see - * org.eclipse.linuxtools.internal.lttng2.ui.views.control.service.ILttngControlService - * #getSessionNames(org.eclipse.core.runtime.IProgressMonitor) - */ @Override public String[] getSessionNames(IProgressMonitor monitor) throws ExecutionException { StringBuffer command = createCommand(LTTngControlServiceConstants.COMMAND_LIST); @@ -152,13 +138,6 @@ public class LTTngControlService implements ILttngControlService { return retArray.toArray(new String[retArray.size()]); } - /* - * (non-Javadoc) - * - * @see - * org.eclipse.linuxtools.internal.lttng2.ui.views.control.service.ILttngControlService - * #getSession(java.lang.String, org.eclipse.core.runtime.IProgressMonitor) - */ @Override public ISessionInfo getSession(String sessionName, IProgressMonitor monitor) throws ExecutionException { StringBuffer command = createCommand(LTTngControlServiceConstants.COMMAND_LIST, sessionName); @@ -244,13 +223,6 @@ public class LTTngControlService implements ILttngControlService { return sessionInfo; } - /* - * (non-Javadoc) - * - * @see - * org.eclipse.linuxtools.internal.lttng2.ui.views.control.service.ILttngControlService - * #getKernelProvider(org.eclipse.core.runtime.IProgressMonitor) - */ @Override public List getKernelProvider(IProgressMonitor monitor) throws ExecutionException { StringBuffer command = createCommand(LTTngControlServiceConstants.COMMAND_LIST_KERNEL); @@ -287,25 +259,11 @@ public class LTTngControlService implements ILttngControlService { return events; } - /* - * (non-Javadoc) - * - * @see - * org.eclipse.linuxtools.internal.lttng2.ui.views.control.service.ILttngControlService - * #getUstProvider() - */ @Override public List getUstProvider() throws ExecutionException { return getUstProvider(new NullProgressMonitor()); } - /* - * (non-Javadoc) - * - * @see - * org.eclipse.linuxtools.internal.lttng2.ui.views.control.service.ILttngControlService - * #getUstProvider(org.eclipse.core.runtime.IProgressMonitor) - */ @Override public List getUstProvider(IProgressMonitor monitor) throws ExecutionException { StringBuffer command = createCommand(LTTngControlServiceConstants.COMMAND_LIST_UST); @@ -388,10 +346,6 @@ public class LTTngControlService implements ILttngControlService { return allProviders; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.service.ILttngControlService#createSession(java.lang.String, java.lang.String, org.eclipse.core.runtime.IProgressMonitor) - */ @Override public ISessionInfo createSession(String sessionName, String sessionPath, IProgressMonitor monitor) throws ExecutionException { @@ -450,10 +404,6 @@ public class LTTngControlService implements ILttngControlService { } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.service.ILttngControlService#createSession(java.lang.String, java.lang.String, java.lang.String, java.lang.String, org.eclipse.core.runtime.IProgressMonitor) - */ @Override public ISessionInfo createSession(String sessionName, String networkUrl, String controlUrl, String dataUrl, IProgressMonitor monitor) throws ExecutionException { @@ -557,10 +507,6 @@ public class LTTngControlService implements ILttngControlService { //Session destroyed } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.service.ILttngControlService#startSession(java.lang.String, org.eclipse.core.runtime.IProgressMonitor) - */ @Override public void startSession(String sessionName, IProgressMonitor monitor) throws ExecutionException { @@ -573,10 +519,6 @@ public class LTTngControlService implements ILttngControlService { //Session started } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.service.ILttngControlService#stopSession(java.lang.String, org.eclipse.core.runtime.IProgressMonitor) - */ @Override public void stopSession(String sessionName, IProgressMonitor monitor) throws ExecutionException { String newSessionName = formatParameter(sessionName); @@ -588,10 +530,6 @@ public class LTTngControlService implements ILttngControlService { } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.service.ILttngControlService#enableChannel(java.lang.String, java.util.List, boolean, org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.IChannelInfo, org.eclipse.core.runtime.IProgressMonitor) - */ @Override public void enableChannels(String sessionName, List channelNames, boolean isKernel, IChannelInfo info, IProgressMonitor monitor) throws ExecutionException { @@ -650,10 +588,6 @@ public class LTTngControlService implements ILttngControlService { } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.service.ILttngControlService#disableChannel(java.lang.String, java.util.List, org.eclipse.core.runtime.IProgressMonitor) - */ @Override public void disableChannels(String sessionName, List channelNames, boolean isKernel, IProgressMonitor monitor) throws ExecutionException { @@ -685,10 +619,6 @@ public class LTTngControlService implements ILttngControlService { executeCommand(command.toString(), monitor); } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.service.ILttngControlService#enableEvents(java.lang.String, java.lang.String, java.util.List, boolean, java.lang.String, org.eclipse.core.runtime.IProgressMonitor) - */ @Override public void enableEvents(String sessionName, String channelName, List eventNames, boolean isKernel, String filterExpression, IProgressMonitor monitor) throws ExecutionException { @@ -738,10 +668,6 @@ public class LTTngControlService implements ILttngControlService { } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.service.ILttngControlService#enableSyscalls(java.lang.String, java.lang.String, org.eclipse.core.runtime.IProgressMonitor) - */ @Override public void enableSyscalls(String sessionName, String channelName, IProgressMonitor monitor) throws ExecutionException { @@ -765,10 +691,6 @@ public class LTTngControlService implements ILttngControlService { executeCommand(command.toString(), monitor); } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.service.ILttngControlService#enableProbe(java.lang.String, java.lang.String, java.lang.String, java.lang.String, org.eclipse.core.runtime.IProgressMonitor) - */ @Override public void enableProbe(String sessionName, String channelName, String eventName, boolean isFunction, String probe, IProgressMonitor monitor) throws ExecutionException { StringBuffer command = createCommand(LTTngControlServiceConstants.COMMAND_ENABLE_EVENT); @@ -795,10 +717,6 @@ public class LTTngControlService implements ILttngControlService { executeCommand(command.toString(), monitor); } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.service.ILttngControlService#enableLogLevel(java.lang.String, java.lang.String, java.lang.String, org.eclipse.linuxtools.internal.lttng2.core.control.model.LogLevelType, org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceLogLevel, java.lang.String, org.eclipse.core.runtime.IProgressMonitor) - */ @Override public void enableLogLevel(String sessionName, String channelName, String eventName, LogLevelType logLevelType, TraceLogLevel level, String filterExpression, IProgressMonitor monitor) throws ExecutionException { StringBuffer command = createCommand(LTTngControlServiceConstants.COMMAND_ENABLE_EVENT); @@ -828,12 +746,6 @@ public class LTTngControlService implements ILttngControlService { executeCommand(command.toString(), monitor); } - - - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.service.ILttngControlService#disableEvent(java.lang.String, java.lang.String, java.util.List, boolean, org.eclipse.core.runtime.IProgressMonitor) - */ @Override public void disableEvent(String sessionName, String channelName, List eventNames, boolean isKernel, IProgressMonitor monitor) throws ExecutionException { StringBuffer command = createCommand(LTTngControlServiceConstants.COMMAND_DISABLE_EVENT); @@ -875,10 +787,6 @@ public class LTTngControlService implements ILttngControlService { executeCommand(command.toString(), monitor); } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.service.ILttngControlService#getContexts(org.eclipse.core.runtime.IProgressMonitor) - */ @Override public List getContextList(IProgressMonitor monitor) throws ExecutionException { @@ -913,10 +821,6 @@ public class LTTngControlService implements ILttngControlService { return contexts; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.service.ILttngControlService#addContexts(java.lang.String, java.lang.String, java.lang.String, boolean, java.util.List, org.eclipse.core.runtime.IProgressMonitor) - */ @Override public void addContexts(String sessionName, String channelName, String eventName, boolean isKernel, List contextNames, IProgressMonitor monitor) throws ExecutionException { StringBuffer command = createCommand(LTTngControlServiceConstants.COMMAND_ADD_CONTEXT); @@ -951,10 +855,6 @@ public class LTTngControlService implements ILttngControlService { } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.internal.lttng2.ui.views.control.service.ILttngControlService#calibrate(boolean, org.eclipse.core.runtime.IProgressMonitor) - */ @Override public void calibrate(boolean isKernel, IProgressMonitor monitor) throws ExecutionException { // String newSessionName = formatParameter(sessionName); @@ -977,6 +877,7 @@ public class LTTngControlService implements ILttngControlService { // ------------------------------------------------------------------------ // Helper methods // ------------------------------------------------------------------------ + /** * Checks if command result is an error result. * diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/service/LTTngControlServiceFactory.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/service/LTTngControlServiceFactory.java index 7488b09dff..13707aab94 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/service/LTTngControlServiceFactory.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/service/LTTngControlServiceFactory.java @@ -1,5 +1,5 @@ /********************************************************************** - * Copyright (c) 2012. 2013 Ericsson + * Copyright (c) 2012, 2013. 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 diff --git a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/TmfCoreTestPlugin.java b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/TmfCoreTestPlugin.java index 2b9d00f45b..b1b3710e42 100644 --- a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/TmfCoreTestPlugin.java +++ b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/TmfCoreTestPlugin.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2012 Ericsson + * Copyright (c) 2009, 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 diff --git a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/TmfStringLocation.java b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/TmfStringLocation.java index 0489687b37..aa707fb431 100644 --- a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/TmfStringLocation.java +++ b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/TmfStringLocation.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 @@ -36,9 +36,6 @@ public class TmfStringLocation extends TmfLocation { super(other.getLocationInfo()); } - /* (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.core.trace.ITmfLocation#getLocationInfo() - */ @Override public String getLocationInfo() { return (String) super.getLocationInfo(); diff --git a/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/CreateTestFiles.java b/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/CreateTestFiles.java index 26785abc61..b9c47baafe 100644 --- a/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/CreateTestFiles.java +++ b/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/CreateTestFiles.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2012 Ericsson + * Copyright (c) 2009, 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 diff --git a/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/component/TmfClientStub.java b/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/component/TmfClientStub.java index 29ac5655a9..776a194bce 100644 --- a/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/component/TmfClientStub.java +++ b/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/component/TmfClientStub.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2012 Ericsson + * Copyright (c) 2009, 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 diff --git a/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/event/TmfEventTypeStub.java b/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/event/TmfEventTypeStub.java index 5d65e3bdbe..2ad3868199 100644 --- a/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/event/TmfEventTypeStub.java +++ b/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/event/TmfEventTypeStub.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2012 Ericsson + * Copyright (c) 2009, 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 diff --git a/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/request/TmfDataRequestStub.java b/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/request/TmfDataRequestStub.java index 206f562f72..c15798fbe4 100644 --- a/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/request/TmfDataRequestStub.java +++ b/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/request/TmfDataRequestStub.java @@ -56,9 +56,6 @@ public class TmfDataRequestStub extends TmfDataRequest { super(dataType, index, nbRequested, blockSize); } - /* (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.core.request.TmfDataRequest#handleData(org.eclipse.linuxtools.tmf.core.event.ITmfEvent) - */ @Override public void handleData(final ITmfEvent data) { super.handleData(data); diff --git a/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/request/TmfEventRequestStub.java b/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/request/TmfEventRequestStub.java index 3c972473cf..25e94223ee 100644 --- a/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/request/TmfEventRequestStub.java +++ b/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/request/TmfEventRequestStub.java @@ -66,9 +66,6 @@ public class TmfEventRequestStub extends TmfEventRequest { super(dataType, range, index, nbRequested, blockSize); } - /* (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.core.request.TmfDataRequest#handleData(org.eclipse.linuxtools.tmf.core.event.ITmfEvent) - */ @Override public void handleData(final ITmfEvent data) { super.handleData(data); diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/internal/tmf/core/Activator.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/internal/tmf/core/Activator.java index 5ff7b090c7..0e8a46f0e6 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/internal/tmf/core/Activator.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/internal/tmf/core/Activator.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2012 Ericsson + * Copyright (c) 2009, 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 @@ -26,36 +26,36 @@ import org.osgi.framework.BundleContext; */ public class Activator extends Plugin { - // ------------------------------------------------------------------------ + // ------------------------------------------------------------------------ // Attributes - // ------------------------------------------------------------------------ + // ------------------------------------------------------------------------ /** * The plug-in ID */ - public static final String PLUGIN_ID = "org.eclipse.linuxtools.tmf.core"; //$NON-NLS-1$ + public static final String PLUGIN_ID = "org.eclipse.linuxtools.tmf.core"; //$NON-NLS-1$ - /** + /** * The shared instance */ - private static Activator fPlugin; + private static Activator fPlugin; - // ------------------------------------------------------------------------ + // ------------------------------------------------------------------------ // Constructors - // ------------------------------------------------------------------------ + // ------------------------------------------------------------------------ - /** + /** * Constructor */ - public Activator() { - setDefault(this); - } + public Activator() { + setDefault(this); + } - // ------------------------------------------------------------------------ + // ------------------------------------------------------------------------ // Accessors - // ------------------------------------------------------------------------ + // ------------------------------------------------------------------------ - /** + /** * Returns the TMF Core plug-in instance. * * @return the TMF Core plug-in instance. @@ -65,54 +65,50 @@ public class Activator extends Plugin { } // Sets plug-in instance - private static void setDefault(Activator plugin) { - fPlugin = plugin; - } + private static void setDefault(Activator plugin) { + fPlugin = plugin; + } - // ------------------------------------------------------------------------ + // ------------------------------------------------------------------------ // Plugin - // ------------------------------------------------------------------------ - - /* - * (non-Javadoc) - * @see org.eclipse.core.runtime.Plugin#start(org.osgi.framework.BundleContext) - */ - @Override - public void start(BundleContext context) throws Exception { - super.start(context); - setDefault(this); - TmfCoreTracer.init(); - } - - /* - * (non-Javadoc) - * @see org.eclipse.core.runtime.Plugin#stop(org.osgi.framework.BundleContext) - */ - @Override - public void stop(BundleContext context) throws Exception { - TmfCoreTracer.stop(); - setDefault(null); - super.stop(context); - } - - // ------------------------------------------------------------------------ - // Log INFO + // ------------------------------------------------------------------------ + + @Override + public void start(BundleContext context) throws Exception { + super.start(context); + setDefault(this); + TmfCoreTracer.init(); + } + + @Override + public void stop(BundleContext context) throws Exception { + TmfCoreTracer.stop(); + setDefault(null); + super.stop(context); + } + + // ------------------------------------------------------------------------ + // Log INFO // ------------------------------------------------------------------------ /** * Logs a message with severity INFO in the runtime log of the plug-in. * - * @param message A message to log + * @param message + * A message to log */ public static void logInfo(String message) { fPlugin.getLog().log(new Status(IStatus.INFO, PLUGIN_ID, message)); } /** - * Logs a message and exception with severity INFO in the runtime log of the plug-in. + * Logs a message and exception with severity INFO in the runtime log of the + * plug-in. * - * @param message A message to log - * @param exception The corresponding exception + * @param message + * A message to log + * @param exception + * The corresponding exception */ public static void logInfo(String message, Throwable exception) { fPlugin.getLog().log(new Status(IStatus.INFO, PLUGIN_ID, message, exception)); @@ -123,19 +119,24 @@ public class Activator extends Plugin { // ------------------------------------------------------------------------ /** - * Logs a message and exception with severity WARNING in the runtime log of the plug-in. + * Logs a message and exception with severity WARNING in the runtime log of + * the plug-in. * - * @param message A message to log + * @param message + * A message to log */ public static void logWarning(String message) { fPlugin.getLog().log(new Status(IStatus.WARNING, PLUGIN_ID, message)); } /** - * Logs a message and exception with severity WARNING in the runtime log of the plug-in. + * Logs a message and exception with severity WARNING in the runtime log of + * the plug-in. * - * @param message A message to log - * @param exception The corresponding exception + * @param message + * A message to log + * @param exception + * The corresponding exception */ public static void logWarning(String message, Throwable exception) { fPlugin.getLog().log(new Status(IStatus.WARNING, PLUGIN_ID, message, exception)); @@ -146,19 +147,24 @@ public class Activator extends Plugin { // ------------------------------------------------------------------------ /** - * Logs a message and exception with severity ERROR in the runtime log of the plug-in. + * Logs a message and exception with severity ERROR in the runtime log of + * the plug-in. * - * @param message A message to log + * @param message + * A message to log */ public static void logError(String message) { fPlugin.getLog().log(new Status(IStatus.ERROR, PLUGIN_ID, message)); } /** - * Logs a message and exception with severity ERROR in the runtime log of the plug-in. + * Logs a message and exception with severity ERROR in the runtime log of + * the plug-in. * - * @param message A message to log - * @param exception The corresponding exception + * @param message + * A message to log + * @param exception + * The corresponding exception */ public static void logError(String message, Throwable exception) { fPlugin.getLog().log(new Status(IStatus.ERROR, PLUGIN_ID, message, exception)); diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/internal/tmf/core/component/TmfEventThread.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/internal/tmf/core/component/TmfEventThread.java index 652bda3623..982b456878 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/internal/tmf/core/component/TmfEventThread.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/internal/tmf/core/component/TmfEventThread.java @@ -145,9 +145,6 @@ public class TmfEventThread implements Runnable { // Runnable // ------------------------------------------------------------------------ - /* (non-Javadoc) - * @see java.lang.Runnable#run() - */ @Override public void run() { diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/internal/tmf/core/request/TmfRequestExecutor.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/internal/tmf/core/request/TmfRequestExecutor.java index 3cff7b3371..83097f3ee8 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/internal/tmf/core/request/TmfRequestExecutor.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/internal/tmf/core/request/TmfRequestExecutor.java @@ -36,15 +36,15 @@ public class TmfRequestExecutor implements Executor { // ------------------------------------------------------------------------ // The request executor - private final ExecutorService fExecutor = Executors.newFixedThreadPool(2); - private final String fExecutorName; + private final ExecutorService fExecutor = Executors.newFixedThreadPool(2); + private final String fExecutorName; - // The request queues - private final Queue fHighPriorityTasks = new ArrayBlockingQueue(100); - private final Queue fLowPriorityTasks = new ArrayBlockingQueue(100); + // The request queues + private final Queue fHighPriorityTasks = new ArrayBlockingQueue(100); + private final Queue fLowPriorityTasks = new ArrayBlockingQueue(100); - // The tasks - private TmfEventThread fActiveTask; + // The tasks + private TmfEventThread fActiveTask; private TmfEventThread fSuspendedTask; // ------------------------------------------------------------------------ @@ -65,7 +65,8 @@ public class TmfRequestExecutor implements Executor { /** * Standard constructor * - * @param executor The executor service to use + * @param executor + * The executor service to use */ @Deprecated public TmfRequestExecutor(ExecutorService executor) { @@ -76,37 +77,34 @@ public class TmfRequestExecutor implements Executor { // Getters // ------------------------------------------------------------------------ - /** - * @return the number of pending requests - */ + /** + * @return the number of pending requests + */ @Deprecated - public synchronized int getNbPendingRequests() { - return fHighPriorityTasks.size() + fLowPriorityTasks.size(); - } - - /** - * @return the shutdown state (i.e. if it is accepting new requests) - */ - public synchronized boolean isShutdown() { - return fExecutor.isShutdown(); - } - - /** - * @return the termination state - */ - public synchronized boolean isTerminated() { - return fExecutor.isTerminated(); - } + public synchronized int getNbPendingRequests() { + return fHighPriorityTasks.size() + fLowPriorityTasks.size(); + } + + /** + * @return the shutdown state (i.e. if it is accepting new requests) + */ + public synchronized boolean isShutdown() { + return fExecutor.isShutdown(); + } + + /** + * @return the termination state + */ + public synchronized boolean isTerminated() { + return fExecutor.isTerminated(); + } // ------------------------------------------------------------------------ // Operations // ------------------------------------------------------------------------ - /* (non-Javadoc) - * @see java.util.concurrent.Executor#execute(java.lang.Runnable) - */ - @Override - public synchronized void execute(final Runnable command) { + @Override + public synchronized void execute(final Runnable command) { // We are expecting MyEventThread:s if (!(command instanceof TmfEventThread)) { @@ -139,24 +137,24 @@ public class TmfRequestExecutor implements Executor { fSuspendedTask = fActiveTask; scheduleNext(); } - } - - /** - * Executes the next pending request, if applicable. - */ - protected synchronized void scheduleNext() { - if (!isShutdown()) { - if ((fActiveTask = fHighPriorityTasks.poll()) != null) { - fExecutor.execute(fActiveTask); - } else if (fSuspendedTask != null) { - fActiveTask = fSuspendedTask; - fSuspendedTask = null; - fActiveTask.getThread().resume(); - } else if ((fActiveTask = fLowPriorityTasks.poll()) != null) { - fExecutor.execute(fActiveTask); - } - } - } + } + + /** + * Executes the next pending request, if applicable. + */ + protected synchronized void scheduleNext() { + if (!isShutdown()) { + if ((fActiveTask = fHighPriorityTasks.poll()) != null) { + fExecutor.execute(fActiveTask); + } else if (fSuspendedTask != null) { + fActiveTask = fSuspendedTask; + fSuspendedTask = null; + fActiveTask.getThread().resume(); + } else if ((fActiveTask = fLowPriorityTasks.poll()) != null) { + fExecutor.execute(fActiveTask); + } + } + } /** * Stops the executor @@ -176,14 +174,14 @@ public class TmfRequestExecutor implements Executor { } } - // ------------------------------------------------------------------------ - // Object - // ------------------------------------------------------------------------ + // ------------------------------------------------------------------------ + // Object + // ------------------------------------------------------------------------ - @Override + @Override @SuppressWarnings("nls") - public String toString() { - return "[TmfRequestExecutor(" + fExecutorName + ")]"; - } + public String toString() { + return "[TmfRequestExecutor(" + fExecutorName + ")]"; + } } diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/internal/tmf/core/statesystem/AttributeTree.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/internal/tmf/core/statesystem/AttributeTree.java index cc279c9df5..69407898e7 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/internal/tmf/core/statesystem/AttributeTree.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/internal/tmf/core/statesystem/AttributeTree.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2012 Ericsson + * Copyright (c) 2012, 2013 Ericsson * Copyright (c) 2010, 2011 École Polytechnique de Montréal * Copyright (c) 2010, 2011 Alexandre Montplaisir * diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/internal/tmf/core/trace/TmfExperimentContext.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/internal/tmf/core/trace/TmfExperimentContext.java index bdeaa775db..29613b5dce 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/internal/tmf/core/trace/TmfExperimentContext.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/internal/tmf/core/trace/TmfExperimentContext.java @@ -66,9 +66,6 @@ public class TmfExperimentContext extends TmfContext { fLastTraceRead = NO_TRACE; } - /* (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.core.trace.TmfContext#dispose() - */ @Override public void dispose() { for (ITmfContext context : fContexts) { diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/internal/tmf/core/trace/TmfExperimentLocation.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/internal/tmf/core/trace/TmfExperimentLocation.java index b618c4de8f..5c7b5b3fe9 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/internal/tmf/core/trace/TmfExperimentLocation.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/internal/tmf/core/trace/TmfExperimentLocation.java @@ -62,9 +62,6 @@ public final class TmfExperimentLocation implements ITmfLocation { // Object // ------------------------------------------------------------------------ - /* (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.core.trace.TmfLocation#toString() - */ @Override @SuppressWarnings("nls") public String toString() { @@ -74,17 +71,11 @@ public final class TmfExperimentLocation implements ITmfLocation { return result.toString(); } - /* (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.core.trace.TmfLocation#hashCode() - */ @Override public int hashCode() { return super.hashCode(); } - /* (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.core.trace.TmfLocation#equals(java.lang.Object) - */ @Override public boolean equals(Object obj) { if (this == obj) { @@ -99,9 +90,6 @@ public final class TmfExperimentLocation implements ITmfLocation { return true; } - /* (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.core.trace.ITmfLocation#getLocationData() - */ @Override public TmfLocationArray getLocationInfo() { return fLocation; diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/internal/tmf/core/trace/TmfLocationArray.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/internal/tmf/core/trace/TmfLocationArray.java index 1010e9c4af..13deef2d00 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/internal/tmf/core/trace/TmfLocationArray.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/internal/tmf/core/trace/TmfLocationArray.java @@ -155,9 +155,6 @@ public final class TmfLocationArray implements Comparable { // Object // ------------------------------------------------------------------------ - /* (non-Javadoc) - * @see java.lang.Object#hashCode() - */ @Override public int hashCode() { final int prime = 31; @@ -167,9 +164,6 @@ public final class TmfLocationArray implements Comparable { return result; } - /* (non-Javadoc) - * @see java.lang.Object#equals(java.lang.Object) - */ @Override public boolean equals(Object obj) { if (this == obj) { @@ -191,9 +185,6 @@ public final class TmfLocationArray implements Comparable { return true; } - /* (non-Javadoc) - * @see java.lang.Object#toString() - */ @Override @SuppressWarnings("nls") public String toString() { diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/TmfProjectNature.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/TmfProjectNature.java index 66697e5ed5..c100335eb0 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/TmfProjectNature.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/TmfProjectNature.java @@ -1,11 +1,11 @@ /******************************************************************************* - * Copyright (c) 2009, 2012 Ericsson - * + * Copyright (c) 2009, 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: * Francois Chouinard - Initial API and implementation *******************************************************************************/ @@ -18,7 +18,7 @@ import org.eclipse.core.runtime.CoreException; /** * The TMF basic tracing project nature. - * + * * @version 1.0 * @author Francois Chouinard */ @@ -28,46 +28,37 @@ public class TmfProjectNature implements IProjectNature { // Constants // ------------------------------------------------------------------------ - /** - * The nature ID - */ - public static final String ID = "org.eclipse.linuxtools.tmf.project.nature"; //$NON-NLS-1$ + /** + * The nature ID + */ + public static final String ID = "org.eclipse.linuxtools.tmf.project.nature"; //$NON-NLS-1$ // ------------------------------------------------------------------------ // Attributes // ------------------------------------------------------------------------ - private IProject fProject; - + private IProject fProject; + // ------------------------------------------------------------------------ // Operations // ------------------------------------------------------------------------ - /* (non-Javadoc) - * @see org.eclipse.core.resources.IProjectNature#configure() - */ - @Override - public void configure() throws CoreException { - } + @Override + public void configure() throws CoreException { + } - /* (non-Javadoc) - * @see org.eclipse.core.resources.IProjectNature#deconfigure() - */ - @Override - public void deconfigure() throws CoreException { - } + @Override + public void deconfigure() throws CoreException { + } - @Override - public IProject getProject() { - return fProject; - } + @Override + public IProject getProject() { + return fProject; + } - /* (non-Javadoc) - * @see org.eclipse.core.resources.IProjectNature#setProject(org.eclipse.core.resources.IProject) - */ - @Override - public void setProject(IProject project) { - fProject = project; - } + @Override + public void setProject(IProject project) { + fProject = project; + } } diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/component/TmfComponent.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/component/TmfComponent.java index 41533e31ea..5bb8dec176 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/component/TmfComponent.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/component/TmfComponent.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2012 Ericsson + * Copyright (c) 2009, 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 @@ -30,24 +30,25 @@ public abstract class TmfComponent implements ITmfComponent { // Attributes // ------------------------------------------------------------------------ - private String fName; + private String fName; - // ------------------------------------------------------------------------ - // Constructor - // ------------------------------------------------------------------------ + // ------------------------------------------------------------------------ + // Constructor + // ------------------------------------------------------------------------ /** * Default constructor. To be used in conjunction with init() */ public TmfComponent() { - this(""); //$NON-NLS-1$ + this(""); //$NON-NLS-1$ } /** * Perform component initialization and register it as a signal listener. * Need to be called when the default constructor was used. * - * @param name the component name + * @param name + * the component name */ public void init(String name) { TmfCoreTracer.traceComponent(this, "created"); //$NON-NLS-1$ @@ -55,62 +56,56 @@ public abstract class TmfComponent implements ITmfComponent { TmfSignalManager.register(this); } - /** - * The standard constructor - * - * @param name the component name - */ - public TmfComponent(String name) { - init(name); - } - - /** - * The copy constructor - * - * @param other the other component - */ - public TmfComponent(TmfComponent other) { + /** + * The standard constructor + * + * @param name + * the component name + */ + public TmfComponent(String name) { + init(name); + } + + /** + * The copy constructor + * + * @param other + * the other component + */ + public TmfComponent(TmfComponent other) { init(other.fName); - } + } // ------------------------------------------------------------------------ // Getters/setters // ------------------------------------------------------------------------ - /* (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.core.component.ITmfComponent#getName() - */ @Override public String getName() { return fName; } - /** - * @param name the new component name - */ - protected void setName(String name) { - fName = name; - } - - // ------------------------------------------------------------------------ - // ITmfComponent - // ------------------------------------------------------------------------ - - /* (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.core.component.ITmfComponent#dispose() - */ - @Override - public void dispose() { - TmfSignalManager.deregister(this); - TmfCoreTracer.traceComponent(this, "disposed"); //$NON-NLS-1$ - } - - /* (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.core.component.ITmfComponent#broadcast(org.eclipse.linuxtools.tmf.core.signal.TmfSignal) - */ - @Override - public void broadcast(TmfSignal signal) { - TmfSignalManager.dispatchSignal(signal); - } + /** + * @param name + * the new component name + */ + protected void setName(String name) { + fName = name; + } + + // ------------------------------------------------------------------------ + // ITmfComponent + // ------------------------------------------------------------------------ + + @Override + public void dispose() { + TmfSignalManager.deregister(this); + TmfCoreTracer.traceComponent(this, "disposed"); //$NON-NLS-1$ + } + + @Override + public void broadcast(TmfSignal signal) { + TmfSignalManager.dispatchSignal(signal); + } } diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/ctfadaptor/CtfEnumPair.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/ctfadaptor/CtfEnumPair.java index 38bc14863a..34aaa4612b 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/ctfadaptor/CtfEnumPair.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/ctfadaptor/CtfEnumPair.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 @@ -52,10 +52,6 @@ public class CtfEnumPair extends Pair { return getSecond(); } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.core.util.Pair#toString() - */ @Override public String toString() { return getFirst(); diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/ctfadaptor/CtfIterator.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/ctfadaptor/CtfIterator.java index ba913ee588..b5d6c8f22f 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/ctfadaptor/CtfIterator.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/ctfadaptor/CtfIterator.java @@ -109,9 +109,6 @@ public class CtfIterator extends CTFTraceReader implements ITmfContext, return null; } - /* (non-Javadoc) - * @see org.eclipse.linuxtools.ctf.core.trace.CTFTraceReader#seek(long) - */ @Override public boolean seek(long timestamp) { return seek(new CtfLocationInfo(timestamp, 0)); @@ -185,11 +182,6 @@ public class CtfIterator extends CTFTraceReader implements ITmfContext, curRank = rank; } - /* - * (non-Javadoc) - * - * @see org.eclipse.linuxtools.tmf.core.trace.TmfContext#clone() - */ @Override public CtfIterator clone() { CtfIterator clone = null; @@ -287,9 +279,6 @@ public class CtfIterator extends CTFTraceReader implements ITmfContext, return 0; } - /* (non-Javadoc) - * @see java.lang.Object#hashCode() - */ @Override public int hashCode() { final int prime = 31; @@ -302,9 +291,6 @@ public class CtfIterator extends CTFTraceReader implements ITmfContext, return result; } - /* (non-Javadoc) - * @see java.lang.Object#equals(java.lang.Object) - */ @Override public boolean equals(Object obj) { if (this == obj) { diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/ctfadaptor/CtfTmfTrace.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/ctfadaptor/CtfTmfTrace.java index c4263d0f41..4273276bad 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/ctfadaptor/CtfTmfTrace.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/ctfadaptor/CtfTmfTrace.java @@ -107,11 +107,6 @@ public class CtfTmfTrace extends TmfTrace implements ITmfEventParser { } } - /* - * (non-Javadoc) - * - * @see org.eclipse.linuxtools.tmf.core.trace.TmfTrace#dispose() - */ @Override public synchronized void dispose() { CtfIteratorManager.removeTrace(this); diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/ITmfEventType.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/ITmfEventType.java index dc0bcbd80c..8e77e938dd 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/ITmfEventType.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/ITmfEventType.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 diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfEventField.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfEventField.java index aa62945166..14f13e8b92 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfEventField.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfEventField.java @@ -93,33 +93,21 @@ public class TmfEventField implements ITmfEventField { // ITmfEventField // ------------------------------------------------------------------------ - /* (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.core.event.ITmfEventField#getName() - */ @Override public String getName() { return fName; } - /* (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.core.event.ITmfEventField#getValue() - */ @Override public Object getValue() { return fValue; } - /* (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.core.event.ITmfEventField#getFieldNames() - */ @Override public String[] getFieldNames() { return fFieldNames; } - /* (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.core.event.ITmfEventField#getFieldName(int) - */ @Override public String getFieldName(final int index) { final ITmfEventField field = getField(index); @@ -129,25 +117,16 @@ public class TmfEventField implements ITmfEventField { return null; } - /* (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.core.event.ITmfEventField#getFields() - */ @Override public ITmfEventField[] getFields() { return (fFields != null) ? fFields : new ITmfEventField[0]; } - /* (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.core.event.ITmfEventField#getField(java.lang.String) - */ @Override public ITmfEventField getField(final String name) { return fNameMapping.get(name); } - /* (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.core.event.ITmfEventField#getField(int) - */ @Override public ITmfEventField getField(final int index) { if (fFields != null && index >= 0 && index < fFields.length) { @@ -179,9 +158,6 @@ public class TmfEventField implements ITmfEventField { // Object // ------------------------------------------------------------------------ - /* (non-Javadoc) - * @see java.lang.Object#hashCode() - */ @Override public int hashCode() { final int prime = 31; @@ -191,9 +167,6 @@ public class TmfEventField implements ITmfEventField { return result; } - /* (non-Javadoc) - * @see java.lang.Object#equals(java.lang.Object) - */ @Override public boolean equals(final Object obj) { if (this == obj) { @@ -219,9 +192,6 @@ public class TmfEventField implements ITmfEventField { return true; } - /* (non-Javadoc) - * @see java.lang.Object#toString() - */ @Override public String toString() { StringBuilder ret = new StringBuilder(); diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfEventType.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfEventType.java index 0fd479fa3b..9cc400a0a9 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfEventType.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfEventType.java @@ -80,41 +80,26 @@ public class TmfEventType implements ITmfEventType { // ITmfEventType // ------------------------------------------------------------------------ - /* (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.core.event.ITmfEventType#getContext() - */ @Override public String getContext() { return fContext; } - /* (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.core.event.ITmfEventType#getName() - */ @Override public String getName() { return fTypeId; } - /* (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.core.event.ITmfEventType#getRootField() - */ @Override public ITmfEventField getRootField() { return fRootField; } - /* (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.core.event.ITmfEventType#getFieldNames() - */ @Override public String[] getFieldNames() { return (fRootField != null) ? fRootField.getFieldNames() : new String[0]; } - /* (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.core.event.ITmfEventType#getFieldName(int) - */ @Override public String getFieldName(final int index) { return (fRootField != null) ? fRootField.getFieldName(index) : null; @@ -124,9 +109,6 @@ public class TmfEventType implements ITmfEventType { // Object // ------------------------------------------------------------------------ - /* (non-Javadoc) - * @see java.lang.Object#hashCode() - */ @Override public int hashCode() { final int prime = 31; @@ -136,9 +118,6 @@ public class TmfEventType implements ITmfEventType { return result; } - /* (non-Javadoc) - * @see java.lang.Object#equals(java.lang.Object) - */ @Override public boolean equals(final Object obj) { if (this == obj) { @@ -160,9 +139,6 @@ public class TmfEventType implements ITmfEventType { return true; } - /* (non-Javadoc) - * @see java.lang.Object#toString() - */ @Override @SuppressWarnings("nls") public String toString() { diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfEventTypeManager.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfEventTypeManager.java index 9e672e5f1d..f89fc5dd82 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfEventTypeManager.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfEventTypeManager.java @@ -1,11 +1,11 @@ /******************************************************************************* - * 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: * Francois Chouinard - Initial API and implementation *******************************************************************************/ @@ -18,10 +18,10 @@ import java.util.Map; /** * A central repository for the available event types. Types are managed by * context space. - * + * * @version 1.0 * @author Francois Chouinard - * + * * @see ITmfEventType */ public final class TmfEventTypeManager { @@ -63,7 +63,7 @@ public final class TmfEventTypeManager { /** * Add a context:type pair to the available types - * + * * @param context the target context * @param type the type to add */ @@ -78,7 +78,7 @@ public final class TmfEventTypeManager { /** * Return the list of currently defined contexts - * + * * @return the list of contexts */ public synchronized String[] getContexts() { @@ -87,7 +87,7 @@ public final class TmfEventTypeManager { /** * Return the list of types defined for a given context - * + * * @param context the context to look into * @return the list of types defined for that context */ @@ -101,7 +101,7 @@ public final class TmfEventTypeManager { /** * Return an event type - * + * * @param context the context to look into * @param typeId the type ID * @return the corresponding type @@ -116,7 +116,7 @@ public final class TmfEventTypeManager { /** * Remove the types associated to a context - * + * * @param context the context to remove */ public synchronized void clear(final String context) { @@ -134,9 +134,6 @@ public final class TmfEventTypeManager { // Object // ------------------------------------------------------------------------ - /* (non-Javadoc) - * @see java.lang.Object#toString() - */ @Override @SuppressWarnings("nls") public String toString() { diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/filter/model/TmfFilterTreeNode.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/filter/model/TmfFilterTreeNode.java index 74b32d32df..b0f4cdc05c 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/filter/model/TmfFilterTreeNode.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/filter/model/TmfFilterTreeNode.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2010, 2012 Ericsson + * Copyright (c) 2010, 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 @@ -29,131 +29,94 @@ import org.eclipse.linuxtools.tmf.core.event.ITmfEventField; */ public abstract class TmfFilterTreeNode implements ITmfFilterTreeNode, Cloneable { - private static final String[] VALID_CHILDREN = { - TmfFilterEventTypeNode.NODE_NAME, - TmfFilterAndNode.NODE_NAME, - TmfFilterOrNode.NODE_NAME, - TmfFilterContainsNode.NODE_NAME, - TmfFilterEqualsNode.NODE_NAME, - TmfFilterMatchesNode.NODE_NAME, - TmfFilterCompareNode.NODE_NAME - }; + private static final String[] VALID_CHILDREN = { + TmfFilterEventTypeNode.NODE_NAME, + TmfFilterAndNode.NODE_NAME, + TmfFilterOrNode.NODE_NAME, + TmfFilterContainsNode.NODE_NAME, + TmfFilterEqualsNode.NODE_NAME, + TmfFilterMatchesNode.NODE_NAME, + TmfFilterCompareNode.NODE_NAME + }; - private ITmfFilterTreeNode parent = null; - private ArrayList children = new ArrayList(); + private ITmfFilterTreeNode parent = null; + private ArrayList children = new ArrayList(); /** - * @param parent the parent node + * @param parent + * the parent node */ public TmfFilterTreeNode(final ITmfFilterTreeNode parent) { - if (parent != null) { - parent.addChild(this); - } + if (parent != null) { + parent.addChild(this); + } + } + + @Override + public ITmfFilterTreeNode getParent() { + return parent; + } + + @Override + public abstract String getNodeName(); + + @Override + public boolean hasChildren() { + return (children.size() > 0); } - /* (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.filter.model.ITmfFilterTreeNode#getParent() - */ - @Override - public ITmfFilterTreeNode getParent() { - return parent; - } - - /* (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.filter.model.ITmfFilterTreeNode#getNodeName() - */ - @Override - public abstract String getNodeName(); - - /* (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.filter.model.ITmfFilterTreeNode#hasChildren() - */ - @Override - public boolean hasChildren() { - return (children.size() > 0); - } - - /* (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.filter.model.ITmfFilterTreeNode#getChildrenCount() - */ - @Override - public int getChildrenCount() { - return children.size(); - } - - /* (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.filter.model.ITmfFilterTreeNode#getChildren() - */ - @Override - public ITmfFilterTreeNode[] getChildren() { - return children.toArray(new ITmfFilterTreeNode[0]); - } - - /* (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.filter.model.ITmfFilterTreeNode#getChild(int) - */ - @Override - public ITmfFilterTreeNode getChild(final int index) throws IndexOutOfBoundsException { - return children.get(index); - } - - /* (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.filter.model.ITmfFilterTreeNode#remove() - */ - @Override - public ITmfFilterTreeNode remove() { - if (getParent() != null) { - getParent().removeChild(this); - } - return this; - } - - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.filter.model.ITmfFilterTreeNode#removeChild(org.eclipse.linuxtools.tmf.filter.model.ITmfFilterTreeNode) - */ - @Override - public ITmfFilterTreeNode removeChild(ITmfFilterTreeNode node) { - children.remove(node); - node.setParent(null); - return node; - } - - /* (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.filter.model.ITmfFilterTreeNode#addChild(org.eclipse.linuxtools.tmf.filter.model.ITmfFilterTreeNode) - */ - @Override - public int addChild(final ITmfFilterTreeNode node) { - node.setParent(this); - if(children.add(node)) { - return (children.size() - 1); - } - return -1; - } - - /* (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.filter.model.ITmfFilterTreeNode#replaceChild(int, org.eclipse.linuxtools.tmf.filter.model.ITmfFilterTreeNode) - */ - @Override - public ITmfFilterTreeNode replaceChild(final int index, final ITmfFilterTreeNode node) throws IndexOutOfBoundsException { - node.setParent(this); - return children.set(index, node); - } - - /* (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.filter.model.ITmfFilterTreeNode#setParent(org.eclipse.linuxtools.tmf.filter.model.ITmfFilterTreeNode) - */ - @Override - public void setParent(final ITmfFilterTreeNode parent) { - this.parent = parent; - } - - - /* (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.filter.model.ITmfFilterTreeNode#matches(org.eclipse.linuxtools.tmf.event.TmfEvent) - */ - @Override - public abstract boolean matches(ITmfEvent event); + @Override + public int getChildrenCount() { + return children.size(); + } + + @Override + public ITmfFilterTreeNode[] getChildren() { + return children.toArray(new ITmfFilterTreeNode[0]); + } + + @Override + public ITmfFilterTreeNode getChild(final int index) throws IndexOutOfBoundsException { + return children.get(index); + } + + @Override + public ITmfFilterTreeNode remove() { + if (getParent() != null) { + getParent().removeChild(this); + } + return this; + } + + @Override + public ITmfFilterTreeNode removeChild(ITmfFilterTreeNode node) { + children.remove(node); + node.setParent(null); + return node; + } + + @Override + public int addChild(final ITmfFilterTreeNode node) { + node.setParent(this); + if (children.add(node)) { + return (children.size() - 1); + } + return -1; + } + + @Override + public ITmfFilterTreeNode replaceChild(final int index, final ITmfFilterTreeNode node) throws IndexOutOfBoundsException { + node.setParent(this); + return children.set(index, node); + } + + @Override + public void setParent(final ITmfFilterTreeNode parent) { + this.parent = parent; + } + + @Override + public abstract boolean matches(ITmfEvent event); /** * @param event the event @@ -186,28 +149,23 @@ public abstract class TmfFilterTreeNode implements ITmfFilterTreeNode, Cloneable return value; } - /* (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.filter.model.ITmfFilterTreeNode#getValidChildren() - * - * By default, all node types are valid children. Override if different. - */ - @Override - public List getValidChildren() { - return Arrays.asList(VALID_CHILDREN); - } - - @Override - public ITmfFilterTreeNode clone() { - try { - TmfFilterTreeNode clone = (TmfFilterTreeNode) super.clone(); - clone.parent = null; - clone.children = new ArrayList(children.size()); - for (ITmfFilterTreeNode child : getChildren()) { - clone.addChild(child.clone()); - } - return clone; - } catch (CloneNotSupportedException e) { - return null; - } - } + @Override + public List getValidChildren() { + return Arrays.asList(VALID_CHILDREN); + } + + @Override + public ITmfFilterTreeNode clone() { + try { + TmfFilterTreeNode clone = (TmfFilterTreeNode) super.clone(); + clone.parent = null; + clone.children = new ArrayList(children.size()); + for (ITmfFilterTreeNode child : getChildren()) { + clone.addChild(child.clone()); + } + return clone; + } catch (CloneNotSupportedException e) { + return null; + } + } } diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/filter/xml/TmfFilterContentHandler.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/filter/xml/TmfFilterContentHandler.java index d5d3550fea..9cc87af79e 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/filter/xml/TmfFilterContentHandler.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/filter/xml/TmfFilterContentHandler.java @@ -1,11 +1,11 @@ /******************************************************************************* - * Copyright (c) 2010, 2012 Ericsson - * + * Copyright (c) 2010, 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: * Yuriy Vashchuk (yvashchuk@gmail.com) - Initial API and implementation * based on http://smeric.developpez.com/java/cours/xml/sax/ @@ -34,19 +34,19 @@ import org.xml.sax.helpers.DefaultHandler; /** * The SAX Content Handler - * + * * @version 1.0 * @author Yuriy Vashchuk * @author Patrick Tasse */ public class TmfFilterContentHandler extends DefaultHandler { - + private ITmfFilterTreeNode fRoot = null; private Stack fFilterTreeStack = null; /** * The default constructor - */ + */ public TmfFilterContentHandler() { super(); fFilterTreeStack = new Stack(); @@ -54,53 +54,50 @@ public class TmfFilterContentHandler extends DefaultHandler { /** * Getter of tree - * + * * @return The builded tree - */ + */ public ITmfFilterTreeNode getTree() { return fRoot; } - - /* - * (non-Javadoc) - * @see org.xml.sax.ContentHandler#startElement(java.lang.String, java.lang.String, java.lang.String, org.xml.sax.Attributes) - */ + + @Override public void startElement(String uri, String localName, String qName, Attributes atts) throws SAXException { ITmfFilterTreeNode node = null; - + if (localName.equalsIgnoreCase(TmfFilterRootNode.NODE_NAME)) { - + node = new TmfFilterRootNode(); - + } else if (localName.equals(TmfFilterNode.NODE_NAME)) { - + node = new TmfFilterNode(atts.getValue(TmfFilterNode.NAME_ATTR)); - + } else if (localName.equals(TmfFilterEventTypeNode.NODE_NAME)) { - + node = new TmfFilterEventTypeNode(null); ((TmfFilterEventTypeNode) node).setEventType(atts.getValue(TmfFilterEventTypeNode.TYPE_ATTR)); ((TmfFilterEventTypeNode) node).setName(atts.getValue(TmfFilterEventTypeNode.NAME_ATTR)); - + } else if (localName.equals(TmfFilterAndNode.NODE_NAME)) { - + node = new TmfFilterAndNode(null); String value = atts.getValue(TmfFilterAndNode.NOT_ATTR); if (value != null && value.equalsIgnoreCase(Boolean.TRUE.toString())) { ((TmfFilterAndNode) node).setNot(true); } - + } else if (localName.equals(TmfFilterOrNode.NODE_NAME)) { - + node = new TmfFilterOrNode(null); String value = atts.getValue(TmfFilterOrNode.NOT_ATTR); if (value != null && value.equalsIgnoreCase(Boolean.TRUE.toString())) { ((TmfFilterOrNode) node).setNot(true); } - + } else if (localName.equals(TmfFilterContainsNode.NODE_NAME)) { - + node = new TmfFilterContainsNode(null); String value = atts.getValue(TmfFilterContainsNode.NOT_ATTR); if (value != null && value.equalsIgnoreCase(Boolean.TRUE.toString())) { @@ -112,9 +109,9 @@ public class TmfFilterContentHandler extends DefaultHandler { if (value != null && value.equalsIgnoreCase(Boolean.TRUE.toString())) { ((TmfFilterContainsNode) node).setIgnoreCase(true); } - + } else if (localName.equals(TmfFilterEqualsNode.NODE_NAME)) { - + node = new TmfFilterEqualsNode(null); String value = atts.getValue(TmfFilterEqualsNode.NOT_ATTR); if (value != null && value.equalsIgnoreCase(Boolean.TRUE.toString())) { @@ -126,9 +123,9 @@ public class TmfFilterContentHandler extends DefaultHandler { if (value != null && value.equalsIgnoreCase(Boolean.TRUE.toString())) { ((TmfFilterEqualsNode) node).setIgnoreCase(true); } - + } else if (localName.equals(TmfFilterMatchesNode.NODE_NAME)) { - + node = new TmfFilterMatchesNode(null); String value = atts.getValue(TmfFilterMatchesNode.NOT_ATTR); if (value != null && value.equalsIgnoreCase(Boolean.TRUE.toString())) { @@ -136,9 +133,9 @@ public class TmfFilterContentHandler extends DefaultHandler { } ((TmfFilterMatchesNode) node).setField(atts.getValue(TmfFilterMatchesNode.FIELD_ATTR)); ((TmfFilterMatchesNode) node).setRegex(atts.getValue(TmfFilterMatchesNode.REGEX_ATTR)); - + } else if (localName.equals(TmfFilterCompareNode.NODE_NAME)) { - + node = new TmfFilterCompareNode(null); String value = atts.getValue(TmfFilterCompareNode.NOT_ATTR); if (value != null && value.equalsIgnoreCase(Boolean.TRUE.toString())) { @@ -160,16 +157,12 @@ public class TmfFilterContentHandler extends DefaultHandler { } } ((TmfFilterCompareNode) node).setValue(atts.getValue(TmfFilterCompareNode.VALUE_ATTR)); - + } fFilterTreeStack.push(node); } - /* - * (non-Javadoc) - * @see org.xml.sax.ContentHandler#endElement(java.lang.String, java.lang.String, java.lang.String) - */ @Override public void endElement(String uri, String localName, String qName) throws SAXException { ITmfFilterTreeNode node = fFilterTreeStack.pop(); @@ -180,7 +173,7 @@ public class TmfFilterContentHandler extends DefaultHandler { node instanceof TmfFilterTreeNode) { fFilterTreeStack.lastElement().addChild(node); } - + } } diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/signal/TmfClearExperimentSignal.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/signal/TmfClearExperimentSignal.java index 2ab51ac44f..6c2a955df2 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/signal/TmfClearExperimentSignal.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/signal/TmfClearExperimentSignal.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 @@ -28,9 +28,6 @@ public class TmfClearExperimentSignal extends TmfSignal { super(source); } - /* (non-Javadoc) - * @see java.lang.Object#toString() - */ @Override @SuppressWarnings("nls") public String toString() { diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/signal/TmfSignalManager.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/signal/TmfSignalManager.java index 3f467e8e9a..cbbf343b53 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/signal/TmfSignalManager.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/signal/TmfSignalManager.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2012 Ericsson + * Copyright (c) 2009, 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 diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/signal/TmfTimeSynchSignal.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/signal/TmfTimeSynchSignal.java index 70906fa54c..9ad5454fc4 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/signal/TmfTimeSynchSignal.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/signal/TmfTimeSynchSignal.java @@ -46,11 +46,6 @@ public class TmfTimeSynchSignal extends TmfSignal { return fCurrentTime; } - /* - * (non-Javadoc) - * - * @see java.lang.Object#toString() - */ @Override public String toString() { return "[TmfTimeSynchSignal (" + fCurrentTime.toString() + ")]"; //$NON-NLS-1$ //$NON-NLS-2$ diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/signal/TmfTraceRangeUpdatedSignal.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/signal/TmfTraceRangeUpdatedSignal.java index e42224f874..57e259801b 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/signal/TmfTraceRangeUpdatedSignal.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/signal/TmfTraceRangeUpdatedSignal.java @@ -60,9 +60,6 @@ public class TmfTraceRangeUpdatedSignal extends TmfSignal { return fTimeRange; } - /* (non-Javadoc) - * @see java.lang.Object#toString() - */ @Override @SuppressWarnings("nls") public String toString() { diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/signal/TmfTraceUpdatedSignal.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/signal/TmfTraceUpdatedSignal.java index 35966ee272..176d431448 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/signal/TmfTraceUpdatedSignal.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/signal/TmfTraceUpdatedSignal.java @@ -60,11 +60,6 @@ public class TmfTraceUpdatedSignal extends TmfSignal { return fTimeRange; } - /* - * (non-Javadoc) - * - * @see java.lang.Object#toString() - */ @Override @SuppressWarnings("nls") public String toString() { diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/statevalue/ITmfStateValue.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/statevalue/ITmfStateValue.java index 6ecb23342f..34f33e3e32 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/statevalue/ITmfStateValue.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/statevalue/ITmfStateValue.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 diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/statevalue/IntegerStateValue.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/statevalue/IntegerStateValue.java index bf7db0534f..d3db069ff1 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/statevalue/IntegerStateValue.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/statevalue/IntegerStateValue.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2012 Ericsson + * Copyright (c) 2012, 2013 Ericsson * Copyright (c) 2010, 2011 École Polytechnique de Montréal * Copyright (c) 2010, 2011 Alexandre Montplaisir * diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/statevalue/NullStateValue.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/statevalue/NullStateValue.java index e42f94b14d..52de5e5fcc 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/statevalue/NullStateValue.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/statevalue/NullStateValue.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2012 Ericsson + * Copyright (c) 2012, 2013 Ericsson * Copyright (c) 2010, 2011 École Polytechnique de Montréal * Copyright (c) 2010, 2011 Alexandre Montplaisir * diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/statevalue/StringStateValue.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/statevalue/StringStateValue.java index 743ea1d00f..bf478cb9ba 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/statevalue/StringStateValue.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/statevalue/StringStateValue.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2012 Ericsson + * Copyright (c) 2012, 2013 Ericsson * Copyright (c) 2010, 2011 École Polytechnique de Montréal * Copyright (c) 2010, 2011 Alexandre Montplaisir * diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/statevalue/TmfStateValue.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/statevalue/TmfStateValue.java index ec2fa4e9a5..b2405ed54d 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/statevalue/TmfStateValue.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/statevalue/TmfStateValue.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2012 Ericsson + * Copyright (c) 2012, 2013 Ericsson * Copyright (c) 2010, 2011 École Polytechnique de Montréal * Copyright (c) 2010, 2011 Alexandre Montplaisir * diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/timestamp/TmfSimpleTimestamp.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/timestamp/TmfSimpleTimestamp.java index 90c22c672c..94fccfb051 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/timestamp/TmfSimpleTimestamp.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/timestamp/TmfSimpleTimestamp.java @@ -59,9 +59,6 @@ public class TmfSimpleTimestamp extends TmfTimestamp { // ITmfTimestamp // ------------------------------------------------------------------------ - /* (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.core.event.TmfTimestamp#normalize(long, int) - */ @Override public ITmfTimestamp normalize(final long offset, final int scale) { if (scale == 0) { @@ -70,9 +67,6 @@ public class TmfSimpleTimestamp extends TmfTimestamp { return super.normalize(offset, scale); } - /* (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.core.event.TmfTimestamp#compareTo(org.eclipse.linuxtools.tmf.core.event.ITmfTimestamp, boolean) - */ @Override public int compareTo(final ITmfTimestamp ts, final boolean withinPrecision) { if (ts instanceof TmfSimpleTimestamp) { @@ -82,9 +76,6 @@ public class TmfSimpleTimestamp extends TmfTimestamp { return super.compareTo(ts, withinPrecision); } - /* (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.core.event.TmfTimestamp#getDelta(org.eclipse.linuxtools.tmf.core.event.ITmfTimestamp) - */ @Override public ITmfTimestamp getDelta(final ITmfTimestamp ts) { if (ts instanceof TmfSimpleTimestamp) { @@ -97,17 +88,11 @@ public class TmfSimpleTimestamp extends TmfTimestamp { // Object // ------------------------------------------------------------------------ - /* (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.core.event.TmfTimestamp#hashCode() - */ @Override public int hashCode() { return super.hashCode(); } - /* (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.core.event.TmfTimestamp#equals(java.lang.Object) - */ @Override public boolean equals(final Object other) { if (this == other) { diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/timestamp/TmfTimeRange.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/timestamp/TmfTimeRange.java index 13abe64ac8..87216e452b 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/timestamp/TmfTimeRange.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/timestamp/TmfTimeRange.java @@ -159,9 +159,6 @@ public final class TmfTimeRange { // Object // ------------------------------------------------------------------------ - /* (non-Javadoc) - * @see java.lang.Object#hashCode() - */ @Override public int hashCode() { final int prime = 31; @@ -171,9 +168,6 @@ public final class TmfTimeRange { return result; } - /* (non-Javadoc) - * @see java.lang.Object#equals(java.lang.Object) - */ @Override public boolean equals(final Object obj) { if (this == obj) { @@ -195,9 +189,6 @@ public final class TmfTimeRange { return true; } - /* (non-Javadoc) - * @see java.lang.Object#toString() - */ @Override @SuppressWarnings("nls") public String toString() { diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/timestamp/TmfTimestamp.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/timestamp/TmfTimestamp.java index c31ef9082e..13ee08a6ea 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/timestamp/TmfTimestamp.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/timestamp/TmfTimestamp.java @@ -138,25 +138,16 @@ public class TmfTimestamp implements ITmfTimestamp { // ITmfTimestamp // ------------------------------------------------------------------------ - /* (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.core.event.ITmfTimestamp#getValue() - */ @Override public long getValue() { return fValue; } - /* (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.core.event.ITmfTimestamp#getScale() - */ @Override public int getScale() { return fScale; } - /* (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.core.event.ITmfTimestamp#getPrecision() - */ @Override public int getPrecision() { return fPrecision; @@ -184,9 +175,6 @@ public class TmfTimestamp implements ITmfTimestamp { 1000000000000000000L, }; - /* (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.core.event.ITmfTimestamp#normalize(long, int) - */ @Override public ITmfTimestamp normalize(final long offset, final int scale) { @@ -230,9 +218,6 @@ public class TmfTimestamp implements ITmfTimestamp { return new TmfTimestamp(value, scale, precision); } - /* (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.core.event.ITmfTimestamp#compareTo(org.eclipse.linuxtools.tmf.core.event.ITmfTimestamp, boolean) - */ @Override public int compareTo(final ITmfTimestamp ts, final boolean withinPrecision) { @@ -279,9 +264,6 @@ public class TmfTimestamp implements ITmfTimestamp { } } - /* (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.core.event.ITmfTimestamp#getDelta(org.eclipse.linuxtools.tmf.core.event.ITmfTimestamp) - */ @Override public ITmfTimestamp getDelta(final ITmfTimestamp ts) { final ITmfTimestamp nts = ts.normalize(0, fScale); @@ -302,9 +284,6 @@ public class TmfTimestamp implements ITmfTimestamp { // Comparable // ------------------------------------------------------------------------ - /* (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.core.event.ITmfTimestamp#compareTo(org.eclipse.linuxtools.tmf.core.event.ITmfTimestamp) - */ @Override public int compareTo(final ITmfTimestamp ts) { return compareTo(ts, false); @@ -314,9 +293,6 @@ public class TmfTimestamp implements ITmfTimestamp { // Object // ------------------------------------------------------------------------ - /* (non-Javadoc) - * @see java.lang.Object#hashCode() - */ @Override public int hashCode() { final int prime = 31; @@ -327,9 +303,6 @@ public class TmfTimestamp implements ITmfTimestamp { return result; } - /* (non-Javadoc) - * @see java.lang.Object#equals(java.lang.Object) - */ @Override public boolean equals(final Object other) { if (this == other) { @@ -345,17 +318,11 @@ public class TmfTimestamp implements ITmfTimestamp { return compareTo(ts, false) == 0; } - /* (non-Javadoc) - * @see java.lang.Object#toString() - */ @Override public String toString() { return toString(TmfTimestampFormat.getDefaulTimeFormat()); } - /* (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.core.event.ITmfTimestamp#toString(org.eclipse.linuxtools.tmf.core.event.TmfTimestampFormat) - */ /** * @since 2.0 */ diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/timestamp/TmfTimestampDelta.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/timestamp/TmfTimestampDelta.java index 6c7c502227..ea0775f993 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/timestamp/TmfTimestampDelta.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/timestamp/TmfTimestampDelta.java @@ -81,27 +81,17 @@ public class TmfTimestampDelta extends TmfTimestamp { // Operations // ------------------------------------------------------------------------ - /* (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.core.event.ITmfTimestamp#normalize(long, int) - */ @Override public ITmfTimestamp normalize(final long offset, final int scale) { ITmfTimestamp nts = super.normalize(offset, scale); return new TmfTimestampDelta(nts.getValue(), nts.getScale(), nts.getPrecision()); } - /* (non-Javadoc) - * @see java.lang.Object#toString() - */ @Override public String toString() { return toString(TmfTimestampFormat.getDefaulIntervalFormat()); } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.core.event.TmfTimestamp#toString(org.eclipse.linuxtools.tmf.core.event.TmfTimestampFormat) - */ @Override public String toString(TmfTimestampFormat format) { if (getValue() < 0) { diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/timestamp/TmfTimestampFormat.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/timestamp/TmfTimestampFormat.java index 9c2b334017..50c143d551 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/timestamp/TmfTimestampFormat.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/timestamp/TmfTimestampFormat.java @@ -316,9 +316,6 @@ public class TmfTimestampFormat extends SimpleDateFormat { return fDefaultIntervalFormat; } - /* (non-Javadoc) - * @see java.text.SimpleDateFormat#applyPattern(java.lang.String) - */ @Override public void applyPattern(String pattern) { fPattern = pattern; @@ -326,9 +323,6 @@ public class TmfTimestampFormat extends SimpleDateFormat { super.applyPattern(quotedPattern); } - /* (non-Javadoc) - * @see java.text.SimpleDateFormat#toPattern() - */ @Override public String toPattern() { return fPattern; diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/TmfCheckpoint.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/TmfCheckpoint.java index 7625a18450..9c93ddcaaa 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/TmfCheckpoint.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/TmfCheckpoint.java @@ -79,9 +79,6 @@ public class TmfCheckpoint implements ITmfCheckpoint { return fTimestamp; } - /* (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.core.trace.ITmfCheckpoint#getLocation() - */ @Override public ITmfLocation getLocation() { return fLocation; @@ -91,12 +88,6 @@ public class TmfCheckpoint implements ITmfCheckpoint { // Comparable // ------------------------------------------------------------------------ - /* (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.core.trace.ITmfCheckpoint#compareTo(org.eclipse.linuxtools.tmf.core.trace.ITmfCheckpoint) - * - * Compares the checkpoints timestamp. If either is null, compares the - * trace checkpoints locations. - */ @Override @SuppressWarnings({ "unchecked", "rawtypes" }) public int compareTo(final ITmfCheckpoint other) { @@ -133,9 +124,6 @@ public class TmfCheckpoint implements ITmfCheckpoint { // Object // ------------------------------------------------------------------------ - /* (non-Javadoc) - * @see java.lang.Object#hashCode() - */ @Override public int hashCode() { final int prime = 31; @@ -145,9 +133,6 @@ public class TmfCheckpoint implements ITmfCheckpoint { return result; } - /* (non-Javadoc) - * @see java.lang.Object#equals(java.lang.Object) - */ @Override public boolean equals(final Object obj) { if (this == obj) { @@ -177,9 +162,6 @@ public class TmfCheckpoint implements ITmfCheckpoint { return true; } - /* (non-Javadoc) - * @see java.lang.Object#toString() - */ @Override @SuppressWarnings("nls") public String toString() { diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/TmfCheckpointIndexer.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/TmfCheckpointIndexer.java index cd34503f2c..f8964ea143 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/TmfCheckpointIndexer.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/TmfCheckpointIndexer.java @@ -103,9 +103,6 @@ public class TmfCheckpointIndexer implements ITmfTraceIndexer { fIsIndexing = false; } - /* (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.core.trace.ITmfTraceIndexer#dispose() - */ @Override public void dispose() { if ((fIndexingRequest != null) && !fIndexingRequest.isCompleted()) { @@ -118,9 +115,6 @@ public class TmfCheckpointIndexer implements ITmfTraceIndexer { // ITmfTraceIndexer - isIndexing // ------------------------------------------------------------------------ - /* (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.core.trace.ITmfTraceIndexer#isIndexing() - */ @Override public boolean isIndexing() { return fIsIndexing; @@ -274,9 +268,6 @@ public class TmfCheckpointIndexer implements ITmfTraceIndexer { return restoreCheckpoint(index); } - /* (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.core.trace.ITmfTraceIndexer#seekIndex(long) - */ @Override public ITmfContext seekIndex(final long rank) { diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/TmfContext.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/TmfContext.java index ae7c6eef02..96a5b93c15 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/TmfContext.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/TmfContext.java @@ -85,41 +85,26 @@ public class TmfContext implements ITmfContext { // ITmfContext // ------------------------------------------------------------------------ - /* (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.core.trace.ITmfContext#getLocation() - */ @Override public ITmfLocation getLocation() { return fLocation; } - /* (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.core.trace.ITmfContext#setLocation(org.eclipse.linuxtools.tmf.core.trace.ITmfLocation) - */ @Override public void setLocation(final ITmfLocation location) { fLocation = location; } - /* (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.core.trace.ITmfContext#getRank() - */ @Override public long getRank() { return fRank; } - /* (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.core.trace.ITmfContext#setRank(long) - */ @Override public void setRank(final long rank) { fRank = rank; } - /* (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.core.trace.ITmfContext#increaseRank() - */ @Override public void increaseRank() { if (hasValidRank()) { @@ -127,17 +112,11 @@ public class TmfContext implements ITmfContext { } } - /* (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.core.trace.ITmfContext#hasValidRank() - */ @Override public boolean hasValidRank() { return fRank != UNKNOWN_RANK; } - /* (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.core.trace.ITmfContext#dispose() - */ @Override public void dispose() { } @@ -146,9 +125,6 @@ public class TmfContext implements ITmfContext { // Object // ------------------------------------------------------------------------ - /* (non-Javadoc) - * @see java.lang.Object#hashCode() - */ @Override public int hashCode() { final int prime = 31; @@ -158,9 +134,6 @@ public class TmfContext implements ITmfContext { return result; } - /* (non-Javadoc) - * @see java.lang.Object#equals(java.lang.Object) - */ @Override public boolean equals(final Object obj) { if (this == obj) { @@ -186,9 +159,6 @@ public class TmfContext implements ITmfContext { return true; } - /* (non-Javadoc) - * @see java.lang.Object#toString() - */ @Override @SuppressWarnings("nls") public String toString() { diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/TmfExperiment.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/TmfExperiment.java index 0b51145884..eb1926dfef 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/TmfExperiment.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/TmfExperiment.java @@ -174,16 +174,10 @@ public class TmfExperiment extends TmfTrace implements ITmfEventParser { // ITmfTrace - Initializers // ------------------------------------------------------------------------ - /* (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.core.trace.TmfTrace#initTrace(org.eclipse.core.resources.IResource, java.lang.String, java.lang.Class) - */ @Override public void initTrace(final IResource resource, final String path, final Class type) { } - /* (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.core.trace.ITmfTrace#validate(org.eclipse.core.resources.IProject, java.lang.String) - */ /** * @since 2.0 */ @@ -266,13 +260,6 @@ public class TmfExperiment extends TmfTrace implements ITmfEventParser { // ITmfTrace trace positioning // ------------------------------------------------------------------------ - /* (non-Javadoc) - * - * Returns a brand new context based on the location provided and - * initializes the event queues - * - * @see org.eclipse.linuxtools.tmf.core.trace.ITmfTrace#seekEvent(org.eclipse.linuxtools.tmf.core.trace.ITmfLocation) - */ @Override public synchronized ITmfContext seekEvent(final ITmfLocation location) { // Validate the location @@ -319,18 +306,12 @@ public class TmfExperiment extends TmfTrace implements ITmfEventParser { // ITmfTrace - SeekEvent operations (returning a trace context) // ------------------------------------------------------------------------ - /* (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.core.trace.ITmfTrace#seekEvent(double) - */ @Override public ITmfContext seekEvent(final double ratio) { final ITmfContext context = seekEvent(Math.round(ratio * getNbEvents())); return context; } - /* (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.core.trace.ITmfTrace#getLocationRatio(org.eclipse.linuxtools.tmf.core.trace.ITmfLocation) - */ @Override public double getLocationRatio(final ITmfLocation location) { if (location instanceof TmfExperimentLocation) { @@ -344,9 +325,6 @@ public class TmfExperiment extends TmfTrace implements ITmfEventParser { return 0.0; } - /* (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.core.trace.ITmfTrace#getCurrentLocation() - */ @Override public ITmfLocation getCurrentLocation() { // never used @@ -357,9 +335,6 @@ public class TmfExperiment extends TmfTrace implements ITmfEventParser { // ITmfTrace trace positioning // ------------------------------------------------------------------------ - /* (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.core.trace.ITmfEventParser#parseEvent(org.eclipse.linuxtools.tmf.core.trace.ITmfContext) - */ @Override public synchronized ITmfEvent parseEvent(final ITmfContext context) { final ITmfContext tmpContext = seekEvent(context.getLocation()); @@ -367,9 +342,6 @@ public class TmfExperiment extends TmfTrace implements ITmfEventParser { return event; } - /* (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.core.trace.TmfTrace#getNext(org.eclipse.linuxtools.tmf.core.trace.ITmfContext) - */ @Override public synchronized ITmfEvent getNext(ITmfContext context) { @@ -429,9 +401,6 @@ public class TmfExperiment extends TmfTrace implements ITmfEventParser { return event; } - /* (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.core.trace.TmfTrace#getInitialRangeOffset() - */ /** * @since 2.0 */ @@ -451,9 +420,6 @@ public class TmfExperiment extends TmfTrace implements ITmfEventParser { return initTs; } - /* (non-Javadoc) - * @see java.lang.Object#toString() - */ @Override @SuppressWarnings("nls") public synchronized String toString() { @@ -534,9 +500,6 @@ public class TmfExperiment extends TmfTrace implements ITmfEventParser { thread.start(); } - /* (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.trace.ITmfTrace#getStreamingInterval() - */ @Override public long getStreamingInterval() { long interval = 0; @@ -550,9 +513,6 @@ public class TmfExperiment extends TmfTrace implements ITmfEventParser { // Signal handlers // ------------------------------------------------------------------------ - /* (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.core.trace.TmfTrace#traceOpened(org.eclipse.linuxtools.tmf.core.signal.TmfTraceOpenedSignal) - */ @Override @TmfSignalHandler public void traceOpened(TmfTraceOpenedSignal signal) { diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/TmfLongLocation.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/TmfLongLocation.java index b54ec5da31..905e372ad1 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/TmfLongLocation.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/TmfLongLocation.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 @@ -38,9 +38,6 @@ public final class TmfLongLocation extends TmfLocation { super(other.getLocationInfo()); } - /* (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.core.trace.ITmfLocation#getLocationInfo() - */ @Override public Long getLocationInfo() { return (Long) super.getLocationInfo(); diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/TmfTimestampLocation.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/TmfTimestampLocation.java index 5228452989..5136d6d1b3 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/TmfTimestampLocation.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/TmfTimestampLocation.java @@ -40,9 +40,6 @@ public final class TmfTimestampLocation extends TmfLocation { super(other.getLocationInfo()); } - /* (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.core.trace.ITmfLocation#getLocationInfo() - */ @Override public ITmfTimestamp getLocationInfo() { return (ITmfTimestamp) super.getLocationInfo(); diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/TmfTrace.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/TmfTrace.java index df0f01c1d9..c5f87d7255 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/TmfTrace.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/TmfTrace.java @@ -189,9 +189,6 @@ public abstract class TmfTrace extends TmfEventProvider implements ITmfTrace { // ITmfTrace - Initializers // ------------------------------------------------------------------------ - /* (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.core.trace.ITmfTrace#initTrace(org.eclipse.core.resources.IResource, java.lang.String, java.lang.Class) - */ @Override public void initTrace(final IResource resource, final String path, final Class type) throws TmfTraceException { fIndexer = new TmfCheckpointIndexer(this, fCacheSize); @@ -319,41 +316,26 @@ public abstract class TmfTrace extends TmfEventProvider implements ITmfTrace { return new ITmfTrace[] { this }; } - /* (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.core.trace.ITmfTrace#getEventType() - */ @Override public Class getEventType() { return (Class) super.getType(); } - /* (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.core.trace.ITmfTrace#getResource() - */ @Override public IResource getResource() { return fResource; } - /* (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.core.trace.ITmfTrace#getPath() - */ @Override public String getPath() { return fPath; } - /* (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.core.trace.ITmfTrace#getIndexPageSize() - */ @Override public int getCacheSize() { return fCacheSize; } - /* (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.core.trace.ITmfTrace#getStreamingInterval() - */ @Override public long getStreamingInterval() { return fStreamingInterval; diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/uml2sd/TmfSyncSequenceDiagramEvent.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/uml2sd/TmfSyncSequenceDiagramEvent.java index 62bc898833..462b6392ac 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/uml2sd/TmfSyncSequenceDiagramEvent.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/uml2sd/TmfSyncSequenceDiagramEvent.java @@ -76,28 +76,17 @@ public class TmfSyncSequenceDiagramEvent implements ITmfSyncSequenceDiagramEvent // ------------------------------------------------------------------------ // Operations // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.core.uml2sd.ITmfSyncSequenceDiagramEvent#getSender() - */ + @Override public String getSender() { return fSender; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.core.uml2sd.ITmfSyncSequenceDiagramEvent#getReceiver() - */ @Override public String getReceiver() { return fReceiver; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.core.uml2sd.ITmfSyncSequenceDiagramEvent#getName() - */ @Override public String getName() { return fName; diff --git a/org.eclipse.linuxtools.tmf.help/doc/User-Guide.mediawiki b/org.eclipse.linuxtools.tmf.help/doc/User-Guide.mediawiki index 593ce6fc28..df64ae47eb 100644 --- a/org.eclipse.linuxtools.tmf.help/doc/User-Guide.mediawiki +++ b/org.eclipse.linuxtools.tmf.help/doc/User-Guide.mediawiki @@ -478,58 +478,34 @@ public class SampleLoader implements IUml2SDLoader, ISDPagingProvider { fSdView.setFrame(testFrame); } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.handlers.provider.ISDPagingProvider#hasNextPage() - */ @Override public boolean hasNextPage() { return page == 0; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.handlers.provider.ISDPagingProvider#hasPrevPage() - */ @Override public boolean hasPrevPage() { return page == 1; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.handlers.provider.ISDPagingProvider#nextPage() - */ @Override public void nextPage() { page = 1; createSecondFrame(); } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.handlers.provider.ISDPagingProvider#prevPage() - */ @Override public void prevPage() { page = 0; createFrame(); } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.handlers.provider.ISDPagingProvider#firstPage() - */ @Override public void firstPage() { page = 0; createFrame(); } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.handlers.provider.ISDPagingProvider#lastPage() - */ @Override public void lastPage() { page = 1; @@ -576,10 +552,7 @@ public class SampleLoader implements IUml2SDLoader, ISDPagingProvider, ISDFindPr fSdView.setSDFindProvider(this); createFrame(); } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.handlers.provider.ISDGraphNodeSupporter#isNodeSupported(int) - */ + @Override public boolean isNodeSupported(int nodeType) { switch (nodeType) { @@ -593,10 +566,6 @@ public class SampleLoader implements IUml2SDLoader, ISDPagingProvider, ISDFindPr return false; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.handlers.provider.ISDGraphNodeSupporter#getNodeName(int, java.lang.String) - */ @Override public String getNodeName(int nodeType, String loaderClassName) { switch (nodeType) { @@ -608,10 +577,6 @@ public class SampleLoader implements IUml2SDLoader, ISDPagingProvider, ISDFindPr return ""; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.handlers.provider.ISDFindProvider#find(org.eclipse.linuxtools.tmf.ui.views.uml2sd.handlers.widgets.Criteria) - */ @Override public boolean find(Criteria criteria) { Frame frame = fSdView.getFrame(); @@ -634,10 +599,6 @@ public class SampleLoader implements IUml2SDLoader, ISDPagingProvider, ISDFindPr return false; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.handlers.provider.ISDFindProvider#cancel() - */ @Override public void cancel() { // reset find parameters @@ -682,10 +643,6 @@ public class SampleLoader implements IUml2SDLoader, ISDPagingProvider, ISDFindPr createFrame(); } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.handlers.provider.ISDFilterProvider#filter(java.util.List) - */ @Override public boolean filter(List list) { return false; @@ -733,10 +690,6 @@ public class SampleLoader implements IUml2SDLoader, ISDPagingProvider, ISDFindPr createFrame(); } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.handlers.provider.ISDExtendedActionBarProvider#supplementCoolbarContent(org.eclipse.ui.IActionBars) - */ @Override public void supplementCoolbarContent(IActionBars iactionbars) { Action action = new Action("Refresh") { @@ -806,10 +759,6 @@ public class SampleLoader implements IUml2SDLoader, ISDPagingProvider, ISDFindPr createFrame(); } - /* - * (non-Javadoc) - * @see org.eclipse.ui.ISelectionListener#selectionChanged(org.eclipse.ui.IWorkbenchPart, org.eclipse.jface.viewers.ISelection) - */ @Override public void selectionChanged(IWorkbenchPart part, ISelection selection) { ISelection sel = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getSelectionService().getSelection(); diff --git a/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/views/uml2sd/loader/IUml2SDTestConstants.java b/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/views/uml2sd/loader/IUml2SDTestConstants.java index 734f1fe07a..6587f6e569 100644 --- a/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/views/uml2sd/loader/IUml2SDTestConstants.java +++ b/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/views/uml2sd/loader/IUml2SDTestConstants.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011, 2012 Ericsson + * Copyright (c) 2011, 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 diff --git a/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/views/uml2sd/loader/Uml2SDTestSetup.java b/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/views/uml2sd/loader/Uml2SDTestSetup.java index d318b1659e..3ea6580ad0 100644 --- a/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/views/uml2sd/loader/Uml2SDTestSetup.java +++ b/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/views/uml2sd/loader/Uml2SDTestSetup.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011, 2012 Ericsson + * Copyright (c) 2011, 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 @@ -27,19 +27,11 @@ public class Uml2SDTestSetup extends TestSetup { super(test); } - /* - * (non-Javadoc) - * @see junit.extensions.TestSetup#setUp() - */ @Override protected void setUp() throws Exception { Uml2SDTestFacility.getInstance().init(); } - /* - * (non-Javadoc) - * @see junit.extensions.TestSetup#tearDown() - */ @Override protected void tearDown() throws Exception { Uml2SDTestFacility.getInstance().dispose(); diff --git a/org.eclipse.linuxtools.tmf.ui.tests/widgetStubs/org/eclipse/linuxtools/tmf/ui/tests/uml2sd/load/TestLoaders.java b/org.eclipse.linuxtools.tmf.ui.tests/widgetStubs/org/eclipse/linuxtools/tmf/ui/tests/uml2sd/load/TestLoaders.java index 52086153d9..5eeb6133df 100644 --- a/org.eclipse.linuxtools.tmf.ui.tests/widgetStubs/org/eclipse/linuxtools/tmf/ui/tests/uml2sd/load/TestLoaders.java +++ b/org.eclipse.linuxtools.tmf.ui.tests/widgetStubs/org/eclipse/linuxtools/tmf/ui/tests/uml2sd/load/TestLoaders.java @@ -221,10 +221,6 @@ public class TestLoaders implements IUml2SDLoader, ISDFindProvider, ISDFilterPro v.setFrame(testFrame); } - /* - * (non-Javadoc) - * @see org.eclipse.hyades.uml2sd.ui.actions.provider.ISDFindProvider#find(org.eclipse.hyades.uml2sd.ui.actions.widgets.Criteria) - */ @Override public boolean find(Criteria toSearch) { Frame frame = v.getFrame(); @@ -407,10 +403,6 @@ public class TestLoaders implements IUml2SDLoader, ISDFindProvider, ISDFilterPro } } - /* - * (non-Javadoc) - * @see org.eclipse.hyades.uml2sd.ui.actions.provider.ISDGraphNodeSupporter#isNodeSupported(int) - */ @Override public boolean isNodeSupported(int nodeType) { switch (nodeType) { diff --git a/org.eclipse.linuxtools.tmf.ui.tests/widgetStubs/org/eclipse/linuxtools/tmf/ui/widgets/timegraph/test/stub/adaption/TsfImplProvider.java b/org.eclipse.linuxtools.tmf.ui.tests/widgetStubs/org/eclipse/linuxtools/tmf/ui/widgets/timegraph/test/stub/adaption/TsfImplProvider.java index a7f1234150..1553dc5a03 100644 --- a/org.eclipse.linuxtools.tmf.ui.tests/widgetStubs/org/eclipse/linuxtools/tmf/ui/widgets/timegraph/test/stub/adaption/TsfImplProvider.java +++ b/org.eclipse.linuxtools.tmf.ui.tests/widgetStubs/org/eclipse/linuxtools/tmf/ui/widgets/timegraph/test/stub/adaption/TsfImplProvider.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2012 Ericsson + * Copyright (c) 2009, 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 diff --git a/org.eclipse.linuxtools.tmf.ui.tests/widgetStubs/org/eclipse/linuxtools/tmf/ui/widgets/timegraph/test/stub/model/TraceImpl.java b/org.eclipse.linuxtools.tmf.ui.tests/widgetStubs/org/eclipse/linuxtools/tmf/ui/widgets/timegraph/test/stub/model/TraceImpl.java index 75db378b65..4f7a7f24e5 100644 --- a/org.eclipse.linuxtools.tmf.ui.tests/widgetStubs/org/eclipse/linuxtools/tmf/ui/widgets/timegraph/test/stub/model/TraceImpl.java +++ b/org.eclipse.linuxtools.tmf.ui.tests/widgetStubs/org/eclipse/linuxtools/tmf/ui/widgets/timegraph/test/stub/model/TraceImpl.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2012 Ericsson + * Copyright (c) 2009, 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 diff --git a/org.eclipse.linuxtools.tmf.ui.tests/widgetStubs/org/eclipse/linuxtools/tmf/ui/widgets/timegraph/test/stub/model/TraceModelImplFactory.java b/org.eclipse.linuxtools.tmf.ui.tests/widgetStubs/org/eclipse/linuxtools/tmf/ui/widgets/timegraph/test/stub/model/TraceModelImplFactory.java index 77b38e0896..7b98ed5e6b 100644 --- a/org.eclipse.linuxtools.tmf.ui.tests/widgetStubs/org/eclipse/linuxtools/tmf/ui/widgets/timegraph/test/stub/model/TraceModelImplFactory.java +++ b/org.eclipse.linuxtools.tmf.ui.tests/widgetStubs/org/eclipse/linuxtools/tmf/ui/widgets/timegraph/test/stub/model/TraceModelImplFactory.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2012 Ericsson + * Copyright (c) 2009, 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 diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/Activator.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/Activator.java index 97b9436865..61ac6df2b3 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/Activator.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/Activator.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2012 Ericsson + * Copyright (c) 2009, 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 @@ -31,98 +31,93 @@ public class Activator extends AbstractUIPlugin { // Attributes // ------------------------------------------------------------------------ - /** - * The plug-in ID - */ - public static final String PLUGIN_ID = "org.eclipse.linuxtools.tmf.ui"; //$NON-NLS-1$ + /** + * The plug-in ID + */ + public static final String PLUGIN_ID = "org.eclipse.linuxtools.tmf.ui"; //$NON-NLS-1$ - /** - * The shared instance - */ - private static Activator plugin; + /** + * The shared instance + */ + private static Activator plugin; // ------------------------------------------------------------------------ // Constructors // ------------------------------------------------------------------------ - /** - * Constructor - */ - public Activator() { - } + /** + * Constructor + */ + public Activator() { + } // ------------------------------------------------------------------------ // Accessors // ------------------------------------------------------------------------ - /** - * Returns the TMF UI plug-in instance. - * - * @return the TMF UI plug-in instance. - */ - public static Activator getDefault() { - return plugin; - } + /** + * Returns the TMF UI plug-in instance. + * + * @return the TMF UI plug-in instance. + */ + public static Activator getDefault() { + return plugin; + } // ------------------------------------------------------------------------ // AbstractUIPlugin // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext) - */ - @Override - public void start(BundleContext context) throws Exception { - super.start(context); - plugin = this; - TmfUiTracer.init(); - TmfTraceElement.init(); - TmfTimePreferences.init(); - } - - /* - * (non-Javadoc) - * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext) - */ - @Override - public void stop(BundleContext context) throws Exception { - TmfUiTracer.stop(); - plugin = null; - super.stop(context); - } + @Override + public void start(BundleContext context) throws Exception { + super.start(context); + plugin = this; + TmfUiTracer.init(); + TmfTraceElement.init(); + TmfTimePreferences.init(); + } + + @Override + public void stop(BundleContext context) throws Exception { + TmfUiTracer.stop(); + plugin = null; + super.stop(context); + } // ------------------------------------------------------------------------ // Operations // ------------------------------------------------------------------------ - /** - * Gets an image object using given path within plug-in. - * - * @param path path to image file - * - * @return image object - */ - public Image getImageFromPath(String path){ + /** + * Gets an image object using given path within plug-in. + * + * @param path + * path to image file + * + * @return image object + */ + public Image getImageFromPath(String path) { return getImageDescripterFromPath(path).createImage(); } /** * Gets an image descriptor using given path within plug-in. * - * @param path path to image file + * @param path + * path to image file * * @return image descriptor object */ - public ImageDescriptor getImageDescripterFromPath(String path){ + public ImageDescriptor getImageDescripterFromPath(String path) { return AbstractUIPlugin.imageDescriptorFromPlugin(PLUGIN_ID, path); } /** - * Gets a image object from the image registry based on the given path. - * If the image is not in the registry it will be registered. + * Gets a image object from the image registry based on the given path. If + * the image is not in the registry it will be registered. * - * @param path to the image file + * @param path + * to the image file * @return image object */ public Image getImageFromImageRegistry(String path) { @@ -134,10 +129,6 @@ public class Activator extends AbstractUIPlugin { return icon; } - /* - * (non-Javadoc) - * @see org.eclipse.ui.plugin.AbstractUIPlugin#initializeImageRegistry(org.eclipse.jface.resource.ImageRegistry) - */ @Override protected void initializeImageRegistry(ImageRegistry reg) { reg.put(ITmfImageConstants.IMG_UI_ZOOM, getImageFromPath(ITmfImageConstants.IMG_UI_ZOOM)); @@ -151,55 +142,69 @@ public class Activator extends AbstractUIPlugin { /** * Logs a message with severity INFO in the runtime log of the plug-in. * - * @param message A message to log + * @param message + * A message to log */ public void logInfo(String message) { getLog().log(new Status(IStatus.INFO, PLUGIN_ID, message)); } /** - * Logs a message and exception with severity INFO in the runtime log of the plug-in. + * Logs a message and exception with severity INFO in the runtime log of the + * plug-in. * - * @param message A message to log - * @param exception A exception to log + * @param message + * A message to log + * @param exception + * A exception to log */ public void logInfo(String message, Throwable exception) { getLog().log(new Status(IStatus.INFO, PLUGIN_ID, message, exception)); } /** - * Logs a message and exception with severity WARNING in the runtime log of the plug-in. + * Logs a message and exception with severity WARNING in the runtime log of + * the plug-in. * - * @param message A message to log + * @param message + * A message to log */ public void logWarning(String message) { getLog().log(new Status(IStatus.WARNING, PLUGIN_ID, message)); } /** - * Logs a message and exception with severity WARNING in the runtime log of the plug-in. + * Logs a message and exception with severity WARNING in the runtime log of + * the plug-in. * - * @param message A message to log - * @param exception A exception to log + * @param message + * A message to log + * @param exception + * A exception to log */ public void logWarning(String message, Throwable exception) { getLog().log(new Status(IStatus.WARNING, PLUGIN_ID, message, exception)); } /** - * Logs a message and exception with severity ERROR in the runtime log of the plug-in. + * Logs a message and exception with severity ERROR in the runtime log of + * the plug-in. * - * @param message A message to log + * @param message + * A message to log */ public void logError(String message) { getLog().log(new Status(IStatus.ERROR, PLUGIN_ID, message)); } /** - * Logs a message and exception with severity ERROR in the runtime log of the plug-in. + * Logs a message and exception with severity ERROR in the runtime log of + * the plug-in. * - * @param message A message to log - * @param exception A exception to log + * @param message + * A message to log + * @param exception + * A exception to log */ public void logError(String message, Throwable exception) { getLog().log(new Status(IStatus.ERROR, PLUGIN_ID, message, exception)); diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/dialogs/ManageCustomParsersDialog.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/dialogs/ManageCustomParsersDialog.java index dbb9453911..010782f6bb 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/dialogs/ManageCustomParsersDialog.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/dialogs/ManageCustomParsersDialog.java @@ -68,9 +68,6 @@ public class ManageCustomParsersDialog extends Dialog { setShellStyle(SWT.RESIZE | SWT.MAX | getShellStyle()); } - /* (non-Javadoc) - * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite) - */ @Override protected Control createDialogArea(Composite parent) { getShell().setText(Messages.ManageCustomParsersDialog_DialogHeader); @@ -284,9 +281,6 @@ public class ManageCustomParsersDialog extends Dialog { return composite; } - /* (non-Javadoc) - * @see org.eclipse.jface.dialogs.Dialog#createButtonsForButtonBar(org.eclipse.swt.widgets.Composite) - */ @Override protected void createButtonsForButtonBar(Composite parent) { createButton(parent, IDialogConstants.OK_ID, IDialogConstants.CLOSE_LABEL, false); diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/dialogs/MultiLineInputDialog.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/dialogs/MultiLineInputDialog.java index 03fd9b00dd..7d757cd5d5 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/dialogs/MultiLineInputDialog.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/dialogs/MultiLineInputDialog.java @@ -81,9 +81,6 @@ public class MultiLineInputDialog extends InputDialog { this.dialogMessage = dialogMessage; } - /* (non-Javadoc) - * @see org.eclipse.jface.dialogs.InputDialog#createDialogArea(org.eclipse.swt.widgets.Composite) - */ @Override protected Control createDialogArea(Composite parent) { Composite composite = (Composite) super.createDialogArea(parent); @@ -138,9 +135,6 @@ public class MultiLineInputDialog extends InputDialog { return composite; } - /* (non-Javadoc) - * @see org.eclipse.jface.dialogs.Dialog#createContents(org.eclipse.swt.widgets.Composite) - */ @Override protected Control createContents(Composite parent) { Control control = super.createContents(parent); @@ -153,17 +147,11 @@ public class MultiLineInputDialog extends InputDialog { return control; } - /* (non-Javadoc) - * @see org.eclipse.jface.dialogs.InputDialog#getInputTextStyle() - */ @Override protected int getInputTextStyle() { return SWT.MULTI | SWT.WRAP | SWT.V_SCROLL | SWT.BORDER; } - /* (non-Javadoc) - * @see org.eclipse.jface.dialogs.Dialog#isResizable() - */ @Override protected boolean isResizable() { return true; diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/custom/CustomTxtTrace.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/custom/CustomTxtTrace.java index 39bf5c3703..0a80b2bf6d 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/custom/CustomTxtTrace.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/custom/CustomTxtTrace.java @@ -388,9 +388,6 @@ public class CustomTxtTrace extends TmfTrace implements ITmfEventParser { return fDefinition; } - /* (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.core.trace.ITmfTrace#validate(org.eclipse.core.resources.IProject, java.lang.String) - */ @Override public IStatus validate(IProject project, String path) { if( fileExists(path)) { diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/custom/CustomTxtTraceContext.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/custom/CustomTxtTraceContext.java index 741ce53e1f..ab528a3781 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/custom/CustomTxtTraceContext.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/custom/CustomTxtTraceContext.java @@ -49,9 +49,6 @@ public class CustomTxtTraceContext extends TmfContext { super(location, rank); } - /* (non-Javadoc) - * @see java.lang.Object#hashCode() - */ @Override public int hashCode() { final int prime = 31; @@ -63,9 +60,6 @@ public class CustomTxtTraceContext extends TmfContext { return result; } - /* (non-Javadoc) - * @see java.lang.Object#equals(java.lang.Object) - */ @Override public boolean equals(Object obj) { if (this == obj) { diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/custom/CustomXmlTrace.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/custom/CustomXmlTrace.java index aa6b63b388..58b7acae3f 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/custom/CustomXmlTrace.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/custom/CustomXmlTrace.java @@ -490,9 +490,6 @@ public class CustomXmlTrace extends TmfTrace implements ITmfEventParser { return fDefinition; } - /* (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.core.trace.ITmfTrace#validate(org.eclipse.core.resources.IProject, java.lang.String) - */ @Override public IStatus validate(IProject project, String path) { if (fileExists(path)) { diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/custom/CustomXmlTraceContext.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/custom/CustomXmlTraceContext.java index 287ae65542..310e355030 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/custom/CustomXmlTraceContext.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/custom/CustomXmlTraceContext.java @@ -34,17 +34,11 @@ public class CustomXmlTraceContext extends TmfContext { super(location, rank); } - /* (non-Javadoc) - * @see java.lang.Object#hashCode() - */ @Override public int hashCode() { return super.hashCode(); } - /* (non-Javadoc) - * @see java.lang.Object#equals(java.lang.Object) - */ @Override public boolean equals(Object obj) { if (this == obj) { diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/wizards/CustomTxtParserInputWizardPage.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/wizards/CustomTxtParserInputWizardPage.java index bba95397f8..4456008f73 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/wizards/CustomTxtParserInputWizardPage.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/wizards/CustomTxtParserInputWizardPage.java @@ -508,9 +508,6 @@ public class CustomTxtParserInputWizardPage extends WizardPage { } } - /* (non-Javadoc) - * @see org.eclipse.jface.dialogs.DialogPage#dispose() - */ @Override public void dispose() { if (fixedFont != null) { diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/wizards/CustomTxtParserOutputWizardPage.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/wizards/CustomTxtParserOutputWizardPage.java index 355bab51d5..581de84292 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/wizards/CustomTxtParserOutputWizardPage.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/wizards/CustomTxtParserOutputWizardPage.java @@ -130,9 +130,6 @@ public class CustomTxtParserOutputWizardPage extends WizardPage { } } - /* (non-Javadoc) - * @see org.eclipse.jface.dialogs.DialogPage#setVisible(boolean) - */ @Override public void setVisible(final boolean visible) { if (visible) { diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/wizards/CustomXmlParserInputWizardPage.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/wizards/CustomXmlParserInputWizardPage.java index 8efe1083e9..2a6f07b513 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/wizards/CustomXmlParserInputWizardPage.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/wizards/CustomXmlParserInputWizardPage.java @@ -585,11 +585,6 @@ public class CustomXmlParserInputWizardPage extends WizardPage { } } - /* - * (non-Javadoc) - * - * @see org.eclipse.jface.dialogs.DialogPage#dispose() - */ @Override public void dispose() { if (fixedFont != null) { @@ -622,11 +617,6 @@ public class CustomXmlParserInputWizardPage extends WizardPage { return getName(inputElement) + " : " + name; //$NON-NLS-1$ } - /* - * (non-Javadoc) - * - * @see org.eclipse.jface.dialogs.DialogPage#setVisible(boolean) - */ @Override public void setVisible(boolean visible) { if (visible) { diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/wizards/CustomXmlParserOutputWizardPage.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/wizards/CustomXmlParserOutputWizardPage.java index 027ec88718..472bc60d7b 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/wizards/CustomXmlParserOutputWizardPage.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/wizards/CustomXmlParserOutputWizardPage.java @@ -131,9 +131,6 @@ public class CustomXmlParserOutputWizardPage extends WizardPage { } } - /* (non-Javadoc) - * @see org.eclipse.jface.dialogs.DialogPage#setVisible(boolean) - */ @Override public void setVisible(final boolean visible) { if (visible) { diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/preferences/TmfTracingPreferencePage.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/preferences/TmfTracingPreferencePage.java index ae7d3ab3f2..bc6618c0de 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/preferences/TmfTracingPreferencePage.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/preferences/TmfTracingPreferencePage.java @@ -1,11 +1,11 @@ /******************************************************************************* - * Copyright (c) 2011, 2012 Ericsson - * + * Copyright (c) 2011, 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: * Bernd Hufmann - Initial API and implementation ******************************************************************************/ @@ -19,8 +19,8 @@ import org.eclipse.ui.IWorkbench; import org.eclipse.ui.IWorkbenchPreferencePage; /** - * Top Level Preference Page for Tracing. - * + * Top Level Preference Page for Tracing. + * * @version 1.0 * @author Bernd Hufmann */ @@ -29,30 +29,22 @@ public class TmfTracingPreferencePage extends PreferencePage implements IWorkben // ------------------------------------------------------------------------ // Attributes // ------------------------------------------------------------------------ - + // ------------------------------------------------------------------------ // Constructors // ------------------------------------------------------------------------ - + // ------------------------------------------------------------------------ // Operations // ------------------------------------------------------------------------ - - /* - * (non-Javadoc) - * @see org.eclipse.jface.preference.PreferencePage#createContents(org.eclipse.swt.widgets.Composite) - */ + @Override protected Control createContents(Composite parent) { Composite composite = new Composite(parent, SWT.NONE); - // No content yet! + // No content yet! return composite; } - /* - * (non-Javadoc) - * @see org.eclipse.ui.IWorkbenchPreferencePage#init(org.eclipse.ui.IWorkbench) - */ @Override public void init(IWorkbench workbench) { // Nothing to do yet! diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/dialogs/SelectSupplementaryResourcesDialog.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/dialogs/SelectSupplementaryResourcesDialog.java index 05605b1452..0b45abc32d 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/dialogs/SelectSupplementaryResourcesDialog.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/dialogs/SelectSupplementaryResourcesDialog.java @@ -79,10 +79,6 @@ public class SelectSupplementaryResourcesDialog extends Dialog { // Dialog // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see org.eclipse.jface.window.Window#configureShell(org.eclipse.swt.widgets.Shell) - */ @Override protected void configureShell(Shell newShell) { super.configureShell(newShell); @@ -162,10 +158,6 @@ public class SelectSupplementaryResourcesDialog extends Dialog { return composite; } - /* - * (non-Javadoc) - * @see org.eclipse.jface.dialogs.Dialog#createButtonsForButtonBar(org.eclipse.swt.widgets.Composite) - */ @Override protected void createButtonsForButtonBar(Composite parent) { createButton(parent, IDialogConstants.CANCEL_ID, "&Cancel", true); //$NON-NLS-1$ diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/handlers/DeleteAction.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/handlers/DeleteAction.java index 6c5c449ed5..43f93831dc 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/handlers/DeleteAction.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/handlers/DeleteAction.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 @@ -51,10 +51,6 @@ public class DeleteAction extends Action { this.selectionProvider = selectionProvider; } - /* - * (non-Javadoc) - * @see org.eclipse.jface.action.Action#isEnabled() - */ @Override public boolean isEnabled() { ISelection selection = selectionProvider.getSelection(); @@ -78,10 +74,6 @@ public class DeleteAction extends Action { return false; } - /* - * (non-Javadoc) - * @see org.eclipse.jface.action.Action#run() - */ @Override public void run() { try { diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/handlers/DropAdapterAssistant.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/handlers/DropAdapterAssistant.java index 498d39615e..edddeed0e3 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/handlers/DropAdapterAssistant.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/handlers/DropAdapterAssistant.java @@ -73,17 +73,11 @@ public class DropAdapterAssistant extends CommonDropAdapterAssistant { public DropAdapterAssistant() { } - /* (non-Javadoc) - * @see org.eclipse.ui.navigator.CommonDropAdapterAssistant#isSupportedType(org.eclipse.swt.dnd.TransferData) - */ @Override public boolean isSupportedType(TransferData aTransferType) { return super.isSupportedType(aTransferType) || FileTransfer.getInstance().isSupportedType(aTransferType); } - /* (non-Javadoc) - * @see org.eclipse.ui.navigator.CommonDropAdapterAssistant#validateDrop(java.lang.Object, int, org.eclipse.swt.dnd.TransferData) - */ @Override public IStatus validateDrop(Object target, int operation, TransferData transferType) { if (target instanceof TmfTraceFolder) { @@ -107,9 +101,6 @@ public class DropAdapterAssistant extends CommonDropAdapterAssistant { return Status.CANCEL_STATUS; } - /* (non-Javadoc) - * @see org.eclipse.ui.navigator.CommonDropAdapterAssistant#handleDrop(org.eclipse.ui.navigator.CommonDropAdapter, org.eclipse.swt.dnd.DropTargetEvent, java.lang.Object) - */ @Override public IStatus handleDrop(CommonDropAdapter aDropAdapter, DropTargetEvent aDropTargetEvent, Object aTarget) { boolean ok = false; diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/handlers/OpenAction.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/handlers/OpenAction.java index 883c827a9c..ed93ecfa7c 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/handlers/OpenAction.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/handlers/OpenAction.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 @@ -51,10 +51,6 @@ public class OpenAction extends Action { this.selectionProvider = selectionProvider; } - /* - * (non-Javadoc) - * @see org.eclipse.jface.action.Action#isEnabled() - */ @Override public boolean isEnabled() { ISelection selection = selectionProvider.getSelection(); @@ -71,10 +67,6 @@ public class OpenAction extends Action { return false; } - /* - * (non-Javadoc) - * @see org.eclipse.jface.action.Action#run() - */ @Override public void run() { try { diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/handlers/RefreshAction.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/handlers/RefreshAction.java index 2dbaeb91ee..610adaad15 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/handlers/RefreshAction.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/handlers/RefreshAction.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 @@ -52,10 +52,6 @@ public class RefreshAction extends Action { this.selectionProvider = selectionProvider; } - /* - * (non-Javadoc) - * @see org.eclipse.jface.action.Action#isEnabled() - */ @Override public boolean isEnabled() { ISelection selection = selectionProvider.getSelection(); @@ -73,10 +69,6 @@ public class RefreshAction extends Action { return false; } - /* - * (non-Javadoc) - * @see org.eclipse.jface.action.Action#run() - */ @Override public void run() { try { diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/handlers/TmfActionProvider.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/handlers/TmfActionProvider.java index ac5c353c63..62ca4dcfea 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/handlers/TmfActionProvider.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/handlers/TmfActionProvider.java @@ -37,10 +37,6 @@ public class TmfActionProvider extends CommonActionProvider { public TmfActionProvider() { } - /* - * (non-Javadoc) - * @see org.eclipse.ui.navigator.CommonActionProvider#init(org.eclipse.ui.navigator.ICommonActionExtensionSite) - */ @Override public void init(ICommonActionExtensionSite aSite) { ICommonViewerSite viewSite = aSite.getViewSite(); @@ -52,10 +48,6 @@ public class TmfActionProvider extends CommonActionProvider { } } - /* - * (non-Javadoc) - * @see org.eclipse.ui.actions.ActionGroup#fillActionBars(org.eclipse.ui.IActionBars) - */ @Override public void fillActionBars(IActionBars actionBars) { if (openAction.isEnabled()) { diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/handlers/TracePropertyTester.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/handlers/TracePropertyTester.java index 051111833d..4fa913c14c 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/handlers/TracePropertyTester.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/handlers/TracePropertyTester.java @@ -49,9 +49,6 @@ public class TracePropertyTester extends PropertyTester { // IPropertyTester // ------------------------------------------------------------------------ - /* (non-Javadoc) - * @see org.eclipse.core.expressions.IPropertyTester#test(java.lang.Object, java.lang.String, java.lang.Object[], java.lang.Object) - */ @Override public boolean test(Object receiver, String property, Object[] args, Object expectedValue) { diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/model/TmfEditorLinkHelper.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/model/TmfEditorLinkHelper.java index 8628a8f3d7..448f4a0421 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/model/TmfEditorLinkHelper.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/model/TmfEditorLinkHelper.java @@ -41,10 +41,6 @@ import org.eclipse.ui.part.FileEditorInput; */ public class TmfEditorLinkHelper implements ILinkHelper { - /* - * (non-Javadoc) - * @see org.eclipse.ui.navigator.ILinkHelper#findSelection(org.eclipse.ui.IEditorInput) - */ @Override public IStructuredSelection findSelection(IEditorInput anInput) { IFile file = ResourceUtil.getFile(anInput); @@ -91,10 +87,6 @@ public class TmfEditorLinkHelper implements ILinkHelper { return StructuredSelection.EMPTY; } - /* - * (non-Javadoc) - * @see org.eclipse.ui.navigator.ILinkHelper#activateEditor(org.eclipse.ui.IWorkbenchPage, org.eclipse.jface.viewers.IStructuredSelection) - */ @Override public void activateEditor(IWorkbenchPage aPage, IStructuredSelection aSelection) { if (aSelection == null || aSelection.isEmpty()) { diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/editors/TmfEditorInput.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/editors/TmfEditorInput.java index 0bbfc56a0d..0a4618f458 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/editors/TmfEditorInput.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/editors/TmfEditorInput.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2010, 2012 Ericsson + * Copyright (c) 2010, 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 @@ -95,9 +95,6 @@ public class TmfEditorInput implements IEditorInput { return fTrace; } - /* (non-Javadoc) - * @see java.lang.Object#hashCode() - */ @Override public int hashCode() { final int prime = 31; @@ -107,9 +104,6 @@ public class TmfEditorInput implements IEditorInput { return result; } - /* (non-Javadoc) - * @see java.lang.Object#equals(java.lang.Object) - */ @Override public boolean equals(Object obj) { if (this == obj) { diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/editors/TmfEventsEditor.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/editors/TmfEventsEditor.java index d1e10d0948..064b1a3b62 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/editors/TmfEventsEditor.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/editors/TmfEventsEditor.java @@ -526,9 +526,6 @@ public class TmfEventsEditor extends TmfEditor implements ITmfTraceEditor, IReus // ISelectionProvider // ------------------------------------------------------------------------ - /* (non-Javadoc) - * @see org.eclipse.jface.viewers.ISelectionProvider#addSelectionChangedListener(org.eclipse.jface.viewers.ISelectionChangedListener) - */ /** * @since 2.0 */ @@ -537,9 +534,6 @@ public class TmfEventsEditor extends TmfEditor implements ITmfTraceEditor, IReus fSelectionChangedListeners.add(listener); } - /* (non-Javadoc) - * @see org.eclipse.jface.viewers.ISelectionProvider#getSelection() - */ /** * @since 2.0 */ @@ -551,9 +545,6 @@ public class TmfEventsEditor extends TmfEditor implements ITmfTraceEditor, IReus return fEventsTable.getSelection(); } - /* (non-Javadoc) - * @see org.eclipse.jface.viewers.ISelectionProvider#removeSelectionChangedListener(org.eclipse.jface.viewers.ISelectionChangedListener) - */ /** * @since 2.0 */ @@ -562,9 +553,6 @@ public class TmfEventsEditor extends TmfEditor implements ITmfTraceEditor, IReus fSelectionChangedListeners.remove(listener); } - /* (non-Javadoc) - * @see org.eclipse.jface.viewers.ISelectionProvider#setSelection(org.eclipse.jface.viewers.ISelection) - */ /** * @since 2.0 */ @@ -599,10 +587,6 @@ public class TmfEventsEditor extends TmfEditor implements ITmfTraceEditor, IReus // ISelectionChangedListener // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see org.eclipse.jface.viewers.ISelectionChangedListener#selectionChanged(org.eclipse.jface.viewers.SelectionChangedEvent) - */ /** * @since 2.0 */ @@ -615,10 +599,6 @@ public class TmfEventsEditor extends TmfEditor implements ITmfTraceEditor, IReus // IPartListener // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see org.eclipse.ui.IPartListener#partActivated(org.eclipse.ui.IWorkbenchPart) - */ /** * @since 2.0 */ @@ -633,10 +613,6 @@ public class TmfEventsEditor extends TmfEditor implements ITmfTraceEditor, IReus } } - /* - * (non-Javadoc) - * @see org.eclipse.ui.IPartListener#partBroughtToTop(org.eclipse.ui.IWorkbenchPart) - */ /** * @since 2.0 */ @@ -651,10 +627,6 @@ public class TmfEventsEditor extends TmfEditor implements ITmfTraceEditor, IReus } } - /* - * (non-Javadoc) - * @see org.eclipse.ui.IPartListener#partClosed(org.eclipse.ui.IWorkbenchPart) - */ /** * @since 2.0 */ @@ -662,10 +634,6 @@ public class TmfEventsEditor extends TmfEditor implements ITmfTraceEditor, IReus public void partClosed(IWorkbenchPart part) { } - /* - * (non-Javadoc) - * @see org.eclipse.ui.IPartListener#partDeactivated(org.eclipse.ui.IWorkbenchPart) - */ /** * @since 2.0 */ @@ -673,10 +641,6 @@ public class TmfEventsEditor extends TmfEditor implements ITmfTraceEditor, IReus public void partDeactivated(IWorkbenchPart part) { } - /* - * (non-Javadoc) - * @see org.eclipse.ui.IPartListener#partOpened(org.eclipse.ui.IWorkbenchPart) - */ /** * @since 2.0 */ diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/editors/UnsortedPropertySheetPage.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/editors/UnsortedPropertySheetPage.java index 3faf03d569..88f097e851 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/editors/UnsortedPropertySheetPage.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/editors/UnsortedPropertySheetPage.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 @@ -26,9 +26,6 @@ import org.eclipse.ui.views.properties.PropertySheetSorter; */ public class UnsortedPropertySheetPage extends PropertySheetPage { - /* (non-Javadoc) - * @see org.eclipse.ui.views.properties.PropertySheetPage#createControl(org.eclipse.swt.widgets.Composite) - */ @Override public void createControl(Composite parent) { super.createControl(parent); diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/model/TmfExperimentElement.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/model/TmfExperimentElement.java index d3c40cb3a9..23f41f99f5 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/model/TmfExperimentElement.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/model/TmfExperimentElement.java @@ -95,19 +95,11 @@ public class TmfExperimentElement extends TmfWithFolderElement implements IPrope // TmfProjectModelElement // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.project.model.TmfProjectModelElement#getResource() - */ @Override public IFolder getResource() { return (IFolder) fResource; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.project.model.ITmfProjectModelElement#getProject() - */ @Override public TmfProjectElement getProject() { return (TmfProjectElement) getParent().getParent(); @@ -116,6 +108,7 @@ public class TmfExperimentElement extends TmfWithFolderElement implements IPrope // ------------------------------------------------------------------------ // Operations // ------------------------------------------------------------------------ + /** * Returns a list of TmfTraceElements contained in this experiment. * @return a list of TmfTraceElements @@ -251,28 +244,16 @@ public class TmfExperimentElement extends TmfWithFolderElement implements IPrope // IPropertySource2 // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see org.eclipse.ui.views.properties.IPropertySource#getEditableValue() - */ @Override public Object getEditableValue() { return null; } - /* - * (non-Javadoc) - * @see org.eclipse.ui.views.properties.IPropertySource#getPropertyDescriptors() - */ @Override public IPropertyDescriptor[] getPropertyDescriptors() { return Arrays.copyOf(sfDescriptors, sfDescriptors.length); } - /* - * (non-Javadoc) - * @see org.eclipse.ui.views.properties.IPropertySource#getPropertyValue(java.lang.Object) - */ @Override public Object getPropertyValue(Object id) { @@ -291,35 +272,19 @@ public class TmfExperimentElement extends TmfWithFolderElement implements IPrope return null; } - /* - * (non-Javadoc) - * @see org.eclipse.ui.views.properties.IPropertySource#resetPropertyValue(java.lang.Object) - */ @Override public void resetPropertyValue(Object id) { } - /* - * (non-Javadoc) - * @see org.eclipse.ui.views.properties.IPropertySource#setPropertyValue(java.lang.Object, java.lang.Object) - */ @Override public void setPropertyValue(Object id, Object value) { } - /* - * (non-Javadoc) - * @see org.eclipse.ui.views.properties.IPropertySource2#isPropertyResettable(java.lang.Object) - */ @Override public boolean isPropertyResettable(Object id) { return false; } - /* - * (non-Javadoc) - * @see org.eclipse.ui.views.properties.IPropertySource2#isPropertySet(java.lang.Object) - */ @Override public boolean isPropertySet(Object id) { return false; diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/model/TmfExperimentFolder.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/model/TmfExperimentFolder.java index 66829fda21..ce7388ef31 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/model/TmfExperimentFolder.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/model/TmfExperimentFolder.java @@ -31,6 +31,7 @@ public class TmfExperimentFolder extends TmfProjectModelElement implements IProp // ------------------------------------------------------------------------ // Constants // ------------------------------------------------------------------------ + /** * The name of the experiment folder. */ @@ -73,28 +74,17 @@ public class TmfExperimentFolder extends TmfProjectModelElement implements IProp // ------------------------------------------------------------------------ // TmfProjectModelElement // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.project.model.TmfProjectModelElement#getResource() - */ + @Override public IFolder getResource() { return (IFolder) fResource; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.project.model.ITmfProjectModelElement#getProject() - */ @Override public TmfProjectElement getProject() { return (TmfProjectElement) getParent(); } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.project.model.TmfProjectModelElement#refresh() - */ @Override public void refresh() { TmfProjectElement project = (TmfProjectElement) getParent(); @@ -104,27 +94,17 @@ public class TmfExperimentFolder extends TmfProjectModelElement implements IProp // ------------------------------------------------------------------------ // IPropertySource2 // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see org.eclipse.ui.views.properties.IPropertySource#getEditableValue() - */ + @Override public Object getEditableValue() { return null; } - /* - * (non-Javadoc) - * @see org.eclipse.ui.views.properties.IPropertySource#getPropertyDescriptors() - */ + @Override public IPropertyDescriptor[] getPropertyDescriptors() { return Arrays.copyOf(sfDescriptors, sfDescriptors.length); } - /* - * (non-Javadoc) - * @see org.eclipse.ui.views.properties.IPropertySource#getPropertyValue(java.lang.Object) - */ @Override public Object getPropertyValue(Object id) { @@ -142,36 +122,23 @@ public class TmfExperimentFolder extends TmfProjectModelElement implements IProp return null; } - /* - * (non-Javadoc) - * @see org.eclipse.ui.views.properties.IPropertySource#resetPropertyValue(java.lang.Object) - */ + @Override public void resetPropertyValue(Object id) { } - /* - * (non-Javadoc) - * @see org.eclipse.ui.views.properties.IPropertySource#setPropertyValue(java.lang.Object, java.lang.Object) - */ + @Override public void setPropertyValue(Object id, Object value) { } - /* - * (non-Javadoc) - * @see org.eclipse.ui.views.properties.IPropertySource2#isPropertyResettable(java.lang.Object) - */ + @Override public boolean isPropertyResettable(Object id) { return false; } - /* - * (non-Javadoc) - * @see org.eclipse.ui.views.properties.IPropertySource2#isPropertySet(java.lang.Object) - */ + @Override public boolean isPropertySet(Object id) { return false; } } - diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/model/TmfNavigatorContentProvider.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/model/TmfNavigatorContentProvider.java index 2be60ebf16..296037a67f 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/model/TmfNavigatorContentProvider.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/model/TmfNavigatorContentProvider.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2010, 2012 Ericsson + * Copyright (c) 2010, 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 @@ -41,19 +41,12 @@ public class TmfNavigatorContentProvider implements IPipelinedTreeContentProvide // ------------------------------------------------------------------------ // ICommonContentProvider // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see org.eclipse.jface.viewers.ITreeContentProvider#getElements(java.lang.Object) - */ + @Override public Object[] getElements(Object inputElement) { return null; } - /* - * (non-Javadoc) - * @see org.eclipse.jface.viewers.ITreeContentProvider#getParent(java.lang.Object) - */ @Override public Object getParent(Object element) { if (element instanceof IProject) { @@ -87,10 +80,6 @@ public class TmfNavigatorContentProvider implements IPipelinedTreeContentProvide return null; } - /* - * (non-Javadoc) - * @see org.eclipse.jface.viewers.ITreeContentProvider#hasChildren(java.lang.Object) - */ @Override public boolean hasChildren(Object element) { if (element instanceof IProject) { @@ -112,42 +101,22 @@ public class TmfNavigatorContentProvider implements IPipelinedTreeContentProvide return false; } - /* - * (non-Javadoc) - * @see org.eclipse.jface.viewers.IContentProvider#dispose() - */ @Override public void dispose() { } - /* - * (non-Javadoc) - * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object) - */ @Override public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { } - /* - * (non-Javadoc) - * @see org.eclipse.ui.navigator.IMementoAware#restoreState(org.eclipse.ui.IMemento) - */ @Override public void restoreState(IMemento aMemento) { } - /* - * (non-Javadoc) - * @see org.eclipse.ui.navigator.IMementoAware#saveState(org.eclipse.ui.IMemento) - */ @Override public void saveState(IMemento aMemento) { } - /* - * (non-Javadoc) - * @see org.eclipse.ui.navigator.ICommonContentProvider#init(org.eclipse.ui.navigator.ICommonContentExtensionSite) - */ @Override public void init(ICommonContentExtensionSite aConfig) { } @@ -155,10 +124,7 @@ public class TmfNavigatorContentProvider implements IPipelinedTreeContentProvide // ------------------------------------------------------------------------ // ICommonContentProvider - getChildren() // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see org.eclipse.jface.viewers.ITreeContentProvider#getChildren(java.lang.Object) - */ + @Override public synchronized Object[] getChildren(Object parentElement) { @@ -188,6 +154,7 @@ public class TmfNavigatorContentProvider implements IPipelinedTreeContentProvide // ------------------------------------------------------------------------ // Helper method // ------------------------------------------------------------------------ + private Object[] getProjectChildren(IProject project) { // The children structure List children = new ArrayList(); @@ -369,19 +336,11 @@ public class TmfNavigatorContentProvider implements IPipelinedTreeContentProvide // IPipelinedTreeContentProvider // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see org.eclipse.ui.navigator.IPipelinedTreeContentProvider#getPipelinedChildren(java.lang.Object, java.util.Set) - */ @Override public void getPipelinedChildren(Object parent, Set currentChildren) { customizeTmfElements(getChildren(parent), currentChildren); } - /* - * (non-Javadoc) - * @see org.eclipse.ui.navigator.IPipelinedTreeContentProvider#getPipelinedElements(java.lang.Object, java.util.Set) - */ @Override public void getPipelinedElements(Object input, Set currentElements) { customizeTmfElements(getElements(input), currentElements); @@ -414,46 +373,26 @@ public class TmfNavigatorContentProvider implements IPipelinedTreeContentProvide } } - /* - * (non-Javadoc) - * @see org.eclipse.ui.navigator.IPipelinedTreeContentProvider#getPipelinedParent(java.lang.Object, java.lang.Object) - */ @Override public Object getPipelinedParent(Object anObject, Object aSuggestedParent) { return aSuggestedParent; } - /* - * (non-Javadoc) - * @see org.eclipse.ui.navigator.IPipelinedTreeContentProvider#interceptAdd(org.eclipse.ui.navigator.PipelinedShapeModification) - */ @Override public PipelinedShapeModification interceptAdd(PipelinedShapeModification anAddModification) { return anAddModification; } - /* - * (non-Javadoc) - * @see org.eclipse.ui.navigator.IPipelinedTreeContentProvider#interceptRemove(org.eclipse.ui.navigator.PipelinedShapeModification) - */ @Override public PipelinedShapeModification interceptRemove(PipelinedShapeModification aRemoveModification) { return null; } - /* - * (non-Javadoc) - * @see org.eclipse.ui.navigator.IPipelinedTreeContentProvider#interceptRefresh(org.eclipse.ui.navigator.PipelinedViewerUpdate) - */ @Override public boolean interceptRefresh(PipelinedViewerUpdate aRefreshSynchronization) { return false; } - /* - * (non-Javadoc) - * @see org.eclipse.ui.navigator.IPipelinedTreeContentProvider#interceptUpdate(org.eclipse.ui.navigator.PipelinedViewerUpdate) - */ @Override public boolean interceptUpdate(PipelinedViewerUpdate anUpdateSynchronization) { return false; diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/model/TmfNavigatorLabelProvider.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/model/TmfNavigatorLabelProvider.java index 2d42c75d69..3e25989d32 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/model/TmfNavigatorLabelProvider.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/model/TmfNavigatorLabelProvider.java @@ -89,10 +89,7 @@ public class TmfNavigatorLabelProvider implements ICommonLabelProvider { // ------------------------------------------------------------------------ // ICommonLabelProvider // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see org.eclipse.jface.viewers.ILabelProvider#getImage(java.lang.Object) - */ + @Override public Image getImage(Object element) { @@ -128,10 +125,6 @@ public class TmfNavigatorLabelProvider implements ICommonLabelProvider { return null; } - /* - * (non-Javadoc) - * @see org.eclipse.jface.viewers.ILabelProvider#getText(java.lang.Object) - */ @Override public String getText(Object element) { @@ -158,68 +151,36 @@ public class TmfNavigatorLabelProvider implements ICommonLabelProvider { return null; } - /* - * (non-Javadoc) - * @see org.eclipse.jface.viewers.IBaseLabelProvider#addListener(org.eclipse.jface.viewers.ILabelProviderListener) - */ @Override public void addListener(ILabelProviderListener listener) { } - /* - * (non-Javadoc) - * @see org.eclipse.jface.viewers.IBaseLabelProvider#dispose() - */ @Override public void dispose() { } - /* - * (non-Javadoc) - * @see org.eclipse.jface.viewers.IBaseLabelProvider#isLabelProperty(java.lang.Object, java.lang.String) - */ @Override public boolean isLabelProperty(Object element, String property) { return false; } - /* - * (non-Javadoc) - * @see org.eclipse.jface.viewers.IBaseLabelProvider#removeListener(org.eclipse.jface.viewers.ILabelProviderListener) - */ @Override public void removeListener(ILabelProviderListener listener) { } - /* - * (non-Javadoc) - * @see org.eclipse.ui.navigator.IMementoAware#restoreState(org.eclipse.ui.IMemento) - */ @Override public void restoreState(IMemento aMemento) { } - /* - * (non-Javadoc) - * @see org.eclipse.ui.navigator.IMementoAware#saveState(org.eclipse.ui.IMemento) - */ @Override public void saveState(IMemento aMemento) { } - /* - * (non-Javadoc) - * @see org.eclipse.ui.navigator.IDescriptionProvider#getDescription(java.lang.Object) - */ @Override public String getDescription(Object anElement) { return getText(anElement); } - /* - * (non-Javadoc) - * @see org.eclipse.ui.navigator.ICommonLabelProvider#init(org.eclipse.ui.navigator.ICommonContentExtensionSite) - */ @Override public void init(ICommonContentExtensionSite aConfig) { } diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/model/TmfProjectElement.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/model/TmfProjectElement.java index 3410b80de7..4adf44b0c8 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/model/TmfProjectElement.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/model/TmfProjectElement.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011, 2012 Ericsson + * Copyright (c) 2011, 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 @@ -58,19 +58,11 @@ public class TmfProjectElement extends TmfProjectModelElement { // TmfProjectModelElement // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.project.model.TmfProjectModelElement#getResource() - */ @Override public IProject getResource() { return (IProject) fResource; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.project.model.TmfProjectModelElement#addChild(org.eclipse.linuxtools.tmf.ui.project.model.ITmfProjectModelElement) - */ @Override public void addChild(ITmfProjectModelElement child) { super.addChild(child); @@ -87,6 +79,7 @@ public class TmfProjectElement extends TmfProjectModelElement { // ------------------------------------------------------------------------ // Accessors // ------------------------------------------------------------------------ + /** * Returns the containing trace folder element. * @return the TMF trace folder element. @@ -107,10 +100,6 @@ public class TmfProjectElement extends TmfProjectModelElement { // TmfProjectElement // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.project.model.TmfProjectModelElement#refresh() - */ @Override public void refresh() { Display.getDefault().asyncExec(new Runnable(){ @@ -136,10 +125,6 @@ public class TmfProjectElement extends TmfProjectModelElement { }}); } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.project.model.TmfProjectModelElement#resourceChanged(org.eclipse.core.resources.IResourceChangeEvent) - */ @Override public void resourceChanged(IResourceChangeEvent event) { if (event.getType() == IResourceChangeEvent.POST_CHANGE) { @@ -147,10 +132,6 @@ public class TmfProjectElement extends TmfProjectModelElement { } } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.project.model.ITmfProjectModelElement#getProject() - */ @Override public TmfProjectElement getProject() { return this; diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/model/TmfProjectModelElement.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/model/TmfProjectModelElement.java index 39f0b84f7a..042918b8c4 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/model/TmfProjectModelElement.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/model/TmfProjectModelElement.java @@ -89,74 +89,47 @@ public abstract class TmfProjectModelElement implements ITmfProjectModelElement, // ------------------------------------------------------------------------ // ITmfProjectModelElement // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.project.model.ITmfProjectModelElement#getName() - */ + @Override public String getName() { return fName; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.project.model.ITmfProjectModelElement#getResource() - */ + @Override public IResource getResource() { return fResource; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.project.model.ITmfProjectModelElement#getPath() - */ + @Override public IPath getPath() { return fPath; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.project.model.ITmfProjectModelElement#getLocation() - */ + @Override public URI getLocation() { return fLocation; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.project.model.ITmfProjectModelElement#getParent() - */ + @Override public ITmfProjectModelElement getParent() { return fParent; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.project.model.ITmfProjectModelElement#hasChildren() - */ + @Override public boolean hasChildren() { return fChildren.size() > 0; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.project.model.ITmfProjectModelElement#getChildren() - */ + @Override public List getChildren() { return fChildren; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.project.model.ITmfProjectModelElement#addChild(org.eclipse.linuxtools.tmf.ui.project.model.ITmfProjectModelElement) - */ + @Override public void addChild(ITmfProjectModelElement child) { fChildren.add(child); } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.project.model.ITmfProjectModelElement#removeChild(org.eclipse.linuxtools.tmf.ui.project.model.ITmfProjectModelElement) - */ + @Override public void removeChild(ITmfProjectModelElement child) { fChildren.remove(child); @@ -165,10 +138,7 @@ public abstract class TmfProjectModelElement implements ITmfProjectModelElement, } refresh(); } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.project.model.ITmfProjectModelElement#refresh() - */ + @Override public void refresh() { // Do nothing by default: sub-classes override this on an "as-needed" @@ -178,10 +148,7 @@ public abstract class TmfProjectModelElement implements ITmfProjectModelElement, // ------------------------------------------------------------------------ // IResourceChangeListener // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see org.eclipse.core.resources.IResourceChangeListener#resourceChanged(org.eclipse.core.resources.IResourceChangeEvent) - */ + @Override public void resourceChanged(IResourceChangeEvent event) { // Do nothing by default: sub-classes override this on an "as-needed" @@ -191,10 +158,7 @@ public abstract class TmfProjectModelElement implements ITmfProjectModelElement, // ------------------------------------------------------------------------ // Object // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see java.lang.Object#hashCode() - */ + @Override public int hashCode() { final int prime = 31; @@ -202,10 +166,7 @@ public abstract class TmfProjectModelElement implements ITmfProjectModelElement, result = prime * result + ((fPath == null) ? 0 : fPath.hashCode()); return result; } - /* - * (non-Javadoc) - * @see java.lang.Object#equals(java.lang.Object) - */ + @Override public boolean equals(Object other) { if (this == other) { diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/model/TmfTraceElement.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/model/TmfTraceElement.java index c15a7b1978..e3c0dbacae 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/model/TmfTraceElement.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/model/TmfTraceElement.java @@ -349,10 +349,7 @@ public class TmfTraceElement extends TmfWithFolderElement implements IActionFilt // ------------------------------------------------------------------------ // TmfTraceElement // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.project.model.ITmfProjectModelElement#getProject() - */ + @Override public TmfProjectElement getProject() { if (getParent() instanceof TmfTraceFolder) { @@ -373,28 +370,16 @@ public class TmfTraceElement extends TmfWithFolderElement implements IActionFilt // IPropertySource2 // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see org.eclipse.ui.views.properties.IPropertySource#getEditableValue() - */ @Override public Object getEditableValue() { return null; } - /* - * (non-Javadoc) - * @see org.eclipse.ui.views.properties.IPropertySource#getPropertyDescriptors() - */ @Override public IPropertyDescriptor[] getPropertyDescriptors() { return Arrays.copyOf(sfDescriptors, sfDescriptors.length); } - /* - * (non-Javadoc) - * @see org.eclipse.ui.views.properties.IPropertySource#getPropertyValue(java.lang.Object) - */ @Override public Object getPropertyValue(Object id) { @@ -435,35 +420,19 @@ public class TmfTraceElement extends TmfWithFolderElement implements IActionFilt return "[no category]"; //$NON-NLS-1$ } - /* - * (non-Javadoc) - * @see org.eclipse.ui.views.properties.IPropertySource#resetPropertyValue(java.lang.Object) - */ @Override public void resetPropertyValue(Object id) { } - /* - * (non-Javadoc) - * @see org.eclipse.ui.views.properties.IPropertySource#setPropertyValue(java.lang.Object, java.lang.Object) - */ @Override public void setPropertyValue(Object id, Object value) { } - /* - * (non-Javadoc) - * @see org.eclipse.ui.views.properties.IPropertySource2#isPropertyResettable(java.lang.Object) - */ @Override public boolean isPropertyResettable(Object id) { return false; } - /* - * (non-Javadoc) - * @see org.eclipse.ui.views.properties.IPropertySource2#isPropertySet(java.lang.Object) - */ @Override public boolean isPropertySet(Object id) { return false; @@ -484,5 +453,4 @@ public class TmfTraceElement extends TmfWithFolderElement implements IActionFilt return new TmfTraceElement(string, res, folder); } - } diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/model/TmfTraceFolder.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/model/TmfTraceFolder.java index ab0be4e38a..946f30dd79 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/model/TmfTraceFolder.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/model/TmfTraceFolder.java @@ -76,28 +76,16 @@ public class TmfTraceFolder extends TmfProjectModelElement implements IPropertyS // TmfProjectModelElement // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.project.model.TmfProjectModelElement#getResource() - */ @Override public IFolder getResource() { return (IFolder) fResource; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.project.model.ITmfProjectModelElement#getProject() - */ @Override public TmfProjectElement getProject() { return (TmfProjectElement) getParent(); } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.project.model.TmfProjectModelElement#refresh() - */ @Override public void refresh() { TmfProjectElement project = (TmfProjectElement) getParent(); @@ -107,6 +95,7 @@ public class TmfTraceFolder extends TmfProjectModelElement implements IPropertyS // ------------------------------------------------------------------------ // Operations // ------------------------------------------------------------------------ + /** * Returns a list of trace model elements under the traces folder. * @return list of trace model elements @@ -126,28 +115,16 @@ public class TmfTraceFolder extends TmfProjectModelElement implements IPropertyS // IPropertySource2 // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see org.eclipse.ui.views.properties.IPropertySource#getEditableValue() - */ @Override public Object getEditableValue() { return null; } - /* - * (non-Javadoc) - * @see org.eclipse.ui.views.properties.IPropertySource#getPropertyDescriptors() - */ @Override public IPropertyDescriptor[] getPropertyDescriptors() { return Arrays.copyOf(sfDescriptors, sfDescriptors.length); } - /* - * (non-Javadoc) - * @see org.eclipse.ui.views.properties.IPropertySource#getPropertyValue(java.lang.Object) - */ @Override public Object getPropertyValue(Object id) { @@ -166,35 +143,19 @@ public class TmfTraceFolder extends TmfProjectModelElement implements IPropertyS return null; } - /* - * (non-Javadoc) - * @see org.eclipse.ui.views.properties.IPropertySource#resetPropertyValue(java.lang.Object) - */ @Override public void resetPropertyValue(Object id) { } - /* - * (non-Javadoc) - * @see org.eclipse.ui.views.properties.IPropertySource#setPropertyValue(java.lang.Object, java.lang.Object) - */ @Override public void setPropertyValue(Object id, Object value) { } - /* - * (non-Javadoc) - * @see org.eclipse.ui.views.properties.IPropertySource2#isPropertyResettable(java.lang.Object) - */ @Override public boolean isPropertyResettable(Object id) { return false; } - /* - * (non-Javadoc) - * @see org.eclipse.ui.views.properties.IPropertySource2#isPropertySet(java.lang.Object) - */ @Override public boolean isPropertySet(Object id) { return false; diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/model/TraceFolderContentProvider.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/model/TraceFolderContentProvider.java index ec1888728f..87115b59dc 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/model/TraceFolderContentProvider.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/model/TraceFolderContentProvider.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2010, 2012 Ericsson + * Copyright (c) 2010, 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 @@ -28,10 +28,6 @@ import org.eclipse.jface.viewers.Viewer; */ public class TraceFolderContentProvider implements IStructuredContentProvider { - /* - * (non-Javadoc) - * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object) - */ @Override public Object[] getElements(Object inputElement) { if (inputElement instanceof TmfTraceFolder) { @@ -50,18 +46,10 @@ public class TraceFolderContentProvider implements IStructuredContentProvider { return null; } - /* - * (non-Javadoc) - * @see org.eclipse.jface.viewers.IContentProvider#dispose() - */ @Override public void dispose() { } - /* - * (non-Javadoc) - * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object) - */ @Override public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { } diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/model/TraceFolderLabelProvider.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/model/TraceFolderLabelProvider.java index 5b5a2f0c88..567dd51336 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/model/TraceFolderLabelProvider.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/model/TraceFolderLabelProvider.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2010, 2012 Ericsson + * Copyright (c) 2010, 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 @@ -26,19 +26,11 @@ import org.eclipse.swt.graphics.Image; */ public class TraceFolderLabelProvider extends LabelProvider implements ITableLabelProvider { - /* - * (non-Javadoc) - * @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnImage(java.lang.Object, int) - */ @Override public Image getColumnImage(Object element, int columnIndex) { return null; } - /* - * (non-Javadoc) - * @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnText(java.lang.Object, int) - */ @Override public String getColumnText(Object element, int columnIndex) { if (element instanceof TmfTraceElement) { diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/wizards/CopyExperimentDialog.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/wizards/CopyExperimentDialog.java index ed0edd52ac..69284cc815 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/wizards/CopyExperimentDialog.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/wizards/CopyExperimentDialog.java @@ -50,6 +50,7 @@ import org.eclipse.ui.dialogs.SelectionStatusDialog; /** * Implementation of the copy experiement dialog box. *

+ * * @version 1.0 * @author Francois Chouinard */ @@ -59,8 +60,8 @@ public class CopyExperimentDialog extends SelectionStatusDialog { // Members // ------------------------------------------------------------------------ - private final TmfExperimentElement fExperiment; - private Text fNewExperimentName; + private final TmfExperimentElement fExperiment; + private Text fNewExperimentName; private IFolder fExperimentFolder; private TmfProjectElement fProject; @@ -70,8 +71,11 @@ public class CopyExperimentDialog extends SelectionStatusDialog { /** * Constructor - * @param shell The parent shell - * @param experiment The TMF experiment model element + * + * @param shell + * The parent shell + * @param experiment + * The TMF experiment model element */ public CopyExperimentDialog(Shell shell, TmfExperimentElement experiment) { super(shell); @@ -87,10 +91,6 @@ public class CopyExperimentDialog extends SelectionStatusDialog { // Dialog // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite) - */ @Override protected Control createDialogArea(Composite parent) { Composite composite = (Composite) super.createDialogArea(parent); @@ -137,25 +137,25 @@ public class CopyExperimentDialog extends SelectionStatusDialog { fNewExperimentName.addListener(SWT.Modify, new Listener() { @Override public void handleEvent(Event event) { - validateNewExperimentName(); + validateNewExperimentName(); } }); } private void validateNewExperimentName() { - String name = fNewExperimentName.getText(); + String name = fNewExperimentName.getText(); IWorkspace workspace = fExperimentFolder.getWorkspace(); IStatus nameStatus = workspace.validateName(name, IResource.FOLDER); if ("".equals(name)) { //$NON-NLS-1$ - updateStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID, IStatus.ERROR, Messages.Dialog_EmptyNameError, null)); - return; + updateStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID, IStatus.ERROR, Messages.Dialog_EmptyNameError, null)); + return; } if (!nameStatus.isOK()) { - updateStatus(nameStatus); - return; + updateStatus(nameStatus); + return; } IPath path = new Path(name); @@ -170,28 +170,17 @@ public class CopyExperimentDialog extends SelectionStatusDialog { // ------------------------------------------------------------------------ // SelectionStatusDialog // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see org.eclipse.ui.dialogs.SelectionStatusDialog#computeResult() - */ + @Override protected void computeResult() { } - /* - * (non-Javadoc) - * @see org.eclipse.ui.dialogs.SelectionStatusDialog#create() - */ @Override public void create() { super.create(); getButton(IDialogConstants.OK_ID).setEnabled(false); } - /* - * (non-Javadoc) - * @see org.eclipse.ui.dialogs.SelectionStatusDialog#okPressed() - */ @Override protected void okPressed() { IFolder folder = copyExperiment(fNewExperimentName.getText()); @@ -208,7 +197,7 @@ public class CopyExperimentDialog extends SelectionStatusDialog { private IFolder copyExperiment(final String newName) { - WorkspaceModifyOperation operation = new WorkspaceModifyOperation() { + WorkspaceModifyOperation operation = new WorkspaceModifyOperation() { @Override public void execute(IProgressMonitor monitor) throws CoreException { try { diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/wizards/CopyTraceDialog.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/wizards/CopyTraceDialog.java index ceca8af67c..397d122351 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/wizards/CopyTraceDialog.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/wizards/CopyTraceDialog.java @@ -85,10 +85,7 @@ public class CopyTraceDialog extends SelectionStatusDialog { // ------------------------------------------------------------------------ // Dialog // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite) - */ + @Override protected Control createDialogArea(Composite parent) { Composite composite = (Composite) super.createDialogArea(parent); @@ -171,28 +168,16 @@ public class CopyTraceDialog extends SelectionStatusDialog { // SelectionStatusDialog // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see org.eclipse.ui.dialogs.SelectionStatusDialog#computeResult() - */ @Override protected void computeResult() { } - /* - * (non-Javadoc) - * @see org.eclipse.ui.dialogs.SelectionStatusDialog#create() - */ @Override public void create() { super.create(); getButton(IDialogConstants.OK_ID).setEnabled(false); } - /* - * (non-Javadoc) - * @see org.eclipse.ui.dialogs.SelectionStatusDialog#okPressed() - */ @Override protected void okPressed() { IResource trace = copyTrace(fNewTraceName.getText()); diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/wizards/ImportTraceWizard.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/wizards/ImportTraceWizard.java index 2adba543e2..9775569985 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/wizards/ImportTraceWizard.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/wizards/ImportTraceWizard.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2010, 2012 Ericsson + * Copyright (c) 2010, 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 @@ -67,10 +67,6 @@ public class ImportTraceWizard extends Wizard implements IImportWizard { // Wizard // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see org.eclipse.ui.IWorkbenchWizard#init(org.eclipse.ui.IWorkbench, org.eclipse.jface.viewers.IStructuredSelection) - */ @Override public void init(IWorkbench workbench, IStructuredSelection selection) { fWorkbench = workbench; @@ -86,10 +82,6 @@ public class ImportTraceWizard extends Wizard implements IImportWizard { setNeedsProgressMonitor(true); } - /* - * (non-Javadoc) - * @see org.eclipse.jface.wizard.Wizard#addPages() - */ @Override public void addPages() { super.addPages(); @@ -97,10 +89,6 @@ public class ImportTraceWizard extends Wizard implements IImportWizard { addPage(fTraceImportWizardPage); } - /* - * (non-Javadoc) - * @see org.eclipse.jface.wizard.Wizard#performFinish() - */ @Override public boolean performFinish() { return fTraceImportWizardPage.finish(); diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/wizards/ImportTraceWizardPage.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/wizards/ImportTraceWizardPage.java index 91b720a42c..dd2a96317e 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/wizards/ImportTraceWizardPage.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/wizards/ImportTraceWizardPage.java @@ -186,13 +186,7 @@ public class ImportTraceWizardPage extends WizardResourceImportPage { // ------------------------------------------------------------------------ // WizardResourceImportPage // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * - * @see - * org.eclipse.ui.dialogs.WizardResourceImportPage#createControl(org.eclipse - * .swt.widgets.Composite) - */ + @Override public void createControl(Composite parent) { super.createControl(parent); @@ -203,13 +197,6 @@ public class ImportTraceWizardPage extends WizardResourceImportPage { } } - /* - * (non-Javadoc) - * - * @see - * org.eclipse.ui.dialogs.WizardResourceImportPage#createSourceGroup(org - * .eclipse.swt.widgets.Composite) - */ @Override protected void createSourceGroup(Composite parent) { createDirectorySelectionGroup(parent); @@ -218,13 +205,6 @@ public class ImportTraceWizardPage extends WizardResourceImportPage { validateSourceGroup(); } - /* - * (non-Javadoc) - * - * @see - * org.eclipse.ui.dialogs.WizardResourceImportPage#createFileSelectionGroup - * (org.eclipse.swt.widgets.Composite) - */ @Override protected void createFileSelectionGroup(Composite parent) { @@ -268,21 +248,11 @@ public class ImportTraceWizardPage extends WizardResourceImportPage { }); } - /* - * (non-Javadoc) - * - * @see org.eclipse.ui.dialogs.WizardResourceImportPage#getFolderProvider() - */ @Override protected ITreeContentProvider getFolderProvider() { return null; } - /* - * (non-Javadoc) - * - * @see org.eclipse.ui.dialogs.WizardResourceImportPage#getFileProvider() - */ @Override protected ITreeContentProvider getFileProvider() { return new WorkbenchContentProvider() { @@ -328,12 +298,6 @@ public class ImportTraceWizardPage extends WizardResourceImportPage { } } - /* - * (non-Javadoc) - * - * @see - * org.eclipse.ui.dialogs.WizardResourceImportPage#getSelectedResources() - */ @Override protected List getSelectedResources() { List resources = new ArrayList(); @@ -439,13 +403,6 @@ public class ImportTraceWizardPage extends WizardResourceImportPage { // Browse for the source directory // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * - * @see - * org.eclipse.ui.dialogs.WizardResourceImportPage#handleEvent(org.eclipse - * .swt.widgets.Event) - */ @Override public void handleEvent(Event event) { if (event.widget == directoryBrowseButton) { @@ -684,13 +641,6 @@ public class ImportTraceWizardPage extends WizardResourceImportPage { private Button overwriteExistingResourcesCheckbox; private Button createLinksInWorkspaceButton; - /* - * (non-Javadoc) - * - * @see - * org.eclipse.ui.dialogs.WizardDataTransferPage#createOptionsGroupButtons - * (org.eclipse.swt.widgets.Group) - */ @Override protected void createOptionsGroupButtons(Group optionsGroup) { @@ -720,11 +670,6 @@ public class ImportTraceWizardPage extends WizardResourceImportPage { // Determine if the finish button can be enabled // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * - * @see org.eclipse.ui.dialogs.WizardDataTransferPage#validateSourceGroup() - */ @Override public boolean validateSourceGroup() { diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/wizards/Messages.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/wizards/Messages.java index 95f9bd27a1..bea988e72d 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/wizards/Messages.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/wizards/Messages.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011, 2012 Ericsson + * Copyright (c) 2011, 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 diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/wizards/NewExperimentDialog.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/wizards/NewExperimentDialog.java index cfe366b894..ee44358832 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/wizards/NewExperimentDialog.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/wizards/NewExperimentDialog.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2012 Ericsson + * Copyright (c) 2009, 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 @@ -50,9 +50,9 @@ import org.eclipse.ui.dialogs.SelectionStatusDialog; /** * Implementation of new experiment dialog that creates the experiment element. *

+ * * @version 1.0 * @author Francois Chouinard - */ public class NewExperimentDialog extends SelectionStatusDialog { @@ -69,8 +69,11 @@ public class NewExperimentDialog extends SelectionStatusDialog { // ------------------------------------------------------------------------ /** * Constructor - * @param shell The parent shell - * @param experimentFolder The parent experiment folder element + * + * @param shell + * The parent shell + * @param experimentFolder + * The parent experiment folder element */ public NewExperimentDialog(Shell shell, TmfExperimentFolder experimentFolder) { super(shell); @@ -83,10 +86,7 @@ public class NewExperimentDialog extends SelectionStatusDialog { // ------------------------------------------------------------------------ // Dialog // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite) - */ + @Override protected Control createDialogArea(Composite parent) { Composite composite = (Composite) super.createDialogArea(parent); @@ -119,25 +119,25 @@ public class NewExperimentDialog extends SelectionStatusDialog { fExperimentName.addListener(SWT.Modify, new Listener() { @Override public void handleEvent(Event event) { - validateNewExperimentName(); + validateNewExperimentName(); } }); } private void validateNewExperimentName() { - String name = fExperimentName.getText(); + String name = fExperimentName.getText(); IWorkspace workspace = fExperimentFolder.getWorkspace(); IStatus nameStatus = workspace.validateName(name, IResource.FOLDER); if ("".equals(name)) { //$NON-NLS-1$ - updateStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID, IStatus.ERROR, Messages.Dialog_EmptyNameError, null)); - return; + updateStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID, IStatus.ERROR, Messages.Dialog_EmptyNameError, null)); + return; } if (!nameStatus.isOK()) { - updateStatus(nameStatus); - return; + updateStatus(nameStatus); + return; } IPath path = new Path(name); @@ -152,28 +152,17 @@ public class NewExperimentDialog extends SelectionStatusDialog { // ------------------------------------------------------------------------ // SelectionStatusDialog // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see org.eclipse.ui.dialogs.SelectionStatusDialog#computeResult() - */ + @Override protected void computeResult() { } - /* - * (non-Javadoc) - * @see org.eclipse.ui.dialogs.SelectionStatusDialog#create() - */ @Override public void create() { super.create(); getButton(IDialogConstants.OK_ID).setEnabled(false); } - /* - * (non-Javadoc) - * @see org.eclipse.ui.dialogs.SelectionStatusDialog#okPressed() - */ @Override protected void okPressed() { IFolder folder = createNewExperiment(fExperimentName.getText()); @@ -190,7 +179,7 @@ public class NewExperimentDialog extends SelectionStatusDialog { private IFolder createNewExperiment(String experimentName) { - final IFolder experimentFolder = createExperiment(experimentName); + final IFolder experimentFolder = createExperiment(experimentName); WorkspaceModifyOperation operation = new WorkspaceModifyOperation() { @Override diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/wizards/NewTmfProjectWizard.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/wizards/NewTmfProjectWizard.java index cc3ee8a505..86b7fe57eb 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/wizards/NewTmfProjectWizard.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/wizards/NewTmfProjectWizard.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2012 Ericsson + * Copyright (c) 2009, 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 @@ -118,11 +118,6 @@ public class NewTmfProjectWizard extends Wizard implements INewWizard, IExecutab // Wizard // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * - * @see org.eclipse.jface.wizard.Wizard#addPages() - */ @Override public void addPages() { fMainPage = new NewTmfProjectMainWizardPage(Messages.NewProjectWizard_DialogHeader); @@ -131,21 +126,11 @@ public class NewTmfProjectWizard extends Wizard implements INewWizard, IExecutab addPage(fMainPage); } - /* - * (non-Javadoc) - * - * @see org.eclipse.jface.wizard.Wizard#performCancel() - */ @Override public boolean performCancel() { return true; } - /* - * (non-Javadoc) - * - * @see org.eclipse.jface.wizard.Wizard#performFinish() - */ @Override public boolean performFinish() { fProjectName = fMainPage.getProjectName(); @@ -206,9 +191,6 @@ public class NewTmfProjectWizard extends Wizard implements INewWizard, IExecutab // INewWizard // ------------------------------------------------------------------------ - /* (non-Javadoc) - * @see org.eclipse.ui.IWorkbenchWizard#init(org.eclipse.ui.IWorkbench, org.eclipse.jface.viewers.IStructuredSelection) - */ @Override public void init(IWorkbench iworkbench, IStructuredSelection istructuredselection) { } @@ -217,10 +199,6 @@ public class NewTmfProjectWizard extends Wizard implements INewWizard, IExecutab // IExecutableExtension // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see org.eclipse.core.runtime.IExecutableExtension#setInitializationData(org.eclipse.core.runtime.IConfigurationElement, java.lang.String, java.lang.Object) - */ @Override public void setInitializationData(IConfigurationElement config, String propertyName, Object data) throws CoreException { fConfigElement = config; diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/wizards/RenameExperimentDialog.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/wizards/RenameExperimentDialog.java index db3dc63be7..2a63546a53 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/wizards/RenameExperimentDialog.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/wizards/RenameExperimentDialog.java @@ -55,6 +55,7 @@ import org.eclipse.ui.part.FileEditorInput; /** * Implementation of a dialog box to rename an experiment. *

+ * * @version 1.0 * @author Francois Chouinard */ @@ -64,8 +65,8 @@ public class RenameExperimentDialog extends SelectionStatusDialog { // Members // ------------------------------------------------------------------------ - private final TmfExperimentElement fExperiment; - private Text fNewExperimentName; + private final TmfExperimentElement fExperiment; + private Text fNewExperimentName; private final IContainer fExperimentFolder; private final TmfProjectElement fProject; @@ -75,8 +76,11 @@ public class RenameExperimentDialog extends SelectionStatusDialog { /** * Constructor - * @param shell The parent shell - * @param experiment The experiment element rename + * + * @param shell + * The parent shell + * @param experiment + * The experiment element rename */ public RenameExperimentDialog(Shell shell, TmfExperimentElement experiment) { super(shell); @@ -91,10 +95,7 @@ public class RenameExperimentDialog extends SelectionStatusDialog { // ------------------------------------------------------------------------ // Dialog // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite) - */ + @Override protected Control createDialogArea(Composite parent) { Composite composite = (Composite) super.createDialogArea(parent); @@ -141,25 +142,25 @@ public class RenameExperimentDialog extends SelectionStatusDialog { fNewExperimentName.addListener(SWT.Modify, new Listener() { @Override public void handleEvent(Event event) { - validateNewExperimentName(); + validateNewExperimentName(); } }); } private void validateNewExperimentName() { - String name = fNewExperimentName.getText(); + String name = fNewExperimentName.getText(); IWorkspace workspace = fExperimentFolder.getWorkspace(); IStatus nameStatus = workspace.validateName(name, IResource.FOLDER); if ("".equals(name)) { //$NON-NLS-1$ - updateStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID, IStatus.ERROR, Messages.Dialog_EmptyNameError, null)); - return; + updateStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID, IStatus.ERROR, Messages.Dialog_EmptyNameError, null)); + return; } if (!nameStatus.isOK()) { - updateStatus(nameStatus); - return; + updateStatus(nameStatus); + return; } IPath path = new Path(name); @@ -174,28 +175,17 @@ public class RenameExperimentDialog extends SelectionStatusDialog { // ------------------------------------------------------------------------ // SelectionStatusDialog // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see org.eclipse.ui.dialogs.SelectionStatusDialog#computeResult() - */ + @Override protected void computeResult() { } - /* - * (non-Javadoc) - * @see org.eclipse.ui.dialogs.SelectionStatusDialog#create() - */ @Override public void create() { super.create(); getButton(IDialogConstants.OK_ID).setEnabled(false); } - /* - * (non-Javadoc) - * @see org.eclipse.ui.dialogs.SelectionStatusDialog#okPressed() - */ @Override protected void okPressed() { IFolder folder = renameExperiment(fNewExperimentName.getText()); @@ -212,10 +202,10 @@ public class RenameExperimentDialog extends SelectionStatusDialog { private IFolder renameExperiment(final String newName) { - IPath oldPath = fExperiment.getResource().getFullPath(); - final IPath newPath = oldPath.append("../" + newName); //$NON-NLS-1$ + IPath oldPath = fExperiment.getResource().getFullPath(); + final IPath newPath = oldPath.append("../" + newName); //$NON-NLS-1$ - WorkspaceModifyOperation operation = new WorkspaceModifyOperation() { + WorkspaceModifyOperation operation = new WorkspaceModifyOperation() { @Override public void execute(IProgressMonitor monitor) throws CoreException { try { @@ -248,7 +238,7 @@ public class RenameExperimentDialog extends SelectionStatusDialog { } fExperiment.renameSupplementaryFolder(newName); - fExperiment.getResource().move(newPath, IResource.FORCE | IResource.SHALLOW, null); + fExperiment.getResource().move(newPath, IResource.FORCE | IResource.SHALLOW, null); if (monitor.isCanceled()) { throw new OperationCanceledException(); } diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/wizards/RenameTraceDialog.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/wizards/RenameTraceDialog.java index 269f05035d..f167227037 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/wizards/RenameTraceDialog.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/wizards/RenameTraceDialog.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011, 2012 Ericsson + * Copyright (c) 2011, 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 @@ -94,10 +94,7 @@ public class RenameTraceDialog extends SelectionStatusDialog { // ------------------------------------------------------------------------ // Dialog // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite) - */ + @Override protected Control createDialogArea(Composite parent) { Composite composite = (Composite) super.createDialogArea(parent); @@ -187,26 +184,17 @@ public class RenameTraceDialog extends SelectionStatusDialog { // ------------------------------------------------------------------------ // SelectionStatusDialog // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see org.eclipse.ui.dialogs.SelectionStatusDialog#computeResult() - */ + @Override protected void computeResult() { } - /* - * (non-Javadoc) - * @see org.eclipse.ui.dialogs.SelectionStatusDialog#create() - */ + @Override public void create() { super.create(); getButton(IDialogConstants.OK_ID).setEnabled(false); } - /* - * (non-Javadoc) - * @see org.eclipse.ui.dialogs.SelectionStatusDialog#okPressed() - */ + @Override protected void okPressed() { IResource trace = renameTrace(fNewTraceNameText.getText()); diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/wizards/SelectTracesWizard.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/wizards/SelectTracesWizard.java index 2ab656bf7a..2efd739fde 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/wizards/SelectTracesWizard.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/wizards/SelectTracesWizard.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2012 Ericsson + * Copyright (c) 2009, 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 @@ -38,6 +38,7 @@ public class SelectTracesWizard extends Wizard implements IImportWizard { // ------------------------------------------------------------------------ // Constructor // ------------------------------------------------------------------------ + /** * Constructor * @param project The project model element @@ -52,19 +53,11 @@ public class SelectTracesWizard extends Wizard implements IImportWizard { // Wizard // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see org.eclipse.ui.IWorkbenchWizard#init(org.eclipse.ui.IWorkbench, org.eclipse.jface.viewers.IStructuredSelection) - */ @Override public void init(IWorkbench workbench, IStructuredSelection selection) { setWindowTitle(Messages.SelectTracesWizard_WindowTitle); } - /* - * (non-Javadoc) - * @see org.eclipse.jface.wizard.Wizard#addPages() - */ @Override public void addPages() { super.addPages(); @@ -72,10 +65,6 @@ public class SelectTracesWizard extends Wizard implements IImportWizard { addPage(fSelectTraceWizardPage); } - /* - * (non-Javadoc) - * @see org.eclipse.jface.wizard.Wizard#performFinish() - */ @Override public boolean performFinish() { return fSelectTraceWizardPage.performFinish(); diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/wizards/SelectTracesWizardPage.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/wizards/SelectTracesWizardPage.java index 8e4fb43a1d..7b5efdf9f0 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/wizards/SelectTracesWizardPage.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/wizards/SelectTracesWizardPage.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2012, 2013 Ericsson, École Polytechnique de Montréal + * Copyright (c) 2009, 2013 Ericsson, École Polytechnique de Montréal * * All rights reserved. This program and the accompanying materials are * made available under the terms of the Eclipse Public License v1.0 which @@ -75,10 +75,7 @@ public class SelectTracesWizardPage extends WizardPage { // ------------------------------------------------------------------------ // Dialog // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite) - */ + @Override public void createControl(Composite parent) { Composite container = new Composite(parent, SWT.NULL); diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/properties/TmfTimestampFormatPage.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/properties/TmfTimestampFormatPage.java index f291ff139b..b13da9f960 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/properties/TmfTimestampFormatPage.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/properties/TmfTimestampFormatPage.java @@ -137,9 +137,6 @@ public class TmfTimestampFormatPage extends PreferencePage implements IWorkbench // IWorkbenchPreferencePage // ------------------------------------------------------------------------ - /* (non-Javadoc) - * @see org.eclipse.ui.IWorkbenchPreferencePage#init(org.eclipse.ui.IWorkbench) - */ @Override public void init(IWorkbench workbench) { } @@ -148,9 +145,6 @@ public class TmfTimestampFormatPage extends PreferencePage implements IWorkbench // PreferencePage // ------------------------------------------------------------------------ - /* (non-Javadoc) - * @see org.eclipse.jface.preference.PreferencePage#createContents(org.eclipse.swt.widgets.Composite) - */ @Override protected Control createContents(Composite parent) { @@ -218,10 +212,6 @@ public class TmfTimestampFormatPage extends PreferencePage implements IWorkbench return fPage; } - /* - * (non-Javadoc) - * @see org.eclipse.jface.preference.PreferencePage#performDefaults() - */ @Override protected void performDefaults() { fDateTimeFields.loadDefault(); @@ -235,10 +225,6 @@ public class TmfTimestampFormatPage extends PreferencePage implements IWorkbench displayExample(); } - /* - * (non-Javadoc) - * @see org.eclipse.jface.preference.PreferencePage#performApply() - */ @Override protected void performApply() { fDateTimeFields.store(); @@ -251,9 +237,6 @@ public class TmfTimestampFormatPage extends PreferencePage implements IWorkbench displayExample(); } - /* (non-Javadoc) - * @see org.eclipse.jface.preference.PreferencePage#performOk() - */ @Override public boolean performOk() { performApply(); @@ -264,16 +247,10 @@ public class TmfTimestampFormatPage extends PreferencePage implements IWorkbench // SelectionListener // ------------------------------------------------------------------------ - /* (non-Javadoc) - * @see org.eclipse.swt.events.SelectionListener#widgetSelected(org.eclipse.swt.events.SelectionEvent) - */ @Override public void widgetSelected(SelectionEvent e) { } - /* (non-Javadoc) - * @see org.eclipse.swt.events.SelectionListener#widgetDefaultSelected(org.eclipse.swt.events.SelectionEvent) - */ @Override public void widgetDefaultSelected(SelectionEvent e) { } @@ -282,9 +259,6 @@ public class TmfTimestampFormatPage extends PreferencePage implements IWorkbench // IPropertyChangeListener // ------------------------------------------------------------------------ - /* (non-Javadoc) - * @see org.eclipse.jface.util.IPropertyChangeListener#propertyChange(org.eclipse.jface.util.PropertyChangeEvent) - */ @Override public void propertyChange(PropertyChangeEvent event) { Object source = event.getSource(); diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/events/TmfEventsTable.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/events/TmfEventsTable.java index d722c3f620..a427771eb7 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/events/TmfEventsTable.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/events/TmfEventsTable.java @@ -1896,9 +1896,6 @@ public class TmfEventsTable extends TmfComponent implements IGotoMarker, IColorS // ISelectionProvider // ------------------------------------------------------------------------ - /* (non-Javadoc) - * @see org.eclipse.jface.viewers.ISelectionProvider#addSelectionChangedListener(org.eclipse.jface.viewers.ISelectionChangedListener) - */ /** * @since 2.0 */ @@ -1907,9 +1904,6 @@ public class TmfEventsTable extends TmfComponent implements IGotoMarker, IColorS selectionChangedListeners.add(listener); } - /* (non-Javadoc) - * @see org.eclipse.jface.viewers.ISelectionProvider#getSelection() - */ /** * @since 2.0 */ @@ -1927,9 +1921,6 @@ public class TmfEventsTable extends TmfComponent implements IGotoMarker, IColorS return new StructuredSelection(list); } - /* (non-Javadoc) - * @see org.eclipse.jface.viewers.ISelectionProvider#removeSelectionChangedListener(org.eclipse.jface.viewers.ISelectionChangedListener) - */ /** * @since 2.0 */ @@ -1938,9 +1929,6 @@ public class TmfEventsTable extends TmfComponent implements IGotoMarker, IColorS selectionChangedListeners.remove(listener); } - /* (non-Javadoc) - * @see org.eclipse.jface.viewers.ISelectionProvider#setSelection(org.eclipse.jface.viewers.ISelection) - */ /** * @since 2.0 */ @@ -2104,11 +2092,6 @@ public class TmfEventsTable extends TmfComponent implements IGotoMarker, IColorS // Listeners // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * - * @see org.eclipse.linuxtools.tmf.ui.views.colors.IColorSettingsListener#colorSettingsChanged(org.eclipse.linuxtools.tmf.ui.views.colors.ColorSetting[]) - */ @Override public void colorSettingsChanged(final ColorSetting[] colorSettings) { fTable.refresh(); diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/statistics/Messages.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/statistics/Messages.java index 2736b8527a..a9c23b4226 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/statistics/Messages.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/statistics/Messages.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 diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/statistics/TmfStatisticsViewer.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/statistics/TmfStatisticsViewer.java index b8a9264bc1..12ad69f676 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/statistics/TmfStatisticsViewer.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/statistics/TmfStatisticsViewer.java @@ -204,11 +204,6 @@ public class TmfStatisticsViewer extends TmfViewer { initInput(); } - /* - * (non-Javadoc) - * - * @see org.eclipse.linuxtools.tmf.core.component.TmfComponent#dispose() - */ @Override public void dispose() { super.dispose(); diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/statistics/model/Messages.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/statistics/model/Messages.java index 2a50be4554..7cabd61e23 100755 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/statistics/model/Messages.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/statistics/model/Messages.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011, 2012 Ericsson + * Copyright (c) 2011, 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 diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/statistics/model/TmfBaseColumnData.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/statistics/model/TmfBaseColumnData.java index c6cea95561..69d4b46299 100755 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/statistics/model/TmfBaseColumnData.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/statistics/model/TmfBaseColumnData.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011, 2012 Ericsson + * Copyright (c) 2011, 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 @@ -109,64 +109,36 @@ public class TmfBaseColumnData implements ITmfStatisticsColumnData { fPercentageProvider = p; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.viewers.statistics.model.ITmfStatisticsColumnData#getHeader() - */ @Override public String getHeader() { return fHeader; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.viewers.statistics.model.ITmfStatisticsColumnData#getWidth() - */ @Override public int getWidth() { return fWidth; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.viewers.statistics.model.ITmfStatisticsColumnData#getAlignment() - */ @Override public int getAlignment() { return fAlignment; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.viewers.statistics.model.ITmfStatisticsColumnData#getTooltip() - */ @Override public String getTooltip() { return fTooltip; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.viewers.statistics.model.ITmfStatisticsColumnData#getLabelProvider() - */ @Override public ColumnLabelProvider getLabelProvider() { return fLabelProvider; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.viewers.statistics.model.ITmfStatisticsColumnData#getComparator() - */ @Override public ViewerComparator getComparator() { return fComparator; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.viewers.statistics.model.ITmfStatisticsColumnData#getPercentageProvider() - */ @Override public ITmfColumnPercentageProvider getPercentageProvider() { return fPercentageProvider; diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/statistics/model/TmfTreeContentProvider.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/statistics/model/TmfTreeContentProvider.java index d6bc3cf32a..645f33fd61 100755 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/statistics/model/TmfTreeContentProvider.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/statistics/model/TmfTreeContentProvider.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011, 2012 Ericsson + * Copyright (c) 2011, 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 @@ -25,60 +25,30 @@ import org.eclipse.jface.viewers.Viewer; */ public class TmfTreeContentProvider implements ITreeContentProvider { - /* - * (non-Javadoc) - * - * @see org.eclipse.jface.viewers.ITreeContentProvider#getChildren(java.lang.Object) - */ @Override public Object[] getChildren(Object parentElement) { return ((TmfStatisticsTreeNode) parentElement).getChildren().toArray(); } - /* - * (non-Javadoc) - * - * @see org.eclipse.jface.viewers.ITreeContentProvider#getParent(java.lang.Object) - */ @Override public Object getParent(Object element) { return ((TmfStatisticsTreeNode) element).getParent(); } - /* - * (non-Javadoc) - * - * @see org.eclipse.jface.viewers.ITreeContentProvider#hasChildren(java.lang.Object) - */ @Override public boolean hasChildren(Object element) { return ((TmfStatisticsTreeNode) element).hasChildren(); } - /* - * (non-Javadoc) - * - * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object) - */ @Override public Object[] getElements(Object inputElement) { return getChildren(inputElement); } - /* - * (non-Javadoc) - * - * @see org.eclipse.jface.viewers.IContentProvider#dispose() - */ @Override public void dispose() { } - /* - * (non-Javadoc) - * - * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object) - */ @Override public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { } diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/TmfView.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/TmfView.java index 45ca2dc106..0005dc3c09 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/TmfView.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/TmfView.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2012 Ericsson + * Copyright (c) 2009, 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 diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/colors/ColorSettingsXML.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/colors/ColorSettingsXML.java index 44d0d04a5b..32382d0a2b 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/colors/ColorSettingsXML.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/colors/ColorSettingsXML.java @@ -1,11 +1,11 @@ /******************************************************************************* - * Copyright (c) 2010, 2012 Ericsson - * + * Copyright (c) 2010, 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: * Patrick Tasse - Initial API and implementation * Bernd Hufmann - Updated to use RGB for the tick color @@ -43,7 +43,7 @@ import org.xml.sax.helpers.DefaultHandler; /** * Class for saving and loading of color settings to/from file. - * + * * @version 1.0 * @author Patrick Tasse * @@ -51,174 +51,171 @@ import org.xml.sax.helpers.DefaultHandler; public class ColorSettingsXML { // XML Tags and attributes - private static final String COLOR_SETTINGS_TAG = "COLOR_SETTINGS"; //$NON-NLS-1$ - private static final String COLOR_SETTING_TAG = "COLOR_SETTING"; //$NON-NLS-1$ - private static final String FG_TAG = "FG"; //$NON-NLS-1$ - private static final String BG_TAG = "BG"; //$NON-NLS-1$ - private static final String R_ATTR = "R"; //$NON-NLS-1$ - private static final String G_ATTR = "G"; //$NON-NLS-1$ - private static final String B_ATTR = "B"; //$NON-NLS-1$ - private static final String TICK_TAG = "TICK"; //$NON-NLS-1$ - private static final String FILTER_TAG = "FILTER"; //$NON-NLS-1$ - - /** - * Saves the given color settings to file. - * - * @param pathName A file name with path - * @param colorSettings -An array of color settings to save. - */ - public static void save(String pathName, ColorSetting[] colorSettings) { - try { - DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactory.newInstance(); - DocumentBuilder documentBuilder = documentBuilderFactory.newDocumentBuilder(); - Document document = documentBuilder.newDocument(); - - Element rootElement = document.createElement(COLOR_SETTINGS_TAG); - document.appendChild(rootElement); - - for (ColorSetting colorSetting : colorSettings) { - Element colorSettingElement = document.createElement(COLOR_SETTING_TAG); - rootElement.appendChild(colorSettingElement); - - Element fgElement = document.createElement(FG_TAG); - colorSettingElement.appendChild(fgElement); - RGB foreground = colorSetting.getForegroundRGB(); - fgElement.setAttribute(R_ATTR, Integer.toString(foreground.red)); - fgElement.setAttribute(G_ATTR, Integer.toString(foreground.green)); - fgElement.setAttribute(B_ATTR, Integer.toString(foreground.blue)); - - Element bgElement = document.createElement(BG_TAG); - colorSettingElement.appendChild(bgElement); - RGB background = colorSetting.getBackgroundRGB(); - bgElement.setAttribute(R_ATTR, Integer.toString(background.red)); - bgElement.setAttribute(G_ATTR, Integer.toString(background.green)); - bgElement.setAttribute(B_ATTR, Integer.toString(background.blue)); - - Element tickColorElement = document.createElement(TICK_TAG); - colorSettingElement.appendChild(tickColorElement); + private static final String COLOR_SETTINGS_TAG = "COLOR_SETTINGS"; //$NON-NLS-1$ + private static final String COLOR_SETTING_TAG = "COLOR_SETTING"; //$NON-NLS-1$ + private static final String FG_TAG = "FG"; //$NON-NLS-1$ + private static final String BG_TAG = "BG"; //$NON-NLS-1$ + private static final String R_ATTR = "R"; //$NON-NLS-1$ + private static final String G_ATTR = "G"; //$NON-NLS-1$ + private static final String B_ATTR = "B"; //$NON-NLS-1$ + private static final String TICK_TAG = "TICK"; //$NON-NLS-1$ + private static final String FILTER_TAG = "FILTER"; //$NON-NLS-1$ + + /** + * Saves the given color settings to file. + * + * @param pathName + * A file name with path + * @param colorSettings + * -An array of color settings to save. + */ + public static void save(String pathName, ColorSetting[] colorSettings) { + try { + DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactory.newInstance(); + DocumentBuilder documentBuilder = documentBuilderFactory.newDocumentBuilder(); + Document document = documentBuilder.newDocument(); + + Element rootElement = document.createElement(COLOR_SETTINGS_TAG); + document.appendChild(rootElement); + + for (ColorSetting colorSetting : colorSettings) { + Element colorSettingElement = document.createElement(COLOR_SETTING_TAG); + rootElement.appendChild(colorSettingElement); + + Element fgElement = document.createElement(FG_TAG); + colorSettingElement.appendChild(fgElement); + RGB foreground = colorSetting.getForegroundRGB(); + fgElement.setAttribute(R_ATTR, Integer.toString(foreground.red)); + fgElement.setAttribute(G_ATTR, Integer.toString(foreground.green)); + fgElement.setAttribute(B_ATTR, Integer.toString(foreground.blue)); + + Element bgElement = document.createElement(BG_TAG); + colorSettingElement.appendChild(bgElement); + RGB background = colorSetting.getBackgroundRGB(); + bgElement.setAttribute(R_ATTR, Integer.toString(background.red)); + bgElement.setAttribute(G_ATTR, Integer.toString(background.green)); + bgElement.setAttribute(B_ATTR, Integer.toString(background.blue)); + + Element tickColorElement = document.createElement(TICK_TAG); + colorSettingElement.appendChild(tickColorElement); RGB tickColor = colorSetting.getTickColorRGB(); tickColorElement.setAttribute(R_ATTR, Integer.toString(tickColor.red)); tickColorElement.setAttribute(G_ATTR, Integer.toString(tickColor.green)); tickColorElement.setAttribute(B_ATTR, Integer.toString(tickColor.blue)); - if (colorSetting.getFilter() != null) { - Element filterElement = document.createElement(FILTER_TAG); - colorSettingElement.appendChild(filterElement); - TmfFilterXMLWriter.buildXMLTree(document, colorSetting.getFilter(), filterElement); - } - } - - TransformerFactory transformerFactory = TransformerFactory.newInstance(); - - Transformer transformer = transformerFactory.newTransformer(); - DOMSource source = new DOMSource(document); - StreamResult result = new StreamResult(new File(pathName)); - transformer.transform(source, result); - } catch (ParserConfigurationException e) { - Activator.getDefault().logError("Error saving color xml file: " + pathName, e); //$NON-NLS-1$ - } catch (TransformerConfigurationException e) { - Activator.getDefault().logError("Error saving color xml file: " + pathName, e); //$NON-NLS-1$ - } catch (TransformerException e) { - Activator.getDefault().logError("Error saving color xml file: " + pathName, e); //$NON-NLS-1$ - } - } - - /** - * Loads color settings from file and returns it in an array. - * - * @param pathName A file name with path - * - * @return the color settings array loaded from file - */ - public static ColorSetting[] load(String pathName) { - if (! new File(pathName).canRead()) { - return new ColorSetting[0]; - } - SAXParserFactory parserFactory = SAXParserFactory.newInstance(); - parserFactory.setNamespaceAware(true); + if (colorSetting.getFilter() != null) { + Element filterElement = document.createElement(FILTER_TAG); + colorSettingElement.appendChild(filterElement); + TmfFilterXMLWriter.buildXMLTree(document, colorSetting.getFilter(), filterElement); + } + } + + TransformerFactory transformerFactory = TransformerFactory.newInstance(); + + Transformer transformer = transformerFactory.newTransformer(); + DOMSource source = new DOMSource(document); + StreamResult result = new StreamResult(new File(pathName)); + transformer.transform(source, result); + } catch (ParserConfigurationException e) { + Activator.getDefault().logError("Error saving color xml file: " + pathName, e); //$NON-NLS-1$ + } catch (TransformerConfigurationException e) { + Activator.getDefault().logError("Error saving color xml file: " + pathName, e); //$NON-NLS-1$ + } catch (TransformerException e) { + Activator.getDefault().logError("Error saving color xml file: " + pathName, e); //$NON-NLS-1$ + } + } + + /** + * Loads color settings from file and returns it in an array. + * + * @param pathName + * A file name with path + * + * @return the color settings array loaded from file + */ + public static ColorSetting[] load(String pathName) { + if (!new File(pathName).canRead()) { + return new ColorSetting[0]; + } + SAXParserFactory parserFactory = SAXParserFactory.newInstance(); + parserFactory.setNamespaceAware(true); ColorSettingsContentHandler handler = new ColorSettingsContentHandler(); - try { - XMLReader saxReader = parserFactory.newSAXParser().getXMLReader(); - saxReader.setContentHandler(handler); - saxReader.parse(pathName); - return handler.colorSettings.toArray(new ColorSetting[0]); - } catch (ParserConfigurationException e) { - Activator.getDefault().logError("Error loading color xml file: " + pathName, e); //$NON-NLS-1$ - } catch (SAXException e) { - Activator.getDefault().logError("Error loading color xml file: " + pathName, e); //$NON-NLS-1$ - } catch (IOException e) { - Activator.getDefault().logError("Error loading color xml file: " + pathName, e); //$NON-NLS-1$ - } - // In case of error, dispose the partial list of color settings - for (ColorSetting colorSetting : handler.colorSettings) { - colorSetting.dispose(); - } - return new ColorSetting[0]; - } - - // Helper class - private static class ColorSettingsContentHandler extends DefaultHandler { - - private List colorSettings = new ArrayList(0); - private RGB fg = new RGB(0, 0, 0); - private RGB bg = new RGB(255, 255, 255); - private RGB tickColor = new RGB(0, 0, 0); - private ITmfFilterTreeNode filter; - private TmfFilterContentHandler filterContentHandler; - - /* (non-Javadoc) - * @see org.xml.sax.helpers.DefaultHandler#startElement(java.lang.String, java.lang.String, java.lang.String, org.xml.sax.Attributes) - */ - @Override - public void startElement(String uri, String localName, String qName, Attributes attributes) - throws SAXException { - if (localName.equals(COLOR_SETTINGS_TAG)) { - colorSettings = new ArrayList(); - } else if (localName.equals(COLOR_SETTING_TAG)) { - fg = null; - bg = null; - filter = null; - } else if (localName.equals(FG_TAG)) { - int r = Integer.valueOf(attributes.getValue(R_ATTR)); - int g = Integer.valueOf(attributes.getValue(G_ATTR)); - int b = Integer.valueOf(attributes.getValue(B_ATTR)); - fg = new RGB(r, g, b); - } else if (localName.equals(BG_TAG)) { - int r = Integer.valueOf(attributes.getValue(R_ATTR)); - int g = Integer.valueOf(attributes.getValue(G_ATTR)); - int b = Integer.valueOf(attributes.getValue(B_ATTR)); - bg = new RGB(r, g, b); + try { + XMLReader saxReader = parserFactory.newSAXParser().getXMLReader(); + saxReader.setContentHandler(handler); + saxReader.parse(pathName); + return handler.colorSettings.toArray(new ColorSetting[0]); + } catch (ParserConfigurationException e) { + Activator.getDefault().logError("Error loading color xml file: " + pathName, e); //$NON-NLS-1$ + } catch (SAXException e) { + Activator.getDefault().logError("Error loading color xml file: " + pathName, e); //$NON-NLS-1$ + } catch (IOException e) { + Activator.getDefault().logError("Error loading color xml file: " + pathName, e); //$NON-NLS-1$ + } + // In case of error, dispose the partial list of color settings + for (ColorSetting colorSetting : handler.colorSettings) { + colorSetting.dispose(); + } + return new ColorSetting[0]; + } + + // Helper class + private static class ColorSettingsContentHandler extends DefaultHandler { + + private List colorSettings = new ArrayList(0); + private RGB fg = new RGB(0, 0, 0); + private RGB bg = new RGB(255, 255, 255); + private RGB tickColor = new RGB(0, 0, 0); + private ITmfFilterTreeNode filter; + private TmfFilterContentHandler filterContentHandler; + + @Override + public void startElement(String uri, String localName, String qName, Attributes attributes) + throws SAXException { + if (localName.equals(COLOR_SETTINGS_TAG)) { + colorSettings = new ArrayList(); + } else if (localName.equals(COLOR_SETTING_TAG)) { + fg = null; + bg = null; + filter = null; + } else if (localName.equals(FG_TAG)) { + int r = Integer.valueOf(attributes.getValue(R_ATTR)); + int g = Integer.valueOf(attributes.getValue(G_ATTR)); + int b = Integer.valueOf(attributes.getValue(B_ATTR)); + fg = new RGB(r, g, b); + } else if (localName.equals(BG_TAG)) { + int r = Integer.valueOf(attributes.getValue(R_ATTR)); + int g = Integer.valueOf(attributes.getValue(G_ATTR)); + int b = Integer.valueOf(attributes.getValue(B_ATTR)); + bg = new RGB(r, g, b); } else if (localName.equals(TICK_TAG)) { int r = Integer.valueOf(attributes.getValue(R_ATTR)); int g = Integer.valueOf(attributes.getValue(G_ATTR)); int b = Integer.valueOf(attributes.getValue(B_ATTR)); tickColor = new RGB(r, g, b); - } else if (localName.equals(FILTER_TAG)) { - filterContentHandler = new TmfFilterContentHandler(); - } else if (filterContentHandler != null) { - filterContentHandler.startElement(uri, localName, qName, attributes); - } - } - - /* (non-Javadoc) - * @see org.xml.sax.helpers.DefaultHandler#endElement(java.lang.String, java.lang.String, java.lang.String) - */ - @Override - public void endElement(String uri, String localName, String qName) - throws SAXException { - if (localName.equals(COLOR_SETTINGS_TAG)) { - // Nothing to do - } else if (localName.equals(COLOR_SETTING_TAG)) { - ColorSetting colorSetting = new ColorSetting(fg, bg, tickColor, filter); - colorSettings.add(colorSetting); - } else if (localName.equals(FILTER_TAG)) { - filter = filterContentHandler.getTree(); - filterContentHandler = null; - } else if (filterContentHandler != null) { - filterContentHandler.endElement(uri, localName, qName); - } - } - - } + } else if (localName.equals(FILTER_TAG)) { + filterContentHandler = new TmfFilterContentHandler(); + } else if (filterContentHandler != null) { + filterContentHandler.startElement(uri, localName, qName, attributes); + } + } + + @Override + public void endElement(String uri, String localName, String qName) + throws SAXException { + if (localName.equals(COLOR_SETTINGS_TAG)) { + // Nothing to do + } else if (localName.equals(COLOR_SETTING_TAG)) { + ColorSetting colorSetting = new ColorSetting(fg, bg, tickColor, filter); + colorSettings.add(colorSetting); + } else if (localName.equals(FILTER_TAG)) { + filter = filterContentHandler.getTree(); + filterContentHandler = null; + } else if (filterContentHandler != null) { + filterContentHandler.endElement(uri, localName, qName); + } + } + + } } diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/colors/ColorsView.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/colors/ColorsView.java index 6f52b3a00b..eabe4ffaa5 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/colors/ColorsView.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/colors/ColorsView.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2010, 2012 Ericsson + * Copyright (c) 2010, 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 @@ -142,9 +142,6 @@ public class ColorsView extends TmfView { super("Colors"); //$NON-NLS-1$ } - /* (non-Javadoc) - * @see org.eclipse.ui.part.WorkbenchPart#createPartControl(Composite) - */ @Override public void createPartControl(Composite parent) { fShell = parent.getShell(); @@ -205,9 +202,6 @@ public class ColorsView extends TmfView { fillToolBar(); } - /* (non-Javadoc) - * @see org.eclipse.ui.part.WorkbenchPart#setFocus() - */ @Override public void setFocus() { fScrolledComposite.setFocus(); diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/environment/TmfEnvironmentView.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/environment/TmfEnvironmentView.java index aa95186b98..0c04c52ac7 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/environment/TmfEnvironmentView.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/environment/TmfEnvironmentView.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 @@ -101,9 +101,6 @@ public class TmfEnvironmentView extends TmfView { } } - /* (non-Javadoc) - * @see org.eclipse.ui.part.WorkbenchPart#setFocus() - */ @Override public void setFocus() { fTree.setFocus(); diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/filter/FilterDialog.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/filter/FilterDialog.java index 3880dc6e00..d573c1760d 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/filter/FilterDialog.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/filter/FilterDialog.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2010, 2012 Ericsson + * Copyright (c) 2010, 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 @@ -29,8 +29,8 @@ import org.eclipse.swt.widgets.Shell; */ public class FilterDialog extends Dialog { - TmfFilterNode fRoot; - FilterViewer fViewer; + TmfFilterNode fRoot; + FilterViewer fViewer; /** * Constructor. @@ -38,46 +38,44 @@ public class FilterDialog extends Dialog { * @param shell * The shell to which this dialog is attached */ - public FilterDialog(Shell shell) { - super(shell); - setShellStyle(getShellStyle() | SWT.RESIZE | SWT.MAX); - } + public FilterDialog(Shell shell) { + super(shell); + setShellStyle(getShellStyle() | SWT.RESIZE | SWT.MAX); + } - /* (non-Javadoc) - * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite) - */ - @Override - protected Control createDialogArea(Composite parent) { + @Override + protected Control createDialogArea(Composite parent) { getShell().setText(Messages.FilterDialog_FilterDialogTitle); - getShell().setMinimumSize(getShell().computeSize(500, 200)); + getShell().setMinimumSize(getShell().computeSize(500, 200)); Composite composite = (Composite) super.createDialogArea(parent); fViewer = new FilterViewer(composite, SWT.BORDER); fViewer.setInput(fRoot); return composite; - } + } - /** - * @param filter the filter to set - */ - public void setFilter(ITmfFilterTreeNode filter) { - fRoot = new TmfFilterNode(null); - if (filter != null) { - fRoot.addChild(filter.clone()); - } - if (fViewer != null) { - fViewer.setInput(fRoot); - } - } + /** + * @param filter + * the filter to set + */ + public void setFilter(ITmfFilterTreeNode filter) { + fRoot = new TmfFilterNode(null); + if (filter != null) { + fRoot.addChild(filter.clone()); + } + if (fViewer != null) { + fViewer.setInput(fRoot); + } + } - /** - * @return the filter - */ - public ITmfFilterTreeNode getFilter() { - if (fRoot != null && fRoot.hasChildren()) { - return fRoot.getChild(0).clone(); - } - return null; - } + /** + * @return the filter + */ + public ITmfFilterTreeNode getFilter() { + if (fRoot != null && fRoot.hasChildren()) { + return fRoot.getChild(0).clone(); + } + return null; + } } diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/filter/FilterTreeContentProvider.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/filter/FilterTreeContentProvider.java index 70f65d8e2b..df038d4aa8 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/filter/FilterTreeContentProvider.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/filter/FilterTreeContentProvider.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2010, 2012 Ericsson + * Copyright (c) 2010, 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 @@ -26,70 +26,46 @@ import org.eclipse.linuxtools.tmf.core.filter.model.ITmfFilterTreeNode; */ public class FilterTreeContentProvider implements ITreeContentProvider { - /* - * (non-Javadoc) - * @see org.eclipse.jface.viewers.IContentProvider#dispose() - */ - @Override + @Override public void dispose() { - // TODO Auto-generated method stub - } + // TODO Auto-generated method stub + } - /* - * (non-Javadoc) - * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object) - */ - @Override + @Override public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { - // TODO Auto-generated method stub - } + // TODO Auto-generated method stub + } - /* - * (non-Javadoc) - * @see org.eclipse.jface.viewers.ITreeContentProvider#getElements(java.lang.Object) - */ - @Override + @Override public Object[] getElements(Object inputElement) { - if (inputElement instanceof ITmfFilterTreeNode) { - ArrayList result = new ArrayList(); - for(int i = 0; i < ((ITmfFilterTreeNode)inputElement).getChildrenCount(); i++) { - result.add(((ITmfFilterTreeNode)inputElement).getChild(i)); - } + if (inputElement instanceof ITmfFilterTreeNode) { + ArrayList result = new ArrayList(); + for (int i = 0; i < ((ITmfFilterTreeNode) inputElement).getChildrenCount(); i++) { + result.add(((ITmfFilterTreeNode) inputElement).getChild(i)); + } - return result.toArray(); - } + return result.toArray(); + } return null; - } + } - /* - * (non-Javadoc) - * @see org.eclipse.jface.viewers.ITreeContentProvider#getChildren(java.lang.Object) - */ - @Override + @Override public Object[] getChildren(Object parentElement) { - ArrayList result = new ArrayList(); - for(int i = 0; i < ((ITmfFilterTreeNode)parentElement).getChildrenCount(); i++) { - result.add(((ITmfFilterTreeNode)parentElement).getChild(i)); - } - return result.toArray(); - } + ArrayList result = new ArrayList(); + for (int i = 0; i < ((ITmfFilterTreeNode) parentElement).getChildrenCount(); i++) { + result.add(((ITmfFilterTreeNode) parentElement).getChild(i)); + } + return result.toArray(); + } - /* - * (non-Javadoc) - * @see org.eclipse.jface.viewers.ITreeContentProvider#getParent(java.lang.Object) - */ - @Override + @Override public Object getParent(Object element) { - return ((ITmfFilterTreeNode) element).getParent(); - } + return ((ITmfFilterTreeNode) element).getParent(); + } - /* - * (non-Javadoc) - * @see org.eclipse.jface.viewers.ITreeContentProvider#hasChildren(java.lang.Object) - */ - @Override + @Override public boolean hasChildren(Object element) { - return ((ITmfFilterTreeNode) element).hasChildren(); - } + return ((ITmfFilterTreeNode) element).hasChildren(); + } } diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/filter/FilterTreeLabelProvider.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/filter/FilterTreeLabelProvider.java index db0f79075c..4657a34b32 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/filter/FilterTreeLabelProvider.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/filter/FilterTreeLabelProvider.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2010, 2012 Ericsson + * Copyright (c) 2010, 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 @@ -33,118 +33,94 @@ import org.eclipse.swt.graphics.Image; */ public class FilterTreeLabelProvider implements ILabelProvider { - /* - * (non-Javadoc) - * @see org.eclipse.jface.viewers.IBaseLabelProvider#addListener(org.eclipse.jface.viewers.ILabelProviderListener) - */ - @Override + @Override public void addListener(ILabelProviderListener listener) { - // TODO Auto-generated method stub - } - - /* - * (non-Javadoc) - * @see org.eclipse.jface.viewers.IBaseLabelProvider#dispose() - */ - @Override + // TODO Auto-generated method stub + } + + @Override public void dispose() { - // TODO Auto-generated method stub - } - - /* - * (non-Javadoc) - * @see org.eclipse.jface.viewers.IBaseLabelProvider#isLabelProperty(java.lang.Object, java.lang.String) - */ - @Override + // TODO Auto-generated method stub + } + + @Override public boolean isLabelProperty(Object element, String property) { - // TODO Auto-generated method stub - return false; - } - - /* - * (non-Javadoc) - * @see org.eclipse.jface.viewers.IBaseLabelProvider#removeListener(org.eclipse.jface.viewers.ILabelProviderListener) - */ - @Override + // TODO Auto-generated method stub + return false; + } + + @Override public void removeListener(ILabelProviderListener listener) { - // TODO Auto-generated method stub - } - - /* - * (non-Javadoc) - * @see org.eclipse.jface.viewers.ILabelProvider#getImage(java.lang.Object) - */ - @Override + // TODO Auto-generated method stub + } + + @Override public Image getImage(Object element) { - // TODO Auto-generated method stub - return null; - } - - /* - * (non-Javadoc) - * @see org.eclipse.jface.viewers.ILabelProvider#getText(java.lang.Object) - */ - @Override + // TODO Auto-generated method stub + return null; + } + + @Override public String getText(Object element) { - String label = null; + String label = null; - if (element instanceof TmfFilterNode) { + if (element instanceof TmfFilterNode) { - TmfFilterNode node = (TmfFilterNode) element; - label = node.getNodeName() + " " + node.getFilterName(); //$NON-NLS-1$ + TmfFilterNode node = (TmfFilterNode) element; + label = node.getNodeName() + " " + node.getFilterName(); //$NON-NLS-1$ - } else if (element instanceof TmfFilterEventTypeNode) { + } else if (element instanceof TmfFilterEventTypeNode) { - TmfFilterEventTypeNode node = (TmfFilterEventTypeNode) element; - label = "WITH " + node.getNodeName() + (node.getName() != null ? " " + node.getName() : ""); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + TmfFilterEventTypeNode node = (TmfFilterEventTypeNode) element; + label = "WITH " + node.getNodeName() + (node.getName() != null ? " " + node.getName() : ""); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - } else if (element instanceof TmfFilterAndNode) { + } else if (element instanceof TmfFilterAndNode) { - TmfFilterAndNode node = (TmfFilterAndNode) element; - label = (node.isNot() ? "NOT " : "") + node.getNodeName(); //$NON-NLS-1$ //$NON-NLS-2$ + TmfFilterAndNode node = (TmfFilterAndNode) element; + label = (node.isNot() ? "NOT " : "") + node.getNodeName(); //$NON-NLS-1$ //$NON-NLS-2$ - } else if (element instanceof TmfFilterOrNode) { + } else if (element instanceof TmfFilterOrNode) { - TmfFilterOrNode node = (TmfFilterOrNode) element; - label = (node.isNot() ? "NOT " : "") + node.getNodeName(); //$NON-NLS-1$ //$NON-NLS-2$ + TmfFilterOrNode node = (TmfFilterOrNode) element; + label = (node.isNot() ? "NOT " : "") + node.getNodeName(); //$NON-NLS-1$ //$NON-NLS-2$ - } else if (element instanceof TmfFilterContainsNode) { + } else if (element instanceof TmfFilterContainsNode) { - TmfFilterContainsNode node = (TmfFilterContainsNode) element; - label = (node.isNot() ? "NOT " : "") + //$NON-NLS-1$ //$NON-NLS-2$ - (node.getField() != null ? node.getField() + " " : "") + //$NON-NLS-1$ //$NON-NLS-2$ - node.getNodeName() + - (node.getValue() != null && node.getValue().length() > 0 ? " \"" + node.getValue() + "\"" : ""); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + TmfFilterContainsNode node = (TmfFilterContainsNode) element; + label = (node.isNot() ? "NOT " : "") + //$NON-NLS-1$ //$NON-NLS-2$ + (node.getField() != null ? node.getField() + " " : "") + //$NON-NLS-1$ //$NON-NLS-2$ + node.getNodeName() + + (node.getValue() != null && node.getValue().length() > 0 ? " \"" + node.getValue() + "\"" : ""); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - } else if (element instanceof TmfFilterEqualsNode) { + } else if (element instanceof TmfFilterEqualsNode) { - TmfFilterEqualsNode node = (TmfFilterEqualsNode) element; - label = (node.isNot() ? "NOT " : "") + //$NON-NLS-1$ //$NON-NLS-2$ - (node.getField() != null ? node.getField() + " " : "") + //$NON-NLS-1$ //$NON-NLS-2$ - node.getNodeName() + - (node.getValue() != null && node.getValue().length() > 0 ? " \"" + node.getValue() + "\"" : ""); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + TmfFilterEqualsNode node = (TmfFilterEqualsNode) element; + label = (node.isNot() ? "NOT " : "") + //$NON-NLS-1$ //$NON-NLS-2$ + (node.getField() != null ? node.getField() + " " : "") + //$NON-NLS-1$ //$NON-NLS-2$ + node.getNodeName() + + (node.getValue() != null && node.getValue().length() > 0 ? " \"" + node.getValue() + "\"" : ""); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - } else if (element instanceof TmfFilterMatchesNode) { + } else if (element instanceof TmfFilterMatchesNode) { - TmfFilterMatchesNode node = (TmfFilterMatchesNode) element; - label = (node.isNot() ? "NOT " : "") + //$NON-NLS-1$ //$NON-NLS-2$ - (node.getField() != null ? node.getField() + " " : "") + //$NON-NLS-1$ //$NON-NLS-2$ - node.getNodeName() + - (node.getRegex() != null && node.getRegex().length() > 0 ? " \"" + node.getRegex() + "\"" : ""); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + TmfFilterMatchesNode node = (TmfFilterMatchesNode) element; + label = (node.isNot() ? "NOT " : "") + //$NON-NLS-1$ //$NON-NLS-2$ + (node.getField() != null ? node.getField() + " " : "") + //$NON-NLS-1$ //$NON-NLS-2$ + node.getNodeName() + + (node.getRegex() != null && node.getRegex().length() > 0 ? " \"" + node.getRegex() + "\"" : ""); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - } else if (element instanceof TmfFilterCompareNode) { + } else if (element instanceof TmfFilterCompareNode) { - TmfFilterCompareNode node = (TmfFilterCompareNode) element; - label = (node.isNot() ? "NOT " : "") + //$NON-NLS-1$ //$NON-NLS-2$ - (node.getField() != null ? node.getField() + " " : "") + //$NON-NLS-1$ //$NON-NLS-2$ - (node.getResult() < 0 ? "<" : (node.getResult() > 0 ? ">" : "=")) + //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - (node.getValue() != null && node.getValue().length() > 0 ? - (node.getType() == Type.ALPHA ? " \"" + node.getValue() + "\"" : //$NON-NLS-1$ //$NON-NLS-2$ - (node.getType() == Type.TIMESTAMP ? " [" + node.getValue() + "]" : //$NON-NLS-1$ //$NON-NLS-2$ - " " + node.getValue())) : ""); //$NON-NLS-1$//$NON-NLS-2$ + TmfFilterCompareNode node = (TmfFilterCompareNode) element; + label = (node.isNot() ? "NOT " : "") + //$NON-NLS-1$ //$NON-NLS-2$ + (node.getField() != null ? node.getField() + " " : "") + //$NON-NLS-1$ //$NON-NLS-2$ + (node.getResult() < 0 ? "<" : (node.getResult() > 0 ? ">" : "=")) + //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + (node.getValue() != null && node.getValue().length() > 0 ? + (node.getType() == Type.ALPHA ? " \"" + node.getValue() + "\"" : //$NON-NLS-1$ //$NON-NLS-2$ + (node.getType() == Type.TIMESTAMP ? " [" + node.getValue() + "]" : //$NON-NLS-1$ //$NON-NLS-2$ + " " + node.getValue())) : ""); //$NON-NLS-1$//$NON-NLS-2$ - } - return label; - } + } + return label; + } } diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/filter/FilterView.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/filter/FilterView.java index fabdead18b..d37a8adb93 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/filter/FilterView.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/filter/FilterView.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2010, 2012 Ericsson + * Copyright (c) 2010, 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 @@ -82,10 +82,9 @@ public class FilterView extends TmfView { * @return The root of builded tree */ public ITmfFilterTreeNode getFilterRoot() { - return fRoot; + return fRoot; } - // ------------------------------------------------------------------------ // Constructor // ------------------------------------------------------------------------ @@ -105,203 +104,192 @@ public class FilterView extends TmfView { fRoot = new TmfFilterRootNode(); for (ITmfFilterTreeNode node : FilterManager.getSavedFilters()) { - fRoot.addChild(node); + fRoot.addChild(node); } - } - - - /** - * Refresh the tree widget - */ - public void refresh() { - fViewer.refresh(); - } - - /** - * Setter for selection - * - * @param node The node to select - */ - public void setSelection(ITmfFilterTreeNode node) { - fViewer.setSelection(node, true); - } - - // ------------------------------------------------------------------------ - // ViewPart - // ------------------------------------------------------------------------ - - /* (non-Javadoc) - * @see org.eclipse.ui.part.WorkbenchPart#createPartControl(Composite) + } + + /** + * Refresh the tree widget */ - @Override - public void createPartControl(Composite parent) { - - fViewer = new FilterViewer(parent, SWT.NONE); - fViewer.setInput(fRoot); - - contributeToActionBars(); - - fViewer.addSelectionChangedListener(new ISelectionChangedListener() { - @Override - public void selectionChanged(SelectionChangedEvent event) { - if (!(event.getSelection().isEmpty()) && event.getSelection() instanceof IStructuredSelection) { - fDeleteAction.setEnabled(true); - fExportAction.setEnabled(true); - } else { - fDeleteAction.setEnabled(false); - fExportAction.setEnabled(false); - } - } - }); - } - - /* (non-Javadoc) - * @see org.eclipse.ui.part.WorkbenchPart#setFocus() + public void refresh() { + fViewer.refresh(); + } + + /** + * Setter for selection + * + * @param node + * The node to select */ + public void setSelection(ITmfFilterTreeNode node) { + fViewer.setSelection(node, true); + } + + // ------------------------------------------------------------------------ + // ViewPart + // ------------------------------------------------------------------------ + + @Override + public void createPartControl(Composite parent) { + + fViewer = new FilterViewer(parent, SWT.NONE); + fViewer.setInput(fRoot); + + contributeToActionBars(); + + fViewer.addSelectionChangedListener(new ISelectionChangedListener() { + @Override + public void selectionChanged(SelectionChangedEvent event) { + if (!(event.getSelection().isEmpty()) && event.getSelection() instanceof IStructuredSelection) { + fDeleteAction.setEnabled(true); + fExportAction.setEnabled(true); + } else { + fDeleteAction.setEnabled(false); + fExportAction.setEnabled(false); + } + } + }); + } + @Override public void setFocus() { fViewer.setFocus(); } - /* - * (non-Javadoc) - * @see java.lang.Object#toString() - */ - @Override - public String toString() { - return "[FilterView]"; //$NON-NLS-1$ - } - + @Override + public String toString() { + return "[FilterView]"; //$NON-NLS-1$ + } /** * Builds the menu toolbar */ - private void contributeToActionBars() { - IActionBars bars = getViewSite().getActionBars(); - //fillLocalPullDown(bars.getMenuManager()); - fillLocalToolBar(bars.getToolBarManager()); - } - - - /** - * Build the popup menu - * - * @param manager The manager to build - */ - private void fillLocalToolBar(IToolBarManager manager) { - - fSaveAction = new SaveAction(); - fSaveAction.setImageDescriptor(ImageDescriptor.createFromImage(SAVE_IMAGE)); - fSaveAction.setToolTipText(Messages.FilterView_SaveActionToolTipText); - - fAddAction = new AddAction(); - fAddAction.setImageDescriptor(ImageDescriptor.createFromImage(ADD_IMAGE)); - fAddAction.setToolTipText(Messages.FilterView_AddActionToolTipText); - - fDeleteAction = new DeleteAction(); - fDeleteAction.setImageDescriptor(ImageDescriptor.createFromImage(DELETE_IMAGE)); - fDeleteAction.setToolTipText(Messages.FilterView_DeleteActionToolTipText); - fDeleteAction.setEnabled(false); - - fExportAction = new ExportAction(); - fExportAction.setImageDescriptor(ImageDescriptor.createFromImage(EXPORT_IMAGE)); - fExportAction.setToolTipText(Messages.FilterView_ExportActionToolTipText); - - fImportAction = new ImportAction(); - fImportAction.setImageDescriptor(ImageDescriptor.createFromImage(IMPORT_IMAGE)); - fImportAction.setToolTipText(Messages.FilterView_ImportActionToolTipText); - - manager.add(fSaveAction); - manager.add(new Separator()); - manager.add(fAddAction); - manager.add(fDeleteAction); - manager.add(new Separator()); - manager.add(fExportAction); - manager.add(fImportAction); - } - - private class SaveAction extends Action { - @Override - public void run() { - FilterManager.setSavedFilters(fRoot.getChildren()); - } - } - - private class AddAction extends Action { - @Override - public void run() { - - TmfFilterNode newNode = new TmfFilterNode(fRoot, ""); //$NON-NLS-1$ - refresh(); - setSelection(newNode); - } - } - - private class DeleteAction extends Action { - @Override - public void run() { - ITmfFilterTreeNode node = fViewer.getSelection(); - if (node != null) { - node.remove(); - } - refresh(); - } - } - - private class ExportAction extends Action { - @Override - public void run() { - try { - FileDialog dlg = new FileDialog(new Shell(), SWT.SAVE); - dlg.setFilterNames(new String[] {Messages.FilterView_FileDialogFilterName + " (*.filter.xml)"}); //$NON-NLS-1$ - dlg.setFilterExtensions(new String[] {"*.filter.xml"}); //$NON-NLS-1$ - - String fn = dlg.open(); - if (fn != null) { - TmfFilterXMLWriter writerXML = new TmfFilterXMLWriter(fRoot); - writerXML.saveTree(fn); - } - - } catch (ParserConfigurationException e) { - Activator.getDefault().logError("Error parsing filter xml file", e); //$NON-NLS-1$ - } - } - } - - private class ImportAction extends Action { - @Override - public void run() { - if (fViewer != null) { - ITmfFilterTreeNode root = null; - try { - FileDialog dlg = new FileDialog(new Shell(), SWT.OPEN); - dlg.setFilterNames(new String[] {Messages.FilterView_FileDialogFilterName + " (*.filter.xml)"}); //$NON-NLS-1$ - dlg.setFilterExtensions(new String[] {"*.filter.xml"}); //$NON-NLS-1$ - - TmfFilterXMLParser parserXML = null; - String fn = dlg.open(); - if (fn != null) { - parserXML = new TmfFilterXMLParser(fn); - root = parserXML.getTree(); - } - - } catch (SAXException e) { - Activator.getDefault().logError("Error importing filter xml file", e); //$NON-NLS-1$ - } catch (IOException e) { - Activator.getDefault().logError("Error importing filter xml file", e); //$NON-NLS-1$ - } - - if (root != null) { - for (ITmfFilterTreeNode node : root.getChildren()) { - if (node instanceof TmfFilterNode) { - fRoot.addChild(node); - refresh(); - fViewer.setSelection(node); - } - } - } - } - } - } + private void contributeToActionBars() { + IActionBars bars = getViewSite().getActionBars(); + // fillLocalPullDown(bars.getMenuManager()); + fillLocalToolBar(bars.getToolBarManager()); + } + + /** + * Build the popup menu + * + * @param manager + * The manager to build + */ + private void fillLocalToolBar(IToolBarManager manager) { + + fSaveAction = new SaveAction(); + fSaveAction.setImageDescriptor(ImageDescriptor.createFromImage(SAVE_IMAGE)); + fSaveAction.setToolTipText(Messages.FilterView_SaveActionToolTipText); + + fAddAction = new AddAction(); + fAddAction.setImageDescriptor(ImageDescriptor.createFromImage(ADD_IMAGE)); + fAddAction.setToolTipText(Messages.FilterView_AddActionToolTipText); + + fDeleteAction = new DeleteAction(); + fDeleteAction.setImageDescriptor(ImageDescriptor.createFromImage(DELETE_IMAGE)); + fDeleteAction.setToolTipText(Messages.FilterView_DeleteActionToolTipText); + fDeleteAction.setEnabled(false); + + fExportAction = new ExportAction(); + fExportAction.setImageDescriptor(ImageDescriptor.createFromImage(EXPORT_IMAGE)); + fExportAction.setToolTipText(Messages.FilterView_ExportActionToolTipText); + + fImportAction = new ImportAction(); + fImportAction.setImageDescriptor(ImageDescriptor.createFromImage(IMPORT_IMAGE)); + fImportAction.setToolTipText(Messages.FilterView_ImportActionToolTipText); + + manager.add(fSaveAction); + manager.add(new Separator()); + manager.add(fAddAction); + manager.add(fDeleteAction); + manager.add(new Separator()); + manager.add(fExportAction); + manager.add(fImportAction); + } + + private class SaveAction extends Action { + @Override + public void run() { + FilterManager.setSavedFilters(fRoot.getChildren()); + } + } + + private class AddAction extends Action { + @Override + public void run() { + + TmfFilterNode newNode = new TmfFilterNode(fRoot, ""); //$NON-NLS-1$ + refresh(); + setSelection(newNode); + } + } + + private class DeleteAction extends Action { + @Override + public void run() { + ITmfFilterTreeNode node = fViewer.getSelection(); + if (node != null) { + node.remove(); + } + refresh(); + } + } + + private class ExportAction extends Action { + @Override + public void run() { + try { + FileDialog dlg = new FileDialog(new Shell(), SWT.SAVE); + dlg.setFilterNames(new String[] { Messages.FilterView_FileDialogFilterName + " (*.filter.xml)" }); //$NON-NLS-1$ + dlg.setFilterExtensions(new String[] { "*.filter.xml" }); //$NON-NLS-1$ + + String fn = dlg.open(); + if (fn != null) { + TmfFilterXMLWriter writerXML = new TmfFilterXMLWriter(fRoot); + writerXML.saveTree(fn); + } + + } catch (ParserConfigurationException e) { + Activator.getDefault().logError("Error parsing filter xml file", e); //$NON-NLS-1$ + } + } + } + + private class ImportAction extends Action { + @Override + public void run() { + if (fViewer != null) { + ITmfFilterTreeNode root = null; + try { + FileDialog dlg = new FileDialog(new Shell(), SWT.OPEN); + dlg.setFilterNames(new String[] { Messages.FilterView_FileDialogFilterName + " (*.filter.xml)" }); //$NON-NLS-1$ + dlg.setFilterExtensions(new String[] { "*.filter.xml" }); //$NON-NLS-1$ + + TmfFilterXMLParser parserXML = null; + String fn = dlg.open(); + if (fn != null) { + parserXML = new TmfFilterXMLParser(fn); + root = parserXML.getTree(); + } + + } catch (SAXException e) { + Activator.getDefault().logError("Error importing filter xml file", e); //$NON-NLS-1$ + } catch (IOException e) { + Activator.getDefault().logError("Error importing filter xml file", e); //$NON-NLS-1$ + } + + if (root != null) { + for (ITmfFilterTreeNode node : root.getChildren()) { + if (node instanceof TmfFilterNode) { + fRoot.addChild(node); + refresh(); + fViewer.setSelection(node); + } + } + } + } + } + } } \ No newline at end of file diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/histogram/FullTraceHistogram.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/histogram/FullTraceHistogram.java index 829e82ca14..9560e297d5 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/histogram/FullTraceHistogram.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/histogram/FullTraceHistogram.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011, 2012 Ericsson + * Copyright (c) 2011, 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 @@ -75,9 +75,6 @@ public class FullTraceHistogram extends Histogram implements MouseMoveListener { // Operations // ------------------------------------------------------------------------ - /* (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.histogram.Histogram#clear() - */ @Override public void clear() { fRangeStartTime = 0L; @@ -112,9 +109,6 @@ public class FullTraceHistogram extends Histogram implements MouseMoveListener { fDataModel.complete(); } - /* (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.histogram.Histogram#updateTimeRange(long, long) - */ @Override public void updateTimeRange(long startTime, long endTime) { ((HistogramView) fParentView).updateTimeRange(startTime, endTime); diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/histogram/HistogramCurrentTimeControl.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/histogram/HistogramCurrentTimeControl.java index 0ddc726e98..8b049675a9 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/histogram/HistogramCurrentTimeControl.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/histogram/HistogramCurrentTimeControl.java @@ -54,9 +54,6 @@ public class HistogramCurrentTimeControl extends HistogramTextControl { TmfSignalManager.register(this); } - /* (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.histogram.HistogramTextControl#dispose() - */ @Override public void dispose() { TmfSignalManager.deregister(this); diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/histogram/HistogramDataModel.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/histogram/HistogramDataModel.java index 1dbd20dd15..4246b42737 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/histogram/HistogramDataModel.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/histogram/HistogramDataModel.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011, 2012 Ericsson + * Copyright (c) 2011, 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 @@ -286,10 +286,6 @@ public class HistogramDataModel implements IHistogramDataModel { // Operations // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.distribution.model.IBaseDistributionModel#complete() - */ @Override public void complete() { fireModelUpdateNotification(); diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/histogram/HistogramTextControl.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/histogram/HistogramTextControl.java index 8569419663..3a1177988b 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/histogram/HistogramTextControl.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/histogram/HistogramTextControl.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2012 Ericsson + * Copyright (c) 2009, 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 @@ -205,18 +205,10 @@ public abstract class HistogramTextControl implements FocusListener, KeyListener // FocusListener // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see org.eclipse.swt.events.FocusListener#focusGained(org.eclipse.swt.events.FocusEvent) - */ @Override public void focusGained(FocusEvent event) { } - /* - * (non-Javadoc) - * @see org.eclipse.swt.events.FocusListener#focusLost(org.eclipse.swt.events.FocusEvent) - */ @Override public void focusLost(FocusEvent event) { updateValue(); @@ -226,10 +218,6 @@ public abstract class HistogramTextControl implements FocusListener, KeyListener // KeyListener // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see org.eclipse.swt.events.KeyListener#keyPressed(org.eclipse.swt.events.KeyEvent) - */ @Override public void keyPressed(KeyEvent event) { switch (event.keyCode) { @@ -241,10 +229,6 @@ public abstract class HistogramTextControl implements FocusListener, KeyListener } } - /* - * (non-Javadoc) - * @see org.eclipse.swt.events.KeyListener#keyReleased(org.eclipse.swt.events.KeyEvent) - */ @Override public void keyReleased(KeyEvent e) { } diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/histogram/HistogramTimeRangeControl.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/histogram/HistogramTimeRangeControl.java index 9f0d12cf9f..cbb07f3cf2 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/histogram/HistogramTimeRangeControl.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/histogram/HistogramTimeRangeControl.java @@ -52,9 +52,6 @@ public class HistogramTimeRangeControl extends HistogramTextControl { TmfSignalManager.register(this); } - /* (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.histogram.HistogramTextControl#dispose() - */ @Override public void dispose() { TmfSignalManager.deregister(this); @@ -64,10 +61,6 @@ public class HistogramTimeRangeControl extends HistogramTextControl { // Operations // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.histogram.HistogramTextControl#updateValue() - */ @Override protected void updateValue() { if (getValue() == Long.MIN_VALUE) { diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/histogram/Messages.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/histogram/Messages.java index 7660923baf..e5c520ec91 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/histogram/Messages.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/histogram/Messages.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2012 Ericsson + * Copyright (c) 2009, 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 diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/histogram/TimeRangeHistogram.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/histogram/TimeRangeHistogram.java index 9c64a084a7..3aed94c38c 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/histogram/TimeRangeHistogram.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/histogram/TimeRangeHistogram.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011, 2012 Ericsson + * Copyright (c) 2011, 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 @@ -52,19 +52,11 @@ public class TimeRangeHistogram extends Histogram { // Operations // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.histogram.Histogram#updateTimeRange(long, long) - */ @Override public void updateTimeRange(long startTime, long endTime) { ((HistogramView) fParentView).updateTimeRange(startTime, endTime); } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.histogram.Histogram#clear() - */ @Override public synchronized void clear() { if (fZoom != null) { diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/statistics/Messages.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/statistics/Messages.java index da24ea62b9..8284082f76 100755 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/statistics/Messages.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/statistics/Messages.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011, 2012 Ericsson + * Copyright (c) 2011, 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 diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/statistics/TmfStatisticsView.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/statistics/TmfStatisticsView.java index 8fd763493e..0ce1d073e6 100755 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/statistics/TmfStatisticsView.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/statistics/TmfStatisticsView.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011, 2012 Ericsson + * Copyright (c) 2011, 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 @@ -92,12 +92,6 @@ public class TmfStatisticsView extends TmfView { this(TMF_STATISTICS_VIEW); } - /* - * (non-Javadoc) - * - * @see - * org.eclipse.ui.part.WorkbenchPart#createPartControl(org.eclipse.swt.widgets.Composite) - */ @Override public void createPartControl(Composite parent) { fStatsViewers.setParent(parent); @@ -109,11 +103,6 @@ public class TmfStatisticsView extends TmfView { } } - /* - * (non-Javadoc) - * - * @see org.eclipse.linuxtools.tmf.ui.views.TmfView#dispose() - */ @Override public void dispose() { super.dispose(); @@ -210,11 +199,6 @@ public class TmfStatisticsView extends TmfView { fStatsViewers.layout(); } - /* - * (non-Javadoc) - * - * @see org.eclipse.ui.part.WorkbenchPart#setFocus() - */ @Override public void setFocus() { fStatsViewers.setFocus(); diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/timechart/TimeChartDecorationProvider.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/timechart/TimeChartDecorationProvider.java index 6cf63f694f..7e0f50bd8c 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/timechart/TimeChartDecorationProvider.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/timechart/TimeChartDecorationProvider.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2010, 2012 Ericsson + * Copyright (c) 2010, 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 diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/DrawableToolTip.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/DrawableToolTip.java index 9201357831..fbeeb451be 100755 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/DrawableToolTip.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/DrawableToolTip.java @@ -241,10 +241,6 @@ public class DrawableToolTip implements PaintListener { } } - /* - * (non-Javadoc) - * @see org.eclipse.swt.events.PaintListener#paintControl(org.eclipse.swt.events.PaintEvent) - */ @Override public void paintControl(PaintEvent event) { fMessage = SDMessages._138 + " " + fCurrentValue.toString(); //$NON-NLS-1$ diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/NGC.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/NGC.java index db6a213483..9869074255 100755 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/NGC.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/NGC.java @@ -1,5 +1,5 @@ /********************************************************************** - * Copyright (c) 2005, 2012 IBM Corporation, Ericsson + * Copyright (c) 2005, 2013 IBM Corporation, 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 @@ -112,73 +112,41 @@ public class NGC implements IGC { // Methods // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.drawings.IGC#setLineStyle(int) - */ @Override public void setLineStyle(int style) { fContext.setLineStyle(style); } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.drawings.IGC#getLineStyle() - */ @Override public int getLineStyle() { return fContext.getLineStyle(); } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.drawings.IGC#getContentsX() - */ @Override public int getContentsX() { return Math.round(fView.getContentsX() / fView.fZoomValue); } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.drawings.IGC#getContentsY() - */ @Override public int getContentsY() { return Math.round(fView.getContentsY() / fView.fZoomValue); } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.drawings.IGC#getVisibleWidth() - */ @Override public int getVisibleWidth() { return Math.round(fView.getVisibleWidth() / fView.fZoomValue); } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.drawings.IGC#getVisibleHeight() - */ @Override public int getVisibleHeight() { return Math.round(fView.getVisibleHeight() / fView.fZoomValue); } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.drawings.IGC#contentsToViewX(int) - */ @Override public int contentsToViewX(int x) { return fView.contentsToViewX(x); } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.drawings.IGC#contentsToViewY(int) - */ @Override public int contentsToViewY(int y) { return fView.contentsToViewY(y); @@ -211,10 +179,6 @@ public class NGC implements IGC { return c; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.drawings.IGC#drawLine(int, int, int, int) - */ @Override public void drawLine(int x1, int y1, int x2, int y2) { int localX1 = x1; @@ -277,10 +241,6 @@ public class NGC implements IGC { } } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.drawings.IGC#drawRectangle(int, int, int, int) - */ @Override public void drawRectangle(int x, int y, int width, int height) { int localX = x; @@ -321,10 +281,6 @@ public class NGC implements IGC { fContext.drawRectangle(localX, localY, localWidth, localHeight); } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.drawings.IGC#drawFocus(int, int, int, int) - */ @Override public void drawFocus(int x, int y, int width, int height) { int localX = x; @@ -359,10 +315,6 @@ public class NGC implements IGC { setForeground(fC); } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.drawings.IGC#fillPolygon(int[]) - */ @Override public void fillPolygon(int[] points) { int len = (points.length / 2) * 2; @@ -380,10 +332,6 @@ public class NGC implements IGC { fContext.fillPolygon(localPoint); } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.drawings.IGC#drawPolygon(int[]) - */ @Override public void drawPolygon(int[] points) { int len = (points.length / 2) * 2; @@ -401,10 +349,6 @@ public class NGC implements IGC { fContext.drawPolygon(localPoint); } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.drawings.IGC#fillRectangle(int, int, int, int) - */ @Override public void fillRectangle(int x, int y, int width, int height) { int localX = x; @@ -442,13 +386,8 @@ public class NGC implements IGC { localHeight = fView.getVisibleHeight() + fVisibleScreenBounds - localY; } fContext.fillRectangle(localX, localY, localWidth, localHeight); - } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.drawings.IGC#fillGradientRectangle(int, int, int, int, boolean) - */ @Override public void fillGradientRectangle(int x, int y, int width, int height, boolean isVertical) { int localX = x; @@ -493,20 +432,11 @@ public class NGC implements IGC { setForeground(tempColor); } - - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.drawings.IGC#textExtent(java.lang.String) - */ @Override public int textExtent(String name) { return fContext.textExtent(name).x; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.drawings.IGC#drawText(java.lang.String, int, int, boolean) - */ @Override public void drawText(String string, int x, int y, boolean isTrans) { int localX = x; @@ -521,10 +451,6 @@ public class NGC implements IGC { } } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.drawings.IGC#drawText(java.lang.String, int, int) - */ @Override public void drawText(String string, int x, int y) { int localX = x; @@ -539,10 +465,6 @@ public class NGC implements IGC { } } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.drawings.IGC#fillOval(int, int, int, int) - */ @Override public void fillOval(int x, int y, int width, int height) { int localX = x; @@ -557,10 +479,6 @@ public class NGC implements IGC { fContext.fillOval(fView.contentsToViewX(localX), fView.contentsToViewY(localY), localWidth, localHeight); } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.drawings.IGC#getBackground() - */ @Override public IColor getBackground() { if ((fBackground != null) && (fBackground.getColor() instanceof Color) && (!((Color) (fBackground.getColor())).isDisposed())) { @@ -569,10 +487,6 @@ public class NGC implements IGC { return ColorImpl.getSystemColor(SWT.COLOR_WHITE); } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.drawings.IGC#getForeground() - */ @Override public IColor getForeground() { if ((fForeground != null) && (fForeground.getColor() instanceof Color) && (!((Color) (fForeground.getColor())).isDisposed())) { @@ -581,10 +495,6 @@ public class NGC implements IGC { return ColorImpl.getSystemColor(SWT.COLOR_WHITE); } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.drawings.IGC#setBackground(org.eclipse.linuxtools.tmf.ui.views.uml2sd.drawings.IColor) - */ @Override public void setBackground(IColor color) { if (color == null) { @@ -596,10 +506,6 @@ public class NGC implements IGC { } } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.drawings.IGC#setForeground(org.eclipse.linuxtools.tmf.ui.views.uml2sd.drawings.IColor) - */ @Override public void setForeground(IColor color) { if (color == null) { @@ -614,10 +520,6 @@ public class NGC implements IGC { } } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.drawings.IGC#setGradientColor(org.eclipse.linuxtools.tmf.ui.views.uml2sd.drawings.IColor) - */ @Override public void setGradientColor(IColor color) { if (color == null) { @@ -628,10 +530,6 @@ public class NGC implements IGC { } } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.drawings.IGC#setLineWidth(int) - */ @Override public void setLineWidth(int width) { if (fView.isPrinting()) { @@ -642,10 +540,6 @@ public class NGC implements IGC { } } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.drawings.IGC#getLineWidth() - */ @Override public int getLineWidth() { return fContext.getLineWidth(); @@ -670,10 +564,6 @@ public class NGC implements IGC { } } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.drawings.IGC#drawTextTruncatedCentred(java.lang.String, int, int, int, int, boolean) - */ @Override public void drawTextTruncatedCentred(String name, int xValue, int yValue, int width, int height, boolean trans) { int localX = xValue; @@ -728,10 +618,6 @@ public class NGC implements IGC { } } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.drawings.IGC#drawTextTruncated(java.lang.String, int, int, int, int, boolean) - */ @Override public void drawTextTruncated(String name, int xValue, int yValue, int width, int height, boolean trans) { int localX = xValue; @@ -768,10 +654,6 @@ public class NGC implements IGC { } } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.drawings.IGC#drawImage(org.eclipse.linuxtools.tmf.ui.views.uml2sd.drawings.IImage, int, int, int, int) - */ @Override public void drawImage(IImage image, int xValue, int yValue, int maxWith, int maxHeight) { int localX = xValue; @@ -823,10 +705,6 @@ public class NGC implements IGC { } } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.drawings.IGC#drawArc(int, int, int, int, int, int) - */ @Override public void drawArc(int x, int y, int width, int height, int startAngle, int endAngle) { int localX = x; @@ -844,10 +722,6 @@ public class NGC implements IGC { fContext.drawArc(fView.contentsToViewX(localX), fView.contentsToViewY(localY), localWidth, localHeight, startAngle, endAngle); } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.drawings.IGC#setFont(org.eclipse.linuxtools.tmf.ui.views.uml2sd.drawings.IFont) - */ @Override public void setFont(IFont font) { if (font.getFont() != null && ((Font) font.getFont()).getFontData().length > 0) { @@ -866,10 +740,6 @@ public class NGC implements IGC { } } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.drawings.IGC#getFontHeight(org.eclipse.linuxtools.tmf.ui.views.uml2sd.drawings.IFont) - */ @Override public int getFontHeight(IFont font) { if (font.getFont() != null && (font.getFont() instanceof Font) && ((Font) font.getFont()).getFontData().length > 0) { @@ -891,10 +761,6 @@ public class NGC implements IGC { return fContext.textExtent("lp").y; //$NON-NLS-1$ } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.drawings.IGC#getFontWidth(org.eclipse.linuxtools.tmf.ui.views.uml2sd.drawings.IFont) - */ @Override public int getFontWidth(IFont font) { if ((font.getFont() != null) && (font.getFont() instanceof Font)) { @@ -921,10 +787,6 @@ public class NGC implements IGC { fContext = null; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.drawings.IGC#getZoom() - */ @Override public float getZoom() { if (fView != null) { @@ -933,46 +795,26 @@ public class NGC implements IGC { return 1; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.drawings.IGC#getLineDotStyle() - */ @Override public int getLineDotStyle() { return SWT.LINE_DOT; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.drawings.IGC#getLineDashStyle() - */ @Override public int getLineDashStyle() { return SWT.LINE_DASH; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.drawings.IGC#getLineSolidStyle() - */ @Override public int getLineSolidStyle() { return SWT.LINE_SOLID; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.drawings.IGC#createColor(int, int, int) - */ @Override public IColor createColor(int r, int g, int b) { return new ColorImpl(Display.getDefault(), r, g, b); } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.drawings.IGC#setDrawTextWithFocusStyle(boolean) - */ @Override public void setDrawTextWithFocusStyle(boolean focus) { fDrawWithFocus = focus; diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/SDView.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/SDView.java index 963170488b..05993f9bd3 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/SDView.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/SDView.java @@ -1,5 +1,5 @@ /********************************************************************** - * Copyright (c) 2005, 2012 IBM Corporation, Ericsson + * Copyright (c) 2005, 2013 IBM Corporation, 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 @@ -157,10 +157,6 @@ public class SDView extends ViewPart { // Methods // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see org.eclipse.ui.part.WorkbenchPart#createPartControl(org.eclipse.swt.widgets.Composite) - */ @Override public void createPartControl(Composite c) { Composite parent = new Composite(c, SWT.NONE); @@ -205,10 +201,6 @@ public class SDView extends ViewPart { setContentDescription(loader.getTitleString()); } - /* - * (non-Javadoc) - * @see org.eclipse.ui.part.WorkbenchPart#setFocus() - */ @Override public void setFocus() { if (fSdWidget != null) { @@ -221,10 +213,6 @@ public class SDView extends ViewPart { } } - /* - * (non-Javadoc) - * @see org.eclipse.ui.part.WorkbenchPart#dispose() - */ @Override public void dispose() { KeyBindingsManager.getInstance().remove(this.getSite().getId()); @@ -1055,11 +1043,6 @@ public class SDView extends ViewPart { bar.getMenuManager().add(new Separator("UML2SD_OTHER_PLUGINS_COMMANDS")); //$NON-NLS-1$ } - /* - * Gets adapter for this view for properties. - * (non-Javadoc) - * @see org.eclipse.ui.part.WorkbenchPart#getAdapter(java.lang.Class) - */ @Override public Object getAdapter(Class adapter) { Object obj = super.getAdapter(adapter); @@ -1076,10 +1059,6 @@ public class SDView extends ViewPart { * @version 1.0 */ public static class BlankUml2SdLoader implements IUml2SDLoader { - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.load.IUml2SDLoader#setViewer(org.eclipse.linuxtools.tmf.ui.views.uml2sd.SDView) - */ @Override public void setViewer(SDView viewer) { // Nothing to do @@ -1088,19 +1067,11 @@ public class SDView extends ViewPart { viewer.setFrame(f); } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.load.IUml2SDLoader#getTitleString() - */ @Override public String getTitleString() { return ""; //$NON-NLS-1$ } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.load.IUml2SDLoader#dispose() - */ @Override public void dispose() { } diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/SDWidget.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/SDWidget.java index 3001b30e84..25c8039a92 100755 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/SDWidget.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/SDWidget.java @@ -276,10 +276,6 @@ public class SDWidget extends ScrollView implements SelectionListener, fAccessible = getViewControl().getAccessible(); fAccessible.addAccessibleListener(new AccessibleAdapter() { - /* - * (non-Javadoc) - * @see org.eclipse.swt.accessibility.AccessibleAdapter#getName(org.eclipse.swt.accessibility.AccessibleEvent) - */ @Override public void getName(AccessibleEvent e) { // Case toolTip @@ -321,10 +317,6 @@ public class SDWidget extends ScrollView implements SelectionListener, }); fAccessible.addAccessibleControlListener(new AccessibleControlAdapter() { - /* - * (non-Javadoc) - * @see org.eclipse.swt.accessibility.AccessibleControlAdapter#getFocus(org.eclipse.swt.accessibility.AccessibleControlEvent) - */ @Override public void getFocus(AccessibleControlEvent e) { if (fFocusedWidget == -1) { @@ -334,10 +326,6 @@ public class SDWidget extends ScrollView implements SelectionListener, } } - /* - * (non-Javadoc) - * @see org.eclipse.swt.accessibility.AccessibleControlAdapter#getRole(org.eclipse.swt.accessibility.AccessibleControlEvent) - */ @Override public void getRole(AccessibleControlEvent e) { switch (e.childID) { @@ -355,10 +343,6 @@ public class SDWidget extends ScrollView implements SelectionListener, } } - /* - * (non-Javadoc) - * @see org.eclipse.swt.accessibility.AccessibleControlAdapter#getState(org.eclipse.swt.accessibility.AccessibleControlEvent) - */ @Override public void getState(AccessibleControlEvent e) { e.detail = ACC.STATE_FOCUSABLE; @@ -386,10 +370,6 @@ public class SDWidget extends ScrollView implements SelectionListener, getViewControl().addFocusListener(new FocusListener() { - /* - * (non-Javadoc) - * @see org.eclipse.swt.events.FocusListener#focusGained(org.eclipse.swt.events.FocusEvent) - */ @Override public void focusGained(FocusEvent e) { SDViewPref.getInstance().setNoFocusSelection(false); @@ -398,10 +378,6 @@ public class SDWidget extends ScrollView implements SelectionListener, redraw(); } - /* - * (non-Javadoc) - * @see org.eclipse.swt.events.FocusListener#focusLost(org.eclipse.swt.events.FocusEvent) - */ @Override public void focusLost(FocusEvent e) { SDViewPref.getInstance().setNoFocusSelection(true); @@ -413,6 +389,7 @@ public class SDWidget extends ScrollView implements SelectionListener, // ------------------------------------------------------------------------ // Operations // ------------------------------------------------------------------------ + /** * Sets the time compression bar. * @@ -1354,10 +1331,6 @@ public class SDWidget extends ScrollView implements SelectionListener, return dbuffer; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.ScrollView#keyPressedEvent(org.eclipse.swt.events.KeyEvent) - */ @Override protected void keyPressedEvent(KeyEvent event) { if (!(isFocusControl() || getViewControl().isFocusControl())) { @@ -1466,10 +1439,6 @@ public class SDWidget extends ScrollView implements SelectionListener, } } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.ScrollView#keyReleasedEvent(org.eclipse.swt.events.KeyEvent) - */ @Override protected void keyReleasedEvent(KeyEvent event) { setFocus(-1); @@ -1483,10 +1452,6 @@ public class SDWidget extends ScrollView implements SelectionListener, setFocus(1); } - /* - * (non-Javadoc) - * @see org.eclipse.swt.widgets.Control#isFocusControl() - */ @Override public boolean isFocusControl() { Control[] child = getChildren(); @@ -1499,10 +1464,6 @@ public class SDWidget extends ScrollView implements SelectionListener, return false; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.ScrollView#setContentsPos(int, int) - */ @Override public boolean setContentsPos(int x, int y) { int localX = x; @@ -1536,10 +1497,6 @@ public class SDWidget extends ScrollView implements SelectionListener, return super.setContentsPos(localX, localY); } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.ScrollView#contentsMouseHover(org.eclipse.swt.events.MouseEvent) - */ @Override protected void contentsMouseHover(MouseEvent event) { GraphNode graphNode = null; @@ -1564,10 +1521,6 @@ public class SDWidget extends ScrollView implements SelectionListener, } } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.ScrollView#contentsMouseMoveEvent(org.eclipse.swt.events.MouseEvent) - */ @Override protected void contentsMouseMoveEvent(MouseEvent e) { fScrollToolTip.hideToolTip(); @@ -1686,10 +1639,6 @@ public class SDWidget extends ScrollView implements SelectionListener, } } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.ScrollView#contentsMouseUpEvent(org.eclipse.swt.events.MouseEvent) - */ @Override protected void contentsMouseUpEvent(MouseEvent event) { // Just in case the diagram highlight a time compression region @@ -1738,10 +1687,6 @@ public class SDWidget extends ScrollView implements SelectionListener, super.contentsMouseUpEvent(event); } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.ScrollView#contentsMouseDownEvent(org.eclipse.swt.events.MouseEvent) - */ @Override protected void contentsMouseDownEvent(MouseEvent event) { if (fCurrentGraphNode != null) { @@ -1839,10 +1784,6 @@ public class SDWidget extends ScrollView implements SelectionListener, fDeltaY = dy; } - /* - * (non-Javadoc) - * @see java.util.TimerTask#run() - */ @Override public void run() { Display.getDefault().asyncExec(new Runnable() { @@ -1859,10 +1800,6 @@ public class SDWidget extends ScrollView implements SelectionListener, } } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.ScrollView#drawContents(org.eclipse.swt.graphics.GC, int, int, int, int) - */ @Override protected void drawContents(GC gc, int clipx, int clipy, int clipw, int cliph) { if (fFrame == null) { @@ -1901,18 +1838,10 @@ public class SDWidget extends ScrollView implements SelectionListener, } } - /* - * (non-Javadoc) - * @see org.eclipse.swt.events.SelectionListener#widgetDefaultSelected(org.eclipse.swt.events.SelectionEvent) - */ @Override public void widgetDefaultSelected(SelectionEvent event) { } - /* - * (non-Javadoc) - * @see org.eclipse.swt.events.SelectionListener#widgetSelected(org.eclipse.swt.events.SelectionEvent) - */ @Override public void widgetSelected(SelectionEvent event) { if (event.widget == fZoomIn) { @@ -1923,11 +1852,9 @@ public class SDWidget extends ScrollView implements SelectionListener, redraw(); } - /* - * Called when property changed occurs in the preference page. "PREFOK" is fired when the user press the ok or apply button - * - * (non-Javadoc) - * @see org.eclipse.jface.util.IPropertyChangeListener#propertyChange(org.eclipse.jface.util.PropertyChangeEvent) + /** + * Called when property changed occurs in the preference page. "PREFOK" is + * fired when the user press the ok or apply button */ @Override public void propertyChange(PropertyChangeEvent e) { @@ -1946,10 +1873,6 @@ public class SDWidget extends ScrollView implements SelectionListener, } } - /* - * (non-Javadoc) - * @see org.eclipse.swt.events.DisposeListener#widgetDisposed(org.eclipse.swt.events.DisposeEvent) - */ @Override public void widgetDisposed(DisposeEvent e) { if (fOverView != null) { @@ -1975,10 +1898,6 @@ public class SDWidget extends ScrollView implements SelectionListener, } } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.ScrollView#drawOverview(org.eclipse.swt.graphics.GC, org.eclipse.swt.graphics.Rectangle) - */ @Override protected void drawOverview(GC gc, Rectangle r) { float oldzoom = fZoomValue; @@ -2013,10 +1932,6 @@ public class SDWidget extends ScrollView implements SelectionListener, super.drawOverview(gc, r); } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.ITimeCompressionListener#deltaSelected(org.eclipse.linuxtools.tmf.ui.views.uml2sd.core.Lifeline, int, int, org.eclipse.linuxtools.tmf.ui.views.uml2sd.drawings.IColor) - */ @Override public void deltaSelected(Lifeline lifeline, int startEvent, int nbEvent, IColor color) { fFrame.highlightTimeCompression(lifeline, startEvent, nbEvent, color); @@ -2028,10 +1943,6 @@ public class SDWidget extends ScrollView implements SelectionListener, update(); } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.ScrollView#getVisibleWidth() - */ @Override public int getVisibleWidth() { if (fIsPrinting) { @@ -2040,10 +1951,6 @@ public class SDWidget extends ScrollView implements SelectionListener, return super.getVisibleWidth(); } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.ScrollView#getVisibleHeight() - */ @Override public int getVisibleHeight() { if (fIsPrinting) { @@ -2052,10 +1959,6 @@ public class SDWidget extends ScrollView implements SelectionListener, return super.getVisibleHeight(); } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.ScrollView#contentsToViewX(int) - */ @Override public int contentsToViewX(int x) { if (fIsPrinting) { @@ -2065,10 +1968,6 @@ public class SDWidget extends ScrollView implements SelectionListener, return x - getContentsX(); } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.ScrollView#contentsToViewY(int) - */ @Override public int contentsToViewY(int y) { if (fIsPrinting) { @@ -2078,23 +1977,14 @@ public class SDWidget extends ScrollView implements SelectionListener, return y - getContentsY(); } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.ScrollView#getContentsX() - */ @Override public int getContentsX() { if (fIsPrinting) { return Math.round(fPrinterX * fPrinterZoom); } return super.getContentsX(); - } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.ScrollView#getContentsY() - */ @Override public int getContentsY() { if (fIsPrinting) { @@ -2107,11 +1997,6 @@ public class SDWidget extends ScrollView implements SelectionListener, * Traverse Listener implementation. */ protected static class LocalTraverseListener implements TraverseListener { - - /* - * (non-Javadoc) - * @see org.eclipse.swt.events.TraverseListener#keyTraversed(org.eclipse.swt.events.TraverseEvent) - */ @Override public void keyTraversed(TraverseEvent e) { if ((e.detail == SWT.TRAVERSE_TAB_NEXT) || (e.detail == SWT.TRAVERSE_TAB_PREVIOUS)) { diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/SDWidgetSelectionProvider.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/SDWidgetSelectionProvider.java index c1b4c60e82..87d0532131 100755 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/SDWidgetSelectionProvider.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/SDWidgetSelectionProvider.java @@ -1,5 +1,5 @@ /********************************************************************** - * Copyright (c) 2005, 2012 IBM Corporation, Ericsson + * Copyright (c) 2005, 2013 IBM Corporation, 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 @@ -38,6 +38,7 @@ public class SDWidgetSelectionProvider implements ISelectionProvider { * The listener list */ protected List fListenerList = null; + /** * The current selection */ @@ -46,6 +47,7 @@ public class SDWidgetSelectionProvider implements ISelectionProvider { // ------------------------------------------------------------------------ // Constructor // ------------------------------------------------------------------------ + /** * Standard constructor */ @@ -57,10 +59,6 @@ public class SDWidgetSelectionProvider implements ISelectionProvider { // Methods // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see org.eclipse.jface.viewers.ISelectionProvider#addSelectionChangedListener(org.eclipse.jface.viewers.ISelectionChangedListener) - */ @Override public void addSelectionChangedListener(ISelectionChangedListener listener) { if (!fListenerList.contains(listener)) { @@ -68,19 +66,11 @@ public class SDWidgetSelectionProvider implements ISelectionProvider { } } - /* - * (non-Javadoc) - * @see org.eclipse.jface.viewers.ISelectionProvider#removeSelectionChangedListener(org.eclipse.jface.viewers.ISelectionChangedListener) - */ @Override public void removeSelectionChangedListener(ISelectionChangedListener listener) { fListenerList.remove(listener); } - /* - * (non-Javadoc) - * @see org.eclipse.jface.viewers.ISelectionProvider#setSelection(org.eclipse.jface.viewers.ISelection) - */ @Override public void setSelection(ISelection selection) { fCurrentSelection = selection; @@ -90,10 +80,6 @@ public class SDWidgetSelectionProvider implements ISelectionProvider { } } - /* - * (non-Javadoc) - * @see org.eclipse.jface.viewers.ISelectionProvider#getSelection() - */ @Override public ISelection getSelection() { return fCurrentSelection; diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/ScrollView.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/ScrollView.java index d30ad37900..c9c6f33fa1 100755 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/ScrollView.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/ScrollView.java @@ -407,30 +407,16 @@ public class ScrollView extends Composite { // Methods // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see org.eclipse.swt.widgets.Composite#setFocus() - */ @Override public boolean setFocus() { return fViewControl.forceFocus(); } - /* - * (non-Javadoc) - * @see org.eclipse.swt.widgets.Control#setCursor(org.eclipse.swt.graphics.Cursor) - */ @Override public void setCursor(Cursor cursor) { fViewControl.setCursor(cursor); } - /* - * Dispose controls used in scroll view - * - * (non-Javadoc) - * @see org.eclipse.swt.widgets.Widget#dispose() - */ @Override public void dispose() { if (fAutoScroll != null) { @@ -460,29 +446,17 @@ public class ScrollView extends Composite { super.dispose(); } - /* - * (non-Javadoc) - * @see org.eclipse.swt.widgets.Composite#getClientArea() - */ @Override public Rectangle getClientArea() { return fViewControl.getClientArea(); } - /* - * (non-Javadoc) - * @see org.eclipse.swt.widgets.Control#setBackground(org.eclipse.swt.graphics.Color) - */ @Override public void setBackground(Color c) { super.setBackground(c); fViewControl.setBackground(c); } - /* - * (non-Javadoc) - * @see org.eclipse.swt.widgets.Control#setToolTipText(java.lang.String) - */ @Override public void setToolTipText(String text) { fViewControl.setToolTipText(text); @@ -1316,21 +1290,11 @@ public class ScrollView extends Composite { return true; } - // redefined to return our vertical bar - /* - * (non-Javadoc) - * @see org.eclipse.swt.widgets.Scrollable#getVerticalBar() - */ @Override public ScrollBar getVerticalBar() { return fVertScrollBar.getVerticalBar(); } - // redefined to return out horizontal bar - /* - * (non-Javadoc) - * @see org.eclipse.swt.widgets.Scrollable#getHorizontalBar() - */ @Override public ScrollBar getHorizontalBar() { return fHorScrollBar.getHorizontalBar(); @@ -1627,10 +1591,6 @@ public class ScrollView extends Composite { return bh + 1; } - /* - * (non-Javadoc) - * @see org.eclipse.swt.widgets.Scrollable#computeTrim(int, int, int, int) - */ @Override public Rectangle computeTrim(int x, int y, int w, int h) { Rectangle r = new Rectangle(x, y, w, h); @@ -1657,10 +1617,6 @@ public class ScrollView extends Composite { */ boolean dontLayout = false; - /* - * (non-Javadoc) - * @see org.eclipse.swt.widgets.Layout#computeSize(org.eclipse.swt.widgets.Composite, int, int, boolean) - */ @Override protected Point computeSize(Composite composite, int wHint, int hHint, boolean flushCache) { Point p = new Point(250, 250); @@ -1673,10 +1629,6 @@ public class ScrollView extends Composite { return p; } - /* - * (non-Javadoc) - * @see org.eclipse.swt.widgets.Layout#layout(org.eclipse.swt.widgets.Composite, boolean) - */ @Override protected void layout(Composite composite, boolean flushCache) { if (dontLayout) { diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/TimeCompressionBar.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/TimeCompressionBar.java index 5e2eba1d35..16b60b7bc0 100755 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/TimeCompressionBar.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/TimeCompressionBar.java @@ -184,10 +184,6 @@ public class TimeCompressionBar extends ScrollView implements DisposeListener { }); fAccessible.addAccessibleControlListener(new AccessibleControlAdapter() { - /* - * (non-Javadoc) - * @see org.eclipse.swt.accessibility.AccessibleControlAdapter#getFocus(org.eclipse.swt.accessibility.AccessibleControlEvent) - */ @Override public void getFocus(AccessibleControlEvent e) { if (fFocusedWidget == -1) { @@ -198,10 +194,6 @@ public class TimeCompressionBar extends ScrollView implements DisposeListener { } } - /* - * (non-Javadoc) - * @see org.eclipse.swt.accessibility.AccessibleControlAdapter#getRole(org.eclipse.swt.accessibility.AccessibleControlEvent) - */ @Override public void getRole(AccessibleControlEvent e) { switch (e.childID) { @@ -219,10 +211,6 @@ public class TimeCompressionBar extends ScrollView implements DisposeListener { } } - /* - * (non-Javadoc) - * @see org.eclipse.swt.accessibility.AccessibleControlAdapter#getState(org.eclipse.swt.accessibility.AccessibleControlEvent) - */ @Override public void getState(AccessibleControlEvent e) { e.detail = ACC.STATE_FOCUSABLE; @@ -242,20 +230,11 @@ public class TimeCompressionBar extends ScrollView implements DisposeListener { addTraverseListener(new LocalTraverseListener()); getViewControl().addFocusListener(new FocusListener() { - - /* - * (non-Javadoc) - * @see org.eclipse.swt.events.FocusListener#focusGained(org.eclipse.swt.events.FocusEvent) - */ @Override public void focusGained(FocusEvent e) { redraw(); } - /* - * (non-Javadoc) - * @see org.eclipse.swt.events.FocusListener#focusLost(org.eclipse.swt.events.FocusEvent) - */ @Override public void focusLost(FocusEvent e) { redraw(); @@ -292,10 +271,6 @@ public class TimeCompressionBar extends ScrollView implements DisposeListener { fMaxTime = fFrame.getMaxTime(); } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.ScrollView#drawContents(org.eclipse.swt.graphics.GC, int, int, int, int) - */ @Override protected void drawContents(GC gc, int clipx, int clipy, int clipw, int cliph) { if (fFrame == null) { @@ -499,10 +474,6 @@ public class TimeCompressionBar extends ScrollView implements DisposeListener { return false; } - /* - * (non-Javadoc) - * @see org.eclipse.swt.widgets.Control#isFocusControl() - */ @Override public boolean isFocusControl() { Control[] child = getChildren(); @@ -515,10 +486,6 @@ public class TimeCompressionBar extends ScrollView implements DisposeListener { return false; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.ScrollView#contentsMouseMoveEvent(org.eclipse.swt.events.MouseEvent) - */ @Override protected void contentsMouseMoveEvent(MouseEvent event) { if (fTooltip != null) { @@ -536,10 +503,6 @@ public class TimeCompressionBar extends ScrollView implements DisposeListener { setFocus(-1); } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.ScrollView#contentsMouseHover(org.eclipse.swt.events.MouseEvent) - */ @Override protected void contentsMouseHover(MouseEvent e) { if (fTooltip == null) { @@ -599,10 +562,6 @@ public class TimeCompressionBar extends ScrollView implements DisposeListener { setFocus(0); } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.ScrollView#contentsMouseExit(org.eclipse.swt.events.MouseEvent) - */ @Override protected void contentsMouseExit(MouseEvent e) { if (fTooltip != null) { @@ -610,10 +569,6 @@ public class TimeCompressionBar extends ScrollView implements DisposeListener { } } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.ScrollView#contentsMouseUpEvent(org.eclipse.swt.events.MouseEvent) - */ @Override protected void contentsMouseUpEvent(MouseEvent event) { selectTimeDelta(event.y, 0); @@ -743,10 +698,6 @@ public class TimeCompressionBar extends ScrollView implements DisposeListener { }); } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.ScrollView#scrollBy(int, int) - */ @Override public void scrollBy(int x, int y) { } @@ -781,10 +732,6 @@ public class TimeCompressionBar extends ScrollView implements DisposeListener { fListenerList.remove(listener); } - /* - * (non-Javadoc) - * @see org.eclipse.swt.events.DisposeListener#widgetDisposed(org.eclipse.swt.events.DisposeEvent) - */ @Override public void widgetDisposed(DisposeEvent e) { if (fTooltip != null) { @@ -796,10 +743,6 @@ public class TimeCompressionBar extends ScrollView implements DisposeListener { } } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.ScrollView#keyPressedEvent(org.eclipse.swt.events.KeyEvent) - */ @Override protected void keyPressedEvent(KeyEvent event) { if (fTooltip != null) { @@ -1083,11 +1026,6 @@ public class TimeCompressionBar extends ScrollView implements DisposeListener { * Traverse Listener implementation. */ protected static class LocalTraverseListener implements TraverseListener { - - /* - * (non-Javadoc) - * @see org.eclipse.swt.events.TraverseListener#keyTraversed(org.eclipse.swt.events.TraverseEvent) - */ @Override public void keyTraversed(TraverseEvent e) { if ((e.detail == SWT.TRAVERSE_TAB_NEXT) || (e.detail == SWT.TRAVERSE_TAB_PREVIOUS)) { diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/core/AsyncMessage.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/core/AsyncMessage.java index 750b0b4a0f..6b6e226025 100755 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/core/AsyncMessage.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/core/AsyncMessage.java @@ -94,10 +94,7 @@ public class AsyncMessage extends BaseMessage implements ITimeRange { // ------------------------------------------------------------------------ // Methods // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.core.BaseMessage#getX() - */ + @Override public int getX() { int x = super.getX(true); @@ -112,10 +109,6 @@ public class AsyncMessage extends BaseMessage implements ITimeRange { return x; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.core.BaseMessage#getY() - */ @Override public int getY() { if ((fStartLifeline != null) && (fEndLifeline != null)) { @@ -124,10 +117,6 @@ public class AsyncMessage extends BaseMessage implements ITimeRange { return super.getY(); } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.core.BaseMessage#getWidth() - */ @Override public int getWidth() { int width = super.getWidth(true); @@ -147,10 +136,6 @@ public class AsyncMessage extends BaseMessage implements ITimeRange { return width; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.core.BaseMessage#getHeight() - */ @Override public int getHeight() { if ((fStartLifeline != null) && (fEndLifeline != null)) { @@ -230,10 +215,6 @@ public class AsyncMessage extends BaseMessage implements ITimeRange { setEndLifeline(lifeline); } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.core.BaseMessage#setStartLifeline(org.eclipse.linuxtools.tmf.ui.views.uml2sd.core.Lifeline) - */ @Override public void setStartLifeline(Lifeline lifeline) { super.setStartLifeline(lifeline); @@ -243,10 +224,6 @@ public class AsyncMessage extends BaseMessage implements ITimeRange { } } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.core.BaseMessage#setEndLifeline(org.eclipse.linuxtools.tmf.ui.views.uml2sd.core.Lifeline) - */ @Override public void setEndLifeline(Lifeline lifeline) { super.setEndLifeline(lifeline); @@ -287,10 +264,6 @@ public class AsyncMessage extends BaseMessage implements ITimeRange { return false; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.core.BaseMessage#contains(int, int) - */ @Override public boolean contains(int x, int y) { // Is it a self message? @@ -359,10 +332,6 @@ public class AsyncMessage extends BaseMessage implements ITimeRange { } } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.core.BaseMessage#draw(org.eclipse.linuxtools.tmf.ui.views.uml2sd.drawings.IGC) - */ @Override public void draw(IGC context) { if (!isVisible()) { @@ -450,10 +419,6 @@ public class AsyncMessage extends BaseMessage implements ITimeRange { return fHasTime; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.core.BaseMessage#isVisible(int, int, int, int) - */ @Override public boolean isVisible(int x, int y, int width, int height) { int toDrawY = getY(); @@ -467,37 +432,21 @@ public class AsyncMessage extends BaseMessage implements ITimeRange { return super.isVisible(x, y, width, height); } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.core.GraphNode#getComparator() - */ @Override public Comparator getComparator() { return new SortAsyncMessageComparator(); } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.core.GraphNode#getArrayId() - */ @Override public String getArrayId() { return ASYNC_MESS_TAG; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.core.GraphNode#getBackComparator() - */ @Override public Comparator getBackComparator() { return new SortAsyncForBackward(); } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.core.GraphNode#positiveDistanceToPoint(int, int) - */ @Override public boolean positiveDistanceToPoint(int x, int y) { int mY = getY(); diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/core/AsyncMessageReturn.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/core/AsyncMessageReturn.java index 3ac9385411..80dd448800 100755 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/core/AsyncMessageReturn.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/core/AsyncMessageReturn.java @@ -1,5 +1,5 @@ /********************************************************************** - * Copyright (c) 2005, 2012 IBM Corporation, Ericsson + * Copyright (c) 2005, 2013 IBM Corporation, 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 @@ -74,10 +74,6 @@ public class AsyncMessageReturn extends AsyncMessage { fMessage = parentMessage; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.core.AsyncMessage#draw(org.eclipse.linuxtools.tmf.ui.views.uml2sd.drawings.IGC) - */ @Override public void draw(IGC context) { if (!isVisible()) { @@ -99,10 +95,6 @@ public class AsyncMessageReturn extends AsyncMessage { context.setLineStyle(oldStyle); } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.core.AsyncMessage#getArrayId() - */ @Override public String getArrayId() { return ASYNC_MESS_RET_TAG; diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/core/BaseMessage.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/core/BaseMessage.java index 195289b833..ff24c32151 100755 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/core/BaseMessage.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/core/BaseMessage.java @@ -1,5 +1,5 @@ /********************************************************************** - * Copyright (c) 2005, 2012 IBM Corporation, Ericsson + * Copyright (c) 2005, 2013 IBM Corporation, 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 @@ -51,20 +51,13 @@ public abstract class BaseMessage extends GraphNode { // ------------------------------------------------------------------------ // Methods // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.core.GraphNode#getX() - */ + @Override public int getX() { // returns the exact x coordinate return getX(false); } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.core.GraphNode#getY() - */ @Override public int getY() { /* @@ -96,20 +89,12 @@ public abstract class BaseMessage extends GraphNode { return 0; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.core.GraphNode#getWidth() - */ @Override public int getWidth() { // Returns the exact width return getWidth(false); } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.core.GraphNode#getHeight() - */ @Override public int getHeight() { return 0; @@ -212,10 +197,6 @@ public abstract class BaseMessage extends GraphNode { return width; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.core.GraphNode#isVisible(int, int, int, int) - */ @Override public boolean isVisible(int x, int y, int width, int height) { // ***Common*** syncMessages visibility @@ -368,10 +349,6 @@ public abstract class BaseMessage extends GraphNode { return inActivation; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.core.GraphNode#contains(int, int) - */ @Override public boolean contains(int xValue, int yValue) { int x = getX(); @@ -627,10 +604,6 @@ public abstract class BaseMessage extends GraphNode { } } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.core.GraphNodee#draw(org.eclipse.linuxtools.tmf.ui.views.uml2sd.drawings.IGC) - */ @Override public void draw(IGC context) { if (!isVisible()) { @@ -723,10 +696,6 @@ public abstract class BaseMessage extends GraphNode { context.drawPolygon(points); } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.core.GraphNode#drawFocus(org.eclipse.linuxtools.tmf.ui.views.uml2sd.drawings.IGC) - */ @Override public void drawFocus(IGC context) { diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/core/BasicExecutionOccurrence.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/core/BasicExecutionOccurrence.java index 72dd896f5c..d915069f12 100755 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/core/BasicExecutionOccurrence.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/core/BasicExecutionOccurrence.java @@ -59,10 +59,6 @@ public class BasicExecutionOccurrence extends GraphNode { // Constants // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.core.GraphNode#getX() - */ @Override public int getX() { if (fLifeline == null) { @@ -71,10 +67,6 @@ public class BasicExecutionOccurrence extends GraphNode { return fLifeline.getX() + Metrics.getLifelineWidth() / 2 - Metrics.EXECUTION_OCCURRENCE_WIDTH / 2; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.core.GraphNode#getY() - */ @Override public int getY() { if (fLifeline == null) { @@ -83,10 +75,6 @@ public class BasicExecutionOccurrence extends GraphNode { return fLifeline.getY() + fLifeline.getHeight() + (Metrics.getMessageFontHeigth() + Metrics.getMessagesSpacing()) * fStartEventOccurrence; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.core.GraphNode#getWidth() - */ @Override public int getWidth() { if (fLifeline == null) { @@ -95,10 +83,6 @@ public class BasicExecutionOccurrence extends GraphNode { return Metrics.EXECUTION_OCCURRENCE_WIDTH; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.core.GraphNode#getHeight() - */ @Override public int getHeight() { if (fLifeline == null) { @@ -107,10 +91,6 @@ public class BasicExecutionOccurrence extends GraphNode { return ((Metrics.getMessageFontHeigth() + Metrics.getMessagesSpacing())) * (fEndEventOccurrence - fStartEventOccurrence); } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.core.GraphNode#contains(int, int) - */ @Override public boolean contains(int xValue, int yValue) { int x = getX(); @@ -128,10 +108,6 @@ public class BasicExecutionOccurrence extends GraphNode { return false; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.core.GraphNode#getName() - */ @Override public String getName() { if (super.getName() == null || super.getName().equals("")) { //$NON-NLS-1$ @@ -196,10 +172,6 @@ public class BasicExecutionOccurrence extends GraphNode { fEndEventOccurrence = occurrence; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.core.GraphNode#draw(org.eclipse.linuxtools.tmf.ui.views.uml2sd.drawings.IGC) - */ @Override public void draw(IGC context) { int x = getX(); @@ -268,19 +240,11 @@ public class BasicExecutionOccurrence extends GraphNode { return null; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.core.GraphNode#getArrayId() - */ @Override public String getArrayId() { return EXEC_OCC_TAG; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.core.GraphNode#positiveDistanceToPoint(int, int) - */ @Override public boolean positiveDistanceToPoint(int x, int y) { if (getY() + getHeight() > y) { @@ -289,10 +253,6 @@ public class BasicExecutionOccurrence extends GraphNode { return false; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.core.GraphNode#isVisible(int, int, int, int) - */ @Override public boolean isVisible(int x, int y, int width, int height) { if ((getLifeline() != null) && (getLifeline().isVisible(x, y, width, height))) { diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/core/BasicFrame.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/core/BasicFrame.java index d17bcbcb27..bcb89ea1e9 100755 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/core/BasicFrame.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/core/BasicFrame.java @@ -163,39 +163,22 @@ public class BasicFrame extends GraphNode { return fHorizontalIndex; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.core.GraphNode#addNode(org.eclipse.linuxtools.tmf.ui.views.uml2sd.core.GraphNode) - */ @Override public void addNode(GraphNode nodeToAdd) { fComputeMinMax = true; super.addNode(nodeToAdd); } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.core.GraphNode#getX() - */ @Override public int getX() { return Metrics.FRAME_H_MARGIN; } - - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.core.GraphNode#getY() - */ @Override public int getY() { return Metrics.FRAME_V_MARGIN; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.core.GraphNode#getWidth() - */ @Override public int getWidth() { if (fHorizontalIndex == 0) { @@ -204,10 +187,6 @@ public class BasicFrame extends GraphNode { return fHorizontalIndex * Metrics.swimmingLaneWidth() + Metrics.LIFELINE_H_MAGIN * 2 + 1 - Metrics.LIFELINE_SPACING; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.core.GraphNode#getHeight() - */ @Override public int getHeight() { // The Frame height depends on the maximum number of messages added to a lifeline @@ -309,10 +288,6 @@ public class BasicFrame extends GraphNode { context.setForeground(pref.getForeGroundColor(ISDPreferences.PREF_FRAME)); } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.core.GraphNode#draw(org.eclipse.linuxtools.tmf.ui.views.uml2sd.drawings.IGC) - */ @Override public void draw(IGC context) { draw(context, true); @@ -581,19 +556,11 @@ public class BasicFrame extends GraphNode { return timeArray; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.core.GraphNode#getArrayId() - */ @Override public String getArrayId() { return null; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.core.GraphNode#contains(int, int) - */ @Override public boolean contains(int x, int y) { return false; diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/core/EllipsisMessage.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/core/EllipsisMessage.java index a16aff81fb..0af19ac7d3 100755 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/core/EllipsisMessage.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/core/EllipsisMessage.java @@ -1,5 +1,5 @@ /********************************************************************** - * Copyright (c) 2005, 2012 IBM Corporation, Ericsson + * Copyright (c) 2005, 2013 IBM Corporation, 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 @@ -26,10 +26,6 @@ import org.eclipse.linuxtools.tmf.ui.views.uml2sd.preferences.SDViewPref; */ public class EllipsisMessage extends AsyncMessage { - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.core.AsyncMessage#getX() - */ @Override public int getX() { if (fStartLifeline == null) { @@ -38,28 +34,16 @@ public class EllipsisMessage extends AsyncMessage { return super.getX(); } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.core.AsyncMessage#getY() - */ @Override public int getY() { return super.getY() + 3; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.core.AsyncMessage#getWidth() - */ @Override public int getWidth() { return 16; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.core.AsyncMessage#drawMessage(org.eclipse.linuxtools.tmf.ui.views.uml2sd.drawings.IGC) - */ @Override protected void drawMessage(IGC context) { // temporary store the coordinates to avoid more methods calls @@ -119,10 +103,6 @@ public class EllipsisMessage extends AsyncMessage { } } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.core.AsyncMessage#draw(org.eclipse.linuxtools.tmf.ui.views.uml2sd.drawings.IGC) - */ @Override public void draw(IGC context) { if (!isVisible()) { diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/core/ExecutionOccurrence.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/core/ExecutionOccurrence.java index 9b343c63a8..acadb480b3 100755 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/core/ExecutionOccurrence.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/core/ExecutionOccurrence.java @@ -33,6 +33,7 @@ public class ExecutionOccurrence extends BasicExecutionOccurrence implements ITi // ------------------------------------------------------------------------ // Attributes // ------------------------------------------------------------------------ + /** * Set the red, green and blue value of the optional color to be used for filling the execution occurrence. */ @@ -65,10 +66,7 @@ public class ExecutionOccurrence extends BasicExecutionOccurrence implements ITi // ------------------------------------------------------------------------ // Methods // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.core.BasicExecutionOccurrence#setLifeline(org.eclipse.linuxtools.tmf.ui.views.uml2sd.core.Lifeline) - */ + @Override public void setLifeline(Lifeline theLifeline) { super.setLifeline(theLifeline); @@ -170,19 +168,11 @@ public class ExecutionOccurrence extends BasicExecutionOccurrence implements ITi return fEndTime; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.core.ITimeRange#hasTimeInfo() - */ @Override public boolean hasTimeInfo() { return fHasTimeInfo; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.core.BasicExecutionOccurrence#draw(org.eclipse.linuxtools.tmf.ui.views.uml2sd.drawings.IGC) - */ @Override public void draw(IGC context) { super.draw(context); @@ -198,10 +188,6 @@ public class ExecutionOccurrence extends BasicExecutionOccurrence implements ITi } } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.core.BasicExecutionOccurrence#setUnselectedFillColor(org.eclipse.linuxtools.tmf.ui.views.uml2sd.drawings.IGC) - */ @Override protected IColor setUnselectedFillColor(IGC context) { ISDPreferences pref = SDViewPref.getInstance(); @@ -219,10 +205,6 @@ public class ExecutionOccurrence extends BasicExecutionOccurrence implements ITi return super.setUnselectedFillColor(context); } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.core.BasicExecutionOccurrence#setUnselectedStrokeColor(org.eclipse.linuxtools.tmf.ui.views.uml2sd.drawings.IGC) - */ @Override protected IColor setUnselectedStrokeColor(IGC context) { if (fStrokeRGB != null) { diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/core/Frame.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/core/Frame.java index 2a98d2302a..155df548a0 100755 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/core/Frame.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/core/Frame.java @@ -517,10 +517,6 @@ public class Frame extends BasicFrame { fHighlightColor = null; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.core.BasicFrame#computeMinMax() - */ @Override protected void computeMinMax() { List timeArray = buildTimeArray(); @@ -645,10 +641,6 @@ public class Frame extends BasicFrame { addNode(message); } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.core.BasicFrame#draw(org.eclipse.linuxtools.tmf.ui.views.uml2sd.drawings.IGC) - */ @Override public void draw(IGC context) { drawFrame(context); @@ -709,10 +701,6 @@ public class Frame extends BasicFrame { } } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.core.BasicFrame#buildTimeArray() - */ @Override protected List buildTimeArray() { diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/core/HotSpot.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/core/HotSpot.java index e058affdf5..03aa62260a 100755 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/core/HotSpot.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/core/HotSpot.java @@ -1,5 +1,5 @@ /********************************************************************** - * Copyright (c) 2005, 2012 IBM Corporation, Ericsson + * Copyright (c) 2005, 2013 IBM Corporation, 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 @@ -72,10 +72,6 @@ public class HotSpot extends GraphNode { fImage = img; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.core.GraphNode#getX() - */ @Override public int getX() { if (fExecOcc != null) { @@ -84,10 +80,6 @@ public class HotSpot extends GraphNode { return 0; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.core.GraphNode#getY() - */ @Override public int getY() { if (fExecOcc != null){ @@ -96,10 +88,6 @@ public class HotSpot extends GraphNode { return 0; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.core.GraphNode#getWidth() - */ @Override public int getWidth() { if (fExecOcc != null) { @@ -108,10 +96,6 @@ public class HotSpot extends GraphNode { return 0; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.core.GraphNode#getHeight() - */ @Override public int getHeight() { if (fExecOcc != null) { @@ -157,10 +141,6 @@ public class HotSpot extends GraphNode { fOccurrence = occ; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.core.GraphNode#draw(org.eclipse.linuxtools.tmf.ui.views.uml2sd.drawings.IGC) - */ @Override public void draw(IGC context) { @@ -178,28 +158,16 @@ public class HotSpot extends GraphNode { context.drawImage(fImage, getX(), getY(), getWidth(), getHeight()); } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.core.GraphNode#getArrayId() - */ @Override public String getArrayId() { return GLYPH; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.core.GraphNode#isVisible(int, int, int, int) - */ @Override public boolean isVisible(int x, int y, int width, int height) { return true; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.core.GraphNode#contains(int, int) - */ @Override public boolean contains(int xValue, int yValue) { int x = getX(); diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/core/Lifeline.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/core/Lifeline.java index 959d44defb..1755eda41b 100755 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/core/Lifeline.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/core/Lifeline.java @@ -79,37 +79,22 @@ public class Lifeline extends GraphNode { // ------------------------------------------------------------------------ // Methods // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.core.GraphNode#getX() - */ + @Override public int getX() { return Metrics.FRAME_H_MARGIN + Metrics.LIFELINE_H_MAGIN + (fIndexInFrame - 1) * Metrics.swimmingLaneWidth(); } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.core.GraphNode#getY() - */ @Override public int getY() { return 2 * Metrics.FRAME_NAME_H_MARGIN + Metrics.LIFELINE_VT_MAGIN / 2 + Metrics.getFrameFontHeigth() + Metrics.getLifelineHeaderFontHeigth() + Metrics.FRAME_V_MARGIN + 2 * Metrics.LIFELINE_HEARDER_TEXT_V_MARGIN; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.core.GraphNode#getWidth() - */ @Override public int getWidth() { return Metrics.getLifelineWidth(); } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.core.GraphNode#getHeight() - */ @Override public int getHeight() { // Set room for two text lines @@ -282,10 +267,6 @@ public class Lifeline extends GraphNode { return new ArrayList(); } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.core.GraphNode#contains(int, int) - */ @Override public boolean contains(int xValue, int yValue) { int x = getX(); @@ -488,28 +469,16 @@ public class Lifeline extends GraphNode { context.setBackground(backupColor); } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.core.GraphNode#draw(org.eclipse.linuxtools.tmf.ui.views.uml2sd.drawings.IGC) - */ @Override public void draw(IGC context) { draw(context, getX(), getY()); } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.core.GraphNode#getArrayId() - */ @Override public String getArrayId() { return LIFELINE_TAG; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.core.GraphNode#positiveDistanceToPoint(int, int) - */ @Override public boolean positiveDistanceToPoint(int x, int y) { if (getX() > x - Metrics.swimmingLaneWidth()) { @@ -518,10 +487,6 @@ public class Lifeline extends GraphNode { return false; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.core.GraphNode#getNodeAt(int, int) - */ @Override public GraphNode getNodeAt(int x, int y) { int vy = 0; diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/core/Stop.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/core/Stop.java index 9ea41239f1..bd06b7fffc 100755 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/core/Stop.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/core/Stop.java @@ -1,5 +1,5 @@ /********************************************************************** - * Copyright (c) 2005, 2012 IBM Corporation, Ericsson + * Copyright (c) 2005, 2013 IBM Corporation, 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 @@ -54,10 +54,6 @@ public class Stop extends GraphNode { // Methods // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.core.GraphNode#getX() - */ @Override public int getX() { if (fLifeline == null) { @@ -66,10 +62,6 @@ public class Stop extends GraphNode { return fLifeline.getX() + Metrics.getLifelineWidth() / 2 - Metrics.STOP_WIDTH / 2; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.core.GraphNode#getY() - */ @Override public int getY() { if (fLifeline == null) { @@ -78,10 +70,6 @@ public class Stop extends GraphNode { return fLifeline.getY() + fLifeline.getHeight() + (Metrics.getMessageFontHeigth() + Metrics.getMessagesSpacing()) * fEventOccurrence - Metrics.STOP_WIDTH / 2; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.core.GraphNode#getWidth() - */ @Override public int getWidth() { if (fLifeline == null) { @@ -90,10 +78,6 @@ public class Stop extends GraphNode { return Metrics.STOP_WIDTH; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.core.GraphNode#getHeight() - */ @Override public int getHeight() { if (fLifeline == null) { @@ -120,10 +104,6 @@ public class Stop extends GraphNode { fEventOccurrence = occurrence; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.core.GraphNode#draw(org.eclipse.linuxtools.tmf.ui.views.uml2sd.drawings.IGC) - */ @Override public void draw(IGC context) { @@ -155,19 +135,11 @@ public class Stop extends GraphNode { context.setLineWidth(lastWidth); } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.core.GraphNode#getArrayId() - */ @Override public String getArrayId() { return STOP; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.core.GraphNode#contains(int, int) - */ @Override public boolean contains(int x, int y) { return false; diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/core/SyncMessage.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/core/SyncMessage.java index 6744d908a6..a60386882e 100755 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/core/SyncMessage.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/core/SyncMessage.java @@ -236,19 +236,11 @@ public class SyncMessage extends BaseMessage implements ITimeRange { return fEventTime; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.core.ITimeRange#hasTimeInfo() - */ @Override public boolean hasTimeInfo() { return fHasTimeInfo; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.core.BaseMessage#draw(org.eclipse.linuxtools.tmf.ui.views.uml2sd.drawings.IGC) - */ @Override public void draw(IGC context) { if (!isVisible()) { @@ -265,10 +257,6 @@ public class SyncMessage extends BaseMessage implements ITimeRange { super.draw(context); } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.core.BaseMessage#isVisible(int, int, int, int) - */ @Override public boolean isVisible(int x, int y, int width, int height) { if (getY() > y + height + @@ -288,28 +276,16 @@ public class SyncMessage extends BaseMessage implements ITimeRange { return super.isVisible(x, y, width, height); } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.core.GraphNode#getComparator() - */ @Override public Comparator getComparator() { return new SortSyncMessageComparator(); } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.core.GraphNode#getArrayId() - */ @Override public String getArrayId() { return SYNC_MESS_TAG; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.core.GraphNode#positiveDistanceToPoint(int, int) - */ @Override public boolean positiveDistanceToPoint(int x, int y) { if (getY() > y) { diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/core/SyncMessageReturn.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/core/SyncMessageReturn.java index 30ee55a5a9..c2a700f80f 100755 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/core/SyncMessageReturn.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/core/SyncMessageReturn.java @@ -1,5 +1,5 @@ /********************************************************************** - * Copyright (c) 2005, 2012 IBM Corporation, Ericsson + * Copyright (c) 2005, 2013 IBM Corporation, 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 @@ -84,10 +84,6 @@ public class SyncMessageReturn extends SyncMessage { return fMessage; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.core.SyncMessage#draw(org.eclipse.linuxtools.tmf.ui.views.uml2sd.drawings.IGC) - */ @Override public void draw(IGC context) { if (!isVisible()) { @@ -109,10 +105,6 @@ public class SyncMessageReturn extends SyncMessage { context.setLineStyle(oldStyle); } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.core.SyncMessage#getArrayId() - */ @Override public String getArrayId() { return SYNC_MESS_RET_TAG; diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/dialogs/FilterCriteria.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/dialogs/FilterCriteria.java index cd8bfacfef..ed2d78c354 100755 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/dialogs/FilterCriteria.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/dialogs/FilterCriteria.java @@ -1,5 +1,5 @@ /********************************************************************** - * Copyright (c) 2005, 2012 IBM Corporation, Ericsson + * Copyright (c) 2005, 2013 IBM Corporation, 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 @@ -111,10 +111,7 @@ public class FilterCriteria { // ------------------------------------------------------------------------ // Methods // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see java.lang.Object#toString() - */ + @Override public String toString() { StringBuffer sb = new StringBuffer(super.toString()); diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/dialogs/FilterListDialog.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/dialogs/FilterListDialog.java index 8a0d64035f..bf01a9f649 100755 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/dialogs/FilterListDialog.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/dialogs/FilterListDialog.java @@ -1,5 +1,5 @@ /********************************************************************** - * Copyright (c) 2005, 2012 IBM Corporation, Ericsson + * Copyright (c) 2005, 2013 IBM Corporation, 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 @@ -143,10 +143,6 @@ public class FilterListDialog extends Dialog { fRemove.setEnabled(count > 0); } - /* - * (non-Javadoc) - * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite) - */ @Override public Control createDialogArea(Composite parent) { @@ -168,10 +164,7 @@ public class FilterListDialog extends Dialog { fTable.setLayoutData(new RowData(220, 84)); fTable.setHeaderVisible(false); fTable.addSelectionListener(new SelectionListener() { - /* - * (non-Javadoc) - * @see org.eclipse.swt.events.SelectionListener#widgetDefaultSelected(org.eclipse.swt.events.SelectionEvent) - */ + @Override public void widgetDefaultSelected(SelectionEvent e) { int count = fTable.getSelectionCount(); @@ -183,10 +176,6 @@ public class FilterListDialog extends Dialog { } } - /* - * (non-Javadoc) - * @see org.eclipse.swt.events.SelectionListener#widgetSelected(org.eclipse.swt.events.SelectionEvent) - */ @Override public void widgetSelected(SelectionEvent e) { handleTableSelectionCount(); @@ -214,19 +203,12 @@ public class FilterListDialog extends Dialog { fAdd = new Button(commands, SWT.NONE); fAdd.setText(SDMessages._61); fAdd.addSelectionListener(new SelectionListener() { - /* - * (non-Javadoc) - * @see org.eclipse.swt.events.SelectionListener#widgetDefaultSelected(org.eclipse.swt.events.SelectionEvent) - */ + @Override public void widgetDefaultSelected(SelectionEvent e) { // Nothing to do } - /* - * (non-Javadoc) - * @see org.eclipse.swt.events.SelectionListener#widgetSelected(org.eclipse.swt.events.SelectionEvent) - */ @Override public void widgetSelected(SelectionEvent e) { Criteria init = new Criteria(); @@ -240,19 +222,12 @@ public class FilterListDialog extends Dialog { fEdit = new Button(commands, SWT.NONE); fEdit.setText(SDMessages._60); fEdit.addSelectionListener(new SelectionListener() { - /* - * (non-Javadoc) - * @see org.eclipse.swt.events.SelectionListener#widgetDefaultSelected(org.eclipse.swt.events.SelectionEvent) - */ + @Override public void widgetDefaultSelected(SelectionEvent e) { // Nothing to do } - /* - * (non-Javadoc) - * @see org.eclipse.swt.events.SelectionListener#widgetSelected(org.eclipse.swt.events.SelectionEvent) - */ @Override public void widgetSelected(SelectionEvent e) { Criteria c = openFilterDialog(((CriteriaTableItem) fTable.getSelection()[0].getData()).getCriteria(), SDMessages._63); @@ -266,19 +241,12 @@ public class FilterListDialog extends Dialog { fRemove = new Button(commands, SWT.NONE); fRemove.setText(SDMessages._64); fRemove.addSelectionListener(new SelectionListener() { - /* - * (non-Javadoc) - * @see org.eclipse.swt.events.SelectionListener#widgetDefaultSelected(org.eclipse.swt.events.SelectionEvent) - */ + @Override public void widgetDefaultSelected(SelectionEvent e) { // Nothing to do } - /* - * (non-Javadoc) - * @see org.eclipse.swt.events.SelectionListener#widgetSelected(org.eclipse.swt.events.SelectionEvent) - */ @Override public void widgetSelected(SelectionEvent e) { fTable.remove(fTable.getSelectionIndices()); @@ -311,10 +279,6 @@ public class FilterListDialog extends Dialog { return filter.getCriteria(); } - /* - * (non-Javadoc) - * @see org.eclipse.jface.window.Window#open() - */ @Override public int open() { create(); @@ -324,10 +288,6 @@ public class FilterListDialog extends Dialog { return super.open(); } - /* - * (non-Javadoc) - * @see org.eclipse.jface.dialogs.Dialog#okPressed() - */ @Override public void okPressed() { if (fTable.getItemCount() > 0) { diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/dialogs/MinMaxDialog.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/dialogs/MinMaxDialog.java index 46705d20a4..3da788b663 100755 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/dialogs/MinMaxDialog.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/dialogs/MinMaxDialog.java @@ -107,10 +107,6 @@ public class MinMaxDialog extends Dialog { return data; } - /* - * (non-Javadoc) - * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite) - */ @Override protected Control createDialogArea(Composite p) { p.getShell().setText(SDMessages._123); @@ -162,10 +158,6 @@ public class MinMaxDialog extends Dialog { return parent; } - /* - * (non-Javadoc) - * @see org.eclipse.jface.dialogs.Dialog#okPressed() - */ @Override protected void okPressed() { long min = 0; @@ -189,19 +181,12 @@ public class MinMaxDialog extends Dialog { } } - /* - * (non-Javadoc) - * @see org.eclipse.jface.dialogs.Dialog#createButtonsForButtonBar(org.eclipse.swt.widgets.Composite) - */ @Override protected void createButtonsForButtonBar(Composite parent) { super.createButtonsForButtonBar(parent); createButton(parent, IDialogConstants.CLIENT_ID, SDMessages._126, false); getButton(IDialogConstants.CLIENT_ID).addSelectionListener(new SelectionListener() { - /* - * (non-Javadoc) - * @see org.eclipse.swt.events.SelectionListener#widgetSelected(org.eclipse.swt.events.SelectionEvent) - */ + @Override public void widgetSelected(SelectionEvent e) { fSdWidget.getFrame().resetCustomMinMax(); @@ -212,10 +197,6 @@ public class MinMaxDialog extends Dialog { fMaxText.getParent().layout(true); } - /* - * (non-Javadoc) - * @see org.eclipse.swt.events.SelectionListener#widgetDefaultSelected(org.eclipse.swt.events.SelectionEvent) - */ @Override public void widgetDefaultSelected(SelectionEvent e) { // nothing to do diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/dialogs/PagesDialog.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/dialogs/PagesDialog.java index 5c144742c8..062fe54b5f 100755 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/dialogs/PagesDialog.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/dialogs/PagesDialog.java @@ -72,10 +72,6 @@ public class PagesDialog extends Dialog { // Methods // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite) - */ @Override public Control createDialogArea(Composite parent) { @@ -105,10 +101,6 @@ public class PagesDialog extends Dialog { return ret; } - /* - * (non-Javadoc) - * @see org.eclipse.jface.dialogs.Dialog#okPressed() - */ @Override public void okPressed() { int currentPageValue = fCurrentPage.getValue() - 1; @@ -139,6 +131,7 @@ public class PagesDialog extends Dialog { // ------------------------------------------------------------------------ // Helper classes // ------------------------------------------------------------------------ + /** * This is a Text Control that accepts only digits and ensures that bounds are respected */ diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/dialogs/SDPrintDialog.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/dialogs/SDPrintDialog.java index 6e184046a8..499c487a2f 100755 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/dialogs/SDPrintDialog.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/dialogs/SDPrintDialog.java @@ -1,5 +1,5 @@ /********************************************************************** - * Copyright (c) 2005, 2012 IBM Corporation, Ericsson + * Copyright (c) 2005, 2013 IBM Corporation, 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 @@ -78,10 +78,7 @@ public class SDPrintDialog extends Dialog { // ------------------------------------------------------------------------ // Methods // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite) - */ + @Override protected Control createDialogArea(Composite p) { p.getShell().setText(SDMessages._114); @@ -98,10 +95,6 @@ public class SDPrintDialog extends Dialog { return parent; } - /* - * (non-Javadoc) - * @see org.eclipse.jface.dialogs.Dialog#okPressed() - */ @Override protected void okPressed() { @@ -110,10 +103,6 @@ public class SDPrintDialog extends Dialog { } } - /* - * (non-Javadoc) - * @see org.eclipse.jface.dialogs.Dialog#createButtonsForButtonBar(org.eclipse.swt.widgets.Composite) - */ @Override protected void createButtonsForButtonBar(Composite parent) { @@ -121,19 +110,11 @@ public class SDPrintDialog extends Dialog { createButton(parent, IDialogConstants.CLIENT_ID, SDMessages._115, false); getButton(IDialogConstants.CLIENT_ID).addSelectionListener(new SelectionListener() { - /* - * (non-Javadoc) - * @see org.eclipse.swt.events.SelectionListener#widgetSelected(org.eclipse.swt.events.SelectionEvent) - */ @Override public void widgetSelected(SelectionEvent e) { - fDialogUI.printButtonSelected(); } - /* - * (non-Javadoc) - * @see org.eclipse.swt.events.SelectionListener#widgetDefaultSelected(org.eclipse.swt.events.SelectionEvent) - */ + @Override public void widgetDefaultSelected(SelectionEvent e) { } diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/dialogs/SDPrintDialogUI.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/dialogs/SDPrintDialogUI.java index 261ca3cadd..32995be928 100755 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/dialogs/SDPrintDialogUI.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/dialogs/SDPrintDialogUI.java @@ -262,10 +262,6 @@ public class SDPrintDialogUI { super(c, s); } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.ScrollView#getContentsHeight() - */ @Override public int getContentsHeight() { if (fSdView.getContentsHeight() > fSdView.getContentsHeight()) { @@ -274,10 +270,6 @@ public class SDPrintDialogUI { return super.getContentsHeight(); } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.ScrollView#getContentsWidth() - */ @Override public int getContentsWidth() { if (fSdView.getVisibleWidth() > fSdView.getContentsWidth()) { @@ -286,10 +278,6 @@ public class SDPrintDialogUI { return super.getContentsWidth(); } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.SDWidget#contentsMouseHover(org.eclipse.swt.events.MouseEvent) - */ @Override protected void contentsMouseHover(MouseEvent event) { } @@ -372,10 +360,6 @@ public class SDPrintDialogUI { return over; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.SDWidget#drawContents(org.eclipse.swt.graphics.GC, int, int, int, int) - */ @Override protected void drawContents(GC gc, int clipx, int clipy, int clipw, int cliph) { @@ -410,13 +394,8 @@ public class SDPrintDialogUI { dbuffer.dispose(); d.dispose(); gc.dispose(); - } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.SDWidget#keyPressedEvent(org.eclipse.swt.events.KeyEvent) - */ @Override protected void keyPressedEvent(KeyEvent e) { if (e.keyCode == SWT.CTRL) { @@ -528,10 +507,6 @@ public class SDPrintDialogUI { fOverviewCanvas.redraw(); } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.SDWidget#keyReleasedEvent(org.eclipse.swt.events.KeyEvent) - */ @Override protected void keyReleasedEvent(KeyEvent e) { if (e.keyCode == SWT.CTRL) { @@ -542,10 +517,6 @@ public class SDPrintDialogUI { } } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.SDWidget#contentsMouseDownEvent(org.eclipse.swt.events.MouseEvent) - */ @Override protected void contentsMouseDownEvent(MouseEvent event) { @@ -623,19 +594,11 @@ public class SDPrintDialogUI { redraw(); } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.SDWidget#contentsMouseMoveEvent(org.eclipse.swt.events.MouseEvent) - */ @Override protected void contentsMouseMoveEvent(MouseEvent e) { fToolTip.hideToolTip(); } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.ScrollView#resizeContents(int, int) - */ @Override public void resizeContents(int w, int h) { super.resizeContents(w, h); @@ -647,10 +610,6 @@ public class SDPrintDialogUI { * A traverse listener implementation. */ protected static class LocalTraverseListener implements TraverseListener { - /* - * (non-Javadoc) - * @see org.eclipse.swt.events.TraverseListener#keyTraversed(org.eclipse.swt.events.TraverseEvent) - */ @Override public void keyTraversed(TraverseEvent e) { if ((e.detail == SWT.TRAVERSE_TAB_NEXT) || (e.detail == SWT.TRAVERSE_TAB_PREVIOUS)) { @@ -755,10 +714,6 @@ public class SDPrintDialogUI { fOverviewCanvas.update(); } - /* - * (non-Javadoc) - * @see org.eclipse.swt.events.SelectionListener#widgetDefaultSelected(org.eclipse.swt.events.SelectionEvent) - */ @Override public void widgetDefaultSelected(SelectionEvent e) { fPagesList = new int[0]; @@ -769,10 +724,6 @@ public class SDPrintDialogUI { }; fModifyListener = new ModifyListener() { - /* - * (non-Javadoc) - * @see org.eclipse.swt.events.ModifyListener#modifyText(org.eclipse.swt.events.ModifyEvent) - */ @Override public void modifyText(ModifyEvent e) { fPagesList = new int[0]; @@ -940,28 +891,16 @@ public class SDPrintDialogUI { fToolTip = new DiagramToolTip(fOverviewCanvas); fOverviewCanvas.getViewControl().addMouseTrackListener(new MouseTrackListener() { - /* - * (non-Javadoc) - * @see org.eclipse.swt.events.MouseTrackListener#mouseEnter(org.eclipse.swt.events.MouseEvent) - */ @Override public void mouseEnter(MouseEvent e) { fToolTip.hideToolTip(); } - /* - * (non-Javadoc) - * @see org.eclipse.swt.events.MouseTrackListener#mouseExit(org.eclipse.swt.events.MouseEvent) - */ @Override public void mouseExit(MouseEvent e) { fToolTip.hideToolTip(); } - /* - * (non-Javadoc) - * @see org.eclipse.swt.events.MouseTrackListener#mouseHover(org.eclipse.swt.events.MouseEvent) - */ @Override public void mouseHover(MouseEvent e) { int x1 = (int) (fOverviewCanvas.viewToContentsX(e.x) / fOverviewCanvas.fZoomValue / fStepX); @@ -984,19 +923,11 @@ public class SDPrintDialogUI { fOverviewCanvas.addTraverseListener(new LocalTraverseListener()); fOverviewCanvas.addFocusListener(new FocusListener() { - /* - * (non-Javadoc) - * @see org.eclipse.swt.events.FocusListener#focusGained(org.eclipse.swt.events.FocusEvent) - */ @Override public void focusGained(FocusEvent e) { fOverviewCanvas.redraw(); } - /* - * (non-Javadoc) - * @see org.eclipse.swt.events.FocusListener#focusLost(org.eclipse.swt.events.FocusEvent) - */ @Override public void focusLost(FocusEvent e) { fOverviewCanvas.redraw(); @@ -1018,20 +949,11 @@ public class SDPrintDialogUI { fPrinterDialog.setText(SDMessages._115); fPrinterDialog.addSelectionListener(new SelectionListener() { - - /* - * (non-Javadoc) - * @see org.eclipse.swt.events.SelectionListener#widgetSelected(org.eclipse.swt.events.SelectionEvent) - */ @Override public void widgetSelected(SelectionEvent e) { printButtonSelected(); } - /* - * (non-Javadoc) - * @see org.eclipse.swt.events.SelectionListener#widgetDefaultSelected(org.eclipse.swt.events.SelectionEvent) - */ @Override public void widgetDefaultSelected(SelectionEvent e) { } diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/dialogs/SearchFilterDialog.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/dialogs/SearchFilterDialog.java index 0826d4a1a2..2863905f37 100755 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/dialogs/SearchFilterDialog.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/dialogs/SearchFilterDialog.java @@ -1,5 +1,5 @@ /********************************************************************** - * Copyright (c) 2005, 2012 IBM Corporation, Ericsson + * Copyright (c) 2005, 2013 IBM Corporation, 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 @@ -93,9 +93,10 @@ public class SearchFilterDialog extends Dialog { protected ISDGraphNodeSupporter fProvider = null; /** - * The okText is the text for the Ok button and title is the title of the dialog.
- * Both depend (okText and title (below)) on the usage that is done of this dialog - * (find or filter). + * The okText is the text for the Ok button and title is the title of the + * dialog.
+ * Both depend (okText and title (below)) on the usage that is done of this + * dialog (find or filter). */ protected String fOkText; @@ -112,7 +113,8 @@ public class SearchFilterDialog extends Dialog { protected String[] fExpressionList; /** - * find is true if the dialog is for the find feature and false for filter feature + * find is true if the dialog is for the find feature and false for filter + * feature */ protected boolean fIsFind; @@ -122,10 +124,14 @@ public class SearchFilterDialog extends Dialog { /** * Standard constructor * - * @param view A sequence diagram view reference - * @param provider A graph node supporter provider - * @param filter A flag to indicate filtering (true) or finding (false) - * @param style Style bits + * @param view + * A sequence diagram view reference + * @param provider + * A graph node supporter provider + * @param filter + * A flag to indicate filtering (true) or finding (false) + * @param style + * Style bits */ public SearchFilterDialog(SDView view, ISDGraphNodeSupporter provider, boolean filter, int style) { super(view.getSDWidget().getShell()); @@ -139,10 +145,6 @@ public class SearchFilterDialog extends Dialog { // Methods // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite) - */ @Override public Control createDialogArea(Composite arg0) { if (fIsFind) { @@ -209,8 +211,8 @@ public class SearchFilterDialog extends Dialog { } /** - * Loads criteria from the dialog settings which are saved in the workspace. - */ + * Loads criteria from the dialog settings which are saved in the workspace. + */ @SuppressWarnings("rawtypes") protected void loadCriteria() { @@ -248,8 +250,8 @@ public class SearchFilterDialog extends Dialog { } /** - * Called when the dialog box ok button is pressed and calls back - * the appropriate action provider (ISDFilterProvider or ISDFindProvider). + * Called when the dialog box ok button is pressed and calls back the + * appropriate action provider (ISDFilterProvider or ISDFindProvider). */ @Override public void okPressed() { @@ -265,10 +267,6 @@ public class SearchFilterDialog extends Dialog { } } - /* - * (non-Javadoc) - * @see org.eclipse.jface.dialogs.Dialog#cancelPressed() - */ @Override public void cancelPressed() { if (fIsFind) { @@ -282,8 +280,8 @@ public class SearchFilterDialog extends Dialog { } /** - * Saves the criteria to the dialog settings within the workspace. - */ + * Saves the criteria to the dialog settings within the workspace. + */ public void saveCriteria() { String CRITERIA = FIND_CRITERIA; String EXPRESSION_LIST = FIND_EXPRESSION_LIST; @@ -319,10 +317,10 @@ public class SearchFilterDialog extends Dialog { } /** - * Returns the criteria - * - * @return the criteria - */ + * Returns the criteria + * + * @return the criteria + */ public Criteria getCriteria() { return fCriteria; } @@ -330,7 +328,8 @@ public class SearchFilterDialog extends Dialog { /** * Sets the criteria. * - * @param criteria the criteria to set. + * @param criteria + * the criteria to set. */ public void setCriteria(Criteria criteria) { fCriteria = criteria; @@ -371,7 +370,8 @@ public class SearchFilterDialog extends Dialog { * Initialize the dialog with the settings of an existing Criteria
* Criteria must not be null and the TabContents must have been created * - * @param from the criteria to copy from + * @param from + * the criteria to copy from */ public void copyFromCriteria(Criteria from) { TabContents content = getTabContents(); @@ -390,7 +390,8 @@ public class SearchFilterDialog extends Dialog { /** * Sets the text to be used for the ok button * - * @param okText text to set + * @param okText + * text to set */ public void setOkText(String okText) { fOkText = okText; @@ -399,7 +400,8 @@ public class SearchFilterDialog extends Dialog { /** * Sets the title to be used for the dialog box. * - * @param title The title to set + * @param title + * The title to set */ public void setTitle(String title) { fTitle = title; diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/dialogs/TabContents.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/dialogs/TabContents.java index 3c94e55beb..516b0b1d02 100755 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/dialogs/TabContents.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/dialogs/TabContents.java @@ -1,5 +1,5 @@ /********************************************************************** - * Copyright (c) 2005, 2012 IBM Corporation, Ericsson + * Copyright (c) 2005, 2013 IBM Corporation, 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 @@ -462,19 +462,11 @@ public class TabContents extends Composite { * @version 1.0 */ protected class GraphNodeTypeListener implements SelectionListener { - /* - * (non-Javadoc) - * @see org.eclipse.swt.events.SelectionListener#widgetDefaultSelected(org.eclipse.swt.events.SelectionEvent) - */ @Override public void widgetDefaultSelected(SelectionEvent e) { // Nothing to do } - /* - * (non-Javadoc) - * @see org.eclipse.swt.events.SelectionListener#widgetSelected(org.eclipse.swt.events.SelectionEvent) - */ @Override public void widgetSelected(SelectionEvent e) { updateOkButton(); @@ -487,11 +479,6 @@ public class TabContents extends Composite { * @version 1.0 */ protected class ExpressionListener implements ModifyListener { - - /* - * (non-Javadoc) - * @see org.eclipse.swt.events.ModifyListener#modifyText(org.eclipse.swt.events.ModifyEvent) - */ @Override public void modifyText(ModifyEvent e) { updateOkButton(); diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/drawings/impl/ColorImpl.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/drawings/impl/ColorImpl.java index b8887028f2..413cecd6bc 100755 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/drawings/impl/ColorImpl.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/drawings/impl/ColorImpl.java @@ -77,19 +77,11 @@ public class ColorImpl implements IColor { return new ColorImpl(Display.getDefault().getSystemColor(color)); } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.drawings.IColor#getColor() - */ @Override public Object getColor() { return fColor; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.drawings.IColor#dispose() - */ @Override public void dispose() { if ((fColor != null) && (fManageColor)) { diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/drawings/impl/FontImpl.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/drawings/impl/FontImpl.java index b0f935a9bb..789dda7567 100755 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/drawings/impl/FontImpl.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/drawings/impl/FontImpl.java @@ -1,5 +1,5 @@ /********************************************************************** - * Copyright (c) 2005, 2012 IBM Corporation, Ericsson + * Copyright (c) 2005, 2013 IBM Corporation, 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 @@ -65,6 +65,7 @@ public class FontImpl implements IFont { // ------------------------------------------------------------------------ // Methods // ------------------------------------------------------------------------ + /** * Returns a font implementation based system font. * @@ -74,19 +75,11 @@ public class FontImpl implements IFont { return new FontImpl(Display.getDefault().getSystemFont()); } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.drawings.IFont#getFont() - */ @Override public Object getFont() { return fFont; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.drawings.IFont#dispose() - */ @Override public void dispose() { if (fFont != null) { diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/drawings/impl/ImageImpl.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/drawings/impl/ImageImpl.java index cbf60ecaff..64c7ec5d23 100755 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/drawings/impl/ImageImpl.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/drawings/impl/ImageImpl.java @@ -1,5 +1,5 @@ /********************************************************************** - * Copyright (c) 2005, 2012 IBM Corporation, Ericsson + * Copyright (c) 2005, 2013 IBM Corporation, 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 @@ -72,19 +72,11 @@ public class ImageImpl implements IImage { return createResourceImage(name); } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.drawings.IImage#getImage() - */ @Override public Object getImage() { return fImage; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.drawings.IImage#dispose() - */ @Override public void dispose() { if (fImage != null) { diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/handlers/ConfigureMinMax.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/handlers/ConfigureMinMax.java index cbac104692..ee0083339d 100755 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/handlers/ConfigureMinMax.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/handlers/ConfigureMinMax.java @@ -1,5 +1,5 @@ /********************************************************************** - * Copyright (c) 2005, 2012 IBM Corporation, Ericsson + * Copyright (c) 2005, 2013 IBM Corporation, 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 @@ -54,10 +54,6 @@ public class ConfigureMinMax extends Action { // Methods // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see org.eclipse.jface.action.Action#run() - */ @Override public void run() { if ((fView != null) && (fView.getSDWidget() != null)) { diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/handlers/FirstPage.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/handlers/FirstPage.java index 6f9a6ffc69..f400bf887d 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/handlers/FirstPage.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/handlers/FirstPage.java @@ -1,12 +1,12 @@ /********************************************************************** - * Copyright (c) 2011, 2012 Ericsson - * + * Copyright (c) 2011, 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.tmf.ui.views.uml2sd.handlers; @@ -19,7 +19,7 @@ import org.eclipse.linuxtools.tmf.ui.views.uml2sd.util.SDMessages; /** * Action class implementation to move the focus to the first page of the whole sequence diagram. - * + * * @version 1.0 * @author Bernd Hufmann */ @@ -28,6 +28,7 @@ public class FirstPage extends Action { // ------------------------------------------------------------------------ // Constants // ------------------------------------------------------------------------ + /** * The action ID. */ @@ -36,17 +37,19 @@ public class FirstPage extends Action { // ------------------------------------------------------------------------ // Attributes // ------------------------------------------------------------------------ + /** * The sequence diagram view reference */ protected SDView fView = null; - + // ------------------------------------------------------------------------ // Constructors // ------------------------------------------------------------------------ + /** - * Default constructor - * + * Default constructor + * * @param view the view reference */ public FirstPage(SDView view) { @@ -61,10 +64,7 @@ public class FirstPage extends Action { // ------------------------------------------------------------------------ // Methods // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see org.eclipse.jface.action.Action#run() - */ + @Override public void run() { if ((fView == null) || (fView.getSDWidget()) == null) { diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/handlers/LastPage.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/handlers/LastPage.java index 5f3e184c30..222cedfb9b 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/handlers/LastPage.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/handlers/LastPage.java @@ -1,12 +1,12 @@ /********************************************************************** - * Copyright (c) 2011, 2012 Ericsson - * + * Copyright (c) 2011, 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.tmf.ui.views.uml2sd.handlers; @@ -19,7 +19,7 @@ import org.eclipse.linuxtools.tmf.ui.views.uml2sd.util.SDMessages; /** * Action class implementation to move the focus to the last page of the whole sequence diagram. - * + * * @version 1.0 * @author Bernd Hufmann */ @@ -28,6 +28,7 @@ public class LastPage extends Action { // ------------------------------------------------------------------------ // Constants // ------------------------------------------------------------------------ + /** * The action ID. */ @@ -36,6 +37,7 @@ public class LastPage extends Action { // ------------------------------------------------------------------------ // Attributes // ------------------------------------------------------------------------ + /** * The sequence diagram view reference */ @@ -44,9 +46,10 @@ public class LastPage extends Action { // ------------------------------------------------------------------------ // Constructors // ------------------------------------------------------------------------ + /** * Standard constructor - * + * * @param view the view reference */ public LastPage(SDView view) { @@ -61,10 +64,7 @@ public class LastPage extends Action { // ------------------------------------------------------------------------ // Methods // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see org.eclipse.jface.action.Action#run() - */ + @Override public void run() { if ((fView == null) || (fView.getSDWidget()) == null) { diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/handlers/MoveSDDown.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/handlers/MoveSDDown.java index 4c083995cd..04f859fcda 100755 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/handlers/MoveSDDown.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/handlers/MoveSDDown.java @@ -1,5 +1,5 @@ /********************************************************************** - * Copyright (c) 2005, 2012 IBM Corporation, Ericsson + * Copyright (c) 2005, 2013 IBM Corporation, 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 @@ -66,10 +66,7 @@ public class MoveSDDown extends Action { // ------------------------------------------------------------------------ // Methods // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see org.eclipse.jface.action.Action#run() - */ + @Override public void run() { if (fView == null) { diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/handlers/MoveSDLeft.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/handlers/MoveSDLeft.java index 4fa0e00097..17fd8c15e1 100755 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/handlers/MoveSDLeft.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/handlers/MoveSDLeft.java @@ -1,5 +1,5 @@ /********************************************************************** - * Copyright (c) 2005, 2012 IBM Corporation, Ericsson + * Copyright (c) 2005, 2013 IBM Corporation, 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 @@ -66,10 +66,7 @@ public class MoveSDLeft extends Action { // ------------------------------------------------------------------------ // Operations // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see org.eclipse.jface.action.Action#run() - */ + @Override public void run() { diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/handlers/MoveSDRight.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/handlers/MoveSDRight.java index 9a1f62cd18..4570a4e7f0 100755 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/handlers/MoveSDRight.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/handlers/MoveSDRight.java @@ -1,5 +1,5 @@ /********************************************************************** - * Copyright (c) 2005, 2012 IBM Corporation, Ericsson + * Copyright (c) 2005, 2013 IBM Corporation, 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 @@ -67,10 +67,7 @@ public class MoveSDRight extends Action { // ------------------------------------------------------------------------ // Methods // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see org.eclipse.jface.action.Action#run() - */ + @Override public void run() { diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/handlers/MoveSDUp.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/handlers/MoveSDUp.java index e8dbd45d32..d0fa8482eb 100755 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/handlers/MoveSDUp.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/handlers/MoveSDUp.java @@ -1,5 +1,5 @@ /********************************************************************** - * Copyright (c) 2005, 2012 IBM Corporation, Ericsson + * Copyright (c) 2005, 2013 IBM Corporation, 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 @@ -66,10 +66,7 @@ public class MoveSDUp extends Action { // ------------------------------------------------------------------------ // Methods // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see org.eclipse.jface.action.Action#run() - */ + @Override public void run() { if (fView == null) { diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/handlers/MoveToMessage.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/handlers/MoveToMessage.java index 5a1ba6d2f1..3741071fc7 100755 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/handlers/MoveToMessage.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/handlers/MoveToMessage.java @@ -1,5 +1,5 @@ /********************************************************************** - * Copyright (c) 2005, 2012 IBM Corporation, Ericsson + * Copyright (c) 2005, 2013 IBM Corporation, 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 @@ -79,10 +79,6 @@ public class MoveToMessage extends Action { // Methods // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see org.eclipse.jface.action.Action#run() - */ @Override public void run() { if (fView == null) { diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/handlers/NextPage.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/handlers/NextPage.java index c4dd072b9d..9686a34c54 100755 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/handlers/NextPage.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/handlers/NextPage.java @@ -1,5 +1,5 @@ /********************************************************************** - * Copyright (c) 2005, 2012 IBM Corporation, Ericsson + * Copyright (c) 2005, 2013 IBM Corporation, 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 @@ -63,10 +63,7 @@ public class NextPage extends Action { // ------------------------------------------------------------------------ // Operations // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see org.eclipse.jface.action.Action#run() - */ + @Override public void run() { if ((fView == null) || (fView.getSDWidget()) == null) { diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/handlers/OpenSDFiltersDialog.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/handlers/OpenSDFiltersDialog.java index e424901f05..392e32b602 100755 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/handlers/OpenSDFiltersDialog.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/handlers/OpenSDFiltersDialog.java @@ -1,5 +1,5 @@ /********************************************************************** - * Copyright (c) 2005, 2012 IBM Corporation, Ericsson + * Copyright (c) 2005, 2013 IBM Corporation, 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 @@ -72,10 +72,7 @@ public class OpenSDFiltersDialog extends Action { // ------------------------------------------------------------------------ // Methods // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see org.eclipse.jface.action.Action#run() - */ + @Override public void run() { if (fView == null) { diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/handlers/OpenSDFindDialog.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/handlers/OpenSDFindDialog.java index 5362bac5b5..3a338342fe 100755 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/handlers/OpenSDFindDialog.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/handlers/OpenSDFindDialog.java @@ -1,5 +1,5 @@ /********************************************************************** - * Copyright (c) 2005, 2012 IBM Corporation, Ericsson + * Copyright (c) 2005, 2013 IBM Corporation, 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 @@ -76,10 +76,7 @@ public class OpenSDFindDialog extends Action { // ------------------------------------------------------------------------ // Methods // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see org.eclipse.jface.action.Action#run() - */ + @Override public void run() { if (fView == null) { diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/handlers/OpenSDPagesDialog.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/handlers/OpenSDPagesDialog.java index 5ce025c06b..9672ae75de 100755 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/handlers/OpenSDPagesDialog.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/handlers/OpenSDPagesDialog.java @@ -1,5 +1,5 @@ /********************************************************************** - * Copyright (c) 2005, 2012 IBM Corporation, Ericsson + * Copyright (c) 2005, 2013 IBM Corporation, 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 @@ -31,6 +31,7 @@ public class OpenSDPagesDialog extends Action { // ------------------------------------------------------------------------ // Constants // ------------------------------------------------------------------------ + /** * The action ID. */ @@ -39,6 +40,7 @@ public class OpenSDPagesDialog extends Action { // ------------------------------------------------------------------------ // Attributes // ------------------------------------------------------------------------ + /** * The sequence diagram view reference */ @@ -51,6 +53,7 @@ public class OpenSDPagesDialog extends Action { // ------------------------------------------------------------------------ // Constructors // ------------------------------------------------------------------------ + /** * Constructor * @@ -70,10 +73,7 @@ public class OpenSDPagesDialog extends Action { // ------------------------------------------------------------------------ // Operations // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see org.eclipse.jface.action.Action#run() - */ + @Override public void run() { if (fView == null) { diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/handlers/PrevPage.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/handlers/PrevPage.java index 3778d846f2..68fc56fdb2 100755 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/handlers/PrevPage.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/handlers/PrevPage.java @@ -1,5 +1,5 @@ /********************************************************************** - * Copyright (c) 2005, 2012 IBM Corporation, Ericsson + * Copyright (c) 2005, 2013 IBM Corporation, 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 @@ -66,10 +66,7 @@ public class PrevPage extends Action { // ------------------------------------------------------------------------ // Methods // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see org.eclipse.jface.action.Action#run() - */ + @Override public void run() { if ((fView == null) || (fView.getSDWidget()) == null) { diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/handlers/Print.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/handlers/Print.java index 5c006513aa..2b504b0080 100755 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/handlers/Print.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/handlers/Print.java @@ -1,5 +1,5 @@ /********************************************************************** - * Copyright (c) 2005, 2012 IBM Corporation, Ericsson + * Copyright (c) 2005, 2013 IBM Corporation, 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 @@ -26,6 +26,7 @@ public class Print extends Action { // ------------------------------------------------------------------------ // Constants // ------------------------------------------------------------------------ + /** * The action ID. */ @@ -34,6 +35,7 @@ public class Print extends Action { // ------------------------------------------------------------------------ // Attributes // ------------------------------------------------------------------------ + /** * The sequence diagram view reference */ @@ -42,6 +44,7 @@ public class Print extends Action { // ------------------------------------------------------------------------ // Constructors // ------------------------------------------------------------------------ + /** * Constructor * @@ -56,10 +59,7 @@ public class Print extends Action { // ------------------------------------------------------------------------ // Methods // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see org.eclipse.jface.action.Action#run() - */ + @Override public void run() { if ((fView == null) || fView.getSDWidget() == null){ diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/handlers/ShowNodeEnd.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/handlers/ShowNodeEnd.java index e7a6a64a74..614e885812 100755 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/handlers/ShowNodeEnd.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/handlers/ShowNodeEnd.java @@ -1,5 +1,5 @@ /********************************************************************** - * Copyright (c) 2005, 2012 IBM Corporation, Ericsson + * Copyright (c) 2005, 2013 IBM Corporation, 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 @@ -67,10 +67,7 @@ public class ShowNodeEnd extends Action { // ------------------------------------------------------------------------ // Operations // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see org.eclipse.jface.action.Action#run() - */ + @Override @SuppressWarnings("rawtypes") public void run() { diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/handlers/ShowNodeStart.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/handlers/ShowNodeStart.java index 68fd0f3b65..93ffafcd53 100755 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/handlers/ShowNodeStart.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/handlers/ShowNodeStart.java @@ -1,5 +1,5 @@ /********************************************************************** - * Copyright (c) 2005, 2012 IBM Corporation, Ericsson + * Copyright (c) 2005, 2013 IBM Corporation, 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 @@ -36,6 +36,7 @@ public class ShowNodeStart extends Action { // ------------------------------------------------------------------------ // Attributes // ------------------------------------------------------------------------ + /** * The sequence diagram view reference */ @@ -44,6 +45,7 @@ public class ShowNodeStart extends Action { // ------------------------------------------------------------------------ // Constructors // ------------------------------------------------------------------------ + /** * Default constructor */ @@ -54,12 +56,13 @@ public class ShowNodeStart extends Action { /** * Constructor * - * @param view The sequence diagram view reference + * @param view + * The sequence diagram view reference */ public ShowNodeStart(IViewPart view) { super(); if (view instanceof SDView) { - fView = (SDView)view; + fView = (SDView) view; } setImageDescriptor(Activator.getDefault().getImageDescripterFromPath(ITmfImageConstants.IMG_UI_NODE_START)); } @@ -67,11 +70,8 @@ public class ShowNodeStart extends Action { // ------------------------------------------------------------------------ // Methods // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see org.eclipse.jface.action.Action#run() - */ - @Override + + @Override @SuppressWarnings("rawtypes") public void run() { if (fView == null) { @@ -101,12 +101,13 @@ public class ShowNodeStart extends Action { } } - /** - * Sets the active SD view. - * - * @param view The SD view. - */ - public void setView(SDView view) { - fView = view; - } + /** + * Sets the active SD view. + * + * @param view + * The SD view. + */ + public void setView(SDView view) { + fView = view; + } } diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/handlers/Zoom.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/handlers/Zoom.java index 23660aecff..d1a9b1d25f 100755 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/handlers/Zoom.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/handlers/Zoom.java @@ -1,5 +1,5 @@ /********************************************************************** - * Copyright (c) 2005, 2012 IBM Corporation, Ericsson + * Copyright (c) 2005, 2013 IBM Corporation, 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 @@ -156,10 +156,7 @@ public class Zoom extends Action { // ------------------------------------------------------------------------ // Methods // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see org.eclipse.jface.action.Action#run() - */ + @Override public void run() { diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/loader/TmfAsyncMessage.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/loader/TmfAsyncMessage.java index 0e22b277b2..d358b38f65 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/loader/TmfAsyncMessage.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/loader/TmfAsyncMessage.java @@ -1,5 +1,5 @@ /********************************************************************** - * Copyright (c) 2011, 2012 Ericsson + * Copyright (c) 2011, 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 @@ -28,6 +28,7 @@ public class TmfAsyncMessage extends AsyncMessage implements ITmfAsyncSequenceDi // ------------------------------------------------------------------------ // Attributes // ------------------------------------------------------------------------ + /** * A asynchronous sequence diagram event implementation */ @@ -36,6 +37,7 @@ public class TmfAsyncMessage extends AsyncMessage implements ITmfAsyncSequenceDi // ------------------------------------------------------------------------ // Constructors // ------------------------------------------------------------------------ + /** * Standard constructor * @@ -54,19 +56,11 @@ public class TmfAsyncMessage extends AsyncMessage implements ITmfAsyncSequenceDi // Methods // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.ust.examples.event.ISequenceDiagramEvent#getSender() - */ @Override public String getSender() { return fSdEvent.getSender(); } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.ust.examples.event.ISequenceDiagramEvent#getReceiver() - */ @Override public String getReceiver() { return fSdEvent.getReceiver(); diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/loader/TmfSyncMessage.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/loader/TmfSyncMessage.java index be2a972896..bc07d3b41a 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/loader/TmfSyncMessage.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/loader/TmfSyncMessage.java @@ -1,5 +1,5 @@ /********************************************************************** - * Copyright (c) 2011, 2012 Ericsson + * Copyright (c) 2011, 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 @@ -29,6 +29,7 @@ public class TmfSyncMessage extends SyncMessage implements ITmfSyncSequenceDiagr // ------------------------------------------------------------------------ // Attributes // ------------------------------------------------------------------------ + /** * A synchronous sequence diagram event implementation */ @@ -37,6 +38,7 @@ public class TmfSyncMessage extends SyncMessage implements ITmfSyncSequenceDiagr // ------------------------------------------------------------------------ // Constructors // ------------------------------------------------------------------------ + /** * Standard constructor * @@ -53,21 +55,14 @@ public class TmfSyncMessage extends SyncMessage implements ITmfSyncSequenceDiagr // ------------------------------------------------------------------------ // Methods // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.ust.examples.event.ISequenceDiagramEvent#getSender() - */ + @Override public String getSender() { return fSdEvent.getSender(); } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.ust.examples.event.ISequenceDiagramEvent#getReceiver() - */ @Override public String getReceiver() { return fSdEvent.getReceiver(); } -} \ No newline at end of file +} diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/loader/TmfUml2SDSyncLoader.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/loader/TmfUml2SDSyncLoader.java index 9f4029b98e..61adb82108 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/loader/TmfUml2SDSyncLoader.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/loader/TmfUml2SDSyncLoader.java @@ -299,10 +299,6 @@ public class TmfUml2SDSyncLoader extends TmfComponent implements IUml2SDLoader, private int fNbSeqEvents = 0; private final List fSdEvents = new ArrayList(MAX_NUM_OF_MSG); - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.core.request.TmfDataRequest#handleData(org.eclipse.linuxtools.tmf.core.event.ITmfEvent) - */ @Override public void handleData(ITmfEvent event) { super.handleData(event); @@ -345,10 +341,6 @@ public class TmfUml2SDSyncLoader extends TmfComponent implements IUml2SDLoader, } } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.core.request.TmfDataRequest#handleSuccess() - */ @Override public void handleSuccess() { if ((fFirstTime != null) && (fLastTime != null)) { @@ -371,10 +363,6 @@ public class TmfUml2SDSyncLoader extends TmfComponent implements IUml2SDLoader, super.handleSuccess(); } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.core.request.TmfDataRequest#handleCompleted() - */ @Override public void handleCompleted() { if (fEvents.isEmpty()) { @@ -477,10 +465,6 @@ public class TmfUml2SDSyncLoader extends TmfComponent implements IUml2SDLoader, } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.load.IUml2SDLoader#setViewer(org.eclipse.linuxtools.tmf.ui.views.uml2sd.SDView) - */ @Override public void setViewer(SDView viewer) { @@ -506,19 +490,11 @@ public class TmfUml2SDSyncLoader extends TmfComponent implements IUml2SDLoader, } } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.load.IUml2SDLoader#getTitleString() - */ @Override public String getTitleString() { return getName(); } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.component.TmfComponent#dispose() - */ @Override public void dispose() { super.dispose(); @@ -547,10 +523,6 @@ public class TmfUml2SDSyncLoader extends TmfComponent implements IUml2SDLoader, } } - /* - * (non-Javadoc) - * @see org.eclipse.hyades.uml2sd.ui.actions.provider.ISDGraphNodeSupporter#isNodeSupported(int) - */ @Override public boolean isNodeSupported(int nodeType) { switch (nodeType) { @@ -564,10 +536,6 @@ public class TmfUml2SDSyncLoader extends TmfComponent implements IUml2SDLoader, return false; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.handlers.provider.ISDGraphNodeSupporter#getNodeName(int, java.lang.String) - */ @Override public String getNodeName(int nodeType, String loaderClassName) { switch (nodeType) { @@ -581,10 +549,6 @@ public class TmfUml2SDSyncLoader extends TmfComponent implements IUml2SDLoader, return ""; //$NON-NLS-1$ } - /* - * (non-Javadoc) - * @see org.eclipse.ui.ISelectionListener#selectionChanged(org.eclipse.ui.IWorkbenchPart, org.eclipse.jface.viewers.ISelection) - */ @Override public void selectionChanged(IWorkbenchPart part, ISelection selection) { ISelection sel = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getSelectionService().getSelection(); @@ -597,11 +561,6 @@ public class TmfUml2SDSyncLoader extends TmfComponent implements IUml2SDLoader, } } - /* - * (non-Javadoc) - * @see - * org.eclipse.hyades.uml2sd.ui.actions.provider.ISDFindProvider#find(org.eclipse.hyades.uml2sd.ui.actions.widgets.Criteria) - */ @Override public boolean find(Criteria toSearch) { fLock.lock(); @@ -658,19 +617,11 @@ public class TmfUml2SDSyncLoader extends TmfComponent implements IUml2SDLoader, } } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.handlers.provider.ISDFindProvider#cancel() - */ @Override public void cancel() { cancelOngoingRequests(); } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.handlers.provider.ISDFilterProvider#filter(java.util.List) - */ @SuppressWarnings("unchecked") @Override public boolean filter(List filters) { @@ -693,10 +644,6 @@ public class TmfUml2SDSyncLoader extends TmfComponent implements IUml2SDLoader, return true; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.handlers.provider.ISDPagingProvider#hasNextPage() - */ @Override public boolean hasNextPage() { fLock.lock(); @@ -711,10 +658,6 @@ public class TmfUml2SDSyncLoader extends TmfComponent implements IUml2SDLoader, return false; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.handlers.provider.ISDPagingProvider#hasPrevPage() - */ @Override public boolean hasPrevPage() { fLock.lock(); @@ -725,10 +668,6 @@ public class TmfUml2SDSyncLoader extends TmfComponent implements IUml2SDLoader, } } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.handlers.provider.ISDPagingProvider#nextPage() - */ @Override public void nextPage() { fLock.lock(); @@ -747,10 +686,6 @@ public class TmfUml2SDSyncLoader extends TmfComponent implements IUml2SDLoader, } } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.handlers.provider.ISDPagingProvider#prevPage() - */ @Override public void prevPage() { fLock.lock(); @@ -769,10 +704,6 @@ public class TmfUml2SDSyncLoader extends TmfComponent implements IUml2SDLoader, } } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.handlers.provider.ISDPagingProvider#firstPage() - */ @Override public void firstPage() { fLock.lock(); @@ -787,10 +718,6 @@ public class TmfUml2SDSyncLoader extends TmfComponent implements IUml2SDLoader, } } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.handlers.provider.ISDPagingProvider#lastPage() - */ @Override public void lastPage() { fLock.lock(); @@ -804,10 +731,6 @@ public class TmfUml2SDSyncLoader extends TmfComponent implements IUml2SDLoader, } } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.handlers.provider.ISDAdvancedPagingProvider#currentPage() - */ @Override public int currentPage() { fLock.lock(); @@ -818,10 +741,6 @@ public class TmfUml2SDSyncLoader extends TmfComponent implements IUml2SDLoader, } } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.handlers.provider.ISDAdvancedPagingProvider#pagesCount() - */ @Override public int pagesCount() { fLock.lock(); @@ -832,10 +751,6 @@ public class TmfUml2SDSyncLoader extends TmfComponent implements IUml2SDLoader, } } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.handlers.provider.ISDAdvancedPagingProvider#pageNumberChanged(int) - */ @Override public void pageNumberChanged(int pagenNumber) { int localPageNumber = pagenNumber; @@ -858,10 +773,6 @@ public class TmfUml2SDSyncLoader extends TmfComponent implements IUml2SDLoader, } } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.component.TmfComponent#broadcast(org.eclipse.linuxtools.tmf.signal.TmfSignal) - */ @Override public void broadcast(TmfSignal signal) { fIsSignalSent = true; @@ -1311,10 +1222,6 @@ public class TmfUml2SDSyncLoader extends TmfComponent implements IUml2SDLoader, fSearchRequest = new SearchEventRequest(window, TmfDataRequest.ALL_DATA, 1, ITmfDataRequest.ExecutionType.FOREGROUND, findCriteria); } - /* - * (non-Javadoc) - * @see org.eclipse.core.runtime.jobs.Job#run(org.eclipse.core.runtime.IProgressMonitor) - */ @Override protected IStatus run(IProgressMonitor monitor) { fSearchRequest.setMonitor(monitor); @@ -1367,10 +1274,6 @@ public class TmfUml2SDSyncLoader extends TmfComponent implements IUml2SDLoader, return status; } - /* - * (non-Javadoc) - * @see org.eclipse.core.runtime.jobs.Job#canceling() - */ @Override protected void canceling() { fSearchRequest.cancel(); @@ -1432,10 +1335,6 @@ public class TmfUml2SDSyncLoader extends TmfComponent implements IUml2SDLoader, fMonitor = monitor; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.request.TmfDataRequest#handleData(org.eclipse.linuxtools.tmf.event.TmfData) - */ @Override public void handleData(ITmfEvent event) { super.handleData(event); diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/preferences/SDViewPref.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/preferences/SDViewPref.java index 18c48b8c38..3fc4e272f0 100755 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/preferences/SDViewPref.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/preferences/SDViewPref.java @@ -1,5 +1,5 @@ /********************************************************************** - * Copyright (c) 2005, 2012 IBM Corporation, Ericsson + * Copyright (c) 2005, 2013 IBM Corporation, 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 @@ -238,10 +238,6 @@ public class SDViewPref implements ISDPreferences, IPropertyChangeListener { return fHandle; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.drawings.ISDPreferences#getForeGroundColor(java.lang.String) - */ @Override public IColor getForeGroundColor(String prefName) { if ((fForeColorPref.get(prefName + FORE_COLOR_POSTFIX) != null) && (fForeColorPref.get(prefName + FORE_COLOR_POSTFIX) instanceof ColorImpl)) { @@ -250,10 +246,6 @@ public class SDViewPref implements ISDPreferences, IPropertyChangeListener { return ColorImpl.getSystemColor(SWT.COLOR_BLACK); } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.drawings.ISDPreferences#getBackGroundColor(java.lang.String) - */ @Override public IColor getBackGroundColor(String prefName) { if ((fBackColorPref.get(prefName + BACK_COLOR_POSTFIX) != null) && (fBackColorPref.get(prefName + BACK_COLOR_POSTFIX) instanceof ColorImpl)) { @@ -262,10 +254,6 @@ public class SDViewPref implements ISDPreferences, IPropertyChangeListener { return ColorImpl.getSystemColor(SWT.COLOR_WHITE); } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.drawings.ISDPreferences#getFontColor(java.lang.String) - */ @Override public IColor getFontColor(String prefName) { if ((fTextColorPref.get(prefName + TEXT_COLOR_POSTFIX) != null) && (fTextColorPref.get(prefName + TEXT_COLOR_POSTFIX) instanceof ColorImpl)) { @@ -274,10 +262,6 @@ public class SDViewPref implements ISDPreferences, IPropertyChangeListener { return ColorImpl.getSystemColor(SWT.COLOR_BLACK); } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.drawings.ISDPreferences#getForeGroundColorSelection() - */ @Override public IColor getForeGroundColorSelection() { if (fNoFocusSelection) { @@ -286,10 +270,6 @@ public class SDViewPref implements ISDPreferences, IPropertyChangeListener { return ColorImpl.getSystemColor(SWT.COLOR_LIST_SELECTION_TEXT); } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.drawings.ISDPreferences#getBackGroundColorSelection() - */ @Override public IColor getBackGroundColorSelection() { if (fNoFocusSelection) { @@ -298,10 +278,6 @@ public class SDViewPref implements ISDPreferences, IPropertyChangeListener { return ColorImpl.getSystemColor(SWT.COLOR_LIST_SELECTION); } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.drawings.ISDPreferences#getFont(java.lang.String) - */ @Override public IFont getFont(String prefName) { if (fFontPref.get(prefName) != null) { @@ -347,19 +323,11 @@ public class SDViewPref implements ISDPreferences, IPropertyChangeListener { return fPrefStore.getBoolean(PREF_EXCLUDE_EXTERNAL_TIME); } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.drawings.ISDPreferences#useGradienColor() - */ @Override public boolean useGradienColor() { return fPrefStore.getBoolean(PREF_USE_GRADIENT); } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.views.uml2sd.drawings.ISDPreferences#getTimeCompressionSelectionColor() - */ @Override public IColor getTimeCompressionSelectionColor() { return fTimeCompressionSelectionColor; @@ -431,10 +399,6 @@ public class SDViewPref implements ISDPreferences, IPropertyChangeListener { fPrefStore.removePropertyChangeListener(listener); } - /* - * (non-Javadoc) - * @see org.eclipse.jface.util.IPropertyChangeListener#propertyChange(org.eclipse.jface.util.PropertyChangeEvent) - */ @Override public void propertyChange(PropertyChangeEvent event) { if (!event.getProperty().equals("PREFOK")) { //$NON-NLS-1$ diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/preferences/SDViewerPage.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/preferences/SDViewerPage.java index 21c11c91df..6e5e8f835f 100755 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/preferences/SDViewerPage.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/preferences/SDViewerPage.java @@ -106,10 +106,6 @@ public class SDViewerPage extends PreferencePage implements IWorkbenchPreference // Methods // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see org.eclipse.jface.preference.PreferencePage#createContents(org.eclipse.swt.widgets.Composite) - */ @Override protected Control createContents(Composite parent) { parent.setLayout(new GridLayout()); @@ -201,19 +197,11 @@ public class SDViewerPage extends PreferencePage implements IWorkbenchPreference return page; } - /* - * (non-Javadoc) - * @see org.eclipse.ui.IWorkbenchPreferencePage#init(org.eclipse.ui.IWorkbench) - */ @Override public void init(IWorkbench workbench) { fPreferences = SDViewPref.getInstance(); } - /* - * (non-Javadoc) - * @see org.eclipse.jface.preference.PreferencePage#performApply() - */ @Override protected void performApply() { // Store the prefrences in the PreferenceStore @@ -236,20 +224,12 @@ public class SDViewerPage extends PreferencePage implements IWorkbenchPreference swapPref(true); } - /* - * (non-Javadoc) - * @see org.eclipse.jface.preference.PreferencePage#performOk() - */ @Override public boolean performOk() { performApply(); return true; } - /* - * (non-Javadoc) - * @see org.eclipse.jface.preference.PreferencePage#performDefaults() - */ @Override protected void performDefaults() { fLink.loadDefault(); @@ -320,10 +300,6 @@ public class SDViewerPage extends PreferencePage implements IWorkbenchPreference fTextColor.load(); } - /* - * (non-Javadoc) - * @see org.eclipse.swt.events.SelectionListener#widgetSelected(org.eclipse.swt.events.SelectionEvent) - */ @Override public void widgetSelected(SelectionEvent e) { // Store the past set font preference or else the @@ -446,10 +422,6 @@ public class SDViewerPage extends PreferencePage implements IWorkbenchPreference } } - /* - * (non-Javadoc) - * @see org.eclipse.swt.events.SelectionListener#widgetDefaultSelected(org.eclipse.swt.events.SelectionEvent) - */ @Override public void widgetDefaultSelected(SelectionEvent e) { } diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/util/SortAsyncForBackward.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/util/SortAsyncForBackward.java index 7f162da3b4..bbbd5df758 100755 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/util/SortAsyncForBackward.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/util/SortAsyncForBackward.java @@ -1,5 +1,5 @@ /********************************************************************** - * Copyright (c) 2005, 2012 IBM Corporation, Ericsson + * Copyright (c) 2005, 2013 IBM Corporation, 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 @@ -44,10 +44,6 @@ public class SortAsyncForBackward implements Comparator, Serializable // Methods // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see java.util.Comparator#compare(java.lang.Object, java.lang.Object) - */ @Override public int compare(GraphNode arg0, GraphNode arg1) { if (arg0 instanceof AsyncMessage && arg1 instanceof AsyncMessage) { diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/util/SortAsyncMessageComparator.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/util/SortAsyncMessageComparator.java index 0afe51d9a3..ab04760b69 100755 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/util/SortAsyncMessageComparator.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/util/SortAsyncMessageComparator.java @@ -1,5 +1,5 @@ /********************************************************************** - * Copyright (c) 2005, 2012 IBM Corporation, Ericsson + * Copyright (c) 2005, 2013 IBM Corporation, 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 @@ -41,10 +41,7 @@ public class SortAsyncMessageComparator implements Comparator, Serial // ------------------------------------------------------------------------ // Methods // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see java.util.Comparator#compare(java.lang.Object, java.lang.Object) - */ + @Override public int compare(GraphNode arg0, GraphNode arg1) { if (arg0 instanceof AsyncMessage && arg1 instanceof AsyncMessage) { diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/util/SortSyncMessageComparator.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/util/SortSyncMessageComparator.java index 3605722d0c..24d5106f20 100755 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/util/SortSyncMessageComparator.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/util/SortSyncMessageComparator.java @@ -1,5 +1,5 @@ /********************************************************************** - * Copyright (c) 2005, 2012 IBM Corporation, Ericsson + * Copyright (c) 2005, 2013 IBM Corporation, 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 @@ -33,6 +33,7 @@ public class SortSyncMessageComparator implements Comparator, Seriali // ------------------------------------------------------------------------ // Constants // ------------------------------------------------------------------------ + /** * Serial version UID */ @@ -41,10 +42,7 @@ public class SortSyncMessageComparator implements Comparator, Seriali // ------------------------------------------------------------------------ // Methods // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see java.util.Comparator#compare(java.lang.Object, java.lang.Object) - */ + @Override public int compare(GraphNode arg0, GraphNode arg1) { if (arg0 instanceof SyncMessage && arg1 instanceof SyncMessage) { diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/util/TimeEventComparator.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/util/TimeEventComparator.java index a9bedf46ce..f06aa783bb 100755 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/util/TimeEventComparator.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/util/TimeEventComparator.java @@ -1,5 +1,5 @@ /********************************************************************** - * Copyright (c) 2005, 2012 IBM Corporation, Ericsson + * Copyright (c) 2005, 2013 IBM Corporation, 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 @@ -38,10 +38,6 @@ public class TimeEventComparator implements Comparator, Serializabl // Methods // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see java.util.Comparator#compare(java.lang.Object, java.lang.Object) - */ @Override public int compare(SDTimeEvent arg0, SDTimeEvent arg1) { SDTimeEvent t1 = arg0; diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/widgets/tabsview/TmfViewerFolder.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/widgets/tabsview/TmfViewerFolder.java index 2b6e2b8fe5..20048067d0 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/widgets/tabsview/TmfViewerFolder.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/widgets/tabsview/TmfViewerFolder.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 @@ -71,11 +71,6 @@ public class TmfViewerFolder extends Composite { initFolder(); } - /* - * (non-Javadoc) - * - * @see org.eclipse.swt.widgets.Widget#dispose() - */ @Override public void dispose() { super.dispose(); diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/widgets/timegraph/TimeGraphCombo.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/widgets/timegraph/TimeGraphCombo.java index cb753cc067..e142ad48a4 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/widgets/timegraph/TimeGraphCombo.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/widgets/timegraph/TimeGraphCombo.java @@ -694,9 +694,6 @@ public class TimeGraphCombo extends Composite { // Control // ------------------------------------------------------------------------ - /* (non-Javadoc) - * @see org.eclipse.swt.widgets.Control#redraw() - */ @Override public void redraw() { fTimeGraphViewer.getControl().redraw(); diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/widgets/timegraph/TimeGraphPresentationProvider.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/widgets/timegraph/TimeGraphPresentationProvider.java index 3d938aef80..a33d6c1e58 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/widgets/timegraph/TimeGraphPresentationProvider.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/widgets/timegraph/TimeGraphPresentationProvider.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2012 Ericsson + * Copyright (c) 2009, 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 @@ -40,10 +40,6 @@ public class TimeGraphPresentationProvider implements ITimeGraphPresentationProv // Operations // ------------------------------------------------------------------------ - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.widgets.timegraph.ITimeGraphPresentationProvider#getStateTypeName() - */ @Override public String getStateTypeName() { return Messages.TmfTimeLegend_TRACE_STATES; @@ -57,90 +53,52 @@ public class TimeGraphPresentationProvider implements ITimeGraphPresentationProv public String getStateTypeName(ITimeGraphEntry entry) { return null; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.widgets.timegraph.ITimeGraphPresentationProvider#getStateTable() - */ + @Override public StateItem[] getStateTable() { return null; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.widgets.timegraph.ITimeGraphPresentationProvider#getEventTableIndex(org.eclipse.linuxtools.tmf.ui.widgets.timegraph.model.ITimeEvent) - */ @Override public int getStateTableIndex(ITimeEvent event) { return 0; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.widgets.timegraph.ITimeGraphPresentationProvider#postDrawControl(org.eclipse.swt.graphics.Rectangle, org.eclipse.swt.graphics.GC) - */ @Override public void postDrawControl(Rectangle bounds, GC gc) { // Override to add own drawing code } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.widgets.timegraph.ITimeGraphPresentationProvider#postDrawEntry(org.eclipse.linuxtools.tmf.ui.widgets.timegraph.model.ITimeGraphEntry, org.eclipse.swt.graphics.Rectangle, org.eclipse.swt.graphics.GC) - */ @Override public void postDrawEntry(ITimeGraphEntry entry, Rectangle bounds, GC gc) { // Override to add own drawing code } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.widgets.timegraph.ITimeGraphPresentationProvider#postDrawEvent(org.eclipse.linuxtools.tmf.ui.widgets.timegraph.model.ITimeEvent, org.eclipse.swt.graphics.Rectangle, org.eclipse.swt.graphics.GC) - */ @Override public void postDrawEvent(ITimeEvent event, Rectangle bounds, GC gc) { // Override to add own drawing code } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.widgets.timegraph.ITimeGraphPresentationProvider#getItemHeight(org.eclipse.linuxtools.tmf.ui.widgets.timegraph.model.ITimeGraphEntry) - */ @Override public int getItemHeight(ITimeGraphEntry entry) { return DEFAULT_ITEM_HEIGHT; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.widgets.timegraph.ITimeGraphPresentationProvider#getItemImage(org.eclipse.linuxtools.tmf.ui.widgets.timegraph.model.ITimeGraphEntry) - */ @Override public Image getItemImage(ITimeGraphEntry entry) { return null; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.widgets.timegraph.ITimeGraphPresentationProvider#getEventName(org.eclipse.linuxtools.tmf.ui.widgets.timegraph.model.ITimeEvent) - */ @Override public String getEventName(ITimeEvent event) { return null; } - /* - * (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.widgets.timegraph.ITimeGraphPresentationProvider#getEventHoverToolTipInfo(org.eclipse.linuxtools.tmf.ui.widgets.timegraph.model.ITimeEvent) - */ @Override public Map getEventHoverToolTipInfo(ITimeEvent event) { return null; } - /* (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.widgets.timegraph.ITimeGraphPresentationProvider#getEventHoverToolTipInfo(org.eclipse.linuxtools.tmf.ui.widgets.timegraph.model.ITimeEvent, long) - */ /** * @since 2.0 */ diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/widgets/timegraph/TimeGraphViewer.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/widgets/timegraph/TimeGraphViewer.java index 5f3c26bd06..06634b4a4e 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/widgets/timegraph/TimeGraphViewer.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/widgets/timegraph/TimeGraphViewer.java @@ -541,35 +541,17 @@ public class TimeGraphViewer implements ITimeDataProvider, SelectionListener { return _time0_; } - /* - * (non-Javadoc) - * - * @see - * org.eclipse.linuxtools.tmf.ui.viewers.timeAnalysis.widgets.ITimeDataProvider - * #setStartFinishTimeNotify(long, long) - */ @Override public void setStartFinishTimeNotify(long time0, long time1) { setStartFinishTime(time0, time1); notifyRangeListeners(time0, time1); } - - /* (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.ui.viewers.timeAnalysis.widgets.ITimeDataProvider#notifyStartFinishTime() - */ @Override public void notifyStartFinishTime() { notifyRangeListeners(_time0, _time1); } - /* - * (non-Javadoc) - * - * @see - * org.eclipse.linuxtools.tmf.ui.viewers.timeAnalysis.widgets.ITimeDataProvider - * #setStartFinishTime(long, long) - */ @Override public void setStartFinishTime(long time0, long time1) { _time0 = time0; diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/widgets/timegraph/dialogs/TimeGraphLegend.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/widgets/timegraph/dialogs/TimeGraphLegend.java index 943f4bbd48..5e2b084e85 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/widgets/timegraph/dialogs/TimeGraphLegend.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/widgets/timegraph/dialogs/TimeGraphLegend.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2012 Ericsson. + * Copyright (c) 2009, 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 -- 2.34.1