tmf: Do not define base aspects in the interface

Instead, create a class with static getters for those aspects

This avoids initialization exceptions when adding a default method in the
interface

Change-Id: I490755e95dedaebaebd0439710c14077010907eb
Signed-off-by: Geneviève Bastien <gbastien+lttng@versatic.net>
Reviewed-on: https://git.eclipse.org/r/71798
Reviewed-by: Hudson CI
Reviewed-by: Alexandre Montplaisir <alexmonthy@efficios.com>
Reviewed-by: Bernd Hufmann <bernd.hufmann@ericsson.com>
Tested-by: Bernd Hufmann <bernd.hufmann@ericsson.com>
Reviewed-by: Matthew Khouzam <matthew.khouzam@ericsson.com>

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 49a6bff89177c9dbf12565cc25503ba4f6a87639..443e5eea221d5ac8e65914248308f05520fb4329 100644 (file)
--- 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
@@ -18,6 +18,7 @@ import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
 import org.eclipse.tracecompass.btf.core.event.BtfEvent;
 import org.eclipse.tracecompass.tmf.core.event.ITmfEvent;
+import org.eclipse.tracecompass.tmf.core.event.aspect.TmfBaseAspects;
 import org.eclipse.tracecompass.tmf.core.event.aspect.ITmfEventAspect;
 import org.eclipse.tracecompass.tmf.core.event.aspect.TmfContentFieldAspect;
 
