From: Alexandre Montplaisir
Date: Wed, 30 Mar 2016 23:31:45 +0000 (-0400)
Subject: tmf: Add generics to ITmfEventAspect
X-Git-Url: http://git.efficios.com/?a=commitdiff_plain;h=ec48d2485a49a69bee11d82dd7054f53692e5686;p=deliverable%2Ftracecompass.git
tmf: Add generics to ITmfEventAspect
The generic type can allow us to define the type of
the resolve() method's return value.
Change-Id: Id9bb9ddaf143fa6b3ed09bf32eab98e1718e7ee3
Signed-off-by: Alexandre Montplaisir
Reviewed-on: https://git.eclipse.org/r/69569
Reviewed-by: Hudson CI
Reviewed-by: Patrick Tasse
Tested-by: Patrick Tasse
---
diff --git a/analysis/org.eclipse.tracecompass.analysis.os.linux.core.tests/stubs/org/eclipse/tracecompass/analysis/os/linux/core/tests/stubs/trace/TmfXmlKernelTraceStub.java b/analysis/org.eclipse.tracecompass.analysis.os.linux.core.tests/stubs/org/eclipse/tracecompass/analysis/os/linux/core/tests/stubs/trace/TmfXmlKernelTraceStub.java
index b5a53886f0..0a158deda7 100644
--- a/analysis/org.eclipse.tracecompass.analysis.os.linux.core.tests/stubs/org/eclipse/tracecompass/analysis/os/linux/core/tests/stubs/trace/TmfXmlKernelTraceStub.java
+++ b/analysis/org.eclipse.tracecompass.analysis.os.linux.core.tests/stubs/org/eclipse/tracecompass/analysis/os/linux/core/tests/stubs/trace/TmfXmlKernelTraceStub.java
@@ -49,12 +49,12 @@ public class TmfXmlKernelTraceStub extends TmfXmlTraceStub implements IKernelTra
}
@Override
- public Iterable getEventAspects() {
+ public Iterable> getEventAspects() {
/*
* This method needs to fill the aspects dynamically because aspects in
* the parent class are not all present at the beginning of the trace
*/
- ImmutableSet.Builder builder = ImmutableSet.builder();
+ ImmutableSet.Builder> builder = ImmutableSet.builder();
builder.addAll(super.getEventAspects());
builder.add(KernelTidAspect.INSTANCE);
builder.add(ThreadPriorityAspect.INSTANCE);
diff --git a/analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/analysis/os/linux/core/event/aspect/LinuxTidAspect.java b/analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/analysis/os/linux/core/event/aspect/LinuxTidAspect.java
index 4f8fbfd3d0..c63a854e91 100644
--- a/analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/analysis/os/linux/core/event/aspect/LinuxTidAspect.java
+++ b/analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/analysis/os/linux/core/event/aspect/LinuxTidAspect.java
@@ -23,7 +23,7 @@ import org.eclipse.tracecompass.tmf.core.event.aspect.ITmfEventAspect;
* @author Geneviève Bastien
* @since 1.0
*/
-public abstract class LinuxTidAspect implements ITmfEventAspect {
+public abstract class LinuxTidAspect implements ITmfEventAspect {
@Override
public final String getName() {
diff --git a/analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/analysis/os/linux/core/event/aspect/ThreadPriorityAspect.java b/analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/analysis/os/linux/core/event/aspect/ThreadPriorityAspect.java
index 9702577776..50578b51a7 100644
--- a/analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/analysis/os/linux/core/event/aspect/ThreadPriorityAspect.java
+++ b/analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/analysis/os/linux/core/event/aspect/ThreadPriorityAspect.java
@@ -37,7 +37,7 @@ import org.eclipse.tracecompass.tmf.core.trace.TmfTraceUtils;
* @author Christian Mansky
* @since 2.0
*/
-public final class ThreadPriorityAspect implements ITmfEventAspect {
+public final class ThreadPriorityAspect implements ITmfEventAspect {
/** The singleton instance */
public static final ThreadPriorityAspect INSTANCE = new ThreadPriorityAspect();
diff --git a/btf/org.eclipse.tracecompass.btf.core/src/org/eclipse/tracecompass/btf/core/trace/BtfEventAspects.java b/btf/org.eclipse.tracecompass.btf.core/src/org/eclipse/tracecompass/btf/core/trace/BtfEventAspects.java
index e14a70305b..49a6bff891 100644
--- a/btf/org.eclipse.tracecompass.btf.core/src/org/eclipse/tracecompass/btf/core/trace/BtfEventAspects.java
+++ b/btf/org.eclipse.tracecompass.btf.core/src/org/eclipse/tracecompass/btf/core/trace/BtfEventAspects.java
@@ -33,7 +33,7 @@ public final class BtfEventAspects {
private BtfEventAspects() {}
- private static final Iterable BTF_ASPECTS =
+ private static final Iterable> BTF_ASPECTS =
ImmutableList.of(
ITmfEventAspect.BaseAspects.TIMESTAMP,
new BtfSourceAspect(),
@@ -48,7 +48,7 @@ public final class BtfEventAspects {
/**
* The "source" aspect, whose value comes from {@link ITmfEvent#getSource()}
*/
- private static class BtfSourceAspect implements ITmfEventAspect {
+ private static class BtfSourceAspect implements ITmfEventAspect {
@Override
public String getName() {
@@ -74,7 +74,7 @@ public final class BtfEventAspects {
* The "target" aspect, taking its value from
* {@link ITmfEvent#getTarget()}.
*/
- private static class BtfTargetAspect implements ITmfEventAspect {
+ private static class BtfTargetAspect implements ITmfEventAspect {
@Override
public String getName() {
@@ -101,7 +101,7 @@ public final class BtfEventAspects {
*
* @return The aspects
*/
- public static Iterable getAspects() {
+ public static Iterable> getAspects() {
return BTF_ASPECTS;
}
}
\ No newline at end of file
diff --git a/btf/org.eclipse.tracecompass.btf.core/src/org/eclipse/tracecompass/btf/core/trace/BtfTrace.java b/btf/org.eclipse.tracecompass.btf.core/src/org/eclipse/tracecompass/btf/core/trace/BtfTrace.java
index 3f45414a82..b881b9bb21 100644
--- a/btf/org.eclipse.tracecompass.btf.core/src/org/eclipse/tracecompass/btf/core/trace/BtfTrace.java
+++ b/btf/org.eclipse.tracecompass.btf.core/src/org/eclipse/tracecompass/btf/core/trace/BtfTrace.java
@@ -480,7 +480,7 @@ public class BtfTrace extends TmfTrace implements ITmfPersistentlyIndexable, ITm
}
@Override
- public Iterable getEventAspects() {
+ public Iterable> getEventAspects() {
return BtfEventAspects.getAspects();
}
diff --git a/ctf/org.eclipse.tracecompass.tmf.ctf.core/src/org/eclipse/tracecompass/tmf/ctf/core/event/aspect/CtfChannelAspect.java b/ctf/org.eclipse.tracecompass.tmf.ctf.core/src/org/eclipse/tracecompass/tmf/ctf/core/event/aspect/CtfChannelAspect.java
index 1e4a8b8824..badab5f5a4 100644
--- a/ctf/org.eclipse.tracecompass.tmf.ctf.core/src/org/eclipse/tracecompass/tmf/ctf/core/event/aspect/CtfChannelAspect.java
+++ b/ctf/org.eclipse.tracecompass.tmf.ctf.core/src/org/eclipse/tracecompass/tmf/ctf/core/event/aspect/CtfChannelAspect.java
@@ -21,7 +21,7 @@ import org.eclipse.tracecompass.tmf.ctf.core.event.CtfTmfEvent;
*
* @author Alexandre Montplaisir
*/
-public class CtfChannelAspect implements ITmfEventAspect {
+public class CtfChannelAspect implements ITmfEventAspect {
@Override
public String getName() {
diff --git a/ctf/org.eclipse.tracecompass.tmf.ctf.core/src/org/eclipse/tracecompass/tmf/ctf/core/trace/CtfTmfTrace.java b/ctf/org.eclipse.tracecompass.tmf.ctf.core/src/org/eclipse/tracecompass/tmf/ctf/core/trace/CtfTmfTrace.java
index 76591c6989..57c02e3949 100644
--- a/ctf/org.eclipse.tracecompass.tmf.ctf.core/src/org/eclipse/tracecompass/tmf/ctf/core/trace/CtfTmfTrace.java
+++ b/ctf/org.eclipse.tracecompass.tmf.ctf.core/src/org/eclipse/tracecompass/tmf/ctf/core/trace/CtfTmfTrace.java
@@ -103,7 +103,7 @@ public class CtfTmfTrace extends TmfTrace
* Event aspects available for all CTF traces
* @since 1.0
*/
- protected static final @NonNull Collection<@NonNull ITmfEventAspect> CTF_ASPECTS =
+ protected static final @NonNull Collection<@NonNull ITmfEventAspect>> CTF_ASPECTS =
ImmutableList.of(
ITmfEventAspect.BaseAspects.TIMESTAMP,
new CtfChannelAspect(),
@@ -297,7 +297,7 @@ public class CtfTmfTrace extends TmfTrace
}
@Override
- public Iterable getEventAspects() {
+ public Iterable> getEventAspects() {
return CTF_ASPECTS;
}
diff --git a/gdbtrace/org.eclipse.tracecompass.gdbtrace.core/src/org/eclipse/tracecompass/internal/gdbtrace/core/trace/GdbEventAspects.java b/gdbtrace/org.eclipse.tracecompass.gdbtrace.core/src/org/eclipse/tracecompass/internal/gdbtrace/core/trace/GdbEventAspects.java
index 188c14bd48..c61284ae2f 100644
--- a/gdbtrace/org.eclipse.tracecompass.gdbtrace.core/src/org/eclipse/tracecompass/internal/gdbtrace/core/trace/GdbEventAspects.java
+++ b/gdbtrace/org.eclipse.tracecompass.gdbtrace.core/src/org/eclipse/tracecompass/internal/gdbtrace/core/trace/GdbEventAspects.java
@@ -31,7 +31,7 @@ public final class GdbEventAspects {
private GdbEventAspects() {}
- private static final @NonNull Iterable GDB_ASPECTS =
+ private static final @NonNull Iterable> GDB_ASPECTS =
ImmutableList.of(
new TmfContentFieldAspect(GdbTraceEventContent.TRACE_FRAME, GdbTraceEventContent.TRACE_FRAME),
new TmfContentFieldAspect(GdbTraceEventContent.TRACEPOINT, GdbTraceEventContent.TRACEPOINT),
@@ -39,7 +39,7 @@ public final class GdbEventAspects {
ITmfEventAspect.BaseAspects.CONTENTS
);
- private static class GdbFileAspect implements ITmfEventAspect {
+ private static class GdbFileAspect implements ITmfEventAspect {
@Override
public String getName() {
@@ -66,7 +66,7 @@ public final class GdbEventAspects {
*
* @return The set of aspects
*/
- public static @NonNull Iterable getAspects() {
+ public static @NonNull Iterable> getAspects() {
return GDB_ASPECTS;
}
}
diff --git a/gdbtrace/org.eclipse.tracecompass.gdbtrace.core/src/org/eclipse/tracecompass/internal/gdbtrace/core/trace/GdbTrace.java b/gdbtrace/org.eclipse.tracecompass.gdbtrace.core/src/org/eclipse/tracecompass/internal/gdbtrace/core/trace/GdbTrace.java
index 36d336f923..f29fee6a81 100644
--- a/gdbtrace/org.eclipse.tracecompass.gdbtrace.core/src/org/eclipse/tracecompass/internal/gdbtrace/core/trace/GdbTrace.java
+++ b/gdbtrace/org.eclipse.tracecompass.gdbtrace.core/src/org/eclipse/tracecompass/internal/gdbtrace/core/trace/GdbTrace.java
@@ -165,7 +165,7 @@ public class GdbTrace extends TmfTrace {
// ------------------------------------------------------------------------
@Override
- public Iterable getEventAspects() {
+ public Iterable> getEventAspects() {
return GdbEventAspects.getAspects();
}
diff --git a/lttng/org.eclipse.tracecompass.lttng2.kernel.core/src/org/eclipse/tracecompass/lttng2/kernel/core/trace/LttngKernelTrace.java b/lttng/org.eclipse.tracecompass.lttng2.kernel.core/src/org/eclipse/tracecompass/lttng2/kernel/core/trace/LttngKernelTrace.java
index 949497d849..84b3a4f9d9 100644
--- a/lttng/org.eclipse.tracecompass.lttng2.kernel.core/src/org/eclipse/tracecompass/lttng2/kernel/core/trace/LttngKernelTrace.java
+++ b/lttng/org.eclipse.tracecompass.lttng2.kernel.core/src/org/eclipse/tracecompass/lttng2/kernel/core/trace/LttngKernelTrace.java
@@ -71,10 +71,10 @@ public class LttngKernelTrace extends CtfTmfTrace implements IKernelTrace {
/**
* Event aspects available for all Lttng Kernel traces
*/
- private static final @NonNull Collection LTTNG_KERNEL_ASPECTS;
+ private static final @NonNull Collection> LTTNG_KERNEL_ASPECTS;
static {
- ImmutableSet.Builder builder = ImmutableSet.builder();
+ ImmutableSet.Builder> builder = ImmutableSet.builder();
builder.addAll(CtfTmfTrace.CTF_ASPECTS);
builder.add(KernelTidAspect.INSTANCE);
builder.add(ThreadPriorityAspect.INSTANCE);
@@ -163,7 +163,7 @@ public class LttngKernelTrace extends CtfTmfTrace implements IKernelTrace {
}
@Override
- public Iterable getEventAspects() {
+ public Iterable> getEventAspects() {
return LTTNG_KERNEL_ASPECTS;
}
diff --git a/lttng/org.eclipse.tracecompass.lttng2.ust.core/src/org/eclipse/tracecompass/lttng2/ust/core/analysis/debuginfo/UstDebugInfoBinaryAspect.java b/lttng/org.eclipse.tracecompass.lttng2.ust.core/src/org/eclipse/tracecompass/lttng2/ust/core/analysis/debuginfo/UstDebugInfoBinaryAspect.java
index 9812c714b9..c2fc6206bb 100644
--- a/lttng/org.eclipse.tracecompass.lttng2.ust.core/src/org/eclipse/tracecompass/lttng2/ust/core/analysis/debuginfo/UstDebugInfoBinaryAspect.java
+++ b/lttng/org.eclipse.tracecompass.lttng2.ust.core/src/org/eclipse/tracecompass/lttng2/ust/core/analysis/debuginfo/UstDebugInfoBinaryAspect.java
@@ -30,7 +30,7 @@ import org.eclipse.tracecompass.tmf.core.trace.TmfTraceUtils;
* @author Alexandre Montplaisir
* @since 2.0
*/
-public class UstDebugInfoBinaryAspect implements ITmfEventAspect {
+public class UstDebugInfoBinaryAspect implements ITmfEventAspect {
/** Singleton instance */
public static final UstDebugInfoBinaryAspect INSTANCE = new UstDebugInfoBinaryAspect();
diff --git a/lttng/org.eclipse.tracecompass.lttng2.ust.core/src/org/eclipse/tracecompass/lttng2/ust/core/analysis/debuginfo/UstDebugInfoSourceAspect.java b/lttng/org.eclipse.tracecompass.lttng2.ust.core/src/org/eclipse/tracecompass/lttng2/ust/core/analysis/debuginfo/UstDebugInfoSourceAspect.java
index 15afdd0a5e..8f947bcf80 100644
--- a/lttng/org.eclipse.tracecompass.lttng2.ust.core/src/org/eclipse/tracecompass/lttng2/ust/core/analysis/debuginfo/UstDebugInfoSourceAspect.java
+++ b/lttng/org.eclipse.tracecompass.lttng2.ust.core/src/org/eclipse/tracecompass/lttng2/ust/core/analysis/debuginfo/UstDebugInfoSourceAspect.java
@@ -29,7 +29,7 @@ import com.google.common.collect.Iterables;
* @author Alexandre Montplaisir
* @since 2.0
*/
-public class UstDebugInfoSourceAspect implements ITmfEventAspect {
+public class UstDebugInfoSourceAspect implements ITmfEventAspect {
/** Singleton instance */
public static final UstDebugInfoSourceAspect INSTANCE = new UstDebugInfoSourceAspect();
diff --git a/lttng/org.eclipse.tracecompass.lttng2.ust.core/src/org/eclipse/tracecompass/lttng2/ust/core/trace/LttngUstTrace.java b/lttng/org.eclipse.tracecompass.lttng2.ust.core/src/org/eclipse/tracecompass/lttng2/ust/core/trace/LttngUstTrace.java
index 6e9345cd4c..32bf54e99e 100644
--- a/lttng/org.eclipse.tracecompass.lttng2.ust.core/src/org/eclipse/tracecompass/lttng2/ust/core/trace/LttngUstTrace.java
+++ b/lttng/org.eclipse.tracecompass.lttng2.ust.core/src/org/eclipse/tracecompass/lttng2/ust/core/trace/LttngUstTrace.java
@@ -57,10 +57,10 @@ public class LttngUstTrace extends CtfTmfTrace {
private static final int CONFIDENCE = 100;
- private static final @NonNull Collection LTTNG_UST_ASPECTS;
+ private static final @NonNull Collection> LTTNG_UST_ASPECTS;
static {
- ImmutableSet.Builder builder = ImmutableSet.builder();
+ ImmutableSet.Builder> builder = ImmutableSet.builder();
builder.addAll(CtfTmfTrace.CTF_ASPECTS);
builder.add(UstDebugInfoBinaryAspect.INSTANCE);
builder.add(UstDebugInfoSourceAspect.INSTANCE);
@@ -121,7 +121,7 @@ public class LttngUstTrace extends CtfTmfTrace {
}
@Override
- public Iterable getEventAspects() {
+ public Iterable> getEventAspects() {
return LTTNG_UST_ASPECTS;
}
diff --git a/pcap/org.eclipse.tracecompass.tmf.pcap.core/src/org/eclipse/tracecompass/internal/tmf/pcap/core/event/aspect/PcapDestinationAspect.java b/pcap/org.eclipse.tracecompass.tmf.pcap.core/src/org/eclipse/tracecompass/internal/tmf/pcap/core/event/aspect/PcapDestinationAspect.java
index ee73270921..f25e13d3e7 100644
--- a/pcap/org.eclipse.tracecompass.tmf.pcap.core/src/org/eclipse/tracecompass/internal/tmf/pcap/core/event/aspect/PcapDestinationAspect.java
+++ b/pcap/org.eclipse.tracecompass.tmf.pcap.core/src/org/eclipse/tracecompass/internal/tmf/pcap/core/event/aspect/PcapDestinationAspect.java
@@ -25,7 +25,7 @@ import org.eclipse.tracecompass.tmf.core.event.aspect.ITmfEventAspect;
*
* @author Alexandre Montplaisir
*/
-public class PcapDestinationAspect implements ITmfEventAspect {
+public class PcapDestinationAspect implements ITmfEventAspect {
/** Singleton instance */
public static final PcapDestinationAspect INSTANCE = new PcapDestinationAspect();
diff --git a/pcap/org.eclipse.tracecompass.tmf.pcap.core/src/org/eclipse/tracecompass/internal/tmf/pcap/core/event/aspect/PcapProtocolAspect.java b/pcap/org.eclipse.tracecompass.tmf.pcap.core/src/org/eclipse/tracecompass/internal/tmf/pcap/core/event/aspect/PcapProtocolAspect.java
index 31bf56afca..304a240195 100644
--- a/pcap/org.eclipse.tracecompass.tmf.pcap.core/src/org/eclipse/tracecompass/internal/tmf/pcap/core/event/aspect/PcapProtocolAspect.java
+++ b/pcap/org.eclipse.tracecompass.tmf.pcap.core/src/org/eclipse/tracecompass/internal/tmf/pcap/core/event/aspect/PcapProtocolAspect.java
@@ -25,7 +25,7 @@ import org.eclipse.tracecompass.tmf.core.event.aspect.ITmfEventAspect;
*
* @author Alexandre Montplaisir
*/
-public class PcapProtocolAspect implements ITmfEventAspect {
+public class PcapProtocolAspect implements ITmfEventAspect {
/** Singleton instance */
public static final PcapProtocolAspect INSTANCE = new PcapProtocolAspect();
diff --git a/pcap/org.eclipse.tracecompass.tmf.pcap.core/src/org/eclipse/tracecompass/internal/tmf/pcap/core/event/aspect/PcapReferenceAspect.java b/pcap/org.eclipse.tracecompass.tmf.pcap.core/src/org/eclipse/tracecompass/internal/tmf/pcap/core/event/aspect/PcapReferenceAspect.java
index 043235898a..032c3f2711 100644
--- a/pcap/org.eclipse.tracecompass.tmf.pcap.core/src/org/eclipse/tracecompass/internal/tmf/pcap/core/event/aspect/PcapReferenceAspect.java
+++ b/pcap/org.eclipse.tracecompass.tmf.pcap.core/src/org/eclipse/tracecompass/internal/tmf/pcap/core/event/aspect/PcapReferenceAspect.java
@@ -24,7 +24,7 @@ import org.eclipse.tracecompass.tmf.core.event.aspect.ITmfEventAspect;
*
* @author Alexandre Montplaisir
*/
-public class PcapReferenceAspect implements ITmfEventAspect {
+public class PcapReferenceAspect implements ITmfEventAspect {
/** Singleton instance */
public static final PcapReferenceAspect INSTANCE = new PcapReferenceAspect();
diff --git a/pcap/org.eclipse.tracecompass.tmf.pcap.core/src/org/eclipse/tracecompass/internal/tmf/pcap/core/event/aspect/PcapSourceAspect.java b/pcap/org.eclipse.tracecompass.tmf.pcap.core/src/org/eclipse/tracecompass/internal/tmf/pcap/core/event/aspect/PcapSourceAspect.java
index 7732d5fd64..e43d116dbc 100644
--- a/pcap/org.eclipse.tracecompass.tmf.pcap.core/src/org/eclipse/tracecompass/internal/tmf/pcap/core/event/aspect/PcapSourceAspect.java
+++ b/pcap/org.eclipse.tracecompass.tmf.pcap.core/src/org/eclipse/tracecompass/internal/tmf/pcap/core/event/aspect/PcapSourceAspect.java
@@ -28,7 +28,7 @@ import org.eclipse.tracecompass.tmf.core.event.aspect.ITmfEventAspect;
*
* @author Alexandre Montplaisir
*/
-public class PcapSourceAspect implements ITmfEventAspect {
+public class PcapSourceAspect implements ITmfEventAspect {
/** Singleton instance */
public static final PcapSourceAspect INSTANCE = new PcapSourceAspect();
diff --git a/pcap/org.eclipse.tracecompass.tmf.pcap.core/src/org/eclipse/tracecompass/internal/tmf/pcap/core/trace/PcapTrace.java b/pcap/org.eclipse.tracecompass.tmf.pcap.core/src/org/eclipse/tracecompass/internal/tmf/pcap/core/trace/PcapTrace.java
index 624334cf82..277f8b89d4 100644
--- a/pcap/org.eclipse.tracecompass.tmf.pcap.core/src/org/eclipse/tracecompass/internal/tmf/pcap/core/trace/PcapTrace.java
+++ b/pcap/org.eclipse.tracecompass.tmf.pcap.core/src/org/eclipse/tracecompass/internal/tmf/pcap/core/trace/PcapTrace.java
@@ -69,7 +69,7 @@ public class PcapTrace extends TmfTrace implements ITmfPropertiesProvider {
/** pcap trace type id as defined in plugin.xml */
public static final String TRACE_TYPE_ID = "org.eclipse.linuxtools.tmf.pcap.core.pcaptrace"; //$NON-NLS-1$
- private static final Collection PCAP_ASPECTS =
+ private static final Collection> PCAP_ASPECTS =
ImmutableList.of(
ITmfEventAspect.BaseAspects.TIMESTAMP,
PcapSourceAspect.INSTANCE,
@@ -128,7 +128,7 @@ public class PcapTrace extends TmfTrace implements ITmfPropertiesProvider {
}
@Override
- public Iterable getEventAspects() {
+ public Iterable> getEventAspects() {
return PCAP_ASPECTS;
}
diff --git a/tmf/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/trace/TmfTraceTest.java b/tmf/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/trace/TmfTraceTest.java
index 29cabe658d..1b0006aaf8 100644
--- a/tmf/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/trace/TmfTraceTest.java
+++ b/tmf/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/trace/TmfTraceTest.java
@@ -1415,8 +1415,8 @@ public class TmfTraceTest {
*/
@Test
public void testGetEventAspects() {
- Iterable aspects = fTrace.getEventAspects();
- for (ITmfEventAspect aspect : aspects) {
+ Iterable> aspects = fTrace.getEventAspects();
+ for (ITmfEventAspect> aspect : aspects) {
assertTrue(TmfTrace.BASE_ASPECTS.contains(aspect));
}
}
diff --git a/tmf/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/trace/TmfTraceUtilsTest.java b/tmf/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/trace/TmfTraceUtilsTest.java
index ba66c7bfd3..719ef25aaf 100644
--- a/tmf/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/trace/TmfTraceUtilsTest.java
+++ b/tmf/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/trace/TmfTraceUtilsTest.java
@@ -63,9 +63,9 @@ public class TmfTraceUtilsTest {
private static class TmfTraceStubWithAspects extends TmfTraceStub {
- private static final @NonNull Collection EVENT_ASPECTS;
+ private static final @NonNull Collection> EVENT_ASPECTS;
static {
- ImmutableList.Builder builder = ImmutableList.builder();
+ ImmutableList.Builder> builder = ImmutableList.builder();
builder.add(new TmfCpuAspect() {
@Override
public Integer resolve(ITmfEvent event) {
@@ -81,7 +81,7 @@ public class TmfTraceUtilsTest {
}
@Override
- public Iterable getEventAspects() {
+ public Iterable> getEventAspects() {
return EVENT_ASPECTS;
}
diff --git a/tmf/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/trace/stub/XmlStubTraceTest.java b/tmf/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/trace/stub/XmlStubTraceTest.java
index b171c51143..d3abb8c227 100644
--- a/tmf/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/trace/stub/XmlStubTraceTest.java
+++ b/tmf/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/trace/stub/XmlStubTraceTest.java
@@ -145,10 +145,10 @@ public class XmlStubTraceTest {
fail(e1.getMessage());
}
- ITmfEventAspect cpuAspect = null;
- ITmfEventAspect testAspect = null;
+ ITmfEventAspect> cpuAspect = null;
+ ITmfEventAspect> testAspect = null;
int aspectCount = 0;
- for (ITmfEventAspect aspect : trace.getEventAspects()) {
+ for (ITmfEventAspect> aspect : trace.getEventAspects()) {
aspectCount++;
if (aspect instanceof TmfCpuAspect) {
cpuAspect = aspect;
diff --git a/tmf/org.eclipse.tracecompass.tmf.core.tests/stubs/org/eclipse/tracecompass/tmf/tests/stubs/trace/text/SyslogTrace.java b/tmf/org.eclipse.tracecompass.tmf.core.tests/stubs/org/eclipse/tracecompass/tmf/tests/stubs/trace/text/SyslogTrace.java
index 68547d4bb0..b5df50009e 100644
--- a/tmf/org.eclipse.tracecompass.tmf.core.tests/stubs/org/eclipse/tracecompass/tmf/tests/stubs/trace/text/SyslogTrace.java
+++ b/tmf/org.eclipse.tracecompass.tmf.core.tests/stubs/org/eclipse/tracecompass/tmf/tests/stubs/trace/text/SyslogTrace.java
@@ -64,7 +64,7 @@ public class SyslogTrace extends TextTrace {
}
/** The event aspects */
- public static final @NonNull Collection ASPECTS =
+ public static final @NonNull Collection> ASPECTS =
ImmutableList.of(
ITmfEventAspect.BaseAspects.TIMESTAMP,
new TmfContentFieldAspect(Field.HOST, Field.HOST),
@@ -140,7 +140,7 @@ public class SyslogTrace extends TextTrace {
}
@Override
- public Iterable getEventAspects() {
+ public Iterable> getEventAspects() {
return ASPECTS;
}
}
diff --git a/tmf/org.eclipse.tracecompass.tmf.core.tests/stubs/org/eclipse/tracecompass/tmf/tests/stubs/trace/xml/TmfXmlTraceStub.java b/tmf/org.eclipse.tracecompass.tmf.core.tests/stubs/org/eclipse/tracecompass/tmf/tests/stubs/trace/xml/TmfXmlTraceStub.java
index 1477160a08..ccb079d1a7 100644
--- a/tmf/org.eclipse.tracecompass.tmf.core.tests/stubs/org/eclipse/tracecompass/tmf/tests/stubs/trace/xml/TmfXmlTraceStub.java
+++ b/tmf/org.eclipse.tracecompass.tmf.core.tests/stubs/org/eclipse/tracecompass/tmf/tests/stubs/trace/xml/TmfXmlTraceStub.java
@@ -99,8 +99,8 @@ public class TmfXmlTraceStub extends TmfTrace {
private final CustomXmlTraceDefinition fDefinition;
private CustomXmlTrace fTrace;
- private Collection fAspects = TmfTrace.BASE_ASPECTS;
- private final Collection fAdditionalAspects = new HashSet<>();
+ private Collection> fAspects = TmfTrace.BASE_ASPECTS;
+ private final Collection> fAdditionalAspects = new HashSet<>();
/**
* Constructor. Constructs the custom XML trace with the appropriate
@@ -322,7 +322,7 @@ public class TmfXmlTraceStub extends TmfTrace {
}
private void generateAspects(ITmfEventField[] fieldsArray) {
- ImmutableList.Builder builder = new ImmutableList.Builder<>();
+ ImmutableList.Builder> builder = new ImmutableList.Builder<>();
/* Initialize the first default trace aspects */
builder.add(ITmfEventAspect.BaseAspects.TIMESTAMP);
@@ -331,7 +331,7 @@ public class TmfXmlTraceStub extends TmfTrace {
/* Add custom aspects in between */
for (ITmfEventField field : fieldsArray) {
String name = field.getName();
- final ITmfEventAspect aspect = new TmfContentFieldAspect(name, name);
+ final ITmfEventAspect> aspect = new TmfContentFieldAspect(name, name);
if (name.equals(ASPECT_CPU)) {
builder.add(new TmfCpuAspect() {
@Override
@@ -356,7 +356,7 @@ public class TmfXmlTraceStub extends TmfTrace {
}
@Override
- public Iterable getEventAspects() {
+ public Iterable> getEventAspects() {
return fAspects;
}
@@ -371,7 +371,7 @@ public class TmfXmlTraceStub extends TmfTrace {
* @param aspect
* The aspect to have
*/
- public void addEventAspect(ITmfEventAspect aspect) {
+ public void addEventAspect(ITmfEventAspect> aspect) {
fAdditionalAspects.add(aspect);
}
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 a0b97dffae..b9f38e3a3b 100644
--- 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 {
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 generateAspects(CustomTraceDefinition definition) {
- ImmutableList.Builder builder = new ImmutableList.Builder<>();
+ public static @NonNull Iterable> generateAspects(CustomTraceDefinition definition) {
+ ImmutableList.Builder> builder = new ImmutableList.Builder<>();
List outputs = definition.outputs;
for (int i = 0; i < outputs.size(); i++) {
String name = outputs.get(i).name;
diff --git a/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/event/aspect/ITmfEventAspect.java b/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/event/aspect/ITmfEventAspect.java
index 7fa0fe1942..314f8ab011 100644
--- a/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/event/aspect/ITmfEventAspect.java
+++ b/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/event/aspect/ITmfEventAspect.java
@@ -34,8 +34,9 @@ import com.google.common.collect.ImmutableList;
* on to only keep certain events, to plot XY charts, etc.
*
* @author Alexandre Montplaisir
+ * @param Type of the return value of the {@link #resolve} method
*/
-public interface ITmfEventAspect {
+public interface ITmfEventAspect {
/**
* Static definition of an empty string. You can use this instead of 'null'!
@@ -45,7 +46,7 @@ public interface ITmfEventAspect {
/**
* List of all common base aspects
*/
- public static final List BASE_ASPECTS =
+ public static final List> BASE_ASPECTS =
ImmutableList.of(
BaseAspects.TIMESTAMP,
BaseAspects.EVENT_TYPE,
@@ -61,7 +62,7 @@ public interface ITmfEventAspect {
/**
* Aspect for the event timestamp
*/
- ITmfEventAspect TIMESTAMP = new ITmfEventAspect() {
+ ITmfEventAspect TIMESTAMP = new ITmfEventAspect() {
@Override
public String getName() {
return Messages.getMessage(Messages.AspectName_Timestamp);
@@ -81,7 +82,7 @@ public interface ITmfEventAspect {
/**
* Aspect for the event type
*/
- ITmfEventAspect EVENT_TYPE = new ITmfEventAspect() {
+ ITmfEventAspect EVENT_TYPE = new ITmfEventAspect() {
@Override
public String getName() {
return Messages.getMessage(Messages.AspectName_EventType);
@@ -121,7 +122,7 @@ public interface ITmfEventAspect {
/**
* Aspect for the trace's name (for experiments with many traces)
*/
- ITmfEventAspect TRACE_NAME = new ITmfEventAspect() {
+ ITmfEventAspect TRACE_NAME = new ITmfEventAspect() {
@Override
public String getName() {
return Messages.getMessage(Messages.AspectName_TraceName);
@@ -177,5 +178,5 @@ public interface ITmfEventAspect {
* The event to process
* @return The resulting tidbit of information for this event.
*/
- @Nullable Object resolve(ITmfEvent event);
+ @Nullable T resolve(ITmfEvent event);
}
diff --git a/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/event/aspect/TmfContentFieldAspect.java b/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/event/aspect/TmfContentFieldAspect.java
index 7f5b7a1194..86936f5008 100644
--- a/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/event/aspect/TmfContentFieldAspect.java
+++ b/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/event/aspect/TmfContentFieldAspect.java
@@ -27,7 +27,7 @@ import org.eclipse.tracecompass.tmf.core.event.ITmfEventField;
*
* @author Alexandre Montplaisir
*/
-public class TmfContentFieldAspect implements ITmfEventAspect {
+public class TmfContentFieldAspect implements ITmfEventAspect
*/
public TmfEventsTable(final Composite parent, int cacheSize,
- @NonNull Iterable aspects) {
+ @NonNull Iterable> aspects) {
super("TmfEventsTable"); //$NON-NLS-1$
fComposite = new Composite(parent, SWT.NONE);
@@ -862,7 +862,7 @@ public class TmfEventsTable extends TmfComponent implements IGotoMarker, IColorS
fTable.setLinesVisible(true);
// Setup the columns
- for (ITmfEventAspect aspect : aspects) {
+ for (ITmfEventAspect> aspect : aspects) {
if (aspect != null) {
fColumns.add(new TmfEventTableColumn(aspect));
}
@@ -1827,7 +1827,7 @@ public class TmfEventsTable extends TmfComponent implements IGotoMarker, IColorS
return false;
}
final TmfFilterMatchesNode filter = new TmfFilterMatchesNode(null);
- ITmfEventAspect aspect = (ITmfEventAspect) column.getData(Key.ASPECT);
+ ITmfEventAspect> aspect = (ITmfEventAspect>) column.getData(Key.ASPECT);
filter.setEventAspect(aspect);
filter.setRegex(regex);
column.setData(Key.SEARCH_OBJ, filter);
@@ -3342,7 +3342,8 @@ public class TmfEventsTable extends TmfComponent implements IGotoMarker, IColorS
*/
private static final class TmfMarginColumn extends TmfEventTableColumn {
- private static final @NonNull ITmfEventAspect MARGIN_ASPECT = new ITmfEventAspect() {
+ private static final @NonNull ITmfEventAspect MARGIN_ASPECT =
+ new ITmfEventAspect() {
@Override
public String getName() {
diff --git a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/viewers/events/columns/TmfEventTableColumn.java b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/viewers/events/columns/TmfEventTableColumn.java
index de13842973..2bde1955e7 100644
--- a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/viewers/events/columns/TmfEventTableColumn.java
+++ b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/viewers/events/columns/TmfEventTableColumn.java
@@ -38,7 +38,7 @@ public class TmfEventTableColumn {
// Fields
// ------------------------------------------------------------------------
- private final ITmfEventAspect fAspect;
+ private final ITmfEventAspect> fAspect;
// ------------------------------------------------------------------------
// Constructors
@@ -51,7 +51,7 @@ public class TmfEventTableColumn {
* The {@link ITmfEventAspect} to be used to populate this
* column.
*/
- public TmfEventTableColumn(ITmfEventAspect aspect) {
+ public TmfEventTableColumn(ITmfEventAspect> aspect) {
fAspect = aspect;
}
@@ -95,7 +95,7 @@ public class TmfEventTableColumn {
*
* @return The event aspect
*/
- public ITmfEventAspect getEventAspect() {
+ public ITmfEventAspect> getEventAspect() {
return fAspect;
}
diff --git a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/views/filter/FilterViewer.java b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/views/filter/FilterViewer.java
index 205fce44fb..5d73f60f59 100644
--- a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/views/filter/FilterViewer.java
+++ b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/views/filter/FilterViewer.java
@@ -95,14 +95,14 @@ class FilterViewer extends Composite {
private static class AspectItem {
public String label;
- public ITmfEventAspect eventAspect;
+ public ITmfEventAspect> eventAspect;
public String traceTypeId;
public AspectItem(String label) {
this.label = label;
}
- public AspectItem(String label, ITmfEventAspect eventAspect, String traceTypeId) {
+ public AspectItem(String label, ITmfEventAspect> eventAspect, String traceTypeId) {
this.label = label;
this.eventAspect = eventAspect;
this.traceTypeId = traceTypeId;
@@ -626,7 +626,7 @@ class FilterViewer extends Composite {
ArrayList aspectList = new ArrayList<>();
aspectList.add(new AspectItem(Messages.FilterViewer_CommonCategory));
- for (ITmfEventAspect aspect : ITmfEventAspect.BASE_ASPECTS) {
+ for (ITmfEventAspect> aspect : ITmfEventAspect.BASE_ASPECTS) {
aspectList.add(new AspectItem(aspect.getName(), aspect, TmfFilterAspectNode.BASE_ASPECT_ID));
}
@@ -634,7 +634,7 @@ class FilterViewer extends Composite {
if (helper != null) {
aspectList.add(new AspectItem("")); //$NON-NLS-1$
aspectList.add(new AspectItem('[' + helper.getLabel() + ']'));
- for (ITmfEventAspect aspect : helper.getTrace().getEventAspects()) {
+ for (ITmfEventAspect> aspect : helper.getTrace().getEventAspects()) {
for (AspectItem baseAspect : aspectList) {
if (aspect.equals(baseAspect.eventAspect)) {
aspectList.remove(baseAspect);