tmf: minor clean-ups for trace analysis under experiments feature

Change-Id: I6b811575508309152a0700e4fd0c945f7782bb54
Signed-off-by: Bernd Hufmann <Bernd.Hufmann@ericsson.com>
Reviewed-on: https://git.eclipse.org/r/97476
Reviewed-by: Matthew Khouzam <matthew.khouzam@ericsson.com>
Reviewed-by: Hudson CI
Reviewed-by: Genevieve Bastien <gbastien+lttng@versatic.net>
Tested-by: Genevieve Bastien <gbastien+lttng@versatic.net>

diff --git a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/project/model/TmfCommonProjectElement.java b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/project/model/TmfCommonProjectElement.java
index 10268c9279e11985e26a7efa90099ae7b11a612f..a2818cba5b380a7edbab89707cf8f98d9ff23038 100644 (file)
--- a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/project/model/TmfCommonProjectElement.java
+++ b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/project/model/TmfCommonProjectElement.java
@@ -430,7 +430,7 @@ public abstract class TmfCommonProjectElement extends TmfProjectModelElement {
      *
      * @return Array of analysis elements
      */
-    public List<TmfAnalysisElement> getAvailableAnalysis() {
+    public List<@NonNull TmfAnalysisElement> getAvailableAnalysis() {
         return getChildElementViews().getChildren().stream()
             .map(elem -> (TmfAnalysisElement) elem)
             .collect(Collectors.toList());
@@ -440,7 +440,7 @@ public abstract class TmfCommonProjectElement extends TmfProjectModelElement {
      * @since 3.0
      * @return list of children analysis elements
      */
-    public List<TmfAnalysisElement> getChildrenAvailableAnalysis() {
+    public List<TmfAnalysisElement> getAvailableChildrenAnalyses() {
         return Collections.EMPTY_LIST;
     }
 

diff --git a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/project/model/TmfExperimentElement.java b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/project/model/TmfExperimentElement.java
index c48e7b769558053ea1b5d8b6907e67d8e7cff715..93fd2e22d3b0f80bfecd40bf4b6f6a27b4acd4f7 100644 (file)
--- a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/project/model/TmfExperimentElement.java
+++ b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/project/model/TmfExperimentElement.java
@@ -233,7 +233,7 @@ public class TmfExperimentElement extends TmfCommonProjectElement implements IPr
     }
 
     @Override
-    public List<TmfAnalysisElement> getChildrenAvailableAnalysis() {
+    public List<TmfAnalysisElement> getAvailableChildrenAnalyses() {
         List<TmfTraceElement> traces = getChildren().stream()
                         .filter(elem -> (elem instanceof TmfTraceElement))
                         .map(elem -> ((TmfTraceElement) elem).getElementUnderTraceFolder())
@@ -415,7 +415,7 @@ public class TmfExperimentElement extends TmfCommonProjectElement implements IPr
         });
 
         /* Remove all trace analyses from experiment view */
-        List<TmfAnalysisElement> analysisElements = trace.getElementUnderTraceFolder().getAvailableAnalysis();
+        List<@NonNull TmfAnalysisElement> analysisElements = trace.getElementUnderTraceFolder().getAvailableAnalysis();
         TmfViewsElement view = getChildElementViews();
 
         if (view != null) {

diff --git a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/project/model/TmfViewsElement.java b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/project/model/TmfViewsElement.java
index 368c1395d37d7f4d1f13ab7ce07727baebf4ff0e..841463fbb65d7d5ec348e8d5207e639b31aeca74 100644 (file)
--- a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/project/model/TmfViewsElement.java
+++ b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/project/model/TmfViewsElement.java
@@ -10,10 +10,8 @@
 package org.eclipse.tracecompass.tmf.ui.project.model;
 
 import java.util.HashMap;
-import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Optional;
 
 import org.eclipse.core.resources.IFolder;
 import org.eclipse.core.resources.IResource;
@@ -119,7 +117,7 @@ public class TmfViewsElement extends TmfProjectModelElement {
             }
         } else if (parent != null) {
             /* In experiment case collect trace analyses in the aggregate analyses element */
-            Map<String, TmfAggregateAnalysisElement> analysisMap = new LinkedHashMap<>();
+            Map<String, TmfAggregateAnalysisElement> analysisMap = new HashMap<>();
 
             /* Add all new analysis modules or refresh outputs of existing ones */
             for (IAnalysisModuleHelper module : TmfAnalysisManager.getAnalysisModules(traceClass).values()) {
@@ -144,8 +142,8 @@ public class TmfViewsElement extends TmfProjectModelElement {
                 analysisMap.put(analysis.getAnalysisId(), aggregateAnalysisElement);
             }
 
-            /* Now add available all trace analyses */
-            for (TmfAnalysisElement analysis : getParent().getChildrenAvailableAnalysis()) {
+            /* Now add all available trace analyses */
+            for (TmfAnalysisElement analysis : getParent().getAvailableChildrenAnalyses()) {
                 /* If the analysis is not a child of the trace, create it */
                 TmfAnalysisElement a = childrenMap.remove(analysis.getAnalysisId());
 
@@ -186,29 +184,23 @@ public class TmfViewsElement extends TmfProjectModelElement {
      *
      * @since 3.0
      */
-    public void removeChildrenAnalysis(List<TmfAnalysisElement> analysisElements) {
+    public void removeChildrenAnalysis(List<@NonNull TmfAnalysisElement> analysisElements) {
         for (TmfAnalysisElement tmfAnalysisElement : analysisElements) {
-            if (tmfAnalysisElement != null) {
-                TmfAggregateAnalysisElement aggrElement = getAggregateAnalysisElement(tmfAnalysisElement);
-                if (aggrElement != null) {
-                    aggrElement.removeAnalyses(tmfAnalysisElement);
-                    if (aggrElement.isEmpty()) {
-                        removeChild(aggrElement);
-                    }
+            TmfAggregateAnalysisElement aggrElement = getAggregateAnalysisElement(tmfAnalysisElement);
+            if (aggrElement != null) {
+                aggrElement.removeAnalyses(tmfAnalysisElement);
+                if (aggrElement.isEmpty()) {
+                    removeChild(aggrElement);
                 }
             }
         }
     }
 
     private TmfAggregateAnalysisElement getAggregateAnalysisElement(TmfAnalysisElement element) {
-        Optional<TmfAggregateAnalysisElement> aggrElem = getChildren().stream()
+        return getChildren().stream()
                 .filter(elem -> (elem instanceof TmfAggregateAnalysisElement))
                 .map(elem -> ((TmfAggregateAnalysisElement) elem))
                 .filter(elem -> elem.getAnalysisHelper().getId().equals(element.getAnalysisHelper().getId()))
-                .findFirst();
-        if (aggrElem.isPresent()) {
-            return aggrElem.get();
-        }
-        return null;
+                .findFirst().orElse(null);
     }
 }