@@ -35,10 +36,10 @@ public final class BtfEventAspects {
 
     private static final Iterable<ITmfEventAspect<?>> BTF_ASPECTS =
             ImmutableList.of(
-                    ITmfEventAspect.BaseAspects.TIMESTAMP,
+                    TmfBaseAspects.getTimestampAspect(),
                     new BtfSourceAspect(),
                     new TmfContentFieldAspect(BtfColumnNames.SOURCE_INSTANCE.toString(), BtfColumnNames.SOURCE_INSTANCE.toString()),
-                    ITmfEventAspect.BaseAspects.EVENT_TYPE,
+                    TmfBaseAspects.getEventTypeAspect(),
                     new BtfTargetAspect(),
                     new TmfContentFieldAspect(BtfColumnNames.TARGET_INSTANCE.toString(), BtfColumnNames.TARGET_INSTANCE.toString()),
                     new TmfContentFieldAspect(BtfColumnNames.EVENT.toString(), BtfColumnNames.EVENT.toString()),

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 9ed272eaa956c9f486ddbd51c1adfdcf613ba964..52fb5e7b520dd2d214b06bfead0ba0c5f58300e2 100644 (file)
--- 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
@@ -46,6 +46,7 @@ import org.eclipse.tracecompass.internal.tmf.ctf.core.trace.iterator.CtfIterator
 import org.eclipse.tracecompass.tmf.core.event.ITmfEvent;
 import org.eclipse.tracecompass.tmf.core.event.ITmfEventField;
 import org.eclipse.tracecompass.tmf.core.event.TmfEventField;
+import org.eclipse.tracecompass.tmf.core.event.aspect.TmfBaseAspects;
 import org.eclipse.tracecompass.tmf.core.event.aspect.ITmfEventAspect;
 import org.eclipse.tracecompass.tmf.core.exceptions.TmfTraceException;
 import org.eclipse.tracecompass.tmf.core.project.model.ITmfPropertiesProvider;
@@ -105,11 +106,11 @@ public class CtfTmfTrace extends TmfTrace
      */
     protected static final @NonNull Collection<@NonNull ITmfEventAspect<?>> CTF_ASPECTS =
             ImmutableList.of(
-                    ITmfEventAspect.BaseAspects.TIMESTAMP,
+                    TmfBaseAspects.getTimestampAspect(),
                     new CtfChannelAspect(),
                     new CtfCpuAspect(),
-                    ITmfEventAspect.BaseAspects.EVENT_TYPE,
-                    ITmfEventAspect.BaseAspects.CONTENTS
+                    TmfBaseAspects.getEventTypeAspect(),
+                    TmfBaseAspects.getContentsAspect()
                     );
 
     /**

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 c61284ae2f9891c0392e2bd4e645cb291a61375a..ddbbad817f3067c279e381fe56e3a570aa572992 100644 (file)
--- 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
@@ -17,6 +17,7 @@ import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.tracecompass.internal.gdbtrace.core.event.GdbTraceEvent;
 import org.eclipse.tracecompass.internal.gdbtrace.core.event.GdbTraceEventContent;
 import org.eclipse.tracecompass.tmf.core.event.ITmfEvent;
+import org.eclipse.tracecompass.tmf.core.event.aspect.TmfBaseAspects;
 import org.eclipse.tracecompass.tmf.core.event.aspect.ITmfEventAspect;
 import org.eclipse.tracecompass.tmf.core.event.aspect.TmfContentFieldAspect;
 
@@ -36,7 +37,7 @@ public final class GdbEventAspects {
                     new TmfContentFieldAspect(GdbTraceEventContent.TRACE_FRAME, GdbTraceEventContent.TRACE_FRAME),
                     new TmfContentFieldAspect(GdbTraceEventContent.TRACEPOINT, GdbTraceEventContent.TRACEPOINT),
                     new GdbFileAspect(),
-                    ITmfEventAspect.BaseAspects.CONTENTS
+                    TmfBaseAspects.getContentsAspect()
                     );
 
     private static class GdbFileAspect implements ITmfEventAspect<String> {

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 bf65808b4588f4b80dc7d902b1799fed5c4d8edc..404b98105f649e278a19100e626a610b026c2253 100644 (file)
--- 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
@@ -45,6 +45,7 @@ import org.eclipse.tracecompass.internal.tmf.pcap.core.event.aspect.PcapReferenc
 import org.eclipse.tracecompass.internal.tmf.pcap.core.event.aspect.PcapSourceAspect;
 import org.eclipse.tracecompass.internal.tmf.pcap.core.util.PcapEventFactory;
 import org.eclipse.tracecompass.tmf.core.event.ITmfEvent;
+import org.eclipse.tracecompass.tmf.core.event.aspect.TmfBaseAspects;
 import org.eclipse.tracecompass.tmf.core.event.aspect.ITmfEventAspect;
 import org.eclipse.tracecompass.tmf.core.exceptions.TmfTraceException;
 import org.eclipse.tracecompass.tmf.core.project.model.ITmfPropertiesProvider;
@@ -73,12 +74,12 @@ public class PcapTrace extends TmfTrace implements ITmfPropertiesProvider {
 
     private static final Collection<ITmfEventAspect<?>> PCAP_ASPECTS =
             ImmutableList.of(
-                    ITmfEventAspect.BaseAspects.TIMESTAMP,
+                    TmfBaseAspects.getTimestampAspect(),
                     PcapSourceAspect.INSTANCE,
                     PcapDestinationAspect.INSTANCE,
                     PcapReferenceAspect.INSTANCE,
                     PcapProtocolAspect.INSTANCE,
-                    ITmfEventAspect.BaseAspects.CONTENTS
+                    TmfBaseAspects.getContentsAspect()
                     );
 
     private static final String EMPTY_STRING = ""; //$NON-NLS-1$

diff --git a/pcap/org.eclipse.tracecompass.tmf.pcap.ui/src/org/eclipse/tracecompass/internal/tmf/pcap/ui/stream/StreamListView.java b/pcap/org.eclipse.tracecompass.tmf.pcap.ui/src/org/eclipse/tracecompass/internal/tmf/pcap/ui/stream/StreamListView.java
index 53b132eb1a5710acb82d78dacc6181d564c82cfc..721f9ff3014619f07cc9208c4dcb1b81aaf6e83b 100644 (file)
--- a/pcap/org.eclipse.tracecompass.tmf.pcap.ui/src/org/eclipse/tracecompass/internal/tmf/pcap/ui/stream/StreamListView.java
+++ b/pcap/org.eclipse.tracecompass.tmf.pcap.ui/src/org/eclipse/tracecompass/internal/tmf/pcap/ui/stream/StreamListView.java
@@ -42,7 +42,7 @@ import org.eclipse.tracecompass.internal.tmf.pcap.core.protocol.TmfPcapProtocol;
 import org.eclipse.tracecompass.internal.tmf.pcap.core.signal.TmfPacketStreamSelectedSignal;
 import org.eclipse.tracecompass.internal.tmf.pcap.core.trace.PcapTrace;
 import org.eclipse.tracecompass.internal.tmf.pcap.ui.Activator;
-import org.eclipse.tracecompass.tmf.core.event.aspect.ITmfEventAspect;
+import org.eclipse.tracecompass.tmf.core.event.aspect.TmfBaseAspects;
 import org.eclipse.tracecompass.tmf.core.filter.model.ITmfFilterTreeNode;
 import org.eclipse.tracecompass.tmf.core.filter.model.TmfFilterAndNode;
 import org.eclipse.tracecompass.tmf.core.filter.model.TmfFilterAspectNode;
@@ -463,7 +463,7 @@ public class StreamListView extends TmfView {
 
                         // Third stage - protocol + or
                         TmfFilterContainsNode protocolFilter = new TmfFilterContainsNode(and);
-                        protocolFilter.setEventAspect(ITmfEventAspect.BaseAspects.CONTENTS.forField(stream.getProtocol().getName()));
+                        protocolFilter.setEventAspect(TmfBaseAspects.getContentsAspect().forField(stream.getProtocol().getName()));
                         protocolFilter.setTraceTypeId(TmfFilterAspectNode.BASE_ASPECT_ID);
                         protocolFilter.setValue(EMPTY_STRING);
                         TmfFilterOrNode or = new TmfFilterOrNode(and);

diff --git a/tmf/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/filter/TmfFilterCompareNodeTest.java b/tmf/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/filter/TmfFilterCompareNodeTest.java
index fc109f7533cb9a4e06c75cc1ba60cdac7f70b0d9..4d7515ebd9a01d0092801f506bc890cbbad647d6 100644 (file)
--- a/tmf/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/filter/TmfFilterCompareNodeTest.java
+++ b/tmf/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/filter/TmfFilterCompareNodeTest.java
@@ -20,7 +20,7 @@ import static org.junit.Assert.assertTrue;
 import org.eclipse.tracecompass.tmf.core.event.ITmfEventField;
 import org.eclipse.tracecompass.tmf.core.event.TmfEvent;
 import org.eclipse.tracecompass.tmf.core.event.TmfEventField;
-import org.eclipse.tracecompass.tmf.core.event.aspect.ITmfEventAspect;
+import org.eclipse.tracecompass.tmf.core.event.aspect.TmfBaseAspects;
 import org.eclipse.tracecompass.tmf.core.event.aspect.TmfContentFieldAspect;
 import org.eclipse.tracecompass.tmf.core.filter.model.TmfFilterCompareNode;
 import org.eclipse.tracecompass.tmf.core.filter.model.TmfFilterCompareNode.Type;
@@ -117,7 +117,7 @@ public class TmfFilterCompareNodeTest extends TmfFilterTreeNodeTestBase {
 
     @Test
     public void testMatchesTimestamp() {
-        fFilter.setEventAspect(ITmfEventAspect.BaseAspects.TIMESTAMP);
+        fFilter.setEventAspect(TmfBaseAspects.getTimestampAspect());
         fFilter.setType(Type.TIMESTAMP);
         fFilter.setValue("0.000000002");
 

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 58b126aaa1d7419824e6495c13974983a9ab8425..9ae170c0090e486ca7e6e4ea64618155c815c294 100644 (file)
--- 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
@@ -23,6 +23,7 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.tracecompass.tmf.core.event.aspect.TmfBaseAspects;
 import org.eclipse.tracecompass.tmf.core.event.aspect.ITmfEventAspect;
 import org.eclipse.tracecompass.tmf.core.event.aspect.TmfContentFieldAspect;
 import org.eclipse.tracecompass.tmf.core.timestamp.ITmfTimestamp;
@@ -66,7 +67,7 @@ public class SyslogTrace extends TextTrace<SyslogEvent> {
     /** The event aspects */
     public static final @NonNull Collection<ITmfEventAspect<?>> ASPECTS =
             ImmutableList.of(
-                    ITmfEventAspect.BaseAspects.TIMESTAMP,
+                    TmfBaseAspects.getTimestampAspect(),
                     new TmfContentFieldAspect(Field.HOST, Field.HOST),
                     new TmfContentFieldAspect(Field.LOGGER, Field.LOGGER),
                     new TmfContentFieldAspect(Field.FILE, Field.FILE),

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 4a0e05ef148dbdc71d309545c4d71690c66d788a..e7f28ff4f4ba343fa9914b149a5927c59df52203 100644 (file)
--- 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
@@ -46,6 +46,7 @@ import org.eclipse.tracecompass.tmf.core.event.ITmfEventType;
 import org.eclipse.tracecompass.tmf.core.event.TmfEvent;
 import org.eclipse.tracecompass.tmf.core.event.TmfEventField;
 import org.eclipse.tracecompass.tmf.core.event.TmfEventType;
+import org.eclipse.tracecompass.tmf.core.event.aspect.TmfBaseAspects;
 import org.eclipse.tracecompass.tmf.core.event.aspect.ITmfEventAspect;
 import org.eclipse.tracecompass.tmf.core.event.aspect.TmfContentFieldAspect;
 import org.eclipse.tracecompass.tmf.core.event.aspect.TmfCpuAspect;
@@ -351,8 +352,8 @@ public class TmfXmlTraceStub extends TmfTrace {
         ImmutableList.Builder<ITmfEventAspect<?>> builder = new ImmutableList.Builder<>();
 
         /* Initialize the first default trace aspects */
-        builder.add(ITmfEventAspect.BaseAspects.TIMESTAMP);
-        builder.add(ITmfEventAspect.BaseAspects.EVENT_TYPE);
+        builder.add(TmfBaseAspects.getTimestampAspect());
+        builder.add(TmfBaseAspects.getEventTypeAspect());
 
         /* Add custom aspects in between */
         for (ITmfEventField field : fieldsArray) {
@@ -375,7 +376,7 @@ public class TmfXmlTraceStub extends TmfTrace {
         }
 
         /* Add the big content aspect */
-        builder.add(ITmfEventAspect.BaseAspects.CONTENTS);
+        builder.add(TmfBaseAspects.getContentsAspect());
         /* Add the additional aspects */
         builder.addAll(fAdditionalAspects);
         fAspects = builder.build();

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 314f8ab01152aabbac780ae655771cf4308f6be6..7cdd4e8de66ad89655c8b2292db4fe4918d9244a 100644 (file)
--- 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
@@ -13,15 +13,8 @@
 
 package org.eclipse.tracecompass.tmf.core.event.aspect;
 
-import java.util.List;
-
 import org.eclipse.jdt.annotation.Nullable;
 import org.eclipse.tracecompass.tmf.core.event.ITmfEvent;
-import org.eclipse.tracecompass.tmf.core.event.ITmfEventField;
-import org.eclipse.tracecompass.tmf.core.event.ITmfEventType;
-import org.eclipse.tracecompass.tmf.core.timestamp.ITmfTimestamp;
-
-import com.google.common.collect.ImmutableList;
 
 /**
  * An aspect is a piece of information that can be extracted, directly or
@@ -43,103 +36,6 @@ public interface ITmfEventAspect<T> {
      */
     String EMPTY_STRING = ""; //$NON-NLS-1$
 
-    /**
-     * List of all common base aspects
-     */
-    public static final List<ITmfEventAspect<?>> BASE_ASPECTS =
-            ImmutableList.of(
-                    BaseAspects.TIMESTAMP,
-                    BaseAspects.EVENT_TYPE,
-                    BaseAspects.CONTENTS,
-                    BaseAspects.TRACE_NAME
-                    );
-    /**
-     * Some basic aspects that all trace types should be able to use, using
-     * methods found in {@link ITmfEvent}.
-     */
-    interface BaseAspects {
-
-        /**
-         * Aspect for the event timestamp
-         */
-        ITmfEventAspect<ITmfTimestamp> TIMESTAMP = new ITmfEventAspect<ITmfTimestamp>() {
-            @Override
-            public String getName() {
-                return Messages.getMessage(Messages.AspectName_Timestamp);
-            }
-
-            @Override
-            public String getHelpText() {
-                return EMPTY_STRING;
-            }
-
-            @Override
-            public @Nullable ITmfTimestamp resolve(ITmfEvent event) {
-                return event.getTimestamp();
-            }
-        };
-
-        /**
-         * Aspect for the event type
-         */
-        ITmfEventAspect<String> EVENT_TYPE = new ITmfEventAspect<String>() {
-            @Override
-            public String getName() {
-                return Messages.getMessage(Messages.AspectName_EventType);
-            }
-
-            @Override
-            public String getHelpText() {
-                return Messages.getMessage(Messages.AspectHelpText_EventType);
-            }
-
-            @Override
-            public @Nullable String resolve(ITmfEvent event) {
-                ITmfEventType type = event.getType();
-                if (type == null) {
-                    return null;
-                }
-                return type.getName();
-            }
-        };
-
-        /**
-         * Aspect for the aggregated event contents (fields)
-         */
-        TmfEventFieldAspect CONTENTS = new TmfEventFieldAspect(Messages.getMessage(Messages.AspectName_Contents), null, new TmfEventFieldAspect.IRootField() {
-            @Override
-            public @Nullable ITmfEventField getRootField(ITmfEvent event) {
-                return event.getContent();
-            }
-        }) {
-            @Override
-            public String getHelpText() {
-                return Messages.getMessage(Messages.AspectHelpText_Contents);
-            }
-
-        };
-
-        /**
-         * Aspect for the trace's name (for experiments with many traces)
-         */
-        ITmfEventAspect<String> TRACE_NAME = new ITmfEventAspect<String>() {
-            @Override
-            public String getName() {
-                return Messages.getMessage(Messages.AspectName_TraceName);
-            }
-
-            @Override
-            public String getHelpText() {
-                return Messages.getMessage(Messages.AspectHelpText_TraceName);
-            }
-
-            @Override
-            public @Nullable String resolve(ITmfEvent event) {
-                return event.getTrace().getName();
-            }
-        };
-    }
-
     /**
      * Get the name of this aspect. This name will be user-visible and, as such,
      * should be localized.

diff --git a/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/event/aspect/TmfBaseAspects.java b/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/event/aspect/TmfBaseAspects.java
new file mode 100644 (file)
index 0000000..7682578
--- /dev/null
+++ b/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/event/aspect/TmfBaseAspects.java
@@ -0,0 +1,154 @@
+/*******************************************************************************
+ * Copyright (c) 2016 École Polytechnique de Montréal
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *******************************************************************************/
+
+package org.eclipse.tracecompass.tmf.core.event.aspect;
+
+import java.util.List;
+
+import org.eclipse.jdt.annotation.Nullable;
+import org.eclipse.tracecompass.tmf.core.event.ITmfEvent;
+import org.eclipse.tracecompass.tmf.core.event.ITmfEventField;
+import org.eclipse.tracecompass.tmf.core.event.ITmfEventType;
+import org.eclipse.tracecompass.tmf.core.timestamp.ITmfTimestamp;
+
+import com.google.common.collect.ImmutableList;
+
+/**
+ * Some basic aspects that all trace types should be able to use, using methods
+ * found in {@link ITmfEvent}.
+ *
+ * @author Alexandre Montplaisir
+ * @author Geneviève Bastien
+ * @since 2.0
+ */
+public final class TmfBaseAspects {
+
+    private static final ITmfEventAspect<ITmfTimestamp> TIMESTAMP_ASPECT = new ITmfEventAspect<ITmfTimestamp>() {
+        @Override
+        public String getName() {
+            return Messages.getMessage(Messages.AspectName_Timestamp);
+        }
+
+        @Override
+        public String getHelpText() {
+            return ITmfEventAspect.EMPTY_STRING;
+        }
+
+        @Override
+        public @Nullable ITmfTimestamp resolve(ITmfEvent event) {
+            return event.getTimestamp();
+        }
+    };
+
+    private static final ITmfEventAspect<String> EVENT_TYPE_ASPECT = new ITmfEventAspect<String>() {
+        @Override
+        public String getName() {
+            return Messages.getMessage(Messages.AspectName_EventType);
+        }
+
+        @Override
+        public String getHelpText() {
+            return Messages.getMessage(Messages.AspectHelpText_EventType);
+        }
+
+        @Override
+        public @Nullable String resolve(ITmfEvent event) {
+            ITmfEventType type = event.getType();
+            if (type == null) {
+                return null;
+            }
+            return type.getName();
+        }
+    };
+
+    private static final TmfEventFieldAspect CONTENTS_ASPECT = new TmfEventFieldAspect(Messages.getMessage(Messages.AspectName_Contents), null, new TmfEventFieldAspect.IRootField() {
+        @Override
+        public @Nullable ITmfEventField getRootField(ITmfEvent event) {
+            return event.getContent();
+        }
+    }) {
+        @Override
+        public String getHelpText() {
+            return Messages.getMessage(Messages.AspectHelpText_Contents);
+        }
+    };
+
+    private static final ITmfEventAspect<String> TRACE_NAME_ASPECT = new ITmfEventAspect<String>() {
+        @Override
+        public String getName() {
+            return Messages.getMessage(Messages.AspectName_TraceName);
+        }
+
+        @Override
+        public String getHelpText() {
+            return Messages.getMessage(Messages.AspectHelpText_TraceName);
+        }
+
+        @Override
+        public @Nullable String resolve(ITmfEvent event) {
+            return event.getTrace().getName();
+        }
+    };
+
+    private static final List<ITmfEventAspect<?>> BASE_ASPECTS = ImmutableList.of(
+            getTimestampAspect(),
+            getEventTypeAspect(),
+            getContentsAspect(),
+            getTraceNameAspect());
+
+    private TmfBaseAspects() {
+
+    }
+
+    /**
+     * Get the aspect for the event timestamp
+     *
+     * @return The timestamp aspect
+     */
+    public static ITmfEventAspect<ITmfTimestamp> getTimestampAspect() {
+        return TIMESTAMP_ASPECT;
+    }
+
+    /**
+     * Get the aspect for the event type
+     *
+     * @return The aspect for the event type
+     */
+    public static ITmfEventAspect<String> getEventTypeAspect() {
+        return EVENT_TYPE_ASPECT;
+    }
+
+    /**
+     * Get the aspect for the aggregated event contents (fields)
+     *
+     * @return The aspect for the aggregate event contents
+     */
+    public static TmfEventFieldAspect getContentsAspect() {
+        return CONTENTS_ASPECT;
+    }
+
+    /**
+     * Get the aspect for the trace's name (for experiments with many traces)
+     *
+     * @return The trace name aspect
+     */
+    public static ITmfEventAspect<String> getTraceNameAspect() {
+        return TRACE_NAME_ASPECT;
+    }
+
+    /**
+     * Get the list of all common base aspects
+     *
+     * @return the list of base aspects
+     */
+    public static List<ITmfEventAspect<?>> getBaseAspects() {
+        return BASE_ASPECTS;
+    }
+
+}
\ No newline at end of file

diff --git a/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/filter/xml/TmfFilterContentHandler.java b/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/filter/xml/TmfFilterContentHandler.java
index b336cf32fd719be3d4c3d0efbacdaeefdb5342ca..b96d73ce484cacd437d862183b675692ad0ca3a1 100644 (file)
--- a/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/filter/xml/TmfFilterContentHandler.java
+++ b/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/filter/xml/TmfFilterContentHandler.java
@@ -16,6 +16,7 @@ package org.eclipse.tracecompass.tmf.core.filter.xml;
 
 import java.util.Stack;
 
+import org.eclipse.tracecompass.tmf.core.event.aspect.TmfBaseAspects;
 import org.eclipse.tracecompass.tmf.core.event.aspect.ITmfEventAspect;
 import org.eclipse.tracecompass.tmf.core.event.aspect.TmfEventFieldAspect;
 import org.eclipse.tracecompass.tmf.core.filter.model.ITmfFilterTreeNode;
@@ -232,7 +233,7 @@ public class TmfFilterContentHandler extends DefaultHandler {
         traceTypeId = TmfTraceType.buildCompatibilityTraceTypeId(traceTypeId);
         String name = atts.getValue(TmfFilterAspectNode.EVENT_ASPECT_ATTR);
         if (TmfFilterAspectNode.BASE_ASPECT_ID.equals(traceTypeId)) {
-            for (ITmfEventAspect<?> eventAspect : ITmfEventAspect.BASE_ASPECTS) {
+            for (ITmfEventAspect<?> eventAspect : TmfBaseAspects.getBaseAspects()) {
                 if (eventAspect.getName().equals(name)) {
                     node.setEventAspect(eventAspect);
                     node.setTraceTypeId(traceTypeId);
@@ -267,16 +268,16 @@ public class TmfFilterContentHandler extends DefaultHandler {
             String field = atts.getValue(FIELD_ATTR);
             if (field != null) {
                 if (field.equals(EVENT_FIELD_TIMESTAMP)) {
-                    node.setEventAspect(ITmfEventAspect.BaseAspects.TIMESTAMP);
+                    node.setEventAspect(TmfBaseAspects.getTimestampAspect());
                     node.setTraceTypeId(TmfFilterAspectNode.BASE_ASPECT_ID);
                 } else if (field.equals(EVENT_FIELD_TYPE)) {
-                    node.setEventAspect(ITmfEventAspect.BaseAspects.EVENT_TYPE);
+                    node.setEventAspect(TmfBaseAspects.getEventTypeAspect());
                     node.setTraceTypeId(TmfFilterAspectNode.BASE_ASPECT_ID);
                 } else if (field.equals(EVENT_FIELD_CONTENT)) {
-                    node.setEventAspect(ITmfEventAspect.BaseAspects.CONTENTS);
+                    node.setEventAspect(TmfBaseAspects.getContentsAspect());
                     node.setTraceTypeId(TmfFilterAspectNode.BASE_ASPECT_ID);
                 } else {
-                    node.setEventAspect(ITmfEventAspect.BaseAspects.CONTENTS.forField(field));
+                    node.setEventAspect(TmfBaseAspects.getContentsAspect().forField(field));
                     node.setTraceTypeId(TmfFilterAspectNode.BASE_ASPECT_ID);
                 }
             }

diff --git a/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/trace/TmfTrace.java b/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/trace/TmfTrace.java
index cb94d02547f929dff5bbc3114ad86455070a47e5..ab6ccf5749ccc7759a722ff56bb886bb5468dbe5 100644 (file)
--- a/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/trace/TmfTrace.java
+++ b/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/trace/TmfTrace.java
@@ -39,6 +39,7 @@ import org.eclipse.tracecompass.tmf.core.component.TmfEventProvider;
 import org.eclipse.tracecompass.tmf.core.event.ITmfEvent;
 import org.eclipse.tracecompass.tmf.core.event.ITmfLostEvent;
 import org.eclipse.tracecompass.tmf.core.event.TmfEvent;
+import org.eclipse.tracecompass.tmf.core.event.aspect.TmfBaseAspects;
 import org.eclipse.tracecompass.tmf.core.event.aspect.ITmfEventAspect;
 import org.eclipse.tracecompass.tmf.core.exceptions.TmfAnalysisException;
 import org.eclipse.tracecompass.tmf.core.exceptions.TmfTraceException;
@@ -98,9 +99,9 @@ public abstract class TmfTrace extends TmfEventProvider implements ITmfTrace, IT
      */
     public static final @NonNull Collection<@NonNull ITmfEventAspect<?>> BASE_ASPECTS =
             ImmutableList.of(
-                    ITmfEventAspect.BaseAspects.TIMESTAMP,
-                    ITmfEventAspect.BaseAspects.EVENT_TYPE,
-                    ITmfEventAspect.BaseAspects.CONTENTS
+                    TmfBaseAspects.getTimestampAspect(),
+                    TmfBaseAspects.getEventTypeAspect(),
+                    TmfBaseAspects.getContentsAspect()
                     );
 
     // ------------------------------------------------------------------------

diff --git a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/editors/TmfEventsEditor.java b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/editors/TmfEventsEditor.java
index 0b4246a39b0aef86a8d603b7e39765e08608d416..3366cd0a2cb03f8da27158894288022266256fc7 100644 (file)
--- a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/editors/TmfEventsEditor.java
+++ b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/editors/TmfEventsEditor.java
@@ -43,6 +43,7 @@ import org.eclipse.swt.widgets.Display;
 import org.eclipse.tracecompass.internal.tmf.ui.Activator;
 import org.eclipse.tracecompass.internal.tmf.ui.editors.ITmfEventsEditorConstants;
 import org.eclipse.tracecompass.tmf.core.TmfCommonConstants;
+import org.eclipse.tracecompass.tmf.core.event.aspect.TmfBaseAspects;
 import org.eclipse.tracecompass.tmf.core.event.aspect.ITmfEventAspect;
 import org.eclipse.tracecompass.tmf.core.signal.TmfSignalHandler;
 import org.eclipse.tracecompass.tmf.core.signal.TmfTimestampFormatUpdateSignal;
@@ -351,7 +352,7 @@ public class TmfEventsEditor extends TmfEditor implements ITmfTraceEditor, IReus
         ImmutableSet.Builder<ITmfEventAspect<?>> builder = new ImmutableSet.Builder<>();
 
         /* For experiments, we'll add a "trace name" aspect/column */
-        builder.add(ITmfEventAspect.BaseAspects.TRACE_NAME);
+        builder.add(TmfBaseAspects.getTraceNameAspect());
 
         String commonTraceType = getCommonTraceType(experiment);
         if (commonTraceType != null) {

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 5d73f60f59fc8bea47565eb85436422f3f06aa3a..7a19e6627db84a5ac526249468fff0d883f1b73b 100644 (file)
--- 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
@@ -61,6 +61,7 @@ import org.eclipse.swt.widgets.Menu;
 import org.eclipse.swt.widgets.Text;
 import org.eclipse.swt.widgets.TreeItem;
 import org.eclipse.tracecompass.internal.tmf.ui.Messages;
+import org.eclipse.tracecompass.tmf.core.event.aspect.TmfBaseAspects;
 import org.eclipse.tracecompass.tmf.core.event.aspect.ITmfEventAspect;
 import org.eclipse.tracecompass.tmf.core.event.aspect.TmfEventFieldAspect;
 import org.eclipse.tracecompass.tmf.core.filter.model.ITmfFilterTreeNode;
@@ -626,7 +627,7 @@ class FilterViewer extends Composite {
             ArrayList<AspectItem> aspectList = new ArrayList<>();
 
             aspectList.add(new AspectItem(Messages.FilterViewer_CommonCategory));
-            for (ITmfEventAspect<?> aspect : ITmfEventAspect.BASE_ASPECTS) {
+            for (ITmfEventAspect<?> aspect : TmfBaseAspects.getBaseAspects()) {
                 aspectList.add(new AspectItem(aspect.getName(), aspect, TmfFilterAspectNode.BASE_ASPECT_ID));
             }