Fix javadoc warnings

[deliverable/tracecompass.git] / org.eclipse.linuxtools.tmf.ui / src / org / eclipse / linuxtools / tmf / ui / views / statistics / TmfStatisticsView.java

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 f5e81fba55c03a870322e5bdf33fda271a9d5368..39ce34764467bf784018d7d9bd41021a546df7be 100755 (executable)
--- 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
@@ -19,14 +19,14 @@ import org.eclipse.jface.viewers.TreeViewer;
 import org.eclipse.jface.viewers.TreeViewerColumn;
 import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.jface.viewers.ViewerComparator;
-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.experiment.TmfExperiment;
 import org.eclipse.linuxtools.tmf.core.request.ITmfDataRequest;
+import org.eclipse.linuxtools.tmf.core.request.ITmfDataRequest.ExecutionType;
 import org.eclipse.linuxtools.tmf.core.request.ITmfEventRequest;
 import org.eclipse.linuxtools.tmf.core.request.TmfDataRequest;
 import org.eclipse.linuxtools.tmf.core.request.TmfEventRequest;
-import org.eclipse.linuxtools.tmf.core.request.ITmfDataRequest.ExecutionType;
 import org.eclipse.linuxtools.tmf.core.signal.TmfExperimentDisposedSignal;
 import org.eclipse.linuxtools.tmf.core.signal.TmfExperimentRangeUpdatedSignal;
 import org.eclipse.linuxtools.tmf.core.signal.TmfExperimentSelectedSignal;
@@ -79,7 +79,7 @@ public class TmfStatisticsView extends TmfView {
     // The actual tree to display
     protected TreeViewer fTreeViewer;
     // Stores the request to the experiment
-    protected ITmfEventRequest<TmfEvent> fRequest = null;
+    protected ITmfEventRequest<ITmfEvent> fRequest = null;
 
     // Update synchronization parameters (used for streaming)
     protected boolean fStatisticsUpdateBusy = false;
@@ -286,7 +286,10 @@ public class TmfStatisticsView extends TmfView {
      * @param signal
      */
     @TmfSignalHandler
-    public void experimentDisposed(TmfExperimentDisposedSignal<? extends TmfEvent> signal) {
+    public void experimentDisposed(TmfExperimentDisposedSignal<? extends ITmfEvent> signal) {
+        if (signal.getExperiment() != TmfExperiment.getCurrentExperiment()) {
+            return;
+        }
         cancelOngoingRequest();
     }
 
@@ -298,7 +301,7 @@ public class TmfStatisticsView extends TmfView {
      *            contains the information about the selection.
      */
     @TmfSignalHandler
-    public void experimentSelected(TmfExperimentSelectedSignal<? extends TmfEvent> signal) {
+    public void experimentSelected(TmfExperimentSelectedSignal<? extends ITmfEvent> signal) {
         if (signal != null) {
             TmfExperiment<?> experiment = signal.getExperiment();
             String experimentName = experiment.getName();
@@ -365,7 +368,7 @@ public class TmfStatisticsView extends TmfView {
     @SuppressWarnings("unchecked")
     @TmfSignalHandler
     public void experimentRangeUpdated(TmfExperimentRangeUpdatedSignal signal) {
-        TmfExperiment<TmfEvent> experiment = (TmfExperiment<TmfEvent>) signal.getExperiment();
+        TmfExperiment<ITmfEvent> experiment = (TmfExperiment<ITmfEvent>) signal.getExperiment();
         // validate
         if (! experiment.equals(TmfExperiment.getCurrentExperiment())) {
             return;
@@ -452,8 +455,9 @@ public class TmfStatisticsView extends TmfView {
 
     /**
      * Perform the request for an experiment and populates the statistics tree with event.
+     * 
      * @param experiment experiment for which we need the statistics data.
-     * @param time range to request
+     * @param timeRange to request
      */
     @SuppressWarnings("unchecked")
     protected void requestData(final TmfExperiment<?> experiment, TmfTimeRange timeRange) {
@@ -470,15 +474,15 @@ public class TmfStatisticsView extends TmfView {
             }
 
             // Preparation of the event request
-            fRequest = new TmfEventRequest<TmfEvent>(TmfEvent.class, timeRange, index, TmfDataRequest.ALL_DATA, getIndexPageSize(), ExecutionType.BACKGROUND) {
+            fRequest = new TmfEventRequest<ITmfEvent>(ITmfEvent.class, timeRange, index, TmfDataRequest.ALL_DATA, getIndexPageSize(), ExecutionType.BACKGROUND) {
 
                 @Override
-                public void handleData(TmfEvent data) {
+                public void handleData(ITmfEvent data) {
                     super.handleData(data);
                     if (data != null) {
                         AbsTmfStatisticsTree statisticsData = TmfStatisticsTreeRootFactory.getStatTree(getTreeID(experiment.getName()));
                         
-                        final String traceName = data.getParentTrace().getName();
+                        final String traceName = data.getTrace().getName();
                         ITmfExtraEventInfo extraInfo = new ITmfExtraEventInfo() {
                             @Override
                             public String getTraceName() {
@@ -516,7 +520,7 @@ public class TmfStatisticsView extends TmfView {
                     modelIncomplete(experiment.getName());
                 }
             };
-            ((TmfExperiment<TmfEvent>) experiment).sendRequest((ITmfDataRequest<TmfEvent>) fRequest);
+            ((TmfExperiment<ITmfEvent>) experiment).sendRequest((ITmfDataRequest<ITmfEvent>) fRequest);
             waitCursor(true);
         }
     }