xml: Event field attributes retrieve aspects by name

instead of using the trace aspect directly. This allows to access global
aspects as well.

Change-Id: I5e4a3837d42510f560d0e8895670306079287ef9
Signed-off-by: Geneviève Bastien <gbastien+lttng@versatic.net>
Reviewed-on: https://git.eclipse.org/r/96902
Reviewed-by: Hudson CI
Reviewed-by: Jean-Christian Kouame <jean-christian.kouame@ericsson.com>
Tested-by: Jean-Christian Kouame <jean-christian.kouame@ericsson.com>

diff --git a/tmf/org.eclipse.tracecompass.tmf.analysis.xml.core/src/org/eclipse/tracecompass/internal/tmf/analysis/xml/core/model/TmfXmlStateAttribute.java b/tmf/org.eclipse.tracecompass.tmf.analysis.xml.core/src/org/eclipse/tracecompass/internal/tmf/analysis/xml/core/model/TmfXmlStateAttribute.java
index cbe65d464e5d224627bfbf54f51496ff7ea96629..3cc7ed37b62b4481941ae2dd88ac5770e77ca303 100644 (file)
--- a/tmf/org.eclipse.tracecompass.tmf.analysis.xml.core/src/org/eclipse/tracecompass/internal/tmf/analysis/xml/core/model/TmfXmlStateAttribute.java
+++ b/tmf/org.eclipse.tracecompass.tmf.analysis.xml.core/src/org/eclipse/tracecompass/internal/tmf/analysis/xml/core/model/TmfXmlStateAttribute.java
@@ -31,7 +31,6 @@ import org.eclipse.tracecompass.statesystem.core.statevalue.TmfStateValue;
 import org.eclipse.tracecompass.tmf.analysis.xml.core.module.TmfXmlStrings;
 import org.eclipse.tracecompass.tmf.core.event.ITmfEvent;
 import org.eclipse.tracecompass.tmf.core.event.ITmfEventField;
-import org.eclipse.tracecompass.tmf.core.event.aspect.ITmfEventAspect;
 import org.eclipse.tracecompass.tmf.core.event.aspect.TmfCpuAspect;
 import org.eclipse.tracecompass.tmf.core.trace.TmfTraceUtils;
 import org.w3c.dom.Element;
@@ -240,12 +239,7 @@ public abstract class TmfXmlStateAttribute implements ITmfXmlStateAttribute {
                         return IXmlStateSystemContainer.ERROR_QUARK;
                     }
                     /* Search between the trace event aspects */
-                    for (ITmfEventAspect<?> aspect : event.getTrace().getEventAspects()) {
-                        if (aspect.getName().equals(fName)) {
-                            fieldValue = aspect.resolve(event);
-                            break;
-                        }
-                    }
+                    fieldValue = TmfTraceUtils.resolveAspectOfNameForEvent(event.getTrace(), name, event);
                 } else {
                     fieldValue = field.getValue();
                 }

diff --git a/tmf/org.eclipse.tracecompass.tmf.analysis.xml.core/src/org/eclipse/tracecompass/internal/tmf/analysis/xml/core/model/TmfXmlStateValue.java b/tmf/org.eclipse.tracecompass.tmf.analysis.xml.core/src/org/eclipse/tracecompass/internal/tmf/analysis/xml/core/model/TmfXmlStateValue.java
index f1f5f1056da6d785cfe8ce614f8834328f302417..8edaaab63dfc0a074d4d8efa032a1f0b51109c97 100644 (file)
--- a/tmf/org.eclipse.tracecompass.tmf.analysis.xml.core/src/org/eclipse/tracecompass/internal/tmf/analysis/xml/core/model/TmfXmlStateValue.java
+++ b/tmf/org.eclipse.tracecompass.tmf.analysis.xml.core/src/org/eclipse/tracecompass/internal/tmf/analysis/xml/core/model/TmfXmlStateValue.java
@@ -30,7 +30,6 @@ import org.eclipse.tracecompass.statesystem.core.statevalue.TmfStateValue;
 import org.eclipse.tracecompass.tmf.analysis.xml.core.module.TmfXmlStrings;
 import org.eclipse.tracecompass.tmf.core.event.ITmfEvent;
 import org.eclipse.tracecompass.tmf.core.event.ITmfEventField;
-import org.eclipse.tracecompass.tmf.core.event.aspect.ITmfEventAspect;
 import org.eclipse.tracecompass.tmf.core.event.aspect.TmfCpuAspect;
 import org.eclipse.tracecompass.tmf.core.trace.TmfTraceUtils;
 import org.w3c.dom.Element;
@@ -316,12 +315,7 @@ public abstract class TmfXmlStateValue implements ITmfXmlStateValue {
                 return TmfStateValue.newValueLong(event.getTimestamp().getValue());
             }
             // This will allow to use any column as input
-            for (ITmfEventAspect<?> aspect : event.getTrace().getEventAspects()) {
-                if (aspect.getName().equals(fieldName)) {
-                    fieldValue = aspect.resolve(event);
-                    break;
-                }
-            }
+            fieldValue = TmfTraceUtils.resolveAspectOfNameForEvent(event.getTrace(), fieldName, event);
             if (fieldValue == null) {
                 return value;
             }