From d4011df2907c2ea65f73a50fa97079c16540bddf Mon Sep 17 00:00:00 2001 From: Francois Chouinard Date: Wed, 27 Oct 2010 15:52:57 +0000 Subject: [PATCH] 2010-10-26 Francois Chouinard Contribution for Bug309042 * Graduated the plug-ins to Java 6 (at last...) * Fixed a lot of @Override warnings * Fixed a unit test --- .../.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 8 --- .../META-INF/MANIFEST.MF | 8 +-- .../build.properties | 3 +- org.eclipse.linuxtools.lttng.jni/.classpath | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../linuxtools/lttng/jni/JniEvent.java | 3 +- .../linuxtools/lttng/jni/common/JniTime.java | 3 +- org.eclipse.linuxtools.lttng.tests/.classpath | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../lttng/model/LTTngTreeNodeTest.java | 4 +- .../resource/LTTngStateResourceTest.java | 6 ++ .../after/StateAfterUpdateHandlers.java | 26 +++++++ .../before/StateBeforeUpdateHandlers.java | 26 +++++++ .../.classpath | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../lttng/stubs/LTTngEventParserStub.java | 1 + .../lttng/stubs/LTTngTraceStub.java | 1 + org.eclipse.linuxtools.lttng.ui/.classpath | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../ui/model/trange/TimeRangeComponent.java | 7 ++ .../ui/model/trange/TimeRangeComposite.java | 3 + .../lttng/ui/model/trange/TimeRangeEvent.java | 3 + .../model/trange/TimeRangeEventProcess.java | 1 + .../model/trange/TimeRangeEventResource.java | 1 + .../lttng/ui/views/PerspectiveFactory.java | 1 + .../ui/views/common/AbsTimeUpdateView.java | 4 ++ .../ui/views/controlflow/ControlFlowView.java | 17 +++-- .../evProcessor/FlowAfterUpdateHandlers.java | 6 ++ .../evProcessor/FlowBeforeUpdateHandlers.java | 5 ++ .../evProcessor/FlowFinishUpdateHandler.java | 1 + .../model/FlowProcessContainer.java | 10 ++- .../ui/views/histogram/HistogramCanvas.java | 2 + .../HistogramCanvasControlListener.java | 2 + .../HistogramCanvasFocusListener.java | 2 + .../histogram/HistogramCanvasKeyListener.java | 2 + .../HistogramCanvasMouseListener.java | 5 ++ .../HistogramCanvasPaintListener.java | 1 + .../ui/views/histogram/HistogramView.java | 2 + .../histogram/ParentHistogramCanvas.java | 1 + .../ui/views/histogram/TimeTextGroup.java | 7 ++ .../ui/views/project/LTTngProjectNature.java | 4 ++ .../lttng/ui/views/project/ProjectView.java | 6 +- .../views/project/dialogs/AddTraceWizard.java | 1 + .../project/dialogs/AddTraceWizardPage.java | 1 + .../dialogs/DialogTraceContentProvider.java | 3 + .../dialogs/DialogTraceLabelProvider.java | 2 + .../project/dialogs/ImportTraceWizard.java | 1 + .../project/dialogs/NewExperimentDialog.java | 5 ++ .../project/handlers/CloseProjectHandler.java | 6 ++ .../handlers/DeleteExperimentHandler.java | 6 ++ .../handlers/DeleteProjectHandler.java | 6 ++ .../project/handlers/DeleteTraceHandler.java | 6 ++ .../project/handlers/ImportTraceHandler.java | 6 ++ .../handlers/NewExperimentHandler.java | 6 ++ .../project/handlers/NewProjectHandler.java | 6 ++ .../handlers/OpenExperimentHandler.java | 6 ++ .../project/handlers/OpenProjectHandler.java | 6 ++ .../project/handlers/OpenTraceHandler.java | 6 ++ .../project/handlers/RefreshHandler.java | 6 ++ .../handlers/RenameExperimentHandler.java | 6 ++ .../handlers/RenameProjectHandler.java | 6 ++ .../project/handlers/RenameTraceHandler.java | 6 ++ .../project/handlers/SelectTracesHandler.java | 6 ++ .../project/handlers/TraceErrorHandler.java | 6 ++ .../model/LTTngExperimentFolderNode.java | 1 + .../project/model/LTTngExperimentNode.java | 1 + .../model/LTTngProjectContentProvider.java | 6 ++ .../model/LTTngProjectLabelProvider.java | 6 ++ .../views/project/model/LTTngProjectNode.java | 1 + .../views/project/model/LTTngProjectRoot.java | 1 + .../project/model/LTTngProjectTreeNode.java | 7 ++ .../project/model/LTTngTraceFolderNode.java | 1 + .../views/project/model/LTTngTraceNode.java | 1 + .../ui/views/resources/ResourcesView.java | 2 + .../ResourcesAfterUpdateHandlers.java | 1 + .../ResourcesBeforeUpdateHandlers.java | 5 ++ .../ResourcesFinishUpdateHandler.java | 1 + .../resources/model/ResourceContainer.java | 8 ++- .../ui/views/statistics/StatisticsView.java | 11 +++ .../evProcessor/StatsModeChangeHandler.java | 1 + .../evProcessor/StatsModeEndHandler.java | 1 + .../evProcessor/StatsProcessExitHandler.java | 1 + .../evProcessor/StatsTracesetEndHandler.java | 1 + .../ui/views/timeframe/SpinnerGroup.java | 7 +- .../ui/views/timeframe/TimeFrameView.java | 6 +- org.eclipse.linuxtools.lttng/.classpath | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../linuxtools/lttng/event/LttngLocation.java | 2 + .../lttng/model/LTTngTreeNodeGeneric.java | 14 ++++ .../lttng/request/LttngSyntEventRequest.java | 10 +++ .../AbsEventToHandlerResolver.java | 9 +++ .../state/StateUpdateHandlers.java | 26 +++++++ .../experiment/StateExperimentManager.java | 6 ++ .../lttng/state/trace/StateTraceManager.java | 12 ++++ .../lttng/trace/LTTngTextTrace.java | 1 + .../linuxtools/lttng/trace/LTTngTrace.java | 3 +- org.eclipse.linuxtools.tmf.tests/.classpath | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../tmf/trace/TmfEventParserStub.java | 3 +- .../linuxtools/tmf/trace/TmfTraceStub.java | 3 +- .../.classpath | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../test/stub/model/TraceImpl.java | 6 ++ .../test/stub/views/TsfTraceAnalysisView.java | 11 +++ org.eclipse.linuxtools.tmf.ui/.classpath | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../ManageCustomParsersCommandHandler.java | 3 +- .../ui/dialogs/ManageCustomParsersDialog.java | 54 ++++++++++----- .../linuxtools/tmf/ui/editors/TmfEditor.java | 6 +- .../tmf/ui/editors/TmfEditorInput.java | 18 +++-- .../tmf/ui/editors/TmfEventsEditor.java | 6 +- .../ui/editors/TmfMultiPageEditorPart.java | 6 +- .../parsers/custom/CustomParserProvider.java | 8 ++- .../tmf/ui/parsers/custom/CustomTxtTrace.java | 1 + .../custom/CustomTxtTraceDefinition.java | 16 +++++ .../tmf/ui/parsers/custom/CustomXmlTrace.java | 15 ++-- .../custom/CustomXmlTraceDefinition.java | 48 ++++++++----- .../tmf/ui/viewers/events/TmfEventsTable.java | 18 +++-- .../timeAnalysis/TmfTimeAnalysisViewer.java | 68 ++++++++++++++++++- .../dialogs/TmfTimeFilterDialog.java | 6 ++ .../timeAnalysis/dialogs/TmfTimeLegend.java | 3 + .../viewers/timeAnalysis/model/TimeEvent.java | 3 + .../timeAnalysis/widgets/PlainSelection.java | 6 ++ .../timeAnalysis/widgets/TimeScaleCtrl.java | 4 ++ .../widgets/TmfTimeStatesCtrl.java | 22 ++++++ .../widgets/TraceColorScheme.java | 3 + .../timeAnalysis/widgets/TraceCtrl.java | 1 + .../linuxtools/tmf/ui/views/TmfView.java | 2 + .../tmf/ui/views/project/ProjectView.java | 9 ++- .../ui/views/project/TmfProjectNature.java | 4 ++ .../views/project/dialogs/AddTraceWizard.java | 1 + .../project/dialogs/AddTraceWizardPage.java | 1 + .../dialogs/DialogTraceContentProvider.java | 3 + .../dialogs/DialogTraceLabelProvider.java | 2 + .../project/dialogs/ImportTraceWizard.java | 1 + .../project/dialogs/NewExperimentDialog.java | 5 ++ .../project/handlers/CloseProjectHandler.java | 1 + .../handlers/DeleteExperimentHandler.java | 1 + .../handlers/DeleteProjectHandler.java | 1 + .../project/handlers/DeleteTraceHandler.java | 1 + .../project/handlers/ImportTraceHandler.java | 1 + .../handlers/NewExperimentHandler.java | 1 + .../project/handlers/NewProjectHandler.java | 1 + .../handlers/OpenExperimentHandler.java | 1 + .../project/handlers/OpenProjectHandler.java | 1 + .../project/handlers/OpenTraceHandler.java | 1 + .../project/handlers/RefreshHandler.java | 1 + .../handlers/RenameExperimentHandler.java | 1 + .../handlers/RenameProjectHandler.java | 1 + .../project/handlers/RenameTraceHandler.java | 1 + .../project/handlers/SelectParserHandler.java | 3 +- .../project/handlers/SelectTracesHandler.java | 1 + .../model/TmfExperimentFolderNode.java | 1 + .../project/model/TmfExperimentNode.java | 1 + .../model/TmfProjectContentProvider.java | 8 ++- .../model/TmfProjectLabelProvider.java | 6 ++ .../views/project/model/TmfProjectNode.java | 1 + .../views/project/model/TmfProjectRoot.java | 1 + .../project/model/TmfProjectTreeNode.java | 7 ++ .../project/model/TmfTraceFolderNode.java | 1 + .../ui/views/project/model/TmfTraceNode.java | 1 + .../tmf/ui/widgets/TmfVirtualTable.java | 4 ++ .../CustomTxtParserInputWizardPage.java | 17 +++++ .../CustomTxtParserOutputWizardPage.java | 1 + .../tmf/ui/wizards/CustomTxtParserWizard.java | 1 + .../CustomXmlParserInputWizardPage.java | 24 +++++++ .../CustomXmlParserOutputWizardPage.java | 3 +- .../tmf/ui/wizards/CustomXmlParserWizard.java | 3 +- org.eclipse.linuxtools.tmf/.classpath | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../tmf/component/TmfComponent.java | 3 + .../tmf/component/TmfDataProvider.java | 2 + .../tmf/experiment/TmfExperiment.java | 17 ++++- .../experiment/TmfExperimentCheckpoint.java | 1 + .../tmf/request/TmfCoalescedEventRequest.java | 1 + .../tmf/request/TmfDataRequest.java | 57 +++++++++++----- .../tmf/request/TmfEventRequest.java | 3 +- .../tmf/request/TmfRequestExecutor.java | 2 + .../linuxtools/tmf/trace/ITmfTrace.java | 1 + .../linuxtools/tmf/trace/TmfCheckpoint.java | 3 +- .../linuxtools/tmf/trace/TmfContext.java | 6 ++ .../linuxtools/tmf/trace/TmfLocation.java | 2 + .../linuxtools/tmf/trace/TmfTrace.java | 34 +++++++--- 184 files changed, 924 insertions(+), 154 deletions(-) delete mode 100644 org.eclipse.linuxtools.lttng.headless/.settings/org.eclipse.jdt.core.prefs diff --git a/org.eclipse.linuxtools.lttng.headless/.classpath b/org.eclipse.linuxtools.lttng.headless/.classpath index 64c5e31b7a..1fa3e6803d 100644 --- a/org.eclipse.linuxtools.lttng.headless/.classpath +++ b/org.eclipse.linuxtools.lttng.headless/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.linuxtools.lttng.headless/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.linuxtools.lttng.headless/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 6f7fc9aa37..0000000000 --- a/org.eclipse.linuxtools.lttng.headless/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,8 +0,0 @@ -#Mon Mar 22 12:32:38 EDT 2010 -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 -org.eclipse.jdt.core.compiler.compliance=1.5 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.5 diff --git a/org.eclipse.linuxtools.lttng.headless/META-INF/MANIFEST.MF b/org.eclipse.linuxtools.lttng.headless/META-INF/MANIFEST.MF index f94742044b..3ff4e420d6 100644 --- a/org.eclipse.linuxtools.lttng.headless/META-INF/MANIFEST.MF +++ b/org.eclipse.linuxtools.lttng.headless/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: Standalone LTTng application Bundle-SymbolicName: org.eclipse.linuxtools.lttng.headless Bundle-Version: 0.3.0.qualifier -Bundle-RequiredExecutionEnvironment: J2SE-1.5 -Require-Bundle: org.eclipse.linuxtools.lttng;bundle-version="0.2.0", - org.eclipse.linuxtools.lttng.jni;bundle-version="0.2.0", - org.eclipse.linuxtools.tmf;bundle-version="0.2.0" +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Require-Bundle: org.eclipse.linuxtools.lttng, + org.eclipse.linuxtools.lttng.jni, + org.eclipse.linuxtools.tmf diff --git a/org.eclipse.linuxtools.lttng.headless/build.properties b/org.eclipse.linuxtools.lttng.headless/build.properties index 34d2e4d2da..c6b651a594 100644 --- a/org.eclipse.linuxtools.lttng.headless/build.properties +++ b/org.eclipse.linuxtools.lttng.headless/build.properties @@ -1,4 +1,3 @@ source.. = src/ output.. = bin/ -bin.includes = META-INF/,\ - . +bin.includes = META-INF/ diff --git a/org.eclipse.linuxtools.lttng.jni/.classpath b/org.eclipse.linuxtools.lttng.jni/.classpath index 64c5e31b7a..1fa3e6803d 100644 --- a/org.eclipse.linuxtools.lttng.jni/.classpath +++ b/org.eclipse.linuxtools.lttng.jni/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.linuxtools.lttng.jni/META-INF/MANIFEST.MF b/org.eclipse.linuxtools.lttng.jni/META-INF/MANIFEST.MF index aed27f7213..d52d79e0fc 100644 --- a/org.eclipse.linuxtools.lttng.jni/META-INF/MANIFEST.MF +++ b/org.eclipse.linuxtools.lttng.jni/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.linuxtools.lttng.jni Bundle-Version: 0.3.0.qualifier -Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Export-Package: org.eclipse.linuxtools.lttng.jni, org.eclipse.linuxtools.lttng.jni.common, org.eclipse.linuxtools.lttng.jni.exception, diff --git a/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/JniEvent.java b/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/JniEvent.java index 48dee4a666..d6acbdeac6 100644 --- a/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/JniEvent.java +++ b/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/JniEvent.java @@ -413,7 +413,8 @@ public abstract class JniEvent extends Jni_C_Common implements Comparable * * @return int of value -1, 0 or 1, as the pased argument is bigger, equal or smaller than this time */ - public int compareTo(JniTime right) { + @Override + public int compareTo(JniTime right) { long leftTime = this.getTime(); long rightTime = right.getTime(); diff --git a/org.eclipse.linuxtools.lttng.tests/.classpath b/org.eclipse.linuxtools.lttng.tests/.classpath index 64c5e31b7a..1fa3e6803d 100644 --- a/org.eclipse.linuxtools.lttng.tests/.classpath +++ b/org.eclipse.linuxtools.lttng.tests/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.linuxtools.lttng.tests/META-INF/MANIFEST.MF b/org.eclipse.linuxtools.lttng.tests/META-INF/MANIFEST.MF index 149cd61473..26a7e51a40 100644 --- a/org.eclipse.linuxtools.lttng.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.linuxtools.lttng.tests/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.linuxtools.lttng.tests Bundle-Version: 0.3.0.qualifier Bundle-Vendor: %Bundle-Vendor -Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Require-Bundle: org.junit, org.eclipse.linuxtools.lttng;bundle-version="0.2.0", org.eclipse.linuxtools.tmf;bundle-version="0.2.0", diff --git a/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/model/LTTngTreeNodeTest.java b/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/model/LTTngTreeNodeTest.java index 472199f27f..68dab475f5 100644 --- a/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/model/LTTngTreeNodeTest.java +++ b/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/model/LTTngTreeNodeTest.java @@ -150,8 +150,8 @@ public class LTTngTreeNodeTest extends TestCase { int size = childrensOf20.length; assertEquals(2, size); - LTTngTreeNode child30 = childrensOf20[0]; - LTTngTreeNode child25 = childrensOf20[1]; + LTTngTreeNode child25 = childrensOf20[0]; + LTTngTreeNode child30 = childrensOf20[1]; assertNotNull(child25); assertNotNull(child30); diff --git a/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/state/resource/LTTngStateResourceTest.java b/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/state/resource/LTTngStateResourceTest.java index be0d1e8100..b8840ef9c5 100644 --- a/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/state/resource/LTTngStateResourceTest.java +++ b/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/state/resource/LTTngStateResourceTest.java @@ -96,26 +96,32 @@ public class LTTngStateResourceTest extends TestCase { private ILttngStateContext getContext() { return new ILttngStateContext() { + @Override public TmfTimeRange getTraceTimeWindow() { return null; } + @Override public ITmfTrace getTraceIdRef() { return null; } + @Override public String getTraceId() { return "Test Trace"; } + @Override public int getNumberOfCpus() { return 1; } + @Override public TmfTimeRange getExperimentTimeWindow() { return null; } + @Override public String getExperimentName() { return "Test Experiment"; } diff --git a/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/state/handlers/after/StateAfterUpdateHandlers.java b/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/state/handlers/after/StateAfterUpdateHandlers.java index d4654c0bb2..4e9ca93f40 100644 --- a/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/state/handlers/after/StateAfterUpdateHandlers.java +++ b/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/state/handlers/after/StateAfterUpdateHandlers.java @@ -34,6 +34,7 @@ class StateAfterUpdateHandlers { AbsStateUpdate handler = new AbsStateUpdate() { // @Override + @Override public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) { // TraceDebug.debug("After event called"); @@ -85,6 +86,7 @@ class StateAfterUpdateHandlers { AbsStateUpdate handler = new AbsStateUpdate() { // @Override + @Override public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) { // TraceDebug.debug("Syscall Exit After event called"); @@ -123,6 +125,7 @@ class StateAfterUpdateHandlers { AbsStateUpdate handler = new AbsStateUpdate() { // @Override + @Override public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) { // Long cpu = trcEvent.getCpuId(); // @@ -169,6 +172,7 @@ class StateAfterUpdateHandlers { AbsStateUpdate handler = new AbsStateUpdate() { // @Override + @Override public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) { // // Long cpu = trcEvent.getCpuId(); @@ -201,6 +205,7 @@ class StateAfterUpdateHandlers { AbsStateUpdate handler = new AbsStateUpdate() { // @Override + @Override public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) { // // Long cpu = trcEvent.getCpuId(); @@ -251,6 +256,7 @@ class StateAfterUpdateHandlers { AbsStateUpdate handler = new AbsStateUpdate() { // @Override + @Override public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) { // // Long cpu = trcEvent.getCpuId(); @@ -283,6 +289,7 @@ class StateAfterUpdateHandlers { AbsStateUpdate handler = new AbsStateUpdate() { // @Override + @Override public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) { // // Long cpu = trcEvent.getCpuId(); @@ -319,6 +326,7 @@ class StateAfterUpdateHandlers { AbsStateUpdate handler = new AbsStateUpdate() { // @Override + @Override public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) { // // // Long cpu = trcEvent.getCpuId(); @@ -366,6 +374,7 @@ class StateAfterUpdateHandlers { AbsStateUpdate handler = new AbsStateUpdate() { // @Override + @Override public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) { // // // obtrain cpu @@ -424,6 +433,7 @@ class StateAfterUpdateHandlers { AbsStateUpdate handler = new AbsStateUpdate() { // @Override + @Override public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) { // String action = getAFieldString(trcEvent, traceSt, // Fields.LTT_FIELD_ACTION); @@ -449,6 +459,7 @@ class StateAfterUpdateHandlers { AbsStateUpdate handler = new AbsStateUpdate() { // @Override + @Override public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) { // // // Get Fields @@ -512,6 +523,7 @@ class StateAfterUpdateHandlers { AbsStateUpdate handler = new AbsStateUpdate() { // @Override + @Override public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) { // // // Get Fields @@ -567,6 +579,7 @@ class StateAfterUpdateHandlers { AbsStateUpdate handler = new AbsStateUpdate() { // @Override + @Override public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) { // Long cpu = trcEvent.getCpuId(); // Long funcptr = getAFieldLong(trcEvent, traceSt, @@ -588,6 +601,7 @@ class StateAfterUpdateHandlers { AbsStateUpdate handler = new AbsStateUpdate() { // @Override + @Override public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) { // // Long funcptr = getAFieldLong(trcEvent, traceSt, @@ -615,6 +629,7 @@ class StateAfterUpdateHandlers { AbsStateUpdate handler = new AbsStateUpdate() { // @Override + @Override public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) { // // obtain the syscall id // Long id = getAFieldLong(trcEvent, traceSt, @@ -650,6 +665,7 @@ class StateAfterUpdateHandlers { AbsStateUpdate handler = new AbsStateUpdate() { // @Override + @Override public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) { // // Long ip = getAFieldLong(trcEvent, traceSt, @@ -680,6 +696,7 @@ class StateAfterUpdateHandlers { AbsStateUpdate handler = new AbsStateUpdate() { // @Override + @Override public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) { // // // Get id @@ -718,6 +735,7 @@ class StateAfterUpdateHandlers { AbsStateUpdate handler = new AbsStateUpdate() { // @Override + @Override public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) { // // Long cpu = trcEvent.getCpuId(); @@ -869,6 +887,7 @@ class StateAfterUpdateHandlers { AbsStateUpdate handler = new AbsStateUpdate() { // @Override + @Override public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) { // // Long cpu = trcEvent.getCpuId(); @@ -999,6 +1018,7 @@ class StateAfterUpdateHandlers { AbsStateUpdate handler = new AbsStateUpdate() { // @Override + @Override public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) { // /* // * We stamp a newly created process as kernel_thread. The @@ -1058,6 +1078,7 @@ class StateAfterUpdateHandlers { AbsStateUpdate handler = new AbsStateUpdate() { // @Override + @Override public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) { // // Long pid; @@ -1096,6 +1117,7 @@ class StateAfterUpdateHandlers { AbsStateUpdate handler = new AbsStateUpdate() { // @Override + @Override public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) { // // Long release_pid; @@ -1173,6 +1195,7 @@ class StateAfterUpdateHandlers { AbsStateUpdate handler = new AbsStateUpdate() { // @Override + @Override public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) { // // Long cpu = trcEvent.getCpuId(); @@ -1221,6 +1244,7 @@ class StateAfterUpdateHandlers { AbsStateUpdate handler = new AbsStateUpdate() { // @Override + @Override public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) { // // String name; @@ -1245,6 +1269,7 @@ class StateAfterUpdateHandlers { AbsStateUpdate handler = new AbsStateUpdate() { // @Override + @Override public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) { // // /* For all processes */ @@ -1359,6 +1384,7 @@ class StateAfterUpdateHandlers { AbsStateUpdate handler = new AbsStateUpdate() { // @Override + @Override public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) { // // Long parent_pid; diff --git a/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/state/handlers/before/StateBeforeUpdateHandlers.java b/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/state/handlers/before/StateBeforeUpdateHandlers.java index fb7b7ef300..58a842a337 100644 --- a/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/state/handlers/before/StateBeforeUpdateHandlers.java +++ b/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/state/handlers/before/StateBeforeUpdateHandlers.java @@ -34,6 +34,7 @@ class StateBeforeUpdateHandlers { AbsStateUpdate handler = new AbsStateUpdate() { // @Override + @Override public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) { // TraceDebug.debug("Before event called"); // @@ -82,6 +83,7 @@ class StateBeforeUpdateHandlers { AbsStateUpdate handler = new AbsStateUpdate() { // @Override + @Override public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) { Long cpu = trcEvent.getCpuId(); @@ -112,6 +114,7 @@ class StateBeforeUpdateHandlers { AbsStateUpdate handler = new AbsStateUpdate() { // @Override + @Override public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) { // Long cpu = trcEvent.getCpuId(); // @@ -158,6 +161,7 @@ class StateBeforeUpdateHandlers { AbsStateUpdate handler = new AbsStateUpdate() { // @Override + @Override public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) { // // Long cpu = trcEvent.getCpuId(); @@ -190,6 +194,7 @@ class StateBeforeUpdateHandlers { AbsStateUpdate handler = new AbsStateUpdate() { // @Override + @Override public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) { // // Long cpu = trcEvent.getCpuId(); @@ -240,6 +245,7 @@ class StateBeforeUpdateHandlers { AbsStateUpdate handler = new AbsStateUpdate() { // @Override + @Override public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) { // // Long cpu = trcEvent.getCpuId(); @@ -272,6 +278,7 @@ class StateBeforeUpdateHandlers { AbsStateUpdate handler = new AbsStateUpdate() { // @Override + @Override public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) { // // Long cpu = trcEvent.getCpuId(); @@ -308,6 +315,7 @@ class StateBeforeUpdateHandlers { AbsStateUpdate handler = new AbsStateUpdate() { // @Override + @Override public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) { // // // Long cpu = trcEvent.getCpuId(); @@ -355,6 +363,7 @@ class StateBeforeUpdateHandlers { AbsStateUpdate handler = new AbsStateUpdate() { // @Override + @Override public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) { // // // obtrain cpu @@ -413,6 +422,7 @@ class StateBeforeUpdateHandlers { AbsStateUpdate handler = new AbsStateUpdate() { // @Override + @Override public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) { // String action = getAFieldString(trcEvent, traceSt, // Fields.LTT_FIELD_ACTION); @@ -438,6 +448,7 @@ class StateBeforeUpdateHandlers { AbsStateUpdate handler = new AbsStateUpdate() { // @Override + @Override public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) { // // // Get Fields @@ -501,6 +512,7 @@ class StateBeforeUpdateHandlers { AbsStateUpdate handler = new AbsStateUpdate() { // @Override + @Override public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) { // // // Get Fields @@ -556,6 +568,7 @@ class StateBeforeUpdateHandlers { AbsStateUpdate handler = new AbsStateUpdate() { // @Override + @Override public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) { // Long cpu = trcEvent.getCpuId(); // Long funcptr = getAFieldLong(trcEvent, traceSt, @@ -577,6 +590,7 @@ class StateBeforeUpdateHandlers { AbsStateUpdate handler = new AbsStateUpdate() { // @Override + @Override public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) { // // Long funcptr = getAFieldLong(trcEvent, traceSt, @@ -604,6 +618,7 @@ class StateBeforeUpdateHandlers { AbsStateUpdate handler = new AbsStateUpdate() { // @Override + @Override public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) { // // obtain the syscall id // Long id = getAFieldLong(trcEvent, traceSt, @@ -639,6 +654,7 @@ class StateBeforeUpdateHandlers { AbsStateUpdate handler = new AbsStateUpdate() { // @Override + @Override public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) { // // Long ip = getAFieldLong(trcEvent, traceSt, @@ -669,6 +685,7 @@ class StateBeforeUpdateHandlers { AbsStateUpdate handler = new AbsStateUpdate() { // @Override + @Override public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) { // // // Get id @@ -707,6 +724,7 @@ class StateBeforeUpdateHandlers { AbsStateUpdate handler = new AbsStateUpdate() { // @Override + @Override public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) { // // Long cpu = trcEvent.getCpuId(); @@ -858,6 +876,7 @@ class StateBeforeUpdateHandlers { AbsStateUpdate handler = new AbsStateUpdate() { // @Override + @Override public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) { // // Long cpu = trcEvent.getCpuId(); @@ -988,6 +1007,7 @@ class StateBeforeUpdateHandlers { AbsStateUpdate handler = new AbsStateUpdate() { // @Override + @Override public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) { // /* // * We stamp a newly created process as kernel_thread. The @@ -1047,6 +1067,7 @@ class StateBeforeUpdateHandlers { AbsStateUpdate handler = new AbsStateUpdate() { // @Override + @Override public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) { // // Long pid; @@ -1085,6 +1106,7 @@ class StateBeforeUpdateHandlers { AbsStateUpdate handler = new AbsStateUpdate() { // @Override + @Override public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) { // // Long release_pid; @@ -1162,6 +1184,7 @@ class StateBeforeUpdateHandlers { AbsStateUpdate handler = new AbsStateUpdate() { // @Override + @Override public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) { // // Long cpu = trcEvent.getCpuId(); @@ -1210,6 +1233,7 @@ class StateBeforeUpdateHandlers { AbsStateUpdate handler = new AbsStateUpdate() { // @Override + @Override public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) { // // String name; @@ -1234,6 +1258,7 @@ class StateBeforeUpdateHandlers { AbsStateUpdate handler = new AbsStateUpdate() { // @Override + @Override public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) { // // /* For all processes */ @@ -1348,6 +1373,7 @@ class StateBeforeUpdateHandlers { AbsStateUpdate handler = new AbsStateUpdate() { // @Override + @Override public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) { // // Long parent_pid; diff --git a/org.eclipse.linuxtools.lttng.ui.tests/.classpath b/org.eclipse.linuxtools.lttng.ui.tests/.classpath index 978c0d27e1..2a987e2854 100644 --- a/org.eclipse.linuxtools.lttng.ui.tests/.classpath +++ b/org.eclipse.linuxtools.lttng.ui.tests/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.linuxtools.lttng.ui.tests/META-INF/MANIFEST.MF b/org.eclipse.linuxtools.lttng.ui.tests/META-INF/MANIFEST.MF index 383bc3fb82..f579d672b7 100644 --- a/org.eclipse.linuxtools.lttng.ui.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.linuxtools.lttng.ui.tests/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.linuxtools.lttng.ui.tests Bundle-Version: 0.3.0.qualifier -Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-Vendor: %Bundle-Vendor Require-Bundle: org.junit, org.eclipse.linuxtools.lttng;bundle-version="0.2.0", diff --git a/org.eclipse.linuxtools.lttng.ui.tests/stubs/org/eclipse/linuxtools/lttng/stubs/LTTngEventParserStub.java b/org.eclipse.linuxtools.lttng.ui.tests/stubs/org/eclipse/linuxtools/lttng/stubs/LTTngEventParserStub.java index 8ad81c3035..b061836fb3 100644 --- a/org.eclipse.linuxtools.lttng.ui.tests/stubs/org/eclipse/linuxtools/lttng/stubs/LTTngEventParserStub.java +++ b/org.eclipse.linuxtools.lttng.ui.tests/stubs/org/eclipse/linuxtools/lttng/stubs/LTTngEventParserStub.java @@ -26,6 +26,7 @@ import org.eclipse.linuxtools.tmf.trace.TmfContext; */ public class LTTngEventParserStub implements ITmfEventParser { + @Override public TmfEvent parseNextEvent(ITmfTrace stream, TmfContext context) throws IOException { // TODO Auto-generated method stub diff --git a/org.eclipse.linuxtools.lttng.ui.tests/stubs/org/eclipse/linuxtools/lttng/stubs/LTTngTraceStub.java b/org.eclipse.linuxtools.lttng.ui.tests/stubs/org/eclipse/linuxtools/lttng/stubs/LTTngTraceStub.java index 5f1a4a072b..8678522629 100644 --- a/org.eclipse.linuxtools.lttng.ui.tests/stubs/org/eclipse/linuxtools/lttng/stubs/LTTngTraceStub.java +++ b/org.eclipse.linuxtools.lttng.ui.tests/stubs/org/eclipse/linuxtools/lttng/stubs/LTTngTraceStub.java @@ -68,6 +68,7 @@ public class LTTngTraceStub extends TmfTrace { // indexTrace(true); } + @Override public ITmfTrace createTraceCopy() { ITmfTrace returnedValue = null; try { diff --git a/org.eclipse.linuxtools.lttng.ui/.classpath b/org.eclipse.linuxtools.lttng.ui/.classpath index 64c5e31b7a..1fa3e6803d 100644 --- a/org.eclipse.linuxtools.lttng.ui/.classpath +++ b/org.eclipse.linuxtools.lttng.ui/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.linuxtools.lttng.ui/META-INF/MANIFEST.MF b/org.eclipse.linuxtools.lttng.ui/META-INF/MANIFEST.MF index 7f3783ec0f..ea2f1b5016 100644 --- a/org.eclipse.linuxtools.lttng.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.linuxtools.lttng.ui/META-INF/MANIFEST.MF @@ -13,6 +13,6 @@ Require-Bundle: org.eclipse.ui, org.eclipse.linuxtools.tmf;bundle-version="0.2.0", org.eclipse.linuxtools.tmf.ui;bundle-version="0.2.0", org.eclipse.linuxtools.lttng;bundle-version="0.2.0" -Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-ActivationPolicy: lazy Bundle-Localization: plugin diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/model/trange/TimeRangeComponent.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/model/trange/TimeRangeComponent.java index 1bef71eff2..7187fd1fd0 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/model/trange/TimeRangeComponent.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/model/trange/TimeRangeComponent.java @@ -49,26 +49,31 @@ public abstract class TimeRangeComponent implements ITimeRangeComponent { * * @param time */ + @Override public long getStartTime() { return startTime.longValue(); } + @Override public void setStartTime(long time) { if (time > -1) { startTime = time; } } + @Override public long getStopTime() { return stopTime.longValue(); } + @Override public void setStopTime(long stopTime) { if (stopTime > -1) { this.stopTime = stopTime; } } + @Override public ITimeRangeComponent getEventParent() { return eventParent; } @@ -77,6 +82,7 @@ public abstract class TimeRangeComponent implements ITimeRangeComponent { this.eventParent = eventParent; } + @Override public abstract String getName(); @@ -87,6 +93,7 @@ public abstract class TimeRangeComponent implements ITimeRangeComponent { /* (non-Javadoc) * @see org.eclipse.linuxtools.lttng.ui.model.trange.ITimeRangeComponent#isVisible() */ + @Override public boolean isVisible() { return visible; } diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/model/trange/TimeRangeComposite.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/model/trange/TimeRangeComposite.java index 21d86de050..ef33779fe6 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/model/trange/TimeRangeComposite.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/model/trange/TimeRangeComposite.java @@ -105,6 +105,7 @@ ITmfTimeAnalysisEntry { * @seeorg.eclipse.linuxtools.tmf.ui.viewers.timeAnalysis.model. * ITmfTimeAnalysisEntry#getGroupName() */ + @Override public String getGroupName() { return groupName; } @@ -122,6 +123,7 @@ ITmfTimeAnalysisEntry { * @seeorg.eclipse.linuxtools.tmf.ui.viewers.timeAnalysis.model. * ITmfTimeAnalysisEntry#getId() */ + @Override public int getId() { return id; } @@ -153,6 +155,7 @@ ITmfTimeAnalysisEntry { * @seeorg.eclipse.linuxtools.tmf.ui.viewers.timeAnalysis.model. * ITmfTimeAnalysisEntry#getTraceEvents() */ + @Override @SuppressWarnings("unchecked") public Vector getTraceEvents() { return ChildEventLeafs; diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/model/trange/TimeRangeEvent.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/model/trange/TimeRangeEvent.java index acf57fbcbc..1b3cb355a7 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/model/trange/TimeRangeEvent.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/model/trange/TimeRangeEvent.java @@ -64,6 +64,7 @@ public class TimeRangeEvent extends TimeRangeComponent implements ITimeEvent { * org.eclipse.linuxtools.tmf.ui.viewers.timeAnalysis.model.ITimeEvent#getTime * () */ + @Override public long getTime() { // The value provided by this method is used to start drawing the // time-range, @@ -84,6 +85,7 @@ public class TimeRangeEvent extends TimeRangeComponent implements ITimeEvent { * org.eclipse.linuxtools.tmf.ui.viewers.timeAnalysis.model.ITimeEvent#getEntry * () */ + @Override public ITmfTimeAnalysisEntry getEntry() { return parent; } @@ -102,6 +104,7 @@ public class TimeRangeEvent extends TimeRangeComponent implements ITimeEvent { * @seeorg.eclipse.linuxtools.tmf.ui.viewers.timeAnalysis.model.ITimeEvent# * getDuration() */ + @Override public long getDuration() { long duration = -1; long endT = (stopTime == null) ? parent.getStopTime() : stopTime; diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/model/trange/TimeRangeEventProcess.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/model/trange/TimeRangeEventProcess.java index 82c12dc839..c217ec0e02 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/model/trange/TimeRangeEventProcess.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/model/trange/TimeRangeEventProcess.java @@ -195,6 +195,7 @@ public class TimeRangeEventProcess extends TimeRangeComposite implements * * @see java.lang.Comparable#compareTo(java.lang.Object) */ + @Override public int compareTo(TimeRangeEventProcess process) { if (process != null) { int result = 0; diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/model/trange/TimeRangeEventResource.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/model/trange/TimeRangeEventResource.java index 5be744cd4e..7d60a82c08 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/model/trange/TimeRangeEventResource.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/model/trange/TimeRangeEventResource.java @@ -153,6 +153,7 @@ public abstract class TimeRangeEventResource extends TimeRangeComposite * "bigger". */ // @Override + @Override public int compareTo(TimeRangeEventResource comparedResource) { int returnedValue = 0; diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/PerspectiveFactory.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/PerspectiveFactory.java index 081bd4d1be..91884830b4 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/PerspectiveFactory.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/PerspectiveFactory.java @@ -51,6 +51,7 @@ public class PerspectiveFactory implements IPerspectiveFactory { /* (non-Javadoc) * @see org.eclipse.ui.IPerspectiveFactory#createInitialLayout(org.eclipse.ui.IPageLayout) */ + @Override public void createInitialLayout(IPageLayout layout) { layout.setEditorAreaVisible(false); diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/common/AbsTimeUpdateView.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/common/AbsTimeUpdateView.java index 971b221422..267a4ea031 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/common/AbsTimeUpdateView.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/common/AbsTimeUpdateView.java @@ -97,6 +97,7 @@ public abstract class AbsTimeUpdateView extends TmfView implements * @seeorg.eclipse.linuxtools.lttng.state.IStateDataRequestListener# * processingStarted(org.eclipse.linuxtools.lttng.state.StateDataRequest) */ + @Override @TmfSignalHandler public synchronized void processingStarted(RequestStartedSignal signal) { LttngSyntEventRequest request = signal.getRequest(); @@ -129,6 +130,7 @@ public abstract class AbsTimeUpdateView extends TmfView implements * @seeorg.eclipse.linuxtools.lttng.state.IStateDataRequestListener# * processingCompleted(org.eclipse.linuxtools.lttng.state.StateDataRequest) */ + @Override @TmfSignalHandler public void processingCompleted(RequestCompletedSignal signal) { ILttngSyntEventRequest request = signal.getRequest(); @@ -485,6 +487,7 @@ public abstract class AbsTimeUpdateView extends TmfView implements // Perform the updates on the UI thread display.asyncExec(new Runnable() { + @Override public void run() { if ((tsfviewer != null) && (!tsfviewer.getControl().isDisposed())) { tsfviewer.waitCursor(waitInd); @@ -604,6 +607,7 @@ public abstract class AbsTimeUpdateView extends TmfView implements TraceDebug.debug("View: " + getName() + "\n\t\tRestoring the selected time to: " + selTime); Display display = tsfviewer.getControl().getDisplay(); display.asyncExec(new Runnable() { + @Override public void run() { if ((tsfviewer != null) && (!tsfviewer.getControl().isDisposed())) { tsfviewer.setSelectedTime(selTime, false, this); diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/controlflow/ControlFlowView.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/controlflow/ControlFlowView.java index 30ee295b17..29504b0292 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/controlflow/ControlFlowView.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/controlflow/ControlFlowView.java @@ -162,6 +162,7 @@ public class ControlFlowView extends AbsTimeUpdateView implements cviewer = v; } + @Override public void inputChanged(Viewer v, Object oldInput, Object newInput) { this.elements = (ITmfTimeAnalysisEntry[]) newInput; if (elements != null) { @@ -171,6 +172,7 @@ public class ControlFlowView extends AbsTimeUpdateView implements } } + @Override public void dispose() { } @@ -181,14 +183,14 @@ public class ControlFlowView extends AbsTimeUpdateView implements cviewer.replace(elements[index], index); } - // @Override + @Override public Object[] getElements(Object inputElement) { return elements; } } - class ViewLabelProvider extends LabelProvider implements - ITableLabelProvider { + class ViewLabelProvider extends LabelProvider implements ITableLabelProvider { + @Override public String getColumnText(Object obj, int index) { String strRes = ""; //$NON-NLS-1$ LttngTimestamp time; @@ -236,6 +238,7 @@ public class ControlFlowView extends AbsTimeUpdateView implements return strRes; } + @Override public Image getColumnImage(Object obj, int index) { return getImage(obj); } @@ -319,6 +322,7 @@ public class ControlFlowView extends AbsTimeUpdateView implements tableViewer.setLabelProvider(new ViewLabelProvider()); Table table = tableViewer.getTable(); tableViewer.addSelectionChangedListener(new ISelectionChangedListener() { + @Override public void selectionChanged(SelectionChangedEvent event) { ISelection sel = event.getSelection(); if (!sel.isEmpty()) { @@ -393,6 +397,7 @@ public class ControlFlowView extends AbsTimeUpdateView implements // Listen to page up /down and Home / Enc keys tableViewer.getTable().addKeyListener(new KeyListener() { + @Override public void keyPressed(KeyEvent e) { Table table = tableViewer.getTable(); Point origin = scrollFrame.getOrigin(); @@ -431,6 +436,7 @@ public class ControlFlowView extends AbsTimeUpdateView implements } } + @Override public void keyReleased(KeyEvent e) { // Nothing to do @@ -560,6 +566,7 @@ public class ControlFlowView extends AbsTimeUpdateView implements MenuManager menuMgr = new MenuManager("#PopupMenu"); //$NON-NLS-1$ menuMgr.setRemoveAllWhenShown(true); menuMgr.addMenuListener(new IMenuListener() { + @Override public void menuAboutToShow(IMenuManager manager) { ControlFlowView.this.fillContextMenu(manager); } @@ -810,6 +817,7 @@ public class ControlFlowView extends AbsTimeUpdateView implements private void hookDoubleClickAction() { tableViewer.addDoubleClickListener(new IDoubleClickListener() { + @Override public void doubleClick(DoubleClickEvent event) { doubleClickAction.run(); } @@ -897,6 +905,7 @@ public class ControlFlowView extends AbsTimeUpdateView implements // Perform the updates on the UI thread) display.asyncExec(new Runnable() { + @Override public void run() { if (!table.isDisposed()) { tableViewer.setInput(items); // This shall be the minimal @@ -959,7 +968,7 @@ public class ControlFlowView extends AbsTimeUpdateView implements } } - // @Override + @Override public void tmfTaProcessFilterSelection(TmfTimeFilterSelectionEvent event) { if (tableFilter != null) { Vector filteredout = event.getFilteredOut(); diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/controlflow/evProcessor/FlowAfterUpdateHandlers.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/controlflow/evProcessor/FlowAfterUpdateHandlers.java index 1a80630a21..770040c4e3 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/controlflow/evProcessor/FlowAfterUpdateHandlers.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/controlflow/evProcessor/FlowAfterUpdateHandlers.java @@ -43,6 +43,7 @@ class FlowAfterUpdateHandlers { AbsFlowTRangeUpdate handler = new AbsFlowTRangeUpdate() { // @Override + @Override public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) { // get event time, cpu, trace_number, process, pid @@ -124,6 +125,7 @@ class FlowAfterUpdateHandlers { AbsFlowTRangeUpdate handler = new AbsFlowTRangeUpdate() { // @Override + @Override public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) { Long child_pid = getAFieldLong(trcEvent, traceSt, Fields.LTT_FIELD_CHILD_PID); @@ -169,6 +171,7 @@ class FlowAfterUpdateHandlers { AbsFlowTRangeUpdate handler = new AbsFlowTRangeUpdate() { // @Override + @Override public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) { LttngProcessState process = traceSt.getRunning_process().get(trcEvent.getCpuId()); @@ -217,6 +220,7 @@ class FlowAfterUpdateHandlers { AbsFlowTRangeUpdate handler = new AbsFlowTRangeUpdate() { // @Override + @Override public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) { LttngProcessState process = traceSt.getRunning_process().get(trcEvent.getCpuId()); @@ -261,6 +265,7 @@ class FlowAfterUpdateHandlers { AbsFlowTRangeUpdate handler = new AbsFlowTRangeUpdate() { // @Override + @Override public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) { LttngProcessState process = traceSt.getRunning_process().get(trcEvent.getCpuId()); @@ -321,6 +326,7 @@ class FlowAfterUpdateHandlers { AbsFlowTRangeUpdate handler = new AbsFlowTRangeUpdate() { // @Override + @Override public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) { int first_cpu; diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/controlflow/evProcessor/FlowBeforeUpdateHandlers.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/controlflow/evProcessor/FlowBeforeUpdateHandlers.java index 78a9fd2dc0..7755bb7f5c 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/controlflow/evProcessor/FlowBeforeUpdateHandlers.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/controlflow/evProcessor/FlowBeforeUpdateHandlers.java @@ -40,6 +40,7 @@ class FlowBeforeUpdateHandlers { AbsFlowTRangeUpdate handler = new AbsFlowTRangeUpdate() { // @Override + @Override public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) { Long cpu = trcEvent.getCpuId(); @@ -99,6 +100,7 @@ class FlowBeforeUpdateHandlers { AbsFlowTRangeUpdate handler = new AbsFlowTRangeUpdate() { // @Override + @Override public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) { Long pid_out = getAFieldLong(trcEvent, traceSt, @@ -221,6 +223,7 @@ class FlowBeforeUpdateHandlers { AbsFlowTRangeUpdate handler = new AbsFlowTRangeUpdate() { // @Override + @Override public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) { // We need to process information. @@ -283,6 +286,7 @@ class FlowBeforeUpdateHandlers { AbsFlowTRangeUpdate handler = new AbsFlowTRangeUpdate() { // @Override + @Override public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) { // PID of the process to release Long release_pid = getAFieldLong(trcEvent, traceSt, @@ -334,6 +338,7 @@ class FlowBeforeUpdateHandlers { AbsFlowTRangeUpdate handler = new AbsFlowTRangeUpdate() { // @Override + @Override public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) { // What's below should replace the following call in C : diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/controlflow/evProcessor/FlowFinishUpdateHandler.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/controlflow/evProcessor/FlowFinishUpdateHandler.java index 98668be440..bf6b37ae15 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/controlflow/evProcessor/FlowFinishUpdateHandler.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/controlflow/evProcessor/FlowFinishUpdateHandler.java @@ -36,6 +36,7 @@ public class FlowFinishUpdateHandler extends AbsFlowTRangeUpdate return null; } + @Override public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) { // The end of the last state is unknown since it's beyond the requested time range window. Create this last // event to half page after the visible window but not beyond the end of trace diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/controlflow/model/FlowProcessContainer.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/controlflow/model/FlowProcessContainer.java index 97a6ff542d..f70fead441 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/controlflow/model/FlowProcessContainer.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/controlflow/model/FlowProcessContainer.java @@ -52,6 +52,7 @@ public class FlowProcessContainer implements ItemContainer iterator = allProcesses.keySet().iterator(); @@ -96,7 +100,8 @@ public class FlowProcessContainer implements ItemContainer 0 && childrenCanvas.getSize().y > 0) { diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/histogram/HistogramView.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/histogram/HistogramView.java index 952871e80e..fe7a7bb224 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/histogram/HistogramView.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/histogram/HistogramView.java @@ -1083,6 +1083,7 @@ public class HistogramView extends TmfView implements ControlListener { * * @param event The control event generated by the move. */ + @Override public void controlMoved(ControlEvent event) { parent.redraw(); } @@ -1095,6 +1096,7 @@ public class HistogramView extends TmfView implements ControlListener { * * @param event The control event generated by the resize. */ + @Override public void controlResized(ControlEvent event) { // Ouch! The screen enlarged (screen resolution changed?) so far that we miss content to fill the space. diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/histogram/ParentHistogramCanvas.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/histogram/ParentHistogramCanvas.java index 31f7ba0ff4..43cad0fdd5 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/histogram/ParentHistogramCanvas.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/histogram/ParentHistogramCanvas.java @@ -475,6 +475,7 @@ public class ParentHistogramCanvas extends HistogramCanvas { Display display = this.getDisplay(); display.asyncExec(new Runnable() { + @Override public void run() { if(!ParentHistogramCanvas.this.isDisposed()) notifyParentSelectionWindowChanged(); diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/histogram/TimeTextGroup.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/histogram/TimeTextGroup.java index 23c8d07f08..63498efe1e 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/histogram/TimeTextGroup.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/histogram/TimeTextGroup.java @@ -364,6 +364,7 @@ public class TimeTextGroup implements FocusListener, KeyListener { * * @param event The focus event generated. */ + @Override public void focusGained(FocusEvent event) { // Nothing to do yet } @@ -374,6 +375,7 @@ public class TimeTextGroup implements FocusListener, KeyListener { * * @param event The focus event generated. */ + @Override public void focusLost(FocusEvent event) { handleNewStringValue(); } @@ -385,6 +387,7 @@ public class TimeTextGroup implements FocusListener, KeyListener { * * @param event The KeyEvent generated when the key was pressed. */ + @Override public void keyPressed(KeyEvent event) { switch (event.keyCode) { // SWT.CR is "ENTER" Key @@ -403,6 +406,7 @@ public class TimeTextGroup implements FocusListener, KeyListener { * * @param event The KeyEvent generated when the key was pressed. */ + @Override public void keyReleased(KeyEvent e) { } @@ -442,6 +446,7 @@ class AsyncTimeTextGroupRedrawer { Display display = parentTimeTextGroup.getParent().getDisplay(); display.asyncExec(new Runnable() { + @Override public void run() { if (!parentTimeTextGroup.getParent().isDisposed()) { parentTimeTextGroup.setValue(newTime); @@ -464,6 +469,7 @@ class AsyncTimeTextGroupRedrawer { final String tmpName = newGroupName; Display display = parentTimeTextGroup.getParent().getDisplay(); display.asyncExec(new Runnable() { + @Override public void run() { if (!parentTimeTextGroup.getParent().isDisposed()) { parentTimeTextGroup.setGroupName(tmpName); @@ -484,6 +490,7 @@ class AsyncTimeTextGroupRedrawer { Display display = parentTimeTextGroup.getParent().getDisplay(); display.asyncExec(new Runnable() { + @Override public void run() { if (!parentTimeTextGroup.getParent().isDisposed()) { parentTimeTextGroup.getParent().redraw(); diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/LTTngProjectNature.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/LTTngProjectNature.java index 2e14ccd1bc..ff54238ce4 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/LTTngProjectNature.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/LTTngProjectNature.java @@ -30,6 +30,7 @@ public class LTTngProjectNature implements IProjectNature { /* (non-Javadoc) * @see org.eclipse.core.resources.IProjectNature#configure() */ + @Override public void configure() throws CoreException { // TODO Auto-generated method stub @@ -38,6 +39,7 @@ public class LTTngProjectNature implements IProjectNature { /* (non-Javadoc) * @see org.eclipse.core.resources.IProjectNature#deconfigure() */ + @Override public void deconfigure() throws CoreException { // TODO Auto-generated method stub @@ -46,6 +48,7 @@ public class LTTngProjectNature implements IProjectNature { /* (non-Javadoc) * @see org.eclipse.core.resources.IProjectNature#getProject() */ + @Override public IProject getProject() { return fProject; } @@ -53,6 +56,7 @@ public class LTTngProjectNature implements IProjectNature { /* (non-Javadoc) * @see org.eclipse.core.resources.IProjectNature#setProject(org.eclipse.core.resources.IProject) */ + @Override public void setProject(IProject project) { fProject = project; } diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/ProjectView.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/ProjectView.java index 5751cb2cc8..1c0b97e816 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/ProjectView.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/ProjectView.java @@ -71,7 +71,8 @@ public class ProjectView extends TmfView { // Perform updates on the UI thread private Runnable fViewRefresher = new Runnable() { - public void run() { + @Override + public void run() { if ((fViewer != null) && (!fViewer.getTree().isDisposed())) { Object[] elements = fViewer.getExpandedElements(); fViewer.refresh(); @@ -95,7 +96,8 @@ public class ProjectView extends TmfView { fWorkspace = ResourcesPlugin.getWorkspace(); fResourceChangeListener = new IResourceChangeListener() { - public void resourceChanged(IResourceChangeEvent event) { + @Override + public void resourceChanged(IResourceChangeEvent event) { if (event.getType() == IResourceChangeEvent.POST_CHANGE) { fProjectRoot.refreshChildren(); refresh(); diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/dialogs/AddTraceWizard.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/dialogs/AddTraceWizard.java index eac20e8704..a24cb45f0d 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/dialogs/AddTraceWizard.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/dialogs/AddTraceWizard.java @@ -48,6 +48,7 @@ public class AddTraceWizard extends Wizard implements IImportWizard { /* (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("Adding traces to experiment"); } diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/dialogs/AddTraceWizardPage.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/dialogs/AddTraceWizardPage.java index ded48a0279..465dcd0289 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/dialogs/AddTraceWizardPage.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/dialogs/AddTraceWizardPage.java @@ -43,6 +43,7 @@ public class AddTraceWizardPage extends WizardPage { fProject = project; } + @Override public void createControl(Composite parent) { Composite container = new Composite(parent, SWT.NULL); container.setLayout(new FormLayout()); diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/dialogs/DialogTraceContentProvider.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/dialogs/DialogTraceContentProvider.java index d3efae9762..3eea43f497 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/dialogs/DialogTraceContentProvider.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/dialogs/DialogTraceContentProvider.java @@ -26,6 +26,7 @@ public class DialogTraceContentProvider implements IStructuredContentProvider { /* (non-Javadoc) * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object) */ + @Override public Object[] getElements(Object inputElement) { if (inputElement instanceof LTTngTraceFolderNode) { LTTngTraceFolderNode folder = (LTTngTraceFolderNode) inputElement; @@ -37,6 +38,7 @@ public class DialogTraceContentProvider implements IStructuredContentProvider { /* (non-Javadoc) * @see org.eclipse.jface.viewers.IContentProvider#dispose() */ + @Override public void dispose() { // TODO Auto-generated method stub } @@ -44,6 +46,7 @@ public class DialogTraceContentProvider implements IStructuredContentProvider { /* (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) { // TODO Auto-generated method stub } diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/dialogs/DialogTraceLabelProvider.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/dialogs/DialogTraceLabelProvider.java index d3ff08b2bd..c2f4c37c2e 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/dialogs/DialogTraceLabelProvider.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/dialogs/DialogTraceLabelProvider.java @@ -27,6 +27,7 @@ public class DialogTraceLabelProvider extends LabelProvider implements ITableLab /* (non-Javadoc) * @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnImage(java.lang.Object, int) */ + @Override public Image getColumnImage(Object element, int columnIndex) { return null; } @@ -34,6 +35,7 @@ public class DialogTraceLabelProvider extends LabelProvider implements ITableLab /* (non-Javadoc) * @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnText(java.lang.Object, int) */ + @Override public String getColumnText(Object element, int columnIndex) { if (element instanceof LTTngTraceNode) { LTTngTraceNode entry = (LTTngTraceNode) element; diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/dialogs/ImportTraceWizard.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/dialogs/ImportTraceWizard.java index 77dd476c0a..3e1b0a040d 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/dialogs/ImportTraceWizard.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/dialogs/ImportTraceWizard.java @@ -64,6 +64,7 @@ public class ImportTraceWizard extends Wizard implements IImportWizard { /* (non-Javadoc) * @see org.eclipse.ui.IWorkbenchWizard#init(org.eclipse.ui.IWorkbench, org.eclipse.jface.viewers.IStructuredSelection) */ + @Override @SuppressWarnings("rawtypes") public void init(IWorkbench workbench, IStructuredSelection selection) { fWorkbench = workbench; diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/dialogs/NewExperimentDialog.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/dialogs/NewExperimentDialog.java index 1cb3929dbb..a754d16311 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/dialogs/NewExperimentDialog.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/dialogs/NewExperimentDialog.java @@ -101,19 +101,23 @@ public class NewExperimentDialog extends SelectionStatusDialog { protected void createLinkResourceGroup(Composite parent) { linkedResourceGroup = new CreateLinkedResourceGroup(IResource.FOLDER, new Listener() { + @Override public void handleEvent(Event e) { validateLinkedResource(); firstLinkCheck = false; } }, new CreateLinkedResourceGroup.IStringValue() { + @Override public void setValue(String string) { folderNameField.setText(string); } + @Override public String getValue() { return folderNameField.getText(); } + @Override public IResource getResource() { // TODO Auto-generated method stub return null; @@ -160,6 +164,7 @@ public class NewExperimentDialog extends SelectionStatusDialog { folderNameField.setLayoutData(data); folderNameField.setFont(font); folderNameField.addListener(SWT.Modify, new Listener() { + @Override public void handleEvent(Event event) { validateLinkedResource(); } diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/handlers/CloseProjectHandler.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/handlers/CloseProjectHandler.java index c00e60d9c9..827a15dc94 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/handlers/CloseProjectHandler.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/handlers/CloseProjectHandler.java @@ -37,6 +37,7 @@ public class CloseProjectHandler implements IHandler { // Validation // ------------------------------------------------------------------------ + @Override public boolean isEnabled() { // Check if we are closing down @@ -59,6 +60,7 @@ public class CloseProjectHandler implements IHandler { } // Handled if we are in the ProjectView + @Override public boolean isHandled() { return true; } @@ -67,6 +69,7 @@ public class CloseProjectHandler implements IHandler { // Execution // ------------------------------------------------------------------------ + @Override public Object execute(ExecutionEvent event) throws ExecutionException { if (fProject != null) { @@ -76,6 +79,7 @@ public class CloseProjectHandler implements IHandler { return null; } + @Override public void dispose() { // TODO Auto-generated method stub } @@ -84,10 +88,12 @@ public class CloseProjectHandler implements IHandler { // IHandlerListener // ------------------------------------------------------------------------ + @Override public void addHandlerListener(IHandlerListener handlerListener) { // TODO Auto-generated method stub } + @Override public void removeHandlerListener(IHandlerListener handlerListener) { // TODO Auto-generated method stub } diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/handlers/DeleteExperimentHandler.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/handlers/DeleteExperimentHandler.java index ed736efa07..a89af48e3d 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/handlers/DeleteExperimentHandler.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/handlers/DeleteExperimentHandler.java @@ -40,6 +40,7 @@ public class DeleteExperimentHandler implements IHandler { // Validation // ------------------------------------------------------------------------ + @Override public boolean isEnabled() { // Check if we are closing down @@ -63,6 +64,7 @@ public class DeleteExperimentHandler implements IHandler { } // Handled if we are in the ProjectView + @Override public boolean isHandled() { return true; } @@ -71,6 +73,7 @@ public class DeleteExperimentHandler implements IHandler { // Execution // ------------------------------------------------------------------------ + @Override public Object execute(ExecutionEvent event) throws ExecutionException { IFolder folder = fExperiment.getFolder(); @@ -86,6 +89,7 @@ public class DeleteExperimentHandler implements IHandler { return null; } + @Override public void dispose() { // TODO Auto-generated method stub } @@ -94,10 +98,12 @@ public class DeleteExperimentHandler implements IHandler { // IHandlerListener // ------------------------------------------------------------------------ + @Override public void addHandlerListener(IHandlerListener handlerListener) { // TODO Auto-generated method stub } + @Override public void removeHandlerListener(IHandlerListener handlerListener) { // TODO Auto-generated method stub } diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/handlers/DeleteProjectHandler.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/handlers/DeleteProjectHandler.java index 328dd97276..ff5379d5a4 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/handlers/DeleteProjectHandler.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/handlers/DeleteProjectHandler.java @@ -40,6 +40,7 @@ public class DeleteProjectHandler implements IHandler { // Validation // ------------------------------------------------------------------------ + @Override public boolean isEnabled() { // Check if we are closing down @@ -62,6 +63,7 @@ public class DeleteProjectHandler implements IHandler { } // Handled if we are in the ProjectView + @Override public boolean isHandled() { return true; } @@ -70,6 +72,7 @@ public class DeleteProjectHandler implements IHandler { // Execution // ------------------------------------------------------------------------ + @Override public Object execute(ExecutionEvent event) throws ExecutionException { IProject project = fProject.getProject(); @@ -85,6 +88,7 @@ public class DeleteProjectHandler implements IHandler { return null; } + @Override public void dispose() { // TODO Auto-generated method stub } @@ -93,10 +97,12 @@ public class DeleteProjectHandler implements IHandler { // IHandlerListener // ------------------------------------------------------------------------ + @Override public void addHandlerListener(IHandlerListener handlerListener) { // TODO Auto-generated method stub } + @Override public void removeHandlerListener(IHandlerListener handlerListener) { // TODO Auto-generated method stub } diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/handlers/DeleteTraceHandler.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/handlers/DeleteTraceHandler.java index beb0d0595b..7404f0d6e7 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/handlers/DeleteTraceHandler.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/handlers/DeleteTraceHandler.java @@ -40,6 +40,7 @@ public class DeleteTraceHandler implements IHandler { // Validation // ------------------------------------------------------------------------ + @Override public boolean isEnabled() { // Check if we are closing down @@ -63,6 +64,7 @@ public class DeleteTraceHandler implements IHandler { } // Handled if we are in the ProjectView + @Override public boolean isHandled() { return true; } @@ -71,6 +73,7 @@ public class DeleteTraceHandler implements IHandler { // Execution // ------------------------------------------------------------------------ + @Override public Object execute(ExecutionEvent event) throws ExecutionException { IFolder folder = fTrace.getFolder(); @@ -86,6 +89,7 @@ public class DeleteTraceHandler implements IHandler { return null; } + @Override public void dispose() { // TODO Auto-generated method stub } @@ -94,10 +98,12 @@ public class DeleteTraceHandler implements IHandler { // IHandlerListener // ------------------------------------------------------------------------ + @Override public void addHandlerListener(IHandlerListener handlerListener) { // TODO Auto-generated method stub } + @Override public void removeHandlerListener(IHandlerListener handlerListener) { // TODO Auto-generated method stub } diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/handlers/ImportTraceHandler.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/handlers/ImportTraceHandler.java index 907c428c07..265c537f80 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/handlers/ImportTraceHandler.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/handlers/ImportTraceHandler.java @@ -43,6 +43,7 @@ public class ImportTraceHandler implements IHandler { // Validation // ------------------------------------------------------------------------ + @Override public boolean isEnabled() { // Check if we are closing down @@ -72,6 +73,7 @@ public class ImportTraceHandler implements IHandler { } // Always handled + @Override public boolean isHandled() { return true; } @@ -80,6 +82,7 @@ public class ImportTraceHandler implements IHandler { // Execution // ------------------------------------------------------------------------ + @Override public Object execute(ExecutionEvent event) throws ExecutionException { // Set the selection to the project @@ -104,6 +107,7 @@ public class ImportTraceHandler implements IHandler { return null; } + @Override public void dispose() { // TODO Auto-generated method stub } @@ -112,10 +116,12 @@ public class ImportTraceHandler implements IHandler { // IHandlerListener // ------------------------------------------------------------------------ + @Override public void addHandlerListener(IHandlerListener handlerListener) { // TODO Auto-generated method stub } + @Override public void removeHandlerListener(IHandlerListener handlerListener) { // TODO Auto-generated method stub } diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/handlers/NewExperimentHandler.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/handlers/NewExperimentHandler.java index b6e760e2b4..c7293b8cb2 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/handlers/NewExperimentHandler.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/handlers/NewExperimentHandler.java @@ -43,6 +43,7 @@ public class NewExperimentHandler implements IHandler { // Validation // ------------------------------------------------------------------------ + @Override public boolean isEnabled() { // Check if we are closing down @@ -72,6 +73,7 @@ public class NewExperimentHandler implements IHandler { } // Handled if we are in the ProjectView + @Override public boolean isHandled() { return true; } @@ -80,6 +82,7 @@ public class NewExperimentHandler implements IHandler { // Execution // ------------------------------------------------------------------------ + @Override public Object execute(ExecutionEvent event) throws ExecutionException { // Open the experiment creation dialog @@ -98,6 +101,7 @@ public class NewExperimentHandler implements IHandler { return null; } + @Override public void dispose() { // TODO Auto-generated method stub } @@ -106,10 +110,12 @@ public class NewExperimentHandler implements IHandler { // IHandlerListener // ------------------------------------------------------------------------ + @Override public void addHandlerListener(IHandlerListener handlerListener) { // TODO Auto-generated method stub } + @Override public void removeHandlerListener(IHandlerListener handlerListener) { // TODO Auto-generated method stub } diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/handlers/NewProjectHandler.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/handlers/NewProjectHandler.java index a4863073e0..ac001a7370 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/handlers/NewProjectHandler.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/handlers/NewProjectHandler.java @@ -40,6 +40,7 @@ public class NewProjectHandler implements IHandler { // Validation // ------------------------------------------------------------------------ + @Override public boolean isEnabled() { // Check if we are closing down @@ -58,6 +59,7 @@ public class NewProjectHandler implements IHandler { } // Always handled + @Override public boolean isHandled() { return true; } @@ -66,6 +68,7 @@ public class NewProjectHandler implements IHandler { // Execution // ------------------------------------------------------------------------ + @Override public Object execute(ExecutionEvent event) throws ExecutionException { // Fire the New Project Wizard @@ -86,6 +89,7 @@ public class NewProjectHandler implements IHandler { return null; } + @Override public void dispose() { // TODO Auto-generated method stub } @@ -94,10 +98,12 @@ public class NewProjectHandler implements IHandler { // IHandlerListener // ------------------------------------------------------------------------ + @Override public void addHandlerListener(IHandlerListener handlerListener) { // TODO Auto-generated method stub } + @Override public void removeHandlerListener(IHandlerListener handlerListener) { // TODO Auto-generated method stub } diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/handlers/OpenExperimentHandler.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/handlers/OpenExperimentHandler.java index c7948b4dbb..a21c7a7dd7 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/handlers/OpenExperimentHandler.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/handlers/OpenExperimentHandler.java @@ -37,6 +37,7 @@ public class OpenExperimentHandler implements IHandler { // Validation // ------------------------------------------------------------------------ + @Override public boolean isEnabled() { // Check if we are closing down IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow(); @@ -59,6 +60,7 @@ public class OpenExperimentHandler implements IHandler { } // Handled if we are in the ProjectView + @Override public boolean isHandled() { return true; } @@ -67,6 +69,7 @@ public class OpenExperimentHandler implements IHandler { // Execution // ------------------------------------------------------------------------ + @Override public Object execute(ExecutionEvent event) throws ExecutionException { // Set the selection to the project @@ -84,14 +87,17 @@ public class OpenExperimentHandler implements IHandler { // IHandlerListener // ------------------------------------------------------------------------ + @Override public void addHandlerListener(IHandlerListener handlerListener) { // TODO Auto-generated method stub } + @Override public void removeHandlerListener(IHandlerListener handlerListener) { // TODO Auto-generated method stub } + @Override public void dispose() { // TODO Auto-generated method stub diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/handlers/OpenProjectHandler.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/handlers/OpenProjectHandler.java index 8aabb38720..5e32f77f8e 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/handlers/OpenProjectHandler.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/handlers/OpenProjectHandler.java @@ -37,6 +37,7 @@ public class OpenProjectHandler implements IHandler { // Validation // ------------------------------------------------------------------------ + @Override public boolean isEnabled() { // Check if we are closing down @@ -59,6 +60,7 @@ public class OpenProjectHandler implements IHandler { } // Handled if we are in the ProjectView + @Override public boolean isHandled() { return true; } @@ -67,6 +69,7 @@ public class OpenProjectHandler implements IHandler { // Execution // ------------------------------------------------------------------------ + @Override public Object execute(ExecutionEvent event) throws ExecutionException { if (fProject != null) { @@ -76,6 +79,7 @@ public class OpenProjectHandler implements IHandler { return null; } + @Override public void dispose() { // TODO Auto-generated method stub } @@ -84,10 +88,12 @@ public class OpenProjectHandler implements IHandler { // IHandlerListener // ------------------------------------------------------------------------ + @Override public void addHandlerListener(IHandlerListener handlerListener) { // TODO Auto-generated method stub } + @Override public void removeHandlerListener(IHandlerListener handlerListener) { // TODO Auto-generated method stub } diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/handlers/OpenTraceHandler.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/handlers/OpenTraceHandler.java index 8e011112b1..f408ae17a4 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/handlers/OpenTraceHandler.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/handlers/OpenTraceHandler.java @@ -33,11 +33,13 @@ public class OpenTraceHandler implements IHandler { // Validation // ------------------------------------------------------------------------ + @Override public boolean isEnabled() { return (fTrace != null); } // Handled if we are in the ProjectView + @Override public boolean isHandled() { return true; } @@ -46,6 +48,7 @@ public class OpenTraceHandler implements IHandler { // Execution // ------------------------------------------------------------------------ + @Override public Object execute(ExecutionEvent event) throws ExecutionException { MessageBox mb = new MessageBox(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell()); @@ -56,6 +59,7 @@ public class OpenTraceHandler implements IHandler { return null; } + @Override public void dispose() { // TODO Auto-generated method stub } @@ -64,10 +68,12 @@ public class OpenTraceHandler implements IHandler { // IHandlerListener // ------------------------------------------------------------------------ + @Override public void addHandlerListener(IHandlerListener handlerListener) { // TODO Auto-generated method stub } + @Override public void removeHandlerListener(IHandlerListener handlerListener) { // TODO Auto-generated method stub } diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/handlers/RefreshHandler.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/handlers/RefreshHandler.java index 740ed30a40..3f94dddfd3 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/handlers/RefreshHandler.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/handlers/RefreshHandler.java @@ -37,6 +37,7 @@ public class RefreshHandler implements IHandler { // Validation // ------------------------------------------------------------------------ + @Override public boolean isEnabled() { // Check if we are closing down @@ -61,6 +62,7 @@ public class RefreshHandler implements IHandler { } // Handled if we are in the ProjectView + @Override public boolean isHandled() { return true; } @@ -69,6 +71,7 @@ public class RefreshHandler implements IHandler { // Execution // ------------------------------------------------------------------------ + @Override public Object execute(ExecutionEvent event) throws ExecutionException { if (fProjectRoot != null) { @@ -79,6 +82,7 @@ public class RefreshHandler implements IHandler { return null; } + @Override public void dispose() { // TODO Auto-generated method stub } @@ -87,10 +91,12 @@ public class RefreshHandler implements IHandler { // IHandlerListener // ------------------------------------------------------------------------ + @Override public void addHandlerListener(IHandlerListener handlerListener) { // TODO Auto-generated method stub } + @Override public void removeHandlerListener(IHandlerListener handlerListener) { // TODO Auto-generated method stub } diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/handlers/RenameExperimentHandler.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/handlers/RenameExperimentHandler.java index 7651437131..38b0d92137 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/handlers/RenameExperimentHandler.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/handlers/RenameExperimentHandler.java @@ -33,11 +33,13 @@ public class RenameExperimentHandler implements IHandler { // Validation // ------------------------------------------------------------------------ + @Override public boolean isEnabled() { return (fExperiment != null); } // Handled if we are in the ProjectView + @Override public boolean isHandled() { return true; } @@ -46,6 +48,7 @@ public class RenameExperimentHandler implements IHandler { // Execution // ------------------------------------------------------------------------ + @Override public Object execute(ExecutionEvent event) throws ExecutionException { MessageBox mb = new MessageBox(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell()); @@ -56,6 +59,7 @@ public class RenameExperimentHandler implements IHandler { return null; } + @Override public void dispose() { // TODO Auto-generated method stub } @@ -64,10 +68,12 @@ public class RenameExperimentHandler implements IHandler { // IHandlerListener // ------------------------------------------------------------------------ + @Override public void addHandlerListener(IHandlerListener handlerListener) { // TODO Auto-generated method stub } + @Override public void removeHandlerListener(IHandlerListener handlerListener) { // TODO Auto-generated method stub } diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/handlers/RenameProjectHandler.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/handlers/RenameProjectHandler.java index 43dc44b2ac..3e4957531d 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/handlers/RenameProjectHandler.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/handlers/RenameProjectHandler.java @@ -33,6 +33,7 @@ public class RenameProjectHandler implements IHandler { // Validation // ------------------------------------------------------------------------ + @Override public boolean isEnabled() { // // Check if we are closing down @@ -56,6 +57,7 @@ public class RenameProjectHandler implements IHandler { } // Handled if we are in the ProjectView + @Override public boolean isHandled() { return false; } @@ -64,6 +66,7 @@ public class RenameProjectHandler implements IHandler { // Execution // ------------------------------------------------------------------------ + @Override public Object execute(ExecutionEvent event) throws ExecutionException { MessageBox mb = new MessageBox(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell()); @@ -74,6 +77,7 @@ public class RenameProjectHandler implements IHandler { return null; } + @Override public void dispose() { // TODO Auto-generated method stub } @@ -82,10 +86,12 @@ public class RenameProjectHandler implements IHandler { // IHandlerListener // ------------------------------------------------------------------------ + @Override public void addHandlerListener(IHandlerListener handlerListener) { // TODO Auto-generated method stub } + @Override public void removeHandlerListener(IHandlerListener handlerListener) { // TODO Auto-generated method stub } diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/handlers/RenameTraceHandler.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/handlers/RenameTraceHandler.java index 3c1457d2ff..708f68ea2e 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/handlers/RenameTraceHandler.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/handlers/RenameTraceHandler.java @@ -33,11 +33,13 @@ public class RenameTraceHandler implements IHandler { // Validation // ------------------------------------------------------------------------ + @Override public boolean isEnabled() { return (fTrace != null); } // Handled if we are in the ProjectView + @Override public boolean isHandled() { return true; } @@ -46,6 +48,7 @@ public class RenameTraceHandler implements IHandler { // Execution // ------------------------------------------------------------------------ + @Override public Object execute(ExecutionEvent event) throws ExecutionException { MessageBox mb = new MessageBox(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell()); @@ -56,6 +59,7 @@ public class RenameTraceHandler implements IHandler { return null; } + @Override public void dispose() { // TODO Auto-generated method stub } @@ -64,10 +68,12 @@ public class RenameTraceHandler implements IHandler { // IHandlerListener // ------------------------------------------------------------------------ + @Override public void addHandlerListener(IHandlerListener handlerListener) { // TODO Auto-generated method stub } + @Override public void removeHandlerListener(IHandlerListener handlerListener) { // TODO Auto-generated method stub } diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/handlers/SelectTracesHandler.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/handlers/SelectTracesHandler.java index ef3804dcaa..d1fe7613bf 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/handlers/SelectTracesHandler.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/handlers/SelectTracesHandler.java @@ -41,6 +41,7 @@ public class SelectTracesHandler implements IHandler { // Validation // ------------------------------------------------------------------------ + @Override public boolean isEnabled() { // Check if we are closing down @@ -64,6 +65,7 @@ public class SelectTracesHandler implements IHandler { } // Handled if we are in the ProjectView + @Override public boolean isHandled() { return true; } @@ -72,6 +74,7 @@ public class SelectTracesHandler implements IHandler { // Execution // ------------------------------------------------------------------------ + @Override public Object execute(ExecutionEvent event) throws ExecutionException { // Open the trace addition wizard @@ -86,6 +89,7 @@ public class SelectTracesHandler implements IHandler { return null; } + @Override public void dispose() { // TODO Auto-generated method stub } @@ -94,10 +98,12 @@ public class SelectTracesHandler implements IHandler { // IHandlerListener // ------------------------------------------------------------------------ + @Override public void addHandlerListener(IHandlerListener handlerListener) { // TODO Auto-generated method stub } + @Override public void removeHandlerListener(IHandlerListener handlerListener) { // TODO Auto-generated method stub } diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/handlers/TraceErrorHandler.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/handlers/TraceErrorHandler.java index ebd6f4deef..13d756e5f4 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/handlers/TraceErrorHandler.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/handlers/TraceErrorHandler.java @@ -30,14 +30,17 @@ public class TraceErrorHandler implements IHandler { messages = newMessages; } + @Override public boolean isEnabled() { return true; } + @Override public boolean isHandled() { return true; } + @Override public Object execute(ExecutionEvent event) throws ExecutionException { IWorkbench workbench = PlatformUI.getWorkbench(); Shell shell = workbench.getActiveWorkbenchWindow().getShell(); @@ -48,12 +51,15 @@ public class TraceErrorHandler implements IHandler { return null; } + @Override public void dispose() { } + @Override public void addHandlerListener(IHandlerListener handlerListener) { } + @Override public void removeHandlerListener(IHandlerListener handlerListener) { } diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/model/LTTngExperimentFolderNode.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/model/LTTngExperimentFolderNode.java index 5f5416b52e..f1032fb668 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/model/LTTngExperimentFolderNode.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/model/LTTngExperimentFolderNode.java @@ -44,6 +44,7 @@ public class LTTngExperimentFolderNode extends LTTngProjectTreeNode { // LTTngProjectTreeNode // ------------------------------------------------------------------------ + @Override public String getName() { return fExperimentFolder.getName(); } diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/model/LTTngExperimentNode.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/model/LTTngExperimentNode.java index e494bc4234..fc05ad8307 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/model/LTTngExperimentNode.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/model/LTTngExperimentNode.java @@ -44,6 +44,7 @@ public class LTTngExperimentNode extends LTTngProjectTreeNode { // LTTngProjectTreeNode // ------------------------------------------------------------------------ + @Override public String getName() { return fExperiment.getName(); } diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/model/LTTngProjectContentProvider.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/model/LTTngProjectContentProvider.java index 12a8f74cc1..1a13286196 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/model/LTTngProjectContentProvider.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/model/LTTngProjectContentProvider.java @@ -22,18 +22,22 @@ import org.eclipse.jface.viewers.Viewer; */ public class LTTngProjectContentProvider implements ITreeContentProvider { + @Override public Object[] getChildren(Object parentElement) { return ((ILTTngProjectTreeNode) parentElement).getChildren().toArray(); } + @Override public Object getParent(Object element) { return ((ILTTngProjectTreeNode) element).getParent(); } + @Override public boolean hasChildren(Object element) { return ((ILTTngProjectTreeNode) element).hasChildren(); } + @Override public Object[] getElements(Object inputElement) { if (inputElement instanceof LTTngProjectRoot) { return ((LTTngProjectRoot) inputElement).getChildren().toArray(); @@ -41,10 +45,12 @@ import org.eclipse.jface.viewers.Viewer; return null; } + @Override public void dispose() { // TODO Auto-generated method stub } + @Override public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { // TODO Auto-generated method stub } diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/model/LTTngProjectLabelProvider.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/model/LTTngProjectLabelProvider.java index 6dee2d47ef..643310d6e6 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/model/LTTngProjectLabelProvider.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/model/LTTngProjectLabelProvider.java @@ -67,6 +67,7 @@ public class LTTngProjectLabelProvider implements ILabelProvider { /* (non-Javadoc) * @see org.eclipse.jface.viewers.ILabelProvider#getImage(java.lang.Object) */ + @Override public Image getImage(Object element) { if (element instanceof LTTngProjectNode) { @@ -96,6 +97,7 @@ public class LTTngProjectLabelProvider implements ILabelProvider { /* (non-Javadoc) * @see org.eclipse.jface.viewers.ILabelProvider#getText(java.lang.Object) */ + @Override public String getText(Object element) { ILTTngProjectTreeNode node = (ILTTngProjectTreeNode) element; String label = node.getName(); @@ -111,6 +113,7 @@ public class LTTngProjectLabelProvider implements ILabelProvider { /* (non-Javadoc) * @see org.eclipse.jface.viewers.IBaseLabelProvider#addListener(org.eclipse.jface.viewers.ILabelProviderListener) */ + @Override public void addListener(ILabelProviderListener listener) { // TODO Auto-generated method stub } @@ -118,6 +121,7 @@ public class LTTngProjectLabelProvider implements ILabelProvider { /* (non-Javadoc) * @see org.eclipse.jface.viewers.IBaseLabelProvider#dispose() */ + @Override public void dispose() { // TODO Auto-generated method stub } @@ -125,6 +129,7 @@ public class LTTngProjectLabelProvider implements ILabelProvider { /* (non-Javadoc) * @see org.eclipse.jface.viewers.IBaseLabelProvider#isLabelProperty(java.lang.Object, java.lang.String) */ + @Override public boolean isLabelProperty(Object element, String property) { // TODO Auto-generated method stub return false; @@ -133,6 +138,7 @@ public class LTTngProjectLabelProvider implements ILabelProvider { /* (non-Javadoc) * @see org.eclipse.jface.viewers.IBaseLabelProvider#removeListener(org.eclipse.jface.viewers.ILabelProviderListener) */ + @Override public void removeListener(ILabelProviderListener listener) { // TODO Auto-generated method stub } diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/model/LTTngProjectNode.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/model/LTTngProjectNode.java index 748dce726f..6e79c35c64 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/model/LTTngProjectNode.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/model/LTTngProjectNode.java @@ -55,6 +55,7 @@ public class LTTngProjectNode extends LTTngProjectTreeNode { // LTTngProjectTreeNode // ------------------------------------------------------------------------ + @Override public String getName() { return fProject.getName(); } diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/model/LTTngProjectRoot.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/model/LTTngProjectRoot.java index b54831c765..75afdc50bd 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/model/LTTngProjectRoot.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/model/LTTngProjectRoot.java @@ -48,6 +48,7 @@ public class LTTngProjectRoot extends LTTngProjectTreeNode { // LTTngProjectTreeNode // ------------------------------------------------------------------------ + @Override public String getName() { return null; } diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/model/LTTngProjectTreeNode.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/model/LTTngProjectTreeNode.java index b35bbfd6a5..f1e5b56c1f 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/model/LTTngProjectTreeNode.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/model/LTTngProjectTreeNode.java @@ -43,24 +43,30 @@ public abstract class LTTngProjectTreeNode implements ILTTngProjectTreeNode { // ILTTngProjectTreeNode // ------------------------------------------------------------------------ + @Override public ILTTngProjectTreeNode getParent() { return fParent; } + @Override public boolean hasChildren() { return fChildren.size() > 0; } + @Override public List getChildren() { return fChildren; } + @Override public abstract void refreshChildren(); + @Override public void refresh() { fParent.refresh(); } + @Override public void removeChild(ILTTngProjectTreeNode child) { for (ILTTngProjectTreeNode node : fChildren) { if (node == child) { @@ -72,6 +78,7 @@ public abstract class LTTngProjectTreeNode implements ILTTngProjectTreeNode { } } + @Override public void removeChildren() { for (ILTTngProjectTreeNode node : fChildren) { node.removeChildren(); diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/model/LTTngTraceFolderNode.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/model/LTTngTraceFolderNode.java index de11690557..96a76ea463 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/model/LTTngTraceFolderNode.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/model/LTTngTraceFolderNode.java @@ -44,6 +44,7 @@ public class LTTngTraceFolderNode extends LTTngProjectTreeNode { // LTTngProjectTreeNode // ------------------------------------------------------------------------ + @Override public String getName() { return fTraceFolder.getName(); } diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/model/LTTngTraceNode.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/model/LTTngTraceNode.java index 4312a2dbf1..12d21d3c75 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/model/LTTngTraceNode.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/model/LTTngTraceNode.java @@ -40,6 +40,7 @@ public class LTTngTraceNode extends LTTngProjectTreeNode { // LTTngProjectTreeNode // ------------------------------------------------------------------------ + @Override public String getName() { return fTrace.getName(); } diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/resources/ResourcesView.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/resources/ResourcesView.java index 759d079c88..deb462135e 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/resources/ResourcesView.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/resources/ResourcesView.java @@ -157,6 +157,7 @@ public class ResourcesView extends AbsTimeUpdateView implements MenuManager menuMgr = new MenuManager("#PopupMenu"); //$NON-NLS-1$ menuMgr.setRemoveAllWhenShown(true); menuMgr.addMenuListener(new IMenuListener() { + @Override public void menuAboutToShow(IMenuManager manager) { ResourcesView.this.fillContextMenu(manager); } @@ -445,6 +446,7 @@ public class ResourcesView extends AbsTimeUpdateView implements Display display = tsfviewer.getControl().getDisplay(); display.asyncExec(new Runnable() { + @Override public void run() { if ((tsfviewer != null) && (!tsfviewer.getControl().isDisposed())) { tsfviewer.display(items, startBoundTime, endBoundTime, updateTimeBounds); diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/resources/evProcessor/ResourcesAfterUpdateHandlers.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/resources/evProcessor/ResourcesAfterUpdateHandlers.java index 11aad14728..dec9ef2c0b 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/resources/evProcessor/ResourcesAfterUpdateHandlers.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/resources/evProcessor/ResourcesAfterUpdateHandlers.java @@ -38,6 +38,7 @@ public class ResourcesAfterUpdateHandlers { final ILttngEventProcessor getAfterSchedChangeHandler() { AbsResourcesTRangeUpdate handler = new AbsResourcesTRangeUpdate() { + @Override public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) { // TODO: After sched scheduler handler should implement an diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/resources/evProcessor/ResourcesBeforeUpdateHandlers.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/resources/evProcessor/ResourcesBeforeUpdateHandlers.java index ff562de22b..ae25ac7ebc 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/resources/evProcessor/ResourcesBeforeUpdateHandlers.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/resources/evProcessor/ResourcesBeforeUpdateHandlers.java @@ -46,6 +46,7 @@ public class ResourcesBeforeUpdateHandlers { AbsResourcesTRangeUpdate handler = new AbsResourcesTRangeUpdate() { // @Override + @Override public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) { // Create a time range for the cpu. globalProcessBeforeExecmode(trcEvent, traceSt); @@ -69,6 +70,7 @@ public class ResourcesBeforeUpdateHandlers { AbsResourcesTRangeUpdate handler = new AbsResourcesTRangeUpdate() { // @Override + @Override public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) { Long irqId = null; @@ -150,6 +152,7 @@ public class ResourcesBeforeUpdateHandlers { AbsResourcesTRangeUpdate handler = new AbsResourcesTRangeUpdate() { // @Override + @Override public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) { Long softIrqId = null; @@ -238,6 +241,7 @@ public class ResourcesBeforeUpdateHandlers { AbsResourcesTRangeUpdate handler = new AbsResourcesTRangeUpdate() { // @Override + @Override public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) { Long trapId = null; @@ -332,6 +336,7 @@ public class ResourcesBeforeUpdateHandlers { AbsResourcesTRangeUpdate handler = new AbsResourcesTRangeUpdate() { // @Override + @Override public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) { Long major = getAFieldLong(trcEvent, traceSt, Fields.LTT_FIELD_MAJOR); diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/resources/evProcessor/ResourcesFinishUpdateHandler.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/resources/evProcessor/ResourcesFinishUpdateHandler.java index f0cb48f441..37d198d237 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/resources/evProcessor/ResourcesFinishUpdateHandler.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/resources/evProcessor/ResourcesFinishUpdateHandler.java @@ -33,6 +33,7 @@ public class ResourcesFinishUpdateHandler extends return null; } + @Override public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) { // The end of the last state is unknown since it's beyond the requested time range window. Create this last // event to half page after the visible window but not beyond the end of trace diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/resources/model/ResourceContainer.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/resources/model/ResourceContainer.java index 472876444a..b7203be227 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/resources/model/ResourceContainer.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/resources/model/ResourceContainer.java @@ -50,6 +50,7 @@ public class ResourceContainer implements ItemContainer * (org.eclipse.linuxtools.tmf.ui.viewers.timeAnalysis.model. * ITmfTimeAnalysisEntry) */ + @Override public void addItem(TimeRangeEventResource newItem) { if (newItem != null) { resources.put( new ResourceKey(newItem),newItem); @@ -62,13 +63,15 @@ public class ResourceContainer implements ItemContainer /* (non-Javadoc) * @see org.eclipse.linuxtools.lttng.ui.views.resources.model.ItemContainer#getUniqueId() */ - public Integer getUniqueId() { + @Override + public Integer getUniqueId() { return uniqueId++; } /* (non-Javadoc) * @see org.eclipse.linuxtools.lttng.ui.views.resources.model.ItemContainer#readItems() */ + @Override public TimeRangeEventResource[] readItems() { return resources.values().toArray( new TimeRangeEventResource[resources.size()]); @@ -77,6 +80,7 @@ public class ResourceContainer implements ItemContainer /* (non-Javadoc) * @see org.eclipse.linuxtools.lttng.ui.views.resources.model.ItemContainer#clearChildren() */ + @Override public void clearChildren() { TimeRangeEventResource newRes = null; Iterator iterator = resources.keySet().iterator(); @@ -90,6 +94,7 @@ public class ResourceContainer implements ItemContainer /* (non-Javadoc) * @see org.eclipse.linuxtools.lttng.ui.views.resources.model.ItemContainer#clearItems() */ + @Override public void clearItems() { resources.clear(); } @@ -97,6 +102,7 @@ public class ResourceContainer implements ItemContainer /* (non-Javadoc) * @see org.eclipse.linuxtools.lttng.ui.views.resources.model.ItemContainer#removeItems(java.lang.String) */ + @Override public void removeItems(String traceId) { ResourceKey newKey = null; diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/StatisticsView.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/StatisticsView.java index 99787b18e4..9e104a376b 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/StatisticsView.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/StatisticsView.java @@ -185,6 +185,7 @@ public class StatisticsView extends AbsTimeUpdateView { .getValue().nbEvents); } }, new ColumnPercentageProvider() { + @Override public double getPercentage(StatisticsTreeNode node) { StatisticsTreeNode parent = node; do { @@ -269,6 +270,7 @@ public class StatisticsView extends AbsTimeUpdateView { * org.eclipse.jface.viewers.ITreeContentProvider#getChildren(java.lang * .Object) */ + @Override public Object[] getChildren(Object parentElement) { return ((StatisticsTreeNode) parentElement).getChildren().toArray(); } @@ -280,6 +282,7 @@ public class StatisticsView extends AbsTimeUpdateView { * org.eclipse.jface.viewers.ITreeContentProvider#getParent(java.lang * .Object) */ + @Override public Object getParent(Object element) { return ((StatisticsTreeNode) element).getParent(); } @@ -291,6 +294,7 @@ public class StatisticsView extends AbsTimeUpdateView { * org.eclipse.jface.viewers.ITreeContentProvider#hasChildren(java.lang * .Object) */ + @Override public boolean hasChildren(Object element) { return ((StatisticsTreeNode) element).hasChildren(); } @@ -302,6 +306,7 @@ public class StatisticsView extends AbsTimeUpdateView { * org.eclipse.jface.viewers.IStructuredContentProvider#getElements( * java.lang.Object) */ + @Override public Object[] getElements(Object inputElement) { return getChildren(inputElement); } @@ -311,6 +316,7 @@ public class StatisticsView extends AbsTimeUpdateView { * * @see org.eclipse.jface.viewers.IContentProvider#dispose() */ + @Override public void dispose() { } @@ -322,6 +328,7 @@ public class StatisticsView extends AbsTimeUpdateView { * .jface.viewers.Viewer, java.lang.Object, java.lang.Object) */ // @Override + @Override public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { } } @@ -398,6 +405,7 @@ public class StatisticsView extends AbsTimeUpdateView { // Handler that will draw the bar charts. treeViewer.getTree().addListener(SWT.EraseItem, new Listener() { // @Override + @Override public void handleEvent(Event event) { if (columnDataList[event.index].percentageProvider != null) { StatisticsTreeNode node = (StatisticsTreeNode) event.item @@ -504,6 +512,7 @@ public class StatisticsView extends AbsTimeUpdateView { // Perform the updates on the UI thread display.asyncExec(new Runnable() { + @Override public void run() { if ((treeViewer != null) && (!treeViewer.getTree().isDisposed())) { Cursor cursor = null; /* indicates default */ @@ -523,6 +532,7 @@ public class StatisticsView extends AbsTimeUpdateView { ((StatisticsTreeNode) input).reset(); treeViewer.getTree().getDisplay().asyncExec(new Runnable() { // @Override + @Override public void run() { if (!treeViewer.getTree().isDisposed()) treeViewer.refresh(); @@ -538,6 +548,7 @@ public class StatisticsView extends AbsTimeUpdateView { treeViewer.getTree().getDisplay().asyncExec(new Runnable() { // @Override + @Override public void run() { if (!treeViewer.getTree().isDisposed()) treeViewer.refresh(); diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/evProcessor/StatsModeChangeHandler.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/evProcessor/StatsModeChangeHandler.java index 42710987a3..0e88e0a45d 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/evProcessor/StatsModeChangeHandler.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/evProcessor/StatsModeChangeHandler.java @@ -26,6 +26,7 @@ class StatsModeChangeHandler extends AbstractStatsEventHandler { /* (non-Javadoc) * @see org.eclipse.linuxtools.lttng.state.evProcessor.IEventProcessing#process(org.eclipse.linuxtools.lttng.event.LttngEvent, org.eclipse.linuxtools.lttng.state.model.LttngTraceState) */ + @Override public boolean process(LttngEvent event, LttngTraceState traceState) { StatisticsData tree = getStatisticsTree(traceState); tree.increase(event, traceState, StatisticsData.Values.CPU_TIME | StatisticsData.Values.STATE_CUMULATIVE_CPU_TIME); diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/evProcessor/StatsModeEndHandler.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/evProcessor/StatsModeEndHandler.java index 1759caa30a..7cb5d035cb 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/evProcessor/StatsModeEndHandler.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/evProcessor/StatsModeEndHandler.java @@ -26,6 +26,7 @@ class StatsModeEndHandler extends AbstractStatsEventHandler { /* (non-Javadoc) * @see org.eclipse.linuxtools.lttng.state.evProcessor.IEventProcessing#process(org.eclipse.linuxtools.lttng.event.LttngEvent, org.eclipse.linuxtools.lttng.state.model.LttngTraceState) */ + @Override public boolean process(LttngEvent event, LttngTraceState traceState) { StatisticsData tree = getStatisticsTree(traceState); tree.increase(event, traceState, StatisticsData.Values.CPU_TIME | StatisticsData.Values.ELAPSED_TIME | StatisticsData.Values.CUMULATIVE_CPU_TIME); diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/evProcessor/StatsProcessExitHandler.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/evProcessor/StatsProcessExitHandler.java index ec74514cd5..15e51dbe23 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/evProcessor/StatsProcessExitHandler.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/evProcessor/StatsProcessExitHandler.java @@ -34,6 +34,7 @@ public class StatsProcessExitHandler extends AbstractStatsEventHandler { /* (non-Javadoc) * @see org.eclipse.linuxtools.lttng.state.evProcessor.ILttngEventProcessor#process(org.eclipse.linuxtools.lttng.event.LttngEvent, org.eclipse.linuxtools.lttng.state.model.LttngTraceState) */ + @Override public boolean process(LttngEvent event, LttngTraceState traceState) { StatisticsData tree = getStatisticsTree(traceState); tree.process_exit(event, traceState); diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/evProcessor/StatsTracesetEndHandler.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/evProcessor/StatsTracesetEndHandler.java index db7894dcd8..d301b9417b 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/evProcessor/StatsTracesetEndHandler.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/evProcessor/StatsTracesetEndHandler.java @@ -31,6 +31,7 @@ public class StatsTracesetEndHandler extends AbstractStatsEventHandler { * (non-Javadoc) * @see org.eclipse.linuxtools.lttng.state.evProcessor.ILttngEventProcessor#process(org.eclipse.linuxtools.lttng.event.LttngEvent, org.eclipse.linuxtools.lttng.state.model.LttngTraceState) */ + @Override public boolean process(LttngEvent event, LttngTraceState traceState) { StatisticsData tree = getStatisticsTree(traceState); tree.endTraceset(event, traceState); diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/timeframe/SpinnerGroup.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/timeframe/SpinnerGroup.java index 167cecd421..0ff8f49e3a 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/timeframe/SpinnerGroup.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/timeframe/SpinnerGroup.java @@ -97,7 +97,8 @@ public class SpinnerGroup { // Create and position the widgets seconds = new Spinner(group, SWT.BORDER); seconds.addModifyListener(new ModifyListener() { - public void modifyText(ModifyEvent e) { + @Override + public void modifyText(ModifyEvent e) { currentSeconds = seconds.getSelection(); refreshCurrentTime(); } @@ -110,7 +111,8 @@ public class SpinnerGroup { nanosec = new Spinner(group, SWT.BORDER); nanosec.addModifyListener(new ModifyListener() { - public void modifyText(ModifyEvent e) { + @Override + public void modifyText(ModifyEvent e) { currentNanosec = nanosec.getSelection(); // Correct for nanosec underflow if (currentNanosec < 0) { @@ -279,6 +281,7 @@ public class SpinnerGroup { if (seconds.isDisposed()) return; seconds.getDisplay().asyncExec(new Runnable() { + @Override public void run() { if (!seconds.isDisposed() && !nanosec.isDisposed()) { // If we are on the start second, ensure that [currentNS >= startNS] diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/timeframe/TimeFrameView.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/timeframe/TimeFrameView.java index 90e3c1f407..ce06019329 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/timeframe/TimeFrameView.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/timeframe/TimeFrameView.java @@ -221,7 +221,8 @@ public class TimeFrameView extends TmfView { fSlider.setLayoutData(gridData); fSlider.addListener(SWT.Selection, new Listener() { - public void handleEvent(Event event) { + @Override + public void handleEvent(Event event) { int ratio = fSlider.getSelection(); TmfTimestamp span = fCurrentGroup.getSpan(); long value = span.getValue() * ratio / SLIDER_RANGE; @@ -254,7 +255,8 @@ public class TimeFrameView extends TmfView { long current = fSlider.getSelection(); if (position != current) { fSlider.getDisplay().asyncExec(new Runnable() { - public void run() { + @Override + public void run() { fSlider.setSelection((int) position); } }); diff --git a/org.eclipse.linuxtools.lttng/.classpath b/org.eclipse.linuxtools.lttng/.classpath index 64c5e31b7a..1fa3e6803d 100644 --- a/org.eclipse.linuxtools.lttng/.classpath +++ b/org.eclipse.linuxtools.lttng/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.linuxtools.lttng/META-INF/MANIFEST.MF b/org.eclipse.linuxtools.lttng/META-INF/MANIFEST.MF index 835e68a196..d7688982d5 100644 --- a/org.eclipse.linuxtools.lttng/META-INF/MANIFEST.MF +++ b/org.eclipse.linuxtools.lttng/META-INF/MANIFEST.MF @@ -8,7 +8,7 @@ Bundle-Vendor: %Bundle-Vendor Require-Bundle: org.eclipse.core.runtime, org.eclipse.linuxtools.tmf;bundle-version="0.2.0", org.eclipse.linuxtools.lttng.jni;bundle-version="0.2.0" -Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-ActivationPolicy: lazy Export-Package: org.eclipse.linuxtools.lttng, org.eclipse.linuxtools.lttng.control, diff --git a/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/event/LttngLocation.java b/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/event/LttngLocation.java index e209fcd596..3e5a4252de 100644 --- a/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/event/LttngLocation.java +++ b/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/event/LttngLocation.java @@ -143,10 +143,12 @@ public class LttngLocation implements ITmfLocation { // ITmfLocation // ------------------------------------------------------------------------ + @Override public void setLocation(LttngTimestamp location) { operationTime = (LttngTimestamp)location; } + @Override public LttngTimestamp getLocation() { return new LttngTimestamp ( operationTime ); } diff --git a/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/model/LTTngTreeNodeGeneric.java b/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/model/LTTngTreeNodeGeneric.java index 9f3a1426d1..46c4a91ab1 100644 --- a/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/model/LTTngTreeNodeGeneric.java +++ b/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/model/LTTngTreeNodeGeneric.java @@ -87,6 +87,7 @@ public abstract class LTTngTreeNodeGeneric> * * @see org.eclipse.linuxtools.lttng.control.ILTTngAnalysisResource#getId() */ + @Override public Long getId() { return fid; } @@ -97,6 +98,7 @@ public abstract class LTTngTreeNodeGeneric> * @see * org.eclipse.linuxtools.lttng.control.ILTTngAnalysisResource#getType() */ + @Override public Object getType() { return ftype; } @@ -108,6 +110,7 @@ public abstract class LTTngTreeNodeGeneric> * org.eclipse.linuxtools.lttng.control.ILTTngAnalysisResource#getChildByName * () */ + @Override public E getChildByName(String name) { E child = null; if (name != null) { @@ -154,6 +157,7 @@ public abstract class LTTngTreeNodeGeneric> * * @see org.eclipse.linuxtools.lttng.model.ILTTngTreeNode#getChildren() */ + @Override public abstract E[] getChildren(); // { // return (T[]) childrenToArray(fchildren.values(), this.getClass()); @@ -193,6 +197,7 @@ public abstract class LTTngTreeNodeGeneric> * org.eclipse.linuxtools.lttng.control.ILTTngAnalysisResource#getChildById * (java.lang.Long) */ + @Override public E getChildById(Long id) { if (id == null) return null; @@ -206,6 +211,7 @@ public abstract class LTTngTreeNodeGeneric> * @see * org.eclipse.linuxtools.lttng.control.ILTTngAnalysisResource#getParent() */ + @Override public E getParent() { return fparent; } @@ -223,6 +229,7 @@ public abstract class LTTngTreeNodeGeneric> * @see * org.eclipse.linuxtools.lttng.control.ILTTngAnalysisResource#hasChildren() */ + @Override public boolean hasChildren() { if (fchildren.size() > 0) { return true; @@ -236,6 +243,7 @@ public abstract class LTTngTreeNodeGeneric> * @see * org.eclipse.linuxtools.lttng.control.ILTTngAnalysisResource#getName() */ + @Override public String getName() { return fname; } @@ -246,6 +254,7 @@ public abstract class LTTngTreeNodeGeneric> * @see * org.eclipse.linuxtools.lttng.control.ILTTngAnalysisResource#getPath() */ + @Override public String getPath() { return getPath(this, ""); } @@ -278,6 +287,7 @@ public abstract class LTTngTreeNodeGeneric> * * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class) */ + @Override @SuppressWarnings("rawtypes") public Object getAdapter(Class clazz) { if (clazz == ftype) { @@ -291,6 +301,7 @@ public abstract class LTTngTreeNodeGeneric> * * @see org.eclipse.linuxtools.lttng.model.ILTTngTreeNode#getValue() */ + @Override public Object getValue() { return fvalue; } @@ -300,6 +311,7 @@ public abstract class LTTngTreeNodeGeneric> * * @see org.eclipse.linuxtools.lttng.model.ILTTngTreeNode#getNextUniqueId() */ + @Override public synchronized Long getNextUniqueId() { return idCount++; } @@ -311,6 +323,7 @@ public abstract class LTTngTreeNodeGeneric> * org.eclipse.linuxtools.lttng.model.ILTTngTreeNode#getAttribute(java.lang * .String) */ + @Override @SuppressWarnings("unchecked") public T getAttribute(String key, Class type) { if (key != null) { @@ -330,6 +343,7 @@ public abstract class LTTngTreeNodeGeneric> * org.eclipse.linuxtools.lttng.model.ILTTngTreeNode#addAttribute(java.lang * .String, java.lang.Object) */ + @Override public boolean addAttribute(String key, Object value) { // validate if (key == null || value == null) { diff --git a/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/request/LttngSyntEventRequest.java b/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/request/LttngSyntEventRequest.java index e7757dac8c..222f5fb626 100644 --- a/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/request/LttngSyntEventRequest.java +++ b/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/request/LttngSyntEventRequest.java @@ -98,6 +98,7 @@ public class LttngSyntEventRequest extends TmfEventRequest /* (non-Javadoc) * @see org.eclipse.linuxtools.lttng.request.ILttngEventRequest#startRequestInd(org.eclipse.linuxtools.tmf.experiment.TmfExperiment, boolean) */ + @Override public void startRequestInd(TmfEventProvider provider) { // trigger the start to process this request provider.sendRequest(this); @@ -106,6 +107,7 @@ public class LttngSyntEventRequest extends TmfEventRequest /* (non-Javadoc) * @see org.eclipse.linuxtools.lttng.request.ILttngEventRequest#notifyCompletion() */ + @Override public void notifyCompletion() { // Notify specific state views for (IRequestStatusListener listener : listeners) { @@ -116,6 +118,7 @@ public class LttngSyntEventRequest extends TmfEventRequest /* (non-Javadoc) * @see org.eclipse.linuxtools.lttng.request.ILttngEventRequest#notifyStarting() */ + @Override public void notifyStarting() { for (IRequestStatusListener listener : listeners) { listener.processingStarted(new RequestStartedSignal(this)); @@ -125,6 +128,7 @@ public class LttngSyntEventRequest extends TmfEventRequest /* (non-Javadoc) * @see org.eclipse.linuxtools.lttng.request.ILttngEventRequest#getExperimentTimeRange() */ + @Override public TmfTimeRange getExperimentTimeRange() { return fExperimentTimeRange; } @@ -136,6 +140,7 @@ public class LttngSyntEventRequest extends TmfEventRequest * org.eclipse.linuxtools.lttng.request.ILttngSyntEventRequest#setSynEventCount * (java.lang.Long) */ + @Override public synchronized void setSynEventCount(Long numOfEvents) { this.feventCount = numOfEvents; } @@ -147,6 +152,7 @@ public class LttngSyntEventRequest extends TmfEventRequest * org.eclipse.linuxtools.lttng.request.ILttngSyntEventRequest#getEventCount * () */ + @Override public synchronized Long getSynEventCount() { return feventCount; } @@ -154,6 +160,7 @@ public class LttngSyntEventRequest extends TmfEventRequest /* (non-Javadoc) * @see org.eclipse.linuxtools.lttng.request.ILttngEventRequest#setclearDataInd(boolean) */ + @Override public void setclearDataInd(boolean clearAllData) { this.clearDataInd = clearAllData; } @@ -161,6 +168,7 @@ public class LttngSyntEventRequest extends TmfEventRequest /* (non-Javadoc) * @see org.eclipse.linuxtools.lttng.request.ILttngEventRequest#isclearDataInd() */ + @Override public boolean isclearDataInd() { return clearDataInd; } @@ -189,6 +197,7 @@ public class LttngSyntEventRequest extends TmfEventRequest /** * @return the source */ + @Override public Object getSource() { return fsource; } @@ -196,6 +205,7 @@ public class LttngSyntEventRequest extends TmfEventRequest /** * @param source */ + @Override public void setSource(Object source) { this.fsource = source; } diff --git a/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/evProcessor/AbsEventToHandlerResolver.java b/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/evProcessor/AbsEventToHandlerResolver.java index 36e21dc913..03a7f71179 100644 --- a/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/evProcessor/AbsEventToHandlerResolver.java +++ b/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/evProcessor/AbsEventToHandlerResolver.java @@ -35,27 +35,32 @@ public abstract class AbsEventToHandlerResolver implements /* (non-Javadoc) * @see org.eclipse.linuxtools.lttng.state.evProcessor.IEventToHandlerResolver#getBeforeProcessor(java.lang.String) */ + @Override public abstract ILttngEventProcessor getBeforeProcessor(String eventType); /* (non-Javadoc) * @see org.eclipse.linuxtools.lttng.state.evProcessor.IEventToHandlerResolver#getAfterProcessor(java.lang.String) */ + @Override public abstract ILttngEventProcessor getAfterProcessor(String eventType); /* (non-Javadoc) * @see org.eclipse.linuxtools.lttng.state.evProcessor.IEventToHandlerResolver#getfinishProcessor() */ + @Override public abstract ILttngEventProcessor getfinishProcessor(); /* (non-Javadoc) * @see org.eclipse.linuxtools.lttng.state.evProcessor.IEventToHandlerResolver#getStateUpdaterProcessor(java.lang.String) */ + @Override public abstract ILttngEventProcessor getStateUpdaterProcessor( String eventType); /* (non-Javadoc) * @see org.eclipse.linuxtools.lttng.state.evProcessor.ILttngEventProcessor#process(org.eclipse.linuxtools.lttng.event.LttngEvent, org.eclipse.linuxtools.lttng.state.model.LttngTraceState) */ + @Override public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) { if (trcEvent instanceof LttngSyntheticEvent) { @@ -122,6 +127,7 @@ public abstract class AbsEventToHandlerResolver implements * (org.eclipse.linuxtools.tmf.event.TmfEvent, * org.eclipse.linuxtools.lttng.state.model.LttngTraceState) */ + @Override public void process(TmfEvent tmfEvent, LttngTraceState traceSt) { if (tmfEvent == null) { return; @@ -154,6 +160,7 @@ public abstract class AbsEventToHandlerResolver implements * @see org.eclipse.linuxtools.lttng.state.evProcessor.ITransEventProcessor# * getEventCount() */ + @Override public Long getBeforeEventCount() { return fbeforeEventCount; } @@ -164,6 +171,7 @@ public abstract class AbsEventToHandlerResolver implements * @see org.eclipse.linuxtools.lttng.state.evProcessor.ITransEventProcessor# * getStateUpdateCount() */ + @Override public Long getStateUpdateCount() { return fstateUpdateCount; } @@ -174,6 +182,7 @@ public abstract class AbsEventToHandlerResolver implements * @see org.eclipse.linuxtools.lttng.state.evProcessor.ITransEventProcessor# * getFilteredOutEventCount() */ + @Override public Long getFilteredOutEventCount() { return filteredOutEventsCount; } diff --git a/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/evProcessor/state/StateUpdateHandlers.java b/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/evProcessor/state/StateUpdateHandlers.java index 6a0dfe9318..971120d3e1 100644 --- a/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/evProcessor/state/StateUpdateHandlers.java +++ b/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/evProcessor/state/StateUpdateHandlers.java @@ -50,6 +50,7 @@ class StateUpdateHandlers { AbsStateUpdate handler = new AbsStateUpdate() { // @Override + @Override public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) { Long cpu = trcEvent.getCpuId(); @@ -92,6 +93,7 @@ class StateUpdateHandlers { AbsStateUpdate handler = new AbsStateUpdate() { // @Override + @Override public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) { Long cpu = trcEvent.getCpuId(); @@ -122,6 +124,7 @@ class StateUpdateHandlers { AbsStateUpdate handler = new AbsStateUpdate() { // @Override + @Override public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) { Long cpu = trcEvent.getCpuId(); @@ -181,6 +184,7 @@ class StateUpdateHandlers { AbsStateUpdate handler = new AbsStateUpdate() { // @Override + @Override public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) { Long cpu = trcEvent.getCpuId(); @@ -216,6 +220,7 @@ class StateUpdateHandlers { AbsStateUpdate handler = new AbsStateUpdate() { // @Override + @Override public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) { Long cpu = trcEvent.getCpuId(); @@ -267,6 +272,7 @@ class StateUpdateHandlers { AbsStateUpdate handler = new AbsStateUpdate() { // @Override + @Override public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) { Long cpu = trcEvent.getCpuId(); @@ -303,6 +309,7 @@ class StateUpdateHandlers { AbsStateUpdate handler = new AbsStateUpdate() { // @Override + @Override public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) { Long cpu = trcEvent.getCpuId(); @@ -340,6 +347,7 @@ class StateUpdateHandlers { private Events eventType = Events.LTT_EVENT_SOFT_IRQ_RAISE; // @Override + @Override public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) { // Long cpu = trcEvent.getCpuId(); @@ -389,6 +397,7 @@ class StateUpdateHandlers { AbsStateUpdate handler = new AbsStateUpdate() { // @Override + @Override public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) { // obtrain cpu @@ -450,6 +459,7 @@ class StateUpdateHandlers { private Events eventType = Events.LTT_EVENT_LIST_INTERRUPT; // @Override + @Override public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) { String action = getAFieldString(trcEvent, traceSt, Fields.LTT_FIELD_ACTION); @@ -489,6 +499,7 @@ class StateUpdateHandlers { AbsStateUpdate handler = new AbsStateUpdate() { // @Override + @Override public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) { // Get Fields @@ -550,6 +561,7 @@ class StateUpdateHandlers { AbsStateUpdate handler = new AbsStateUpdate() { // @Override + @Override public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) { // Get Fields @@ -605,6 +617,7 @@ class StateUpdateHandlers { AbsStateUpdate handler = new AbsStateUpdate() { // @Override + @Override public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) { Long cpu = trcEvent.getCpuId(); Long funcptr = getAFieldLong(trcEvent, traceSt, @@ -626,6 +639,7 @@ class StateUpdateHandlers { AbsStateUpdate handler = new AbsStateUpdate() { // @Override + @Override public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) { Long funcptr = getAFieldLong(trcEvent, traceSt, @@ -653,6 +667,7 @@ class StateUpdateHandlers { AbsStateUpdate handler = new AbsStateUpdate() { // @Override + @Override public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) { // obtain the syscall id Long id = getAFieldLong(trcEvent, traceSt, Fields.LTT_FIELD_ID); @@ -687,6 +702,7 @@ class StateUpdateHandlers { AbsStateUpdate handler = new AbsStateUpdate() { // @Override + @Override public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) { Long ip = getAFieldLong(trcEvent, traceSt, Fields.LTT_FIELD_IP); @@ -716,6 +732,7 @@ class StateUpdateHandlers { AbsStateUpdate handler = new AbsStateUpdate() { // @Override + @Override public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) { // Get id @@ -753,6 +770,7 @@ class StateUpdateHandlers { AbsStateUpdate handler = new AbsStateUpdate() { // @Override + @Override public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) { Long cpu = trcEvent.getCpuId(); @@ -898,6 +916,7 @@ class StateUpdateHandlers { AbsStateUpdate handler = new AbsStateUpdate() { // @Override + @Override public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) { Long cpu = trcEvent.getCpuId(); @@ -1026,6 +1045,7 @@ class StateUpdateHandlers { AbsStateUpdate handler = new AbsStateUpdate() { // @Override + @Override public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) { /* * We stamp a newly created process as kernel_thread. The thread @@ -1077,6 +1097,7 @@ class StateUpdateHandlers { AbsStateUpdate handler = new AbsStateUpdate() { // @Override + @Override public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) { Long pid; @@ -1114,6 +1135,7 @@ class StateUpdateHandlers { AbsStateUpdate handler = new AbsStateUpdate() { // @Override + @Override public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) { Long release_pid; @@ -1190,6 +1212,7 @@ class StateUpdateHandlers { AbsStateUpdate handler = new AbsStateUpdate() { // @Override + @Override public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) { Long cpu = trcEvent.getCpuId(); @@ -1237,6 +1260,7 @@ class StateUpdateHandlers { AbsStateUpdate handler = new AbsStateUpdate() { // @Override + @Override public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) { String name; @@ -1260,6 +1284,7 @@ class StateUpdateHandlers { AbsStateUpdate handler = new AbsStateUpdate() { // @Override + @Override public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) { /* For all processes */ @@ -1377,6 +1402,7 @@ class StateUpdateHandlers { AbsStateUpdate handler = new AbsStateUpdate() { // @Override + @Override public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) { Long parent_pid; diff --git a/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/experiment/StateExperimentManager.java b/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/experiment/StateExperimentManager.java index 2c73665e0a..6499c21653 100644 --- a/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/experiment/StateExperimentManager.java +++ b/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/experiment/StateExperimentManager.java @@ -131,6 +131,7 @@ public class StateExperimentManager extends LTTngTreeNode implements * #experimentSelected_prep * (org.eclipse.linuxtools.tmf.experiment.TmfExperiment) */ + @Override public void experimentSelected_prep(TmfExperiment experiment) { LTTngTreeNode experimentNode = null; if (experiment != null) { @@ -188,6 +189,7 @@ public class StateExperimentManager extends LTTngTreeNode implements * experimentSelected(java.lang.Object, * org.eclipse.linuxtools.tmf.experiment.TmfExperiment) */ + @Override public void experimentSelected(Object source, TmfExperiment experiment) { // validate @@ -213,6 +215,7 @@ public class StateExperimentManager extends LTTngTreeNode implements * experimentUpdated * (org.eclipse.linuxtools.tmf.signal.TmfExperimentUpdatedSignal, boolean) */ + @Override public void experimentUpdated(TmfExperimentUpdatedSignal signal, boolean wait) { // NOTE: This represents the end of TMF indexing for a trace, however // the node was already existing and the state system check points are @@ -224,6 +227,7 @@ public class StateExperimentManager extends LTTngTreeNode implements /** * @return the SelectedExperiment tree node */ + @Override public LTTngTreeNode getSelectedExperiment() { return fSelectedExperiment; } @@ -231,6 +235,7 @@ public class StateExperimentManager extends LTTngTreeNode implements /* (non-Javadoc) * @see org.eclipse.linuxtools.lttng.state.experiment.IStateExperimentManager#getExperimentTimeRange() */ + @Override @SuppressWarnings("unchecked") public TmfTimeRange getExperimentTimeRange() { TmfTimeRange timeRangeResult = null; @@ -259,6 +264,7 @@ public class StateExperimentManager extends LTTngTreeNode implements * org.eclipse.linuxtools.lttng.state.experiment.IStateExperimentManager * #waitForComplete(boolean) */ + @Override public void waitForCompletion(boolean wait) { fwaitForCompletion = wait; } diff --git a/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/trace/StateTraceManager.java b/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/trace/StateTraceManager.java index b26a519add..6c6c533503 100644 --- a/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/trace/StateTraceManager.java +++ b/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/trace/StateTraceManager.java @@ -126,6 +126,7 @@ public class StateTraceManager extends LTTngTreeNode implements IStateTraceManag * * @see org.eclipse.linuxtools.lttng.state.IStateManager#getEventLog() */ + @Override public ITmfTrace getTrace() { return fTrace; } @@ -189,6 +190,7 @@ public class StateTraceManager extends LTTngTreeNode implements IStateTraceManag * restoreCheckPointByTimestamp * (org.eclipse.linuxtools.tmf.event.TmfTimestamp) */ + @Override @SuppressWarnings("unchecked") public TmfTimestamp restoreCheckPointByTimestamp(TmfTimestamp eventTime) { TmfTimeRange experimentRange = fExperiment.getTimeRange(); @@ -285,6 +287,7 @@ public class StateTraceManager extends LTTngTreeNode implements IStateTraceManag * org.eclipse.linuxtools.lttng.state.trace.IStateTraceManager#getStateModel * () */ + @Override public LttngTraceState getStateModel() { synchronized (fStateModel) { return fStateModel; @@ -297,6 +300,7 @@ public class StateTraceManager extends LTTngTreeNode implements IStateTraceManag * @see org.eclipse.linuxtools.lttng.state.trace.IStateTraceManager# * getCheckPointStateModel() */ + @Override public LttngTraceState getCheckPointStateModel() { synchronized (fStateModel) { return fCheckPointStateModel; @@ -390,6 +394,7 @@ public class StateTraceManager extends LTTngTreeNode implements IStateTraceManag * @see org.eclipse.linuxtools.lttng.state.resource.ILttngStateContext# * getNumberOfCpus() */ + @Override public int getNumberOfCpus() { return fcpuNumber; } @@ -400,6 +405,7 @@ public class StateTraceManager extends LTTngTreeNode implements IStateTraceManag * @see org.eclipse.linuxtools.lttng.state.resource.ILttngStateContext# * getTraceTimeWindow() */ + @Override public TmfTimeRange getTraceTimeWindow() { if (fTrace != null) { return fTrace.getTimeRange(); @@ -415,6 +421,7 @@ public class StateTraceManager extends LTTngTreeNode implements IStateTraceManag * org.eclipse.linuxtools.lttng.state.resource.ILttngStateContext#getTraceId * () */ + @Override public String getTraceId() { if (fTrace != null) { return fTrace.getName(); @@ -428,6 +435,7 @@ public class StateTraceManager extends LTTngTreeNode implements IStateTraceManag * @see org.eclipse.linuxtools.lttng.state.trace.IStateTraceManager# * getExperimentTimeWindow() */ + @Override public TmfTimeRange getExperimentTimeWindow() { if (fExperiment != null) { return fExperiment.getTimeRange(); @@ -442,6 +450,7 @@ public class StateTraceManager extends LTTngTreeNode implements IStateTraceManag * org.eclipse.linuxtools.lttng.state.trace.IStateTraceManager#getExperimentName * () */ + @Override public String getExperimentName() { return fExperiment.getName(); } @@ -453,6 +462,7 @@ public class StateTraceManager extends LTTngTreeNode implements IStateTraceManag * org.eclipse.linuxtools.lttng.state.resource.ILttngStateContext#getTraceIdRef * () */ + @Override public ITmfTrace getTraceIdRef() { return fTrace; } @@ -464,6 +474,7 @@ public class StateTraceManager extends LTTngTreeNode implements IStateTraceManag * org.eclipse.linuxtools.lttng.state.trace.IStateTraceManager#clearCheckPoints * () */ + @Override public void clearCheckPoints() { synchronized (checkPointsLock) { stateCheckpointsList.clear(); @@ -485,6 +496,7 @@ public class StateTraceManager extends LTTngTreeNode implements IStateTraceManag * org.eclipse.linuxtools.lttng.state.trace.IStateTraceManager#handleEvent * (org.eclipse.linuxtools.lttng.event.LttngSyntheticEvent, java.lang.Long) */ + @Override public void handleEvent(LttngSyntheticEvent synEvent, Long eventCount) { fStateUpdateProcessor.process(synEvent, fCheckPointStateModel); diff --git a/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/trace/LTTngTextTrace.java b/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/trace/LTTngTextTrace.java index 751a967da2..7d1de2a5c0 100644 --- a/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/trace/LTTngTextTrace.java +++ b/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/trace/LTTngTextTrace.java @@ -109,6 +109,7 @@ public class LTTngTextTrace extends TmfTrace implements ITmfTrace { fCheckpoints = oldTrace.fCheckpoints; } + @Override public LTTngTextTrace createTraceCopy() { LTTngTextTrace returnedTrace = null; diff --git a/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/trace/LTTngTrace.java b/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/trace/LTTngTrace.java index 589759f139..c15f8e0007 100644 --- a/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/trace/LTTngTrace.java +++ b/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/trace/LTTngTrace.java @@ -200,7 +200,8 @@ public class LTTngTrace extends TmfTrace { ); } - public LTTngTrace createTraceCopy() { + @Override + public LTTngTrace createTraceCopy() { LTTngTrace returnedTrace = null; try { diff --git a/org.eclipse.linuxtools.tmf.tests/.classpath b/org.eclipse.linuxtools.tmf.tests/.classpath index 978c0d27e1..2a987e2854 100644 --- a/org.eclipse.linuxtools.tmf.tests/.classpath +++ b/org.eclipse.linuxtools.tmf.tests/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.linuxtools.tmf.tests/META-INF/MANIFEST.MF b/org.eclipse.linuxtools.tmf.tests/META-INF/MANIFEST.MF index a10d278f93..4e1d425d46 100644 --- a/org.eclipse.linuxtools.tmf.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.linuxtools.tmf.tests/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.linuxtools.tmf.tests Bundle-Version: 0.3.0.qualifier -Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-Vendor: %Bundle-Vendor Require-Bundle: org.junit;bundle-version="3.8.2", org.eclipse.linuxtools.tmf;bundle-version="0.2.0", diff --git a/org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf/trace/TmfEventParserStub.java b/org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf/trace/TmfEventParserStub.java index 259604aff4..f4ab4d15bd 100644 --- a/org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf/trace/TmfEventParserStub.java +++ b/org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf/trace/TmfEventParserStub.java @@ -60,7 +60,8 @@ public class TmfEventParserStub implements ITmfEventParser { // ------------------------------------------------------------------------ static final String typePrefix = "Type-"; - @SuppressWarnings("unchecked") + @Override + @SuppressWarnings("unchecked") public TmfEvent parseNextEvent(ITmfTrace eventStream, TmfContext context) throws IOException { if (! (eventStream instanceof TmfTraceStub)) { diff --git a/org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf/trace/TmfTraceStub.java b/org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf/trace/TmfTraceStub.java index da556ba029..4f84e6ae58 100644 --- a/org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf/trace/TmfTraceStub.java +++ b/org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf/trace/TmfTraceStub.java @@ -95,7 +95,8 @@ public class TmfTraceStub extends TmfTrace { return clone; } - public ITmfTrace createTraceCopy() { + @Override + public ITmfTrace createTraceCopy() { ITmfTrace returnedValue = null; returnedValue = clone(); return returnedValue; diff --git a/org.eclipse.linuxtools.tmf.ui.tests/.classpath b/org.eclipse.linuxtools.tmf.ui.tests/.classpath index 62549a7696..8a9fe4165c 100644 --- a/org.eclipse.linuxtools.tmf.ui.tests/.classpath +++ b/org.eclipse.linuxtools.tmf.ui.tests/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.linuxtools.tmf.ui.tests/META-INF/MANIFEST.MF b/org.eclipse.linuxtools.tmf.ui.tests/META-INF/MANIFEST.MF index e2b651ac75..7e111f72ed 100644 --- a/org.eclipse.linuxtools.tmf.ui.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.linuxtools.tmf.ui.tests/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.linuxtools.tmf.ui.tests;singleton:=true Bundle-Version: 0.3.0.qualifier Bundle-Vendor: %Bundle-Vendor -Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Require-Bundle: org.junit, org.eclipse.linuxtools.tmf;bundle-version="0.2.0", org.eclipse.linuxtools.tmf.ui;bundle-version="0.2.0", diff --git a/org.eclipse.linuxtools.tmf.ui.tests/widgetStubs/org/eclipse/linuxtools/tmf/ui/widgets/timeAnalysis/test/stub/model/TraceImpl.java b/org.eclipse.linuxtools.tmf.ui.tests/widgetStubs/org/eclipse/linuxtools/tmf/ui/widgets/timeAnalysis/test/stub/model/TraceImpl.java index 7ffc2d1cf4..83527dfd8e 100644 --- a/org.eclipse.linuxtools.tmf.ui.tests/widgetStubs/org/eclipse/linuxtools/tmf/ui/widgets/timeAnalysis/test/stub/model/TraceImpl.java +++ b/org.eclipse.linuxtools.tmf.ui.tests/widgetStubs/org/eclipse/linuxtools/tmf/ui/widgets/timeAnalysis/test/stub/model/TraceImpl.java @@ -75,26 +75,32 @@ public class TraceImpl implements ITmfTimeAnalysisEntry { this.stopTime = stopTime; } + @Override public String getGroupName() { return groupName; } + @Override public int getId() { return id; } + @Override public String getName() { return name; } + @Override public long getStartTime() { return startTime; } + @Override public long getStopTime() { return stopTime; } + @Override @SuppressWarnings("unchecked") public Vector getTraceEvents() { return traceEvents; diff --git a/org.eclipse.linuxtools.tmf.ui.tests/widgetStubs/org/eclipse/linuxtools/tmf/ui/widgets/timeAnalysis/test/stub/views/TsfTraceAnalysisView.java b/org.eclipse.linuxtools.tmf.ui.tests/widgetStubs/org/eclipse/linuxtools/tmf/ui/widgets/timeAnalysis/test/stub/views/TsfTraceAnalysisView.java index 3a43b5a55b..8e3c9cacd0 100644 --- a/org.eclipse.linuxtools.tmf.ui.tests/widgetStubs/org/eclipse/linuxtools/tmf/ui/widgets/timeAnalysis/test/stub/views/TsfTraceAnalysisView.java +++ b/org.eclipse.linuxtools.tmf.ui.tests/widgetStubs/org/eclipse/linuxtools/tmf/ui/widgets/timeAnalysis/test/stub/views/TsfTraceAnalysisView.java @@ -123,6 +123,7 @@ public class TsfTraceAnalysisView extends ViewPart implements return getName(); } + @Override @SuppressWarnings("rawtypes") public Object getAdapter(Class key) { return null; @@ -161,12 +162,15 @@ public class TsfTraceAnalysisView extends ViewPart implements ITreeContentProvider { private TreeParent invisibleRoot; + @Override public void inputChanged(Viewer v, Object oldInput, Object newInput) { } + @Override public void dispose() { } + @Override public Object[] getElements(Object parent) { if (parent.equals(getViewSite())) { if (invisibleRoot == null) @@ -176,6 +180,7 @@ public class TsfTraceAnalysisView extends ViewPart implements return getChildren(parent); } + @Override public Object getParent(Object child) { if (child instanceof TreeObject) { return ((TreeObject) child).getParent(); @@ -183,6 +188,7 @@ public class TsfTraceAnalysisView extends ViewPart implements return null; } + @Override public Object[] getChildren(Object parent) { if (parent instanceof TreeParent) { return ((TreeParent) parent).getChildren(); @@ -190,6 +196,7 @@ public class TsfTraceAnalysisView extends ViewPart implements return new Object[0]; } + @Override public boolean hasChildren(Object parent) { if (parent instanceof TreeParent) return ((TreeParent) parent).hasChildren(); @@ -292,6 +299,7 @@ public class TsfTraceAnalysisView extends ViewPart implements MenuManager menuMgr = new MenuManager("#PopupMenu"); menuMgr.setRemoveAllWhenShown(true); menuMgr.addMenuListener(new IMenuListener() { + @Override public void menuAboutToShow(IMenuManager manager) { TsfTraceAnalysisView.this.fillContextMenu(manager); } @@ -567,6 +575,7 @@ public class TsfTraceAnalysisView extends ViewPart implements private void hookDoubleClickAction() { viewer.addDoubleClickListener(new IDoubleClickListener() { + @Override public void doubleClick(DoubleClickEvent event) { doubleClickAction.run(); } @@ -586,6 +595,7 @@ public class TsfTraceAnalysisView extends ViewPart implements viewer.getControl().setFocus(); } + @Override public void tsfTmProcessSelEvent(TmfTimeSelectionEvent event) { Object source = event.getSource(); if (source == null || !(source instanceof ITimeAnalysisViewer)) { @@ -650,6 +660,7 @@ public class TsfTraceAnalysisView extends ViewPart implements } + @Override public void tsfTmProcessTimeScaleEvent(TmfTimeScaleSelectionEvent event) { Object source = event.getSource(); if (source == null || !(source instanceof ITimeAnalysisViewer)) { diff --git a/org.eclipse.linuxtools.tmf.ui/.classpath b/org.eclipse.linuxtools.tmf.ui/.classpath index 64c5e31b7a..1fa3e6803d 100644 --- a/org.eclipse.linuxtools.tmf.ui/.classpath +++ b/org.eclipse.linuxtools.tmf.ui/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.linuxtools.tmf.ui/META-INF/MANIFEST.MF b/org.eclipse.linuxtools.tmf.ui/META-INF/MANIFEST.MF index d865250894..3da4b5cf85 100644 --- a/org.eclipse.linuxtools.tmf.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.linuxtools.tmf.ui/META-INF/MANIFEST.MF @@ -10,7 +10,7 @@ Require-Bundle: org.eclipse.ui, org.eclipse.linuxtools.tmf;bundle-version="0.2.0", org.eclipse.core.resources;bundle-version="3.6.0", org.eclipse.ui.ide;bundle-version="3.6.0" -Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-ActivationPolicy: lazy Export-Package: org.eclipse.linuxtools.tmf.ui, org.eclipse.linuxtools.tmf.ui.editors, diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/commands/ManageCustomParsersCommandHandler.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/commands/ManageCustomParsersCommandHandler.java index b1568f31db..420d8bc96b 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/commands/ManageCustomParsersCommandHandler.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/commands/ManageCustomParsersCommandHandler.java @@ -20,7 +20,8 @@ import org.eclipse.swt.widgets.Display; public class ManageCustomParsersCommandHandler extends AbstractHandler { - public Object execute(ExecutionEvent event) throws ExecutionException { + @Override + public Object execute(ExecutionEvent event) throws ExecutionException { ManageCustomParsersDialog dialog = new ManageCustomParsersDialog(Display.getDefault().getActiveShell()); dialog.open(); return null; diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/dialogs/ManageCustomParsersDialog.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/dialogs/ManageCustomParsersDialog.java index 56718766c3..389b3cc428 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/dialogs/ManageCustomParsersDialog.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/dialogs/ManageCustomParsersDialog.java @@ -104,24 +104,30 @@ public class ManageCustomParsersDialog extends Dialog { txtButton.setText("Text"); txtButton.setSelection(true); txtButton.addSelectionListener(new SelectionListener(){ - public void widgetDefaultSelected(SelectionEvent e) {} - public void widgetSelected(SelectionEvent e) { + @Override + public void widgetDefaultSelected(SelectionEvent e) {} + @Override + public void widgetSelected(SelectionEvent e) { fillParserList(); }}); xmlButton = new Button(radioContainer, SWT.RADIO); xmlButton.setText("XML"); xmlButton.addSelectionListener(new SelectionListener(){ - public void widgetDefaultSelected(SelectionEvent e) {} - public void widgetSelected(SelectionEvent e) { + @Override + public void widgetDefaultSelected(SelectionEvent e) {} + @Override + public void widgetSelected(SelectionEvent e) { fillParserList(); }}); parserList = new List(listContainer, SWT.SINGLE | SWT.BORDER | SWT.H_SCROLL | SWT.V_SCROLL); parserList.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true)); parserList.addSelectionListener(new SelectionListener(){ - public void widgetDefaultSelected(SelectionEvent e) {} - public void widgetSelected(SelectionEvent e) { + @Override + public void widgetDefaultSelected(SelectionEvent e) {} + @Override + public void widgetSelected(SelectionEvent e) { if (parserList.getSelectionCount() == 0) { editButton.setEnabled(false); deleteButton.setEnabled(false); @@ -143,8 +149,10 @@ public class ManageCustomParsersDialog extends Dialog { newButton.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false)); newButton.setText("New..."); newButton.addSelectionListener(new SelectionListener(){ - public void widgetDefaultSelected(SelectionEvent e) {} - public void widgetSelected(SelectionEvent e) { + @Override + public void widgetDefaultSelected(SelectionEvent e) {} + @Override + public void widgetSelected(SelectionEvent e) { WizardDialog dialog = null; if (txtButton.getSelection()) { dialog = new WizardDialog(getShell(), new CustomTxtParserWizard()); @@ -162,8 +170,10 @@ public class ManageCustomParsersDialog extends Dialog { editButton.setText("Edit..."); editButton.setEnabled(false); editButton.addSelectionListener(new SelectionListener(){ - public void widgetDefaultSelected(SelectionEvent e) {} - public void widgetSelected(SelectionEvent e) { + @Override + public void widgetDefaultSelected(SelectionEvent e) {} + @Override + public void widgetSelected(SelectionEvent e) { WizardDialog dialog = null; if (txtButton.getSelection()) { dialog = new WizardDialog(getShell(), @@ -183,8 +193,10 @@ public class ManageCustomParsersDialog extends Dialog { deleteButton.setText("Delete"); deleteButton.setEnabled(false); deleteButton.addSelectionListener(new SelectionListener(){ - public void widgetDefaultSelected(SelectionEvent e) {} - public void widgetSelected(SelectionEvent e) { + @Override + public void widgetDefaultSelected(SelectionEvent e) {} + @Override + public void widgetSelected(SelectionEvent e) { boolean confirm = MessageDialog.openQuestion( getShell(), "Delete Custom Parser", @@ -205,8 +217,10 @@ public class ManageCustomParsersDialog extends Dialog { importButton.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false)); importButton.setText("Import..."); importButton.addSelectionListener(new SelectionListener(){ - public void widgetDefaultSelected(SelectionEvent e) {} - public void widgetSelected(SelectionEvent e) { + @Override + public void widgetDefaultSelected(SelectionEvent e) {} + @Override + public void widgetSelected(SelectionEvent e) { FileDialog dialog = new FileDialog(Display.getCurrent().getActiveShell(), SWT.OPEN); dialog.setText("Select custom parser file to import"); dialog.setFilterExtensions(new String[] {"*.xml", "*"}); @@ -232,8 +246,10 @@ public class ManageCustomParsersDialog extends Dialog { exportButton.setText("Export..."); exportButton.setEnabled(false); exportButton.addSelectionListener(new SelectionListener(){ - public void widgetDefaultSelected(SelectionEvent e) {} - public void widgetSelected(SelectionEvent e) { + @Override + public void widgetDefaultSelected(SelectionEvent e) {} + @Override + public void widgetSelected(SelectionEvent e) { FileDialog dialog = new FileDialog(Display.getCurrent().getActiveShell(), SWT.SAVE); dialog.setText("Select file to export the " + parserList.getSelection()[0] + " custom parser"); dialog.setFilterExtensions(new String[] {"*.xml", "*"}); @@ -256,8 +272,10 @@ public class ManageCustomParsersDialog extends Dialog { parseButton.setText("Parse..."); parseButton.setEnabled(false); parseButton.addSelectionListener(new SelectionListener(){ - public void widgetDefaultSelected(SelectionEvent e) {} - public void widgetSelected(SelectionEvent e) { + @Override + public void widgetDefaultSelected(SelectionEvent e) {} + @Override + public void widgetSelected(SelectionEvent e) { FileDialog dialog = new FileDialog(Display.getCurrent().getActiveShell(), SWT.OPEN); dialog.setText("Select log file to parse using the " + parserList.getSelection()[0] + " custom parser"); if (xmlButton.getSelection()) { diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/editors/TmfEditor.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/editors/TmfEditor.java index 36e0ed0a41..91708c7592 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/editors/TmfEditor.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/editors/TmfEditor.java @@ -41,11 +41,13 @@ public abstract class TmfEditor extends EditorPart implements ITmfComponent { // ITmfComponent // ------------------------------------------------------------------------ - public String getName() { + @Override + public String getName() { return fName; } - public void broadcast(TmfSignal signal) { + @Override + public void broadcast(TmfSignal signal) { TmfSignalManager.dispatchSignal(signal); } } 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 3740fae215..c98f9956c0 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 @@ -34,15 +34,18 @@ public class TmfEditorInput implements IEditorInput { fTrace = trace; } - public Object getAdapter(@SuppressWarnings("rawtypes") Class adapter) { + @Override + public Object getAdapter(@SuppressWarnings("rawtypes") Class adapter) { return null; } - public boolean exists() { + @Override + public boolean exists() { return fResource.exists(); } - public ImageDescriptor getImageDescriptor() { + @Override + public ImageDescriptor getImageDescriptor() { if (fResource instanceof IFile) { IFile file = (IFile) fResource; IContentType contentType = IDE.getContentType(file); @@ -52,15 +55,18 @@ public class TmfEditorInput implements IEditorInput { return null; } - public String getName() { + @Override + public String getName() { return fResource.getName(); } - public IPersistableElement getPersistable() { + @Override + public IPersistableElement getPersistable() { return null; } - public String getToolTipText() { + @Override + public String getToolTipText() { return fResource.getFullPath().makeRelative().toString(); } 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 fb9276a63a..3b88050eea 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 @@ -99,7 +99,8 @@ public class TmfEventsEditor extends TmfEditor implements ITmfTraceEditor, IReus } // @Override - public void propertyChanged(Object source, int propId) { + @Override + public void propertyChanged(Object source, int propId) { if (propId == IEditorPart.PROP_INPUT) { broadcast(new TmfTraceClosedSignal(this, fTrace)); fResource = ((TmfEditorInput) getEditorInput()).getResource(); @@ -151,7 +152,8 @@ public class TmfEventsEditor extends TmfEditor implements ITmfTraceEditor, IReus } // @Override - public ITmfTrace getTrace() { + @Override + public ITmfTrace getTrace() { return fTrace; } diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/editors/TmfMultiPageEditorPart.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/editors/TmfMultiPageEditorPart.java index 70a2efcfff..7dc7be0090 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/editors/TmfMultiPageEditorPart.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/editors/TmfMultiPageEditorPart.java @@ -41,11 +41,13 @@ public abstract class TmfMultiPageEditorPart extends MultiPageEditorPart impleme // ITmfComponent // ------------------------------------------------------------------------ - public String getName() { + @Override + public String getName() { return fName; } - public void broadcast(TmfSignal signal) { + @Override + public void broadcast(TmfSignal signal) { TmfSignalManager.dispatchSignal(signal); } } diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomParserProvider.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomParserProvider.java index aaf5fe72ae..4e64770ca2 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomParserProvider.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomParserProvider.java @@ -24,10 +24,12 @@ import org.eclipse.swt.widgets.Composite; public class CustomParserProvider implements IParserProvider { + @Override public String getCategory() { return "Custom"; } + @Override public ITmfTrace getTraceForParser(String parser, IResource resource) { try { String name = resource.getName(); @@ -48,14 +50,17 @@ public class CustomParserProvider implements IParserProvider { return null; } + @Override public ITmfTrace getTraceForContentType(String contentTypeId, IResource resource) { return null; } - public String getEditorIdForParser(String parser) { + @Override + public String getEditorIdForParser(String parser) { return null; } + @Override public Map getParserMap() { Map parserMap = new LinkedHashMap(); for (CustomTxtTraceDefinition def : CustomTxtTraceDefinition.loadAll()) { @@ -67,6 +72,7 @@ public class CustomParserProvider implements IParserProvider { return parserMap; } + @Override public TmfEventsTable getEventsTable(ITmfTrace trace, Composite parent, int cacheSize) { if (trace instanceof CustomTxtTrace) { return new CustomEventsTable(((CustomTxtTrace) trace).getDefinition(), parent, cacheSize); diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomTxtTrace.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomTxtTrace.java index 2cae30c5c3..7901d556f7 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomTxtTrace.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomTxtTrace.java @@ -45,6 +45,7 @@ public class CustomTxtTrace extends TmfTrace { fDefinition = definition; } + @Override public ITmfTrace createTraceCopy() { // TODO Auto-generated method stub return null; diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomTxtTraceDefinition.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomTxtTraceDefinition.java index e9a6d5ee13..ab1803f78e 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomTxtTraceDefinition.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomTxtTraceDefinition.java @@ -264,6 +264,7 @@ public class CustomTxtTraceDefinition extends CustomTraceDefinition { // The following allows xml parsing without access to the dtd EntityResolver resolver = new EntityResolver () { + @Override public InputSource resolveEntity (String publicId, String systemId) { String empty = ""; ByteArrayInputStream bais = new ByteArrayInputStream(empty.getBytes()); @@ -274,8 +275,11 @@ public class CustomTxtTraceDefinition extends CustomTraceDefinition { // The following catches xml parsing exceptions db.setErrorHandler(new ErrorHandler(){ + @Override public void error(SAXParseException saxparseexception) throws SAXException {} + @Override public void warning(SAXParseException saxparseexception) throws SAXException {} + @Override public void fatalError(SAXParseException saxparseexception) throws SAXException { throw saxparseexception; }}); @@ -397,6 +401,7 @@ public class CustomTxtTraceDefinition extends CustomTraceDefinition { // The following allows xml parsing without access to the dtd EntityResolver resolver = new EntityResolver () { + @Override public InputSource resolveEntity (String publicId, String systemId) { String empty = ""; ByteArrayInputStream bais = new ByteArrayInputStream(empty.getBytes()); @@ -407,8 +412,11 @@ public class CustomTxtTraceDefinition extends CustomTraceDefinition { // The following catches xml parsing exceptions db.setErrorHandler(new ErrorHandler(){ + @Override public void error(SAXParseException saxparseexception) throws SAXException {} + @Override public void warning(SAXParseException saxparseexception) throws SAXException {} + @Override public void fatalError(SAXParseException saxparseexception) throws SAXException { throw saxparseexception; }}); @@ -453,6 +461,7 @@ public class CustomTxtTraceDefinition extends CustomTraceDefinition { // The following allows xml parsing without access to the dtd EntityResolver resolver = new EntityResolver () { + @Override public InputSource resolveEntity (String publicId, String systemId) { String empty = ""; ByteArrayInputStream bais = new ByteArrayInputStream(empty.getBytes()); @@ -463,8 +472,11 @@ public class CustomTxtTraceDefinition extends CustomTraceDefinition { // The following catches xml parsing exceptions db.setErrorHandler(new ErrorHandler(){ + @Override public void error(SAXParseException saxparseexception) throws SAXException {} + @Override public void warning(SAXParseException saxparseexception) throws SAXException {} + @Override public void fatalError(SAXParseException saxparseexception) throws SAXException { throw saxparseexception; }}); @@ -567,6 +579,7 @@ public class CustomTxtTraceDefinition extends CustomTraceDefinition { // The following allows xml parsing without access to the dtd EntityResolver resolver = new EntityResolver () { + @Override public InputSource resolveEntity (String publicId, String systemId) { String empty = ""; ByteArrayInputStream bais = new ByteArrayInputStream(empty.getBytes()); @@ -577,8 +590,11 @@ public class CustomTxtTraceDefinition extends CustomTraceDefinition { // The following catches xml parsing exceptions db.setErrorHandler(new ErrorHandler(){ + @Override public void error(SAXParseException saxparseexception) throws SAXException {} + @Override public void warning(SAXParseException saxparseexception) throws SAXException {} + @Override public void fatalError(SAXParseException saxparseexception) throws SAXException { throw saxparseexception; }}); diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomXmlTrace.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomXmlTrace.java index ca4c593f7a..f028c7ffd6 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomXmlTrace.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomXmlTrace.java @@ -93,7 +93,8 @@ public class CustomXmlTrace extends TmfTrace { } - public ITmfTrace createTraceCopy() { + @Override + public ITmfTrace createTraceCopy() { // TODO Auto-generated method stub return null; } @@ -165,7 +166,8 @@ public class CustomXmlTrace extends TmfTrace { // The following allows xml parsing without access to the dtd EntityResolver resolver = new EntityResolver () { - public InputSource resolveEntity (String publicId, String systemId) { + @Override + public InputSource resolveEntity (String publicId, String systemId) { String empty = ""; ByteArrayInputStream bais = new ByteArrayInputStream(empty.getBytes()); return new InputSource(bais); @@ -175,9 +177,12 @@ public class CustomXmlTrace extends TmfTrace { // The following catches xml parsing exceptions db.setErrorHandler(new ErrorHandler(){ - public void error(SAXParseException saxparseexception) throws SAXException {} - public void warning(SAXParseException saxparseexception) throws SAXException {} - public void fatalError(SAXParseException saxparseexception) throws SAXException { + @Override + public void error(SAXParseException saxparseexception) throws SAXException {} + @Override + public void warning(SAXParseException saxparseexception) throws SAXException {} + @Override + public void fatalError(SAXParseException saxparseexception) throws SAXException { throw saxparseexception; }}); diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomXmlTraceDefinition.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomXmlTraceDefinition.java index c6f8b28553..a1efbcfe31 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomXmlTraceDefinition.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomXmlTraceDefinition.java @@ -180,7 +180,8 @@ public class CustomXmlTraceDefinition extends CustomTraceDefinition { // The following allows xml parsing without access to the dtd EntityResolver resolver = new EntityResolver () { - public InputSource resolveEntity (String publicId, String systemId) { + @Override + public InputSource resolveEntity (String publicId, String systemId) { String empty = ""; ByteArrayInputStream bais = new ByteArrayInputStream(empty.getBytes()); return new InputSource(bais); @@ -190,9 +191,12 @@ public class CustomXmlTraceDefinition extends CustomTraceDefinition { // The following catches xml parsing exceptions db.setErrorHandler(new ErrorHandler(){ - public void error(SAXParseException saxparseexception) throws SAXException {} - public void warning(SAXParseException saxparseexception) throws SAXException {} - public void fatalError(SAXParseException saxparseexception) throws SAXException { + @Override + public void error(SAXParseException saxparseexception) throws SAXException {} + @Override + public void warning(SAXParseException saxparseexception) throws SAXException {} + @Override + public void fatalError(SAXParseException saxparseexception) throws SAXException { throw saxparseexception; }}); @@ -320,7 +324,8 @@ public class CustomXmlTraceDefinition extends CustomTraceDefinition { // The following allows xml parsing without access to the dtd EntityResolver resolver = new EntityResolver () { - public InputSource resolveEntity (String publicId, String systemId) { + @Override + public InputSource resolveEntity (String publicId, String systemId) { String empty = ""; ByteArrayInputStream bais = new ByteArrayInputStream(empty.getBytes()); return new InputSource(bais); @@ -330,9 +335,12 @@ public class CustomXmlTraceDefinition extends CustomTraceDefinition { // The following catches xml parsing exceptions db.setErrorHandler(new ErrorHandler(){ - public void error(SAXParseException saxparseexception) throws SAXException {} - public void warning(SAXParseException saxparseexception) throws SAXException {} - public void fatalError(SAXParseException saxparseexception) throws SAXException { + @Override + public void error(SAXParseException saxparseexception) throws SAXException {} + @Override + public void warning(SAXParseException saxparseexception) throws SAXException {} + @Override + public void fatalError(SAXParseException saxparseexception) throws SAXException { throw saxparseexception; }}); @@ -376,7 +384,8 @@ public class CustomXmlTraceDefinition extends CustomTraceDefinition { // The following allows xml parsing without access to the dtd EntityResolver resolver = new EntityResolver () { - public InputSource resolveEntity (String publicId, String systemId) { + @Override + public InputSource resolveEntity (String publicId, String systemId) { String empty = ""; ByteArrayInputStream bais = new ByteArrayInputStream(empty.getBytes()); return new InputSource(bais); @@ -386,9 +395,12 @@ public class CustomXmlTraceDefinition extends CustomTraceDefinition { // The following catches xml parsing exceptions db.setErrorHandler(new ErrorHandler(){ - public void error(SAXParseException saxparseexception) throws SAXException {} - public void warning(SAXParseException saxparseexception) throws SAXException {} - public void fatalError(SAXParseException saxparseexception) throws SAXException { + @Override + public void error(SAXParseException saxparseexception) throws SAXException {} + @Override + public void warning(SAXParseException saxparseexception) throws SAXException {} + @Override + public void fatalError(SAXParseException saxparseexception) throws SAXException { throw saxparseexception; }}); @@ -498,7 +510,8 @@ public class CustomXmlTraceDefinition extends CustomTraceDefinition { // The following allows xml parsing without access to the dtd EntityResolver resolver = new EntityResolver () { - public InputSource resolveEntity (String publicId, String systemId) { + @Override + public InputSource resolveEntity (String publicId, String systemId) { String empty = ""; ByteArrayInputStream bais = new ByteArrayInputStream(empty.getBytes()); return new InputSource(bais); @@ -508,9 +521,12 @@ public class CustomXmlTraceDefinition extends CustomTraceDefinition { // The following catches xml parsing exceptions db.setErrorHandler(new ErrorHandler(){ - public void error(SAXParseException saxparseexception) throws SAXException {} - public void warning(SAXParseException saxparseexception) throws SAXException {} - public void fatalError(SAXParseException saxparseexception) throws SAXException { + @Override + public void error(SAXParseException saxparseexception) throws SAXException {} + @Override + public void warning(SAXParseException saxparseexception) throws SAXException {} + @Override + public void fatalError(SAXParseException saxparseexception) throws SAXException { throw saxparseexception; }}); 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 f31e012008..f304d2bcfc 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 @@ -128,7 +128,8 @@ public class TmfEventsTable extends TmfComponent { // Handle the table item requests fTable.addListener(SWT.SetData, new Listener() { - @SuppressWarnings("unchecked") + @Override + @SuppressWarnings("unchecked") public void handleEvent(Event event) { final TableItem item = (TableItem) event.item; @@ -249,7 +250,8 @@ public class TmfEventsTable extends TmfComponent { // Perform the updates on the UI thread fTable.getDisplay().syncExec(new Runnable() { - public void run() { + @Override + public void run() { //fTable.setSelection(0); fTable.removeAll(); fCacheStartIndex = fCacheEndIndex = 0; // Clear the cache @@ -272,7 +274,8 @@ public class TmfEventsTable extends TmfComponent { if ((signal.getExperiment() != fTrace) || fTable.isDisposed()) return; // Perform the refresh on the UI thread fTable.getDisplay().asyncExec(new Runnable() { - public void run() { + @Override + public void run() { if (!fTable.isDisposed() && fTrace != null) { fTable.setItemCount((int) fTrace.getNbEvents()); fTable.refresh(); @@ -286,7 +289,8 @@ public class TmfEventsTable extends TmfComponent { if ((signal.getTrace() != fTrace ) || fTable.isDisposed()) return; // Perform the refresh on the UI thread fTable.getDisplay().asyncExec(new Runnable() { - public void run() { + @Override + public void run() { if (!fTable.isDisposed() && fTrace != null) { //int nbEvents = (int) fTrace.getNbEvents(); //fTable.setItemCount((nbEvents > 100) ? nbEvents : 100); @@ -303,7 +307,8 @@ public class TmfEventsTable extends TmfComponent { // Perform the refresh on the UI thread fRefreshPending = true; fTable.getDisplay().asyncExec(new Runnable() { - public void run() { + @Override + public void run() { fRefreshPending = false; if (!fTable.isDisposed() && fTrace != null) { fTable.setItemCount((int) fTrace.getNbEvents()); @@ -322,7 +327,8 @@ public class TmfEventsTable extends TmfComponent { final int index = (int) fTrace.getRank(signal.getCurrentTime()); // Perform the updates on the UI thread fTable.getDisplay().asyncExec(new Runnable() { - public void run() { + @Override + public void run() { // Return if table is disposed if (fTable.isDisposed()) return; diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/timeAnalysis/TmfTimeAnalysisViewer.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/timeAnalysis/TmfTimeAnalysisViewer.java index 1de16d6d00..d8fb2bb344 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/timeAnalysis/TmfTimeAnalysisViewer.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/timeAnalysis/TmfTimeAnalysisViewer.java @@ -88,10 +88,12 @@ public class TmfTimeAnalysisViewer implements ITimeAnalysisViewer, ITimeDataProv /* (non-Javadoc) * @see org.eclipse.linuxtools.tmf.ui.widgets.timeAnalysis.api.ITimeAnalysisWidget#display(org.eclipse.linuxtools.tmf.ui.widgets.timeAnalysis.model.TmfTaTrace[]) */ - public void display(ITmfTimeAnalysisEntry[] traceArr) { + @Override + public void display(ITmfTimeAnalysisEntry[] traceArr) { modelUpdate(traceArr); } + @Override public void display(ITmfTimeAnalysisEntry[] traceArr, long start, long end, boolean updateTimeBounds) { modelUpdate(traceArr, start, end, updateTimeBounds); @@ -100,6 +102,7 @@ public class TmfTimeAnalysisViewer implements ITimeAnalysisViewer, ITimeDataProv public void controlMoved(ControlEvent e) { } + @Override public void controlResized(ControlEvent e) { resizeControls(); } @@ -131,6 +134,7 @@ public class TmfTimeAnalysisViewer implements ITimeAnalysisViewer, ITimeDataProv } } + @Override public void itemUpdate(ITmfTimeAnalysisEntry parent, TimeEvent item) { if (null != parent && null != item) { _stateCtrl.refreshPartial(parent, item); @@ -209,6 +213,7 @@ public class TmfTimeAnalysisViewer implements ITimeAnalysisViewer, ITimeDataProv _colors.dispose(); } + @Override public void resizeControls() { Rectangle r = _dataViewer.getClientArea(); if (r.isEmpty()) @@ -317,43 +322,53 @@ public class TmfTimeAnalysisViewer implements ITimeAnalysisViewer, ITimeDataProv filterOutNotification(); } + @Override public void setFocus() { if (null != _stateCtrl) _stateCtrl.setFocus(); } + @Override public boolean isInFocus() { return _stateCtrl.isInFocus(); } + @Override public ITmfTimeAnalysisEntry getSelectedTrace() { return _stateCtrl.getSelectedTrace(); } + @Override public ISelection getSelection() { return _stateCtrl.getSelection(); } + @Override public ISelection getSelectionTrace() { return _stateCtrl.getSelectionTrace(); } + @Override public long getTime0() { return _time0; } + @Override public long getTime1() { return _time1; } + @Override public long getMinTimeInterval() { return _minTimeInterval; } + @Override public int getNameSpace() { return _nameWidth; } + @Override public void setNameSpace(int width) { _nameWidth = width; width = _stateCtrl.getClientArea().width; @@ -366,27 +381,33 @@ public class TmfTimeAnalysisViewer implements ITimeAnalysisViewer, ITimeDataProv _timeScaleCtrl.redraw(); } + @Override public int getTimeSpace() { int w = _stateCtrl.getClientArea().width; return w - _nameWidth; } + @Override public long getSelectedTime() { return _selectedTime; } + @Override public long getBeginTime() { return _beginTime; } + @Override public long getEndTime() { return _endTime; } + @Override public long getMaxTime() { return _time1_; } + @Override public long getMinTime() { return _time0_; } @@ -398,6 +419,7 @@ public class TmfTimeAnalysisViewer implements ITimeAnalysisViewer, ITimeDataProv * org.eclipse.linuxtools.tmf.ui.viewers.timeAnalysis.widgets.ITimeDataProvider * #setStartFinishTimeNotify(long, long) */ + @Override public void setStartFinishTimeNotify(long time0, long time1) { setStartFinishTime(time0, time1); notifyStartFinishTimeSelectionListeners(time0, time1); @@ -407,7 +429,8 @@ public class TmfTimeAnalysisViewer implements ITimeAnalysisViewer, ITimeDataProv /* (non-Javadoc) * @see org.eclipse.linuxtools.tmf.ui.viewers.timeAnalysis.widgets.ITimeDataProvider#notifyStartFinishTime() */ - public void notifyStartFinishTime() { + @Override + public void notifyStartFinishTime() { notifyStartFinishTimeSelectionListeners(_time0, _time1); } @@ -418,6 +441,7 @@ public class TmfTimeAnalysisViewer implements ITimeAnalysisViewer, ITimeDataProv * org.eclipse.linuxtools.tmf.ui.viewers.timeAnalysis.widgets.ITimeDataProvider * #setStartFinishTime(long, long) */ + @Override public void setStartFinishTime(long time0, long time1) { _time0 = time0; if (_time0 < _time0_) @@ -437,11 +461,13 @@ public class TmfTimeAnalysisViewer implements ITimeAnalysisViewer, ITimeDataProv _timeScaleCtrl.redraw(); } + @Override public void resetStartFinishTime() { setStartFinishTimeNotify(_time0_, _time1_); _timeRangeFixed = false; } + @Override public void setSelectedTimeInt(long time, boolean ensureVisible) { // Trace.debug("currentTime:" + _selectedTime + " new time:" + time); _selectedTime = time; @@ -474,6 +500,7 @@ public class TmfTimeAnalysisViewer implements ITimeAnalysisViewer, ITimeDataProv _timeScaleCtrl.redraw(); } + @Override public void widgetDefaultSelected(SelectionEvent e) { // TODO: Opening call stack shall be replaced to a configurable view // new OpenCallStackViewAction().openView(false); @@ -482,32 +509,39 @@ public class TmfTimeAnalysisViewer implements ITimeAnalysisViewer, ITimeDataProv notifySelectionListeners(TmfTimeSelectionEvent.type.WIDGET_DEF_SEL); } + @Override public void widgetSelected(SelectionEvent e) { // Replace by event notification // updateModelSelection(); notifySelectionListeners(TmfTimeSelectionEvent.type.WIDGET_SEL); } + @Override public void selectNextEvent() { _stateCtrl.selectNextEvent(); } + @Override public void selectPrevEvent() { _stateCtrl.selectPrevEvent(); } + @Override public void selectNextTrace() { _stateCtrl.selectNextTrace(); } + @Override public void selectPrevTrace() { _stateCtrl.selectPrevTrace(); } + @Override public void groupTraces(boolean on) { _stateCtrl.groupTraces(on); } + @Override public void filterTraces() { if (_dataViewer == null || _dataViewer.isDisposed()) return; @@ -519,6 +553,7 @@ public class TmfTimeAnalysisViewer implements ITimeAnalysisViewer, ITimeDataProv } } + @Override public void showLegend() { if (_dataViewer == null || _dataViewer.isDisposed()) return; @@ -570,10 +605,12 @@ public class TmfTimeAnalysisViewer implements ITimeAnalysisViewer, ITimeDataProv } } + @Override public void zoomIn() { _stateCtrl.zoomIn(); } + @Override public void zoomOut() { _stateCtrl.zoomOut(); } @@ -582,24 +619,29 @@ public class TmfTimeAnalysisViewer implements ITimeAnalysisViewer, ITimeDataProv return getViewTypeStr() + "." + string; } + @Override public void addWidgetSelectionListner(ITmfTimeSelectionListener listener) { widgetSelectionListners.add(listener); } + @Override public void removeWidgetSelectionListner(ITmfTimeSelectionListener listener) { widgetSelectionListners.removeElement(listener); } + @Override public void addWidgetTimeScaleSelectionListner( ITmfTimeScaleSelectionListener listener) { widgetTimeScaleSelectionListners.add(listener); } + @Override public void removeWidgetTimeScaleSelectionListner( ITmfTimeScaleSelectionListener listener) { widgetTimeScaleSelectionListners.removeElement(listener); } + @Override public void setSelectedTime(long time, boolean ensureVisible, Object source) { if (_acceptSetSelAPICalls == false || this == source) { return; @@ -608,6 +650,7 @@ public class TmfTimeAnalysisViewer implements ITimeAnalysisViewer, ITimeDataProv setSelectedTimeInt(time, ensureVisible); } + @Override public void setSelectedEvent(ITimeEvent event, Object source) { if (_acceptSetSelAPICalls == false || event == null || source == this) { return; @@ -620,6 +663,7 @@ public class TmfTimeAnalysisViewer implements ITimeAnalysisViewer, ITimeDataProv setSelectedTimeInt(event.getTime(), true); } + @Override public void setSelectedTraceTime(ITmfTimeAnalysisEntry trace, long time, Object source) { if (_acceptSetSelAPICalls == false || trace == null || source == this) { return; @@ -632,6 +676,7 @@ public class TmfTimeAnalysisViewer implements ITimeAnalysisViewer, ITimeDataProv setSelectedTimeInt(time, true); } + @Override public void setSelectedTrace(ITmfTimeAnalysisEntry trace) { if (trace == null) { return; @@ -647,6 +692,7 @@ public class TmfTimeAnalysisViewer implements ITimeAnalysisViewer, ITimeDataProv * org.eclipse.linuxtools.tmf.ui.viewers.timeAnalysis.ITimeAnalysisViewer * #setSelectVisTimeWindow(long, long, java.lang.Object) */ + @Override public void setSelectVisTimeWindow(long time0, long time1, Object source) { if (_acceptSetSelAPICalls == false || source == this) { return; @@ -659,6 +705,7 @@ public class TmfTimeAnalysisViewer implements ITimeAnalysisViewer, ITimeDataProv updateExtSynchTimers(); } + @Override public void setAcceptSelectionAPIcalls(boolean acceptCalls) { _acceptSetSelAPICalls = acceptCalls; } @@ -720,18 +767,22 @@ public class TmfTimeAnalysisViewer implements ITimeAnalysisViewer, ITimeDataProv _time1_extSynch = _time1; } + @Override public void setTimeCalendarFormat(boolean toAbsoluteCaltime) { calendarTimeFormat = toAbsoluteCaltime; } + @Override public boolean isCalendarFormat() { return calendarTimeFormat; } + @Override public int getBorderWidth() { return borderWidth; } + @Override public void setBorderWidth(int borderWidth) { if (borderWidth > -1) { this.borderWidth = borderWidth; @@ -740,10 +791,12 @@ public class TmfTimeAnalysisViewer implements ITimeAnalysisViewer, ITimeDataProv } } + @Override public int getHeaderHeight() { return timeScaleHeight; } + @Override public void setHeaderHeight(int headerHeight) { if (headerHeight > -1) { this.timeScaleHeight = headerHeight; @@ -751,6 +804,7 @@ public class TmfTimeAnalysisViewer implements ITimeAnalysisViewer, ITimeDataProv } } + @Override public int getItemHeight() { if (_stateCtrl != null) { return _stateCtrl.getItemHeight(); @@ -758,12 +812,14 @@ public class TmfTimeAnalysisViewer implements ITimeAnalysisViewer, ITimeDataProv return 0; } + @Override public void setItemHeight(int rowHeight) { if (_stateCtrl != null) { _stateCtrl.setItemHeight(rowHeight); } } + @Override public boolean isVisibleVerticalScroll() { if (_stateCtrl != null) { _stateCtrl.isVisibleVerticalScroll(); @@ -771,12 +827,14 @@ public class TmfTimeAnalysisViewer implements ITimeAnalysisViewer, ITimeDataProv return false; } + @Override public void setVisibleVerticalScroll(boolean visibleVerticalScroll) { if (_stateCtrl != null) { _stateCtrl.setVisibleVerticalScroll(visibleVerticalScroll); } } + @Override public void setNameWidthPref(int width) { _nameWidthPref = width; if (width == 0) { @@ -784,14 +842,17 @@ public class TmfTimeAnalysisViewer implements ITimeAnalysisViewer, ITimeDataProv } } + @Override public int getNameWidthPref(int width) { return _nameWidthPref; } + @Override public void addFilterSelectionListner(ITmfTimeFilterSelectionListener listener) { widgetFilterSelectionListeners.add(listener); } + @Override public void removeFilterSelectionListner( ITmfTimeFilterSelectionListener listener) { widgetFilterSelectionListeners.remove(listener); @@ -810,6 +871,7 @@ public class TmfTimeAnalysisViewer implements ITimeAnalysisViewer, ITimeDataProv * * @return */ + @Override public Control getControl() { return _stateCtrl; } @@ -819,6 +881,7 @@ public class TmfTimeAnalysisViewer implements ITimeAnalysisViewer, ITimeDataProv * * @return */ + @Override public ISelectionProvider getSelectionProvider() { return _stateCtrl; } @@ -830,6 +893,7 @@ public class TmfTimeAnalysisViewer implements ITimeAnalysisViewer, ITimeDataProv * org.eclipse.linuxtools.tmf.ui.viewers.timeAnalysis.ITimeAnalysisViewer * #waitCursor(boolean) */ + @Override public void waitCursor(boolean waitInd) { _stateCtrl.waitCursor(waitInd); } diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/timeAnalysis/dialogs/TmfTimeFilterDialog.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/timeAnalysis/dialogs/TmfTimeFilterDialog.java index f3bd9eebdc..9e287cf643 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/timeAnalysis/dialogs/TmfTimeFilterDialog.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/timeAnalysis/dialogs/TmfTimeFilterDialog.java @@ -91,6 +91,7 @@ public class TmfTimeFilterDialog extends TitleAreaDialog { viewer.setInput(new Object()); viewer.addCheckStateListener(new ICheckStateListener() { + @Override public void checkStateChanged(CheckStateChangedEvent event) { Object o = event.getElement(); for (int i = threads.length - 1; i >= 0; i--) { @@ -162,12 +163,15 @@ public class TmfTimeFilterDialog extends TitleAreaDialog { } class ViewContentProvider implements IStructuredContentProvider { + @Override public void dispose() { } + @Override public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { } + @Override public Object[] getElements(Object input) { return threads; } @@ -180,10 +184,12 @@ public class TmfTimeFilterDialog extends TitleAreaDialog { return null; } + @Override public Image getColumnImage(Object element, int columnIndex) { return null; } + @Override public String getColumnText(Object element, int columnIndex) { // TODO: AA: Provide Label Provider externally ITmfTimeAnalysisEntry t = (ITmfTimeAnalysisEntry) element; diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/timeAnalysis/dialogs/TmfTimeLegend.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/timeAnalysis/dialogs/TmfTimeLegend.java index 5d0e54fc67..f1802bb885 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/timeAnalysis/dialogs/TmfTimeLegend.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/timeAnalysis/dialogs/TmfTimeLegend.java @@ -193,6 +193,7 @@ public class TmfTimeLegend extends TitleAreaDialog { this.colorIdx = colorIdx; color = colors.getColor(colorIdx); addListener(SWT.Paint, new Listener() { + @Override public void handleEvent(Event event) { draw(event.gc); } @@ -239,6 +240,7 @@ public class TmfTimeLegend extends TitleAreaDialog { color = colors.getColor(colorIdx); addListener(SWT.Paint, new Listener() { + @Override public void handleEvent(Event event) { draw(event.gc); } @@ -275,6 +277,7 @@ public class TmfTimeLegend extends TitleAreaDialog { color = colors.getColor(colorIdx); addListener(SWT.Paint, new Listener() { + @Override public void handleEvent(Event event) { draw(event.gc); } diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/timeAnalysis/model/TimeEvent.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/timeAnalysis/model/TimeEvent.java index 05681c9701..8083040e66 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/timeAnalysis/model/TimeEvent.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/timeAnalysis/model/TimeEvent.java @@ -16,16 +16,19 @@ public abstract class TimeEvent implements ITimeEvent { /* (non-Javadoc) * @see org.eclipse.linuxtools.tlf.widgets.timeAnalysis.model.TmTaEventI#getTrace() */ + @Override public abstract ITmfTimeAnalysisEntry getEntry(); /* (non-Javadoc) * @see org.eclipse.linuxtools.tlf.widgets.timeAnalysis.model.TmTaEventI#getTime() */ + @Override public abstract long getTime(); /* (non-Javadoc) * @see org.eclipse.linuxtools.tlf.widgets.timeAnalysis.model.TmTaEventI#getDuration() */ + @Override public long getDuration() { return -1; } diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/timeAnalysis/widgets/PlainSelection.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/timeAnalysis/widgets/PlainSelection.java index cd6c0fa274..739ff7798e 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/timeAnalysis/widgets/PlainSelection.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/timeAnalysis/widgets/PlainSelection.java @@ -37,28 +37,34 @@ public class PlainSelection implements IStructuredSelection { list.add(sel); } + @Override public Object getFirstElement() { if (!list.isEmpty()) return list.get(0); return null; } + @Override public Iterator iterator() { return list.iterator(); } + @Override public int size() { return list.size(); } + @Override public Object[] toArray() { return list.toArray(); } + @Override public List toList() { return list; } + @Override public boolean isEmpty() { return list.isEmpty(); } diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/timeAnalysis/widgets/TimeScaleCtrl.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/timeAnalysis/widgets/TimeScaleCtrl.java index 9c53a4d73d..ae7e67261a 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/timeAnalysis/widgets/TimeScaleCtrl.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/timeAnalysis/widgets/TimeScaleCtrl.java @@ -371,6 +371,7 @@ public class TimeScaleCtrl extends TraceCtrl implements MouseListener, return numDigits; } + @Override public void mouseDown(MouseEvent e) { if (_dragState == 0 && null != _timeProvider) { if (1 == e.button) { @@ -391,6 +392,7 @@ public class TimeScaleCtrl extends TraceCtrl implements MouseListener, } } + @Override public void mouseUp(MouseEvent e) { if (e.button == 1 && _dragState == 1) { setCapture(false); @@ -424,6 +426,7 @@ public class TimeScaleCtrl extends TraceCtrl implements MouseListener, } } + @Override public void mouseMove(MouseEvent e) { if (_dragX0 < 0 || _dragState == 0) { return; @@ -450,6 +453,7 @@ public class TimeScaleCtrl extends TraceCtrl implements MouseListener, } } + @Override public void mouseDoubleClick(MouseEvent e) { if (null != _timeProvider) { _timeProvider.resetStartFinishTime(); diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/timeAnalysis/widgets/TmfTimeStatesCtrl.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/timeAnalysis/widgets/TmfTimeStatesCtrl.java index 988c619730..e21bd00deb 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/timeAnalysis/widgets/TmfTimeStatesCtrl.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/timeAnalysis/widgets/TmfTimeStatesCtrl.java @@ -140,6 +140,7 @@ public class TmfTimeStatesCtrl extends TraceCtrl implements FocusListener, mouseScrollFilterListener = new Listener() { // This filter is used to prevent scrolling of the view when the // mouse wheel is used to zoom + @Override public void handleEvent(Event event) { event.doit = false; } @@ -292,6 +293,7 @@ public class TmfTimeStatesCtrl extends TraceCtrl implements FocusListener, return changed; } + @Override public ISelection getSelection() { PlainSelection sel = new PlainSelection(); ITmfTimeAnalysisEntry trace = getSelectedTrace(); @@ -1572,12 +1574,14 @@ public class TmfTimeStatesCtrl extends TraceCtrl implements FocusListener, } } + @Override public void keyTraversed(TraverseEvent e) { if ((e.detail == SWT.TRAVERSE_TAB_NEXT) || (e.detail == SWT.TRAVERSE_TAB_PREVIOUS)) e.doit = true; } + @Override public void keyPressed(KeyEvent e) { int idx = -1; if (SWT.HOME == e.keyCode) { @@ -1632,15 +1636,18 @@ public class TmfTimeStatesCtrl extends TraceCtrl implements FocusListener, } } + @Override public void keyReleased(KeyEvent e) { } + @Override public void focusGained(FocusEvent e) { _isInFocus = true; redraw(); getDisplay().addFilter(SWT.MouseWheel, mouseScrollFilterListener); } + @Override public void focusLost(FocusEvent e) { _isInFocus = false; if (0 != _dragState) { @@ -1655,6 +1662,7 @@ public class TmfTimeStatesCtrl extends TraceCtrl implements FocusListener, return _isInFocus; } + @Override public void mouseMove(MouseEvent e) { if (null == _timeProvider) return; @@ -1694,6 +1702,7 @@ public class TmfTimeStatesCtrl extends TraceCtrl implements FocusListener, updateCursor(e.x, e.y); } + @Override public void mouseDoubleClick(MouseEvent e) { if (null == _timeProvider) return; @@ -1760,6 +1769,7 @@ public class TmfTimeStatesCtrl extends TraceCtrl implements FocusListener, _isDragCursor3 = false; } + @Override public void mouseDown(MouseEvent e) { if (null == _timeProvider) return; @@ -1804,6 +1814,7 @@ public class TmfTimeStatesCtrl extends TraceCtrl implements FocusListener, } } + @Override public void mouseUp(MouseEvent e) { if (0 != _dragState) { setCapture(false); @@ -1820,16 +1831,20 @@ public class TmfTimeStatesCtrl extends TraceCtrl implements FocusListener, } } + @Override public void controlMoved(ControlEvent e) { } + @Override public void controlResized(ControlEvent e) { adjustScrolls(); } + @Override public void widgetDefaultSelected(SelectionEvent e) { } + @Override public void widgetSelected(SelectionEvent e) { if (e.widget == getVerticalBar()) { _topItem = getVerticalBar().getSelection(); @@ -1860,9 +1875,11 @@ public class TmfTimeStatesCtrl extends TraceCtrl implements FocusListener, } } + @Override public void mouseEnter(MouseEvent e) { } + @Override public void mouseExit(MouseEvent e) { if (_mouseHover) { _mouseHover = false; @@ -1870,9 +1887,11 @@ public class TmfTimeStatesCtrl extends TraceCtrl implements FocusListener, } } + @Override public void mouseHover(MouseEvent e) { } + @Override public void mouseScrolled(MouseEvent e) { if (!_isInFocus) return; @@ -1925,6 +1944,7 @@ public class TmfTimeStatesCtrl extends TraceCtrl implements FocusListener, } // @Override + @Override public void addSelectionChangedListener(ISelectionChangedListener listener) { if (listener != null) { if (!_selectionChangedListeners.contains(listener)) { @@ -1934,6 +1954,7 @@ public class TmfTimeStatesCtrl extends TraceCtrl implements FocusListener, } // @Override + @Override public void removeSelectionChangedListener( ISelectionChangedListener listener) { if (listener != null) { @@ -1942,6 +1963,7 @@ public class TmfTimeStatesCtrl extends TraceCtrl implements FocusListener, } // @Override + @Override public void setSelection(ISelection selection) { if (selection instanceof PlainSelection) { PlainSelection sel = (PlainSelection) selection; diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/timeAnalysis/widgets/TraceColorScheme.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/timeAnalysis/widgets/TraceColorScheme.java index 32c533ceb7..fb700f767e 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/timeAnalysis/widgets/TraceColorScheme.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/timeAnalysis/widgets/TraceColorScheme.java @@ -154,6 +154,7 @@ public class TraceColorScheme { this.syscol = syscol; } + @Override public Color get() { return Utils.getSysColor(syscol); } @@ -170,6 +171,7 @@ public class TraceColorScheme { this.b = b; } + @Override public Color get() { return new Color(null, r, g, b); } @@ -195,6 +197,7 @@ public class TraceColorScheme { this.w2 = 1; } + @Override public Color get() { Color col1 = cp1.get(); Color col2 = cp2.get(); diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/timeAnalysis/widgets/TraceCtrl.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/timeAnalysis/widgets/TraceCtrl.java index bb7cab6b11..345b481482 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/timeAnalysis/widgets/TraceCtrl.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/timeAnalysis/widgets/TraceCtrl.java @@ -47,6 +47,7 @@ public abstract class TraceCtrl extends Canvas implements PaintListener { super.dispose(); } + @Override public void paintControl(PaintEvent e) { if (e.widget != this) return; 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 cef468ad03..094380f25b 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 @@ -47,10 +47,12 @@ public abstract class TmfView extends ViewPart implements ITmfComponent { // ITmfComponent // ------------------------------------------------------------------------ + @Override public String getName() { return fName; } + @Override public void broadcast(TmfSignal signal) { TmfSignalManager.dispatchSignal(signal); } diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/ProjectView.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/ProjectView.java index 687ed1d712..e6578c93bc 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/ProjectView.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/ProjectView.java @@ -147,7 +147,8 @@ public class ProjectView extends TmfView { // Perform updates on the UI thread private Runnable fViewRefresher = new Runnable() { - public void run() { + @Override + public void run() { if ((fViewer != null) && (!fViewer.getTree().isDisposed())) { Object[] elements = fViewer.getExpandedElements(); fViewer.refresh(); @@ -191,7 +192,8 @@ public class ProjectView extends TmfView { public void init(IViewSite site) throws PartInitException { super.init(site); fResourceChangeListener = new IResourceChangeListener() { - public void resourceChanged(IResourceChangeEvent event) { + @Override + public void resourceChanged(IResourceChangeEvent event) { if (event.getType() == IResourceChangeEvent.POST_CHANGE) { fProjectRoot.refreshChildren(); refresh(); @@ -200,7 +202,8 @@ public class ProjectView extends TmfView { }; fWorkspace.addResourceChangeListener(fResourceChangeListener); fPreferenceChangeListener = new IPreferenceChangeListener() { - public void preferenceChange(PreferenceChangeEvent event) { + @Override + public void preferenceChange(PreferenceChangeEvent event) { refresh(); } }; diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/TmfProjectNature.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/TmfProjectNature.java index 83b21e345d..57de13a97f 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/TmfProjectNature.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/TmfProjectNature.java @@ -30,6 +30,7 @@ public class TmfProjectNature implements IProjectNature { /* (non-Javadoc) * @see org.eclipse.core.resources.IProjectNature#configure() */ + @Override public void configure() throws CoreException { // TODO Auto-generated method stub @@ -38,6 +39,7 @@ public class TmfProjectNature implements IProjectNature { /* (non-Javadoc) * @see org.eclipse.core.resources.IProjectNature#deconfigure() */ + @Override public void deconfigure() throws CoreException { // TODO Auto-generated method stub @@ -46,6 +48,7 @@ public class TmfProjectNature implements IProjectNature { /* (non-Javadoc) * @see org.eclipse.core.resources.IProjectNature#getProject() */ + @Override public IProject getProject() { return fProject; } @@ -53,6 +56,7 @@ public class TmfProjectNature implements IProjectNature { /* (non-Javadoc) * @see org.eclipse.core.resources.IProjectNature#setProject(org.eclipse.core.resources.IProject) */ + @Override public void setProject(IProject project) { fProject = project; } diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/dialogs/AddTraceWizard.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/dialogs/AddTraceWizard.java index bcb4ae1ed3..d17585b52a 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/dialogs/AddTraceWizard.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/dialogs/AddTraceWizard.java @@ -49,6 +49,7 @@ public class AddTraceWizard extends Wizard implements IImportWizard { /* (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("Adding traces to experiment"); } diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/dialogs/AddTraceWizardPage.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/dialogs/AddTraceWizardPage.java index 8bd411c566..c729b419b2 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/dialogs/AddTraceWizardPage.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/dialogs/AddTraceWizardPage.java @@ -43,6 +43,7 @@ public class AddTraceWizardPage extends WizardPage { fProject = project; } + @Override public void createControl(Composite parent) { Composite container = new Composite(parent, SWT.NULL); container.setLayout(new FormLayout()); diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/dialogs/DialogTraceContentProvider.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/dialogs/DialogTraceContentProvider.java index 0e0ddcd8f0..5bff8e6e3d 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/dialogs/DialogTraceContentProvider.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/dialogs/DialogTraceContentProvider.java @@ -26,6 +26,7 @@ public class DialogTraceContentProvider implements IStructuredContentProvider { /* (non-Javadoc) * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object) */ + @Override public Object[] getElements(Object inputElement) { if (inputElement instanceof TmfTraceFolderNode) { TmfTraceFolderNode folder = (TmfTraceFolderNode) inputElement; @@ -37,6 +38,7 @@ public class DialogTraceContentProvider implements IStructuredContentProvider { /* (non-Javadoc) * @see org.eclipse.jface.viewers.IContentProvider#dispose() */ + @Override public void dispose() { // TODO Auto-generated method stub } @@ -44,6 +46,7 @@ public class DialogTraceContentProvider implements IStructuredContentProvider { /* (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) { // TODO Auto-generated method stub } diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/dialogs/DialogTraceLabelProvider.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/dialogs/DialogTraceLabelProvider.java index 6992840b78..ec23afe1f4 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/dialogs/DialogTraceLabelProvider.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/dialogs/DialogTraceLabelProvider.java @@ -27,6 +27,7 @@ public class DialogTraceLabelProvider extends LabelProvider implements ITableLab /* (non-Javadoc) * @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnImage(java.lang.Object, int) */ + @Override public Image getColumnImage(Object element, int columnIndex) { return null; } @@ -34,6 +35,7 @@ public class DialogTraceLabelProvider extends LabelProvider implements ITableLab /* (non-Javadoc) * @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnText(java.lang.Object, int) */ + @Override public String getColumnText(Object element, int columnIndex) { if (element instanceof TmfTraceNode) { TmfTraceNode entry = (TmfTraceNode) element; diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/dialogs/ImportTraceWizard.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/dialogs/ImportTraceWizard.java index 6cb1e0d23c..5a080b07cb 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/dialogs/ImportTraceWizard.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/dialogs/ImportTraceWizard.java @@ -63,6 +63,7 @@ public class ImportTraceWizard extends Wizard implements IImportWizard { /* (non-Javadoc) * @see org.eclipse.ui.IWorkbenchWizard#init(org.eclipse.ui.IWorkbench, org.eclipse.jface.viewers.IStructuredSelection) */ + @Override @SuppressWarnings("rawtypes") public void init(IWorkbench workbench, IStructuredSelection selection) { fWorkbench = workbench; diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/dialogs/NewExperimentDialog.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/dialogs/NewExperimentDialog.java index 27c593e634..eb96806bc8 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/dialogs/NewExperimentDialog.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/dialogs/NewExperimentDialog.java @@ -101,19 +101,23 @@ public class NewExperimentDialog extends SelectionStatusDialog { protected void createLinkResourceGroup(Composite parent) { linkedResourceGroup = new CreateLinkedResourceGroup(IResource.FOLDER, new Listener() { + @Override public void handleEvent(Event e) { validateLinkedResource(); firstLinkCheck = false; } }, new CreateLinkedResourceGroup.IStringValue() { + @Override public void setValue(String string) { folderNameField.setText(string); } + @Override public String getValue() { return folderNameField.getText(); } + @Override public IResource getResource() { // TODO Auto-generated method stub return null; @@ -160,6 +164,7 @@ public class NewExperimentDialog extends SelectionStatusDialog { folderNameField.setLayoutData(data); folderNameField.setFont(font); folderNameField.addListener(SWT.Modify, new Listener() { + @Override public void handleEvent(Event event) { validateLinkedResource(); } diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/handlers/CloseProjectHandler.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/handlers/CloseProjectHandler.java index e3d728cb1c..4f290619d4 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/handlers/CloseProjectHandler.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/handlers/CloseProjectHandler.java @@ -62,6 +62,7 @@ public class CloseProjectHandler extends AbstractHandler { // Execution // ------------------------------------------------------------------------ + @Override public Object execute(ExecutionEvent event) throws ExecutionException { if (fProject != null) { diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/handlers/DeleteExperimentHandler.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/handlers/DeleteExperimentHandler.java index 924f38aeca..81fd78fc6f 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/handlers/DeleteExperimentHandler.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/handlers/DeleteExperimentHandler.java @@ -66,6 +66,7 @@ public class DeleteExperimentHandler extends AbstractHandler { // Execution // ------------------------------------------------------------------------ + @Override public Object execute(ExecutionEvent event) throws ExecutionException { IFolder folder = fExperiment.getFolder(); diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/handlers/DeleteProjectHandler.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/handlers/DeleteProjectHandler.java index 8bbc3653bc..0279a5dd8a 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/handlers/DeleteProjectHandler.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/handlers/DeleteProjectHandler.java @@ -65,6 +65,7 @@ public class DeleteProjectHandler extends AbstractHandler { // Execution // ------------------------------------------------------------------------ + @Override public Object execute(ExecutionEvent event) throws ExecutionException { IProject project = fProject.getProject(); diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/handlers/DeleteTraceHandler.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/handlers/DeleteTraceHandler.java index 1fa9598aeb..3a3f96fbf4 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/handlers/DeleteTraceHandler.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/handlers/DeleteTraceHandler.java @@ -68,6 +68,7 @@ public class DeleteTraceHandler extends AbstractHandler { // Execution // ------------------------------------------------------------------------ + @Override public Object execute(ExecutionEvent event) throws ExecutionException { IResource resource = fTrace.getResource(); diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/handlers/ImportTraceHandler.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/handlers/ImportTraceHandler.java index af90aed4bf..416e247979 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/handlers/ImportTraceHandler.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/handlers/ImportTraceHandler.java @@ -75,6 +75,7 @@ public class ImportTraceHandler extends AbstractHandler { // Execution // ------------------------------------------------------------------------ + @Override public Object execute(ExecutionEvent event) throws ExecutionException { // Set the selection to the project diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/handlers/NewExperimentHandler.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/handlers/NewExperimentHandler.java index 4d63826067..d40aaaac84 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/handlers/NewExperimentHandler.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/handlers/NewExperimentHandler.java @@ -75,6 +75,7 @@ public class NewExperimentHandler extends AbstractHandler { // Execution // ------------------------------------------------------------------------ + @Override public Object execute(ExecutionEvent event) throws ExecutionException { // Open the experiment creation dialog diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/handlers/NewProjectHandler.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/handlers/NewProjectHandler.java index 03df7f2fe0..76ea56351c 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/handlers/NewProjectHandler.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/handlers/NewProjectHandler.java @@ -66,6 +66,7 @@ public class NewProjectHandler extends AbstractHandler { // Execution // ------------------------------------------------------------------------ + @Override public Object execute(ExecutionEvent event) throws ExecutionException { // Fire the New Project Wizard diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/handlers/OpenExperimentHandler.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/handlers/OpenExperimentHandler.java index 7de08393e7..b72b186fe2 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/handlers/OpenExperimentHandler.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/handlers/OpenExperimentHandler.java @@ -62,6 +62,7 @@ public class OpenExperimentHandler extends AbstractHandler { // Execution // ------------------------------------------------------------------------ + @Override public Object execute(ExecutionEvent event) throws ExecutionException { // Set the selection to the project diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/handlers/OpenProjectHandler.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/handlers/OpenProjectHandler.java index 2e5c8e5723..a98fdb1f86 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/handlers/OpenProjectHandler.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/handlers/OpenProjectHandler.java @@ -62,6 +62,7 @@ public class OpenProjectHandler extends AbstractHandler { // Execution // ------------------------------------------------------------------------ + @Override public Object execute(ExecutionEvent event) throws ExecutionException { if (fProject != null) { diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/handlers/OpenTraceHandler.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/handlers/OpenTraceHandler.java index 151cfcb1fa..8483c0ebe3 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/handlers/OpenTraceHandler.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/handlers/OpenTraceHandler.java @@ -73,6 +73,7 @@ public class OpenTraceHandler extends AbstractHandler { // Execution // ------------------------------------------------------------------------ + @Override public Object execute(ExecutionEvent event) throws ExecutionException { IResource resource = fTrace.getResource(); diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/handlers/RefreshHandler.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/handlers/RefreshHandler.java index 05d2966caa..daf7b338ff 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/handlers/RefreshHandler.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/handlers/RefreshHandler.java @@ -68,6 +68,7 @@ public class RefreshHandler extends AbstractHandler { // Execution // ------------------------------------------------------------------------ + @Override public Object execute(ExecutionEvent event) throws ExecutionException { IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot(); try { diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/handlers/RenameExperimentHandler.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/handlers/RenameExperimentHandler.java index 2dcd99f261..62a423c2ae 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/handlers/RenameExperimentHandler.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/handlers/RenameExperimentHandler.java @@ -41,6 +41,7 @@ public class RenameExperimentHandler extends AbstractHandler { // Execution // ------------------------------------------------------------------------ + @Override public Object execute(ExecutionEvent event) throws ExecutionException { MessageBox mb = new MessageBox(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell()); diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/handlers/RenameProjectHandler.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/handlers/RenameProjectHandler.java index b7f90cd4bd..3d964f9818 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/handlers/RenameProjectHandler.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/handlers/RenameProjectHandler.java @@ -59,6 +59,7 @@ public class RenameProjectHandler extends AbstractHandler { // Execution // ------------------------------------------------------------------------ + @Override public Object execute(ExecutionEvent event) throws ExecutionException { MessageBox mb = new MessageBox(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell()); diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/handlers/RenameTraceHandler.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/handlers/RenameTraceHandler.java index 46728aff08..799f5e97fe 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/handlers/RenameTraceHandler.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/handlers/RenameTraceHandler.java @@ -41,6 +41,7 @@ public class RenameTraceHandler extends AbstractHandler { // Execution // ------------------------------------------------------------------------ + @Override public Object execute(ExecutionEvent event) throws ExecutionException { MessageBox mb = new MessageBox(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell()); diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/handlers/SelectParserHandler.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/handlers/SelectParserHandler.java index ad546e2792..87c8ec685c 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/handlers/SelectParserHandler.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/handlers/SelectParserHandler.java @@ -73,7 +73,8 @@ public class SelectParserHandler extends AbstractHandler { // Execution // ------------------------------------------------------------------------ - @SuppressWarnings("unchecked") + @Override + @SuppressWarnings("unchecked") public Object execute(ExecutionEvent event) throws ExecutionException { IResource resource = fTrace.getResource(); if (fTrace.getParent() instanceof TmfExperimentNode) { diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/handlers/SelectTracesHandler.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/handlers/SelectTracesHandler.java index 056f0d69df..afb1ed8907 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/handlers/SelectTracesHandler.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/handlers/SelectTracesHandler.java @@ -67,6 +67,7 @@ public class SelectTracesHandler extends AbstractHandler { // Execution // ------------------------------------------------------------------------ + @Override public Object execute(ExecutionEvent event) throws ExecutionException { // Open the trace addition wizard diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/model/TmfExperimentFolderNode.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/model/TmfExperimentFolderNode.java index 90d59a7ae1..460fd6b92b 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/model/TmfExperimentFolderNode.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/model/TmfExperimentFolderNode.java @@ -44,6 +44,7 @@ public class TmfExperimentFolderNode extends TmfProjectTreeNode { // TmfProjectTreeNode // ------------------------------------------------------------------------ + @Override public String getName() { return fExperimentFolder.getName(); } diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/model/TmfExperimentNode.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/model/TmfExperimentNode.java index 43e71966da..089ba73040 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/model/TmfExperimentNode.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/model/TmfExperimentNode.java @@ -44,6 +44,7 @@ public class TmfExperimentNode extends TmfProjectTreeNode { // TmfProjectTreeNode // ------------------------------------------------------------------------ + @Override public String getName() { return fExperiment.getName(); } diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/model/TmfProjectContentProvider.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/model/TmfProjectContentProvider.java index 96e73622fe..54fbf6f230 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/model/TmfProjectContentProvider.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/model/TmfProjectContentProvider.java @@ -22,18 +22,22 @@ import org.eclipse.jface.viewers.Viewer; */ public class TmfProjectContentProvider implements ITreeContentProvider { - public Object[] getChildren(Object parentElement) { + @Override + public Object[] getChildren(Object parentElement) { return ((ITmfProjectTreeNode) parentElement).getChildren().toArray(); } + @Override public Object getParent(Object element) { return ((ITmfProjectTreeNode) element).getParent(); } + @Override public boolean hasChildren(Object element) { return ((ITmfProjectTreeNode) element).hasChildren(); } + @Override public Object[] getElements(Object inputElement) { if (inputElement instanceof TmfProjectRoot) { return ((TmfProjectRoot) inputElement).getChildren().toArray(); @@ -41,10 +45,12 @@ import org.eclipse.jface.viewers.Viewer; return null; } + @Override public void dispose() { // TODO Auto-generated method stub } + @Override public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { // TODO Auto-generated method stub } diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/model/TmfProjectLabelProvider.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/model/TmfProjectLabelProvider.java index bc8f0a4681..ffd736aac9 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/model/TmfProjectLabelProvider.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/model/TmfProjectLabelProvider.java @@ -75,6 +75,7 @@ public class TmfProjectLabelProvider implements ILabelProvider { /* (non-Javadoc) * @see org.eclipse.jface.viewers.ILabelProvider#getImage(java.lang.Object) */ + @Override public Image getImage(Object element) { if (element instanceof TmfProjectNode) { @@ -129,6 +130,7 @@ public class TmfProjectLabelProvider implements ILabelProvider { /* (non-Javadoc) * @see org.eclipse.jface.viewers.ILabelProvider#getText(java.lang.Object) */ + @Override public String getText(Object element) { ITmfProjectTreeNode node = (ITmfProjectTreeNode) element; String label = node.getName(); @@ -144,6 +146,7 @@ public class TmfProjectLabelProvider implements ILabelProvider { /* (non-Javadoc) * @see org.eclipse.jface.viewers.IBaseLabelProvider#addListener(org.eclipse.jface.viewers.ILabelProviderListener) */ + @Override public void addListener(ILabelProviderListener listener) { // TODO Auto-generated method stub } @@ -151,6 +154,7 @@ public class TmfProjectLabelProvider implements ILabelProvider { /* (non-Javadoc) * @see org.eclipse.jface.viewers.IBaseLabelProvider#dispose() */ + @Override public void dispose() { // TODO Auto-generated method stub } @@ -158,6 +162,7 @@ public class TmfProjectLabelProvider implements ILabelProvider { /* (non-Javadoc) * @see org.eclipse.jface.viewers.IBaseLabelProvider#isLabelProperty(java.lang.Object, java.lang.String) */ + @Override public boolean isLabelProperty(Object element, String property) { // TODO Auto-generated method stub return false; @@ -166,6 +171,7 @@ public class TmfProjectLabelProvider implements ILabelProvider { /* (non-Javadoc) * @see org.eclipse.jface.viewers.IBaseLabelProvider#removeListener(org.eclipse.jface.viewers.ILabelProviderListener) */ + @Override public void removeListener(ILabelProviderListener listener) { // TODO Auto-generated method stub } diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/model/TmfProjectNode.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/model/TmfProjectNode.java index 74ea1d277f..140bb6208e 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/model/TmfProjectNode.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/model/TmfProjectNode.java @@ -55,6 +55,7 @@ public class TmfProjectNode extends TmfProjectTreeNode { // TmfProjectTreeNode // ------------------------------------------------------------------------ + @Override public String getName() { return fProject.getName(); } diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/model/TmfProjectRoot.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/model/TmfProjectRoot.java index be3d62bf90..cdeae34ad3 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/model/TmfProjectRoot.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/model/TmfProjectRoot.java @@ -51,6 +51,7 @@ public class TmfProjectRoot extends TmfProjectTreeNode { // TmfProjectTreeNode // ------------------------------------------------------------------------ + @Override public String getName() { return null; } diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/model/TmfProjectTreeNode.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/model/TmfProjectTreeNode.java index a137c775e8..c6367e2448 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/model/TmfProjectTreeNode.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/model/TmfProjectTreeNode.java @@ -43,24 +43,30 @@ public abstract class TmfProjectTreeNode implements ITmfProjectTreeNode { // ITmfProjectTreeNode // ------------------------------------------------------------------------ + @Override public ITmfProjectTreeNode getParent() { return fParent; } + @Override public boolean hasChildren() { return fChildren.size() > 0; } + @Override public List getChildren() { return fChildren; } + @Override public abstract void refreshChildren(); + @Override public void refresh() { fParent.refresh(); } + @Override public void removeChild(ITmfProjectTreeNode child) { for (ITmfProjectTreeNode node : fChildren) { if (node == child) { @@ -72,6 +78,7 @@ public abstract class TmfProjectTreeNode implements ITmfProjectTreeNode { } } + @Override public void removeChildren() { for (ITmfProjectTreeNode node : fChildren) { node.removeChildren(); diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/model/TmfTraceFolderNode.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/model/TmfTraceFolderNode.java index c1cf883371..ec193f3215 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/model/TmfTraceFolderNode.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/model/TmfTraceFolderNode.java @@ -46,6 +46,7 @@ public class TmfTraceFolderNode extends TmfProjectTreeNode { // TmfProjectTreeNode // ------------------------------------------------------------------------ + @Override public String getName() { return fTraceFolder.getName(); } diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/model/TmfTraceNode.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/model/TmfTraceNode.java index e81f18d05c..2ce68d4360 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/model/TmfTraceNode.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/model/TmfTraceNode.java @@ -40,6 +40,7 @@ public class TmfTraceNode extends TmfProjectTreeNode { // TmfProjectTreeNode // ------------------------------------------------------------------------ + @Override public String getName() { return fTrace.getName(); } diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/widgets/TmfVirtualTable.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/widgets/TmfVirtualTable.java index 00cb203dfb..cc92e6bb7e 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/widgets/TmfVirtualTable.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/widgets/TmfVirtualTable.java @@ -97,6 +97,7 @@ public class TmfVirtualTable extends Composite { // Add the listeners fTable.addMouseWheelListener(new MouseWheelListener() { + @Override public void mouseScrolled(MouseEvent event) { fTableTopEventRank -= event.count; if (fTableTopEventRank < 0) { @@ -144,9 +145,11 @@ public class TmfVirtualTable extends Composite { }); fTable.addKeyListener(new KeyListener() { + @Override public void keyPressed(KeyEvent event) { handleTableKeyEvent(event); } + @Override public void keyReleased(KeyEvent event) { } }); @@ -303,6 +306,7 @@ public class TmfVirtualTable extends Composite { fSlider.setMaximum(0); fSlider.addListener(SWT.Selection, new Listener() { + @Override public void handleEvent(Event event) { switch (event.detail) { case SWT.ARROW_DOWN: diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/wizards/CustomTxtParserInputWizardPage.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/wizards/CustomTxtParserInputWizardPage.java index 3f0f846b55..2498bd661f 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/wizards/CustomTxtParserInputWizardPage.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/wizards/CustomTxtParserInputWizardPage.java @@ -134,6 +134,7 @@ public class CustomTxtParserInputWizardPage extends WizardPage { } } + @Override public void createControl(Composite parent) { container = new Composite(parent, SWT.NULL); container.setLayout(new GridLayout()); @@ -405,27 +406,33 @@ public class CustomTxtParserInputWizardPage extends WizardPage { private class InputLineTreeNodeContentProvider implements ITreeContentProvider { + @Override public Object[] getElements(Object inputElement) { return ((List) inputElement).toArray(); } + @Override public Object[] getChildren(Object parentElement) { InputLine inputLine = (InputLine) parentElement; if (inputLine.childrenInputs == null) return new InputLine[0]; return inputLine.childrenInputs.toArray(); } + @Override public boolean hasChildren(Object element) { InputLine inputLine = (InputLine) element; return (inputLine.childrenInputs != null && inputLine.childrenInputs.size() > 0); } + @Override public void dispose() { } + @Override public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { } + @Override public Object getParent(Object element) { InputLine inputLine = (InputLine) element; return inputLine.parentInput; @@ -451,6 +458,7 @@ public class CustomTxtParserInputWizardPage extends WizardPage { } private class InputLineTreeSelectionChangedListener implements ISelectionChangedListener { + @Override public void selectionChanged(SelectionChangedEvent event) { if (selectedLine != null) { selectedLine.dispose(); @@ -859,6 +867,7 @@ public class CustomTxtParserInputWizardPage extends WizardPage { helpShell.setLayout(new FillLayout()); helpBrowser = new Browser(helpShell, SWT.NONE); helpBrowser.addTitleListener(new TitleListener() { + @Override public void changed(TitleEvent event) { helpShell.setText(event.title); } @@ -910,16 +919,19 @@ public class CustomTxtParserInputWizardPage extends WizardPage { private class UpdateListener implements ModifyListener, SelectionListener { + @Override public void modifyText(ModifyEvent e) { validate(); updatePreviews(); } + @Override public void widgetDefaultSelected(SelectionEvent e) { validate(); updatePreviews(); } + @Override public void widgetSelected(SelectionEvent e) { validate(); updatePreviews(); @@ -1008,7 +1020,9 @@ public class CustomTxtParserInputWizardPage extends WizardPage { Cardinality.ONE.toString(), "(?,?)"}); cardinalityCombo.addSelectionListener(new SelectionListener(){ + @Override public void widgetDefaultSelected(SelectionEvent e) {} + @Override public void widgetSelected(SelectionEvent e) { switch (cardinalityCombo.getSelectionIndex()) { case 4: //(?,?) @@ -1088,6 +1102,7 @@ public class CustomTxtParserInputWizardPage extends WizardPage { } VerifyListener digitsListener = new VerifyListener() { + @Override public void verifyText(VerifyEvent e) { if (e.text.equals(INFINITY_STRING)) { e.doit = e.widget == cardinalityMaxText && e.start == 0 && e.end == ((Text) e.widget).getText().length(); @@ -1301,7 +1316,9 @@ public class CustomTxtParserInputWizardPage extends WizardPage { CustomTxtTraceDefinition.TAG_OTHER}); tagCombo.select(1); tagCombo.addSelectionListener(new SelectionListener(){ + @Override public void widgetDefaultSelected(SelectionEvent e) {} + @Override public void widgetSelected(SelectionEvent e) { tagText.removeModifyListener(updateListener); switch (tagCombo.getSelectionIndex()) { diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/wizards/CustomTxtParserOutputWizardPage.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/wizards/CustomTxtParserOutputWizardPage.java index 8ef7d6c5da..e640405cad 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/wizards/CustomTxtParserOutputWizardPage.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/wizards/CustomTxtParserOutputWizardPage.java @@ -54,6 +54,7 @@ public class CustomTxtParserOutputWizardPage extends WizardPage { setPageComplete(false); } + @Override public void createControl(Composite parent) { container = new Composite(parent, SWT.NULL); container.setLayout(new GridLayout()); diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/wizards/CustomTxtParserWizard.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/wizards/CustomTxtParserWizard.java index cf9c8c6c08..4b32913a49 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/wizards/CustomTxtParserWizard.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/wizards/CustomTxtParserWizard.java @@ -69,6 +69,7 @@ public class CustomTxtParserWizard extends Wizard implements INewWizard { addPage(outputPage); } + @Override public void init(IWorkbench workbench, IStructuredSelection selection) { this.selection = selection; } diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/wizards/CustomXmlParserInputWizardPage.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/wizards/CustomXmlParserInputWizardPage.java index 1fedaf2a71..9ab6fb752f 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/wizards/CustomXmlParserInputWizardPage.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/wizards/CustomXmlParserInputWizardPage.java @@ -140,6 +140,7 @@ public class CustomXmlParserInputWizardPage extends WizardPage { } } + @Override public void createControl(Composite parent) { container = new Composite(parent, SWT.NULL); container.setLayout(new GridLayout()); @@ -272,6 +273,7 @@ public class CustomXmlParserInputWizardPage extends WizardPage { inputText.setLayoutData(gd); inputText.setText(getSelectionText()); inputText.addModifyListener(new ModifyListener(){ + @Override public void modifyText(ModifyEvent e) { parseXmlInput(inputText.getText()); }}); @@ -455,6 +457,7 @@ public class CustomXmlParserInputWizardPage extends WizardPage { private class InputElementTreeNodeContentProvider implements ITreeContentProvider { + @Override public Object[] getElements(Object inputElement) { CustomXmlTraceDefinition def = (CustomXmlTraceDefinition) inputElement; if (def.rootInputElement != null) { @@ -464,23 +467,28 @@ public class CustomXmlParserInputWizardPage extends WizardPage { } } + @Override public Object[] getChildren(Object parentElement) { InputElement inputElement = (InputElement) parentElement; if (inputElement.childElements == null) return new InputElement[0]; return inputElement.childElements.toArray(); } + @Override public boolean hasChildren(Object element) { InputElement inputElement = (InputElement) element; return (inputElement.childElements != null && inputElement.childElements.size() > 0); } + @Override public void dispose() { } + @Override public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { } + @Override public Object getParent(Object element) { InputElement inputElement = (InputElement) element; return inputElement.parentElement; @@ -502,6 +510,7 @@ public class CustomXmlParserInputWizardPage extends WizardPage { } private class InputElementTreeSelectionChangedListener implements ISelectionChangedListener { + @Override public void selectionChanged(SelectionChangedEvent event) { if (selectedElement != null) { selectedElement.dispose(); @@ -664,6 +673,7 @@ public class CustomXmlParserInputWizardPage extends WizardPage { // The following allows xml parsing without access to the dtd EntityResolver resolver = new EntityResolver () { + @Override public InputSource resolveEntity (String publicId, String systemId) { String empty = ""; ByteArrayInputStream bais = new ByteArrayInputStream(empty.getBytes()); @@ -674,8 +684,11 @@ public class CustomXmlParserInputWizardPage extends WizardPage { // The following catches xml parsing exceptions db.setErrorHandler(new ErrorHandler(){ + @Override public void error(SAXParseException saxparseexception) throws SAXException {} + @Override public void warning(SAXParseException saxparseexception) throws SAXException {} + @Override public void fatalError(SAXParseException saxparseexception) throws SAXException { if (string.trim().length() != 0) { errorText.setText(saxparseexception.getMessage()); @@ -749,6 +762,7 @@ public class CustomXmlParserInputWizardPage extends WizardPage { helpShell.setLayout(new FillLayout()); helpBrowser = new Browser(helpShell, SWT.NONE); helpBrowser.addTitleListener(new TitleListener() { + @Override public void changed(TitleEvent event) { helpShell.setText(event.title); } @@ -761,16 +775,19 @@ public class CustomXmlParserInputWizardPage extends WizardPage { private class UpdateListener implements ModifyListener, SelectionListener { + @Override public void modifyText(ModifyEvent e) { validate(); updatePreviews(); } + @Override public void widgetDefaultSelected(SelectionEvent e) { validate(); updatePreviews(); } + @Override public void widgetSelected(SelectionEvent e) { validate(); updatePreviews(); @@ -816,6 +833,7 @@ public class CustomXmlParserInputWizardPage extends WizardPage { gd.widthHint = 0; elementNameText.setLayoutData(gd); elementNameText.addModifyListener(new ModifyListener(){ + @Override public void modifyText(ModifyEvent e) { ElementNode.this.inputElement.elementName = elementNameText.getText().trim(); group.setText(getName(ElementNode.this.inputElement)); @@ -839,7 +857,9 @@ public class CustomXmlParserInputWizardPage extends WizardPage { logEntryButton.setText("Log Entry"); logEntryButton.setSelection(inputElement.logEntry); logEntryButton.addSelectionListener(new SelectionListener(){ + @Override public void widgetDefaultSelected(SelectionEvent e) {} + @Override public void widgetSelected(SelectionEvent e) { InputElement parent = ElementNode.this.inputElement.parentElement; while (parent != null) { @@ -863,7 +883,9 @@ public class CustomXmlParserInputWizardPage extends WizardPage { CustomXmlTraceDefinition.TAG_OTHER}); tagCombo.setVisibleItemCount(tagCombo.getItemCount()); tagCombo.addSelectionListener(new SelectionListener(){ + @Override public void widgetDefaultSelected(SelectionEvent e) {} + @Override public void widgetSelected(SelectionEvent e) { tagText.removeModifyListener(updateListener); switch (tagCombo.getSelectionIndex()) { @@ -1207,7 +1229,9 @@ public class CustomXmlParserInputWizardPage extends WizardPage { CustomXmlTraceDefinition.TAG_OTHER}); tagCombo.select(2); //Other tagCombo.addSelectionListener(new SelectionListener(){ + @Override public void widgetDefaultSelected(SelectionEvent e) {} + @Override public void widgetSelected(SelectionEvent e) { tagText.removeModifyListener(updateListener); switch (tagCombo.getSelectionIndex()) { diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/wizards/CustomXmlParserOutputWizardPage.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/wizards/CustomXmlParserOutputWizardPage.java index 502af087e5..d9fab22325 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/wizards/CustomXmlParserOutputWizardPage.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/wizards/CustomXmlParserOutputWizardPage.java @@ -55,7 +55,8 @@ public class CustomXmlParserOutputWizardPage extends WizardPage { setPageComplete(false); } - public void createControl(Composite parent) { + @Override + public void createControl(Composite parent) { container = new Composite(parent, SWT.NULL); container.setLayout(new GridLayout()); diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/wizards/CustomXmlParserWizard.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/wizards/CustomXmlParserWizard.java index 9af0bc7874..929e08c029 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/wizards/CustomXmlParserWizard.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/wizards/CustomXmlParserWizard.java @@ -69,7 +69,8 @@ public class CustomXmlParserWizard extends Wizard implements INewWizard { addPage(outputPage); } - public void init(IWorkbench workbench, IStructuredSelection selection) { + @Override + public void init(IWorkbench workbench, IStructuredSelection selection) { this.selection = selection; } diff --git a/org.eclipse.linuxtools.tmf/.classpath b/org.eclipse.linuxtools.tmf/.classpath index 64c5e31b7a..1fa3e6803d 100644 --- a/org.eclipse.linuxtools.tmf/.classpath +++ b/org.eclipse.linuxtools.tmf/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.linuxtools.tmf/META-INF/MANIFEST.MF b/org.eclipse.linuxtools.tmf/META-INF/MANIFEST.MF index fbb5071a50..3626e69efc 100644 --- a/org.eclipse.linuxtools.tmf/META-INF/MANIFEST.MF +++ b/org.eclipse.linuxtools.tmf/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-Activator: org.eclipse.linuxtools.tmf.TmfCorePlugin Bundle-Vendor: %Bundle-Vendor Require-Bundle: org.eclipse.core.runtime, org.eclipse.core.resources;bundle-version="3.6.0" -Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-ActivationPolicy: lazy Export-Package: org.eclipse.linuxtools.tmf, org.eclipse.linuxtools.tmf.component, diff --git a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/component/TmfComponent.java b/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/component/TmfComponent.java index 2f0badc6f2..7cc507a3ef 100644 --- a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/component/TmfComponent.java +++ b/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/component/TmfComponent.java @@ -57,6 +57,7 @@ public abstract class TmfComponent implements ITmfComponent { /* (non-Javadoc) * @see org.eclipse.linuxtools.tmf.component.ITmfComponent#getName() */ + @Override public String getName() { return fName; } @@ -64,6 +65,7 @@ public abstract class TmfComponent implements ITmfComponent { /* (non-Javadoc) * @see org.eclipse.linuxtools.tmf.component.ITmfComponent#dispose() */ + @Override public void dispose() { TmfSignalManager.deregister(this); // if (Tracer.isComponentTraced()) Tracer.traceComponent(this, "terminated"); @@ -72,6 +74,7 @@ public abstract class TmfComponent implements ITmfComponent { /* (non-Javadoc) * @see org.eclipse.linuxtools.tmf.component.ITmfComponent#broadcast(org.eclipse.linuxtools.tmf.signal.TmfSignal) */ + @Override public void broadcast(TmfSignal signal) { TmfSignalManager.dispatchSignal(signal); } diff --git a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/component/TmfDataProvider.java b/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/component/TmfDataProvider.java index 1e93feba1f..c231b1db20 100644 --- a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/component/TmfDataProvider.java +++ b/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/component/TmfDataProvider.java @@ -126,6 +126,7 @@ public abstract class TmfDataProvider extends TmfComponent im // ITmfRequestHandler // ------------------------------------------------------------------------ + @Override public void sendRequest(final ITmfDataRequest request) { synchronized(fLock) { if (fSignalDepth > 0) { @@ -141,6 +142,7 @@ public abstract class TmfDataProvider extends TmfComponent im * * @param thread */ + @Override public void fireRequests() { synchronized(fLock) { for (TmfDataRequest request : fPendingCoalescedRequests) { diff --git a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/experiment/TmfExperiment.java b/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/experiment/TmfExperiment.java index 0ffccef26b..1da7793255 100644 --- a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/experiment/TmfExperiment.java +++ b/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/experiment/TmfExperiment.java @@ -138,6 +138,7 @@ public class TmfExperiment extends TmfEventProvider imple fTimeRange = other.fTimeRange; } + @Override public TmfExperiment createTraceCopy() { TmfExperiment experiment = new TmfExperiment(this); TmfSignalManager.deregister(experiment); @@ -165,26 +166,32 @@ public class TmfExperiment extends TmfEventProvider imple // ITmfTrace // ------------------------------------------------------------------------ + @Override public String getPath() { return null; } + @Override public long getNbEvents() { return fNbEvents; } - public int getCacheSize() { + @Override + public int getCacheSize() { return fIndexPageSize; } + @Override public TmfTimeRange getTimeRange() { return fTimeRange; } + @Override public TmfTimestamp getStartTime() { return fTimeRange.getStartTime(); } + @Override public TmfTimestamp getEndTime() { return fTimeRange.getEndTime(); } @@ -220,7 +227,8 @@ public class TmfExperiment extends TmfEventProvider imple * @param timestamp * @return */ - public long getRank(TmfTimestamp timestamp) { + @Override + public long getRank(TmfTimestamp timestamp) { TmfExperimentContext context = seekEvent(timestamp); return context.getRank(); } @@ -301,6 +309,7 @@ public class TmfExperiment extends TmfEventProvider imple // Returns a brand new context based on the location provided // and initializes the event queues + @Override public synchronized TmfExperimentContext seekLocation(ITmfLocation location) { // Validate the location @@ -348,6 +357,7 @@ public class TmfExperiment extends TmfEventProvider imple /* (non-Javadoc) * @see org.eclipse.linuxtools.tmf.trace.ITmfTrace#seekEvent(org.eclipse.linuxtools.tmf.event.TmfTimestamp) */ + @Override public synchronized TmfExperimentContext seekEvent(TmfTimestamp timestamp) { // Tracer.trace("Ctx: seekEvent(TS) - start"); @@ -401,6 +411,7 @@ public class TmfExperiment extends TmfEventProvider imple /* (non-Javadoc) * @see org.eclipse.linuxtools.tmf.trace.ITmfTrace#seekEvent(long) */ + @Override public synchronized TmfExperimentContext seekEvent(long rank) { // Tracer.trace("Ctx: seekEvent(rank) - start"); @@ -464,6 +475,7 @@ public class TmfExperiment extends TmfEventProvider imple // Tracer.trace(result.toString()); // } + @Override public synchronized TmfEvent getNextEvent(TmfContext context) { // Validate the context @@ -546,6 +558,7 @@ public class TmfExperiment extends TmfEventProvider imple /* (non-Javadoc) * @see org.eclipse.linuxtools.tmf.trace.ITmfTrace#parseEvent(org.eclipse.linuxtools.tmf.trace.TmfContext) */ + @Override public TmfEvent parseEvent(TmfContext context) { // Validate the context diff --git a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/experiment/TmfExperimentCheckpoint.java b/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/experiment/TmfExperimentCheckpoint.java index f93ccb4f19..d7257f6833 100644 --- a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/experiment/TmfExperimentCheckpoint.java +++ b/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/experiment/TmfExperimentCheckpoint.java @@ -84,6 +84,7 @@ public class TmfExperimentCheckpoint implements Comparable extends TmfCoalescedDa // ITmfEventRequest // ------------------------------------------------------------------------ + @Override public TmfTimeRange getRange() { return fRange; } diff --git a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/request/TmfDataRequest.java b/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/request/TmfDataRequest.java index aed62c1997..4c773db3f2 100644 --- a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/request/TmfDataRequest.java +++ b/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/request/TmfDataRequest.java @@ -185,6 +185,7 @@ public abstract class TmfDataRequest implements ITmfDataReque /** * @return the request ID */ + @Override public int getRequestId() { return fRequestId; } @@ -192,6 +193,7 @@ public abstract class TmfDataRequest implements ITmfDataReque /** * @return the index of the first event requested */ + @Override public int getIndex() { return fIndex; } @@ -199,6 +201,7 @@ public abstract class TmfDataRequest implements ITmfDataReque /** * @return the index of the first event requested */ + @Override public ExecutionType getExecType() { return fExecType; } @@ -206,49 +209,56 @@ public abstract class TmfDataRequest implements ITmfDataReque /** * @return the number of requested events (ALL_DATA = all) */ - public int getNbRequested() { + @Override + public int getNbRequested() { return fNbRequested; } /** * @return the number of events read so far */ - public synchronized int getNbRead() { + @Override + public synchronized int getNbRead() { return fNbRead; } /** * @return indicates if the request is completed */ - public boolean isRunning() { + @Override + public boolean isRunning() { return fRequestRunning; } /** * @return indicates if the request is completed */ - public boolean isCompleted() { + @Override + public boolean isCompleted() { return fRequestCompleted; } /** * @return indicates if the request is canceled */ - public boolean isFailed() { + @Override + public boolean isFailed() { return fRequestFailed; } /** * @return indicates if the request is canceled */ - public boolean isCancelled() { + @Override + public boolean isCancelled() { return fRequestCanceled; } /** * @return the requested data type */ - public Class getDataType() { + @Override + public Class getDataType() { return fDataType; } @@ -277,13 +287,15 @@ public abstract class TmfDataRequest implements ITmfDataReque * * @param events - an events */ - public void handleData(T data) { + @Override + public void handleData(T data) { if (data != null) { fNbRead++; } } - public void handleStarted() { + @Override + public void handleStarted() { } /** @@ -296,7 +308,8 @@ public abstract class TmfDataRequest implements ITmfDataReque * As a convenience, handleXXXX methods are provided. They are meant to be * overridden by the application if it needs to handle these conditions. */ - public void handleCompleted() { + @Override + public void handleCompleted() { if (fRequestFailed) { if (Tracer.isRequestTraced()) Tracer.traceRequest(this, "failed"); handleFailure(); @@ -311,13 +324,16 @@ public abstract class TmfDataRequest implements ITmfDataReque } } - public void handleSuccess() { + @Override + public void handleSuccess() { } - public void handleFailure() { + @Override + public void handleFailure() { } - public void handleCancel() { + @Override + public void handleCancel() { } /** @@ -338,7 +354,8 @@ public abstract class TmfDataRequest implements ITmfDataReque * * @throws InterruptedException */ - public void waitForCompletion() throws InterruptedException { + @Override + public void waitForCompletion() throws InterruptedException { while (!fRequestCompleted) { completedLatch.await(); } @@ -347,7 +364,8 @@ public abstract class TmfDataRequest implements ITmfDataReque /** * Called by the request processor upon starting to service the request. */ - public void start() { + @Override + public void start() { if (Tracer.isRequestTraced()) Tracer.traceRequest(this, "starting"); synchronized(this) { fRequestRunning = true; @@ -360,7 +378,8 @@ public abstract class TmfDataRequest implements ITmfDataReque /** * Called by the request processor upon completion. */ - public void done() { + @Override + public void done() { if (Tracer.isRequestTraced()) Tracer.traceRequest(this, "completing"); synchronized(this) { if (!fRequestCompleted) { @@ -375,7 +394,8 @@ public abstract class TmfDataRequest implements ITmfDataReque /** * Called by the request processor upon failure. */ - public synchronized void fail() { + @Override + public synchronized void fail() { fRequestFailed = true; done(); } @@ -383,7 +403,8 @@ public abstract class TmfDataRequest implements ITmfDataReque /** * Called by the request processor upon cancellation. */ - public synchronized void cancel() { + @Override + public synchronized void cancel() { fRequestCanceled = true; done(); } diff --git a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/request/TmfEventRequest.java b/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/request/TmfEventRequest.java index 05f75c8e0f..43dfc53f42 100644 --- a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/request/TmfEventRequest.java +++ b/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/request/TmfEventRequest.java @@ -88,7 +88,8 @@ public abstract class TmfEventRequest extends TmfDataRequest /** * @return the requested time range */ - public TmfTimeRange getRange() { + @Override + public TmfTimeRange getRange() { return fRange; } diff --git a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/request/TmfRequestExecutor.java b/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/request/TmfRequestExecutor.java index 2598a7d953..12cfcb1315 100644 --- a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/request/TmfRequestExecutor.java +++ b/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/request/TmfRequestExecutor.java @@ -32,6 +32,7 @@ public class TmfRequestExecutor implements Executor { private final ExecutorService fExecutor; private final String fExecutorName; private final PriorityBlockingQueue fRequestQueue = new PriorityBlockingQueue(100, new Comparator() { + @Override public int compare(TmfThread o1, TmfThread o2) { if (o1.getExecType() == o2.getExecType()) return 0; @@ -93,6 +94,7 @@ public class TmfRequestExecutor implements Executor { /* (non-Javadoc) * @see java.util.concurrent.Executor#execute(java.lang.Runnable) */ + @Override public synchronized void execute(final Runnable requestThread) { fRequestQueue.offer(new TmfThread(((TmfThread) requestThread).getExecType()) { @Override diff --git a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/trace/ITmfTrace.java b/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/trace/ITmfTrace.java index f524dbb2a4..6afae45b7f 100644 --- a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/trace/ITmfTrace.java +++ b/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/trace/ITmfTrace.java @@ -33,6 +33,7 @@ public interface ITmfTrace extends ITmfComponent { /** * @return the trace name */ + @Override public String getName(); /** diff --git a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/trace/TmfCheckpoint.java b/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/trace/TmfCheckpoint.java index b630f78fce..3d23329787 100644 --- a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/trace/TmfCheckpoint.java +++ b/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/trace/TmfCheckpoint.java @@ -117,7 +117,8 @@ public class TmfCheckpoint implements Comparable, Cloneable { // Comparable // ------------------------------------------------------------------------ - public int compareTo(TmfCheckpoint other) { + @Override + public int compareTo(TmfCheckpoint other) { return fTimestamp.compareTo(other.fTimestamp, false); } diff --git a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/trace/TmfContext.java b/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/trace/TmfContext.java index 2dfc2de0dd..e03e85ea24 100644 --- a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/trace/TmfContext.java +++ b/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/trace/TmfContext.java @@ -50,27 +50,33 @@ public class TmfContext implements ITmfContext, Cloneable { // ITmfContext // ------------------------------------------------------------------------ + @Override public void setLocation(ITmfLocation location) { fLocation = location; } + @Override public ITmfLocation getLocation() { return fLocation; } + @Override public void setRank(long rank) { fRank = rank; } + @Override public long getRank() { return fRank; } + @Override public void updateRank(int delta) { if (isValidRank()) fRank += delta; } + @Override public boolean isValidRank() { return fRank != UNKNOWN_RANK; } diff --git a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/trace/TmfLocation.java b/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/trace/TmfLocation.java index 258e685230..5e00215631 100644 --- a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/trace/TmfLocation.java +++ b/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/trace/TmfLocation.java @@ -37,10 +37,12 @@ public class TmfLocation implements ITmfLocation { fLocation = other.fLocation; } + @Override public void setLocation(L location) { fLocation = location; } + @Override public L getLocation() { return fLocation; } diff --git a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/trace/TmfTrace.java b/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/trace/TmfTrace.java index dde6360114..fff6a88af8 100644 --- a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/trace/TmfTrace.java +++ b/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/trace/TmfTrace.java @@ -120,42 +120,48 @@ public abstract class TmfTrace extends TmfEventProvider i /** * @return the trace path */ - public String getPath() { + @Override + public String getPath() { return fPath; } /* (non-Javadoc) * @see org.eclipse.linuxtools.tmf.stream.ITmfEventStream#getNbEvents() */ - public long getNbEvents() { + @Override + public long getNbEvents() { return fNbEvents; } /** * @return the size of the cache */ - public int getCacheSize() { + @Override + public int getCacheSize() { return fIndexPageSize; } /* (non-Javadoc) * @see org.eclipse.linuxtools.tmf.stream.ITmfEventStream#getTimeRange() */ - public TmfTimeRange getTimeRange() { + @Override + public TmfTimeRange getTimeRange() { return new TmfTimeRange(fStartTime, fEndTime); } /* (non-Javadoc) * @see org.eclipse.linuxtools.tmf.trace.ITmfTrace#getStartTime() */ - public TmfTimestamp getStartTime() { + @Override + public TmfTimestamp getStartTime() { return fStartTime; } /* (non-Javadoc) * @see org.eclipse.linuxtools.tmf.trace.ITmfTrace#getEndTime() */ - public TmfTimestamp getEndTime() { + @Override + public TmfTimestamp getEndTime() { return fEndTime; } @@ -171,7 +177,8 @@ public abstract class TmfTrace extends TmfEventProvider i * @param timestamp * @return */ - public long getRank(TmfTimestamp timestamp) { + @Override + public long getRank(TmfTimestamp timestamp) { TmfContext context = seekEvent(timestamp); return context.getRank(); } @@ -228,7 +235,8 @@ public abstract class TmfTrace extends TmfEventProvider i /* (non-Javadoc) * @see org.eclipse.linuxtools.tmf.trace.ITmfTrace#seekEvent(org.eclipse.linuxtools.tmf.event.TmfTimestamp) */ - public TmfContext seekEvent(TmfTimestamp timestamp) { + @Override + public TmfContext seekEvent(TmfTimestamp timestamp) { if (timestamp == null) { timestamp = TmfTimestamp.BigBang; @@ -275,7 +283,8 @@ public abstract class TmfTrace extends TmfEventProvider i /* (non-Javadoc) * @see org.eclipse.linuxtools.tmf.trace.ITmfTrace#seekEvent(int) */ - public TmfContext seekEvent(long rank) { + @Override + public TmfContext seekEvent(long rank) { // Position the stream at the previous checkpoint int index = (int) rank / fIndexPageSize; @@ -309,6 +318,7 @@ public abstract class TmfTrace extends TmfEventProvider i /* (non-Javadoc) * @see org.eclipse.linuxtools.tmf.trace.ITmfTrace#getNextEvent(org.eclipse.linuxtools.tmf.trace.ITmfTrace.TraceContext) */ + @Override public synchronized TmfEvent getNextEvent(TmfContext context) { // parseEvent() does not update the context TmfEvent event = parseEvent(context); @@ -354,9 +364,11 @@ public abstract class TmfTrace extends TmfEventProvider i /** * To be implemented by the concrete class */ - public abstract TmfContext seekLocation(ITmfLocation location); + @Override + public abstract TmfContext seekLocation(ITmfLocation location); public abstract ITmfLocation getCurrentLocation(); - public abstract TmfEvent parseEvent(TmfContext context); + @Override + public abstract TmfEvent parseEvent(TmfContext context); // ------------------------------------------------------------------------ // toString -- 2.34.1