Monster merge from the integration branch. Still some problems left and JUnits failing.

[deliverable/tracecompass.git] / org.eclipse.linuxtools.lttng.ui / src / org / eclipse / linuxtools / lttng / ui / views / project / ProjectView.java

diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/ProjectView.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/ProjectView.java
index c76654f77e11d8dcb6e130d4b712c215f9efaf5f..ecc0eb5a47ae417ce7e0eec75115a13c359c0f43 100644 (file)
--- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/ProjectView.java
+++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/ProjectView.java
@@ -168,8 +168,11 @@ public class ProjectView extends TmfView {
         */
        public void selectExperiment(LTTngExperimentNode experiment) {
        String expId = experiment.getName();
-        if (fSelectedExperiment != null)
+        if (fSelectedExperiment != null) {
+//             System.out.println(fSelectedExperiment.getName() + ": nbEvents=" + fSelectedExperiment.getNbEvents() + 
+//                             ", nbReads=" + ((LTTngTrace) fSelectedExperiment.getTraces()[0]).nbEventsRead);
                fSelectedExperiment.dispose();
+        }
         try {
                LTTngTraceNode[] traceEntries = experiment.getTraces();
                int nbTraces = traceEntries.length;
@@ -181,7 +184,7 @@ public class ProjectView extends TmfView {
                 traces[i] = trace;
                }
             fSelectedExperiment = new TmfExperiment<LttngEvent>(LttngEvent.class, expId, traces);
-            fSelectedExperiment.indexExperiment(waitForCompletion);
+
                        // Make sure the lttng-core, experiment selection context is ready
                        // for an event request from any view
                        StateManagerFactory.getExperimentManager().experimentSelected_prep(