tmf: Add generics to ITmfEventAspect

[deliverable/tracecompass.git] / tmf / org.eclipse.tracecompass.tmf.core / src / org / eclipse / tracecompass / internal / tmf / core / parsers / custom / CustomEventAspects.java

diff --git a/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/internal/tmf/core/parsers/custom/CustomEventAspects.java b/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/internal/tmf/core/parsers/custom/CustomEventAspects.java
index a0b97dffae23a5e09a8a2deb310aff5d621807f2..b9f38e3a3b607809a5965d0ed49486858ec3e46d 100644 (file)
--- a/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/internal/tmf/core/parsers/custom/CustomEventAspects.java
+++ b/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/internal/tmf/core/parsers/custom/CustomEventAspects.java
@@ -42,7 +42,7 @@ public class CustomEventAspects {
      * Aspects for custom events, which use an integer ID to represent each
      * field.
      */
-    private static final class CustomEventFieldAspect implements ITmfEventAspect {
+    private static final class CustomEventFieldAspect implements ITmfEventAspect<String> {
 
         private final @NonNull String fName;
         private final int fIndex;
@@ -87,8 +87,8 @@ public class CustomEventAspects {
      *            want the aspects
      * @return The set of event aspects for the given trace
      */
-    public static @NonNull Iterable<ITmfEventAspect> generateAspects(CustomTraceDefinition definition) {
-        ImmutableList.Builder<ITmfEventAspect> builder = new ImmutableList.Builder<>();
+    public static @NonNull Iterable<ITmfEventAspect<?>> generateAspects(CustomTraceDefinition definition) {
+        ImmutableList.Builder<ITmfEventAspect<?>> builder = new ImmutableList.Builder<>();
         List<OutputColumn> outputs = definition.outputs;
         for (int i = 0; i < outputs.size(); i++) {
             String name = outputs.get(i).name;