From 6256d8ad70f478e5ed584d9c60d012381c506d67 Mon Sep 17 00:00:00 2001 From: Alexandre Montplaisir Date: Tue, 5 Jun 2012 17:47:03 -0400 Subject: [PATCH] tmf: Drop generics from ITmfTrace and TmfExperiment Most of the generics are redundant now that we have interfaces. In this case, the ITmfEvent type is always implied. Lots of lines affected, but most of it is just removing the stuff in brackets. Fixes bug #382905 Change-Id: Ic857457d3ecea6ba4e369c79e9b24255572bfa77 Signed-off-by: Alexandre Montplaisir Reviewed-on: https://git.eclipse.org/r/6969 --- .../ui/views/controlflow/ControlFlowView.java | 18 ++- .../ui/views/resources/ResourcesView.java | 17 +-- .../tests/component/TmfEventProviderTest.java | 53 ++++---- .../component/TmfProviderManagerTest.java | 95 +++++++------- .../tests/ctfadaptor/CtfTmfTraceTest.java | 3 +- .../ctfadaptor/headless/RequestBenchmark.java | 14 +- .../tmf/core/tests/event/TmfEventTest.java | 16 +-- .../request/TmfCoalescedDataRequestTest.java | 116 ++++++++--------- .../request/TmfCoalescedEventRequestTest.java | 117 ++++++++--------- .../tests/request/TmfDataRequestTest.java | 42 +++--- .../tests/request/TmfEventRequestTest.java | 42 +++--- .../tests/trace/TmfCheckpointIndexTest.java | 10 +- .../TmfExperimentCheckpointIndexTest.java | 14 +- .../core/tests/trace/TmfExperimentTest.java | 43 +++---- .../trace/TmfMultiTraceExperimentTest.java | 33 +++-- .../tmf/core/tests/trace/TmfTraceTest.java | 50 ++++---- .../tests/stubs/component/TmfClientStub.java | 4 +- .../stubs/component/TmfDataProviderStub.java | 13 +- .../stubs/component/TmfEventProviderStub.java | 13 +- .../TmfSyntheticEventProviderStub.java | 23 ++-- .../stubs/event/TmfSyntheticEventStub.java | 3 +- .../stubs/request/TmfDataRequestStub.java | 16 +-- .../stubs/request/TmfEventRequestStub.java | 18 ++- .../tests/stubs/trace/TmfEventParserStub.java | 8 +- .../tests/stubs/trace/TmfExperimentStub.java | 5 +- .../tmf/tests/stubs/trace/TmfIndexerStub.java | 4 +- .../tmf/tests/stubs/trace/TmfTraceStub.java | 15 ++- .../linuxtools/internal/tmf/core/Tracer.java | 4 +- .../core/component/TmfProviderManager.java | 53 ++++---- .../core/request/TmfCoalescedDataRequest.java | 64 +++++---- .../request/TmfCoalescedEventRequest.java | 55 ++++---- .../tmf/core/statesystem/HistoryBuilder.java | 10 +- .../tmf/core/component/ITmfDataProvider.java | 8 +- .../tmf/core/component/TmfDataProvider.java | 63 +++++---- .../tmf/core/component/TmfEventProvider.java | 34 +++-- .../tmf/core/ctfadaptor/CtfTmfEvent.java | 2 +- .../tmf/core/ctfadaptor/CtfTmfTrace.java | 5 +- .../linuxtools/tmf/core/event/ITmfEvent.java | 8 +- .../linuxtools/tmf/core/event/TmfEvent.java | 22 ++-- .../tmf/core/request/ITmfDataRequest.java | 8 +- .../tmf/core/request/ITmfEventRequest.java | 5 +- .../tmf/core/request/TmfDataRequest.java | 51 ++++---- .../tmf/core/request/TmfEventRequest.java | 28 ++-- .../signal/TmfExperimentDisposedSignal.java | 11 +- .../TmfExperimentRangeUpdatedSignal.java | 13 +- .../signal/TmfExperimentSelectedSignal.java | 11 +- .../signal/TmfExperimentUpdatedSignal.java | 13 +- .../tmf/core/signal/TmfSignalManager.java | 31 +++-- .../signal/TmfStateSystemBuildCompleted.java | 14 +- .../core/signal/TmfTraceSelectedSignal.java | 12 +- .../core/signal/TmfTraceUpdatedSignal.java | 12 +- .../core/statesystem/IStateChangeInput.java | 1 - .../tmf/core/trace/ITmfEventParser.java | 6 +- .../linuxtools/tmf/core/trace/ITmfTrace.java | 8 +- .../tmf/core/trace/ITmfTraceIndexer.java | 4 +- .../tmf/core/trace/TmfCheckpoint.java | 12 +- .../tmf/core/trace/TmfCheckpointIndexer.java | 16 +-- .../tmf/core/trace/TmfExperiment.java | 53 ++++---- .../linuxtools/tmf/core/trace/TmfTrace.java | 58 ++++----- .../uml2sd/TmfAsyncSequenceDiagramEvent.java | 18 +-- .../uml2sd/TmfSyncSequenceDiagramEvent.java | 6 +- .../uml2sd/loader/Uml2SDTestFacility.java | 11 +- .../uml2sd/trace/TmfUml2SDTestTrace.java | 8 +- .../tmf/ui/parsers/custom/CustomEvent.java | 18 ++- .../tmf/ui/parsers/custom/CustomTxtEvent.java | 6 +- .../tmf/ui/parsers/custom/CustomTxtTrace.java | 9 +- .../tmf/ui/parsers/custom/CustomXmlEvent.java | 6 +- .../tmf/ui/parsers/custom/CustomXmlTrace.java | 9 +- .../CustomTxtParserOutputWizardPage.java | 30 +++-- .../CustomXmlParserOutputWizardPage.java | 30 +++-- .../tmf/ui/project/handlers/DeleteAction.java | 10 +- .../project/handlers/DeleteTraceHandler.java | 16 ++- .../tmf/ui/project/handlers/OpenAction.java | 8 +- .../handlers/OpenExperimentHandler.java | 14 +- .../ui/project/handlers/OpenTraceHandler.java | 1 - .../handlers/SelectTraceTypeHandler.java | 18 ++- .../tmf/ui/signal/TmfTraceClosedSignal.java | 12 +- .../tmf/ui/signal/TmfTraceOpenedSignal.java | 12 +- .../tmf/ui/editors/EventsViewEditor.java | 4 +- .../tmf/ui/editors/ITmfTraceEditor.java | 2 +- .../tmf/ui/editors/TmfEditorInput.java | 6 +- .../tmf/ui/editors/TmfEventsEditor.java | 14 +- .../tmf/ui/project/model/TmfTraceElement.java | 44 +++---- .../ui/project/wizards/CopyTraceDialog.java | 10 +- .../wizards/ImportTraceWizardPage.java | 4 +- .../ui/project/wizards/RenameTraceDialog.java | 10 +- .../tmf/ui/signal/TmfTraceClosedSignal.java | 6 +- .../tmf/ui/signal/TmfTraceOpenedSignal.java | 6 +- .../events/ITmfEventsFilterListener.java | 5 +- .../tmf/ui/viewers/events/TmfEventsCache.java | 24 ++-- .../tmf/ui/viewers/events/TmfEventsTable.java | 23 ++-- .../views/environment/TmfEnvironmentView.java | 13 +- .../tmf/ui/views/events/TmfEventsView.java | 20 ++- .../HistogramCurrentTimeControl.java | 16 +-- .../ui/views/histogram/HistogramRequest.java | 2 +- .../tmf/ui/views/histogram/HistogramView.java | 15 +-- .../views/statistics/TmfStatisticsView.java | 29 ++--- .../timechart/TimeChartAnalysisEntry.java | 6 +- .../tmf/ui/views/timechart/TimeChartView.java | 20 +-- .../uml2sd/loader/TmfUml2SDSyncLoader.java | 24 ++-- .../widgets/rawviewer/TmfRawEventViewer.java | 121 ++++++++++-------- 101 files changed, 1069 insertions(+), 1097 deletions(-) diff --git a/org.eclipse.linuxtools.lttng2.kernel.ui/src/org/eclipse/linuxtools/internal/lttng2/kernel/ui/views/controlflow/ControlFlowView.java b/org.eclipse.linuxtools.lttng2.kernel.ui/src/org/eclipse/linuxtools/internal/lttng2/kernel/ui/views/controlflow/ControlFlowView.java index 03d2c4f94d..45e913fa73 100644 --- a/org.eclipse.linuxtools.lttng2.kernel.ui/src/org/eclipse/linuxtools/internal/lttng2/kernel/ui/views/controlflow/ControlFlowView.java +++ b/org.eclipse.linuxtools.lttng2.kernel.ui/src/org/eclipse/linuxtools/internal/lttng2/kernel/ui/views/controlflow/ControlFlowView.java @@ -31,7 +31,6 @@ import org.eclipse.linuxtools.internal.lttng2.kernel.core.Attributes; import org.eclipse.linuxtools.internal.lttng2.kernel.ui.Messages; import org.eclipse.linuxtools.lttng2.kernel.core.trace.CtfKernelTrace; import org.eclipse.linuxtools.tmf.core.ctfadaptor.CtfTmfTimestamp; -import org.eclipse.linuxtools.tmf.core.event.ITmfEvent; import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange; import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp; import org.eclipse.linuxtools.tmf.core.exceptions.AttributeNotFoundException; @@ -115,7 +114,7 @@ public class ControlFlowView extends TmfView { private TimeGraphCombo fTimeGraphCombo; // The selected experiment - private TmfExperiment fSelectedExperiment; + private TmfExperiment fSelectedExperiment; // The timegraph entry list private ArrayList fEntryList; @@ -412,7 +411,7 @@ public class ControlFlowView extends TmfView { * The signal that's received */ @TmfSignalHandler - public void experimentSelected(final TmfExperimentSelectedSignal signal) { + public void experimentSelected(final TmfExperimentSelectedSignal signal) { if (signal.getExperiment().equals(fSelectedExperiment)) { return; } @@ -440,7 +439,7 @@ public class ControlFlowView extends TmfView { final long time = signal.getCurrentTime().normalize(0, -9).getValue(); int thread = -1; - for (ITmfTrace trace : fSelectedExperiment.getTraces()) { + for (ITmfTrace trace : fSelectedExperiment.getTraces()) { if (thread > 0) { break; } @@ -533,11 +532,11 @@ public class ControlFlowView extends TmfView { */ @TmfSignalHandler public void stateSystemBuildCompleted (final TmfStateSystemBuildCompleted signal) { - final TmfExperiment selectedExperiment = fSelectedExperiment; + final TmfExperiment selectedExperiment = fSelectedExperiment; if (selectedExperiment == null || selectedExperiment.getTraces() == null) { return; } - for (ITmfTrace trace : selectedExperiment.getTraces()) { + for (ITmfTrace trace : selectedExperiment.getTraces()) { if (trace == signal.getTrace() && trace instanceof CtfKernelTrace) { final Thread thread = new Thread("ControlFlowView build") { //$NON-NLS-1$ @Override @@ -555,13 +554,12 @@ public class ControlFlowView extends TmfView { // Internal // ------------------------------------------------------------------------ - @SuppressWarnings("unchecked") - private void selectExperiment(TmfExperiment experiment) { + private void selectExperiment(TmfExperiment experiment) { fStartTime = Long.MAX_VALUE; fEndTime = Long.MIN_VALUE; - fSelectedExperiment = (TmfExperiment) experiment; + fSelectedExperiment = experiment; ArrayList rootList = new ArrayList(); - for (ITmfTrace trace : experiment.getTraces()) { + for (ITmfTrace trace : experiment.getTraces()) { if (trace instanceof CtfKernelTrace) { ArrayList entryList = new ArrayList(); CtfKernelTrace ctfKernelTrace = (CtfKernelTrace) trace; diff --git a/org.eclipse.linuxtools.lttng2.kernel.ui/src/org/eclipse/linuxtools/internal/lttng2/kernel/ui/views/resources/ResourcesView.java b/org.eclipse.linuxtools.lttng2.kernel.ui/src/org/eclipse/linuxtools/internal/lttng2/kernel/ui/views/resources/ResourcesView.java index 4dca24190c..4fb79a47f5 100644 --- a/org.eclipse.linuxtools.lttng2.kernel.ui/src/org/eclipse/linuxtools/internal/lttng2/kernel/ui/views/resources/ResourcesView.java +++ b/org.eclipse.linuxtools.lttng2.kernel.ui/src/org/eclipse/linuxtools/internal/lttng2/kernel/ui/views/resources/ResourcesView.java @@ -28,8 +28,6 @@ import org.eclipse.linuxtools.internal.lttng2.kernel.ui.Messages; import org.eclipse.linuxtools.internal.lttng2.kernel.ui.views.resources.ResourcesEntry.Type; import org.eclipse.linuxtools.lttng2.kernel.core.trace.CtfKernelTrace; import org.eclipse.linuxtools.tmf.core.ctfadaptor.CtfTmfTimestamp; -import org.eclipse.linuxtools.tmf.core.event.ITmfEvent; -import org.eclipse.linuxtools.tmf.core.event.TmfEvent; import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange; import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp; import org.eclipse.linuxtools.tmf.core.exceptions.AttributeNotFoundException; @@ -89,7 +87,7 @@ public class ResourcesView extends TmfView { TimeGraphViewer fTimeGraphViewer; // The selected experiment - private TmfExperiment fSelectedExperiment; + private TmfExperiment fSelectedExperiment; // The time graph entry list private ArrayList fEntryList; @@ -349,7 +347,7 @@ public class ResourcesView extends TmfView { * The incoming signal */ @TmfSignalHandler - public void experimentSelected(final TmfExperimentSelectedSignal signal) { + public void experimentSelected(final TmfExperimentSelectedSignal signal) { if (signal.getExperiment().equals(fSelectedExperiment)) { return; } @@ -422,11 +420,11 @@ public class ResourcesView extends TmfView { */ @TmfSignalHandler public void stateSystemBuildCompleted (final TmfStateSystemBuildCompleted signal) { - final TmfExperiment selectedExperiment = fSelectedExperiment; + final TmfExperiment selectedExperiment = fSelectedExperiment; if (selectedExperiment == null || selectedExperiment.getTraces() == null) { return; } - for (ITmfTrace trace : selectedExperiment.getTraces()) { + for (ITmfTrace trace : selectedExperiment.getTraces()) { if (trace == signal.getTrace() && trace instanceof CtfKernelTrace) { final Thread thread = new Thread("ResourcesView build") { //$NON-NLS-1$ @Override @@ -444,13 +442,12 @@ public class ResourcesView extends TmfView { // Internal // ------------------------------------------------------------------------ - @SuppressWarnings("unchecked") - private void selectExperiment(TmfExperiment experiment) { + private void selectExperiment(TmfExperiment experiment) { fStartTime = Long.MAX_VALUE; fEndTime = Long.MIN_VALUE; - fSelectedExperiment = (TmfExperiment) experiment; + fSelectedExperiment = experiment; ArrayList entryList = new ArrayList(); - for (ITmfTrace trace : experiment.getTraces()) { + for (ITmfTrace trace : experiment.getTraces()) { if (trace instanceof CtfKernelTrace) { CtfKernelTrace ctfKernelTrace = (CtfKernelTrace) trace; IStateSystemQuerier ssq = ctfKernelTrace.getStateSystem(); diff --git a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/component/TmfEventProviderTest.java b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/component/TmfEventProviderTest.java index 273f3d0e2c..3854007fb1 100644 --- a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/component/TmfEventProviderTest.java +++ b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/component/TmfEventProviderTest.java @@ -18,6 +18,7 @@ import junit.framework.TestCase; import org.eclipse.linuxtools.internal.tmf.core.component.TmfProviderManager; import org.eclipse.linuxtools.tmf.core.component.ITmfDataProvider; +import org.eclipse.linuxtools.tmf.core.event.ITmfEvent; import org.eclipse.linuxtools.tmf.core.event.TmfEvent; import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange; import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp; @@ -72,17 +73,17 @@ public class TmfEventProviderTest extends TestCase { // There should be 2 TmfEvent providers: a TmfTraceStub and a // TmfEventProviderStub - ITmfDataProvider[] eventProviders = (ITmfDataProvider[]) TmfProviderManager.getProviders(TmfEvent.class); + ITmfDataProvider[] eventProviders = TmfProviderManager.getProviders(TmfEvent.class); assertEquals("getProviders", 2, eventProviders.length); - eventProviders = (ITmfDataProvider[]) TmfProviderManager.getProviders(TmfEvent.class, TmfTraceStub.class); + eventProviders = TmfProviderManager.getProviders(TmfEvent.class, TmfTraceStub.class); assertEquals("getProviders", 1, eventProviders.length); - eventProviders = (ITmfDataProvider[]) TmfProviderManager.getProviders(TmfEvent.class, TmfEventProviderStub.class); + eventProviders = TmfProviderManager.getProviders(TmfEvent.class, TmfEventProviderStub.class); assertEquals("getProviders", 1, eventProviders.length); // There should be 1 TmfSyntheticEventStub provider - eventProviders = (ITmfDataProvider[]) TmfProviderManager.getProviders(TmfSyntheticEventStub.class); + eventProviders = TmfProviderManager.getProviders(TmfSyntheticEventStub.class); assertEquals("getProviders", 1, eventProviders.length); } @@ -97,17 +98,17 @@ public class TmfEventProviderTest extends TestCase { final int BLOCK_SIZE = 100; final int NB_EVENTS = 1000; - final Vector requestedEvents = new Vector(); + final Vector requestedEvents = new Vector(); // Get the TmfSyntheticEventStub provider - ITmfDataProvider[] eventProviders = (ITmfDataProvider[]) TmfProviderManager.getProviders(TmfEvent.class, + ITmfDataProvider[] eventProviders = TmfProviderManager.getProviders(TmfEvent.class, TmfEventProviderStub.class); - ITmfDataProvider provider = eventProviders[0]; + ITmfDataProvider provider = eventProviders[0]; TmfTimeRange range = new TmfTimeRange(TmfTimestamp.BIG_BANG, TmfTimestamp.BIG_CRUNCH); - final TmfEventRequest request = new TmfEventRequest(TmfEvent.class, range, NB_EVENTS, BLOCK_SIZE) { + final TmfEventRequest request = new TmfEventRequest(TmfEvent.class, range, NB_EVENTS, BLOCK_SIZE) { @Override - public void handleData(TmfEvent event) { + public void handleData(ITmfEvent event) { super.handleData(event); requestedEvents.add(event); } @@ -140,20 +141,20 @@ public class TmfEventProviderTest extends TestCase { final int NUMBER_EVENTS_BEFORE_CANCEL_REQ1 = 10; final int NUMBER_EVENTS_BEFORE_CANCEL_REQ2 = 800; - final Vector requestedEventsReq1 = new Vector(); - final Vector requestedEventsReq2 = new Vector(); + final Vector requestedEventsReq1 = new Vector(); + final Vector requestedEventsReq2 = new Vector(); // Get the TmfSyntheticEventStub provider - ITmfDataProvider[] eventProviders = (ITmfDataProvider[]) TmfProviderManager.getProviders(TmfEvent.class, + ITmfDataProvider[] eventProviders = TmfProviderManager.getProviders(TmfEvent.class, TmfEventProviderStub.class); - ITmfDataProvider provider = eventProviders[0]; + ITmfDataProvider provider = eventProviders[0]; TmfTimeRange range = new TmfTimeRange(TmfTimestamp.BIG_BANG, TmfTimestamp.BIG_CRUNCH); // Create first request - final TmfEventRequest request1 = new TmfEventRequest(TmfEvent.class, range, NB_EVENTS, BLOCK_SIZE) { + final TmfEventRequest request1 = new TmfEventRequest(TmfEvent.class, range, NB_EVENTS, BLOCK_SIZE) { @Override - public void handleData(TmfEvent event) { + public void handleData(ITmfEvent event) { super.handleData(event); requestedEventsReq1.add(event); @@ -178,9 +179,9 @@ public class TmfEventProviderTest extends TestCase { assertFalse("isRunning", request1.isRunning()); // Create second request - final TmfEventRequest request2 = new TmfEventRequest(TmfEvent.class, range, NB_EVENTS, BLOCK_SIZE) { + final TmfEventRequest request2 = new TmfEventRequest(TmfEvent.class, range, NB_EVENTS, BLOCK_SIZE) { @Override - public void handleData(TmfEvent event) { + public void handleData(ITmfEvent event) { super.handleData(event); requestedEventsReq2.add(event); @@ -244,17 +245,17 @@ public class TmfEventProviderTest extends TestCase { private static void getSyntheticData(final TmfTimeRange range, final int nbEvents, final int blockSize) throws InterruptedException { - final Vector requestedEvents = new Vector(); + final Vector requestedEvents = new Vector(); // Get the event provider - ITmfDataProvider[] eventProviders = (ITmfDataProvider[]) TmfProviderManager + ITmfDataProvider[] eventProviders = TmfProviderManager .getProviders(TmfSyntheticEventStub.class); - ITmfDataProvider provider = eventProviders[0]; + ITmfDataProvider provider = eventProviders[0]; - final TmfEventRequest request = new TmfEventRequest(TmfSyntheticEventStub.class, range, + final TmfEventRequest request = new TmfEventRequest(TmfSyntheticEventStub.class, range, nbEvents, blockSize) { @Override - public void handleData(TmfSyntheticEventStub event) { + public void handleData(ITmfEvent event) { super.handleData(event); requestedEvents.add(event); } @@ -364,17 +365,17 @@ public class TmfEventProviderTest extends TestCase { // There should be 2 TmfEvent providers: a TmfTraceStub and a // TmfEventProviderStub - ITmfDataProvider[] eventProviders = (ITmfDataProvider[]) TmfProviderManager.getProviders(TmfEvent.class); + ITmfDataProvider[] eventProviders = TmfProviderManager.getProviders(TmfEvent.class); assertEquals("getProviders", 2, eventProviders.length); - eventProviders = (ITmfDataProvider[]) TmfProviderManager.getProviders(TmfEvent.class, TmfTraceStub.class); + eventProviders = TmfProviderManager.getProviders(TmfEvent.class, TmfTraceStub.class); assertEquals("getProviders", 1, eventProviders.length); - eventProviders = (ITmfDataProvider[]) TmfProviderManager.getProviders(TmfEvent.class, TmfEventProviderStub.class); + eventProviders = TmfProviderManager.getProviders(TmfEvent.class, TmfEventProviderStub.class); assertEquals("getProviders", 1, eventProviders.length); // There should be 1 TmfSyntheticEventStub provider - eventProviders = (ITmfDataProvider[]) TmfProviderManager.getProviders(TmfSyntheticEventStub.class); + eventProviders = TmfProviderManager.getProviders(TmfSyntheticEventStub.class); assertEquals("getProviders", 1, eventProviders.length); } diff --git a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/component/TmfProviderManagerTest.java b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/component/TmfProviderManagerTest.java index d38657bc90..4f9c425f17 100644 --- a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/component/TmfProviderManagerTest.java +++ b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/component/TmfProviderManagerTest.java @@ -16,6 +16,7 @@ import junit.framework.TestCase; import org.eclipse.linuxtools.internal.tmf.core.component.TmfProviderManager; import org.eclipse.linuxtools.tmf.core.component.TmfDataProvider; +import org.eclipse.linuxtools.tmf.core.event.ITmfEvent; import org.eclipse.linuxtools.tmf.core.event.TmfEvent; import org.eclipse.linuxtools.tmf.core.request.ITmfDataRequest; import org.eclipse.linuxtools.tmf.core.trace.ITmfContext; @@ -49,12 +50,12 @@ public class TmfProviderManagerTest extends TestCase { // Dummy Providers // ------------------------------------------------------------------------ - private class TestProvider1 extends TmfDataProvider { + private class TestProvider1 extends TmfDataProvider { public TestProvider1(Class type) { super("TestProvider1", type); } @Override - public ITmfContext armRequest(ITmfDataRequest request) { + public ITmfContext armRequest(ITmfDataRequest request) { return null; } @Override @@ -62,17 +63,17 @@ public class TmfProviderManagerTest extends TestCase { return null; } @Override - public boolean isCompleted(ITmfDataRequest request, TmfEvent data, int nbRead) { + public boolean isCompleted(ITmfDataRequest request, ITmfEvent data, int nbRead) { return false; } } - private class TestProvider2 extends TmfDataProvider { + private class TestProvider2 extends TmfDataProvider { public TestProvider2(Class type) { super("TestProvider2", type); } @Override - public ITmfContext armRequest(ITmfDataRequest request) { + public ITmfContext armRequest(ITmfDataRequest request) { return null; } @Override @@ -80,7 +81,7 @@ public class TmfProviderManagerTest extends TestCase { return null; } @Override - public boolean isCompleted(ITmfDataRequest request, TmfEvent data, int nbRead) { + public boolean isCompleted(ITmfDataRequest request, ITmfEvent data, int nbRead) { return false; } } @@ -92,12 +93,12 @@ public class TmfProviderManagerTest extends TestCase { } } - private class TestProvider3 extends TmfDataProvider { + private class TestProvider3 extends TmfDataProvider { public TestProvider3(Class type) { super("TestProvider3", type); } @Override - public ITmfContext armRequest(ITmfDataRequest request) { + public ITmfContext armRequest(ITmfDataRequest request) { return null; } @Override @@ -105,7 +106,7 @@ public class TmfProviderManagerTest extends TestCase { return null; } @Override - public boolean isCompleted(ITmfDataRequest request, TmfEvent3 data, int nbRead) { + public boolean isCompleted(ITmfDataRequest request, ITmfEvent data, int nbRead) { return false; } } @@ -118,10 +119,10 @@ public class TmfProviderManagerTest extends TestCase { * */ public void testRegister_0() { - TmfDataProvider[] providers = (TmfDataProvider[]) TmfProviderManager.getProviders(TmfEvent.class); + TmfDataProvider[] providers = TmfProviderManager.getProviders(TmfEvent.class); assertEquals("getProviders", 0, providers.length); - providers = (TmfDataProvider[]) TmfProviderManager.getProviders(TmfEvent.class, TestProvider1.class); + providers = TmfProviderManager.getProviders(TmfEvent.class, TestProvider1.class); assertEquals("getProviders", 0, providers.length); } @@ -133,21 +134,21 @@ public class TmfProviderManagerTest extends TestCase { // Register a single provider TestProvider1 testProvider1 = new TestProvider1(TmfEvent.class); - TmfDataProvider[] providers = (TmfDataProvider[]) TmfProviderManager.getProviders(TmfEvent.class); + TmfDataProvider[] providers = TmfProviderManager.getProviders(TmfEvent.class); assertEquals("getProviders", 1, providers.length); assertEquals("getProviders", testProvider1, providers[0]); - providers = (TmfDataProvider[]) TmfProviderManager.getProviders(TmfEvent.class, TestProvider1.class); + providers = TmfProviderManager.getProviders(TmfEvent.class, TestProvider1.class); assertEquals("getProviders", 1, providers.length); assertEquals("getProviders", testProvider1, providers[0]); // Unregister it testProvider1.dispose(); - providers = (TmfDataProvider[]) TmfProviderManager.getProviders(TmfEvent.class); + providers = TmfProviderManager.getProviders(TmfEvent.class); assertEquals("getProviders", 0, providers.length); - providers = (TmfDataProvider[]) TmfProviderManager.getProviders(TmfEvent.class, TestProvider1.class); + providers = TmfProviderManager.getProviders(TmfEvent.class, TestProvider1.class); assertEquals("getProviders", 0, providers.length); } @@ -160,7 +161,7 @@ public class TmfProviderManagerTest extends TestCase { TestProvider1 testProvider1 = new TestProvider1(TmfEvent.class); TestProvider2 testProvider2 = new TestProvider2(TmfEvent.class); - TmfDataProvider[] providers = (TmfDataProvider[]) TmfProviderManager.getProviders(TmfEvent.class); + TmfDataProvider[] providers = TmfProviderManager.getProviders(TmfEvent.class); assertEquals("getProviders", 2, providers.length); assertTrue(providers.length == 2); if (providers[0] == testProvider1) { @@ -171,38 +172,38 @@ public class TmfProviderManagerTest extends TestCase { assertEquals("getProviders", testProvider1, providers[1]); } - providers = (TmfDataProvider[]) TmfProviderManager.getProviders(TmfEvent.class, TestProvider1.class); + providers = TmfProviderManager.getProviders(TmfEvent.class, TestProvider1.class); assertEquals("getProviders", 1, providers.length); assertEquals("getProviders", testProvider1, providers[0]); - providers = (TmfDataProvider[]) TmfProviderManager.getProviders(TmfEvent.class, TestProvider2.class); + providers = TmfProviderManager.getProviders(TmfEvent.class, TestProvider2.class); assertEquals("getProviders", 1, providers.length); assertEquals("getProviders", testProvider2, providers[0]); // Remove one testProvider1.dispose(); - providers = (TmfDataProvider[]) TmfProviderManager.getProviders(TmfEvent.class); + providers = TmfProviderManager.getProviders(TmfEvent.class); assertEquals("getProviders", 1, providers.length); assertEquals("getProviders", testProvider2, providers[0]); - providers = (TmfDataProvider[]) TmfProviderManager.getProviders(TmfEvent.class, TestProvider1.class); + providers = TmfProviderManager.getProviders(TmfEvent.class, TestProvider1.class); assertEquals("getProviders", 0, providers.length); - providers = (TmfDataProvider[]) TmfProviderManager.getProviders(TmfEvent.class, TestProvider2.class); + providers = TmfProviderManager.getProviders(TmfEvent.class, TestProvider2.class); assertEquals("getProviders", 1, providers.length); assertEquals("getProviders", testProvider2, providers[0]); // Remove the other testProvider2.dispose(); - providers = (TmfDataProvider[]) TmfProviderManager.getProviders(TmfEvent.class); + providers = TmfProviderManager.getProviders(TmfEvent.class); assertEquals("getProviders", 0, providers.length); - providers = (TmfDataProvider[]) TmfProviderManager.getProviders(TmfEvent.class, TestProvider1.class); + providers = TmfProviderManager.getProviders(TmfEvent.class, TestProvider1.class); assertEquals("getProviders", 0, providers.length); - providers = (TmfDataProvider[]) TmfProviderManager.getProviders(TmfEvent.class, TestProvider2.class); + providers = TmfProviderManager.getProviders(TmfEvent.class, TestProvider2.class); assertEquals("getProviders", 0, providers.length); } @@ -216,7 +217,7 @@ public class TmfProviderManagerTest extends TestCase { TestProvider2 testProvider2 = new TestProvider2(TmfEvent.class); TestProvider3 testProvider3 = new TestProvider3(TmfEvent3.class); - TmfDataProvider[] providers = (TmfDataProvider[]) TmfProviderManager.getProviders(TmfEvent.class); + TmfDataProvider[] providers = TmfProviderManager.getProviders(TmfEvent.class); assertEquals("getProviders", 2, providers.length); if (providers[0] == testProvider1) { assertEquals("getProviders", testProvider2, providers[1]); @@ -226,80 +227,80 @@ public class TmfProviderManagerTest extends TestCase { assertEquals("getProviders", testProvider1, providers[1]); } - TmfDataProvider[] providers3 = (TmfDataProvider[]) TmfProviderManager.getProviders(TmfEvent3.class); + TmfDataProvider[] providers3 = TmfProviderManager.getProviders(TmfEvent3.class); assertEquals("getProviders", 1, providers3.length); assertEquals("getProviders", testProvider3, providers3[0]); - providers = (TmfDataProvider[]) TmfProviderManager.getProviders(TmfEvent.class, TestProvider1.class); + providers = TmfProviderManager.getProviders(TmfEvent.class, TestProvider1.class); assertEquals("getProviders", 1, providers.length); assertEquals("getProviders", testProvider1, providers[0]); - providers = (TmfDataProvider[]) TmfProviderManager.getProviders(TmfEvent.class, TestProvider2.class); + providers = TmfProviderManager.getProviders(TmfEvent.class, TestProvider2.class); assertEquals("getProviders", 1, providers.length); assertEquals("getProviders", testProvider2, providers[0]); - providers3 = (TmfDataProvider[]) TmfProviderManager.getProviders(TmfEvent3.class, TestProvider3.class); + providers3 = TmfProviderManager.getProviders(TmfEvent3.class, TestProvider3.class); assertEquals("getProviders", 1, providers3.length); assertEquals("getProviders", testProvider3, providers3[0]); // Remove one testProvider1.dispose(); - providers = (TmfDataProvider[]) TmfProviderManager.getProviders(TmfEvent.class); + providers = TmfProviderManager.getProviders(TmfEvent.class); assertEquals("getProviders", 1, providers.length); assertEquals("getProviders", testProvider2, providers[0]); - providers = (TmfDataProvider[]) TmfProviderManager.getProviders(TmfEvent.class, TestProvider1.class); + providers = TmfProviderManager.getProviders(TmfEvent.class, TestProvider1.class); assertEquals("getProviders", 0, providers.length); - providers = (TmfDataProvider[]) TmfProviderManager.getProviders(TmfEvent.class, TestProvider2.class); + providers = TmfProviderManager.getProviders(TmfEvent.class, TestProvider2.class); assertEquals("getProviders", 1, providers.length); assertEquals("getProviders", testProvider2, providers[0]); - providers3 = (TmfDataProvider[]) TmfProviderManager.getProviders(TmfEvent3.class); + providers3 = TmfProviderManager.getProviders(TmfEvent3.class); assertEquals("getProviders", 1, providers3.length); assertEquals("getProviders", testProvider3, providers3[0]); - providers3 = (TmfDataProvider[]) TmfProviderManager.getProviders(TmfEvent3.class, TestProvider3.class); + providers3 = TmfProviderManager.getProviders(TmfEvent3.class, TestProvider3.class); assertEquals("getProviders", 1, providers3.length); assertEquals("getProviders", testProvider3, providers3[0]); // Remove another one testProvider2.dispose(); - providers = (TmfDataProvider[]) TmfProviderManager.getProviders(TmfEvent.class); + providers = TmfProviderManager.getProviders(TmfEvent.class); assertEquals("getProviders", 0, providers.length); - providers = (TmfDataProvider[]) TmfProviderManager.getProviders(TmfEvent.class, TestProvider1.class); + providers = TmfProviderManager.getProviders(TmfEvent.class, TestProvider1.class); assertEquals("getProviders", 0, providers.length); - providers = (TmfDataProvider[]) TmfProviderManager.getProviders(TmfEvent.class, TestProvider2.class); + providers = TmfProviderManager.getProviders(TmfEvent.class, TestProvider2.class); assertEquals("getProviders", 0, providers.length); - providers3 = (TmfDataProvider[]) TmfProviderManager.getProviders(TmfEvent3.class); + providers3 = TmfProviderManager.getProviders(TmfEvent3.class); assertTrue(providers3.length == 1); assertTrue(providers3[0] == testProvider3); - providers3 = (TmfDataProvider[]) TmfProviderManager.getProviders(TmfEvent3.class, TestProvider3.class); + providers3 = TmfProviderManager.getProviders(TmfEvent3.class, TestProvider3.class); assertEquals("getProviders", 1, providers3.length); assertEquals("getProviders", testProvider3, providers3[0]); // Remove the last one testProvider3.dispose(); - providers = (TmfDataProvider[]) TmfProviderManager.getProviders(TmfEvent.class); + providers = TmfProviderManager.getProviders(TmfEvent.class); assertEquals("getProviders", 0, providers.length); - providers = (TmfDataProvider[]) TmfProviderManager.getProviders(TmfEvent.class, TestProvider1.class); + providers = TmfProviderManager.getProviders(TmfEvent.class, TestProvider1.class); assertEquals("getProviders", 0, providers.length); - providers = (TmfDataProvider[]) TmfProviderManager.getProviders(TmfEvent.class, TestProvider2.class); + providers = TmfProviderManager.getProviders(TmfEvent.class, TestProvider2.class); assertEquals("getProviders", 0, providers.length); - providers3 = (TmfDataProvider[]) TmfProviderManager.getProviders(TmfEvent3.class); + providers3 = TmfProviderManager.getProviders(TmfEvent3.class); assertEquals("getProviders", 0, providers.length); - providers3 = (TmfDataProvider[]) TmfProviderManager.getProviders(TmfEvent3.class, TestProvider3.class); + providers3 = TmfProviderManager.getProviders(TmfEvent3.class, TestProvider3.class); assertEquals("getProviders", 0, providers.length); } @@ -313,7 +314,7 @@ public class TmfProviderManagerTest extends TestCase { TestProvider2 testProvider2 = new TestProvider2(TmfEvent.class); TestProvider3 testProvider3 = new TestProvider3(TmfEvent3.class); - TmfDataProvider[] providers = (TmfDataProvider[]) TmfProviderManager.getProviders(TmfEvent.class, null); + TmfDataProvider[] providers = TmfProviderManager.getProviders(TmfEvent.class, null); assertEquals("getProviders", 2, providers.length); if (providers[0] == testProvider1) { assertEquals("getProviders", testProvider2, providers[1]); @@ -323,7 +324,7 @@ public class TmfProviderManagerTest extends TestCase { assertEquals("getProviders", testProvider1, providers[1]); } - providers = (TmfDataProvider[]) TmfProviderManager.getProviders(TmfEvent3.class, null); + providers = TmfProviderManager.getProviders(TmfEvent3.class, null); assertEquals("getProviders", 1, providers.length); assertEquals("getProviders", testProvider3, providers[0]); @@ -333,4 +334,4 @@ public class TmfProviderManagerTest extends TestCase { testProvider3.dispose(); } -} \ No newline at end of file +} diff --git a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/ctfadaptor/CtfTmfTraceTest.java b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/ctfadaptor/CtfTmfTraceTest.java index ac7617260f..bb23c0cd5d 100644 --- a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/ctfadaptor/CtfTmfTraceTest.java +++ b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/ctfadaptor/CtfTmfTraceTest.java @@ -24,6 +24,7 @@ import org.eclipse.linuxtools.tmf.core.ctfadaptor.CtfLocation; import org.eclipse.linuxtools.tmf.core.ctfadaptor.CtfTmfEvent; import org.eclipse.linuxtools.tmf.core.ctfadaptor.CtfTmfTimestamp; import org.eclipse.linuxtools.tmf.core.ctfadaptor.CtfTmfTrace; +import org.eclipse.linuxtools.tmf.core.event.ITmfEvent; import org.eclipse.linuxtools.tmf.core.event.ITmfTimestamp; import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange; import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp; @@ -201,7 +202,7 @@ public class CtfTmfTraceTest { */ @Test public void testGetEventType() { - Class result = fixture.getEventType(); + Class result = fixture.getEventType(); assertNotNull(result); } diff --git a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/ctfadaptor/headless/RequestBenchmark.java b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/ctfadaptor/headless/RequestBenchmark.java index 57a7c7fbc9..c9adc374e2 100644 --- a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/ctfadaptor/headless/RequestBenchmark.java +++ b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/ctfadaptor/headless/RequestBenchmark.java @@ -26,12 +26,11 @@ import org.eclipse.linuxtools.tmf.core.trace.TmfExperiment; /** * Benchmark the event request subsystem of TMF. */ -public class RequestBenchmark extends TmfEventRequest { +public class RequestBenchmark extends TmfEventRequest { - @SuppressWarnings("unchecked") private RequestBenchmark(final Class dataType, final TmfTimeRange range, final int nbRequested) { - super((Class) dataType, range, nbRequested, 1); + super(dataType, range, nbRequested, 1); } // Path of the trace @@ -42,7 +41,7 @@ public class RequestBenchmark extends TmfEventRequest { // Work variables private static int nbEvent = 0; - private static TmfExperiment fExperiment = null; + private static TmfExperiment fExperiment = null; private static Vector benchs = new Vector(); /** @@ -55,12 +54,11 @@ public class RequestBenchmark extends TmfEventRequest { try { /* Our experiment will contains ONE trace */ - @SuppressWarnings("unchecked") - final ITmfTrace[] traces = new ITmfTrace[1]; + final ITmfTrace[] traces = new ITmfTrace[1]; traces[0] = new CtfTmfTrace(); traces[0].initTrace(null, TRACE_PATH, CtfTmfEvent.class); /* Create our new experiment */ - fExperiment = new TmfExperiment(CtfTmfEvent.class, "Headless", traces); //$NON-NLS-1$ + fExperiment = new TmfExperiment(CtfTmfEvent.class, "Headless", traces); //$NON-NLS-1$ /* * We will issue a request for each "pass". TMF will then process @@ -85,7 +83,7 @@ public class RequestBenchmark extends TmfEventRequest { } @Override - public void handleData(final CtfTmfEvent event) { + public void handleData(final ITmfEvent event) { super.handleData(event); nbEvent++; diff --git a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfEventTest.java b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfEventTest.java index 3699a6fa63..56e11ab4c0 100644 --- a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfEventTest.java +++ b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfEventTest.java @@ -181,7 +181,7 @@ public class TmfEventTest extends TestCase { * */ public void testConstructorWithTrace() { - final ITmfTrace trace = openTrace(); + final ITmfTrace trace = openTrace(); final TmfEvent event = new TmfEvent(trace, 0, fTimestamp1, fSource, fType, fContent1, fReference1); assertNotNull("getTrace", event.getTrace()); assertEquals("getRank", 0, event.getRank()); @@ -230,7 +230,7 @@ public class TmfEventTest extends TestCase { } @Override - public void setTrace(final ITmfTrace trace) { + public void setTrace(final ITmfTrace trace) { super.setTrace(trace); } @@ -266,8 +266,8 @@ public class TmfEventTest extends TestCase { } - private ITmfTrace setupTrace() { - ITmfTrace trace = null; + private ITmfTrace setupTrace() { + ITmfTrace trace = null; try { final URL location = FileLocator.find(TmfCoreTestPlugin.getDefault().getBundle(), new Path(fTracePath), null); final File test = new File(FileLocator.toFileURL(location).toURI()); @@ -286,7 +286,7 @@ public class TmfEventTest extends TestCase { * */ public void testSetTrace() { - final ITmfTrace trace = setupTrace(); + final ITmfTrace trace = setupTrace(); assertNotNull(trace); final TestEvent event = new TestEvent(fEvent1); @@ -464,7 +464,7 @@ public class TmfEventTest extends TestCase { assertTrue("hashCode", event1.hashCode() == event2.hashCode()); - final ITmfTrace trace = openTrace(); + final ITmfTrace trace = openTrace(); event1 = new TmfEvent(trace, 0, fTimestamp1, fSource, fType, fContent1, fReference1); event2 = new TmfEvent(trace, 1, fTimestamp2, fSource, fType, fContent2, fReference2); final TmfEvent event1b = new TmfEvent(event1); @@ -541,8 +541,8 @@ public class TmfEventTest extends TestCase { * */ public void testNonEqualTraces() { - final ITmfTrace trace1 = openTrace(); - final ITmfTrace trace2 = openTrace(); + final ITmfTrace trace1 = openTrace(); + final ITmfTrace trace2 = openTrace(); final TmfEvent event1 = new TmfEvent(trace1, 0, fTimestamp1, fSource, fType, fContent1, fReference1); TmfEvent event2 = new TmfEvent(trace1, 0, fTimestamp1, fSource, fType, fContent1, fReference1); diff --git a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/request/TmfCoalescedDataRequestTest.java b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/request/TmfCoalescedDataRequestTest.java index 460c8c0d3f..9a686c6786 100644 --- a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/request/TmfCoalescedDataRequestTest.java +++ b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/request/TmfCoalescedDataRequestTest.java @@ -30,13 +30,13 @@ public class TmfCoalescedDataRequestTest extends TestCase { // Variables // ------------------------------------------------------------------------ - private TmfCoalescedDataRequest fRequest1; - private TmfCoalescedDataRequest fRequest2; - private TmfCoalescedDataRequest fRequest3; - private TmfCoalescedDataRequest fRequest4; + private TmfCoalescedDataRequest fRequest1; + private TmfCoalescedDataRequest fRequest2; + private TmfCoalescedDataRequest fRequest3; + private TmfCoalescedDataRequest fRequest4; - private TmfCoalescedDataRequest fRequest1b; - private TmfCoalescedDataRequest fRequest1c; + private TmfCoalescedDataRequest fRequest1b; + private TmfCoalescedDataRequest fRequest1c; private int fRequestCount; @@ -55,13 +55,13 @@ public class TmfCoalescedDataRequestTest extends TestCase { public void setUp() throws Exception { super.setUp(); TmfDataRequest.reset(); - fRequest1 = new TmfCoalescedDataRequest(TmfEvent.class, 10, 100, 200); - fRequest2 = new TmfCoalescedDataRequest(TmfEvent.class, 20, 100, 200); - fRequest3 = new TmfCoalescedDataRequest(TmfEvent.class, 20, 200, 200); - fRequest4 = new TmfCoalescedDataRequest(TmfEvent.class, 20, 200, 300); + fRequest1 = new TmfCoalescedDataRequest(TmfEvent.class, 10, 100, 200); + fRequest2 = new TmfCoalescedDataRequest(TmfEvent.class, 20, 100, 200); + fRequest3 = new TmfCoalescedDataRequest(TmfEvent.class, 20, 200, 200); + fRequest4 = new TmfCoalescedDataRequest(TmfEvent.class, 20, 200, 300); - fRequest1b = new TmfCoalescedDataRequest(TmfEvent.class, 10, 100, 200); - fRequest1c = new TmfCoalescedDataRequest(TmfEvent.class, 10, 100, 200); + fRequest1b = new TmfCoalescedDataRequest(TmfEvent.class, 10, 100, 200); + fRequest1c = new TmfCoalescedDataRequest(TmfEvent.class, 10, 100, 200); fRequestCount = fRequest1c.getRequestId() + 1; } @@ -71,9 +71,9 @@ public class TmfCoalescedDataRequestTest extends TestCase { super.tearDown(); } - private static TmfCoalescedDataRequest setupTestRequest(final boolean[] flags) { + private static TmfCoalescedDataRequest setupTestRequest(final boolean[] flags) { - TmfCoalescedDataRequest request = new TmfCoalescedDataRequest(TmfEvent.class, 10, 100, 200) { + TmfCoalescedDataRequest request = new TmfCoalescedDataRequest(TmfEvent.class, 10, 100, 200) { @Override public void handleCompleted() { super.handleCompleted(); @@ -102,8 +102,8 @@ public class TmfCoalescedDataRequestTest extends TestCase { // Constructors // ------------------------------------------------------------------------ - public void testTmfCoalescedDataRequest() { - TmfCoalescedDataRequest request = new TmfCoalescedDataRequest(TmfEvent.class); + public void testTmfCoalescedDataRequest() { + TmfCoalescedDataRequest request = new TmfCoalescedDataRequest(TmfEvent.class); assertEquals("getRequestId", fRequestCount++, request.getRequestId()); assertEquals("getDataType", TmfEvent.class, request.getDataType()); @@ -119,7 +119,7 @@ public class TmfCoalescedDataRequestTest extends TestCase { } public void testTmfCoalescedDataRequestIndex() { - TmfCoalescedDataRequest request = new TmfCoalescedDataRequest(TmfEvent.class, 10); + TmfCoalescedDataRequest request = new TmfCoalescedDataRequest(TmfEvent.class, 10); assertEquals("getRequestId", fRequestCount++, request.getRequestId()); assertEquals("getDataType", TmfEvent.class, request.getDataType()); @@ -135,7 +135,7 @@ public class TmfCoalescedDataRequestTest extends TestCase { } public void testTmfCoalescedDataRequestIndexNbRequested() { - TmfCoalescedDataRequest request = new TmfCoalescedDataRequest(TmfEvent.class, 10, 100); + TmfCoalescedDataRequest request = new TmfCoalescedDataRequest(TmfEvent.class, 10, 100); assertEquals("getRequestId", fRequestCount++, request.getRequestId()); assertEquals("getDataType", TmfEvent.class, request.getDataType()); @@ -151,7 +151,7 @@ public class TmfCoalescedDataRequestTest extends TestCase { } public void testTmfCoalescedDataRequestIndexNbEventsBlocksize() { - TmfCoalescedDataRequest request = new TmfCoalescedDataRequest(TmfEvent.class, 10, 100, 200); + TmfCoalescedDataRequest request = new TmfCoalescedDataRequest(TmfEvent.class, 10, 100, 200); assertEquals("getRequestId", fRequestCount++, request.getRequestId()); assertEquals("getDataType", TmfEvent.class, request.getDataType()); @@ -230,15 +230,15 @@ public class TmfCoalescedDataRequestTest extends TestCase { // ------------------------------------------------------------------------ public void testIsCompatible() { - TmfCoalescedDataRequest coalescedRequest = new TmfCoalescedDataRequest(TmfEvent.class, 10, 100, 200); - TmfDataRequest request1 = new TmfDataRequestStub(TmfEvent.class, 10, 100, 200); - TmfDataRequest request2 = new TmfDataRequestStub(TmfEvent.class, 5, 100, 200); - TmfDataRequest request3 = new TmfDataRequestStub(TmfEvent.class, 5, 4, 200); - TmfDataRequest request4 = new TmfDataRequestStub(TmfEvent.class, 5, 5, 200); - TmfDataRequest request5 = new TmfDataRequestStub(TmfEvent.class, 15, 100, 200); - TmfDataRequest request6 = new TmfDataRequestStub(TmfEvent.class, 100, 100, 200); - TmfDataRequest request7 = new TmfDataRequestStub(TmfEvent.class, 110, 100, 200); - TmfDataRequest request8 = new TmfDataRequestStub(TmfEvent.class, 111, 100, 200); + TmfCoalescedDataRequest coalescedRequest = new TmfCoalescedDataRequest(TmfEvent.class, 10, 100, 200); + TmfDataRequest request1 = new TmfDataRequestStub(TmfEvent.class, 10, 100, 200); + TmfDataRequest request2 = new TmfDataRequestStub(TmfEvent.class, 5, 100, 200); + TmfDataRequest request3 = new TmfDataRequestStub(TmfEvent.class, 5, 4, 200); + TmfDataRequest request4 = new TmfDataRequestStub(TmfEvent.class, 5, 5, 200); + TmfDataRequest request5 = new TmfDataRequestStub(TmfEvent.class, 15, 100, 200); + TmfDataRequest request6 = new TmfDataRequestStub(TmfEvent.class, 100, 100, 200); + TmfDataRequest request7 = new TmfDataRequestStub(TmfEvent.class, 110, 100, 200); + TmfDataRequest request8 = new TmfDataRequestStub(TmfEvent.class, 111, 100, 200); assertTrue("isCompatible", coalescedRequest.isCompatible(request1)); assertTrue("isCompatible", coalescedRequest.isCompatible(request2)); @@ -249,8 +249,8 @@ public class TmfCoalescedDataRequestTest extends TestCase { assertTrue("isCompatible", coalescedRequest.isCompatible(request7)); assertTrue("isCompatible", coalescedRequest.isCompatible(request8)); - TmfDataRequest request9 = new TmfDataRequestStub(TmfEvent.class, 5, 3, 200); - TmfDataRequest request10 = new TmfDataRequestStub(TmfEvent.class, 112, 100, 200); + TmfDataRequest request9 = new TmfDataRequestStub(TmfEvent.class, 5, 3, 200); + TmfDataRequest request10 = new TmfDataRequestStub(TmfEvent.class, 112, 100, 200); assertFalse("isCompatible", coalescedRequest.isCompatible(request9)); assertFalse("isCompatible", coalescedRequest.isCompatible(request10)); @@ -261,8 +261,8 @@ public class TmfCoalescedDataRequestTest extends TestCase { // ------------------------------------------------------------------------ public void testAddRequest1() { - TmfCoalescedDataRequest coalescedRequest = new TmfCoalescedDataRequest(TmfEvent.class, 10, 100, 200); - TmfDataRequest request = new TmfDataRequestStub(TmfEvent.class, 10, 100, 200); + TmfCoalescedDataRequest coalescedRequest = new TmfCoalescedDataRequest(TmfEvent.class, 10, 100, 200); + TmfDataRequest request = new TmfDataRequestStub(TmfEvent.class, 10, 100, 200); assertTrue("isCompatible", coalescedRequest.isCompatible(request)); coalescedRequest.addRequest(request); @@ -272,8 +272,8 @@ public class TmfCoalescedDataRequestTest extends TestCase { } public void testAddRequest2() { - TmfCoalescedDataRequest coalescedRequest = new TmfCoalescedDataRequest(TmfEvent.class, 10, 100, 200); - TmfDataRequest request = new TmfDataRequestStub(TmfEvent.class, 5, 100, 200); + TmfCoalescedDataRequest coalescedRequest = new TmfCoalescedDataRequest(TmfEvent.class, 10, 100, 200); + TmfDataRequest request = new TmfDataRequestStub(TmfEvent.class, 5, 100, 200); assertTrue("isCompatible", coalescedRequest.isCompatible(request)); coalescedRequest.addRequest(request); @@ -283,8 +283,8 @@ public class TmfCoalescedDataRequestTest extends TestCase { } public void testAddRequest3() { - TmfCoalescedDataRequest coalescedRequest = new TmfCoalescedDataRequest(TmfEvent.class, 10, 100, 200); - TmfDataRequest request = new TmfDataRequestStub(TmfEvent.class, 5, 4, 200); + TmfCoalescedDataRequest coalescedRequest = new TmfCoalescedDataRequest(TmfEvent.class, 10, 100, 200); + TmfDataRequest request = new TmfDataRequestStub(TmfEvent.class, 5, 4, 200); assertTrue("isCompatible", coalescedRequest.isCompatible(request)); coalescedRequest.addRequest(request); @@ -294,8 +294,8 @@ public class TmfCoalescedDataRequestTest extends TestCase { } public void testAddRequest4() { - TmfCoalescedDataRequest coalescedRequest = new TmfCoalescedDataRequest(TmfEvent.class, 10, 100, 200); - TmfDataRequest request = new TmfDataRequestStub(TmfEvent.class, 5, 5, 200); + TmfCoalescedDataRequest coalescedRequest = new TmfCoalescedDataRequest(TmfEvent.class, 10, 100, 200); + TmfDataRequest request = new TmfDataRequestStub(TmfEvent.class, 5, 5, 200); assertTrue("isCompatible", coalescedRequest.isCompatible(request)); coalescedRequest.addRequest(request); @@ -305,8 +305,8 @@ public class TmfCoalescedDataRequestTest extends TestCase { } public void testAddRequest5() { - TmfCoalescedDataRequest coalescedRequest = new TmfCoalescedDataRequest(TmfEvent.class, 10, 100, 200); - TmfDataRequest request = new TmfDataRequestStub(TmfEvent.class, 15, 100, 200); + TmfCoalescedDataRequest coalescedRequest = new TmfCoalescedDataRequest(TmfEvent.class, 10, 100, 200); + TmfDataRequest request = new TmfDataRequestStub(TmfEvent.class, 15, 100, 200); assertTrue("isCompatible", coalescedRequest.isCompatible(request)); coalescedRequest.addRequest(request); @@ -316,8 +316,8 @@ public class TmfCoalescedDataRequestTest extends TestCase { } public void testAddRequest6() { - TmfCoalescedDataRequest coalescedRequest = new TmfCoalescedDataRequest(TmfEvent.class, 10, 100, 200); - TmfDataRequest request = new TmfDataRequestStub(TmfEvent.class, 100, 100, 200); + TmfCoalescedDataRequest coalescedRequest = new TmfCoalescedDataRequest(TmfEvent.class, 10, 100, 200); + TmfDataRequest request = new TmfDataRequestStub(TmfEvent.class, 100, 100, 200); assertTrue("isCompatible", coalescedRequest.isCompatible(request)); coalescedRequest.addRequest(request); @@ -327,8 +327,8 @@ public class TmfCoalescedDataRequestTest extends TestCase { } public void testAddRequest7() { - TmfCoalescedDataRequest coalescedRequest = new TmfCoalescedDataRequest(TmfEvent.class, 10, 100, 200); - TmfDataRequest request = new TmfDataRequestStub(TmfEvent.class, 110, 100, 200); + TmfCoalescedDataRequest coalescedRequest = new TmfCoalescedDataRequest(TmfEvent.class, 10, 100, 200); + TmfDataRequest request = new TmfDataRequestStub(TmfEvent.class, 110, 100, 200); assertTrue("isCompatible", coalescedRequest.isCompatible(request)); coalescedRequest.addRequest(request); @@ -338,8 +338,8 @@ public class TmfCoalescedDataRequestTest extends TestCase { } public void testAddRequest8() { - TmfCoalescedDataRequest coalescedRequest = new TmfCoalescedDataRequest(TmfEvent.class, 10, 100, 200); - TmfDataRequest request = new TmfDataRequestStub(TmfEvent.class, 111, 100, 200); + TmfCoalescedDataRequest coalescedRequest = new TmfCoalescedDataRequest(TmfEvent.class, 10, 100, 200); + TmfDataRequest request = new TmfDataRequestStub(TmfEvent.class, 111, 100, 200); assertTrue("isCompatible", coalescedRequest.isCompatible(request)); coalescedRequest.addRequest(request); @@ -356,9 +356,9 @@ public class TmfCoalescedDataRequestTest extends TestCase { // Test request final boolean[] crFlags = new boolean[4]; - TmfCoalescedDataRequest request = setupTestRequest(crFlags); - TmfDataRequest subRequest1 = new TmfDataRequestStub(TmfEvent.class, 10, 100, 200); - TmfDataRequest subRequest2 = new TmfDataRequestStub(TmfEvent.class, 10, 100, 200); + TmfCoalescedDataRequest request = setupTestRequest(crFlags); + TmfDataRequest subRequest1 = new TmfDataRequestStub(TmfEvent.class, 10, 100, 200); + TmfDataRequest subRequest2 = new TmfDataRequestStub(TmfEvent.class, 10, 100, 200); request.addRequest(subRequest1); request.addRequest(subRequest2); @@ -392,9 +392,9 @@ public class TmfCoalescedDataRequestTest extends TestCase { public void testFail() { final boolean[] crFlags = new boolean[4]; - TmfCoalescedDataRequest request = setupTestRequest(crFlags); - TmfDataRequest subRequest1 = new TmfDataRequestStub(TmfEvent.class, 10, 100, 200); - TmfDataRequest subRequest2 = new TmfDataRequestStub(TmfEvent.class, 10, 100, 200); + TmfCoalescedDataRequest request = setupTestRequest(crFlags); + TmfDataRequest subRequest1 = new TmfDataRequestStub(TmfEvent.class, 10, 100, 200); + TmfDataRequest subRequest2 = new TmfDataRequestStub(TmfEvent.class, 10, 100, 200); request.addRequest(subRequest1); request.addRequest(subRequest2); @@ -428,9 +428,9 @@ public class TmfCoalescedDataRequestTest extends TestCase { public void testCancel() { final boolean[] crFlags = new boolean[4]; - TmfCoalescedDataRequest request = setupTestRequest(crFlags); - TmfDataRequest subRequest1 = new TmfDataRequestStub(TmfEvent.class, 10, 100, 200); - TmfDataRequest subRequest2 = new TmfDataRequestStub(TmfEvent.class, 10, 100, 200); + TmfCoalescedDataRequest request = setupTestRequest(crFlags); + TmfDataRequest subRequest1 = new TmfDataRequestStub(TmfEvent.class, 10, 100, 200); + TmfDataRequest subRequest2 = new TmfDataRequestStub(TmfEvent.class, 10, 100, 200); request.addRequest(subRequest1); request.addRequest(subRequest2); @@ -465,9 +465,9 @@ public class TmfCoalescedDataRequestTest extends TestCase { public void testCancelSubRequests() { final boolean[] crFlags = new boolean[4]; - TmfCoalescedDataRequest request = setupTestRequest(crFlags); - TmfDataRequest subRequest1 = new TmfDataRequestStub(TmfEvent.class, 10, 100, 200); - TmfDataRequest subRequest2 = new TmfDataRequestStub(TmfEvent.class, 10, 100, 200); + TmfCoalescedDataRequest request = setupTestRequest(crFlags); + TmfDataRequest subRequest1 = new TmfDataRequestStub(TmfEvent.class, 10, 100, 200); + TmfDataRequest subRequest2 = new TmfDataRequestStub(TmfEvent.class, 10, 100, 200); request.addRequest(subRequest1); request.addRequest(subRequest2); diff --git a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/request/TmfCoalescedEventRequestTest.java b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/request/TmfCoalescedEventRequestTest.java index 2079022941..42c62e33ac 100644 --- a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/request/TmfCoalescedEventRequestTest.java +++ b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/request/TmfCoalescedEventRequestTest.java @@ -26,6 +26,7 @@ import org.eclipse.linuxtools.internal.tmf.core.component.TmfProviderManager; import org.eclipse.linuxtools.internal.tmf.core.request.TmfCoalescedDataRequest; import org.eclipse.linuxtools.internal.tmf.core.request.TmfCoalescedEventRequest; import org.eclipse.linuxtools.tmf.core.component.ITmfDataProvider; +import org.eclipse.linuxtools.tmf.core.event.ITmfEvent; import org.eclipse.linuxtools.tmf.core.event.TmfEvent; import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange; import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp; @@ -55,13 +56,13 @@ public class TmfCoalescedEventRequestTest extends TestCase { private final TmfTimeRange range1 = new TmfTimeRange(TmfTimeRange.ETERNITY); private final TmfTimeRange range2 = new TmfTimeRange(new TmfTimestamp(), TmfTimestamp.BIG_CRUNCH); - private TmfCoalescedEventRequest fRequest1; - private TmfCoalescedEventRequest fRequest2; - private TmfCoalescedEventRequest fRequest3; - private TmfCoalescedEventRequest fRequest4; + private TmfCoalescedEventRequest fRequest1; + private TmfCoalescedEventRequest fRequest2; + private TmfCoalescedEventRequest fRequest3; + private TmfCoalescedEventRequest fRequest4; - private TmfCoalescedEventRequest fRequest1b; - private TmfCoalescedEventRequest fRequest1c; + private TmfCoalescedEventRequest fRequest1b; + private TmfCoalescedEventRequest fRequest1c; private int fRequestCount; @@ -80,13 +81,13 @@ public class TmfCoalescedEventRequestTest extends TestCase { public void setUp() throws Exception { super.setUp(); TmfDataRequest.reset(); - fRequest1 = new TmfCoalescedEventRequest(TmfEvent.class, range1, 100, 200); - fRequest2 = new TmfCoalescedEventRequest(TmfEvent.class, range2, 100, 200); - fRequest3 = new TmfCoalescedEventRequest(TmfEvent.class, range2, 200, 200); - fRequest4 = new TmfCoalescedEventRequest(TmfEvent.class, range2, 200, 300); + fRequest1 = new TmfCoalescedEventRequest(TmfEvent.class, range1, 100, 200); + fRequest2 = new TmfCoalescedEventRequest(TmfEvent.class, range2, 100, 200); + fRequest3 = new TmfCoalescedEventRequest(TmfEvent.class, range2, 200, 200); + fRequest4 = new TmfCoalescedEventRequest(TmfEvent.class, range2, 200, 300); - fRequest1b = new TmfCoalescedEventRequest(TmfEvent.class, range1, 100, 200); - fRequest1c = new TmfCoalescedEventRequest(TmfEvent.class, range1, 100, 200); + fRequest1b = new TmfCoalescedEventRequest(TmfEvent.class, range1, 100, 200); + fRequest1c = new TmfCoalescedEventRequest(TmfEvent.class, range1, 100, 200); fRequestCount = fRequest1c.getRequestId() + 1; } @@ -96,9 +97,9 @@ public class TmfCoalescedEventRequestTest extends TestCase { super.tearDown(); } - private TmfCoalescedEventRequest setupTestRequest(final boolean[] flags) { + private TmfCoalescedEventRequest setupTestRequest(final boolean[] flags) { - TmfCoalescedEventRequest request = new TmfCoalescedEventRequest(TmfEvent.class, range1, 100, 200) { + TmfCoalescedEventRequest request = new TmfCoalescedEventRequest(TmfEvent.class, range1, 100, 200) { @Override public void handleCompleted() { super.handleCompleted(); @@ -128,7 +129,7 @@ public class TmfCoalescedEventRequestTest extends TestCase { // ------------------------------------------------------------------------ public void testTmfCoalescedEventRequest() { - TmfCoalescedEventRequest request = new TmfCoalescedEventRequest(TmfEvent.class); + TmfCoalescedEventRequest request = new TmfCoalescedEventRequest(TmfEvent.class); assertEquals("getRequestId", fRequestCount++, request.getRequestId()); assertEquals("getDataType", TmfEvent.class, request.getDataType()); @@ -144,7 +145,7 @@ public class TmfCoalescedEventRequestTest extends TestCase { } public void testTmfCoalescedEventRequestIndex() { - TmfCoalescedEventRequest request = new TmfCoalescedEventRequest(TmfEvent.class, range1); + TmfCoalescedEventRequest request = new TmfCoalescedEventRequest(TmfEvent.class, range1); assertEquals("getRequestId", fRequestCount++, request.getRequestId()); assertEquals("getDataType", TmfEvent.class, request.getDataType()); @@ -160,7 +161,7 @@ public class TmfCoalescedEventRequestTest extends TestCase { } public void testTmfCoalescedEventRequestIndexNbRequested() { - TmfCoalescedEventRequest request = new TmfCoalescedEventRequest(TmfEvent.class, range1, 100); + TmfCoalescedEventRequest request = new TmfCoalescedEventRequest(TmfEvent.class, range1, 100); assertEquals("getRequestId", fRequestCount++, request.getRequestId()); assertEquals("getDataType", TmfEvent.class, request.getDataType()); @@ -176,7 +177,7 @@ public class TmfCoalescedEventRequestTest extends TestCase { } public void testTmfCoalescedEventRequestIndexNbEventsBlocksize() { - TmfCoalescedEventRequest request = new TmfCoalescedEventRequest(TmfEvent.class, range1, 100, 200); + TmfCoalescedEventRequest request = new TmfCoalescedEventRequest(TmfEvent.class, range1, 100, 200); assertEquals("getRequestId", fRequestCount++, request.getRequestId()); assertEquals("getDataType", TmfEvent.class, request.getDataType()); @@ -225,11 +226,11 @@ public class TmfCoalescedEventRequestTest extends TestCase { } public void testEqualsSuper() { - TmfCoalescedDataRequest dataRequest1 = new TmfCoalescedDataRequest( + TmfCoalescedDataRequest dataRequest1 = new TmfCoalescedDataRequest( fRequest1.getDataType(), fRequest1.getIndex(), fRequest1.getNbRequested()); - TmfCoalescedDataRequest dataRequest2 = new TmfCoalescedDataRequest( + TmfCoalescedDataRequest dataRequest2 = new TmfCoalescedDataRequest( fRequest1.getDataType(), fRequest1.getIndex(), fRequest1.getNbRequested()); - TmfCoalescedDataRequest dataRequest3 = new TmfCoalescedDataRequest( + TmfCoalescedDataRequest dataRequest3 = new TmfCoalescedDataRequest( fRequest3.getDataType(), fRequest3.getIndex(), fRequest3.getNbRequested()); assertTrue("equals", fRequest1.equals(dataRequest2)); @@ -269,11 +270,11 @@ public class TmfCoalescedEventRequestTest extends TestCase { // ------------------------------------------------------------------------ @SuppressWarnings("hiding") - public void testIsCompatible() { - TmfCoalescedEventRequest coalescedRequest = new TmfCoalescedEventRequest(TmfEvent.class, range1, 100, 200); - TmfEventRequest request1 = new TmfEventRequestStub(TmfEvent.class, range1, 100, 200); - TmfEventRequest request2 = new TmfEventRequestStub(TmfEvent.class, range2, 100, 200); - TmfEventRequest request3 = new TmfEventRequestStub(TmfEvent.class, range1, 101, 200); + public void testIsCompatible() { + TmfCoalescedEventRequest coalescedRequest = new TmfCoalescedEventRequest(TmfEvent.class, range1, 100, 200); + TmfEventRequest request1 = new TmfEventRequestStub(TmfEvent.class, range1, 100, 200); + TmfEventRequest request2 = new TmfEventRequestStub(TmfEvent.class, range2, 100, 200); + TmfEventRequest request3 = new TmfEventRequestStub(TmfEvent.class, range1, 101, 200); assertTrue("isCompatible", coalescedRequest.isCompatible(request1)); assertTrue("isCompatible", coalescedRequest.isCompatible(request2)); @@ -286,9 +287,9 @@ public class TmfCoalescedEventRequestTest extends TestCase { @SuppressWarnings("hiding") public void testAddEvent1() { - TmfCoalescedEventRequest coalescedRequest = new TmfCoalescedEventRequest(TmfEvent.class, range1, 0, 2147483647, 200, ExecutionType.FOREGROUND); - TmfEventRequest request1 = new TmfEventRequestStub(TmfEvent.class, range1, 0, 2147483647, 200); - TmfEventRequest request2 = new TmfEventRequestStub(TmfEvent.class, range1, 1, 2147483647, 200); + TmfCoalescedEventRequest coalescedRequest = new TmfCoalescedEventRequest(TmfEvent.class, range1, 0, 2147483647, 200, ExecutionType.FOREGROUND); + TmfEventRequest request1 = new TmfEventRequestStub(TmfEvent.class, range1, 0, 2147483647, 200); + TmfEventRequest request2 = new TmfEventRequestStub(TmfEvent.class, range1, 1, 2147483647, 200); assertTrue("isCompatible", coalescedRequest.isCompatible(request1)); assertTrue("isCompatible", coalescedRequest.isCompatible(request2)); @@ -304,9 +305,9 @@ public class TmfCoalescedEventRequestTest extends TestCase { @SuppressWarnings("hiding") public void testAddEvent2() { - TmfCoalescedEventRequest coalescedRequest = new TmfCoalescedEventRequest(TmfEvent.class, range1, 1, 2147483647, 200, ExecutionType.FOREGROUND); - TmfEventRequest request1 = new TmfEventRequestStub(TmfEvent.class, range1, 1, 2147483647, 200); - TmfEventRequest request2 = new TmfEventRequestStub(TmfEvent.class, range1, 0, 2147483647, 200); + TmfCoalescedEventRequest coalescedRequest = new TmfCoalescedEventRequest(TmfEvent.class, range1, 1, 2147483647, 200, ExecutionType.FOREGROUND); + TmfEventRequest request1 = new TmfEventRequestStub(TmfEvent.class, range1, 1, 2147483647, 200); + TmfEventRequest request2 = new TmfEventRequestStub(TmfEvent.class, range1, 0, 2147483647, 200); assertTrue("isCompatible", coalescedRequest.isCompatible(request1)); assertTrue("isCompatible", coalescedRequest.isCompatible(request2)); @@ -328,9 +329,9 @@ public class TmfCoalescedEventRequestTest extends TestCase { // Test request final boolean[] crFlags = new boolean[4]; - TmfCoalescedEventRequest request = setupTestRequest(crFlags); - TmfEventRequest subRequest1 = new TmfEventRequestStub(TmfEvent.class, range1, 100, 200); - TmfEventRequest subRequest2 = new TmfEventRequestStub(TmfEvent.class, range1, 100, 200); + TmfCoalescedEventRequest request = setupTestRequest(crFlags); + TmfEventRequest subRequest1 = new TmfEventRequestStub(TmfEvent.class, range1, 100, 200); + TmfEventRequest subRequest2 = new TmfEventRequestStub(TmfEvent.class, range1, 100, 200); request.addRequest(subRequest1); request.addRequest(subRequest2); @@ -364,9 +365,9 @@ public class TmfCoalescedEventRequestTest extends TestCase { public void testFail() { final boolean[] crFlags = new boolean[4]; - TmfCoalescedEventRequest request = setupTestRequest(crFlags); - TmfEventRequest subRequest1 = new TmfEventRequestStub(TmfEvent.class, range1, 100, 200); - TmfEventRequest subRequest2 = new TmfEventRequestStub(TmfEvent.class, range1, 100, 200); + TmfCoalescedEventRequest request = setupTestRequest(crFlags); + TmfEventRequest subRequest1 = new TmfEventRequestStub(TmfEvent.class, range1, 100, 200); + TmfEventRequest subRequest2 = new TmfEventRequestStub(TmfEvent.class, range1, 100, 200); request.addRequest(subRequest1); request.addRequest(subRequest2); @@ -400,9 +401,9 @@ public class TmfCoalescedEventRequestTest extends TestCase { public void testCancel() { final boolean[] crFlags = new boolean[4]; - TmfCoalescedEventRequest request = setupTestRequest(crFlags); - TmfEventRequest subRequest1 = new TmfEventRequestStub(TmfEvent.class, range1, 100, 200); - TmfEventRequest subRequest2 = new TmfEventRequestStub(TmfEvent.class, range1, 100, 200); + TmfCoalescedEventRequest request = setupTestRequest(crFlags); + TmfEventRequest subRequest1 = new TmfEventRequestStub(TmfEvent.class, range1, 100, 200); + TmfEventRequest subRequest2 = new TmfEventRequestStub(TmfEvent.class, range1, 100, 200); request.addRequest(subRequest1); request.addRequest(subRequest2); @@ -457,15 +458,15 @@ public class TmfCoalescedEventRequestTest extends TestCase { return fTrace; } - Vector requestedEvents1; - Vector requestedEvents2; - Vector requestedEvents3; + Vector requestedEvents1; + Vector requestedEvents2; + Vector requestedEvents3; - TmfEventRequest request1; - TmfEventRequest request2; - TmfEventRequest request3; + TmfEventRequest request1; + TmfEventRequest request2; + TmfEventRequest request3; - ITmfDataProvider[] providers; + ITmfDataProvider[] providers; private static class TmfTestTriggerSignal extends TmfSignal { public final boolean forceCancel; @@ -483,11 +484,11 @@ public class TmfCoalescedEventRequestTest extends TestCase { TmfTimeRange range = new TmfTimeRange(TmfTimestamp.BIG_BANG, TmfTimestamp.BIG_CRUNCH); final long REQUEST_OFFSET = 1000; - requestedEvents1 = new Vector(); - request1 = new TmfEventRequest(TmfEvent.class, range, signal.fIndex, NB_EVENTS, BLOCK_SIZE) { + requestedEvents1 = new Vector(); + request1 = new TmfEventRequest(TmfEvent.class, range, signal.fIndex, NB_EVENTS, BLOCK_SIZE) { int nbRead = 0; @Override - public void handleData(TmfEvent event) { + public void handleData(ITmfEvent event) { super.handleData(event); if (!isCompleted()) { requestedEvents1.add(event); @@ -498,10 +499,10 @@ public class TmfCoalescedEventRequestTest extends TestCase { } }; - requestedEvents2 = new Vector(); - request2 = new TmfEventRequest(TmfEvent.class, range, signal.fIndex + REQUEST_OFFSET, NB_EVENTS, BLOCK_SIZE) { + requestedEvents2 = new Vector(); + request2 = new TmfEventRequest(TmfEvent.class, range, signal.fIndex + REQUEST_OFFSET, NB_EVENTS, BLOCK_SIZE) { @Override - public void handleData(TmfEvent event) { + public void handleData(ITmfEvent event) { super.handleData(event); if (!isCompleted()) { requestedEvents2.add(event); @@ -509,10 +510,10 @@ public class TmfCoalescedEventRequestTest extends TestCase { } }; - requestedEvents3 = new Vector(); - request3 = new TmfEventRequest(TmfEvent.class, range, signal.fIndex + 2 * REQUEST_OFFSET, NB_EVENTS, BLOCK_SIZE) { + requestedEvents3 = new Vector(); + request3 = new TmfEventRequest(TmfEvent.class, range, signal.fIndex + 2 * REQUEST_OFFSET, NB_EVENTS, BLOCK_SIZE) { @Override - public void handleData(TmfEvent event) { + public void handleData(ITmfEvent event) { super.handleData(event); if (!isCompleted()) { requestedEvents3.add(event); @@ -520,7 +521,7 @@ public class TmfCoalescedEventRequestTest extends TestCase { } }; - providers = (ITmfDataProvider[]) TmfProviderManager.getProviders(TmfEvent.class, TmfTraceStub.class); + providers = TmfProviderManager.getProviders(TmfEvent.class, TmfTraceStub.class); providers[0].sendRequest(request1); providers[0].sendRequest(request2); providers[0].sendRequest(request3); diff --git a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/request/TmfDataRequestTest.java b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/request/TmfDataRequestTest.java index 05115c5f1f..6a29795692 100644 --- a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/request/TmfDataRequestTest.java +++ b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/request/TmfDataRequestTest.java @@ -30,12 +30,12 @@ public class TmfDataRequestTest extends TestCase { // Variables // ------------------------------------------------------------------------ - private static TmfDataRequest fRequest1; - private static TmfDataRequest fRequest1b; - private static TmfDataRequest fRequest1c; - private static TmfDataRequest fRequest2; - private static TmfDataRequest fRequest3; - private static TmfDataRequest fRequest4; + private static TmfDataRequest fRequest1; + private static TmfDataRequest fRequest1b; + private static TmfDataRequest fRequest1c; + private static TmfDataRequest fRequest2; + private static TmfDataRequest fRequest3; + private static TmfDataRequest fRequest4; private static int fRequestCount; @@ -54,12 +54,12 @@ public class TmfDataRequestTest extends TestCase { protected void setUp() throws Exception { super.setUp(); TmfDataRequest.reset(); - fRequest1 = new TmfDataRequestStub(TmfEvent.class, 10, 100, 200); - fRequest2 = new TmfDataRequestStub(TmfEvent.class, 20, 100, 200); - fRequest3 = new TmfDataRequestStub(TmfEvent.class, 20, 200, 200); - fRequest4 = new TmfDataRequestStub(TmfEvent.class, 20, 200, 300); - fRequest1b = new TmfDataRequestStub(TmfEvent.class, 10, 100, 200); - fRequest1c = new TmfDataRequestStub(TmfEvent.class, 10, 100, 200); + fRequest1 = new TmfDataRequestStub(TmfEvent.class, 10, 100, 200); + fRequest2 = new TmfDataRequestStub(TmfEvent.class, 20, 100, 200); + fRequest3 = new TmfDataRequestStub(TmfEvent.class, 20, 200, 200); + fRequest4 = new TmfDataRequestStub(TmfEvent.class, 20, 200, 300); + fRequest1b = new TmfDataRequestStub(TmfEvent.class, 10, 100, 200); + fRequest1c = new TmfDataRequestStub(TmfEvent.class, 10, 100, 200); fRequestCount = fRequest1c.getRequestId() + 1; } @@ -68,9 +68,9 @@ public class TmfDataRequestTest extends TestCase { super.tearDown(); } - private static TmfDataRequest setupTestRequest(final boolean[] flags) { + private static TmfDataRequest setupTestRequest(final boolean[] flags) { - TmfDataRequest request = new TmfDataRequestStub(TmfEvent.class, 10, 100, 200) { + TmfDataRequest request = new TmfDataRequestStub(TmfEvent.class, 10, 100, 200) { @Override public void handleCompleted() { super.handleCompleted(); @@ -100,7 +100,7 @@ public class TmfDataRequestTest extends TestCase { // ------------------------------------------------------------------------ public void testTmfDataRequest() { - TmfDataRequest request = new TmfDataRequestStub(TmfEvent.class); + TmfDataRequest request = new TmfDataRequestStub(TmfEvent.class); assertEquals("getRequestId", fRequestCount++, request.getRequestId()); assertEquals("getDataType", TmfEvent.class, request.getDataType()); @@ -116,7 +116,7 @@ public class TmfDataRequestTest extends TestCase { } public void testTmfDataRequestIndex() { - TmfDataRequest request = new TmfDataRequestStub(TmfEvent.class, 10); + TmfDataRequest request = new TmfDataRequestStub(TmfEvent.class, 10); assertEquals("getRequestId", fRequestCount++, request.getRequestId()); assertEquals("getDataType", TmfEvent.class, request.getDataType()); @@ -132,7 +132,7 @@ public class TmfDataRequestTest extends TestCase { } public void testTmfDataRequestIndexNbRequested() { - TmfDataRequest request = new TmfDataRequestStub(TmfEvent.class, 10, 100); + TmfDataRequest request = new TmfDataRequestStub(TmfEvent.class, 10, 100); assertEquals("getRequestId", fRequestCount++, request.getRequestId()); assertEquals("getDataType", TmfEvent.class, request.getDataType()); @@ -148,7 +148,7 @@ public class TmfDataRequestTest extends TestCase { } public void testTmfDataRequestIndexNbEventsBlocksize() { - TmfDataRequest request = new TmfDataRequestStub(TmfEvent.class, 10, 100, 200); + TmfDataRequest request = new TmfDataRequestStub(TmfEvent.class, 10, 100, 200); assertEquals("getRequestId", fRequestCount++, request.getRequestId()); assertEquals("getDataType", TmfEvent.class, request.getDataType()); @@ -229,7 +229,7 @@ public class TmfDataRequestTest extends TestCase { public void testDone() { final boolean[] flags = new boolean[4]; - TmfDataRequest request = setupTestRequest(flags); + TmfDataRequest request = setupTestRequest(flags); request.done(); assertTrue ("isCompleted", request.isCompleted()); @@ -249,7 +249,7 @@ public class TmfDataRequestTest extends TestCase { public void testFail() { final boolean[] flags = new boolean[4]; - TmfDataRequest request = setupTestRequest(flags); + TmfDataRequest request = setupTestRequest(flags); request.fail(); assertTrue ("isCompleted", request.isCompleted()); @@ -269,7 +269,7 @@ public class TmfDataRequestTest extends TestCase { public void testCancel() { final boolean[] flags = new boolean[4]; - TmfDataRequest request = setupTestRequest(flags); + TmfDataRequest request = setupTestRequest(flags); request.cancel(); assertTrue ("isCompleted", request.isCompleted()); diff --git a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/request/TmfEventRequestTest.java b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/request/TmfEventRequestTest.java index f2422a5c85..f5bbc4bff2 100644 --- a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/request/TmfEventRequestTest.java +++ b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/request/TmfEventRequestTest.java @@ -36,12 +36,12 @@ public class TmfEventRequestTest extends TestCase { private static TmfTimeRange range1 = new TmfTimeRange(TmfTimeRange.ETERNITY); private static TmfTimeRange range2 = new TmfTimeRange(new TmfTimestamp(), TmfTimestamp.BIG_CRUNCH); - private static TmfEventRequest fRequest1; - private static TmfEventRequest fRequest1b; - private static TmfEventRequest fRequest1c; - private static TmfEventRequest fRequest2; - private static TmfEventRequest fRequest3; - private static TmfEventRequest fRequest4; + private static TmfEventRequest fRequest1; + private static TmfEventRequest fRequest1b; + private static TmfEventRequest fRequest1c; + private static TmfEventRequest fRequest2; + private static TmfEventRequest fRequest3; + private static TmfEventRequest fRequest4; private static int fRequestCount; @@ -60,12 +60,12 @@ public class TmfEventRequestTest extends TestCase { protected void setUp() throws Exception { super.setUp(); TmfDataRequest.reset(); - fRequest1 = new TmfEventRequestStub(TmfEvent.class, range1, 100, 200); - fRequest2 = new TmfEventRequestStub(TmfEvent.class, range2, 100, 200); - fRequest3 = new TmfEventRequestStub(TmfEvent.class, range2, 200, 200); - fRequest4 = new TmfEventRequestStub(TmfEvent.class, range2, 200, 300); - fRequest1b = new TmfEventRequestStub(TmfEvent.class, range1, 100, 200); - fRequest1c = new TmfEventRequestStub(TmfEvent.class, range1, 100, 200); + fRequest1 = new TmfEventRequestStub(TmfEvent.class, range1, 100, 200); + fRequest2 = new TmfEventRequestStub(TmfEvent.class, range2, 100, 200); + fRequest3 = new TmfEventRequestStub(TmfEvent.class, range2, 200, 200); + fRequest4 = new TmfEventRequestStub(TmfEvent.class, range2, 200, 300); + fRequest1b = new TmfEventRequestStub(TmfEvent.class, range1, 100, 200); + fRequest1c = new TmfEventRequestStub(TmfEvent.class, range1, 100, 200); fRequestCount = fRequest1c.getRequestId() + 1; } @@ -74,9 +74,9 @@ public class TmfEventRequestTest extends TestCase { super.tearDown(); } - private static TmfEventRequest setupTestRequest(final boolean[] flags) { + private static TmfEventRequest setupTestRequest(final boolean[] flags) { - TmfEventRequest request = new TmfEventRequestStub(TmfEvent.class, new TmfTimeRange(TmfTimeRange.ETERNITY), 100, 200) { + TmfEventRequest request = new TmfEventRequestStub(TmfEvent.class, new TmfTimeRange(TmfTimeRange.ETERNITY), 100, 200) { @Override public void handleCompleted() { super.handleCompleted(); @@ -106,7 +106,7 @@ public class TmfEventRequestTest extends TestCase { // ------------------------------------------------------------------------ public void testTmfEventRequest() { - TmfEventRequest request = new TmfEventRequestStub(TmfEvent.class); + TmfEventRequest request = new TmfEventRequestStub(TmfEvent.class); assertEquals("getRequestId", fRequestCount++, request.getRequestId()); assertEquals("getDataType", TmfEvent.class, request.getDataType()); @@ -126,7 +126,7 @@ public class TmfEventRequestTest extends TestCase { public void testTmfEventRequestTimeRange() { TmfTimeRange range = new TmfTimeRange(new TmfTimestamp(), TmfTimestamp.BIG_CRUNCH); - TmfEventRequest request = new TmfEventRequestStub(TmfEvent.class, range); + TmfEventRequest request = new TmfEventRequestStub(TmfEvent.class, range); assertEquals("getRequestId", fRequestCount++, request.getRequestId()); assertEquals("getDataType", TmfEvent.class, request.getDataType()); @@ -146,7 +146,7 @@ public class TmfEventRequestTest extends TestCase { public void testTmfEventRequestTimeRangeNbRequested() { TmfTimeRange range = new TmfTimeRange(new TmfTimestamp(), TmfTimestamp.BIG_CRUNCH); - TmfEventRequest request = new TmfEventRequestStub(TmfEvent.class, range, 100); + TmfEventRequest request = new TmfEventRequestStub(TmfEvent.class, range, 100); assertEquals("getRequestId", fRequestCount++, request.getRequestId()); assertEquals("getDataType", TmfEvent.class, request.getDataType()); @@ -166,7 +166,7 @@ public class TmfEventRequestTest extends TestCase { public void testTmfEventRequestTimeRangeNbRequestedBlocksize() { TmfTimeRange range = new TmfTimeRange(new TmfTimestamp(), TmfTimestamp.BIG_CRUNCH); - TmfEventRequest request = new TmfEventRequestStub(TmfEvent.class, range, 100, 200); + TmfEventRequest request = new TmfEventRequestStub(TmfEvent.class, range, 100, 200); assertEquals("getRequestId", fRequestCount++, request.getRequestId()); assertEquals("getDataType", TmfEvent.class, request.getDataType()); @@ -250,7 +250,7 @@ public class TmfEventRequestTest extends TestCase { public void testDone() { final boolean[] flags = new boolean[4]; - TmfEventRequest request = setupTestRequest(flags); + TmfEventRequest request = setupTestRequest(flags); request.done(); assertTrue ("isCompleted", request.isCompleted()); @@ -270,7 +270,7 @@ public class TmfEventRequestTest extends TestCase { public void testFail() { final boolean[] flags = new boolean[4]; - TmfEventRequest request = setupTestRequest(flags); + TmfEventRequest request = setupTestRequest(flags); request.fail(); assertTrue ("isCompleted", request.isCompleted()); @@ -290,7 +290,7 @@ public class TmfEventRequestTest extends TestCase { public void testCancel() { final boolean[] flags = new boolean[4]; - TmfEventRequest request = setupTestRequest(flags); + TmfEventRequest request = setupTestRequest(flags); request.cancel(); assertTrue ("isCompleted", request.isCompleted()); diff --git a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/TmfCheckpointIndexTest.java b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/TmfCheckpointIndexTest.java index 0854963935..7944de0b59 100644 --- a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/TmfCheckpointIndexTest.java +++ b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/TmfCheckpointIndexTest.java @@ -81,14 +81,14 @@ public class TmfCheckpointIndexTest extends TestCase { // Helper classes // ------------------------------------------------------------------------ - private static class TestIndexer extends TmfCheckpointIndexer> { - @SuppressWarnings({ "unchecked", "rawtypes" }) + private static class TestIndexer extends TmfCheckpointIndexer { + @SuppressWarnings({ }) public TestIndexer(TestTrace testTrace) { - super((ITmfTrace) testTrace, BLOCK_SIZE); + super(testTrace, BLOCK_SIZE); } - @SuppressWarnings({ "unchecked", "rawtypes" }) + @SuppressWarnings({ }) public TestIndexer(EmptyTestTrace testTrace) { - super((ITmfTrace) testTrace, BLOCK_SIZE); + super(testTrace, BLOCK_SIZE); } public List getCheckpoints() { return getTraceIndex(); diff --git a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/TmfExperimentCheckpointIndexTest.java b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/TmfExperimentCheckpointIndexTest.java index 9053a05e8c..6be2ca5d90 100644 --- a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/TmfExperimentCheckpointIndexTest.java +++ b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/TmfExperimentCheckpointIndexTest.java @@ -26,7 +26,6 @@ import org.eclipse.linuxtools.internal.tmf.core.trace.TmfExperimentContext; import org.eclipse.linuxtools.internal.tmf.core.trace.TmfExperimentLocation; import org.eclipse.linuxtools.internal.tmf.core.trace.TmfLocationArray; import org.eclipse.linuxtools.tmf.core.event.ITmfEvent; -import org.eclipse.linuxtools.tmf.core.event.TmfEvent; import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange; import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp; import org.eclipse.linuxtools.tmf.core.exceptions.TmfTraceException; @@ -55,8 +54,8 @@ public class TmfExperimentCheckpointIndexTest extends TestCase { private static int NB_EVENTS = 20000; private static int BLOCK_SIZE = 1000; - private static ITmfTrace[] fTestTraces; - private static TmfExperimentStub fExperiment; + private static ITmfTrace[] fTestTraces; + private static TmfExperimentStub fExperiment; // ------------------------------------------------------------------------ // Housekeeping @@ -74,7 +73,7 @@ public class TmfExperimentCheckpointIndexTest extends TestCase { super.setUp(); if (fExperiment == null) { setupTrace(DIRECTORY + File.separator + TEST_STREAM1, DIRECTORY + File.separator + TEST_STREAM2); - fExperiment = new TmfExperimentStub(EXPERIMENT, fTestTraces, BLOCK_SIZE); + fExperiment = new TmfExperimentStub(EXPERIMENT, fTestTraces, BLOCK_SIZE); fExperiment.getIndexer().buildIndex(0, TmfTimeRange.ETERNITY, true); } } @@ -87,8 +86,7 @@ public class TmfExperimentCheckpointIndexTest extends TestCase { fTestTraces = null; } - @SuppressWarnings("unchecked") - private synchronized static ITmfTrace[] setupTrace(final String path1, final String path2) { + private synchronized static ITmfTrace[] setupTrace(final String path1, final String path2) { if (fTestTraces == null) { fTestTraces = new ITmfTrace[2]; try { @@ -153,7 +151,7 @@ public class TmfExperimentCheckpointIndexTest extends TestCase { @SuppressWarnings("null") public void testGrowingIndex() { - ITmfTrace[] testTraces = new TmfTraceStub[2]; + ITmfTrace[] testTraces = new TmfTraceStub[2]; try { URL location = FileLocator.find(TmfCoreTestPlugin.getDefault().getBundle(), new Path(DIRECTORY + File.separator + TEST_STREAM1), null); File test = new File(FileLocator.toFileURL(location).toURI()); @@ -171,7 +169,7 @@ public class TmfExperimentCheckpointIndexTest extends TestCase { e.printStackTrace(); } - TmfExperimentStub experiment = new TmfExperimentStub(EXPERIMENT, testTraces, BLOCK_SIZE); + TmfExperimentStub experiment = new TmfExperimentStub(EXPERIMENT, testTraces, BLOCK_SIZE); int pageSize = experiment.getCacheSize(); // Build the first half of the index diff --git a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/TmfExperimentTest.java b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/TmfExperimentTest.java index 448b3e549a..4158292593 100644 --- a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/TmfExperimentTest.java +++ b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/TmfExperimentTest.java @@ -58,8 +58,8 @@ public class TmfExperimentTest extends TestCase { private static int NB_EVENTS = 10000; private static int BLOCK_SIZE = 1000; - private ITmfTrace[] fTestTraces; - private TmfExperimentStub fExperiment; + private ITmfTrace[] fTestTraces; + private TmfExperimentStub fExperiment; private static byte SCALE = (byte) -3; @@ -67,8 +67,7 @@ public class TmfExperimentTest extends TestCase { // Housekeeping // ------------------------------------------------------------------------ - @SuppressWarnings("unchecked") - private synchronized ITmfTrace[] setupTrace(final String path) { + private synchronized ITmfTrace[] setupTrace(final String path) { if (fTestTraces == null) { fTestTraces = new ITmfTrace[1]; try { @@ -89,7 +88,7 @@ public class TmfExperimentTest extends TestCase { private synchronized void setupExperiment() { if (fExperiment == null) { - fExperiment = new TmfExperimentStub(EXPERIMENT, fTestTraces, BLOCK_SIZE); + fExperiment = new TmfExperimentStub(EXPERIMENT, fTestTraces, BLOCK_SIZE); fExperiment.getIndexer().buildIndex(0, TmfTimeRange.ETERNITY, true); } } @@ -119,12 +118,12 @@ public class TmfExperimentTest extends TestCase { public void testSimpleTmfExperimentConstructor() { - TmfExperiment experiment = new TmfExperiment(TmfEvent.class, EXPERIMENT, fTestTraces); + TmfExperiment experiment = new TmfExperiment(TmfEvent.class, EXPERIMENT, fTestTraces); assertEquals("GetId", EXPERIMENT, experiment.getName()); assertEquals("GetCacheSize", TmfExperiment.DEFAULT_INDEX_PAGE_SIZE, experiment.getCacheSize()); experiment.dispose(); - experiment = new TmfExperiment(TmfEvent.class, EXPERIMENT, null); + experiment = new TmfExperiment(TmfEvent.class, EXPERIMENT, null); experiment.dispose(); } @@ -147,11 +146,11 @@ public class TmfExperimentTest extends TestCase { @SuppressWarnings("static-access") public void testSetCurrentExperiment() { - TmfExperiment experiment = new TmfExperiment(TmfEvent.class, EXPERIMENT, fTestTraces); + TmfExperiment experiment = new TmfExperiment(TmfEvent.class, EXPERIMENT, fTestTraces); experiment.setCurrentExperiment(experiment); assertEquals("getCurrentExperiment", experiment, experiment.getCurrentExperiment()); - TmfExperiment experiment2 = new TmfExperiment(TmfEvent.class, EXPERIMENT, null); + TmfExperiment experiment2 = new TmfExperiment(TmfEvent.class, EXPERIMENT, null); experiment.setCurrentExperiment(experiment2); assertEquals("getCurrentExperiment", experiment2, experiment.getCurrentExperiment()); @@ -196,7 +195,7 @@ public class TmfExperimentTest extends TestCase { } public void testSeekNoTrace() { - TmfExperiment experiment = new TmfExperiment(TmfEvent.class, EXPERIMENT, null); + TmfExperiment experiment = new TmfExperiment(TmfEvent.class, EXPERIMENT, null); ITmfContext context = experiment.seekEvent((TmfExperimentLocation) null); assertNull("seekEvent", context); experiment.dispose(); @@ -826,12 +825,12 @@ public class TmfExperimentTest extends TestCase { final int blockSize = 100; final int nbEvents = 1000; - final Vector requestedEvents = new Vector(); + final Vector requestedEvents = new Vector(); final TmfTimeRange range = new TmfTimeRange(TmfTimestamp.BIG_BANG, TmfTimestamp.BIG_CRUNCH); - final TmfEventRequest request = new TmfEventRequest(TmfEvent.class, range, nbEvents, blockSize) { + final TmfEventRequest request = new TmfEventRequest(TmfEvent.class, range, nbEvents, blockSize) { @Override - public void handleData(final TmfEvent event) { + public void handleData(final ITmfEvent event) { super.handleData(event); requestedEvents.add(event); } @@ -854,12 +853,12 @@ public class TmfExperimentTest extends TestCase { final int blockSize = 2 * NB_EVENTS; final int nbEvents = 1000; - final Vector requestedEvents = new Vector(); + final Vector requestedEvents = new Vector(); final TmfTimeRange range = new TmfTimeRange(TmfTimestamp.BIG_BANG, TmfTimestamp.BIG_CRUNCH); - final TmfEventRequest request = new TmfEventRequest(TmfEvent.class, range, nbEvents, blockSize) { + final TmfEventRequest request = new TmfEventRequest(TmfEvent.class, range, nbEvents, blockSize) { @Override - public void handleData(final TmfEvent event) { + public void handleData(final ITmfEvent event) { super.handleData(event); requestedEvents.add(event); } @@ -882,13 +881,13 @@ public class TmfExperimentTest extends TestCase { final int nbEvents = TmfDataRequest.ALL_DATA; final int blockSize = 1; - final Vector requestedEvents = new Vector(); + final Vector requestedEvents = new Vector(); final long nbExpectedEvents = NB_EVENTS; final TmfTimeRange range = new TmfTimeRange(TmfTimestamp.BIG_BANG, TmfTimestamp.BIG_CRUNCH); - final TmfEventRequest request = new TmfEventRequest(TmfEvent.class, range, nbEvents, blockSize) { + final TmfEventRequest request = new TmfEventRequest(TmfEvent.class, range, nbEvents, blockSize) { @Override - public void handleData(final TmfEvent event) { + public void handleData(final ITmfEvent event) { super.handleData(event); requestedEvents.add(event); } @@ -915,13 +914,13 @@ public class TmfExperimentTest extends TestCase { final int nbEvents = NB_EVENTS; final int blockSize = BLOCK_SIZE; - final Vector requestedEvents = new Vector(); + final Vector requestedEvents = new Vector(); final TmfTimeRange range = new TmfTimeRange(TmfTimestamp.BIG_BANG, TmfTimestamp.BIG_CRUNCH); - final TmfEventRequest request = new TmfEventRequest(TmfEvent.class, range, nbEvents, blockSize) { + final TmfEventRequest request = new TmfEventRequest(TmfEvent.class, range, nbEvents, blockSize) { int nbRead = 0; @Override - public void handleData(final TmfEvent event) { + public void handleData(final ITmfEvent event) { super.handleData(event); requestedEvents.add(event); if (++nbRead == blockSize) { diff --git a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/TmfMultiTraceExperimentTest.java b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/TmfMultiTraceExperimentTest.java index 3ce41a477f..9596fd4911 100644 --- a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/TmfMultiTraceExperimentTest.java +++ b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/TmfMultiTraceExperimentTest.java @@ -55,8 +55,8 @@ public class TmfMultiTraceExperimentTest extends TestCase { private static int NB_EVENTS = 20000; private static int BLOCK_SIZE = 1000; - private static ITmfTrace[] fTraces; - private static TmfExperimentStub fExperiment; + private static ITmfTrace[] fTraces; + private static TmfExperimentStub fExperiment; private static byte SCALE = (byte) -3; @@ -64,8 +64,7 @@ public class TmfMultiTraceExperimentTest extends TestCase { // Housekeeping // ------------------------------------------------------------------------ - @SuppressWarnings("unchecked") - private synchronized static ITmfTrace[] setupTrace(final String path1, final String path2) { + private synchronized static ITmfTrace[] setupTrace(final String path1, final String path2) { if (fTraces == null) { fTraces = new ITmfTrace[2]; try { @@ -100,7 +99,7 @@ public class TmfMultiTraceExperimentTest extends TestCase { super.setUp(); setupTrace(DIRECTORY + File.separator + TEST_STREAM1, DIRECTORY + File.separator + TEST_STREAM2); if (fExperiment == null) { - fExperiment = new TmfExperimentStub(EXPERIMENT, fTraces, BLOCK_SIZE); + fExperiment = new TmfExperimentStub(EXPERIMENT, fTraces, BLOCK_SIZE); fExperiment.getIndexer().buildIndex(0, TmfTimeRange.ETERNITY, true); } } @@ -673,12 +672,12 @@ public class TmfMultiTraceExperimentTest extends TestCase { final int blockSize = 100; final int nbEvents = 1000; - final Vector requestedEvents = new Vector(); + final Vector requestedEvents = new Vector(); final TmfTimeRange range = new TmfTimeRange(TmfTimestamp.BIG_BANG, TmfTimestamp.BIG_CRUNCH); - final TmfEventRequest request = new TmfEventRequest(TmfEvent.class, range, nbEvents, blockSize) { + final TmfEventRequest request = new TmfEventRequest(TmfEvent.class, range, nbEvents, blockSize) { @Override - public void handleData(final TmfEvent event) { + public void handleData(final ITmfEvent event) { super.handleData(event); requestedEvents.add(event); } @@ -701,12 +700,12 @@ public class TmfMultiTraceExperimentTest extends TestCase { final int blockSize = 2 * NB_EVENTS; final int nbEvents = 1000; - final Vector requestedEvents = new Vector(); + final Vector requestedEvents = new Vector(); final TmfTimeRange range = new TmfTimeRange(TmfTimestamp.BIG_BANG, TmfTimestamp.BIG_CRUNCH); - final TmfEventRequest request = new TmfEventRequest(TmfEvent.class, range, nbEvents, blockSize) { + final TmfEventRequest request = new TmfEventRequest(TmfEvent.class, range, nbEvents, blockSize) { @Override - public void handleData(final TmfEvent event) { + public void handleData(final ITmfEvent event) { super.handleData(event); requestedEvents.add(event); } @@ -729,13 +728,13 @@ public class TmfMultiTraceExperimentTest extends TestCase { final int nbEvents = TmfDataRequest.ALL_DATA; final int blockSize = 1; - final Vector requestedEvents = new Vector(); + final Vector requestedEvents = new Vector(); final long nbExpectedEvents = NB_EVENTS; final TmfTimeRange range = new TmfTimeRange(TmfTimestamp.BIG_BANG, TmfTimestamp.BIG_CRUNCH); - final TmfEventRequest request = new TmfEventRequest(TmfEvent.class, range, nbEvents, blockSize) { + final TmfEventRequest request = new TmfEventRequest(TmfEvent.class, range, nbEvents, blockSize) { @Override - public void handleData(final TmfEvent event) { + public void handleData(final ITmfEvent event) { super.handleData(event); requestedEvents.add(event); } @@ -762,13 +761,13 @@ public class TmfMultiTraceExperimentTest extends TestCase { final int nbEvents = NB_EVENTS; final int blockSize = BLOCK_SIZE; - final Vector requestedEvents = new Vector(); + final Vector requestedEvents = new Vector(); final TmfTimeRange range = new TmfTimeRange(TmfTimestamp.BIG_BANG, TmfTimestamp.BIG_CRUNCH); - final TmfEventRequest request = new TmfEventRequest(TmfEvent.class, range, nbEvents, blockSize) { + final TmfEventRequest request = new TmfEventRequest(TmfEvent.class, range, nbEvents, blockSize) { int nbRead = 0; @Override - public void handleData(final TmfEvent event) { + public void handleData(final ITmfEvent event) { super.handleData(event); requestedEvents.add(event); if (++nbRead == blockSize) { diff --git a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/TmfTraceTest.java b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/TmfTraceTest.java index 345648c896..14cf7fb509 100644 --- a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/TmfTraceTest.java +++ b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/TmfTraceTest.java @@ -254,7 +254,7 @@ public class TmfTraceTest extends TestCase { assertEquals("getEndTime", NB_EVENTS, trace.getEndTime().getValue()); } - @SuppressWarnings({ "unchecked", "rawtypes", "null" }) + @SuppressWarnings("null") public void testCopyConstructor() throws TmfTraceException { TmfTraceStub original = null; TmfTraceStub trace = null; @@ -1198,17 +1198,17 @@ public class TmfTraceTest extends TestCase { @SuppressWarnings("hiding") public void testProcessEventRequestForAllEvents() throws InterruptedException { final int BLOCK_SIZE = 1; - final Vector requestedEvents = new Vector(); + final Vector requestedEvents = new Vector(); final TmfTimeRange range = new TmfTimeRange(TmfTimestamp.BIG_BANG, TmfTimestamp.BIG_CRUNCH); - final TmfEventRequest request = new TmfEventRequest(TmfEvent.class, range, NB_EVENTS, BLOCK_SIZE) { + final TmfEventRequest request = new TmfEventRequest(TmfEvent.class, range, NB_EVENTS, BLOCK_SIZE) { @Override - public void handleData(final TmfEvent event) { + public void handleData(final ITmfEvent event) { super.handleData(event); requestedEvents.add(event); } }; - final ITmfDataProvider[] providers = (ITmfDataProvider[]) TmfProviderManager.getProviders(TmfEvent.class, TmfTraceStub.class); + final ITmfDataProvider[] providers = TmfProviderManager.getProviders(TmfEvent.class, TmfTraceStub.class); providers[0].sendRequest(request); request.waitForCompletion(); @@ -1227,17 +1227,17 @@ public class TmfTraceTest extends TestCase { public void testProcessEventRequestForNbEvents() throws InterruptedException { final int BLOCK_SIZE = 100; final int NB_EVENTS = 1000; - final Vector requestedEvents = new Vector(); + final Vector requestedEvents = new Vector(); final TmfTimeRange range = new TmfTimeRange(TmfTimestamp.BIG_BANG, TmfTimestamp.BIG_CRUNCH); - final TmfEventRequest request = new TmfEventRequest(TmfEvent.class, range, NB_EVENTS, BLOCK_SIZE) { + final TmfEventRequest request = new TmfEventRequest(TmfEvent.class, range, NB_EVENTS, BLOCK_SIZE) { @Override - public void handleData(final TmfEvent event) { + public void handleData(final ITmfEvent event) { super.handleData(event); requestedEvents.add(event); } }; - final ITmfDataProvider[] providers = (ITmfDataProvider[]) TmfProviderManager.getProviders(TmfEvent.class, TmfTraceStub.class); + final ITmfDataProvider[] providers = TmfProviderManager.getProviders(TmfEvent.class, TmfTraceStub.class); providers[0].sendRequest(request); request.waitForCompletion(); @@ -1257,17 +1257,17 @@ public class TmfTraceTest extends TestCase { final int BLOCK_SIZE = 1; final long startTime = 100; final int NB_EVENTS = 1000; - final Vector requestedEvents = new Vector(); + final Vector requestedEvents = new Vector(); final TmfTimeRange range = new TmfTimeRange(new TmfTimestamp(startTime, SCALE), TmfTimestamp.BIG_CRUNCH); - final TmfEventRequest request = new TmfEventRequest(TmfEvent.class, range, NB_EVENTS, BLOCK_SIZE) { + final TmfEventRequest request = new TmfEventRequest(TmfEvent.class, range, NB_EVENTS, BLOCK_SIZE) { @Override - public void handleData(final TmfEvent event) { + public void handleData(final ITmfEvent event) { super.handleData(event); requestedEvents.add(event); } }; - final ITmfDataProvider[] providers = (ITmfDataProvider[]) TmfProviderManager.getProviders(TmfEvent.class, TmfTraceStub.class); + final ITmfDataProvider[] providers = TmfProviderManager.getProviders(TmfEvent.class, TmfTraceStub.class); providers[0].sendRequest(request); request.waitForCompletion(); @@ -1288,17 +1288,17 @@ public class TmfTraceTest extends TestCase { final int startIndex = 99; final long startTime = 100; final int NB_EVENTS = 1000; - final Vector requestedEvents = new Vector(); + final Vector requestedEvents = new Vector(); final TmfTimeRange range = new TmfTimeRange(new TmfTimestamp(startTime, SCALE), TmfTimestamp.BIG_CRUNCH); - final TmfEventRequest request = new TmfEventRequest(TmfEvent.class, range, startIndex, NB_EVENTS, BLOCK_SIZE) { + final TmfEventRequest request = new TmfEventRequest(TmfEvent.class, range, startIndex, NB_EVENTS, BLOCK_SIZE) { @Override - public void handleData(final TmfEvent event) { + public void handleData(final ITmfEvent event) { super.handleData(event); requestedEvents.add(event); } }; - final ITmfDataProvider[] providers = (ITmfDataProvider[]) TmfProviderManager.getProviders(TmfEvent.class, TmfTraceStub.class); + final ITmfDataProvider[] providers = TmfProviderManager.getProviders(TmfEvent.class, TmfTraceStub.class); providers[0].sendRequest(request); request.waitForCompletion(); @@ -1317,16 +1317,16 @@ public class TmfTraceTest extends TestCase { public void testProcessDataRequestForSomeEvents() throws InterruptedException { final int startIndex = 100; final int NB_EVENTS = 1000; - final Vector requestedEvents = new Vector(); + final Vector requestedEvents = new Vector(); - final TmfDataRequest request = new TmfDataRequest(TmfEvent.class, startIndex, NB_EVENTS) { + final TmfDataRequest request = new TmfDataRequest(TmfEvent.class, startIndex, NB_EVENTS) { @Override - public void handleData(final TmfEvent event) { + public void handleData(final ITmfEvent event) { super.handleData(event); requestedEvents.add(event); } }; - final ITmfDataProvider[] providers = (ITmfDataProvider[]) TmfProviderManager.getProviders(TmfEvent.class, TmfTraceStub.class); + final ITmfDataProvider[] providers = TmfProviderManager.getProviders(TmfEvent.class, TmfTraceStub.class); providers[0].sendRequest(request); request.waitForCompletion(); @@ -1346,13 +1346,13 @@ public class TmfTraceTest extends TestCase { // ------------------------------------------------------------------------ public void testCancel() throws InterruptedException { - final Vector requestedEvents = new Vector(); + final Vector requestedEvents = new Vector(); final TmfTimeRange range = new TmfTimeRange(TmfTimestamp.BIG_BANG, TmfTimestamp.BIG_CRUNCH); - final TmfEventRequest request = new TmfEventRequest(TmfEvent.class, range, NB_EVENTS, BLOCK_SIZE) { + final TmfEventRequest request = new TmfEventRequest(TmfEvent.class, range, NB_EVENTS, BLOCK_SIZE) { int nbRead = 0; @Override - public void handleData(final TmfEvent event) { + public void handleData(final ITmfEvent event) { super.handleData(event); requestedEvents.add(event); if (++nbRead == BLOCK_SIZE) { @@ -1360,7 +1360,7 @@ public class TmfTraceTest extends TestCase { } } }; - final ITmfDataProvider[] providers = (ITmfDataProvider[]) TmfProviderManager.getProviders(TmfEvent.class, TmfTraceStub.class); + final ITmfDataProvider[] providers = TmfProviderManager.getProviders(TmfEvent.class, TmfTraceStub.class); providers[0].sendRequest(request); request.waitForCompletion(); diff --git a/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/component/TmfClientStub.java b/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/component/TmfClientStub.java index 518554a3a8..905a2eb7b7 100644 --- a/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/component/TmfClientStub.java +++ b/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/component/TmfClientStub.java @@ -25,14 +25,14 @@ import org.eclipse.linuxtools.tmf.tests.stubs.event.TmfSyntheticEventStub; @SuppressWarnings({"nls","javadoc"}) public class TmfClientStub extends TmfComponent { - private TmfDataProvider[] fProviders; + private TmfDataProvider[] fProviders; public TmfClientStub() { super("TmfClientStub"); } public void findProvider() { - fProviders = (TmfDataProvider[]) TmfProviderManager.getProviders(TmfSyntheticEventStub.class, TmfSyntheticEventProviderStub.class); + fProviders = TmfProviderManager.getProviders(TmfSyntheticEventStub.class, TmfSyntheticEventProviderStub.class); // TmfEventRequest request; System.out.println(fProviders.length); } diff --git a/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/component/TmfDataProviderStub.java b/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/component/TmfDataProviderStub.java index 2889cca5d2..dfb0c05e5c 100644 --- a/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/component/TmfDataProviderStub.java +++ b/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/component/TmfDataProviderStub.java @@ -20,6 +20,7 @@ import java.net.URL; import org.eclipse.core.runtime.FileLocator; import org.eclipse.core.runtime.Path; import org.eclipse.linuxtools.tmf.core.component.TmfDataProvider; +import org.eclipse.linuxtools.tmf.core.event.ITmfEvent; import org.eclipse.linuxtools.tmf.core.event.TmfEvent; import org.eclipse.linuxtools.tmf.core.exceptions.TmfTraceException; import org.eclipse.linuxtools.tmf.core.request.ITmfDataRequest; @@ -34,7 +35,7 @@ import org.eclipse.linuxtools.tmf.tests.stubs.trace.TmfTraceStub; * TODO: Implement me. Please. */ @SuppressWarnings({"nls","javadoc"}) -public class TmfDataProviderStub extends TmfDataProvider { +public class TmfDataProviderStub extends TmfDataProvider { private static final String DIRECTORY = "testfiles"; private static final String TEST_STREAM = "M-Test-10K"; @@ -63,21 +64,21 @@ public class TmfDataProviderStub extends TmfDataProvider { // ------------------------------------------------------------------------ @Override - public ITmfContext armRequest(final ITmfDataRequest request) { - if (request instanceof ITmfEventRequest) { - final ITmfContext context = fTrace.seekEvent(((ITmfEventRequest) request).getRange().getStartTime()); + public ITmfContext armRequest(final ITmfDataRequest request) { + if (request instanceof ITmfEventRequest) { + final ITmfContext context = fTrace.seekEvent(((ITmfEventRequest) request).getRange().getStartTime()); return context; } return null; } @Override - public TmfEvent getNext(final ITmfContext context) { + public ITmfEvent getNext(final ITmfContext context) { return fTrace.getNext(context); } @Override - public boolean isCompleted(final ITmfDataRequest request, final TmfEvent data, final int nbRead) { + public boolean isCompleted(final ITmfDataRequest request, final ITmfEvent data, final int nbRead) { return false; } diff --git a/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/component/TmfEventProviderStub.java b/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/component/TmfEventProviderStub.java index f105d4d423..66c2cb37cf 100644 --- a/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/component/TmfEventProviderStub.java +++ b/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/component/TmfEventProviderStub.java @@ -20,6 +20,7 @@ import java.net.URL; import org.eclipse.core.runtime.FileLocator; import org.eclipse.core.runtime.Path; import org.eclipse.linuxtools.tmf.core.component.TmfEventProvider; +import org.eclipse.linuxtools.tmf.core.event.ITmfEvent; import org.eclipse.linuxtools.tmf.core.event.TmfEvent; import org.eclipse.linuxtools.tmf.core.exceptions.TmfTraceException; import org.eclipse.linuxtools.tmf.core.request.ITmfDataRequest; @@ -34,7 +35,7 @@ import org.eclipse.linuxtools.tmf.tests.stubs.trace.TmfTraceStub; * TODO: Implement me. Please. */ @SuppressWarnings({"nls","javadoc"}) -public class TmfEventProviderStub extends TmfEventProvider { +public class TmfEventProviderStub extends TmfEventProvider { private static final String DIRECTORY = "testfiles"; private static final String TEST_STREAM = "A-Test-10K"; @@ -69,17 +70,17 @@ public class TmfEventProviderStub extends TmfEventProvider { // ------------------------------------------------------------------------ @Override - public ITmfContext armRequest(final ITmfDataRequest request) { - if (request instanceof ITmfEventRequest) { - final ITmfContext context = fTrace.seekEvent(((ITmfEventRequest) request).getRange().getStartTime()); + public ITmfContext armRequest(final ITmfDataRequest request) { + if (request instanceof ITmfEventRequest) { + final ITmfContext context = fTrace.seekEvent(((ITmfEventRequest) request).getRange().getStartTime()); return context; } return null; } @Override - public TmfEvent getNext(final ITmfContext context) { + public ITmfEvent getNext(final ITmfContext context) { return fTrace.getNext(context); } -} \ No newline at end of file +} diff --git a/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/component/TmfSyntheticEventProviderStub.java b/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/component/TmfSyntheticEventProviderStub.java index b9282e8d73..29b889d115 100644 --- a/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/component/TmfSyntheticEventProviderStub.java +++ b/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/component/TmfSyntheticEventProviderStub.java @@ -17,6 +17,7 @@ import java.util.concurrent.TimeUnit; import org.eclipse.linuxtools.internal.tmf.core.component.TmfProviderManager; import org.eclipse.linuxtools.tmf.core.component.ITmfDataProvider; import org.eclipse.linuxtools.tmf.core.component.TmfEventProvider; +import org.eclipse.linuxtools.tmf.core.event.ITmfEvent; import org.eclipse.linuxtools.tmf.core.event.TmfEvent; import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange; import org.eclipse.linuxtools.tmf.core.request.ITmfDataRequest; @@ -32,7 +33,7 @@ import org.eclipse.linuxtools.tmf.tests.stubs.event.TmfSyntheticEventStub; * TODO: Implement me. Please. */ @SuppressWarnings({"nls","javadoc"}) -public class TmfSyntheticEventProviderStub extends TmfEventProvider { +public class TmfSyntheticEventProviderStub extends TmfEventProvider { public static final int BLOCK_SIZE = 100; public static final int NB_EVENTS = 1000; @@ -42,24 +43,24 @@ public class TmfSyntheticEventProviderStub extends TmfEventProvider request) { + public ITmfContext armRequest(final ITmfDataRequest request) { // Get the TmfSyntheticEventStub provider - final ITmfDataProvider[] eventProviders = (ITmfDataProvider[]) TmfProviderManager.getProviders(TmfEvent.class, TmfEventProviderStub.class); - final ITmfDataProvider provider = eventProviders[0]; + final ITmfDataProvider[] eventProviders = TmfProviderManager.getProviders(TmfEvent.class, TmfEventProviderStub.class); + final ITmfDataProvider provider = eventProviders[0]; // make sure we have the right type of request - if (!(request instanceof ITmfEventRequest)) { + if (!(request instanceof ITmfEventRequest)) { request.cancel(); return null; } - final TmfEventRequest eventRequest = (TmfEventRequest) request; + final TmfEventRequest eventRequest = (TmfEventRequest) request; final TmfTimeRange range = eventRequest.getRange(); - final TmfEventRequest subRequest = - new TmfEventRequest(TmfEvent.class, range, NB_EVENTS, BLOCK_SIZE) { + final TmfEventRequest subRequest = + new TmfEventRequest(TmfEvent.class, range, NB_EVENTS, BLOCK_SIZE) { @Override - public void handleData(final TmfEvent event) { + public void handleData(final ITmfEvent event) { super.handleData(event); if (event != null) { handleIncomingData(event); @@ -75,7 +76,7 @@ public class TmfSyntheticEventProviderStub extends TmfEventProvider The event type + * */ -public class TmfDataRequestStub extends TmfDataRequest { +public class TmfDataRequestStub extends TmfDataRequest { /** * Default constructor * * @param dataType the request data type */ - public TmfDataRequestStub(final Class dataType) { + public TmfDataRequestStub(final Class dataType) { super(dataType); } @@ -33,7 +33,7 @@ public class TmfDataRequestStub extends TmfDataRequest { * @param dataType the request data type * @param index the initial event index */ - public TmfDataRequestStub(final Class dataType, final int index) { + public TmfDataRequestStub(final Class dataType, final int index) { super(dataType, index); } @@ -42,7 +42,7 @@ public class TmfDataRequestStub extends TmfDataRequest { * @param index the initial event index * @param nbRequested the number of events requested */ - public TmfDataRequestStub(final Class dataType, final int index, final int nbRequested) { + public TmfDataRequestStub(final Class dataType, final int index, final int nbRequested) { super(dataType, index, nbRequested); } @@ -52,7 +52,7 @@ public class TmfDataRequestStub extends TmfDataRequest { * @param nbRequested the number of events requested * @param blockSize the event block size */ - public TmfDataRequestStub(final Class dataType, final int index, final int nbRequested, final int blockSize) { + public TmfDataRequestStub(final Class dataType, final int index, final int nbRequested, final int blockSize) { super(dataType, index, nbRequested, blockSize); } @@ -60,7 +60,7 @@ public class TmfDataRequestStub extends TmfDataRequest { * @see org.eclipse.linuxtools.tmf.core.request.TmfDataRequest#handleData(org.eclipse.linuxtools.tmf.core.event.ITmfEvent) */ @Override - public void handleData(final T data) { + public void handleData(final ITmfEvent data) { super.handleData(data); } diff --git a/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/request/TmfEventRequestStub.java b/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/request/TmfEventRequestStub.java index 477de1e6e9..3e2ba6a74b 100644 --- a/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/request/TmfEventRequestStub.java +++ b/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/request/TmfEventRequestStub.java @@ -12,21 +12,19 @@ package org.eclipse.linuxtools.tmf.tests.stubs.request; -import org.eclipse.linuxtools.tmf.core.event.TmfEvent; +import org.eclipse.linuxtools.tmf.core.event.ITmfEvent; import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange; import org.eclipse.linuxtools.tmf.core.request.TmfEventRequest; /** * TmfEventRequestStub - *

- * @param The requested event type */ -public class TmfEventRequestStub extends TmfEventRequest { +public class TmfEventRequestStub extends TmfEventRequest { /** * @param dataType the event type */ - public TmfEventRequestStub(final Class dataType) { + public TmfEventRequestStub(final Class dataType) { super(dataType); } @@ -34,7 +32,7 @@ public class TmfEventRequestStub extends TmfEventRequest * @param dataType the event type * @param range the requested time range */ - public TmfEventRequestStub(final Class dataType, final TmfTimeRange range) { + public TmfEventRequestStub(final Class dataType, final TmfTimeRange range) { super(dataType, range); } @@ -43,7 +41,7 @@ public class TmfEventRequestStub extends TmfEventRequest * @param range the requested time range * @param nbRequested the number of events requested */ - public TmfEventRequestStub(final Class dataType, final TmfTimeRange range, final int nbRequested) { + public TmfEventRequestStub(final Class dataType, final TmfTimeRange range, final int nbRequested) { super(dataType, range, nbRequested); } @@ -53,7 +51,7 @@ public class TmfEventRequestStub extends TmfEventRequest * @param nbRequested the number of events requested * @param blockSize the event block size */ - public TmfEventRequestStub(final Class dataType, final TmfTimeRange range, final int nbRequested, final int blockSize) { + public TmfEventRequestStub(final Class dataType, final TmfTimeRange range, final int nbRequested, final int blockSize) { super(dataType, range, nbRequested, blockSize); } @@ -64,7 +62,7 @@ public class TmfEventRequestStub extends TmfEventRequest * @param nbRequested the number of events requested * @param blockSize the event block size */ - public TmfEventRequestStub(final Class dataType, final TmfTimeRange range, final long index, final int nbRequested, final int blockSize) { + public TmfEventRequestStub(final Class dataType, final TmfTimeRange range, final long index, final int nbRequested, final int blockSize) { super(dataType, range, index, nbRequested, blockSize); } @@ -72,7 +70,7 @@ public class TmfEventRequestStub extends TmfEventRequest * @see org.eclipse.linuxtools.tmf.core.request.TmfDataRequest#handleData(org.eclipse.linuxtools.tmf.core.event.ITmfEvent) */ @Override - public void handleData(final T data) { + public void handleData(final ITmfEvent data) { super.handleData(data); } } diff --git a/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/trace/TmfEventParserStub.java b/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/trace/TmfEventParserStub.java index fefeee13a3..0f8a84aee0 100644 --- a/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/trace/TmfEventParserStub.java +++ b/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/trace/TmfEventParserStub.java @@ -33,7 +33,7 @@ import org.eclipse.linuxtools.tmf.core.trace.TmfLocation; * TODO: Implement me. Please. */ @SuppressWarnings({"nls","javadoc"}) -public class TmfEventParserStub implements ITmfEventParser { +public class TmfEventParserStub implements ITmfEventParser { // ------------------------------------------------------------------------ // Attributes @@ -41,13 +41,13 @@ public class TmfEventParserStub implements ITmfEventParser { private static final int NB_TYPES = 10; private final TmfEventType[] fTypes; - private ITmfTrace fEventStream; + private final ITmfTrace fEventStream; // ------------------------------------------------------------------------ // Constructors // ------------------------------------------------------------------------ - public TmfEventParserStub(final ITmfTrace eventStream) { + public TmfEventParserStub(final ITmfTrace eventStream) { fEventStream = eventStream; fTypes = new TmfEventType[NB_TYPES]; for (int i = 0; i < NB_TYPES; i++) { @@ -118,4 +118,4 @@ public class TmfEventParserStub implements ITmfEventParser { return null; } -} \ No newline at end of file +} diff --git a/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/trace/TmfExperimentStub.java b/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/trace/TmfExperimentStub.java index 34eea40894..b8a2f0d70d 100644 --- a/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/trace/TmfExperimentStub.java +++ b/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/trace/TmfExperimentStub.java @@ -12,7 +12,6 @@ package org.eclipse.linuxtools.tmf.tests.stubs.trace; -import org.eclipse.linuxtools.tmf.core.event.ITmfEvent; import org.eclipse.linuxtools.tmf.core.event.TmfEvent; import org.eclipse.linuxtools.tmf.core.trace.ITmfTrace; import org.eclipse.linuxtools.tmf.core.trace.TmfExperiment; @@ -24,9 +23,9 @@ import org.eclipse.linuxtools.tmf.core.trace.TmfExperiment; *

*/ @SuppressWarnings("javadoc") -public class TmfExperimentStub extends TmfExperiment { +public class TmfExperimentStub extends TmfExperiment { - public TmfExperimentStub(String name, ITmfTrace[] traces, int blockSize) { + public TmfExperimentStub(String name, ITmfTrace[] traces, int blockSize) { super(TmfEvent.class, name, traces, blockSize); setIndexer(new TmfIndexerStub(this, blockSize)); } diff --git a/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/trace/TmfIndexerStub.java b/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/trace/TmfIndexerStub.java index 2acfa55275..1812d938f3 100644 --- a/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/trace/TmfIndexerStub.java +++ b/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/trace/TmfIndexerStub.java @@ -14,7 +14,6 @@ package org.eclipse.linuxtools.tmf.tests.stubs.trace; import java.util.List; -import org.eclipse.linuxtools.tmf.core.event.ITmfEvent; import org.eclipse.linuxtools.tmf.core.trace.ITmfCheckpoint; import org.eclipse.linuxtools.tmf.core.trace.ITmfTrace; import org.eclipse.linuxtools.tmf.core.trace.TmfCheckpointIndexer; @@ -26,9 +25,8 @@ import org.eclipse.linuxtools.tmf.core.trace.TmfCheckpointIndexer; *

*/ @SuppressWarnings("javadoc") -public class TmfIndexerStub extends TmfCheckpointIndexer> { +public class TmfIndexerStub extends TmfCheckpointIndexer { - @SuppressWarnings({ "rawtypes", "unchecked" }) public TmfIndexerStub(ITmfTrace trace, int blockSize) { super(trace, blockSize); } diff --git a/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/trace/TmfTraceStub.java b/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/trace/TmfTraceStub.java index 97324ed646..2b192f93c3 100644 --- a/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/trace/TmfTraceStub.java +++ b/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/trace/TmfTraceStub.java @@ -19,6 +19,7 @@ import java.util.concurrent.locks.ReentrantLock; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; +import org.eclipse.linuxtools.tmf.core.event.ITmfEvent; import org.eclipse.linuxtools.tmf.core.event.ITmfTimestamp; import org.eclipse.linuxtools.tmf.core.event.TmfEvent; import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange; @@ -38,7 +39,7 @@ import org.eclipse.linuxtools.tmf.core.trace.TmfTrace; * Dummy test trace. Use in conjunction with TmfEventParserStub. */ @SuppressWarnings({"nls","javadoc"}) -public class TmfTraceStub extends TmfTrace implements ITmfEventParser { +public class TmfTraceStub extends TmfTrace implements ITmfEventParser { // ------------------------------------------------------------------------ // Attributes @@ -99,7 +100,7 @@ public class TmfTraceStub extends TmfTrace implements ITmfEventParser< * @param cacheSize * @throws FileNotFoundException */ - public TmfTraceStub(final String path, final int cacheSize, final ITmfTraceIndexer indexer) throws TmfTraceException { + public TmfTraceStub(final String path, final int cacheSize, final ITmfTraceIndexer indexer) throws TmfTraceException { this(path, cacheSize, false, null, indexer); } @@ -155,7 +156,7 @@ public class TmfTraceStub extends TmfTrace implements ITmfEventParser< * @throws FileNotFoundException */ public TmfTraceStub(final String path, final int cacheSize, final boolean waitForCompletion, - final ITmfEventParser parser, final ITmfTraceIndexer indexer) throws TmfTraceException { + final ITmfEventParser parser, final ITmfTraceIndexer indexer) throws TmfTraceException { super(null, TmfEvent.class, path, cacheSize, 0, indexer); try { fTrace = new RandomAccessFile(path, "r"); @@ -183,7 +184,7 @@ public class TmfTraceStub extends TmfTrace implements ITmfEventParser< } @Override - public void initTrace(final IResource resource, final String path, final Class type) throws TmfTraceException { + public void initTrace(final IResource resource, final String path, final Class type) throws TmfTraceException { try { fTrace = new RandomAccessFile(path, "r"); } catch (FileNotFoundException e) { @@ -194,7 +195,7 @@ public class TmfTraceStub extends TmfTrace implements ITmfEventParser< } @Override - public void initialize(final IResource resource, final String path, final Class type) throws TmfTraceException { + public void initialize(final IResource resource, final String path, final Class type) throws TmfTraceException { super.initialize(resource, path, type); } @@ -298,12 +299,12 @@ public class TmfTraceStub extends TmfTrace implements ITmfEventParser< } @Override - public TmfEvent parseEvent(final ITmfContext context) { + public ITmfEvent parseEvent(final ITmfContext context) { fLock.lock(); try { // parseNextEvent will update the context if (fTrace != null && getParser() != null && context != null) { - final TmfEvent event = getParser().parseEvent(context.clone()); + final ITmfEvent event = getParser().parseEvent(context.clone()); return event; } } finally { diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/internal/tmf/core/Tracer.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/internal/tmf/core/Tracer.java index 3dad637b1b..462d66f86f 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/internal/tmf/core/Tracer.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/internal/tmf/core/Tracer.java @@ -157,7 +157,7 @@ public class Tracer { trace(message); } - public static void traceRequest(ITmfDataRequest request, String msg) { + public static void traceRequest(ITmfDataRequest request, String msg) { String message = ("[REQ] Req=" + request.getRequestId() + " " + msg); trace(message); } @@ -167,7 +167,7 @@ public class Tracer { trace(message); } - public static void traceEvent(ITmfDataProvider provider, ITmfDataRequest request, ITmfEvent event) { + public static void traceEvent(ITmfDataProvider provider, ITmfDataRequest request, ITmfEvent event) { String message = ("[EVT] Provider=" + provider.toString() + ", Req=" + request.getRequestId() + ", Event=" + event.getTimestamp()); trace(message); } diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/internal/tmf/core/component/TmfProviderManager.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/internal/tmf/core/component/TmfProviderManager.java index 28b83d58a5..79eb85ced8 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/internal/tmf/core/component/TmfProviderManager.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/internal/tmf/core/component/TmfProviderManager.java @@ -1,11 +1,11 @@ /******************************************************************************* * Copyright (c) 2009, 2010 Ericsson - * + * * All rights reserved. This program and the accompanying materials are * made available under the terms of the Eclipse Public License v1.0 which * accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Francois Chouinard - Initial API and implementation *******************************************************************************/ @@ -22,7 +22,7 @@ import org.eclipse.linuxtools.tmf.core.event.ITmfEvent; /** * Singleton that keeps track of the event providers. - * + * * @version 1.0 * @author Francois Chouinard */ @@ -33,13 +33,13 @@ public class TmfProviderManager { // ------------------------------------------------------------------------ private TmfProviderManager() {} - + // ------------------------------------------------------------------------ // Keeps track of the providers for each event type // ------------------------------------------------------------------------ - - private static Map, List>> fProviders = - new HashMap, List>>(); + + private static Map, List> fProviders = + new HashMap, List>(); /** * Registers [provider] as a provider of [eventType] @@ -47,9 +47,10 @@ public class TmfProviderManager { * @param eventType The event type * @param provider The data provider */ - public static void register(Class eventType, TmfDataProvider provider) { - if (fProviders.get(eventType) == null) - fProviders.put(eventType, new ArrayList>()); + public static void register(Class eventType, TmfDataProvider provider) { + if (fProviders.get(eventType) == null) { + fProviders.put(eventType, new ArrayList()); + } fProviders.get(eventType).add(provider); } @@ -59,12 +60,13 @@ public class TmfProviderManager { * @param eventType The event type * @param provider The data provider */ - public static void deregister(Class eventType, TmfDataProvider provider) { - List> list = fProviders.get(eventType); + public static void deregister(Class eventType, TmfDataProvider provider) { + List list = fProviders.get(eventType); if (list != null) { list.remove(provider); - if (list.size() == 0) - fProviders.remove(eventType); + if (list.size() == 0) { + fProviders.remove(eventType); + } } } @@ -74,12 +76,12 @@ public class TmfProviderManager { * @param eventType The event type * @return the list of components that provide [eventType] */ - @SuppressWarnings("unchecked") - public static TmfDataProvider[] getProviders(Class eventType) { - List> list = fProviders.get(eventType); - if (list == null) - list = new ArrayList>(); - TmfDataProvider[] result = new TmfDataProvider[list.size()]; + public static TmfDataProvider[] getProviders(Class eventType) { + List list = fProviders.get(eventType); + if (list == null) { + list = new ArrayList(); + } + TmfDataProvider[] result = new TmfDataProvider[list.size()]; return list.toArray(result); } @@ -90,21 +92,20 @@ public class TmfProviderManager { * @param providerType The data provider * @return the list of components of type [providerType] that provide [eventType] */ - @SuppressWarnings("unchecked") - public static TmfDataProvider[] getProviders(Class eventType, Class> providerType) { + public static TmfDataProvider[] getProviders(Class eventType, Class providerType) { if (providerType == null) { return getProviders(eventType); } - TmfDataProvider[] list = getProviders(eventType); - List> result = new ArrayList>(); + TmfDataProvider[] list = getProviders(eventType); + List result = new ArrayList(); if (list != null) { - for (TmfDataProvider provider : list) { + for (TmfDataProvider provider : list) { if (provider.getClass() == providerType) { result.add(provider); } } } - TmfDataProvider[] array = new TmfDataProvider[result.size()]; + TmfDataProvider[] array = new TmfDataProvider[result.size()]; return result.toArray(array); } diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/internal/tmf/core/request/TmfCoalescedDataRequest.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/internal/tmf/core/request/TmfCoalescedDataRequest.java index 51565e7b13..c659128fbb 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/internal/tmf/core/request/TmfCoalescedDataRequest.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/internal/tmf/core/request/TmfCoalescedDataRequest.java @@ -21,12 +21,10 @@ import org.eclipse.linuxtools.tmf.core.request.TmfDataRequest; /** * The TMF coalesced data request * - * @param The request data type - * * @version 1.0 * @author Francois Chouinard */ -public class TmfCoalescedDataRequest extends TmfDataRequest { +public class TmfCoalescedDataRequest extends TmfDataRequest { // ------------------------------------------------------------------------ // Attributes @@ -35,7 +33,7 @@ public class TmfCoalescedDataRequest extends TmfDataRequest /** * The list of coalesced requests */ - protected Vector> fRequests = new Vector>(); + protected Vector fRequests = new Vector(); // ------------------------------------------------------------------------ // Constructor @@ -47,7 +45,7 @@ public class TmfCoalescedDataRequest extends TmfDataRequest * * @param dataType the requested data type */ - public TmfCoalescedDataRequest(Class dataType) { + public TmfCoalescedDataRequest(Class dataType) { this(dataType, 0, ALL_DATA, DEFAULT_BLOCK_SIZE, ExecutionType.FOREGROUND); } @@ -58,7 +56,7 @@ public class TmfCoalescedDataRequest extends TmfDataRequest * @param dataType the requested data type * @param priority the requested execution priority */ - public TmfCoalescedDataRequest(Class dataType, ExecutionType priority) { + public TmfCoalescedDataRequest(Class dataType, ExecutionType priority) { this(dataType, 0, ALL_DATA, DEFAULT_BLOCK_SIZE, priority); } @@ -69,7 +67,7 @@ public class TmfCoalescedDataRequest extends TmfDataRequest * @param dataType the requested data type * @param index the index of the first event to retrieve */ - public TmfCoalescedDataRequest(Class dataType, long index) { + public TmfCoalescedDataRequest(Class dataType, long index) { this(dataType, index, ALL_DATA, DEFAULT_BLOCK_SIZE, ExecutionType.FOREGROUND); } @@ -81,7 +79,7 @@ public class TmfCoalescedDataRequest extends TmfDataRequest * @param index the index of the first event to retrieve * @param priority the requested execution priority */ - public TmfCoalescedDataRequest(Class dataType, long index, ExecutionType priority) { + public TmfCoalescedDataRequest(Class dataType, long index, ExecutionType priority) { this(dataType, index, ALL_DATA, DEFAULT_BLOCK_SIZE, priority); } @@ -93,7 +91,7 @@ public class TmfCoalescedDataRequest extends TmfDataRequest * @param index the index of the first event to retrieve * @param nbRequested the number of events requested */ - public TmfCoalescedDataRequest(Class dataType, long index, int nbRequested) { + public TmfCoalescedDataRequest(Class dataType, long index, int nbRequested) { this(dataType, index, nbRequested, DEFAULT_BLOCK_SIZE, ExecutionType.FOREGROUND); } @@ -106,7 +104,7 @@ public class TmfCoalescedDataRequest extends TmfDataRequest * @param nbRequested the number of events requested * @param priority the requested execution priority */ - public TmfCoalescedDataRequest(Class dataType, long index, int nbRequested, ExecutionType priority) { + public TmfCoalescedDataRequest(Class dataType, long index, int nbRequested, ExecutionType priority) { this(dataType, index, nbRequested, DEFAULT_BLOCK_SIZE, priority); } @@ -119,7 +117,7 @@ public class TmfCoalescedDataRequest extends TmfDataRequest * @param nbRequested the number of events requested * @param blockSize the number of events per block */ - public TmfCoalescedDataRequest(Class dataType, long index, int nbRequested, int blockSize) { + public TmfCoalescedDataRequest(Class dataType, long index, int nbRequested, int blockSize) { super(dataType, index, nbRequested, blockSize, ExecutionType.FOREGROUND); } @@ -133,7 +131,7 @@ public class TmfCoalescedDataRequest extends TmfDataRequest * @param blockSize the number of events per block * @param priority the requested execution priority */ - public TmfCoalescedDataRequest(Class dataType, long index, int nbRequested, int blockSize, ExecutionType priority) { + public TmfCoalescedDataRequest(Class dataType, long index, int nbRequested, int blockSize, ExecutionType priority) { super(dataType, index, nbRequested, blockSize, priority); } @@ -146,7 +144,7 @@ public class TmfCoalescedDataRequest extends TmfDataRequest * * @param request The request to add */ - public void addRequest(ITmfDataRequest request) { + public void addRequest(ITmfDataRequest request) { fRequests.add(request); merge(request); } @@ -158,14 +156,14 @@ public class TmfCoalescedDataRequest extends TmfDataRequest * The request to verify * @return If the request is compatible, true or false */ - public boolean isCompatible(ITmfDataRequest request) { + public boolean isCompatible(ITmfDataRequest request) { if (request.getExecType() == getExecType()) { return overlaps(request); } return false; } - private boolean overlaps(ITmfDataRequest request) { + private boolean overlaps(ITmfDataRequest request) { long start = request.getIndex(); long end = start + request.getNbRequested(); @@ -174,7 +172,7 @@ public class TmfCoalescedDataRequest extends TmfDataRequest return (start <= (fIndex + fNbRequested + 1) && (end >= fIndex - 1)); } - private void merge(ITmfDataRequest request) { + private void merge(ITmfDataRequest request) { long start = request.getIndex(); long end = Math.min(start + request.getNbRequested(), TmfDataRequest.ALL_DATA); @@ -214,15 +212,15 @@ public class TmfCoalescedDataRequest extends TmfDataRequest // ------------------------------------------------------------------------ @Override - public void handleData(T data) { - super.handleData(data); - // Don't call sub-requests handleData() unless this is a - // TmfCoalescedDataRequest; extended classes should call - // the sub-requests handleData(). - if (getClass() == TmfCoalescedDataRequest.class) { - long index = getIndex() + getNbRead() - 1; - for (ITmfDataRequest request : fRequests) { - if (!request.isCompleted()) { + public void handleData(ITmfEvent data) { + super.handleData(data); + // Don't call sub-requests handleData() unless this is a + // TmfCoalescedDataRequest; extended classes should call + // the sub-requests handleData(). + if (getClass() == TmfCoalescedDataRequest.class) { + long index = getIndex() + getNbRead() - 1; + for (ITmfDataRequest request : fRequests) { + if (!request.isCompleted()) { if (request.getDataType().isInstance(data)) { long start = request.getIndex(); long end = start + request.getNbRequested(); @@ -237,7 +235,7 @@ public class TmfCoalescedDataRequest extends TmfDataRequest @Override public void start() { - for (ITmfDataRequest request : fRequests) { + for (ITmfDataRequest request : fRequests) { if (!request.isCompleted()) { request.start(); } @@ -247,7 +245,7 @@ public class TmfCoalescedDataRequest extends TmfDataRequest @Override public void done() { - for (ITmfDataRequest request : fRequests) { + for (ITmfDataRequest request : fRequests) { if (!request.isCompleted()) { request.done(); } @@ -257,7 +255,7 @@ public class TmfCoalescedDataRequest extends TmfDataRequest @Override public void fail() { - for (ITmfDataRequest request : fRequests) { + for (ITmfDataRequest request : fRequests) { request.fail(); } super.fail(); @@ -265,7 +263,7 @@ public class TmfCoalescedDataRequest extends TmfDataRequest @Override public void cancel() { - for (ITmfDataRequest request : fRequests) { + for (ITmfDataRequest request : fRequests) { if (!request.isCompleted()) { request.cancel(); } @@ -284,7 +282,7 @@ public class TmfCoalescedDataRequest extends TmfDataRequest if (fRequests.size() > 0) { // If all sub requests are completed the coalesced request is // treated as completed, too. - for (ITmfDataRequest request : fRequests) { + for (ITmfDataRequest request : fRequests) { if (!request.isCompleted()) { return false; } @@ -307,7 +305,7 @@ public class TmfCoalescedDataRequest extends TmfDataRequest if (fRequests.size() > 0) { // If all sub requests are canceled the coalesced request is // treated as completed, too. - for (ITmfDataRequest request : fRequests) { + for (ITmfDataRequest request : fRequests) { if (!request.isCancelled()) { return false; } @@ -333,8 +331,8 @@ public class TmfCoalescedDataRequest extends TmfDataRequest @Override public boolean equals(Object other) { - if (other instanceof TmfCoalescedDataRequest) { - TmfCoalescedDataRequest request = (TmfCoalescedDataRequest) other; + if (other instanceof TmfCoalescedDataRequest) { + TmfCoalescedDataRequest request = (TmfCoalescedDataRequest) other; return (request.getDataType() == getDataType()) && (request.getIndex() == getIndex()) && (request.getNbRequested() == getNbRequested() && diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/internal/tmf/core/request/TmfCoalescedEventRequest.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/internal/tmf/core/request/TmfCoalescedEventRequest.java index 95ad17b8d1..7fb6cebd24 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/internal/tmf/core/request/TmfCoalescedEventRequest.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/internal/tmf/core/request/TmfCoalescedEventRequest.java @@ -19,17 +19,14 @@ import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange; import org.eclipse.linuxtools.tmf.core.request.ITmfDataRequest; import org.eclipse.linuxtools.tmf.core.request.ITmfEventRequest; import org.eclipse.linuxtools.tmf.core.request.TmfDataRequest; -import org.eclipse.linuxtools.tmf.core.request.TmfEventRequest; /** * The TMF coalesced event request * - * @param The request event type - * * @version 1.0 * @author Francois Chouinard */ -public class TmfCoalescedEventRequest extends TmfCoalescedDataRequest implements ITmfEventRequest { +public class TmfCoalescedEventRequest extends TmfCoalescedDataRequest implements ITmfEventRequest { // ------------------------------------------------------------------------ // Attributes @@ -47,7 +44,7 @@ public class TmfCoalescedEventRequest extends TmfCoalescedD * * @param dataType the requested data type */ - public TmfCoalescedEventRequest(Class dataType) { + public TmfCoalescedEventRequest(Class dataType) { this(dataType, TmfTimeRange.ETERNITY, ALL_DATA, DEFAULT_BLOCK_SIZE, ExecutionType.FOREGROUND); } @@ -58,7 +55,7 @@ public class TmfCoalescedEventRequest extends TmfCoalescedD * @param dataType the requested data type * @param priority the requested execution priority */ - public TmfCoalescedEventRequest(Class dataType, ExecutionType priority) { + public TmfCoalescedEventRequest(Class dataType, ExecutionType priority) { this(dataType, TmfTimeRange.ETERNITY, ALL_DATA, DEFAULT_BLOCK_SIZE, priority); } @@ -69,7 +66,7 @@ public class TmfCoalescedEventRequest extends TmfCoalescedD * @param dataType the requested data type * @param range the time range of the requested events */ - public TmfCoalescedEventRequest(Class dataType, TmfTimeRange range) { + public TmfCoalescedEventRequest(Class dataType, TmfTimeRange range) { this(dataType, range, ALL_DATA, DEFAULT_BLOCK_SIZE, ExecutionType.FOREGROUND); } @@ -81,7 +78,7 @@ public class TmfCoalescedEventRequest extends TmfCoalescedD * @param range the time range of the requested events * @param priority the requested execution priority */ - public TmfCoalescedEventRequest(Class dataType, TmfTimeRange range, ExecutionType priority) { + public TmfCoalescedEventRequest(Class dataType, TmfTimeRange range, ExecutionType priority) { this(dataType, range, ALL_DATA, DEFAULT_BLOCK_SIZE, priority); } @@ -93,7 +90,7 @@ public class TmfCoalescedEventRequest extends TmfCoalescedD * @param range the time range of the requested events * @param nbRequested the number of events requested */ - public TmfCoalescedEventRequest(Class dataType, TmfTimeRange range, int nbRequested) { + public TmfCoalescedEventRequest(Class dataType, TmfTimeRange range, int nbRequested) { this(dataType, range, nbRequested, DEFAULT_BLOCK_SIZE, ExecutionType.FOREGROUND); } @@ -106,7 +103,7 @@ public class TmfCoalescedEventRequest extends TmfCoalescedD * @param nbRequested the number of events requested * @param priority the requested execution priority */ - public TmfCoalescedEventRequest(Class dataType, TmfTimeRange range, int nbRequested, ExecutionType priority) { + public TmfCoalescedEventRequest(Class dataType, TmfTimeRange range, int nbRequested, ExecutionType priority) { this(dataType, range, nbRequested, DEFAULT_BLOCK_SIZE, priority); } @@ -119,7 +116,7 @@ public class TmfCoalescedEventRequest extends TmfCoalescedD * @param nbRequested the number of events requested * @param blockSize the number of events per block */ - public TmfCoalescedEventRequest(Class dataType, TmfTimeRange range, int nbRequested, int blockSize) { + public TmfCoalescedEventRequest(Class dataType, TmfTimeRange range, int nbRequested, int blockSize) { this(dataType, range, 0, nbRequested, blockSize, ExecutionType.FOREGROUND); } @@ -133,7 +130,7 @@ public class TmfCoalescedEventRequest extends TmfCoalescedD * @param blockSize the number of events per block * @param priority the requested execution priority */ - public TmfCoalescedEventRequest(Class dataType, TmfTimeRange range, int nbRequested, int blockSize, ExecutionType priority) { + public TmfCoalescedEventRequest(Class dataType, TmfTimeRange range, int nbRequested, int blockSize, ExecutionType priority) { this(dataType, range, 0, nbRequested, blockSize, priority); } @@ -148,7 +145,7 @@ public class TmfCoalescedEventRequest extends TmfCoalescedD * @param blockSize the number of events per block * @param priority the requested execution priority */ - public TmfCoalescedEventRequest(Class dataType, TmfTimeRange range, long index, int nbRequested, int blockSize, ExecutionType priority) { + public TmfCoalescedEventRequest(Class dataType, TmfTimeRange range, long index, int nbRequested, int blockSize, ExecutionType priority) { super(dataType, index, nbRequested, blockSize, priority); fRange = range; @@ -170,30 +167,30 @@ public class TmfCoalescedEventRequest extends TmfCoalescedD // ------------------------------------------------------------------------ @Override - public void addRequest(ITmfDataRequest request) { + public void addRequest(ITmfDataRequest request) { super.addRequest(request); - if (request instanceof ITmfEventRequest) { - merge((ITmfEventRequest) request); + if (request instanceof ITmfEventRequest) { + merge((ITmfEventRequest) request); } } @Override - public boolean isCompatible(ITmfDataRequest request) { - if (request instanceof ITmfEventRequest) { + public boolean isCompatible(ITmfDataRequest request) { + if (request instanceof ITmfEventRequest) { if (super.isCompatible(request)) { - return overlaps((ITmfEventRequest) request); + return overlaps((ITmfEventRequest) request); } } return false; } - private boolean overlaps(ITmfEventRequest request) { + private boolean overlaps(ITmfEventRequest request) { ITmfTimestamp startTime = request.getRange().getStartTime(); ITmfTimestamp endTime = request.getRange().getEndTime(); return (startTime.compareTo(endTime) <= 0) && (fRange.getStartTime().compareTo(fRange.getEndTime()) <= 0); } - private void merge(ITmfEventRequest request) { + private void merge(ITmfEventRequest request) { ITmfTimestamp startTime = request.getRange().getStartTime(); ITmfTimestamp endTime = request.getRange().getEndTime(); if (!fRange.contains(startTime) && fRange.getStartTime().compareTo(startTime) > 0) { @@ -209,17 +206,17 @@ public class TmfCoalescedEventRequest extends TmfCoalescedD // ------------------------------------------------------------------------ @Override - public void handleData(T data) { + public void handleData(ITmfEvent data) { super.handleData(data); long index = getIndex() + getNbRead() - 1; - for (ITmfDataRequest request : fRequests) { + for (ITmfDataRequest request : fRequests) { if (data == null) { request.handleData(null); } else { long start = request.getIndex(); long end = start + request.getNbRequested(); - if (request instanceof TmfEventRequest) { - TmfEventRequest req = (TmfEventRequest) request; + if (request instanceof ITmfEventRequest) { + ITmfEventRequest req = (ITmfEventRequest) request; if (!req.isCompleted() && index >= start && index < end) { ITmfTimestamp ts = data.getTimestamp(); if (req.getRange().contains(ts)) { @@ -230,7 +227,7 @@ public class TmfCoalescedEventRequest extends TmfCoalescedD } } else { - TmfDataRequest req = (TmfDataRequest) request; + TmfDataRequest req = (TmfDataRequest) request; if (!req.isCompleted() && index >= start && index < end) { if (req.getDataType().isInstance(data)) { req.handleData(data); @@ -267,14 +264,14 @@ public class TmfCoalescedEventRequest extends TmfCoalescedD @Override public boolean equals(Object other) { - if (other instanceof TmfCoalescedEventRequest) { - TmfCoalescedEventRequest request = (TmfCoalescedEventRequest) other; + if (other instanceof TmfCoalescedEventRequest) { + TmfCoalescedEventRequest request = (TmfCoalescedEventRequest) other; return (request.getDataType() == getDataType()) && (request.getIndex() == getIndex()) && (request.getNbRequested() == getNbRequested()) && (request.getRange().equals(getRange())); } - if (other instanceof TmfCoalescedDataRequest) { + if (other instanceof TmfCoalescedDataRequest) { return super.equals(other); } return false; diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/internal/tmf/core/statesystem/HistoryBuilder.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/internal/tmf/core/statesystem/HistoryBuilder.java index 725709c4bf..415d261f26 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/internal/tmf/core/statesystem/HistoryBuilder.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/internal/tmf/core/statesystem/HistoryBuilder.java @@ -157,12 +157,12 @@ public class HistoryBuilder extends TmfComponent { @TmfSignalHandler public void experimentRangeUpdated(final TmfExperimentRangeUpdatedSignal signal) { StateSystemBuildRequest request; - TmfExperiment exp; + TmfExperiment exp; if (!started) { started = true; request = new StateSystemBuildRequest(this); - exp = (TmfExperiment) TmfExperiment.getCurrentExperiment(); + exp = TmfExperiment.getCurrentExperiment(); if (exp == null) { return; } @@ -197,17 +197,17 @@ public class HistoryBuilder extends TmfComponent { } } -class StateSystemBuildRequest extends TmfEventRequest { +class StateSystemBuildRequest extends TmfEventRequest { /** The amount of events queried at a time through the requests */ private final static int chunkSize = 50000; private final HistoryBuilder builder; private final IStateChangeInput sci; - private final ITmfTrace trace; + private final ITmfTrace trace; StateSystemBuildRequest(HistoryBuilder builder) { - super((Class) builder.getInputPlugin().getExpectedEventType().getClass(), + super(builder.getInputPlugin().getExpectedEventType().getClass(), TmfTimeRange.ETERNITY, TmfDataRequest.ALL_DATA, chunkSize, diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/component/ITmfDataProvider.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/component/ITmfDataProvider.java index 3edd87e500..bb993c41b6 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/component/ITmfDataProvider.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/component/ITmfDataProvider.java @@ -20,22 +20,20 @@ import org.eclipse.linuxtools.tmf.core.trace.ITmfContext; * This is the interface of the data providers in TMF. Data providers have the * capability of handling data requests. * - * @param The provider event type - * * @version 1.0 * @author Francois Chouinard * * @see TmfDataProvider * @see TmfEventProvider */ -public interface ITmfDataProvider extends ITmfComponent { +public interface ITmfDataProvider extends ITmfComponent { /** * Queue the request for processing. * * @param request The request to process */ - public void sendRequest(ITmfDataRequest request); + public void sendRequest(ITmfDataRequest request); /** * Queue the coalesced requests. @@ -60,5 +58,5 @@ public interface ITmfDataProvider extends ITmfComponent { * @param context the trace read context (updated) * @return the event referred to by context */ - public T getNext(ITmfContext context); + public ITmfEvent getNext(ITmfContext context); } diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/component/TmfDataProvider.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/component/TmfDataProvider.java index cf67eb1e8f..5ae7bd90f6 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/component/TmfDataProvider.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/component/TmfDataProvider.java @@ -42,12 +42,10 @@ import org.eclipse.linuxtools.tmf.core.trace.ITmfContext; *

* TODO: Add support for providing multiple data types. * - * @param The provider event type - * * @version 1.0 * @author Francois Chouinard */ -public abstract class TmfDataProvider extends TmfComponent implements ITmfDataProvider { +public abstract class TmfDataProvider extends TmfComponent implements ITmfDataProvider { // ------------------------------------------------------------------------ // Constants @@ -63,12 +61,12 @@ public abstract class TmfDataProvider extends TmfComponent // Attributes // ------------------------------------------------------------------------ - protected Class fType; + protected Class fType; protected boolean fLogData; protected boolean fLogError; protected int fQueueSize = DEFAULT_QUEUE_SIZE; - protected BlockingQueue fDataQueue; + protected BlockingQueue fDataQueue; protected TmfRequestExecutor fExecutor; private int fSignalDepth = 0; @@ -86,7 +84,7 @@ public abstract class TmfDataProvider extends TmfComponent public TmfDataProvider() { super(); fQueueSize = DEFAULT_QUEUE_SIZE; - fDataQueue = new LinkedBlockingQueue(fQueueSize); + fDataQueue = new LinkedBlockingQueue(fQueueSize); fExecutor = new TmfRequestExecutor(); } @@ -98,10 +96,10 @@ public abstract class TmfDataProvider extends TmfComponent * @param type * The type of events that will be handled */ - public void init(String name, Class type) { + public void init(String name, Class type) { super.init(name); fType = type; - fDataQueue = (fQueueSize > 1) ? new LinkedBlockingQueue(fQueueSize) : new SynchronousQueue(); + fDataQueue = (fQueueSize > 1) ? new LinkedBlockingQueue(fQueueSize) : new SynchronousQueue(); fExecutor = new TmfRequestExecutor(); fSignalDepth = 0; @@ -112,7 +110,7 @@ public abstract class TmfDataProvider extends TmfComponent TmfProviderManager.register(fType, this); } - protected TmfDataProvider(String name, Class type, int queueSize) { + protected TmfDataProvider(String name, Class type, int queueSize) { this(); fQueueSize = queueSize; init(name, type); @@ -124,7 +122,7 @@ public abstract class TmfDataProvider extends TmfComponent * @param other * The other object to copy */ - public TmfDataProvider(TmfDataProvider other) { + public TmfDataProvider(TmfDataProvider other) { this(); init(other.getName(), other.fType); } @@ -137,7 +135,7 @@ public abstract class TmfDataProvider extends TmfComponent * @param type * The type of events that will be handled */ - public TmfDataProvider(String name, Class type) { + public TmfDataProvider(String name, Class type) { this(name, type, DEFAULT_QUEUE_SIZE); } @@ -176,7 +174,7 @@ public abstract class TmfDataProvider extends TmfComponent // ------------------------------------------------------------------------ @Override - public void sendRequest(final ITmfDataRequest request) { + public void sendRequest(final ITmfDataRequest request) { synchronized (fLock) { if (fSignalDepth > 0) { coalesceDataRequest(request); @@ -193,7 +191,7 @@ public abstract class TmfDataProvider extends TmfComponent return; } if (fPendingCoalescedRequests.size() > 0) { - for (TmfDataRequest request : fPendingCoalescedRequests) { + for (TmfDataRequest request : fPendingCoalescedRequests) { dispatchRequest(request); } fPendingCoalescedRequests.clear(); @@ -234,11 +232,11 @@ public abstract class TmfDataProvider extends TmfComponent // Coalescing (primitive test...) // ------------------------------------------------------------------------ - protected Vector> fPendingCoalescedRequests = new Vector>(); + protected Vector fPendingCoalescedRequests = new Vector(); - protected void newCoalescedDataRequest(ITmfDataRequest request) { + protected void newCoalescedDataRequest(ITmfDataRequest request) { synchronized (fLock) { - TmfCoalescedDataRequest coalescedRequest = new TmfCoalescedDataRequest(request.getDataType(), request.getIndex(), + TmfCoalescedDataRequest coalescedRequest = new TmfCoalescedDataRequest(request.getDataType(), request.getIndex(), request.getNbRequested(), request.getBlockSize(), request.getExecType()); coalescedRequest.addRequest(request); if (Tracer.isRequestTraced()) { @@ -249,9 +247,9 @@ public abstract class TmfDataProvider extends TmfComponent } } - protected void coalesceDataRequest(ITmfDataRequest request) { + protected void coalesceDataRequest(ITmfDataRequest request) { synchronized (fLock) { - for (TmfCoalescedDataRequest coalescedRequest : fPendingCoalescedRequests) { + for (TmfCoalescedDataRequest coalescedRequest : fPendingCoalescedRequests) { if (coalescedRequest.isCompatible(request)) { coalescedRequest.addRequest(request); if (Tracer.isRequestTraced()) { @@ -269,7 +267,7 @@ public abstract class TmfDataProvider extends TmfComponent // Request processing // ------------------------------------------------------------------------ - private void dispatchRequest(final ITmfDataRequest request) { + private void dispatchRequest(final ITmfDataRequest request) { if (request.getExecType() == ExecutionType.FOREGROUND) { queueRequest(request); } else { @@ -277,14 +275,14 @@ public abstract class TmfDataProvider extends TmfComponent } } - protected void queueRequest(final ITmfDataRequest request) { + protected void queueRequest(final ITmfDataRequest request) { if (fExecutor.isShutdown()) { request.cancel(); return; } - final TmfDataProvider provider = this; + final TmfDataProvider provider = this; // Process the request TmfThread thread = new TmfThread(request.getExecType()) { @@ -310,9 +308,8 @@ public abstract class TmfDataProvider extends TmfComponent try { // Get the ordered events - T data = getNext(context); - if (Tracer.isRequestTraced()) - { + ITmfEvent data = getNext(context); + if (Tracer.isRequestTraced()) { Tracer.traceRequest(request, "read first event"); //$NON-NLS-1$ } while (data != null && !isCompleted(request, data, nbRead)) { @@ -329,8 +326,7 @@ public abstract class TmfDataProvider extends TmfComponent data = getNext(context); } } - if (Tracer.isRequestTraced()) - { + if (Tracer.isRequestTraced()) { Tracer.traceRequest(request, "COMPLETED"); //$NON-NLS-1$ } @@ -355,17 +351,16 @@ public abstract class TmfDataProvider extends TmfComponent } }; - if (Tracer.isRequestTraced()) - { + if (Tracer.isRequestTraced()) { Tracer.traceRequest(request, "QUEUED"); //$NON-NLS-1$ } fExecutor.execute(thread); } - protected void queueBackgroundRequest(final ITmfDataRequest request, final int blockSize, final boolean indexing) { + protected void queueBackgroundRequest(final ITmfDataRequest request, final int blockSize, final boolean indexing) { - final TmfDataProvider provider = this; + final TmfDataProvider provider = this; Thread thread = new Thread() { @Override @@ -388,7 +383,7 @@ public abstract class TmfDataProvider extends TmfComponent while (!isFinished[0]) { - TmfDataRequest subRequest = new TmfDataRequest(request.getDataType(), request.getIndex() + TmfDataRequest subRequest = new TmfDataRequest(request.getDataType(), request.getIndex() + nbRead[0], CHUNK_SIZE[0], blockSize, ExecutionType.BACKGROUND) { @Override @@ -397,7 +392,7 @@ public abstract class TmfDataProvider extends TmfComponent } @Override - public void handleData(T data) { + public void handleData(ITmfEvent data) { super.handleData(data); if (request.getDataType().isInstance(data)) { request.handleData(data); @@ -452,7 +447,7 @@ public abstract class TmfDataProvider extends TmfComponent * @param request * @return an application specific context; null if request can't be serviced */ - protected abstract ITmfContext armRequest(ITmfDataRequest request); + protected abstract ITmfContext armRequest(ITmfDataRequest request); // /** // * Return the next event based on the context supplied. The context @@ -471,7 +466,7 @@ public abstract class TmfDataProvider extends TmfComponent * @param nbRead the number of events read so far * @return true if completion criteria is met */ - public boolean isCompleted(ITmfDataRequest request, T data, int nbRead) { + public boolean isCompleted(ITmfDataRequest request, ITmfEvent data, int nbRead) { return request.isCompleted() || nbRead >= request.getNbRequested(); } diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/component/TmfEventProvider.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/component/TmfEventProvider.java index b89ed152b0..211ca0c549 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/component/TmfEventProvider.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/component/TmfEventProvider.java @@ -24,12 +24,10 @@ import org.eclipse.linuxtools.tmf.core.request.TmfEventRequest; /** * An extension of TmfDataProvider timestamped events providers. * - * @param The provider event type - * * @version 1.0 * @author Francois Chouinard */ -public abstract class TmfEventProvider extends TmfDataProvider { +public abstract class TmfEventProvider extends TmfDataProvider { // ------------------------------------------------------------------------ // Constructors @@ -43,7 +41,7 @@ public abstract class TmfEventProvider extends TmfDataProvi } @Override - public void init(String name, Class type) { + public void init(String name, Class type) { super.init(name, type); } @@ -55,7 +53,7 @@ public abstract class TmfEventProvider extends TmfDataProvi * @param type * The type of handled events */ - public TmfEventProvider(String name, Class type) { + public TmfEventProvider(String name, Class type) { super(name, type); } @@ -69,7 +67,7 @@ public abstract class TmfEventProvider extends TmfDataProvi * @param queueSize * The size of the queue */ - public TmfEventProvider(String name, Class type, int queueSize) { + public TmfEventProvider(String name, Class type, int queueSize) { super(name, type, queueSize); } @@ -79,7 +77,7 @@ public abstract class TmfEventProvider extends TmfDataProvi * @param other * The other TmfEventProvider to copy */ - public TmfEventProvider(TmfEventProvider other) { + public TmfEventProvider(TmfEventProvider other) { super(other); } @@ -88,20 +86,20 @@ public abstract class TmfEventProvider extends TmfDataProvi // ------------------------------------------------------------------------ @Override - public boolean isCompleted(ITmfDataRequest request, T data, int nbRead) { + public boolean isCompleted(ITmfDataRequest request, ITmfEvent data, int nbRead) { boolean requestCompleted = super.isCompleted(request, data, nbRead); - if (!requestCompleted && request instanceof ITmfEventRequest) { - ITmfTimestamp endTime = ((ITmfEventRequest) request).getRange().getEndTime(); + if (!requestCompleted && request instanceof ITmfEventRequest) { + ITmfTimestamp endTime = ((ITmfEventRequest) request).getRange().getEndTime(); return data.getTimestamp().compareTo(endTime, false) > 0; } return requestCompleted; } @Override - protected synchronized void newCoalescedDataRequest(ITmfDataRequest request) { - if (request instanceof ITmfEventRequest) { - ITmfEventRequest eventRequest = (ITmfEventRequest) request; - TmfCoalescedEventRequest coalescedRequest = new TmfCoalescedEventRequest(eventRequest.getDataType(), eventRequest.getRange(), + protected synchronized void newCoalescedDataRequest(ITmfDataRequest request) { + if (request instanceof ITmfEventRequest) { + ITmfEventRequest eventRequest = (ITmfEventRequest) request; + TmfCoalescedEventRequest coalescedRequest = new TmfCoalescedEventRequest(eventRequest.getDataType(), eventRequest.getRange(), eventRequest.getIndex(), eventRequest.getNbRequested(), eventRequest.getBlockSize(), eventRequest.getExecType()); coalescedRequest.addRequest(eventRequest); if (Tracer.isRequestTraced()) { @@ -115,14 +113,14 @@ public abstract class TmfEventProvider extends TmfDataProvi } @Override - protected void queueBackgroundRequest(final ITmfDataRequest request, final int blockSize, final boolean indexing) { + protected void queueBackgroundRequest(final ITmfDataRequest request, final int blockSize, final boolean indexing) { if (! (request instanceof ITmfEventRequest)) { super.queueBackgroundRequest(request, blockSize, indexing); return; } - final TmfDataProvider provider = this; + final TmfDataProvider provider = this; Thread thread = new Thread() { @Override @@ -147,7 +145,7 @@ public abstract class TmfEventProvider extends TmfDataProvi while (!isFinished[0]) { - TmfEventRequest subRequest= new TmfEventRequest(request.getDataType(), ((ITmfEventRequest) request).getRange(), startIndex + nbRead[0], CHUNK_SIZE[0], blockSize, ExecutionType.BACKGROUND) { + TmfEventRequest subRequest= new TmfEventRequest(request.getDataType(), ((ITmfEventRequest) request).getRange(), startIndex + nbRead[0], CHUNK_SIZE[0], blockSize, ExecutionType.BACKGROUND) { @Override public synchronized boolean isCompleted() { @@ -155,7 +153,7 @@ public abstract class TmfEventProvider extends TmfDataProvi } @Override - public void handleData(T data) { + public void handleData(ITmfEvent data) { super.handleData(data); if (request.getDataType().isInstance(data)) { request.handleData(data); diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/ctfadaptor/CtfTmfEvent.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/ctfadaptor/CtfTmfEvent.java index 9de76d1eb4..3090a7d46b 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/ctfadaptor/CtfTmfEvent.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/ctfadaptor/CtfTmfEvent.java @@ -28,7 +28,7 @@ import org.eclipse.linuxtools.tmf.core.event.ITmfTimestamp; /** * A wrapper class around CTF's Event Definition/Declaration that maps all * types of Declaration to native Java types. - * + * * @version 1.0 * @author Alexandre Montplaisir */ diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/ctfadaptor/CtfTmfTrace.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/ctfadaptor/CtfTmfTrace.java index 0c7542bd21..8ae3189e16 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/ctfadaptor/CtfTmfTrace.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/ctfadaptor/CtfTmfTrace.java @@ -18,6 +18,7 @@ import org.eclipse.linuxtools.ctf.core.trace.CTFReaderException; import org.eclipse.linuxtools.ctf.core.trace.CTFTrace; import org.eclipse.linuxtools.tmf.core.ctfadaptor.CtfTmfTimestamp.TimestampType; import org.eclipse.linuxtools.tmf.core.event.ITmfTimestamp; +import org.eclipse.linuxtools.tmf.core.event.ITmfEvent; import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp; import org.eclipse.linuxtools.tmf.core.exceptions.TmfTraceException; import org.eclipse.linuxtools.tmf.core.statesystem.IStateSystemQuerier; @@ -32,7 +33,7 @@ import org.eclipse.linuxtools.tmf.core.trace.TmfTrace; * @version 1.0 * @author Matthew khouzam */ -public class CtfTmfTrace extends TmfTrace implements ITmfEventParser{ +public class CtfTmfTrace extends TmfTrace implements ITmfEventParser{ //------------------------------------------- @@ -71,7 +72,7 @@ public class CtfTmfTrace extends TmfTrace implements ITmfEventParse * If something when wrong while reading the trace */ @Override - public void initTrace(final IResource resource, final String path, final Class eventType) + public void initTrace(final IResource resource, final String path, final Class eventType) throws TmfTraceException { /* * Set the cache size. This has to be done before the call to super() diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/ITmfEvent.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/ITmfEvent.java index eac36207e4..95e24f46a9 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/ITmfEvent.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/ITmfEvent.java @@ -1,11 +1,11 @@ /******************************************************************************* * Copyright (c) 2012 Ericsson - * + * * All rights reserved. This program and the accompanying materials are * made available under the terms of the Eclipse Public License v1.0 which * accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Francois Chouinard - Initial API and implementation *******************************************************************************/ @@ -27,7 +27,7 @@ import org.eclipse.linuxtools.tmf.core.trace.ITmfTrace; * For convenience, a free-form reference field is also provided. It could be * used as e.g. a location marker (filename:lineno) to indicate where the event * was generated. - * + * * @version 1.0 * @author Francois Chouinard * @@ -74,7 +74,7 @@ public interface ITmfEvent { /** * @return the trace that 'owns' the event */ - public ITmfTrace getTrace(); + public ITmfTrace getTrace(); /** * @return the event rank within the parent trace diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfEvent.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfEvent.java index dcab9a5825..bd1b40dcfa 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfEvent.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfEvent.java @@ -1,11 +1,11 @@ /******************************************************************************* * Copyright (c) 2009, 2012 Ericsson - * + * * All rights reserved. This program and the accompanying materials are made * available under the terms of the Eclipse Public License v1.0 which * accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Francois Chouinard - Initial API and implementation * Francois Chouinard - Updated as per TMF Event Model 1.0 @@ -22,10 +22,10 @@ import org.eclipse.linuxtools.tmf.core.trace.ITmfTrace; * Note that for performance reasons TmfEvent is NOT immutable. If a shallow * copy of the event is needed, use the copy constructor. Otherwise (deep copy) * use clone(). - * + * * @version 1.0 * @author Francois Chouinard - * + * * @see ITmfTimestamp * @see ITmfEventType * @see ITmfEventField @@ -37,7 +37,7 @@ public class TmfEvent implements ITmfEvent, Cloneable { // Attributes // ------------------------------------------------------------------------ - private ITmfTrace fTrace; + private ITmfTrace fTrace; private long fRank; private ITmfTimestamp fTimestamp; private String fSource; @@ -68,7 +68,7 @@ public class TmfEvent implements ITmfEvent, Cloneable { * @param reference the event reference */ - public TmfEvent(final ITmfTrace trace, final ITmfTimestamp timestamp, final String source, + public TmfEvent(final ITmfTrace trace, final ITmfTimestamp timestamp, final String source, final ITmfEventType type, final ITmfEventField content, final String reference) { this(trace, ITmfContext.UNKNOWN_RANK, timestamp, source, type, content, reference); @@ -76,7 +76,7 @@ public class TmfEvent implements ITmfEvent, Cloneable { /** * Full constructor - * + * * @param trace the parent trace * @param rank the event rank (in the trace) * @param timestamp the event timestamp @@ -85,7 +85,7 @@ public class TmfEvent implements ITmfEvent, Cloneable { * @param content the event content (payload) * @param reference the event reference */ - public TmfEvent(final ITmfTrace trace, final long rank, final ITmfTimestamp timestamp, final String source, + public TmfEvent(final ITmfTrace trace, final long rank, final ITmfTimestamp timestamp, final String source, final ITmfEventType type, final ITmfEventField content, final String reference) { fTrace = trace; @@ -99,7 +99,7 @@ public class TmfEvent implements ITmfEvent, Cloneable { /** * Copy constructor - * + * * @param event the original event */ public TmfEvent(final ITmfEvent event) { @@ -123,7 +123,7 @@ public class TmfEvent implements ITmfEvent, Cloneable { * @see org.eclipse.linuxtools.tmf.core.event.ITmfEvent#getTrace() */ @Override - public ITmfTrace getTrace() { + public ITmfTrace getTrace() { return fTrace; } @@ -182,7 +182,7 @@ public class TmfEvent implements ITmfEvent, Cloneable { /** * @param trace the new event trace */ - protected void setTrace(final ITmfTrace trace) { + protected void setTrace(final ITmfTrace trace) { fTrace = trace; } diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/request/ITmfDataRequest.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/request/ITmfDataRequest.java index ea84d93dde..f22d0ea2fb 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/request/ITmfDataRequest.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/request/ITmfDataRequest.java @@ -17,12 +17,10 @@ import org.eclipse.linuxtools.tmf.core.event.ITmfEvent; /** * The TMF data request * - * @param The request data type - * * @version 1.0 * @author Francois Chouinard */ -public interface ITmfDataRequest { +public interface ITmfDataRequest { // ------------------------------------------------------------------------ // Constants @@ -49,7 +47,7 @@ public interface ITmfDataRequest { /** * @return request data type (T) */ - public Class getDataType(); + public Class getDataType(); /** * @return request ID @@ -114,7 +112,7 @@ public interface ITmfDataRequest { * * @param data the data to process */ - public void handleData(T data); + public void handleData(ITmfEvent data); // ------------------------------------------------------------------------ // Request notifications diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/request/ITmfEventRequest.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/request/ITmfEventRequest.java index 0fb7301f9a..54c9819107 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/request/ITmfEventRequest.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/request/ITmfEventRequest.java @@ -12,18 +12,15 @@ package org.eclipse.linuxtools.tmf.core.request; -import org.eclipse.linuxtools.tmf.core.event.ITmfEvent; import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange; /** * The TMF event request * - * @param The request event type - * * @version 1.0 * @author Francois Chouinard */ -public interface ITmfEventRequest extends ITmfDataRequest { +public interface ITmfEventRequest extends ITmfDataRequest { /** * @return the requested time range diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/request/TmfDataRequest.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/request/TmfDataRequest.java index 5be9be4d37..39660ebf43 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/request/TmfDataRequest.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/request/TmfDataRequest.java @@ -67,12 +67,10 @@ import org.eclipse.linuxtools.tmf.core.event.ITmfEvent; * * TODO: Implement request failures (codes, etc...) * - * @param The request data type - * * @version 1.0 * @author Francois Chouinard */ -public abstract class TmfDataRequest implements ITmfDataRequest { +public abstract class TmfDataRequest implements ITmfDataRequest { // ------------------------------------------------------------------------ // Constants @@ -90,7 +88,7 @@ public abstract class TmfDataRequest implements ITmfDataReq // Attributes // ------------------------------------------------------------------------ - private final Class fDataType; + private final Class fDataType; private final ExecutionType fExecType; private final int fRequestId; // A unique request ID protected long fIndex; // The index (rank) of the requested event @@ -98,8 +96,8 @@ public abstract class TmfDataRequest implements ITmfDataReq private final int fBlockSize; // The block size (for BG requests) private int fNbRead; // The number of reads so far - private CountDownLatch startedLatch = new CountDownLatch(1); - private CountDownLatch completedLatch = new CountDownLatch(1); + private final CountDownLatch startedLatch = new CountDownLatch(1); + private final CountDownLatch completedLatch = new CountDownLatch(1); private boolean fRequestRunning; private boolean fRequestCompleted; private boolean fRequestFailed; @@ -122,7 +120,7 @@ public abstract class TmfDataRequest implements ITmfDataReq * * @param dataType the requested data type */ - public TmfDataRequest(Class dataType) { + public TmfDataRequest(Class dataType) { this(dataType, 0, ALL_DATA, DEFAULT_BLOCK_SIZE, ExecutionType.FOREGROUND); } @@ -133,7 +131,7 @@ public abstract class TmfDataRequest implements ITmfDataReq * @param dataType the requested data type * @param priority the requested execution priority */ - public TmfDataRequest(Class dataType, ExecutionType priority) { + public TmfDataRequest(Class dataType, ExecutionType priority) { this(dataType, 0, ALL_DATA, DEFAULT_BLOCK_SIZE, priority); } @@ -144,7 +142,7 @@ public abstract class TmfDataRequest implements ITmfDataReq * @param dataType the requested data type * @param index the index of the first event to retrieve */ - public TmfDataRequest(Class dataType, long index) { + public TmfDataRequest(Class dataType, long index) { this(dataType, index, ALL_DATA, DEFAULT_BLOCK_SIZE, ExecutionType.FOREGROUND); } @@ -156,7 +154,7 @@ public abstract class TmfDataRequest implements ITmfDataReq * @param index the index of the first event to retrieve * @param priority the requested execution priority */ - public TmfDataRequest(Class dataType, long index, ExecutionType priority) { + public TmfDataRequest(Class dataType, long index, ExecutionType priority) { this(dataType, index, ALL_DATA, DEFAULT_BLOCK_SIZE, priority); } @@ -168,7 +166,7 @@ public abstract class TmfDataRequest implements ITmfDataReq * @param index the index of the first event to retrieve * @param nbRequested the number of events requested */ - public TmfDataRequest(Class dataType, long index, int nbRequested) { + public TmfDataRequest(Class dataType, long index, int nbRequested) { this(dataType, index, nbRequested, DEFAULT_BLOCK_SIZE, ExecutionType.FOREGROUND); } @@ -181,7 +179,7 @@ public abstract class TmfDataRequest implements ITmfDataReq * @param nbRequested the number of events requested * @param priority the requested execution priority */ - public TmfDataRequest(Class dataType, long index, int nbRequested, ExecutionType priority) { + public TmfDataRequest(Class dataType, long index, int nbRequested, ExecutionType priority) { this(dataType, index, nbRequested, DEFAULT_BLOCK_SIZE, priority); } @@ -194,7 +192,7 @@ public abstract class TmfDataRequest implements ITmfDataReq * @param nbRequested the number of events requested * @param blockSize the number of events per block */ - public TmfDataRequest(Class dataType, long index, int nbRequested, int blockSize) { + public TmfDataRequest(Class dataType, long index, int nbRequested, int blockSize) { this(dataType, index, nbRequested, blockSize, ExecutionType.FOREGROUND); } @@ -208,7 +206,7 @@ public abstract class TmfDataRequest implements ITmfDataReq * @param blockSize the number of events per block * @param priority the requested execution priority */ - public TmfDataRequest(Class dataType, long index, int nbRequested, int blockSize, ExecutionType priority) { + public TmfDataRequest(Class dataType, long index, int nbRequested, int blockSize, ExecutionType priority) { fRequestId = fRequestNumber++; fDataType = dataType; fIndex = index; @@ -238,7 +236,7 @@ public abstract class TmfDataRequest implements ITmfDataReq * Copy constructor */ @SuppressWarnings("unused") - private TmfDataRequest(TmfDataRequest other) { + private TmfDataRequest(TmfDataRequest other) { this(null, 0, ALL_DATA, DEFAULT_BLOCK_SIZE); } @@ -330,7 +328,7 @@ public abstract class TmfDataRequest implements ITmfDataReq * @return the requested data type */ @Override - public Class getDataType() { + public Class getDataType() { return fDataType; } @@ -368,7 +366,7 @@ public abstract class TmfDataRequest implements ITmfDataReq * @param data a piece of data */ @Override - public void handleData(T data) { + public void handleData(ITmfEvent data) { if (data != null) { fNbRead++; } @@ -376,8 +374,7 @@ public abstract class TmfDataRequest implements ITmfDataReq @Override public void handleStarted() { - if (Tracer.isRequestTraced()) - { + if (Tracer.isRequestTraced()) { Tracer.traceRequest(this, "STARTED"); //$NON-NLS-1$ } } @@ -408,32 +405,28 @@ public abstract class TmfDataRequest implements ITmfDataReq } else { handleSuccess(); } - if (Tracer.isRequestTraced()) - { + if (Tracer.isRequestTraced()) { Tracer.traceRequest(this, "COMPLETED (" + fNbRead + " events read)"); //$NON-NLS-1$ //$NON-NLS-2$ } } @Override public void handleSuccess() { - if (Tracer.isRequestTraced()) - { + if (Tracer.isRequestTraced()) { Tracer.traceRequest(this, "SUCCEEDED"); //$NON-NLS-1$ } } @Override public void handleFailure() { - if (Tracer.isRequestTraced()) - { + if (Tracer.isRequestTraced()) { Tracer.traceRequest(this, "FAILED"); //$NON-NLS-1$ } } @Override public void handleCancel() { - if (Tracer.isRequestTraced()) - { + if (Tracer.isRequestTraced()) { Tracer.traceRequest(this, "CANCELLED"); //$NON-NLS-1$ } } @@ -530,8 +523,8 @@ public abstract class TmfDataRequest implements ITmfDataReq @Override public boolean equals(Object other) { - if (other instanceof TmfDataRequest) { - TmfDataRequest request = (TmfDataRequest) other; + if (other instanceof TmfDataRequest) { + TmfDataRequest request = (TmfDataRequest) other; return (request.fDataType == fDataType) && (request.fIndex == fIndex) && (request.fNbRequested == fNbRequested); } diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/request/TmfEventRequest.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/request/TmfEventRequest.java index 5a052faa5b..75eadb97d6 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/request/TmfEventRequest.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/request/TmfEventRequest.java @@ -19,12 +19,10 @@ import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange; /** * An extension of TmfDataRequest for timestamped events. * - * @param The request event type - * * @version 1.0 * @author Francois Chouinard */ -public abstract class TmfEventRequest extends TmfDataRequest implements ITmfEventRequest { +public abstract class TmfEventRequest extends TmfDataRequest implements ITmfEventRequest { // ------------------------------------------------------------------------ // Attributes @@ -42,7 +40,7 @@ public abstract class TmfEventRequest extends TmfDataReques * * @param dataType the requested data type */ - public TmfEventRequest(Class dataType) { + public TmfEventRequest(Class dataType) { this(dataType, TmfTimeRange.ETERNITY, 0, ALL_DATA, DEFAULT_BLOCK_SIZE, ExecutionType.FOREGROUND); } @@ -53,7 +51,7 @@ public abstract class TmfEventRequest extends TmfDataReques * @param dataType the requested data type * @param priority the requested execution priority */ - public TmfEventRequest(Class dataType, ExecutionType priority) { + public TmfEventRequest(Class dataType, ExecutionType priority) { this(dataType, TmfTimeRange.ETERNITY, 0, ALL_DATA, DEFAULT_BLOCK_SIZE, priority); } @@ -64,7 +62,7 @@ public abstract class TmfEventRequest extends TmfDataReques * @param dataType the requested data type * @param range the time range of the requested events */ - public TmfEventRequest(Class dataType, TmfTimeRange range) { + public TmfEventRequest(Class dataType, TmfTimeRange range) { this(dataType, range, 0, ALL_DATA, DEFAULT_BLOCK_SIZE, ExecutionType.FOREGROUND); } @@ -76,7 +74,7 @@ public abstract class TmfEventRequest extends TmfDataReques * @param range the time range of the requested events * @param priority the requested execution priority */ - public TmfEventRequest(Class dataType, TmfTimeRange range, ExecutionType priority) { + public TmfEventRequest(Class dataType, TmfTimeRange range, ExecutionType priority) { this(dataType, range, 0, ALL_DATA, DEFAULT_BLOCK_SIZE, priority); } @@ -88,7 +86,7 @@ public abstract class TmfEventRequest extends TmfDataReques * @param range the time range of the requested events * @param nbRequested the number of events requested */ - public TmfEventRequest(Class dataType, TmfTimeRange range, int nbRequested) { + public TmfEventRequest(Class dataType, TmfTimeRange range, int nbRequested) { this(dataType, range, 0, nbRequested, DEFAULT_BLOCK_SIZE, ExecutionType.FOREGROUND); } @@ -101,7 +99,7 @@ public abstract class TmfEventRequest extends TmfDataReques * @param nbRequested the number of events requested * @param priority the requested execution priority */ - public TmfEventRequest(Class dataType, TmfTimeRange range, int nbRequested, ExecutionType priority) { + public TmfEventRequest(Class dataType, TmfTimeRange range, int nbRequested, ExecutionType priority) { this(dataType, range, 0, nbRequested, DEFAULT_BLOCK_SIZE, priority); } @@ -114,7 +112,7 @@ public abstract class TmfEventRequest extends TmfDataReques * @param nbRequested the number of events requested * @param blockSize the number of events per block */ - public TmfEventRequest(Class dataType, TmfTimeRange range, int nbRequested, int blockSize) { + public TmfEventRequest(Class dataType, TmfTimeRange range, int nbRequested, int blockSize) { this(dataType, range, 0, nbRequested, blockSize, ExecutionType.FOREGROUND); } @@ -128,7 +126,7 @@ public abstract class TmfEventRequest extends TmfDataReques * @param nbRequested the number of events requested * @param blockSize the number of events per block */ - public TmfEventRequest(Class dataType, TmfTimeRange range, long index, int nbRequested, int blockSize) { + public TmfEventRequest(Class dataType, TmfTimeRange range, long index, int nbRequested, int blockSize) { this(dataType, range, index, nbRequested, blockSize, ExecutionType.FOREGROUND); } @@ -142,7 +140,7 @@ public abstract class TmfEventRequest extends TmfDataReques * @param blockSize the number of events per block * @param priority the requested execution priority */ - public TmfEventRequest(Class dataType, TmfTimeRange range, int nbRequested, int blockSize, ExecutionType priority) { + public TmfEventRequest(Class dataType, TmfTimeRange range, int nbRequested, int blockSize, ExecutionType priority) { this(dataType, range, 0, nbRequested, blockSize, priority); } @@ -157,7 +155,7 @@ public abstract class TmfEventRequest extends TmfDataReques * @param blockSize the number of events per block * @param priority the requested execution priority */ - public TmfEventRequest(Class dataType, TmfTimeRange range, long index, int nbRequested, int blockSize, ExecutionType priority) { + public TmfEventRequest(Class dataType, TmfTimeRange range, long index, int nbRequested, int blockSize, ExecutionType priority) { super(dataType, index, nbRequested, blockSize, priority); fRange = range; @@ -213,8 +211,8 @@ public abstract class TmfEventRequest extends TmfDataReques @Override public boolean equals(Object other) { - if (other instanceof TmfEventRequest) { - TmfEventRequest request = (TmfEventRequest) other; + if (other instanceof TmfEventRequest) { + TmfEventRequest request = (TmfEventRequest) other; return super.equals(other) && request.fRange.equals(fRange); } return false; diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/signal/TmfExperimentDisposedSignal.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/signal/TmfExperimentDisposedSignal.java index adffcbff51..89c31abb5b 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/signal/TmfExperimentDisposedSignal.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/signal/TmfExperimentDisposedSignal.java @@ -12,20 +12,17 @@ package org.eclipse.linuxtools.tmf.core.signal; -import org.eclipse.linuxtools.tmf.core.event.ITmfEvent; import org.eclipse.linuxtools.tmf.core.trace.TmfExperiment; /** * Experiemnt has been disposed * - * @param The experiment event type - * * @version 1.0 * @author Francois Chouinard */ -public class TmfExperimentDisposedSignal extends TmfSignal { +public class TmfExperimentDisposedSignal extends TmfSignal { - private final TmfExperiment fExperiment; + private final TmfExperiment fExperiment; /** * Constructor @@ -35,7 +32,7 @@ public class TmfExperimentDisposedSignal extends TmfSignal * @param experiment * Experiment that was disposed */ - public TmfExperimentDisposedSignal(Object source, TmfExperiment experiment) { + public TmfExperimentDisposedSignal(Object source, TmfExperiment experiment) { super(source); fExperiment = experiment; } @@ -43,7 +40,7 @@ public class TmfExperimentDisposedSignal extends TmfSignal /** * @return Reference to the disposed experiment concerning this signal */ - public TmfExperiment getExperiment() { + public TmfExperiment getExperiment() { return fExperiment; } diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/signal/TmfExperimentRangeUpdatedSignal.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/signal/TmfExperimentRangeUpdatedSignal.java index bc1380af48..e043612817 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/signal/TmfExperimentRangeUpdatedSignal.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/signal/TmfExperimentRangeUpdatedSignal.java @@ -1,30 +1,29 @@ /******************************************************************************* * Copyright (c) 2011 Ericsson - * + * * All rights reserved. This program and the accompanying materials are * made available under the terms of the Eclipse Public License v1.0 which * accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Patrick Tasse - Initial API and implementation *******************************************************************************/ package org.eclipse.linuxtools.tmf.core.signal; -import org.eclipse.linuxtools.tmf.core.event.ITmfEvent; import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange; import org.eclipse.linuxtools.tmf.core.trace.TmfExperiment; /** * Experiment time range update - * + * * @version 1.0 * @author Francois Chouinard */ public class TmfExperimentRangeUpdatedSignal extends TmfSignal { - private final TmfExperiment fExperiment; + private final TmfExperiment fExperiment; private final TmfTimeRange fTimeRange; /** @@ -38,7 +37,7 @@ public class TmfExperimentRangeUpdatedSignal extends TmfSignal { * The new time range of the experiment */ public TmfExperimentRangeUpdatedSignal(Object source, - TmfExperiment experiment, TmfTimeRange range) { + TmfExperiment experiment, TmfTimeRange range) { // , ITmfTrace trace) { super(source); fExperiment = experiment; @@ -48,7 +47,7 @@ public class TmfExperimentRangeUpdatedSignal extends TmfSignal { /** * @return The experiment */ - public TmfExperiment getExperiment() { + public TmfExperiment getExperiment() { return fExperiment; } diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/signal/TmfExperimentSelectedSignal.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/signal/TmfExperimentSelectedSignal.java index 3b677f95fd..a64add984b 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/signal/TmfExperimentSelectedSignal.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/signal/TmfExperimentSelectedSignal.java @@ -12,20 +12,17 @@ package org.eclipse.linuxtools.tmf.core.signal; -import org.eclipse.linuxtools.tmf.core.event.ITmfEvent; import org.eclipse.linuxtools.tmf.core.trace.TmfExperiment; /** * New experiment has been selected * - * @param The experiment event type - * * @version 1.0 * @author Francois Chouinard */ -public class TmfExperimentSelectedSignal extends TmfSignal { +public class TmfExperimentSelectedSignal extends TmfSignal { - private final TmfExperiment fExperiment; + private final TmfExperiment fExperiment; /** * Constructor @@ -35,7 +32,7 @@ public class TmfExperimentSelectedSignal extends TmfSignal * @param experiment * The experiment that was selected */ - public TmfExperimentSelectedSignal(Object source, TmfExperiment experiment) { + public TmfExperimentSelectedSignal(Object source, TmfExperiment experiment) { super(source); fExperiment = experiment; } @@ -43,7 +40,7 @@ public class TmfExperimentSelectedSignal extends TmfSignal /** * @return The experiment */ - public TmfExperiment getExperiment() { + public TmfExperiment getExperiment() { return fExperiment; } diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/signal/TmfExperimentUpdatedSignal.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/signal/TmfExperimentUpdatedSignal.java index 0053b0febd..ce98d2f8cb 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/signal/TmfExperimentUpdatedSignal.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/signal/TmfExperimentUpdatedSignal.java @@ -1,29 +1,28 @@ /******************************************************************************* * Copyright (c) 2009 Ericsson - * + * * All rights reserved. This program and the accompanying materials are * made available under the terms of the Eclipse Public License v1.0 which * accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Francois Chouinard - Initial API and implementation *******************************************************************************/ package org.eclipse.linuxtools.tmf.core.signal; -import org.eclipse.linuxtools.tmf.core.event.ITmfEvent; import org.eclipse.linuxtools.tmf.core.trace.TmfExperiment; /** * Current experiment has been updated. - * + * * @version 1.0 * @author Francois Chouinard */ public class TmfExperimentUpdatedSignal extends TmfSignal { - private final TmfExperiment fExperiment; + private final TmfExperiment fExperiment; /** * Constructor @@ -33,7 +32,7 @@ public class TmfExperimentUpdatedSignal extends TmfSignal { * @param experiment * The experiment that was updated */ - public TmfExperimentUpdatedSignal(Object source, TmfExperiment experiment) { + public TmfExperimentUpdatedSignal(Object source, TmfExperiment experiment) { super(source); fExperiment = experiment; } @@ -41,7 +40,7 @@ public class TmfExperimentUpdatedSignal extends TmfSignal { /** * @return The experiment */ - public TmfExperiment getExperiment() { + public TmfExperiment getExperiment() { return fExperiment; } diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/signal/TmfSignalManager.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/signal/TmfSignalManager.java index 83817acbb0..8f19a469e4 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/signal/TmfSignalManager.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/signal/TmfSignalManager.java @@ -1,11 +1,11 @@ /******************************************************************************* * Copyright (c) 2009, 2010 Ericsson - * + * * All rights reserved. This program and the accompanying materials are * made available under the terms of the Eclipse Public License v1.0 which * accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Francois Chouinard - Initial API and implementation *******************************************************************************/ @@ -26,7 +26,7 @@ import org.eclipse.linuxtools.internal.tmf.core.Tracer; * This class manages the set of signal listeners and the signals they are * interested in. When a signal is broadcasted, the appropriate listeners * signal handlers are invoked. - * + * * @version 1.0 * @author Francois Chouinard */ @@ -40,7 +40,7 @@ public class TmfSignalManager { static private Map fVIPListeners = new HashMap(); // If requested, add universal signal tracer - // TODO: Temporary solution: should be enabled/disabled dynamically + // TODO: Temporary solution: should be enabled/disabled dynamically private static boolean fTraceIsActive = false; private static TmfSignalTracer fSignalTracer; static { @@ -75,8 +75,9 @@ public class TmfSignalManager { */ public static synchronized void registerVIP(Object listener) { Method[] methods = getSignalHandlerMethods(listener); - if (methods.length > 0) + if (methods.length > 0) { fVIPListeners.put(listener, methods); + } } /** @@ -94,7 +95,7 @@ public class TmfSignalManager { /** * Returns the list of signal handlers in the listener. Signal handler name * is irrelevant; only the annotation (@TmfSignalHandler) is important. - * + * * @param listener * @return */ @@ -113,14 +114,14 @@ public class TmfSignalManager { /** * Invokes the handling methods that listens to signals of a given type. - * + * * The list of handlers is built on-the-fly to allow for the dynamic * creation/deletion of signal handlers. Since the number of signal * handlers shouldn't be too high, this is not a big performance issue * to pay for the flexibility. - * + * * For synchronization purposes, the signal is bracketed by two synch signals. - * + * * @param signal the signal to dispatch */ static public synchronized void dispatchSignal(TmfSignal signal) { @@ -138,7 +139,9 @@ public class TmfSignalManager { static private void sendSignal(Map listeners, TmfSignal signal) { - if (Tracer.isSignalTraced()) Tracer.traceSignal(signal, "(start)"); //$NON-NLS-1$ + if (Tracer.isSignalTraced()) { + Tracer.traceSignal(signal, "(start)"); //$NON-NLS-1$ + } // Build the list of listener methods that are registered for this signal Class signalClass = signal.getClass(); @@ -156,7 +159,7 @@ public class TmfSignalManager { } } - // Call the signal handlers + // Call the signal handlers for (Map.Entry> entry : targets.entrySet()) { for (Method method : entry.getValue()) { try { @@ -165,7 +168,7 @@ public class TmfSignalManager { Object key = entry.getKey(); String hash = String.format("%1$08X", entry.getKey().hashCode()); //$NON-NLS-1$ String target = "[" + hash + "] " + key.getClass().getSimpleName() + ":" + method.getName(); //$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$ - Tracer.traceSignal(signal, target); + Tracer.traceSignal(signal, target); } } catch (IllegalArgumentException e) { Activator.getDefault().logError("Exception handling signal " + signal + " in method " + method, e); //$NON-NLS-1$ //$NON-NLS-2$ @@ -177,7 +180,9 @@ public class TmfSignalManager { } } - if (Tracer.isSignalTraced()) Tracer.traceSignal(signal, "(end)"); //$NON-NLS-1$ + if (Tracer.isSignalTraced()) { + Tracer.traceSignal(signal, "(end)"); //$NON-NLS-1$ + } } } diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/signal/TmfStateSystemBuildCompleted.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/signal/TmfStateSystemBuildCompleted.java index 497e59fddc..d94e893c7c 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/signal/TmfStateSystemBuildCompleted.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/signal/TmfStateSystemBuildCompleted.java @@ -1,11 +1,11 @@ /******************************************************************************* * Copyright (c) 2012 Ericsson - * + * * All rights reserved. This program and the accompanying materials are * made available under the terms of the Eclipse Public License v1.0 which * accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Francois Chouinard - Initial API and implementation *******************************************************************************/ @@ -16,14 +16,14 @@ import org.eclipse.linuxtools.tmf.core.trace.ITmfTrace; /** * Signal sent when the state system has completed its build. - * + * * @version 1.0 * @author Francois Chouinard */ public class TmfStateSystemBuildCompleted extends TmfSignal { - private ITmfTrace fTrace; - + private final ITmfTrace fTrace; + /** * Constructor * @@ -32,7 +32,7 @@ public class TmfStateSystemBuildCompleted extends TmfSignal { * @param trace * The state system of which trace just finished building */ - public TmfStateSystemBuildCompleted(Object source, ITmfTrace trace) { + public TmfStateSystemBuildCompleted(Object source, ITmfTrace trace) { super(source); fTrace = trace; } @@ -40,7 +40,7 @@ public class TmfStateSystemBuildCompleted extends TmfSignal { /** * @return The trace referred to by this signal */ - public ITmfTrace getTrace() { + public ITmfTrace getTrace() { return fTrace; } diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/signal/TmfTraceSelectedSignal.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/signal/TmfTraceSelectedSignal.java index c4a2d2507c..f0e421f1be 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/signal/TmfTraceSelectedSignal.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/signal/TmfTraceSelectedSignal.java @@ -1,11 +1,11 @@ /******************************************************************************* * Copyright (c) 2010 Ericsson - * + * * All rights reserved. This program and the accompanying materials are * made available under the terms of the Eclipse Public License v1.0 which * accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Patrick Tasse - Initial API and implementation *******************************************************************************/ @@ -16,13 +16,13 @@ import org.eclipse.linuxtools.tmf.core.trace.ITmfTrace; /** * A trace was selected - * + * * @version 1.0 * @author Patrick Tasse */ public class TmfTraceSelectedSignal extends TmfSignal { - private final ITmfTrace fTrace; + private final ITmfTrace fTrace; /** * Constructor @@ -32,7 +32,7 @@ public class TmfTraceSelectedSignal extends TmfSignal { * @param trace * The trace that was selected */ - public TmfTraceSelectedSignal(Object source, ITmfTrace trace) { + public TmfTraceSelectedSignal(Object source, ITmfTrace trace) { super(source); fTrace = trace; } @@ -40,7 +40,7 @@ public class TmfTraceSelectedSignal extends TmfSignal { /** * @return The trace referred to by this signal */ - public ITmfTrace getTrace() { + public ITmfTrace getTrace() { return fTrace; } diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/signal/TmfTraceUpdatedSignal.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/signal/TmfTraceUpdatedSignal.java index 865a4e5a31..a84c14505a 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/signal/TmfTraceUpdatedSignal.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/signal/TmfTraceUpdatedSignal.java @@ -1,11 +1,11 @@ /******************************************************************************* * Copyright (c) 2009 Ericsson - * + * * All rights reserved. This program and the accompanying materials are * made available under the terms of the Eclipse Public License v1.0 which * accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Francois Chouinard - Initial API and implementation *******************************************************************************/ @@ -17,13 +17,13 @@ import org.eclipse.linuxtools.tmf.core.trace.ITmfTrace; /** * A trace was updated (typically its time range) - * + * * @version 1.0 * @author Francois Chouinard */ public class TmfTraceUpdatedSignal extends TmfSignal { - private final ITmfTrace fTrace; + private final ITmfTrace fTrace; private final TmfTimeRange fTimeRange; /** @@ -36,7 +36,7 @@ public class TmfTraceUpdatedSignal extends TmfSignal { * @param range * The new time range of the trace */ - public TmfTraceUpdatedSignal(Object source, ITmfTrace trace, TmfTimeRange range) { + public TmfTraceUpdatedSignal(Object source, ITmfTrace trace, TmfTimeRange range) { super(source); fTrace = trace; fTimeRange = range; @@ -45,7 +45,7 @@ public class TmfTraceUpdatedSignal extends TmfSignal { /** * @return The trace referred to by this signal */ - public ITmfTrace getTrace() { + public ITmfTrace getTrace() { return fTrace; } diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/statesystem/IStateChangeInput.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/statesystem/IStateChangeInput.java index fba0c4f321..9ed2079529 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/statesystem/IStateChangeInput.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/statesystem/IStateChangeInput.java @@ -32,7 +32,6 @@ public interface IStateChangeInput { * * @return The associated trace */ - @SuppressWarnings("rawtypes") public ITmfTrace getTrace(); /** diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/ITmfEventParser.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/ITmfEventParser.java index 011311dbdd..680d393e10 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/ITmfEventParser.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/ITmfEventParser.java @@ -18,15 +18,13 @@ import org.eclipse.linuxtools.tmf.core.event.ITmfEvent; /** * The generic trace parser in TMF. * - * @param The trace event type - * * @version 1.0 * @author Francois Chouinard * * @see ITmfEvent * @see ITmfContext */ -public interface ITmfEventParser { +public interface ITmfEventParser { /** * Parses the trace event referenced by the context. @@ -35,6 +33,6 @@ public interface ITmfEventParser { * @param context the trace context * @return a parsed event (null if none) */ - public T parseEvent(ITmfContext context); + public ITmfEvent parseEvent(ITmfContext context); } diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/ITmfTrace.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/ITmfTrace.java index d0d949cbf2..4b18b9c860 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/ITmfTrace.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/ITmfTrace.java @@ -99,8 +99,6 @@ import org.eclipse.linuxtools.tmf.core.exceptions.TmfTraceException; * } * * - * @param The trace event type - * * @version 1.0 * @author Francois Chouinard * @@ -109,7 +107,7 @@ import org.eclipse.linuxtools.tmf.core.exceptions.TmfTraceException; * @see ITmfTraceIndexer * @see ITmfEventParser */ -public interface ITmfTrace extends ITmfDataProvider { +public interface ITmfTrace extends ITmfDataProvider { // ------------------------------------------------------------------------ // Constants @@ -137,7 +135,7 @@ public interface ITmfTrace extends ITmfDataProvider { * @param type the trace event type * @throws TmfTraceException If we couldn't open the trace */ - public void initTrace(IResource resource, String path, Class type) throws TmfTraceException; + public void initTrace(IResource resource, String path, Class type) throws TmfTraceException; /** * Validate that the trace is of the correct type. @@ -156,7 +154,7 @@ public interface ITmfTrace extends ITmfDataProvider { /** * @return the trace event type */ - public Class getEventType(); + public Class getEventType(); /** * @return the associated trace resource diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/ITmfTraceIndexer.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/ITmfTraceIndexer.java index 8d04a0b3c6..41f162aacb 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/ITmfTraceIndexer.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/ITmfTraceIndexer.java @@ -19,15 +19,13 @@ import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange; /** * The generic trace indexer in TMF with support for incremental indexing. * - * @param The trace event type - * * @version 1.0 * @author Francois Chouinard * * @see ITmfTrace * @see ITmfEvent */ -public interface ITmfTraceIndexer> { +public interface ITmfTraceIndexer { /** * Start an asynchronous index building job and waits for the job completion diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/TmfCheckpoint.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/TmfCheckpoint.java index 9cabf4eecd..4853a1a1a1 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/TmfCheckpoint.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/TmfCheckpoint.java @@ -1,11 +1,11 @@ /******************************************************************************* * Copyright (c) 2009, 2012 Ericsson - * + * * All rights reserved. This program and the accompanying materials are * made available under the terms of the Eclipse Public License v1.0 which * accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Francois Chouinard - Initial API and implementation * Francois Chouinard - Updated as per TMF Trace Model 1.0 @@ -18,7 +18,7 @@ import org.eclipse.linuxtools.tmf.core.event.ITmfTimestamp; /** * A basic implementation of ITmfCheckpoint. It simply maps an event timestamp * to a generic location. - * + * * @version 1.0 * @author Francois Chouinard * @@ -50,7 +50,7 @@ public class TmfCheckpoint implements ITmfCheckpoint, Cloneable { /** * Full constructor - * + * * @param timestamp the checkpoint timestamp * @param context the corresponding trace location */ @@ -61,7 +61,7 @@ public class TmfCheckpoint implements ITmfCheckpoint, Cloneable { /** * Copy constructor - * + * * @param other the other checkpoint */ public TmfCheckpoint(final TmfCheckpoint other) { @@ -125,7 +125,7 @@ public class TmfCheckpoint implements ITmfCheckpoint, Cloneable { /* (non-Javadoc) * @see org.eclipse.linuxtools.tmf.core.trace.ITmfCheckpoint#compareTo(org.eclipse.linuxtools.tmf.core.trace.ITmfCheckpoint) - * + * * Compares the checkpoints timestamp. If either is null, compares the * trace checkpoints locations. */ diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/TmfCheckpointIndexer.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/TmfCheckpointIndexer.java index 66c700fb06..29af87f681 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/TmfCheckpointIndexer.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/TmfCheckpointIndexer.java @@ -44,22 +44,20 @@ import org.eclipse.linuxtools.tmf.core.signal.TmfTraceUpdatedSignal; * Locating a specific checkpoint is trivial for both rank (rank % interval) and * timestamp (bsearch in the array). * - * @param The trace event type - * * @version 1.0 * @author Francois Chouinard * * @see ITmfTrace * @see ITmfEvent */ -public class TmfCheckpointIndexer> implements ITmfTraceIndexer { +public class TmfCheckpointIndexer implements ITmfTraceIndexer { // ------------------------------------------------------------------------ // Attributes // ------------------------------------------------------------------------ // The event trace to index - protected final ITmfTrace fTrace; + protected final ITmfTrace fTrace; // The interval between checkpoints private final int fCheckpointInterval; @@ -76,7 +74,7 @@ public class TmfCheckpointIndexer> implements ITm /** * The indexing request */ - private ITmfEventRequest fIndexingRequest = null; + private ITmfEventRequest fIndexingRequest = null; // ------------------------------------------------------------------------ // Construction @@ -88,7 +86,7 @@ public class TmfCheckpointIndexer> implements ITm * * @param trace the trace to index */ - public TmfCheckpointIndexer(final ITmfTrace trace) { + public TmfCheckpointIndexer(final ITmfTrace trace) { this(trace, TmfDataProvider.DEFAULT_BLOCK_SIZE); } @@ -98,7 +96,7 @@ public class TmfCheckpointIndexer> implements ITm * @param trace the trace to index * @param interval the checkpoints interval */ - public TmfCheckpointIndexer(final ITmfTrace trace, final int interval) { + public TmfCheckpointIndexer(final ITmfTrace trace, final int interval) { fTrace = trace; fCheckpointInterval = interval; fTraceIndex = new ArrayList(); @@ -172,7 +170,7 @@ public class TmfCheckpointIndexer> implements ITm // Build a background request for all the trace data. The index is // updated as we go by readNextEvent(). - fIndexingRequest = new TmfEventRequest(ITmfEvent.class, + fIndexingRequest = new TmfEventRequest(ITmfEvent.class, range, offset, TmfDataRequest.ALL_DATA, fCheckpointInterval, ITmfDataRequest.ExecutionType.BACKGROUND) { private ITmfTimestamp startTime = null; @@ -379,7 +377,7 @@ public class TmfCheckpointIndexer> implements ITm int size = expContext.getContexts().length; ITmfContext[] trcCtxts = new ITmfContext[size]; for (int i = 0; i < size; i++) { - ITmfTrace trace = ((TmfExperiment) fTrace).getTraces()[i]; + ITmfTrace trace = ((TmfExperiment) fTrace).getTraces()[i]; ITmfContext ctx = expContext.getContexts()[i]; trcCtxts[i] = trace.seekEvent(ctx.getLocation().clone()); trcCtxts[i].setRank(ctx.getRank()); diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/TmfExperiment.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/TmfExperiment.java index b4f85fa0f1..d10ff9d7a3 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/TmfExperiment.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/TmfExperiment.java @@ -38,12 +38,10 @@ import org.eclipse.linuxtools.tmf.core.signal.TmfTraceUpdatedSignal; * TmfExperiment presents a time-ordered, unified view of a set of ITmfTrace:s * that are part of a tracing experiment. * - * @param The experiment event type - * * @version 1.0 * @author Francois Chouinard */ -public class TmfExperiment extends TmfTrace implements ITmfEventParser { +public class TmfExperiment extends TmfTrace implements ITmfEventParser { // ------------------------------------------------------------------------ // Constants @@ -61,12 +59,12 @@ public class TmfExperiment extends TmfTrace implements I /** * The currently selected experiment (null if none) */ - protected static TmfExperiment fCurrentExperiment = null; + protected static TmfExperiment fCurrentExperiment = null; /** * The set of traces that constitute the experiment */ - protected ITmfTrace[] fTraces; + protected ITmfTrace[] fTraces; /** * The set of traces that constitute the experiment @@ -91,7 +89,7 @@ public class TmfExperiment extends TmfTrace implements I * @param id the experiment id * @param traces the experiment set of traces */ - public TmfExperiment(final Class type, final String id, final ITmfTrace[] traces) { + public TmfExperiment(final Class type, final String id, final ITmfTrace[] traces) { this(type, id, traces, DEFAULT_INDEX_PAGE_SIZE); } @@ -101,8 +99,7 @@ public class TmfExperiment extends TmfTrace implements I * @param traces the experiment set of traces * @param indexPageSize the experiment index page size */ - @SuppressWarnings({ "unchecked", "rawtypes" }) - public TmfExperiment(final Class type, final String path, final ITmfTrace[] traces, final int indexPageSize) { + public TmfExperiment(final Class type, final String path, final ITmfTrace[] traces, final int indexPageSize) { setCacheSize(indexPageSize); setStreamingInterval(0); setIndexer(new TmfCheckpointIndexer(this, indexPageSize)); @@ -121,10 +118,9 @@ public class TmfExperiment extends TmfTrace implements I * Clears the experiment */ @Override - @SuppressWarnings("rawtypes") public synchronized void dispose() { - final TmfExperimentDisposedSignal signal = new TmfExperimentDisposedSignal(this, this); + final TmfExperimentDisposedSignal signal = new TmfExperimentDisposedSignal(this, this); broadcast(signal); if (fCurrentExperiment == this) { @@ -153,7 +149,7 @@ public class TmfExperiment extends TmfTrace implements I * @see org.eclipse.linuxtools.tmf.core.trace.TmfTrace#initTrace(org.eclipse.core.resources.IResource, java.lang.String, java.lang.Class) */ @Override - public void initTrace(final IResource resource, final String path, final Class type) { + public void initTrace(final IResource resource, final String path, final Class type) { } /* (non-Javadoc) @@ -173,7 +169,7 @@ public class TmfExperiment extends TmfTrace implements I * * @param experiment das experiment */ - public static void setCurrentExperiment(final TmfExperiment experiment) { + public static void setCurrentExperiment(final TmfExperiment experiment) { if (fCurrentExperiment != null && fCurrentExperiment != experiment) { fCurrentExperiment.dispose(); } @@ -183,7 +179,7 @@ public class TmfExperiment extends TmfTrace implements I /** * @return das experiment */ - public static TmfExperiment getCurrentExperiment() { + public static TmfExperiment getCurrentExperiment() { return fCurrentExperiment; } @@ -192,7 +188,7 @@ public class TmfExperiment extends TmfTrace implements I * * @return the experiment traces */ - public ITmfTrace[] getTraces() { + public ITmfTrace[] getTraces() { return fTraces; } @@ -235,19 +231,19 @@ public class TmfExperiment extends TmfTrace implements I * @see org.eclipse.linuxtools.tmf.core.trace.TmfTrace#armRequest(org.eclipse.linuxtools.tmf.core.request.ITmfDataRequest) */ @Override - protected synchronized ITmfContext armRequest(final ITmfDataRequest request) { + protected synchronized ITmfContext armRequest(final ITmfDataRequest request) { // Make sure we have something to read from if (fTraces == null) { return null; } - if (request instanceof ITmfEventRequest - && !TmfTimestamp.BIG_BANG.equals(((ITmfEventRequest) request).getRange().getStartTime()) + if (request instanceof ITmfEventRequest + && !TmfTimestamp.BIG_BANG.equals(((ITmfEventRequest) request).getRange().getStartTime()) && request.getIndex() == 0) { - final ITmfContext context = seekEvent(((ITmfEventRequest) request).getRange().getStartTime()); - ((ITmfEventRequest) request).setStartIndex((int) context.getRank()); + final ITmfContext context = seekEvent(((ITmfEventRequest) request).getRange().getStartTime()); + ((ITmfEventRequest) request).setStartIndex((int) context.getRank()); return context; } @@ -351,9 +347,9 @@ public class TmfExperiment extends TmfTrace implements I * @see org.eclipse.linuxtools.tmf.core.trace.ITmfEventParser#parseEvent(org.eclipse.linuxtools.tmf.core.trace.ITmfContext) */ @Override - public synchronized T parseEvent(final ITmfContext context) { + public synchronized ITmfEvent parseEvent(final ITmfContext context) { final ITmfContext savedContext = context.clone(); - final T event = getNext(savedContext); + final ITmfEvent event = getNext(savedContext); return event; } @@ -361,8 +357,7 @@ public class TmfExperiment extends TmfTrace implements I * @see org.eclipse.linuxtools.tmf.core.trace.TmfTrace#getNext(org.eclipse.linuxtools.tmf.core.trace.ITmfContext) */ @Override - @SuppressWarnings("unchecked") - public synchronized T getNext(ITmfContext context) { + public synchronized ITmfEvent getNext(ITmfContext context) { // Validate the context if (!(context instanceof TmfExperimentContext)) { @@ -398,9 +393,9 @@ public class TmfExperiment extends TmfTrace implements I } } - T event = null; + ITmfEvent event = null; if (trace != TmfExperimentContext.NO_TRACE) { - event = (T) expContext.getEvents()[trace]; + event = expContext.getEvents()[trace]; if (event != null) { updateAttributes(expContext, event.getTimestamp()); expContext.increaseRank(); @@ -470,7 +465,7 @@ public class TmfExperiment extends TmfTrace implements I if (!getIndexer().isIndexing()) { ITmfTimestamp startTimestamp = TmfTimestamp.BIG_CRUNCH; ITmfTimestamp endTimestamp = TmfTimestamp.BIG_BANG; - for (final ITmfTrace trace : fTraces) { + for (final ITmfTrace trace : fTraces) { if (trace.getStartTime().compareTo(startTimestamp) < 0) { startTimestamp = trace.getStartTime(); } @@ -508,7 +503,7 @@ public class TmfExperiment extends TmfTrace implements I @Override public long getStreamingInterval() { long interval = 0; - for (final ITmfTrace trace : fTraces) { + for (final ITmfTrace trace : fTraces) { interval = Math.max(interval, trace.getStreamingInterval()); } return interval; @@ -526,8 +521,8 @@ public class TmfExperiment extends TmfTrace implements I * @param signal The incoming signal */ @TmfSignalHandler - public void experimentSelected(final TmfExperimentSelectedSignal signal) { - final TmfExperiment experiment = signal.getExperiment(); + public void experimentSelected(final TmfExperimentSelectedSignal signal) { + final TmfExperiment experiment = signal.getExperiment(); if (experiment == this) { setCurrentExperiment(experiment); fEndSynchReference = Integer.valueOf(signal.getReference()); diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/TmfTrace.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/TmfTrace.java index a1ccadb03e..3c960c579d 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/TmfTrace.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/TmfTrace.java @@ -46,8 +46,6 @@ import org.eclipse.linuxtools.tmf.core.request.ITmfEventRequest; * TmfCheckpointIndexer (default). In this case, the trace cache size will be * used as checkpoint interval. * - * @param The trace event type - * * @version 1.0 * @author Francois Chouinard * @@ -55,7 +53,7 @@ import org.eclipse.linuxtools.tmf.core.request.ITmfEventRequest; * @see ITmfTraceIndexer * @see ITmfEventParser */ -public abstract class TmfTrace extends TmfEventProvider implements ITmfTrace { +public abstract class TmfTrace extends TmfEventProvider implements ITmfTrace { // ------------------------------------------------------------------------ // Attributes @@ -81,10 +79,10 @@ public abstract class TmfTrace extends TmfEventProvider private long fStreamingInterval = 0; // The trace indexer - private ITmfTraceIndexer> fIndexer; + private ITmfTraceIndexer fIndexer; // The trace parser - private ITmfEventParser fParser; + private ITmfEventParser fParser; // ------------------------------------------------------------------------ // Construction @@ -107,7 +105,7 @@ public abstract class TmfTrace extends TmfEventProvider * @param cacheSize the trace cache size * @throws TmfTraceException */ - protected TmfTrace(final IResource resource, final Class type, final String path, final int cacheSize) throws TmfTraceException { + protected TmfTrace(final IResource resource, final Class type, final String path, final int cacheSize) throws TmfTraceException { this(resource, type, path, cacheSize, 0); } @@ -122,7 +120,7 @@ public abstract class TmfTrace extends TmfEventProvider * @param interval the trace streaming interval * @throws TmfTraceException */ - protected TmfTrace(final IResource resource, final Class type, final String path, final int cacheSize, final long interval) throws TmfTraceException { + protected TmfTrace(final IResource resource, final Class type, final String path, final int cacheSize, final long interval) throws TmfTraceException { this(resource, type, path, cacheSize, interval, null); } @@ -137,8 +135,8 @@ public abstract class TmfTrace extends TmfEventProvider * @param indexer the trace indexer * @throws TmfTraceException */ - protected TmfTrace(final IResource resource, final Class type, final String path, final int cacheSize, - final long interval, final ITmfTraceIndexer indexer) throws TmfTraceException { + protected TmfTrace(final IResource resource, final Class type, final String path, final int cacheSize, + final long interval, final ITmfTraceIndexer indexer) throws TmfTraceException { this(resource, type, path, cacheSize, interval, indexer, null); } @@ -153,9 +151,8 @@ public abstract class TmfTrace extends TmfEventProvider * @param parser the trace event parser * @throws TmfTraceException */ - @SuppressWarnings({ "unchecked", "rawtypes" }) - protected TmfTrace(final IResource resource, final Class type, final String path, final int cacheSize, - final long interval, final ITmfTraceIndexer indexer, final ITmfEventParser parser) throws TmfTraceException { + protected TmfTrace(final IResource resource, final Class type, final String path, final int cacheSize, + final long interval, final ITmfTraceIndexer indexer, final ITmfEventParser parser) throws TmfTraceException { super(); fCacheSize = (cacheSize > 0) ? cacheSize : ITmfTrace.DEFAULT_TRACE_CACHE_SIZE; fStreamingInterval = interval; @@ -170,8 +167,7 @@ public abstract class TmfTrace extends TmfEventProvider * @param trace the original trace * @throws TmfTraceException Should not happen usually */ - @SuppressWarnings({ "unchecked", "rawtypes" }) - public TmfTrace(final TmfTrace trace) throws TmfTraceException { + public TmfTrace(final TmfTrace trace) throws TmfTraceException { super(); if (trace == null) { throw new IllegalArgumentException(); @@ -191,8 +187,7 @@ public abstract class TmfTrace extends TmfEventProvider * @see org.eclipse.linuxtools.tmf.core.trace.ITmfTrace#initTrace(org.eclipse.core.resources.IResource, java.lang.String, java.lang.Class) */ @Override - @SuppressWarnings({ "unchecked", "rawtypes" }) - public void initTrace(final IResource resource, final String path, final Class type) throws TmfTraceException { + public void initTrace(final IResource resource, final String path, final Class type) throws TmfTraceException { fIndexer = new TmfCheckpointIndexer(this, fCacheSize); initialize(resource, path, type); } @@ -206,8 +201,7 @@ public abstract class TmfTrace extends TmfEventProvider * * @throws TmfTraceException */ - @SuppressWarnings("unchecked") - protected void initialize(final IResource resource, final String path, final Class type) throws TmfTraceException { + protected void initialize(final IResource resource, final String path, final Class type) throws TmfTraceException { if (path == null) { throw new TmfTraceException("Invalid trace path"); //$NON-NLS-1$ } @@ -221,7 +215,7 @@ public abstract class TmfTrace extends TmfEventProvider } if (fParser == null) { if (this instanceof ITmfEventParser) { - fParser = (ITmfEventParser) this; + fParser = (ITmfEventParser) this; } else { throw new TmfTraceException("Invalid trace parser"); //$NON-NLS-1$ } @@ -269,8 +263,8 @@ public abstract class TmfTrace extends TmfEventProvider * @see org.eclipse.linuxtools.tmf.core.trace.ITmfTrace#getEventType() */ @Override - public Class getEventType() { - return (Class) super.getType(); + public Class getEventType() { + return (Class) super.getType(); } /* (non-Javadoc) @@ -308,14 +302,14 @@ public abstract class TmfTrace extends TmfEventProvider /** * @return the trace indexer */ - protected ITmfTraceIndexer> getIndexer() { + protected ITmfTraceIndexer getIndexer() { return fIndexer; } /** * @return the trace parser */ - protected ITmfEventParser getParser() { + protected ITmfEventParser getParser() { return fParser; } @@ -420,7 +414,7 @@ public abstract class TmfTrace extends TmfEventProvider * * @param indexer the trace indexer */ - protected void setIndexer(final ITmfTraceIndexer> indexer) { + protected void setIndexer(final ITmfTraceIndexer indexer) { fIndexer = indexer; } @@ -429,7 +423,7 @@ public abstract class TmfTrace extends TmfEventProvider * * @param parser the new trace parser */ - protected void setParser(final ITmfEventParser parser) { + protected void setParser(final ITmfEventParser parser) { fParser = parser; } @@ -502,9 +496,9 @@ public abstract class TmfTrace extends TmfEventProvider * @see org.eclipse.linuxtools.tmf.core.trace.ITmfTrace#readNextEvent(org.eclipse.linuxtools.tmf.core.trace.ITmfContext) */ @Override - public synchronized T getNext(final ITmfContext context) { + public synchronized ITmfEvent getNext(final ITmfContext context) { // parseEvent() does not update the context - final T event = fParser.parseEvent(context); + final ITmfEvent event = fParser.parseEvent(context); if (event != null) { updateAttributes(context, event.getTimestamp()); context.setLocation(getCurrentLocation()); @@ -554,13 +548,13 @@ public abstract class TmfTrace extends TmfEventProvider * @see org.eclipse.linuxtools.tmf.core.component.TmfDataProvider#armRequest(org.eclipse.linuxtools.tmf.core.request.ITmfDataRequest) */ @Override - protected ITmfContext armRequest(final ITmfDataRequest request) { - if ((request instanceof ITmfEventRequest) - && !TmfTimestamp.BIG_BANG.equals(((ITmfEventRequest) request).getRange().getStartTime()) + protected ITmfContext armRequest(final ITmfDataRequest request) { + if ((request instanceof ITmfEventRequest) + && !TmfTimestamp.BIG_BANG.equals(((ITmfEventRequest) request).getRange().getStartTime()) && (request.getIndex() == 0)) { - final ITmfContext context = seekEvent(((ITmfEventRequest) request).getRange().getStartTime()); - ((ITmfEventRequest) request).setStartIndex((int) context.getRank()); + final ITmfContext context = seekEvent(((ITmfEventRequest) request).getRange().getStartTime()); + ((ITmfEventRequest) request).setStartIndex((int) context.getRank()); return context; } diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/uml2sd/TmfAsyncSequenceDiagramEvent.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/uml2sd/TmfAsyncSequenceDiagramEvent.java index 1b995e24d2..2ef28a4697 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/uml2sd/TmfAsyncSequenceDiagramEvent.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/uml2sd/TmfAsyncSequenceDiagramEvent.java @@ -1,12 +1,12 @@ /********************************************************************** * Copyright (c) 2011 Ericsson - * + * * All rights reserved. This program and the accompanying materials are * made available under the terms of the Eclipse Public License v1.0 which * accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: + * + * Contributors: * Bernd Hufmann - Initial API and implementation **********************************************************************/ package org.eclipse.linuxtools.tmf.core.uml2sd; @@ -18,7 +18,7 @@ import org.eclipse.linuxtools.tmf.core.event.ITmfTimestamp; *

* A basic implementation of ITmfAsyncSequenceDiagramEvent. *

- * + * * @version 1.0 * @author Bernd Hufmann */ @@ -31,13 +31,13 @@ public class TmfAsyncSequenceDiagramEvent extends TmfSyncSequenceDiagramEvent im * The end time of the sequence diagram event (i.e. time when signal was received). */ final protected ITmfTimestamp fEndTime; - + // ------------------------------------------------------------------------ // Constructors // ------------------------------------------------------------------------ /** * Constructor - * + * * @param startEvent The start event (on sender side). * @param endEvent The end event (receiver side). * @param sender The name of sender of signal. @@ -46,16 +46,16 @@ public class TmfAsyncSequenceDiagramEvent extends TmfSyncSequenceDiagramEvent im */ public TmfAsyncSequenceDiagramEvent(ITmfEvent startEvent, ITmfEvent endEvent, String sender, String receiver, String name) { super(startEvent, sender, receiver, name); - + if (endEvent == null) { throw new IllegalArgumentException("TmfAsyncSequenceDiagramEvent constructor: endEvent=null"); //$NON-NLS-1$ } - fEndTime = endEvent.getTimestamp().clone(); + fEndTime = endEvent.getTimestamp().clone(); } // ------------------------------------------------------------------------ // Operations - // ------------------------------------------------------------------------ + // ------------------------------------------------------------------------ /* * (non-Javadoc) diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/uml2sd/TmfSyncSequenceDiagramEvent.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/uml2sd/TmfSyncSequenceDiagramEvent.java index bbb068bed6..ab34f9582c 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/uml2sd/TmfSyncSequenceDiagramEvent.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/uml2sd/TmfSyncSequenceDiagramEvent.java @@ -18,7 +18,7 @@ import org.eclipse.linuxtools.tmf.core.event.ITmfTimestamp; *

* A basic implementation of ITmfSyncSequenceDiagramEvent. *

- * + * * @version 1.0 * @author Bernd Hufmann */ @@ -49,12 +49,12 @@ public class TmfSyncSequenceDiagramEvent implements ITmfSyncSequenceDiagramEvent // ------------------------------------------------------------------------ /** * Constructor - * + * * @param startEvent The start event (on sender side). * @param sender The name of sender of signal. * @param receiver The Name of receiver of signal. * @param name - The signal name - */ + */ public TmfSyncSequenceDiagramEvent(ITmfEvent startEvent, String sender, String receiver, String name) { if ((startEvent == null) || (sender == null) || (receiver == null) || (name == null)) { diff --git a/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/views/uml2sd/loader/Uml2SDTestFacility.java b/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/views/uml2sd/loader/Uml2SDTestFacility.java index ea19263650..ef8d03754b 100644 --- a/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/views/uml2sd/loader/Uml2SDTestFacility.java +++ b/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/views/uml2sd/loader/Uml2SDTestFacility.java @@ -58,7 +58,7 @@ public class Uml2SDTestFacility { private SDView fSdView; private TmfTraceStub fTrace = null; private TmfUml2SDTestTrace fParser = null; - private TmfExperiment fExperiment = null; + private TmfExperiment fExperiment = null; private boolean fIsInitialized = false; @@ -126,7 +126,7 @@ public class Uml2SDTestFacility { } - private TmfTraceStub setupTrace(final ITmfEventParser parser) { + private TmfTraceStub setupTrace(final ITmfEventParser parser) { try { // Create test trace object @@ -223,7 +223,7 @@ public class Uml2SDTestFacility { /** * @return current experiment. */ - public TmfExperiment getExperiment() { + public TmfExperiment getExperiment() { return fExperiment; } @@ -283,7 +283,6 @@ public class Uml2SDTestFacility { * Selects the experiment. * @param wait true to wait for indexing to finish else false */ - @SuppressWarnings({ "rawtypes", "unchecked" }) public void selectExperiment(final boolean wait) { fParser = new TmfUml2SDTestTrace(); fTrace = setupTrace(fParser); @@ -293,8 +292,8 @@ public class Uml2SDTestFacility { final ITmfTrace traces[] = new ITmfTrace[1]; traces[0] = fTrace; - fExperiment = new TmfExperiment(TmfEvent.class, "TestExperiment", traces); //$NON-NLS-1$ - fTrace.broadcast(new TmfExperimentSelectedSignal(this, fExperiment)); + fExperiment = new TmfExperiment(TmfEvent.class, "TestExperiment", traces); //$NON-NLS-1$ + fTrace.broadcast(new TmfExperimentSelectedSignal(this, fExperiment)); if (wait) { while (fExperiment.getNbEvents() == 0) { delay(IUml2SDTestConstants.GUI_REFESH_DELAY); diff --git a/org.eclipse.linuxtools.tmf.ui.tests/widgetStubs/org/eclipse/linuxtools/tmf/ui/tests/uml2sd/trace/TmfUml2SDTestTrace.java b/org.eclipse.linuxtools.tmf.ui.tests/widgetStubs/org/eclipse/linuxtools/tmf/ui/tests/uml2sd/trace/TmfUml2SDTestTrace.java index cef80258a8..337ff1bb2c 100644 --- a/org.eclipse.linuxtools.tmf.ui.tests/widgetStubs/org/eclipse/linuxtools/tmf/ui/tests/uml2sd/trace/TmfUml2SDTestTrace.java +++ b/org.eclipse.linuxtools.tmf.ui.tests/widgetStubs/org/eclipse/linuxtools/tmf/ui/tests/uml2sd/trace/TmfUml2SDTestTrace.java @@ -30,9 +30,9 @@ import org.eclipse.linuxtools.tmf.tests.stubs.trace.TmfTraceStub; * Parser implementation for Uml2SD Test Traces. * */ -public class TmfUml2SDTestTrace implements ITmfEventParser { +public class TmfUml2SDTestTrace implements ITmfEventParser { - ITmfTrace fEventStream; + ITmfTrace fEventStream; /** * Default Constructor @@ -44,14 +44,14 @@ public class TmfUml2SDTestTrace implements ITmfEventParser { * Constructor * @param eventStream ITmfTrace implementation */ - public TmfUml2SDTestTrace(ITmfTrace eventStream) { + public TmfUml2SDTestTrace(ITmfTrace eventStream) { fEventStream = eventStream; } /** * @param eventStream ITmfTrace implementation to set */ - public void setTrace(ITmfTrace eventStream) { + public void setTrace(ITmfTrace eventStream) { fEventStream = eventStream; } diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/custom/CustomEvent.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/custom/CustomEvent.java index 631003e0b8..6adee3728e 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/custom/CustomEvent.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/custom/CustomEvent.java @@ -1,11 +1,11 @@ /******************************************************************************* * Copyright (c) 2010 Ericsson - * + * * All rights reserved. This program and the accompanying materials are * made available under the terms of the Eclipse Public License v1.0 which * accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Patrick Tasse - Initial API and implementation *******************************************************************************/ @@ -32,7 +32,7 @@ public class CustomEvent extends TmfEvent { protected static final String TIMESTAMP_INPUT_FORMAT_KEY = "CE_TS_I_F"; //$NON-NLS-1$ protected static final String NO_MESSAGE = ""; //$NON-NLS-1$ public static final byte TIMESTAMP_SCALE = -3; - + protected CustomTraceDefinition fDefinition; protected Map fData; private TmfEventField[] fColumnData; @@ -48,7 +48,7 @@ public class CustomEvent extends TmfEvent { fData = new HashMap(); } - public CustomEvent(CustomTraceDefinition definition, ITmfTrace parentTrace, ITmfTimestamp timestamp, String source, TmfEventType type, String reference) { + public CustomEvent(CustomTraceDefinition definition, ITmfTrace parentTrace, ITmfTimestamp timestamp, String source, TmfEventType type, String reference) { super(parentTrace, timestamp, source, type, null, reference); fDefinition = definition; fData = new HashMap(); @@ -56,12 +56,16 @@ public class CustomEvent extends TmfEvent { @Override public ITmfTimestamp getTimestamp() { - if (fData != null) processData(); + if (fData != null) { + processData(); + } return super.getTimestamp(); } public TmfEventField[] extractItemFields() { - if (fData != null) processData(); + if (fData != null) { + processData(); + } return Arrays.copyOf(fColumnData, fColumnData.length); } @@ -80,7 +84,7 @@ public class CustomEvent extends TmfEvent { } else { setTimestamp(TmfTimestamp.ZERO); } - + int i = 0; fColumnData = new TmfEventField[fDefinition.outputs.size()]; for (OutputColumn outputColumn : fDefinition.outputs) { diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/custom/CustomTxtEvent.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/custom/CustomTxtEvent.java index 745a449266..86b473ba2f 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/custom/CustomTxtEvent.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/custom/CustomTxtEvent.java @@ -1,11 +1,11 @@ /******************************************************************************* * Copyright (c) 2010 Ericsson - * + * * All rights reserved. This program and the accompanying materials are * made available under the terms of the Eclipse Public License v1.0 which * accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Patrick Tasse - Initial API and implementation *******************************************************************************/ @@ -33,7 +33,7 @@ public class CustomTxtEvent extends CustomEvent { super(definition, other); } - public CustomTxtEvent(CustomTxtTraceDefinition definition, ITmfTrace parentTrace, ITmfTimestamp timestamp, String source, TmfEventType type, String reference) { + public CustomTxtEvent(CustomTxtTraceDefinition definition, ITmfTrace parentTrace, ITmfTimestamp timestamp, String source, TmfEventType type, String reference) { super(definition, parentTrace, timestamp, source, type, reference); } diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/custom/CustomTxtTrace.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/custom/CustomTxtTrace.java index c6e731fe1f..b224a92b52 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/custom/CustomTxtTrace.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/custom/CustomTxtTrace.java @@ -1,11 +1,11 @@ /******************************************************************************* * Copyright (c) 2010 Ericsson - * + * * All rights reserved. This program and the accompanying materials are * made available under the terms of the Eclipse Public License v1.0 which * accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Patrick Tasse - Initial API and implementation *******************************************************************************/ @@ -24,6 +24,7 @@ import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; import org.eclipse.linuxtools.internal.tmf.ui.Activator; import org.eclipse.linuxtools.internal.tmf.ui.parsers.custom.CustomTxtTraceDefinition.InputLine; +import org.eclipse.linuxtools.tmf.core.event.ITmfEvent; import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp; import org.eclipse.linuxtools.tmf.core.exceptions.TmfTraceException; import org.eclipse.linuxtools.tmf.core.io.BufferedRandomAccessFile; @@ -34,7 +35,7 @@ import org.eclipse.linuxtools.tmf.core.trace.TmfContext; import org.eclipse.linuxtools.tmf.core.trace.TmfLocation; import org.eclipse.linuxtools.tmf.core.trace.TmfTrace; -public class CustomTxtTrace extends TmfTrace implements ITmfEventParser { +public class CustomTxtTrace extends TmfTrace implements ITmfEventParser { private static final TmfLocation NULL_LOCATION = new TmfLocation((Long) null); private static final int DEFAULT_CACHE_SIZE = 100; @@ -56,7 +57,7 @@ public class CustomTxtTrace extends TmfTrace implements ITmfEven } @Override - public void initTrace(final IResource resource, final String path, final Class eventType) throws TmfTraceException { + public void initTrace(final IResource resource, final String path, final Class eventType) throws TmfTraceException { super.initTrace(resource, path, eventType); try { fFile = new BufferedRandomAccessFile(getPath(), "r"); //$NON-NLS-1$ diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/custom/CustomXmlEvent.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/custom/CustomXmlEvent.java index 04704d64d8..8acb7810d8 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/custom/CustomXmlEvent.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/custom/CustomXmlEvent.java @@ -1,11 +1,11 @@ /******************************************************************************* * Copyright (c) 2010 Ericsson - * + * * All rights reserved. This program and the accompanying materials are * made available under the terms of the Eclipse Public License v1.0 which * accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Patrick Tasse - Initial API and implementation *******************************************************************************/ @@ -29,7 +29,7 @@ public class CustomXmlEvent extends CustomEvent { super(definition, other); } - public CustomXmlEvent(CustomXmlTraceDefinition definition, ITmfTrace parentTrace, ITmfTimestamp timestamp, String source, TmfEventType type, String reference) { + public CustomXmlEvent(CustomXmlTraceDefinition definition, ITmfTrace parentTrace, ITmfTimestamp timestamp, String source, TmfEventType type, String reference) { super(definition, parentTrace, timestamp, source, type, reference); } diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/custom/CustomXmlTrace.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/custom/CustomXmlTrace.java index fb13a4c0cf..063d005aac 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/custom/CustomXmlTrace.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/custom/CustomXmlTrace.java @@ -1,11 +1,11 @@ /******************************************************************************* * Copyright (c) 2010 Ericsson - * + * * All rights reserved. This program and the accompanying materials are * made available under the terms of the Eclipse Public License v1.0 which * accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Patrick Tasse - Initial API and implementation *******************************************************************************/ @@ -25,6 +25,7 @@ import org.eclipse.core.resources.IResource; import org.eclipse.linuxtools.internal.tmf.ui.Activator; import org.eclipse.linuxtools.internal.tmf.ui.parsers.custom.CustomXmlTraceDefinition.InputAttribute; import org.eclipse.linuxtools.internal.tmf.ui.parsers.custom.CustomXmlTraceDefinition.InputElement; +import org.eclipse.linuxtools.tmf.core.event.ITmfEvent; import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp; import org.eclipse.linuxtools.tmf.core.exceptions.TmfTraceException; import org.eclipse.linuxtools.tmf.core.io.BufferedRandomAccessFile; @@ -44,7 +45,7 @@ import org.xml.sax.InputSource; import org.xml.sax.SAXException; import org.xml.sax.SAXParseException; -public class CustomXmlTrace extends TmfTrace implements ITmfEventParser { +public class CustomXmlTrace extends TmfTrace implements ITmfEventParser { private static final TmfLocation NULL_LOCATION = new TmfLocation((Long) null); private static final int DEFAULT_CACHE_SIZE = 100; @@ -68,7 +69,7 @@ public class CustomXmlTrace extends TmfTrace implements ITmfEven } @Override - public void initTrace(final IResource resource, final String path, final Class eventType) throws TmfTraceException { + public void initTrace(final IResource resource, final String path, final Class eventType) throws TmfTraceException { super.initTrace(resource, path, eventType); try { fFile = new BufferedRandomAccessFile(getPath(), "r"); //$NON-NLS-1$ diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/wizards/CustomTxtParserOutputWizardPage.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/wizards/CustomTxtParserOutputWizardPage.java index ed3f3fa46e..41e0bda6fb 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/wizards/CustomTxtParserOutputWizardPage.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/wizards/CustomTxtParserOutputWizardPage.java @@ -8,8 +8,8 @@ import java.util.Iterator; import java.util.List; import org.eclipse.jface.wizard.WizardPage; -import org.eclipse.linuxtools.internal.tmf.ui.Messages; import org.eclipse.linuxtools.internal.tmf.ui.Activator; +import org.eclipse.linuxtools.internal.tmf.ui.Messages; import org.eclipse.linuxtools.internal.tmf.ui.parsers.custom.CustomEventsTable; import org.eclipse.linuxtools.internal.tmf.ui.parsers.custom.CustomTraceDefinition.OutputColumn; import org.eclipse.linuxtools.internal.tmf.ui.parsers.custom.CustomTxtTrace; @@ -87,8 +87,9 @@ public class CustomTxtParserOutputWizardPage extends WizardPage { previewTable = new CustomEventsTable(new CustomTxtTraceDefinition(), tableContainer, 0); previewTable.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true)); - if (wizard.definition != null) + if (wizard.definition != null) { loadDefinition(wizard.definition); + } setControl(container); } @@ -120,11 +121,12 @@ public class CustomTxtParserOutputWizardPage extends WizardPage { while (iter.hasNext()) { final Output output = iter.next(); boolean found = false; - for (final String name : outputNames) + for (final String name : outputNames) { if (output.name.equals(name)) { found = true; break; } + } if (!found) { output.dispose(); iter.remove(); @@ -134,25 +136,29 @@ public class CustomTxtParserOutputWizardPage extends WizardPage { // create outputs that have been added in the input page for (final String name : outputNames) { boolean found = false; - for (final Output output : outputs) + for (final Output output : outputs) { if (output.name.equals(name)) { found = true; break; } - if (!found) + } + if (!found) { outputs.add(new Output(outputsContainer, name)); + } } outputsContainer.layout(); outputsScrolledComposite.setMinSize(outputsContainer.computeSize(SWT.DEFAULT, SWT.DEFAULT).x, outputsContainer.computeSize(SWT.DEFAULT, SWT.DEFAULT).y-5); updatePreviewTable(); - if (sash.getSize().y > outputsContainer.computeSize(SWT.DEFAULT, SWT.DEFAULT).y + previewTable.getTable().getItemHeight()) + if (sash.getSize().y > outputsContainer.computeSize(SWT.DEFAULT, SWT.DEFAULT).y + previewTable.getTable().getItemHeight()) { sash.setWeights(new int[] {outputsContainer.computeSize(SWT.DEFAULT, SWT.DEFAULT).y, sash.getSize().y - outputsContainer.computeSize(SWT.DEFAULT, SWT.DEFAULT).y}); - else + } else { sash.setWeights(new int[] {outputsContainer.computeSize(SWT.DEFAULT, SWT.DEFAULT).y, previewTable.getTable().getItemHeight()}); + } setPageComplete(true); - } else + } else { setPageComplete(false); + } super.setVisible(visible); } @@ -198,7 +204,7 @@ public class CustomTxtParserOutputWizardPage extends WizardPage { writer.write(wizard.inputPage.getInputText()); writer.close(); - final ITmfTrace trace = new CustomTxtTrace(null, definition, tmpFile.getAbsolutePath(), CACHE_SIZE); + final ITmfTrace trace = new CustomTxtTrace(null, definition, tmpFile.getAbsolutePath(), CACHE_SIZE); previewTable.dispose(); previewTable = new CustomEventsTable(definition, tableContainer, CACHE_SIZE); previewTable.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true)); @@ -215,9 +221,11 @@ public class CustomTxtParserOutputWizardPage extends WizardPage { public List extractOutputs() { int numColumns = 0; - for (int i = 0; i < outputs.size(); i++) - if (outputs.get(i).enabledButton.getSelection()) + for (int i = 0; i < outputs.size(); i++) { + if (outputs.get(i).enabledButton.getSelection()) { numColumns++; + } + } final List outputColumns = new ArrayList(numColumns); numColumns = 0; for (int i = 0; i < outputs.size(); i++) { diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/wizards/CustomXmlParserOutputWizardPage.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/wizards/CustomXmlParserOutputWizardPage.java index c17e4f099e..f9eb2b4e45 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/wizards/CustomXmlParserOutputWizardPage.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/wizards/CustomXmlParserOutputWizardPage.java @@ -8,8 +8,8 @@ import java.util.Iterator; import java.util.List; import org.eclipse.jface.wizard.WizardPage; -import org.eclipse.linuxtools.internal.tmf.ui.Messages; import org.eclipse.linuxtools.internal.tmf.ui.Activator; +import org.eclipse.linuxtools.internal.tmf.ui.Messages; import org.eclipse.linuxtools.internal.tmf.ui.parsers.custom.CustomEventsTable; import org.eclipse.linuxtools.internal.tmf.ui.parsers.custom.CustomTraceDefinition; import org.eclipse.linuxtools.internal.tmf.ui.parsers.custom.CustomTraceDefinition.OutputColumn; @@ -88,8 +88,9 @@ public class CustomXmlParserOutputWizardPage extends WizardPage { previewTable = new CustomEventsTable(new CustomXmlTraceDefinition(), tableContainer, 0); previewTable.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true)); - if (wizard.definition != null) + if (wizard.definition != null) { loadDefinition(wizard.definition); + } setControl(container); } @@ -121,11 +122,12 @@ public class CustomXmlParserOutputWizardPage extends WizardPage { while (iter.hasNext()) { final Output output = iter.next(); boolean found = false; - for (final String name : outputNames) + for (final String name : outputNames) { if (output.name.equals(name)) { found = true; break; } + } if (!found) { output.dispose(); iter.remove(); @@ -135,25 +137,29 @@ public class CustomXmlParserOutputWizardPage extends WizardPage { // create outputs that have been added in the input page for (final String name : outputNames) { boolean found = false; - for (final Output output : outputs) + for (final Output output : outputs) { if (output.name.equals(name)) { found = true; break; } - if (!found) + } + if (!found) { outputs.add(new Output(outputsContainer, name)); + } } outputsContainer.layout(); outputsScrolledComposite.setMinSize(outputsContainer.computeSize(SWT.DEFAULT, SWT.DEFAULT).x, outputsContainer.computeSize(SWT.DEFAULT, SWT.DEFAULT).y-5); updatePreviewTable(); - if (sash.getSize().y > outputsContainer.computeSize(SWT.DEFAULT, SWT.DEFAULT).y + previewTable.getTable().getItemHeight()) + if (sash.getSize().y > outputsContainer.computeSize(SWT.DEFAULT, SWT.DEFAULT).y + previewTable.getTable().getItemHeight()) { sash.setWeights(new int[] {outputsContainer.computeSize(SWT.DEFAULT, SWT.DEFAULT).y, sash.getSize().y - outputsContainer.computeSize(SWT.DEFAULT, SWT.DEFAULT).y}); - else + } else { sash.setWeights(new int[] {outputsContainer.computeSize(SWT.DEFAULT, SWT.DEFAULT).y, previewTable.getTable().getItemHeight()}); + } setPageComplete(true); - } else + } else { setPageComplete(false); + } super.setVisible(visible); } @@ -199,7 +205,7 @@ public class CustomXmlParserOutputWizardPage extends WizardPage { writer.write(wizard.inputPage.getInputText()); writer.close(); - final ITmfTrace trace = new CustomXmlTrace(null, definition, tmpFile.getAbsolutePath(), CACHE_SIZE); + final ITmfTrace trace = new CustomXmlTrace(null, definition, tmpFile.getAbsolutePath(), CACHE_SIZE); previewTable.dispose(); previewTable = new CustomEventsTable(definition, tableContainer, CACHE_SIZE); previewTable.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true)); @@ -216,9 +222,11 @@ public class CustomXmlParserOutputWizardPage extends WizardPage { public List extractOutputs() { int numColumns = 0; - for (int i = 0; i < outputs.size(); i++) - if (outputs.get(i).enabledButton.getSelection()) + for (int i = 0; i < outputs.size(); i++) { + if (outputs.get(i).enabledButton.getSelection()) { numColumns++; + } + } final List outputColumns = new ArrayList(numColumns); numColumns = 0; for (int i = 0; i < outputs.size(); i++) { diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/handlers/DeleteAction.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/handlers/DeleteAction.java index 3183776441..c6f66d2b94 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/handlers/DeleteAction.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/handlers/DeleteAction.java @@ -1,11 +1,11 @@ /******************************************************************************* * Copyright (c) 2012 Ericsson - * + * * All rights reserved. This program and the accompanying materials are * made available under the terms of the Eclipse Public License v1.0 which * accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Patrick Tasse - Initial API and implementation *******************************************************************************/ @@ -31,8 +31,8 @@ public class DeleteAction extends Action { private static final String DELETE_TRACE_COMMAND_ID = "org.eclipse.linuxtools.tmf.ui.command.project.trace.delete"; //$NON-NLS-1$ private static final String DELETE_EXPERIMENT_COMMAND_ID = "org.eclipse.linuxtools.tmf.ui.command.project.experiment.delete"; //$NON-NLS-1$ - private IWorkbenchPage page; - private ISelectionProvider selectionProvider; + private final IWorkbenchPage page; + private final ISelectionProvider selectionProvider; private boolean tracesSelected; private boolean experimentsSelected; @@ -68,7 +68,7 @@ public class DeleteAction extends Action { if (tracesSelected && experimentsSelected) { return false; } - return (tracesSelected || experimentsSelected); + return (tracesSelected || experimentsSelected); } return false; } diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/handlers/DeleteTraceHandler.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/handlers/DeleteTraceHandler.java index 012e10c7cc..5749865eb0 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/handlers/DeleteTraceHandler.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/handlers/DeleteTraceHandler.java @@ -1,11 +1,11 @@ /******************************************************************************* * Copyright (c) 2009, 2010, 2011 Ericsson - * + * * All rights reserved. This program and the accompanying materials are * made available under the terms of the Eclipse Public License v1.0 which * accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Francois Chouinard - Initial API and implementation *******************************************************************************/ @@ -56,15 +56,17 @@ public class DeleteTraceHandler extends AbstractHandler { // Check if we are closing down IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow(); - if (window == null) + if (window == null) { return false; + } // Get the selection IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage(); IWorkbenchPart part = page.getActivePart(); ISelectionProvider selectionProvider = part.getSite().getSelectionProvider(); - if (selectionProvider == null) + if (selectionProvider == null) { return false; + } ISelection selection = selectionProvider.getSelection(); // Make sure selection contains only traces @@ -94,16 +96,18 @@ public class DeleteTraceHandler extends AbstractHandler { // Check if we are closing down IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow(); - if (window == null) + if (window == null) { return null; + } // Confirm the operation Shell shell = window.getShell(); MessageBox confirmOperation = new MessageBox(shell, SWT.ICON_QUESTION | SWT.CANCEL | SWT.OK); confirmOperation.setText(Messages.DeleteDialog_Title); confirmOperation.setMessage(Messages.DeleteTraceHandler_Message); - if (confirmOperation.open() != SWT.OK) + if (confirmOperation.open() != SWT.OK) { return null; + } @SuppressWarnings("unchecked") Iterator iterator = fSelection.iterator(); diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/handlers/OpenAction.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/handlers/OpenAction.java index cb7fbbacc1..507923f7da 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/handlers/OpenAction.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/handlers/OpenAction.java @@ -1,11 +1,11 @@ /******************************************************************************* * Copyright (c) 2012 Ericsson - * + * * All rights reserved. This program and the accompanying materials are * made available under the terms of the Eclipse Public License v1.0 which * accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Patrick Tasse - Initial API and implementation *******************************************************************************/ @@ -32,8 +32,8 @@ public class OpenAction extends Action { private static final String OPEN_TRACE_COMMAND_ID = "org.eclipse.linuxtools.tmf.ui.command.project.trace.open"; //$NON-NLS-1$ private static final String OPEN_EXPERIMENT_COMMAND_ID = "org.eclipse.linuxtools.tmf.ui.command.project.experiment.open"; //$NON-NLS-1$ - private IWorkbenchPage page; - private ISelectionProvider selectionProvider; + private final IWorkbenchPage page; + private final ISelectionProvider selectionProvider; private TmfProjectModelElement element; /** diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/handlers/OpenExperimentHandler.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/handlers/OpenExperimentHandler.java index 0abc69dbe9..2aa0893a0b 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/handlers/OpenExperimentHandler.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/handlers/OpenExperimentHandler.java @@ -69,15 +69,17 @@ public class OpenExperimentHandler extends AbstractHandler { // Check if we are closing down final IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow(); - if (window == null) + if (window == null) { return false; + } // Get the selection final IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage(); final IWorkbenchPart part = page.getActivePart(); final ISelectionProvider selectionProvider = part.getSite().getSelectionProvider(); - if (selectionProvider == null) + if (selectionProvider == null) { return false; + } final ISelection selection = selectionProvider.getSelection(); // Make sure there is only one selection and that it is an experiment @@ -86,8 +88,9 @@ public class OpenExperimentHandler extends AbstractHandler { final TreeSelection sel = (TreeSelection) selection; // There should be only one item selected as per the plugin.xml final Object element = sel.getFirstElement(); - if (element instanceof TmfExperimentElement) + if (element instanceof TmfExperimentElement) { fExperiment = (TmfExperimentElement) element; + } } // We only enable opening from the Traces folder for now @@ -104,8 +107,9 @@ public class OpenExperimentHandler extends AbstractHandler { // Check if we are closing down final IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow(); - if (window == null) + if (window == null) { return false; + } try { final IFile bookmarksFile = fExperiment.getProject().getExperimentsFolder().getResource().getFile(BOOKMARKS_HIDDEN_FILE); @@ -128,7 +132,7 @@ public class OpenExperimentHandler extends AbstractHandler { int cacheSize = Integer.MAX_VALUE; boolean useEditor = true; String experimentEditorId = null; - final ITmfTrace[] traces = new ITmfTrace[nbTraces]; + final ITmfTrace[] traces = new ITmfTrace[nbTraces]; for (int i = 0; i < nbTraces; i++) { TmfTraceElement element = traceEntries.get(i); diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/handlers/OpenTraceHandler.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/handlers/OpenTraceHandler.java index 0b4ac7f69b..e6531756da 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/handlers/OpenTraceHandler.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/handlers/OpenTraceHandler.java @@ -107,7 +107,6 @@ public class OpenTraceHandler extends AbstractHandler { // ------------------------------------------------------------------------ @Override - @SuppressWarnings({ "rawtypes", "unchecked" }) public Object execute(final ExecutionEvent event) throws ExecutionException { // Check if we are closing down diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/handlers/SelectTraceTypeHandler.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/handlers/SelectTraceTypeHandler.java index aea2f9b9b1..d7a86e928d 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/handlers/SelectTraceTypeHandler.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/handlers/SelectTraceTypeHandler.java @@ -1,11 +1,11 @@ /******************************************************************************* * Copyright (c) 2011 Ericsson - * + * * All rights reserved. This program and the accompanying materials are * made available under the terms of the Eclipse Public License v1.0 which * accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Francois Chouinard - Initial API and implementation *******************************************************************************/ @@ -66,15 +66,17 @@ public class SelectTraceTypeHandler extends AbstractHandler { // Check if we are closing down IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow(); - if (window == null) + if (window == null) { return false; + } // Get the selection IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage(); IWorkbenchPart part = page.getActivePart(); ISelectionProvider selectionProvider = part.getSite().getSelectionProvider(); - if (selectionProvider == null) + if (selectionProvider == null) { return false; + } ISelection selection = selectionProvider.getSelection(); // Make sure selection contains only traces @@ -104,8 +106,9 @@ public class SelectTraceTypeHandler extends AbstractHandler { // Check if we are closing down IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow(); - if (window == null) + if (window == null) { return null; + } boolean ok = true; for (Object element : fSelection.toList()) { @@ -183,13 +186,14 @@ public class SelectTraceTypeHandler extends AbstractHandler { private static boolean validateTraceType(TmfTraceElement trace) { IProject project = trace.getProject().getResource(); - ITmfTrace tmfTrace = null; + ITmfTrace tmfTrace = null; try { tmfTrace = trace.instantiateTrace(); return (tmfTrace != null && tmfTrace.validate(project, trace.getLocation().getPath())); } finally { - if (tmfTrace != null) + if (tmfTrace != null) { tmfTrace.dispose(); + } } } diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/signal/TmfTraceClosedSignal.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/signal/TmfTraceClosedSignal.java index 39f2bca7a4..1710333120 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/signal/TmfTraceClosedSignal.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/signal/TmfTraceClosedSignal.java @@ -1,11 +1,11 @@ /******************************************************************************* * Copyright (c) 2010 Ericsson - * + * * All rights reserved. This program and the accompanying materials are * made available under the terms of the Eclipse Public License v1.0 which * accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Patrick Tasse - Initial API and implementation *******************************************************************************/ @@ -23,14 +23,14 @@ import org.eclipse.linuxtools.tmf.core.trace.ITmfTrace; */ public class TmfTraceClosedSignal extends TmfSignal { - private final ITmfTrace fTrace; - - public TmfTraceClosedSignal(Object source, ITmfTrace trace) { + private final ITmfTrace fTrace; + + public TmfTraceClosedSignal(Object source, ITmfTrace trace) { super(source); fTrace = trace; } - public ITmfTrace getTrace() { + public ITmfTrace getTrace() { return fTrace; } diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/signal/TmfTraceOpenedSignal.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/signal/TmfTraceOpenedSignal.java index e507897e7e..7eaa023060 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/signal/TmfTraceOpenedSignal.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/signal/TmfTraceOpenedSignal.java @@ -1,11 +1,11 @@ /******************************************************************************* * Copyright (c) 2010 Ericsson - * + * * All rights reserved. This program and the accompanying materials are * made available under the terms of the Eclipse Public License v1.0 which * accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Patrick Tasse - Initial API and implementation *******************************************************************************/ @@ -25,18 +25,18 @@ import org.eclipse.linuxtools.tmf.ui.viewers.events.ITmfEventsFilterProvider; */ public class TmfTraceOpenedSignal extends TmfSignal { - private final ITmfTrace fTrace; + private final ITmfTrace fTrace; private final IFile fBookmarksFile; private final ITmfEventsFilterProvider fEventsFilterProvider; - - public TmfTraceOpenedSignal(Object source, ITmfTrace trace, IFile bookmarksFile, ITmfEventsFilterProvider eventsFilterProvider) { + + public TmfTraceOpenedSignal(Object source, ITmfTrace trace, IFile bookmarksFile, ITmfEventsFilterProvider eventsFilterProvider) { super(source); fTrace = trace; fBookmarksFile = bookmarksFile; fEventsFilterProvider = eventsFilterProvider; } - public ITmfTrace getTrace() { + public ITmfTrace getTrace() { return fTrace; } diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/editors/EventsViewEditor.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/editors/EventsViewEditor.java index a579938601..3cf02688e4 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/editors/EventsViewEditor.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/editors/EventsViewEditor.java @@ -65,7 +65,6 @@ public class EventsViewEditor extends TmfEditor { public static final String ID = "org.eclipse.linuxtools.tmf.ui.editors.eventsView"; //$NON-NLS-1$ private IFile fFile; - @SuppressWarnings("rawtypes") private ITmfTrace fTrace; private IMarker fGotoMarker; private boolean fEditorAreaVisible; @@ -86,7 +85,6 @@ public class EventsViewEditor extends TmfEditor { * (non-Javadoc) * @see org.eclipse.ui.part.EditorPart#init(org.eclipse.ui.IEditorSite, org.eclipse.ui.IEditorInput) */ - @SuppressWarnings({ "unchecked", "rawtypes" }) @Override public void init(final IEditorSite site, IEditorInput input) throws PartInitException { fEditorAreaVisible = site.getPage().isEditorAreaVisible(); @@ -126,7 +124,7 @@ public class EventsViewEditor extends TmfEditor { final List traceEntries = experimentElement.getTraces(); final int nbTraces = traceEntries.size(); int cacheSize = Integer.MAX_VALUE; - final ITmfTrace[] traces = new ITmfTrace[nbTraces]; + final ITmfTrace[] traces = new ITmfTrace[nbTraces]; for (int i = 0; i < nbTraces; i++) { final TmfTraceElement traceElement = traceEntries.get(i); final ITmfTrace trace = traceElement.instantiateTrace(); diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/editors/ITmfTraceEditor.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/editors/ITmfTraceEditor.java index 7ab0675274..41c13653e4 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/editors/ITmfTraceEditor.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/editors/ITmfTraceEditor.java @@ -28,7 +28,7 @@ public interface ITmfTraceEditor { * * @return The trace */ - public ITmfTrace getTrace(); + public ITmfTrace getTrace(); /** * Get the bookmark file associated to this trace 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 d16a26ce62..95299b8b39 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 @@ -30,7 +30,7 @@ import org.eclipse.ui.ide.IDE; public class TmfEditorInput implements IEditorInput { private final IFile fFile; - private final ITmfTrace fTrace; + private final ITmfTrace fTrace; /** * Standard constructor @@ -38,7 +38,7 @@ public class TmfEditorInput implements IEditorInput { * @param file The IFile pointer * @param trace Reference to the trace */ - public TmfEditorInput(IFile file, ITmfTrace trace) { + public TmfEditorInput(IFile file, ITmfTrace trace) { fFile = file; fTrace = trace; } @@ -89,7 +89,7 @@ public class TmfEditorInput implements IEditorInput { * * @return The trace */ - public ITmfTrace getTrace() { + public ITmfTrace getTrace() { return fTrace; } 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 c0567eab38..4f72aa9d86 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 @@ -81,7 +81,6 @@ public class TmfEventsEditor extends TmfEditor implements ITmfTraceEditor, IReus private TmfEventsTable fEventsTable; private IFile fFile; - @SuppressWarnings("rawtypes") private ITmfTrace fTrace; private Composite fParent; @@ -127,7 +126,7 @@ public class TmfEventsEditor extends TmfEditor implements ITmfTraceEditor, IReus final List traceEntries = experimentElement.getTraces(); final int nbTraces = traceEntries.size(); int cacheSize = Integer.MAX_VALUE; - final ITmfTrace[] traces = new ITmfTrace[nbTraces]; + final ITmfTrace[] traces = new ITmfTrace[nbTraces]; for (int i = 0; i < nbTraces; i++) { final TmfTraceElement traceElement = traceEntries.get(i); final ITmfTrace trace = traceElement.instantiateTrace(); @@ -296,7 +295,7 @@ public class TmfEventsEditor extends TmfEditor implements ITmfTraceEditor, IReus private TmfEventsTable getEventsTable(final Composite parent, final int cacheSize) { if (fTrace instanceof TmfExperiment) { - return getExperimentEventsTable((TmfExperiment) fTrace, parent, cacheSize); + return getExperimentEventsTable((TmfExperiment) fTrace, parent, cacheSize); } TmfEventsTable eventsTable = null; try { @@ -367,12 +366,12 @@ public class TmfEventsEditor extends TmfEditor implements ITmfTraceEditor, IReus * @return an events table of the appropriate type */ private static TmfEventsTable getExperimentEventsTable( - final TmfExperiment experiment, final Composite parent, + final TmfExperiment experiment, final Composite parent, final int cacheSize) { TmfEventsTable eventsTable = null; String commonTraceType = null; try { - for (final ITmfTrace trace : experiment.getTraces()) { + for (final ITmfTrace trace : experiment.getTraces()) { final IResource resource = trace.getResource(); if (resource == null) { return null; @@ -434,7 +433,7 @@ public class TmfEventsEditor extends TmfEditor implements ITmfTraceEditor, IReus } @Override - public ITmfTrace getTrace() { + public ITmfTrace getTrace() { return fTrace; } @@ -505,7 +504,6 @@ public class TmfEventsEditor extends TmfEditor implements ITmfTraceEditor, IReus * * @param signal The incoming signal */ - @SuppressWarnings("unchecked") @TmfSignalHandler public void traceParserUpdated(final TmfTraceParserUpdatedSignal signal) { if (signal.getTraceResource().equals(fFile)) { @@ -517,7 +515,7 @@ public class TmfEventsEditor extends TmfEditor implements ITmfTraceEditor, IReus if (traceTypeId != null) { for (final IConfigurationElement ce : TmfTraceType.getTypeElements()) { if (traceTypeId.equals(ce.getAttribute(TmfTraceType.ID_ATTR))) { - fTrace = (ITmfTrace) ce.createExecutableExtension(TmfTraceType.TRACE_TYPE_ATTR); + fTrace = (ITmfTrace) ce.createExecutableExtension(TmfTraceType.TRACE_TYPE_ATTR); final ITmfEvent event = (TmfEvent) ce.createExecutableExtension(TmfTraceType.EVENT_TYPE_ATTR); final String path = fFile.getLocationURI().getPath(); fTrace.initTrace(null, path, event.getClass()); diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/model/TmfTraceElement.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/model/TmfTraceElement.java index 69175d9dc6..c30e692759 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/model/TmfTraceElement.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/model/TmfTraceElement.java @@ -87,7 +87,7 @@ public class TmfTraceElement extends TmfProjectModelElement implements IActionFi sfTypeDescriptor.setCategory(sfInfoCategory); sfIsLinkedDescriptor.setCategory(sfInfoCategory); } - + // ------------------------------------------------------------------------ // Attributes // ------------------------------------------------------------------------ @@ -178,7 +178,7 @@ public class TmfTraceElement extends TmfProjectModelElement implements IActionFi * * @return the ITmfTrace or null for an error */ - public ITmfTrace instantiateTrace() { + public ITmfTrace instantiateTrace() { try { // make sure that supplementary folder exists @@ -200,7 +200,7 @@ public class TmfTraceElement extends TmfProjectModelElement implements IActionFi } } IConfigurationElement ce = sfTraceTypeAttributes.get(fTraceTypeId); - ITmfTrace trace = (ITmfTrace) ce.createExecutableExtension(TmfTraceType.TRACE_TYPE_ATTR); + ITmfTrace trace = (ITmfTrace) ce.createExecutableExtension(TmfTraceType.TRACE_TYPE_ATTR); return trace; } } catch (CoreException e) { @@ -264,9 +264,9 @@ public class TmfTraceElement extends TmfProjectModelElement implements IActionFi /** * Returns the TmfTraceElement located under the TmfTracesFolder. - * - * @return this if this element is under the TmfTracesFolder - * else the corresponding TmfTraceElement if this element is under + * + * @return this if this element is under the TmfTracesFolder + * else the corresponding TmfTraceElement if this element is under * TmfExperimentElement. */ public TmfTraceElement getElementUnderTraceFolder() { @@ -281,7 +281,7 @@ public class TmfTraceElement extends TmfProjectModelElement implements IActionFi } return this; } - + /** * Deletes the trace specific supplementary folder. */ @@ -298,8 +298,8 @@ public class TmfTraceElement extends TmfProjectModelElement implements IActionFi /** * Renames the trace specific supplementary folder according to the new trace name. - * - * @param newTraceName The new trace name + * + * @param newTraceName The new trace name */ public void renameSupplementaryFolder(String newTraceName) { IFolder oldSupplFolder = getTraceSupplementaryFolder(fResource.getName()); @@ -317,8 +317,8 @@ public class TmfTraceElement extends TmfProjectModelElement implements IActionFi /** * Copies the trace specific supplementary folder to the new trace name. - * - * @param newTraceName The new trace name + * + * @param newTraceName The new trace name */ public void copySupplementaryFolder(String newTraceName) { IFolder oldSupplFolder = getTraceSupplementaryFolder(fResource.getName()); @@ -336,8 +336,8 @@ public class TmfTraceElement extends TmfProjectModelElement implements IActionFi /** * Copies the trace specific supplementary folder a new folder. - * - * @param destination The destination folder to copy to. + * + * @param destination The destination folder to copy to. */ public void copySupplementaryFolder(IFolder destination) { IFolder oldSupplFolder = getTraceSupplementaryFolder(fResource.getName()); @@ -352,10 +352,10 @@ public class TmfTraceElement extends TmfProjectModelElement implements IActionFi } } - + /** * Refreshes the trace specific supplementary folder information. It creates the folder if not exists. - * It sets the persistence property of the trace resource + * It sets the persistence property of the trace resource */ public void refreshSupplementaryFolder() { createSupplementaryDirectory(); @@ -363,17 +363,17 @@ public class TmfTraceElement extends TmfProjectModelElement implements IActionFi /** * Checks if supplementary resource exist or not. - * + * * @return true if one or more files are under the trace supplementary folder */ public boolean hasSupplementaryResources() { IResource[] resources = getSupplementaryResources(); return (resources.length > 0); } - + /** * Returns the supplementary resources under the trace supplementary folder. - * + * * @return array of resources under the trace supplementary folder. */ public IResource[] getSupplementaryResources() { @@ -389,12 +389,12 @@ public class TmfTraceElement extends TmfProjectModelElement implements IActionFi } /** - * Deletes the given resources. - * + * Deletes the given resources. + * * @param resources array of resources to delete. */ public void deleteSupplementaryResources(IResource[] resources) { - + for (int i = 0; i < resources.length; i++) { try { resources[i].delete(true, new NullProgressMonitor()); @@ -419,7 +419,7 @@ public class TmfTraceElement extends TmfProjectModelElement implements IActionFi } catch (CoreException e) { Activator.getDefault().logError("Error setting persistant property " + TmfCommonConstants.TRACE_SUPPLEMENTARY_FOLDER, e); //$NON-NLS-1$ } - + } // ------------------------------------------------------------------------ diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/wizards/CopyTraceDialog.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/wizards/CopyTraceDialog.java index 2c92cd7440..046b526d80 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/wizards/CopyTraceDialog.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/wizards/CopyTraceDialog.java @@ -1,11 +1,11 @@ /******************************************************************************* * Copyright (c) 2011, 2012 Ericsson - * + * * All rights reserved. This program and the accompanying materials are * made available under the terms of the Eclipse Public License v1.0 which * accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Francois Chouinard - Copied and adapted from NewFolderDialog *******************************************************************************/ @@ -62,8 +62,8 @@ public class CopyTraceDialog extends SelectionStatusDialog { private final TmfTraceElement fTrace; private Text fNewTraceName; - private IFolder fTraceFolder; - private TmfProjectElement fProject; + private final IFolder fTraceFolder; + private final TmfProjectElement fProject; // ------------------------------------------------------------------------ // Constructor @@ -179,7 +179,7 @@ public class CopyTraceDialog extends SelectionStatusDialog { @Override protected void computeResult() { } - + /* * (non-Javadoc) * @see org.eclipse.ui.dialogs.SelectionStatusDialog#create() diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/wizards/ImportTraceWizardPage.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/wizards/ImportTraceWizardPage.java index 5b9bffc93d..4fb945d7a8 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/wizards/ImportTraceWizardPage.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/wizards/ImportTraceWizardPage.java @@ -740,10 +740,10 @@ public class ImportTraceWizardPage extends WizardResourceImportPage { List traces = isolateTraces(); for (File trace : traces) { - ITmfTrace tmfTrace = null; + ITmfTrace tmfTrace = null; try { IConfigurationElement ce = fTraceAttributes.get(traceTypeName); - tmfTrace = (ITmfTrace) ce.createExecutableExtension(TmfTraceType.TRACE_TYPE_ATTR); + tmfTrace = (ITmfTrace) ce.createExecutableExtension(TmfTraceType.TRACE_TYPE_ATTR); if (tmfTrace != null && !tmfTrace.validate(fProject, trace.getAbsolutePath())) { setMessage(null); setErrorMessage(Messages.ImportTraceWizard_TraceValidationFailed); diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/wizards/RenameTraceDialog.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/wizards/RenameTraceDialog.java index 9b81c19de5..850e266b91 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/wizards/RenameTraceDialog.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/wizards/RenameTraceDialog.java @@ -1,11 +1,11 @@ /******************************************************************************* * Copyright (c) 2011, 2012 Ericsson - * + * * All rights reserved. This program and the accompanying materials are * made available under the terms of the Eclipse Public License v1.0 which * accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Francois Chouinard - Copied and adapted from NewFolderDialog *******************************************************************************/ @@ -50,7 +50,7 @@ import org.eclipse.ui.dialogs.SelectionStatusDialog; /** * Implementation of a dialog box to rename a trace. - *

+ *

* @version 1.0 * @author Francois Chouinard */ @@ -63,8 +63,8 @@ public class RenameTraceDialog extends SelectionStatusDialog { private final TmfTraceElement fTrace; private Text fNewTraceNameText; private String fNewTraceName; - private IContainer fTraceFolder; - private TmfProjectElement fProject; + private final IContainer fTraceFolder; + private final TmfProjectElement fProject; // ------------------------------------------------------------------------ // Constructor diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/signal/TmfTraceClosedSignal.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/signal/TmfTraceClosedSignal.java index 0214cf307d..94fc43f587 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/signal/TmfTraceClosedSignal.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/signal/TmfTraceClosedSignal.java @@ -23,7 +23,7 @@ import org.eclipse.linuxtools.tmf.core.trace.ITmfTrace; */ public class TmfTraceClosedSignal extends TmfSignal { - private final ITmfTrace fTrace; + private final ITmfTrace fTrace; /** * Constructor for a new signal @@ -33,7 +33,7 @@ public class TmfTraceClosedSignal extends TmfSignal { * @param trace * The trace being closed */ - public TmfTraceClosedSignal(Object source, ITmfTrace trace) { + public TmfTraceClosedSignal(Object source, ITmfTrace trace) { super(source); fTrace = trace; } @@ -43,7 +43,7 @@ public class TmfTraceClosedSignal extends TmfSignal { * * @return The trace object */ - public ITmfTrace getTrace() { + public ITmfTrace getTrace() { return fTrace; } diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/signal/TmfTraceOpenedSignal.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/signal/TmfTraceOpenedSignal.java index 5a3d6182d9..76992b07c5 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/signal/TmfTraceOpenedSignal.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/signal/TmfTraceOpenedSignal.java @@ -25,7 +25,7 @@ import org.eclipse.linuxtools.tmf.ui.viewers.events.ITmfEventsFilterProvider; */ public class TmfTraceOpenedSignal extends TmfSignal { - private final ITmfTrace fTrace; + private final ITmfTrace fTrace; private final IFile fBookmarksFile; private final ITmfEventsFilterProvider fEventsFilterProvider; @@ -41,7 +41,7 @@ public class TmfTraceOpenedSignal extends TmfSignal { * @param eventsFilterProvider * Provider for the event filter in use */ - public TmfTraceOpenedSignal(Object source, ITmfTrace trace, + public TmfTraceOpenedSignal(Object source, ITmfTrace trace, IFile bookmarksFile, ITmfEventsFilterProvider eventsFilterProvider) { super(source); fTrace = trace; @@ -54,7 +54,7 @@ public class TmfTraceOpenedSignal extends TmfSignal { * * @return The trace */ - public ITmfTrace getTrace() { + public ITmfTrace getTrace() { return fTrace; } diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/events/ITmfEventsFilterListener.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/events/ITmfEventsFilterListener.java index 82046ce4e3..5b33a056bc 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/events/ITmfEventsFilterListener.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/events/ITmfEventsFilterListener.java @@ -31,7 +31,7 @@ public interface ITmfEventsFilterListener { * @param trace * The trace on which this filter is applied */ - public void filterApplied(ITmfFilter filter, ITmfTrace trace); + public void filterApplied(ITmfFilter filter, ITmfTrace trace); /** * Notify this listener that a new search has been run. @@ -41,6 +41,5 @@ public interface ITmfEventsFilterListener { * @param trace * The trace on which this filter is applied */ - public void searchApplied(ITmfFilter filter, ITmfTrace trace); - + public void searchApplied(ITmfFilter filter, ITmfTrace trace); } diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/events/TmfEventsCache.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/events/TmfEventsCache.java index bb8c6a540f..68ccec8eea 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/events/TmfEventsCache.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/events/TmfEventsCache.java @@ -65,7 +65,7 @@ public class TmfEventsCache { private int fCacheStartIndex = 0; private int fCacheEndIndex = 0; - private ITmfTrace fTrace; + private ITmfTrace fTrace; private final TmfEventsTable fTable; private ITmfFilter fFilter; private final List fFilterIndex = new ArrayList(); // contains the event rank at each 'cache size' filtered events @@ -90,7 +90,7 @@ public class TmfEventsCache { * @param trace * The trace to assign. */ - public void setTrace(ITmfTrace trace) { + public void setTrace(ITmfTrace trace) { fTrace = trace; clear(); } @@ -191,11 +191,10 @@ public class TmfEventsCache { * The rank of the event in the trace * @return The position (index) this event should use once cached */ - @SuppressWarnings("unchecked") public int getFilteredEventIndex(final long rank) { int current; int startRank; - TmfDataRequest request; + TmfDataRequest request; final ITmfFilter filter = fFilter; synchronized (this) { int start = 0; @@ -231,12 +230,12 @@ public class TmfEventsCache { final int index = current * fCache.length; - class DataRequest extends TmfDataRequest { + class DataRequest extends TmfDataRequest { ITmfFilter fFilter; int fRank; int fIndex; - DataRequest(Class dataType, ITmfFilter filter, int start, int nbRequested) { + DataRequest(Class dataType, ITmfFilter filter, int start, int nbRequested) { super(dataType, start, nbRequested); fFilter = filter; fRank = start; @@ -244,7 +243,7 @@ public class TmfEventsCache { } @Override - public void handleData(T event) { + public void handleData(ITmfEvent event) { super.handleData(event); if (isCancelled()) { return; @@ -264,11 +263,11 @@ public class TmfEventsCache { } } - request = new DataRequest(ITmfEvent.class, filter, startRank, TmfDataRequest.ALL_DATA); - ((ITmfDataProvider) fTrace).sendRequest(request); + request = new DataRequest(ITmfEvent.class, filter, startRank, TmfDataRequest.ALL_DATA); + ((ITmfDataProvider) fTrace).sendRequest(request); try { request.waitForCompletion(); - return ((DataRequest) request).getFilteredIndex(); + return ((DataRequest) request).getFilteredIndex(); } catch (InterruptedException e) { Activator.getDefault().logError("Filter request interrupted!", e); //$NON-NLS-1$ } @@ -310,7 +309,6 @@ public class TmfEventsCache { private int startIndex = index; private int skipCount = 0; @Override - @SuppressWarnings("unchecked") protected IStatus run(final IProgressMonitor monitor) { int nbRequested; @@ -325,7 +323,7 @@ public class TmfEventsCache { } } - TmfDataRequest request = new TmfDataRequest(ITmfEvent.class, startIndex, nbRequested) { + TmfDataRequest request = new TmfDataRequest(ITmfEvent.class, startIndex, nbRequested) { private int count = 0; private long rank = startIndex; @Override @@ -357,7 +355,7 @@ public class TmfEventsCache { } }; - ((ITmfDataProvider) fTrace).sendRequest(request); + ((ITmfDataProvider) fTrace).sendRequest(request); try { request.waitForCompletion(); } catch (InterruptedException e) { 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 8708ac187f..ee7a7ec708 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 @@ -194,7 +194,7 @@ public class TmfEventsTable extends TmfComponent implements IGotoMarker, protected SashForm fSashForm; protected TmfVirtualTable fTable; protected TmfRawEventViewer fRawViewer; - protected ITmfTrace fTrace; + protected ITmfTrace fTrace; protected boolean fPackDone = false; protected HeaderState fHeaderState = HeaderState.SEARCH; protected long fSelectedRank = 0; @@ -1118,7 +1118,7 @@ public class TmfEventsTable extends TmfComponent implements IGotoMarker, protected class FilterThread extends Thread { private final ITmfFilterTreeNode filter; - private TmfDataRequest request; + private TmfDataRequest request; private boolean refreshBusy = false; private boolean refreshPending = false; private final Object syncObj = new Object(); @@ -1128,7 +1128,6 @@ public class TmfEventsTable extends TmfComponent implements IGotoMarker, this.filter = filter; } - @SuppressWarnings("unchecked") @Override public void run() { if (fTrace == null) { @@ -1138,7 +1137,7 @@ public class TmfEventsTable extends TmfComponent implements IGotoMarker, if (nbRequested <= 0) { return; } - request = new TmfDataRequest(ITmfEvent.class, (int) fFilterCheckCount, + request = new TmfDataRequest(ITmfEvent.class, (int) fFilterCheckCount, nbRequested, fTrace.getCacheSize(), ExecutionType.BACKGROUND) { @Override public void handleData(final ITmfEvent event) { @@ -1158,7 +1157,7 @@ public class TmfEventsTable extends TmfComponent implements IGotoMarker, fFilterCheckCount++; } }; - ((ITmfDataProvider) fTrace).sendRequest(request); + ((ITmfDataProvider) fTrace).sendRequest(request); try { request.waitForCompletion(); } catch (final InterruptedException e) { @@ -1282,7 +1281,7 @@ public class TmfEventsTable extends TmfComponent implements IGotoMarker, protected int direction; protected long rank; protected long foundRank = -1; - protected TmfDataRequest request; + protected TmfDataRequest request; public SearchThread(final ITmfFilterTreeNode searchFilter, final ITmfFilterTreeNode eventFilter, final int startIndex, final long currentRank, final int direction) { @@ -1294,7 +1293,6 @@ public class TmfEventsTable extends TmfComponent implements IGotoMarker, this.direction = direction; } - @SuppressWarnings("unchecked") @Override protected IStatus run(final IProgressMonitor monitor) { if (fTrace == null) { @@ -1344,7 +1342,7 @@ public class TmfEventsTable extends TmfComponent implements IGotoMarker, if (direction == Direction.BACKWARD) { rank = Math.max(0, rank - fTrace.getCacheSize() + 1); } - request = new TmfDataRequest(ITmfEvent.class, (int) rank, nbRequested, fTrace.getCacheSize(), ExecutionType.BACKGROUND) { + request = new TmfDataRequest(ITmfEvent.class, (int) rank, nbRequested, fTrace.getCacheSize(), ExecutionType.BACKGROUND) { long currentRank = rank; @Override @@ -1360,7 +1358,7 @@ public class TmfEventsTable extends TmfComponent implements IGotoMarker, currentRank++; } }; - ((ITmfDataProvider) fTrace).sendRequest(request); + ((ITmfDataProvider) fTrace).sendRequest(request); try { request.waitForCompletion(); if (request.isCancelled()) { @@ -1495,7 +1493,7 @@ public class TmfEventsTable extends TmfComponent implements IGotoMarker, * true if the trace should be disposed when the table is * disposed */ - public void setTrace(final ITmfTrace trace, final boolean disposeOnClose) { + public void setTrace(final ITmfTrace trace, final boolean disposeOnClose) { if ((fTrace != null) && fDisposeOnClose) { fTrace.dispose(); } @@ -1805,7 +1803,6 @@ public class TmfEventsTable extends TmfComponent implements IGotoMarker, * @param signal * The incoming signal */ - @SuppressWarnings("unchecked") @TmfSignalHandler public void currentTimeUpdated(final TmfTimeSynchSignal signal) { if ((signal.getSource() != this) && (fTrace != null) && (!fTable.isDisposed())) { @@ -1813,7 +1810,7 @@ public class TmfEventsTable extends TmfComponent implements IGotoMarker, // Create a request for one event that will be queued after other ongoing requests. When this request is completed // do the work to select the actual event with the timestamp specified in the signal. This procedure prevents // the method fTrace.getRank() from interfering and delaying ongoing requests. - final TmfDataRequest subRequest = new TmfDataRequest(ITmfEvent.class, 0, 1, ExecutionType.FOREGROUND) { + final TmfDataRequest subRequest = new TmfDataRequest(ITmfEvent.class, 0, 1, ExecutionType.FOREGROUND) { TmfTimestamp ts = new TmfTimestamp(signal.getCurrentTime()); @@ -1866,7 +1863,7 @@ public class TmfEventsTable extends TmfComponent implements IGotoMarker, } }; - ((ITmfDataProvider) fTrace).sendRequest(subRequest); + ((ITmfDataProvider) fTrace).sendRequest(subRequest); } } diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/environment/TmfEnvironmentView.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/environment/TmfEnvironmentView.java index de0cf71d8a..f713a38ccc 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/environment/TmfEnvironmentView.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/environment/TmfEnvironmentView.java @@ -14,8 +14,6 @@ package org.eclipse.linuxtools.tmf.ui.views.environment; import java.util.ArrayList; import org.eclipse.linuxtools.tmf.core.ctfadaptor.CtfTmfTrace; -import org.eclipse.linuxtools.tmf.core.event.ITmfEvent; -import org.eclipse.linuxtools.tmf.core.event.TmfEvent; import org.eclipse.linuxtools.tmf.core.signal.TmfExperimentSelectedSignal; import org.eclipse.linuxtools.tmf.core.signal.TmfSignalHandler; import org.eclipse.linuxtools.tmf.core.trace.ITmfTrace; @@ -38,7 +36,7 @@ public class TmfEnvironmentView extends TmfView { /** The Environment View's ID */ public static final String ID = "org.eclipse.linuxtools.tmf.ui.views.environment"; //$NON-NLS-1$ - private TmfExperiment fExperiment; + private TmfExperiment fExperiment; private Table fTable; // final private String fTitlePrefix; private Composite fParent; @@ -64,13 +62,11 @@ public class TmfEnvironmentView extends TmfView { } @Override - @SuppressWarnings({ "unchecked", "rawtypes" }) public void createPartControl(Composite parent) { fParent = parent; TableItem ti[]; // If an experiment is already selected, update the table - TmfExperiment experiment = (TmfExperiment) TmfExperiment - .getCurrentExperiment(); + TmfExperiment experiment = TmfExperiment.getCurrentExperiment(); if (experiment == null) { return; } @@ -135,11 +131,10 @@ public class TmfEnvironmentView extends TmfView { * @param signal * The incoming signal */ - @SuppressWarnings("unchecked") @TmfSignalHandler - public void experimentSelected(TmfExperimentSelectedSignal signal) { + public void experimentSelected(TmfExperimentSelectedSignal signal) { // Update the trace reference - TmfExperiment exp = (TmfExperiment) signal.getExperiment(); + TmfExperiment exp = signal.getExperiment(); if (!exp.equals(fExperiment)) { fExperiment = exp; if (fTable != null) { diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/events/TmfEventsView.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/events/TmfEventsView.java index 9968b8e239..e3a909665e 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/events/TmfEventsView.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/events/TmfEventsView.java @@ -32,7 +32,6 @@ import org.eclipse.linuxtools.internal.tmf.ui.parsers.custom.CustomEventsTable; import org.eclipse.linuxtools.internal.tmf.ui.parsers.custom.CustomTxtTrace; import org.eclipse.linuxtools.internal.tmf.ui.parsers.custom.CustomXmlTrace; import org.eclipse.linuxtools.tmf.core.TmfCommonConstants; -import org.eclipse.linuxtools.tmf.core.event.ITmfEvent; import org.eclipse.linuxtools.tmf.core.signal.TmfExperimentDisposedSignal; import org.eclipse.linuxtools.tmf.core.signal.TmfExperimentSelectedSignal; import org.eclipse.linuxtools.tmf.core.signal.TmfSignalHandler; @@ -68,7 +67,7 @@ public class TmfEventsView extends TmfView implements IResourceChangeListener { /** Event View's ID */ public static final String ID = "org.eclipse.linuxtools.tmf.ui.views.events"; //$NON-NLS-1$ - private TmfExperiment fExperiment; + private TmfExperiment fExperiment; private TmfEventsTable fEventsTable; private static final int DEFAULT_CACHE_SIZE = 100; private String fTitlePrefix; @@ -98,16 +97,15 @@ public class TmfEventsView extends TmfView implements IResourceChangeListener { // ------------------------------------------------------------------------ @Override - @SuppressWarnings("unchecked") public void createPartControl(Composite parent) { fParent = parent; fTitlePrefix = getTitle(); // If an experiment is already selected, update the table - TmfExperiment experiment = (TmfExperiment) TmfExperiment.getCurrentExperiment(); + TmfExperiment experiment = TmfExperiment.getCurrentExperiment(); if (experiment != null) { - experimentSelected(new TmfExperimentSelectedSignal(this, experiment)); + experimentSelected(new TmfExperimentSelectedSignal(this, experiment)); } else { fEventsTable = createEventsTable(parent); } @@ -135,7 +133,7 @@ public class TmfEventsView extends TmfView implements IResourceChangeListener { int cacheSize = fExperiment.getCacheSize(); String commonTraceType = null; try { - for (ITmfTrace trace : fExperiment.getTraces()) { + for (ITmfTrace trace : fExperiment.getTraces()) { IResource resource = trace.getResource(); if (resource == null) { return new TmfEventsTable(parent, cacheSize); @@ -234,11 +232,10 @@ public class TmfEventsView extends TmfView implements IResourceChangeListener { * @param signal * The incoming signal */ - @SuppressWarnings("unchecked") @TmfSignalHandler - public void experimentSelected(TmfExperimentSelectedSignal signal) { + public void experimentSelected(TmfExperimentSelectedSignal signal) { // Update the trace reference - TmfExperiment exp = (TmfExperiment) signal.getExperiment(); + TmfExperiment exp = signal.getExperiment(); if (!exp.equals(fExperiment)) { fExperiment = exp; setPartName(fTitlePrefix + " - " + fExperiment.getName()); //$NON-NLS-1$ @@ -261,11 +258,10 @@ public class TmfEventsView extends TmfView implements IResourceChangeListener { * @param signal * The incoming signal */ - @SuppressWarnings("unchecked") @TmfSignalHandler - public void experimentDisposed(TmfExperimentDisposedSignal signal) { + public void experimentDisposed(TmfExperimentDisposedSignal signal) { // Clear the trace reference - TmfExperiment experiment = (TmfExperiment) signal.getExperiment(); + TmfExperiment experiment = signal.getExperiment(); if (experiment.equals(fExperiment)) { fEventsTable.setTrace(null, false); diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/histogram/HistogramCurrentTimeControl.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/histogram/HistogramCurrentTimeControl.java index 0be433f767..f995664cad 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/histogram/HistogramCurrentTimeControl.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/histogram/HistogramCurrentTimeControl.java @@ -1,11 +1,11 @@ /******************************************************************************* * Copyright (c) 2011, 2012 Ericsson - * + * * All rights reserved. This program and the accompanying materials are * made available under the terms of the Eclipse Public License v1.0 which * accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Francois Chouinard - Initial API and implementation * Francois Chouinard - Moved from LTTng to TMF @@ -19,7 +19,7 @@ import org.eclipse.swt.widgets.Composite; /** * This control provides a group containing a text control. - * + * * @version 1.0 * @author Francois Chouinard */ @@ -31,10 +31,10 @@ public class HistogramCurrentTimeControl extends HistogramTextControl { /** * Constructor with default group and text value. - * + * * @param parentView A parent histogram view * @param parent A parent composite to draw in - * @param textStyle A test style + * @param textStyle A test style * @param groupStyle A group style */ public HistogramCurrentTimeControl(HistogramView parentView, Composite parent, int textStyle, int groupStyle) { @@ -42,11 +42,11 @@ public class HistogramCurrentTimeControl extends HistogramTextControl { } /** - * + * * Constructor * @param parentView A parent histogram view * @param parent A parent composite to draw in - * @param textStyle A test style + * @param textStyle A test style * @param groupStyle A group style * @param groupValue A group value * @param textValue A text value @@ -66,7 +66,7 @@ public class HistogramCurrentTimeControl extends HistogramTextControl { if (getValue() != value) { // Make sure that the new time is within range - TmfExperiment exp = TmfExperiment.getCurrentExperiment(); + TmfExperiment exp = TmfExperiment.getCurrentExperiment(); if (exp != null) { TmfTimeRange range = exp.getTimeRange(); long startTime = range.getStartTime().normalize(0, -9).getValue(); diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/histogram/HistogramRequest.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/histogram/HistogramRequest.java index 505740f8af..900755c3e0 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/histogram/HistogramRequest.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/histogram/HistogramRequest.java @@ -28,7 +28,7 @@ import org.eclipse.linuxtools.tmf.core.trace.ITmfTrace; * @author Francois Chouinard *

*/ -public class HistogramRequest extends TmfEventRequest { +public class HistogramRequest extends TmfEventRequest { // ------------------------------------------------------------------------ // Attributes diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/histogram/HistogramView.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/histogram/HistogramView.java index 0601b5eb00..7961545dac 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/histogram/HistogramView.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/histogram/HistogramView.java @@ -79,7 +79,7 @@ public class HistogramView extends TmfView { private Composite fParent; // The current experiment - private TmfExperiment fCurrentExperiment; + private TmfExperiment fCurrentExperiment; // Current timestamp/time window private long fExperimentStartTime; @@ -130,7 +130,6 @@ public class HistogramView extends TmfView { // ------------------------------------------------------------------------ @Override - @SuppressWarnings("unchecked") public void createPartControl(Composite parent) { fParent = parent; @@ -245,16 +244,15 @@ public class HistogramView extends TmfView { fFullTraceHistogram = new FullTraceHistogram(this, fullRangeComposite); // Load the experiment if present - fCurrentExperiment = (TmfExperiment) TmfExperiment.getCurrentExperiment(); + fCurrentExperiment = TmfExperiment.getCurrentExperiment(); if (fCurrentExperiment != null) { loadExperiment(); } } @Override - @SuppressWarnings("unchecked") public void setFocus() { - TmfExperiment experiment = (TmfExperiment) TmfExperiment.getCurrentExperiment(); + TmfExperiment experiment = TmfExperiment.getCurrentExperiment(); if ((experiment != null) && (experiment != fCurrentExperiment)) { fCurrentExperiment = experiment; initializeHistograms(); @@ -363,10 +361,9 @@ public class HistogramView extends TmfView { * @param signal the experiment selected signal */ @TmfSignalHandler - @SuppressWarnings("unchecked") - public void experimentSelected(TmfExperimentSelectedSignal signal) { + public void experimentSelected(TmfExperimentSelectedSignal signal) { assert (signal != null); - fCurrentExperiment = (TmfExperiment) signal.getExperiment(); + fCurrentExperiment = signal.getExperiment(); loadExperiment(); } @@ -499,7 +496,7 @@ public class HistogramView extends TmfView { } } - private TmfTimeRange updateExperimentTimeRange(TmfExperiment experiment) { + private TmfTimeRange updateExperimentTimeRange(TmfExperiment experiment) { fExperimentStartTime = 0; fExperimentEndTime = 0; fCurrentTimestamp = 0; diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/statistics/TmfStatisticsView.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/statistics/TmfStatisticsView.java index 7367ef7efb..e9f3950452 100755 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/statistics/TmfStatisticsView.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/statistics/TmfStatisticsView.java @@ -87,7 +87,7 @@ public class TmfStatisticsView extends TmfView { /** * Stores the request to the experiment */ - protected ITmfEventRequest fRequest = null; + protected ITmfEventRequest fRequest = null; /** * Update synchronization parameter (used for streaming): Update busy indicator */ @@ -225,12 +225,11 @@ public class TmfStatisticsView extends TmfView { fTreeViewer.getTree().setSortDirection(SWT.DOWN); // Read current data if any available - TmfExperiment experiment = TmfExperiment.getCurrentExperiment(); + TmfExperiment experiment = TmfExperiment.getCurrentExperiment(); if (experiment != null) { fRequestData = true; // Insert the statistics data into the tree - @SuppressWarnings({ "rawtypes", "unchecked" }) - TmfExperimentSelectedSignal signal = new TmfExperimentSelectedSignal(this, experiment); + TmfExperimentSelectedSignal signal = new TmfExperimentSelectedSignal(this, experiment); experimentSelected(signal); } } @@ -288,7 +287,8 @@ public class TmfStatisticsView extends TmfView { } /** - * Called when an experiment request has failed or has been canceled Remove the data retrieved from the experiment from the statistics tree. + * Called when an experiment request has failed or has been cancelled. + * Remove the data retrieved from the experiment from the statistics tree. * * @param name The experiment name */ @@ -312,7 +312,7 @@ public class TmfStatisticsView extends TmfView { * @param signal The disposed signal */ @TmfSignalHandler - public void experimentDisposed(TmfExperimentDisposedSignal signal) { + public void experimentDisposed(TmfExperimentDisposedSignal signal) { if (signal.getExperiment() != TmfExperiment.getCurrentExperiment()) { return; } @@ -326,16 +326,15 @@ public class TmfStatisticsView extends TmfView { * @param signal Contains the information about the selection. */ @TmfSignalHandler - public void experimentSelected(TmfExperimentSelectedSignal signal) { + public void experimentSelected(TmfExperimentSelectedSignal signal) { if (signal != null) { - TmfExperiment experiment = signal.getExperiment(); + TmfExperiment experiment = signal.getExperiment(); String experimentName = experiment.getName(); if (TmfStatisticsTreeRootFactory.containsTreeRoot(getTreeID(experimentName))) { // The experiment root is already present TmfStatisticsTreeNode experimentTreeNode = TmfStatisticsTreeRootFactory.getStatTreeRoot(getTreeID(experimentName)); - @SuppressWarnings("rawtypes") ITmfTrace[] traces = experiment.getTraces(); // check if there is partial data loaded in the experiment @@ -391,10 +390,9 @@ public class TmfStatisticsView extends TmfView { * Handles the signal about new experiment range. * @param signal The experiment range updated signal */ - @SuppressWarnings("unchecked") @TmfSignalHandler public void experimentRangeUpdated(TmfExperimentRangeUpdatedSignal signal) { - TmfExperiment experiment = (TmfExperiment) signal.getExperiment(); + TmfExperiment experiment = signal.getExperiment(); // validate if (! experiment.equals(TmfExperiment.getCurrentExperiment())) { return; @@ -412,7 +410,7 @@ public class TmfStatisticsView extends TmfView { */ @TmfSignalHandler public void experimentUpdated(TmfExperimentUpdatedSignal signal) { - TmfExperiment experiment = signal.getExperiment(); + TmfExperiment experiment = signal.getExperiment(); if (! experiment.equals(TmfExperiment.getCurrentExperiment())) { return; } @@ -512,8 +510,7 @@ public class TmfStatisticsView extends TmfView { * @param experiment experiment for which we need the statistics data. * @param timeRange to request */ - @SuppressWarnings("unchecked") - protected void requestData(final TmfExperiment experiment, TmfTimeRange timeRange) { + protected void requestData(final TmfExperiment experiment, TmfTimeRange timeRange) { if (experiment != null) { // Check if update is already ongoing @@ -527,7 +524,7 @@ public class TmfStatisticsView extends TmfView { } // Preparation of the event request - fRequest = new TmfEventRequest(ITmfEvent.class, timeRange, index, TmfDataRequest.ALL_DATA, getIndexPageSize(), ExecutionType.BACKGROUND) { + fRequest = new TmfEventRequest(ITmfEvent.class, timeRange, index, TmfDataRequest.ALL_DATA, getIndexPageSize(), ExecutionType.BACKGROUND) { private final AbsTmfStatisticsTree statisticsData = TmfStatisticsTreeRootFactory.getStatTree(getTreeID(experiment.getName())); @@ -573,7 +570,7 @@ public class TmfStatisticsView extends TmfView { modelIncomplete(experiment.getName()); } }; - ((TmfExperiment) experiment).sendRequest(fRequest); + experiment.sendRequest(fRequest); waitCursor(true); } } diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/timechart/TimeChartAnalysisEntry.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/timechart/TimeChartAnalysisEntry.java index b6559c5b3d..d30ef99955 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/timechart/TimeChartAnalysisEntry.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/timechart/TimeChartAnalysisEntry.java @@ -28,7 +28,7 @@ import org.eclipse.linuxtools.tmf.ui.widgets.timegraph.model.ITimeGraphEntry; */ public class TimeChartAnalysisEntry implements ITimeGraphEntry { - private final ITmfTrace fTrace; + private final ITmfTrace fTrace; private final Vector fTraceEvents; private int fPower = 0; // 2^fPower nanoseconds per vector position private long fReferenceTime = -1; // time corresponding to beginning of index 0 @@ -36,7 +36,7 @@ public class TimeChartAnalysisEntry implements ITimeGraphEntry { private long fStopTime = -1; // time of last event private long fLastRank = -1; // rank of last processed trace event - TimeChartAnalysisEntry(ITmfTrace trace, int modelSize) { + TimeChartAnalysisEntry(ITmfTrace trace, int modelSize) { fTrace = trace; fTraceEvents = new Vector(modelSize); } @@ -248,7 +248,7 @@ public class TimeChartAnalysisEntry implements ITimeGraphEntry { * * @return The trace object */ - public ITmfTrace getTrace() { + public ITmfTrace getTrace() { return fTrace; } diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/timechart/TimeChartView.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/timechart/TimeChartView.java index 69e2899bd1..346ae1125a 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/timechart/TimeChartView.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/timechart/TimeChartView.java @@ -78,7 +78,7 @@ public class TimeChartView extends TmfView implements ITimeGraphRangeListener, private final int fDisplayWidth; private TimeGraphViewer fViewer; private final ArrayList fTimeAnalysisEntries = new ArrayList(); - private final Map, TimeChartDecorationProvider> fDecorationProviders = new HashMap, TimeChartDecorationProvider>(); + private final Map fDecorationProviders = new HashMap(); private ArrayList fDecorateThreads; private long fStartTime = 0; private long fStopTime = Long.MAX_VALUE; @@ -112,7 +112,7 @@ public class TimeChartView extends TmfView implements ITimeGraphRangeListener, for (IEditorReference editorReference : editorReferences) { IEditorPart editor = editorReference.getEditor(false); if (editor instanceof ITmfTraceEditor) { - ITmfTrace trace = ((ITmfTraceEditor) editor).getTrace(); + ITmfTrace trace = ((ITmfTraceEditor) editor).getTrace(); if (trace != null) { IFile bookmarksFile = ((ITmfTraceEditor) editor).getBookmarksFile(); TimeChartAnalysisEntry timeAnalysisEntry = new TimeChartAnalysisEntry(trace, fDisplayWidth * 2); @@ -161,7 +161,7 @@ public class TimeChartView extends TmfView implements ITimeGraphRangeListener, } private void updateTraceEntry(TimeChartAnalysisEntry timeAnalysisEntry, long stopRank, long startTime, long stopTime) { - ITmfTrace trace = timeAnalysisEntry.getTrace(); + ITmfTrace trace = timeAnalysisEntry.getTrace(); TimeChartDecorationProvider decorationProvider = fDecorationProviders.get(trace); if (decorationProvider == null) { return; // the trace has been closed @@ -463,7 +463,7 @@ public class TimeChartView extends TmfView implements ITimeGraphRangeListener, public void decorateEvent(TimeChartEvent timeChartEvent) { // TODO possible concurrency problem here with ItemizeJob TimeChartAnalysisEntry timeAnalysisEntry = (TimeChartAnalysisEntry) timeChartEvent.getEntry(); - ITmfTrace trace = timeAnalysisEntry.getTrace(); + ITmfTrace trace = timeAnalysisEntry.getTrace(); int priority = ColorSettingsManager.PRIORITY_NONE; boolean isBookmarked = false; boolean isVisible = false; @@ -567,14 +567,14 @@ public class TimeChartView extends TmfView implements ITimeGraphRangeListener, } @Override - public void filterApplied(ITmfFilter filter, ITmfTrace trace) { + public void filterApplied(ITmfFilter filter, ITmfTrace trace) { TimeChartDecorationProvider decorationProvider = fDecorationProviders.get(trace); decorationProvider.filterApplied(filter); redecorate(); } @Override - public void searchApplied(ITmfFilter filter, ITmfTrace trace) { + public void searchApplied(ITmfFilter filter, ITmfTrace trace) { TimeChartDecorationProvider decorationProvider = fDecorationProviders.get(trace); decorationProvider.searchApplied(filter); redecorate(); @@ -595,7 +595,7 @@ public class TimeChartView extends TmfView implements ITimeGraphRangeListener, if (fTimeAnalysisEntries == null) { return; } - final ITmfTrace trace = signal.getTrace(); + final ITmfTrace trace = signal.getTrace(); final IFile bookmarksFile = signal.getBookmarksFile(); final ITmfEventsFilterProvider eventsFilterProvider = signal.getEventsFilterProvider(); TimeChartAnalysisEntry timeAnalysisEntry = null; @@ -629,7 +629,7 @@ public class TimeChartView extends TmfView implements ITimeGraphRangeListener, if (fTimeAnalysisEntries == null) { return; } - final ITmfTrace trace = signal.getTrace(); + final ITmfTrace trace = signal.getTrace(); for (int i = 0; i < fTimeAnalysisEntries.size(); i++) { if (fTimeAnalysisEntries.get(i).getTrace().equals(trace)) { fTimeAnalysisEntries.remove(i); @@ -649,7 +649,7 @@ public class TimeChartView extends TmfView implements ITimeGraphRangeListener, @TmfSignalHandler public void traceSelected(TmfTraceSelectedSignal signal) { if (signal.getSource() != this && fTimeAnalysisEntries != null) { - ITmfTrace trace = signal.getTrace(); + ITmfTrace trace = signal.getTrace(); for (int i = 0; i < fTimeAnalysisEntries.size(); i++) { if (fTimeAnalysisEntries.get(i).getTrace().equals(trace)) { fViewer.setSelection(fTimeAnalysisEntries.get(i)); @@ -670,7 +670,7 @@ public class TimeChartView extends TmfView implements ITimeGraphRangeListener, if (fTimeAnalysisEntries == null) { return; } - final ITmfTrace trace = signal.getTrace(); + final ITmfTrace trace = signal.getTrace(); for (int i = 0; i < fTimeAnalysisEntries.size(); i++) { TimeChartAnalysisEntry timeAnalysisEntry = fTimeAnalysisEntries.get(i); if (timeAnalysisEntry.getTrace().equals(trace)) { diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/loader/TmfUml2SDSyncLoader.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/loader/TmfUml2SDSyncLoader.java index ca75216367..13503db9d2 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/loader/TmfUml2SDSyncLoader.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/loader/TmfUml2SDSyncLoader.java @@ -125,15 +125,15 @@ public class TmfUml2SDSyncLoader extends TmfComponent implements IUml2SDLoader, /** * The TMF experiment reference. */ - protected TmfExperiment fExperiment = null; + protected TmfExperiment fExperiment = null; /** * The current indexing event request. */ - protected ITmfEventRequest fIndexRequest = null; + protected ITmfEventRequest fIndexRequest = null; /** * The current request to fill a page. */ - protected ITmfEventRequest fPageRequest = null; + protected ITmfEventRequest fPageRequest = null; /** * Flag whether the time range signal was sent by this loader class or not */ @@ -249,7 +249,7 @@ public class TmfUml2SDSyncLoader extends TmfComponent implements IUml2SDLoader, */ public void waitForCompletion() { fLock.lock(); - ITmfEventRequest request = fPageRequest; + ITmfEventRequest request = fPageRequest; fLock.unlock(); if (request != null) { try { @@ -269,7 +269,7 @@ public class TmfUml2SDSyncLoader extends TmfComponent implements IUml2SDLoader, * @param signal The experiment selected signal */ @TmfSignalHandler - public void experimentSelected(TmfExperimentSelectedSignal signal) { + public void experimentSelected(TmfExperimentSelectedSignal signal) { final Job job = new IndexingJob("Indexing " + getName() + "..."); //$NON-NLS-1$ //$NON-NLS-2$ job.setUser(false); @@ -278,14 +278,14 @@ public class TmfUml2SDSyncLoader extends TmfComponent implements IUml2SDLoader, fLock.lock(); try { // Update the trace reference - TmfExperiment exp = (TmfExperiment) signal.getExperiment(); + TmfExperiment exp = signal.getExperiment(); if (!exp.equals(fExperiment)) { fExperiment = exp; } TmfTimeRange window = TmfTimeRange.ETERNITY; - fIndexRequest = new TmfEventRequest(ITmfEvent.class, window, TmfDataRequest.ALL_DATA, DEFAULT_BLOCK_SIZE, ITmfDataRequest.ExecutionType.BACKGROUND) { + fIndexRequest = new TmfEventRequest(ITmfEvent.class, window, TmfDataRequest.ALL_DATA, DEFAULT_BLOCK_SIZE, ITmfDataRequest.ExecutionType.BACKGROUND) { private ITmfTimestamp fFirstTime = null; private ITmfTimestamp fLastTime = null; @@ -392,7 +392,7 @@ public class TmfUml2SDSyncLoader extends TmfComponent implements IUml2SDLoader, * @param signal The experiment disposed signal */ @TmfSignalHandler - public void experimentDisposed(TmfExperimentDisposedSignal signal) { + public void experimentDisposed(TmfExperimentDisposedSignal signal) { if (signal.getExperiment() != TmfExperiment.getCurrentExperiment()) { return; } @@ -482,9 +482,9 @@ public class TmfUml2SDSyncLoader extends TmfComponent implements IUml2SDLoader, resetLoader(); - fExperiment = (TmfExperiment) TmfExperiment.getCurrentExperiment(); + fExperiment = TmfExperiment.getCurrentExperiment(); if (fExperiment != null) { - experimentSelected(new TmfExperimentSelectedSignal(this, fExperiment)); + experimentSelected(new TmfExperimentSelectedSignal(this, fExperiment)); } } finally { fLock.unlock(); @@ -1105,7 +1105,7 @@ public class TmfUml2SDSyncLoader extends TmfComponent implements IUml2SDLoader, window = TmfTimeRange.ETERNITY; } - fPageRequest = new TmfEventRequest(ITmfEvent.class, window, TmfDataRequest.ALL_DATA, 1, ITmfDataRequest.ExecutionType.FOREGROUND) { + fPageRequest = new TmfEventRequest(ITmfEvent.class, window, TmfDataRequest.ALL_DATA, 1, ITmfDataRequest.ExecutionType.FOREGROUND) { private final List fSdEvent = new ArrayList(); @Override @@ -1349,7 +1349,7 @@ public class TmfUml2SDSyncLoader extends TmfComponent implements IUml2SDLoader, /** * TMF event request for searching within trace. */ - protected class SearchEventRequest extends TmfEventRequest { + protected class SearchEventRequest extends TmfEventRequest { /** * The find criteria. diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/widgets/rawviewer/TmfRawEventViewer.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/widgets/rawviewer/TmfRawEventViewer.java index 2ee72aee17..9d4068f3f3 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/widgets/rawviewer/TmfRawEventViewer.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/widgets/rawviewer/TmfRawEventViewer.java @@ -1,11 +1,11 @@ /******************************************************************************* * Copyright (c) 2010, 2012 Ericsson - * + * * All rights reserved. This program and the accompanying materials are * made available under the terms of the Eclipse Public License v1.0 which * accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Patrick Tasse - Initial API and implementation ******************************************************************************/ @@ -52,7 +52,7 @@ import org.eclipse.swt.widgets.Slider; /** * TmfRawEventViewer allows for the display of the raw data for an arbitrarily * large number of TMF events. - * + * * It is essentially a Composite of a StyledText area and a Slider, where the number * of visible lines in the StyledText control is set to fill the viewer display area. * An underlying data model is used to store a cache of event raw text line data. @@ -71,20 +71,20 @@ public class TmfRawEventViewer extends Composite implements ControlListener, Sel private static final int MAX_LINE_DATA_SIZE = 1000; private static final int SLIDER_MAX = 1000000; - private ITmfTrace fTrace; + private ITmfTrace fTrace; private ITmfContext fBottomContext; - + private ScrolledComposite fScrolledComposite; private Composite fTextArea; private StyledText fStyledText; private Font fFixedFont; private Slider fSlider; - private List fLines = new ArrayList(); + private final List fLines = new ArrayList(); private boolean fActualRanks = false; private int fTopLineIndex; private int fLastTopLineIndex; - private CaretPosition[] fStoredCaretPosition = new CaretPosition[] + private final CaretPosition[] fStoredCaretPosition = new CaretPosition[] { new CaretPosition(0, 0), new CaretPosition(0,0)}; private int fNumVisibleLines; private ITmfLocation fSelectedLocation = null; @@ -119,7 +119,7 @@ public class TmfRawEventViewer extends Composite implements ControlListener, Sel this.caretOffset = caretOffset; } } - + // ------------------------------------------------------------------------ // Constructor // ------------------------------------------------------------------------ @@ -140,15 +140,15 @@ public class TmfRawEventViewer extends Composite implements ControlListener, Sel gridLayout.marginWidth = 0; gridLayout.marginHeight = 0; setLayout(gridLayout); - + // Create the controls createTextArea(style & SWT.H_SCROLL); createSlider(style & SWT.V_SCROLL); - + // Prevent the slider from being traversed setTabList(new Control[] { fScrolledComposite }); } - + @Override public void dispose() { if (fFixedFont != null) { @@ -189,11 +189,11 @@ public class TmfRawEventViewer extends Composite implements ControlListener, Sel fFixedFont = new Font(Display.getCurrent(), new FontData("Monospace", 10, SWT.NORMAL)); //$NON-NLS-1$ } } - + fStyledText = new StyledText(fTextArea, SWT.READ_ONLY); fStyledText.setFont(fFixedFont); fStyledText.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false)); - + fStyledText.addCaretListener(this); fStyledText.addMouseMoveListener(this); fStyledText.addMouseTrackListener(this); @@ -202,14 +202,14 @@ public class TmfRawEventViewer extends Composite implements ControlListener, Sel @Override public void handleEvent(Event event) { event.doit = false; }}); fStyledText.addKeyListener(this); - + fTextArea.setBackground(fStyledText.getBackground()); fTextArea.addMouseListener(new MouseAdapter() { @Override public void mouseDown(MouseEvent e) { fTextArea.setFocus(); }}); - } + } // ------------------------------------------------------------------------ // Slider handling @@ -237,7 +237,7 @@ public class TmfRawEventViewer extends Composite implements ControlListener, Sel } return isVisible; } - + @Override public void setMenu(Menu menu) { fStyledText.setMenu(menu); @@ -247,7 +247,7 @@ public class TmfRawEventViewer extends Composite implements ControlListener, Sel * Sets the trace and updates the content * @param trace The trace to set */ - public void setTrace(ITmfTrace trace) { + public void setTrace(ITmfTrace trace) { fTrace = trace; fTopLineIndex = 0; fLines.clear(); @@ -265,8 +265,10 @@ public class TmfRawEventViewer extends Composite implements ControlListener, Sel fSlider.setThumb(SLIDER_MAX); } - if (!isVisible()) return; - + if (!isVisible()) { + return; + } + if (fLines.size() == 0) { setTopRank(0); } else if (fLines.size() < fNumVisibleLines) { @@ -278,7 +280,7 @@ public class TmfRawEventViewer extends Composite implements ControlListener, Sel } } } - + /** * Selects the event of given rank and makes it visible. * @param rank The rank of event @@ -306,13 +308,16 @@ public class TmfRawEventViewer extends Composite implements ControlListener, Sel refreshLineBackgrounds(); } } + /** * Add a selection listener * @param listener A listener to add */ public void addSelectionListener(Listener listener) { checkWidget(); - if (listener == null) SWT.error (SWT.ERROR_NULL_ARGUMENT); + if (listener == null) { + SWT.error (SWT.ERROR_NULL_ARGUMENT); + } addListener (SWT.Selection, listener); } @@ -322,7 +327,9 @@ public class TmfRawEventViewer extends Composite implements ControlListener, Sel */ public void removeSelectionListener(Listener listener) { checkWidget(); - if (listener == null) SWT.error (SWT.ERROR_NULL_ARGUMENT); + if (listener == null) { + SWT.error (SWT.ERROR_NULL_ARGUMENT); + } removeListener(SWT.Selection, listener); } @@ -335,7 +342,7 @@ public class TmfRawEventViewer extends Composite implements ControlListener, Sel } notifyListeners(SWT.Selection, event); } - + private void setTopRank(long rank) { fBottomContext = fTrace.seekEvent(rank); if (fBottomContext == null) { @@ -353,7 +360,7 @@ public class TmfRawEventViewer extends Composite implements ControlListener, Sel fSlider.setSelection((int) (SLIDER_MAX * fTrace.getLocationRatio(fLines.get(fTopLineIndex).location))); } } - + private void setTopPosition(double ratio) { fBottomContext = fTrace.seekEvent(ratio); if (fBottomContext == null) { @@ -366,7 +373,7 @@ public class TmfRawEventViewer extends Composite implements ControlListener, Sel loadLineData(); refreshTextArea(); } - + private void loadLineData() { if (fTopLineIndex < 0) { //if (fLines.size() > 0 && fLines.get(0).rank > 0) { @@ -381,7 +388,7 @@ public class TmfRawEventViewer extends Composite implements ControlListener, Sel //String[] lines = event.getRawText().split("\r?\n"); //for (int i = 0; i < lines.length; i++) { //String line = lines[i]; - //LineData lineData = new LineData(rank, location, line); + //LineData lineData = new LineData(rank, location, line); //fLines.add(index++, lineData); //fTopLineIndex++; //fLastTopLineIndex++; @@ -417,7 +424,7 @@ public class TmfRawEventViewer extends Composite implements ControlListener, Sel String[] lines = event.getContent().getValue().toString().split("\r?\n"); //$NON-NLS-1$ for (int i = 0; i < lines.length; i++) { String line = lines[i]; - LineData lineData = new LineData(rank, location, line); + LineData lineData = new LineData(rank, location, line); fLines.add(index++, lineData); fTopLineIndex++; fLastTopLineIndex++; @@ -446,7 +453,7 @@ public class TmfRawEventViewer extends Composite implements ControlListener, Sel fTopLineIndex = 0; } } - + while (fLines.size() - fTopLineIndex < fNumVisibleLines) { if (fBottomContext == null) { if (fLines.size() == 0) { @@ -472,7 +479,7 @@ public class TmfRawEventViewer extends Composite implements ControlListener, Sel if ((crPos = line.indexOf('\r')) != -1) { line = line.substring(0, crPos); } - LineData lineData = new LineData(rank, location, line); + LineData lineData = new LineData(rank, location, line); fLines.add(lineData); } } else { @@ -481,7 +488,7 @@ public class TmfRawEventViewer extends Composite implements ControlListener, Sel } } fTopLineIndex = Math.max(0, Math.min(fTopLineIndex, fLines.size() - 1)); - + if (fLines.size() > MAX_LINE_DATA_SIZE) { if (fTopLineIndex < MAX_LINE_DATA_SIZE / 2) { long rank = fLines.get(MAX_LINE_DATA_SIZE - 1).rank; @@ -505,11 +512,14 @@ public class TmfRawEventViewer extends Composite implements ControlListener, Sel } } } - + private void refreshTextArea() { fStyledText.setText(""); //$NON-NLS-1$ for (int i = 0; i < fLines.size() - fTopLineIndex && i < fNumVisibleLines; i++) { - if (i > 0) fStyledText.append("\n"); //$NON-NLS-1$ + if (i > 0) + { + fStyledText.append("\n"); //$NON-NLS-1$ + } LineData lineData = fLines.get(fTopLineIndex + i); fStyledText.append(lineData.string); setLineBackground(i, lineData); @@ -522,7 +532,10 @@ public class TmfRawEventViewer extends Composite implements ControlListener, Sel private void fillTextArea() { int nextLine = fStyledText.getCharCount() == 0 ? 0 : fStyledText.getLineCount(); for (int i = nextLine; i < fLines.size() - fTopLineIndex && i < fNumVisibleLines; i++) { - if (i > 0) fStyledText.append("\n"); //$NON-NLS-1$ + if (i > 0) + { + fStyledText.append("\n"); //$NON-NLS-1$ + } LineData lineData = fLines.get(fTopLineIndex + i); fStyledText.append(lineData.string); setLineBackground(i, lineData); @@ -556,7 +569,9 @@ public class TmfRawEventViewer extends Composite implements ControlListener, Sel int length = 0; for (int i = 0; i < fTopLineIndex - fLastTopLineIndex && i < fNumVisibleLines; i++) { length += fLines.get(i + fLastTopLineIndex).string.length(); - if (i < fStyledText.getLineCount()) length += 1; + if (i < fStyledText.getLineCount()) { + length += 1; + } } fStyledText.replaceTextRange(0, length, ""); //$NON-NLS-1$ fLastTopLineIndex = fTopLineIndex; @@ -572,7 +587,7 @@ public class TmfRawEventViewer extends Composite implements ControlListener, Sel fTextArea.layout(); fScrolledComposite.setMinSize(fTextArea.computeSize(SWT.DEFAULT, SWT.DEFAULT)); } - + private void refreshLineBackgrounds() { for (int i = 0; (i < fStyledText.getLineCount()) && (i < fNumVisibleLines) && (i < fLines.size() - fTopLineIndex); i++) { LineData lineData = fLines.get(fTopLineIndex + i); @@ -600,7 +615,7 @@ public class TmfRawEventViewer extends Composite implements ControlListener, Sel fStoredCaretPosition[0] = new CaretPosition(time, caretOffset); } } - + private int getPreviousCaretOffset(int time) { if (fStoredCaretPosition[0].time == time) { return fStoredCaretPosition[1].caretOffset; @@ -631,11 +646,11 @@ public class TmfRawEventViewer extends Composite implements ControlListener, Sel } } } - + // ------------------------------------------------------------------------ // ControlListener (ScrolledComposite) // ------------------------------------------------------------------------ - + @Override public void controlResized(ControlEvent event) { int areaHeight = fScrolledComposite.getSize().y; @@ -654,11 +669,11 @@ public class TmfRawEventViewer extends Composite implements ControlListener, Sel @Override public void controlMoved(ControlEvent e) { } - + // ------------------------------------------------------------------------ // SelectionListener (Slider) // ------------------------------------------------------------------------ - + @Override public void widgetSelected(SelectionEvent e) { fTextArea.setFocus(); @@ -683,7 +698,9 @@ public class TmfRawEventViewer extends Composite implements ControlListener, Sel fLines.clear(); while (fLines.size() == 0) { setTopPosition(ratio); - if (ratio == 0.0) break; + if (ratio == 0.0) { + break; + } delta = Math.min(delta * 10, 0.1); ratio = Math.max(ratio - delta, 0.0); } @@ -734,7 +751,9 @@ public class TmfRawEventViewer extends Composite implements ControlListener, Sel fLines.clear(); while (fLines.size() == 0) { setTopPosition(ratio); - if (ratio == 0.0) break; + if (ratio == 0.0) { + break; + } delta = Math.min(delta * 10, 0.1); ratio = Math.max(ratio - delta, 0.0); } @@ -747,7 +766,7 @@ public class TmfRawEventViewer extends Composite implements ControlListener, Sel if (e.detail != SWT.NONE) { fSlider.setSelection((int) (SLIDER_MAX * fTrace.getLocationRatio(fLines.get(fTopLineIndex).location))); } - + fHoldSelection = 0; } @@ -758,7 +777,7 @@ public class TmfRawEventViewer extends Composite implements ControlListener, Sel // ------------------------------------------------------------------------ // KeyListener (StyledText) // ------------------------------------------------------------------------ - + @Override public void keyPressed(KeyEvent e) { if (fLines.size() == 0) { @@ -906,7 +925,9 @@ public class TmfRawEventViewer extends Composite implements ControlListener, Sel fLines.clear(); while (fLines.size() == 0) { setTopPosition(ratio); - if (ratio == 0.0) break; + if (ratio == 0.0) { + break; + } delta = Math.min(delta * 10, 0.1); ratio = Math.max(ratio - delta, 0.0); } @@ -933,7 +954,7 @@ public class TmfRawEventViewer extends Composite implements ControlListener, Sel // ------------------------------------------------------------------------ // CaretListener (StyledText) // ------------------------------------------------------------------------ - + @Override public void caretMoved(CaretEvent event) { if (fHoldSelection == 0) { @@ -963,7 +984,7 @@ public class TmfRawEventViewer extends Composite implements ControlListener, Sel // ------------------------------------------------------------------------ // MouseMoveListener (StyledText) // ------------------------------------------------------------------------ - + @Override public void mouseMove(MouseEvent e) { fCursorYCoordinate = e.y; @@ -993,7 +1014,7 @@ public class TmfRawEventViewer extends Composite implements ControlListener, Sel // ------------------------------------------------------------------------ // MouseTrackListener (StyledText) // ------------------------------------------------------------------------ - + @Override public void mouseExit(MouseEvent e) { fCursorYCoordinate = -1; @@ -1015,7 +1036,7 @@ public class TmfRawEventViewer extends Composite implements ControlListener, Sel // ------------------------------------------------------------------------ // MouseWheelListener (StyledText) // ------------------------------------------------------------------------ - + @Override public void mouseScrolled(MouseEvent e) { if (fLines.size() == 0) { @@ -1030,5 +1051,5 @@ public class TmfRawEventViewer extends Composite implements ControlListener, Sel updateHighlightedRank(); fSlider.setSelection((int) (SLIDER_MAX * fTrace.getLocationRatio(fLines.get(fTopLineIndex).location))); } - + } -- 2.34.1