Bug 539092: tmf: Fix opening of experiment from views under experiments

commit 935c0a introduced this bug that opened the trace instead of the
experiment. This was caused because the delegate was not a
TmfAggregateAnalysisElement anymore as it was before. This patch
creates a new set of TmfAnalysisOutputElement with the aggregate
element as parent when the children of the analysis element are
requested.

Change-Id: I02398977d8e1db04490f1003243e477aa0721a36
Signed-off-by: Bernd Hufmann <Bernd.Hufmann@ericsson.com>
Reviewed-on: https://git.eclipse.org/r/129388
Reviewed-by: Matthew Khouzam <matthew.khouzam@ericsson.com>
Tested-by: Matthew Khouzam <matthew.khouzam@ericsson.com>
Tested-by: CI Bot

2 files changed, 19 insertions, 3 deletions

diff --git a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/project/model/TmfAggregateAnalysisElement.java b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/project/model/TmfAggregateAnalysisElement.java
index 47f17b7c80..c30eefea63 100644
--- a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/project/model/TmfAggregateAnalysisElement.java
+++ b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/project/model/TmfAggregateAnalysisElement.java
@@ -10,7 +10,6 @@
 package org.eclipse.tracecompass.tmf.ui.project.model;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
@@ -58,6 +57,7 @@ public class TmfAggregateAnalysisElement extends TmfAnalysisElement {
         for (TmfAnalysisElement analysis : fContainedAnalyses) {
             analysis.refreshChildren();
         }
+        super.refreshChildren();
     }
 
     @Override
@@ -166,12 +166,19 @@ public class TmfAggregateAnalysisElement extends TmfAnalysisElement {
 
     @Override
     public List<ITmfProjectModelElement> getChildren() {
+        List<ITmfProjectModelElement> children = new ArrayList<>();
         for (TmfAnalysisElement analysis : fContainedAnalyses) {
             if (analysis.hasChildren()) {
-                return analysis.getChildren();
+                for (ITmfProjectModelElement output : analysis.getChildren()) {
+                    if (output instanceof TmfAnalysisOutputElement) {
+                        TmfAnalysisOutputElement newOutput = new TmfAnalysisOutputElement(output.getName(), output.getResource(), this, ((TmfAnalysisOutputElement) output).getOutput());
+                        children.add(newOutput);
+                    }
+                }
+                return children;
             }
         }
-        return Collections.emptyList();
+        return children;
     }
 
     @Override
diff --git a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/project/model/TmfAnalysisOutputElement.java b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/project/model/TmfAnalysisOutputElement.java
index 6ee604f35c..1b3eeac61b 100644
--- a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/project/model/TmfAnalysisOutputElement.java
+++ b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/project/model/TmfAnalysisOutputElement.java
@@ -85,4 +85,13 @@ public class TmfAnalysisOutputElement extends TmfProjectModelElement {
         /* Nothing to do */
     }
 
+    /**
+     * Get the {@link IAnalysisOutput} element.
+     *
+     * @return Get the {@link IAnalysisOutput} element
+     */
+    IAnalysisOutput getOutput() {
+        return fOutput;
+    }
+
 }