tmf: Consolidate constructors in TmfEvent

The default constructor can be used by the ITmfEvent extension
point, so should remain available, but should not be used by
normal code.

Change-Id: Id0e5e6d35d5593852b2a89672efea4fcbcd5b948
Signed-off-by: Alexandre Montplaisir <alexmonthy@voxpopuli.im>
Reviewed-on: https://git.eclipse.org/r/36130
Tested-by: Hudson CI
Reviewed-by: Matthew Khouzam <matthew.khouzam@ericsson.com>

diff --git a/org.eclipse.tracecompass.gdbtrace.core/src/org/eclipse/tracecompass/internal/gdbtrace/core/event/GdbTraceEvent.java b/org.eclipse.tracecompass.gdbtrace.core/src/org/eclipse/tracecompass/internal/gdbtrace/core/event/GdbTraceEvent.java
index 30474886ea0edffe07579301818209b8f8ac4057..0f05368a305d6c9bd58fbb4b3cb0ad392201f920 100644 (file)
--- a/org.eclipse.tracecompass.gdbtrace.core/src/org/eclipse/tracecompass/internal/gdbtrace/core/event/GdbTraceEvent.java
+++ b/org.eclipse.tracecompass.gdbtrace.core/src/org/eclipse/tracecompass/internal/gdbtrace/core/event/GdbTraceEvent.java
@@ -17,6 +17,7 @@ import org.eclipse.tracecompass.internal.gdbtrace.core.trace.GdbTrace;
 import org.eclipse.tracecompass.tmf.core.event.ITmfEventType;
 import org.eclipse.tracecompass.tmf.core.event.TmfEvent;
 import org.eclipse.tracecompass.tmf.core.timestamp.ITmfTimestamp;
+import org.eclipse.tracecompass.tmf.core.trace.ITmfContext;
 
 /**
  * GDB Trace implementation of TmfEvent
@@ -32,6 +33,7 @@ public class GdbTraceEvent extends TmfEvent {
      * Default constructor
      */
     public GdbTraceEvent() {
+        super(null, ITmfContext.UNKNOWN_RANK, null, null, null, null, null);
     }
 
     /**
@@ -52,7 +54,7 @@ public class GdbTraceEvent extends TmfEvent {
      */
     public GdbTraceEvent(GdbTrace trace, ITmfTimestamp timestamp, String source,
             ITmfEventType type, GdbTraceEventContent content, String reference) {
-        super(trace, timestamp, source, type, content, reference);
+        super(trace, ITmfContext.UNKNOWN_RANK, timestamp, source, type, content, reference);
     }
 
     @Override

diff --git a/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/component/TmfProviderManagerTest.java b/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/component/TmfProviderManagerTest.java
index 475db7dc05316fc3cc083649f808880f7c55596a..12929a902dd8a9f4d146e45c19852d7b7d9c6a34 100644 (file)
--- a/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/component/TmfProviderManagerTest.java
+++ b/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/component/TmfProviderManagerTest.java
@@ -76,6 +76,9 @@ public class TmfProviderManagerTest {
     }
 
     private class TmfEvent3 extends TmfEvent {
+        private TmfEvent3() {
+            super(null, ITmfContext.UNKNOWN_RANK, null, null, null, null, null);
+        }
     }
 
     private class TestProvider3 extends TmfEventProvider {

diff --git a/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/event/TmfEventFieldTest.java b/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/event/TmfEventFieldTest.java
index 380ed1ad14894f4eec144153e71bdc7eed4b33a5..2814d938640bf0c3aedd74f199fcb3e5e4b691fe 100644 (file)
--- a/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/event/TmfEventFieldTest.java
+++ b/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/event/TmfEventFieldTest.java
@@ -28,6 +28,7 @@ import java.util.Collection;
 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.trace.ITmfContext;
 import org.junit.Test;
 
 /**
@@ -288,7 +289,7 @@ public class TmfEventFieldTest {
     public void testNonEqualsValue() {
         final String fieldName = "myfield";
         final Object value1 = new String("test-string");
-        final Object value2 = new TmfEvent();
+        final Object value2 = new TmfEvent(null, ITmfContext.UNKNOWN_RANK, null, null, null, null, null);
         final TmfEventField[] fields = { fField1, fField2 };
 
         final TmfEventField field1 = new TmfEventField(fieldName, value1, fields);

diff --git a/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/event/TmfEventTest.java b/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/event/TmfEventTest.java
index 1f7d6aa9c164ee750c74e79b61ccd0f0a967ac4b..025dc1f93c014654b2da351db0d3f86d61b9d215 100644 (file)
--- a/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/event/TmfEventTest.java
+++ b/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/event/TmfEventTest.java
@@ -92,7 +92,7 @@ public class TmfEventTest {
 
     @Test
     public void testDefaultConstructor() {
-        final ITmfEvent event = new TmfEvent(fTrace);
+        final ITmfEvent event = new TmfEvent(fTrace, ITmfContext.UNKNOWN_RANK, null, null, null, null, null);
         assertNotNull("getTrace", event.getTrace());
         assertEquals("getRank", ITmfContext.UNKNOWN_RANK, event.getRank());
         assertNull("getTimestamp", event.getTimestamp());
@@ -123,7 +123,7 @@ public class TmfEventTest {
 
     @Test
     public void testNoRankConstructor() {
-        final ITmfEvent event = new TmfEvent(fTrace, fTimestamp1, fSource, fType, fContent1, fReference1);
+        final ITmfEvent event = new TmfEvent(fTrace, ITmfContext.UNKNOWN_RANK, fTimestamp1, fSource, fType, fContent1, fReference1);
         assertNotNull("getTrace", event.getTrace());
         assertEquals("getRank", ITmfContext.UNKNOWN_RANK, event.getRank());
         assertEquals("getTimestamp", fTimestamp1, event.getTimestamp());
@@ -165,8 +165,8 @@ public class TmfEventTest {
 
     @Test
     public void testHashCode() {
-        ITmfEvent event1 = new TmfEvent(fTrace);
-        ITmfEvent event2 = new TmfEvent(fTrace);
+        ITmfEvent event1 = new TmfEvent(fTrace, ITmfContext.UNKNOWN_RANK, null, null, null, null, null);
+        ITmfEvent event2 = new TmfEvent(fTrace, ITmfContext.UNKNOWN_RANK, null, null, null, null, null);
 
         assertTrue("hashCode", event1.hashCode() == event2.hashCode());
 

diff --git a/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/filter/TmfCollapseFilterTest.java b/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/filter/TmfCollapseFilterTest.java
index 0a063b917683c3fac8048b4396c686692360fe6d..7a29afd60d55a1b6848529493c55887fcefb116e 100644 (file)
--- a/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/filter/TmfCollapseFilterTest.java
+++ b/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/filter/TmfCollapseFilterTest.java
@@ -30,6 +30,7 @@ import org.eclipse.tracecompass.tmf.core.event.collapse.ITmfCollapsibleEvent;
 import org.eclipse.tracecompass.tmf.core.tests.shared.TmfTestTrace;
 import org.eclipse.tracecompass.tmf.core.timestamp.ITmfTimestamp;
 import org.eclipse.tracecompass.tmf.core.timestamp.TmfNanoTimestamp;
+import org.eclipse.tracecompass.tmf.core.trace.ITmfContext;
 import org.eclipse.tracecompass.tmf.core.trace.ITmfTrace;
 import org.junit.After;
 import org.junit.Test;
@@ -133,7 +134,7 @@ public class TmfCollapseFilterTest {
         private final boolean fIsCollapsible;
 
         CollapsibleEvent(boolean isCollapsible) {
-            super(fTrace);
+            super(fTrace, ITmfContext.UNKNOWN_RANK, null, null, null, null, null);
             fIsCollapsible = isCollapsible;
         }
 

diff --git a/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/statesystem/mipmap/TmfMipmapStateProviderStub.java b/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/statesystem/mipmap/TmfMipmapStateProviderStub.java
index 81ed95de29660ef7b512060ffe7ceb9ed429d2ee..153cd9328c5396cfb3b5cbae4f22f029084db73a 100644 (file)
--- a/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/statesystem/mipmap/TmfMipmapStateProviderStub.java
+++ b/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/statesystem/mipmap/TmfMipmapStateProviderStub.java
@@ -28,6 +28,7 @@ import org.eclipse.tracecompass.tmf.core.event.TmfEventField;
 import org.eclipse.tracecompass.tmf.core.event.TmfEventType;
 import org.eclipse.tracecompass.tmf.core.timestamp.ITmfTimestamp;
 import org.eclipse.tracecompass.tmf.core.timestamp.TmfNanoTimestamp;
+import org.eclipse.tracecompass.tmf.core.trace.ITmfContext;
 
 /**
  * A mipmap state provider for test
@@ -110,7 +111,7 @@ class TmfMipmapStateProviderStub extends AbstractTmfMipmapStateProvider {
         ITmfTimestamp timestamp = new TmfNanoTimestamp(time);
         ITmfEventType eventType = new TmfEventType(MIPMAP_ID, null);
         ITmfEventField content = new TmfEventField(ITmfEventField.ROOT_FIELD_ID, value, null);
-        ITmfEvent event = new TmfEvent(null, timestamp, null, eventType, content, null);
+        ITmfEvent event = new TmfEvent(null, ITmfContext.UNKNOWN_RANK, timestamp, null, eventType, content, null);
         return event;
     }
 }

diff --git a/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/uml2sd/TmfAsyncSequenceDiagramEventTest.java b/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/uml2sd/TmfAsyncSequenceDiagramEventTest.java
index 940c3661c42651e0b968efde071384b052c7e355..7553ddd450220991e7450cb2a784dae7ead18522 100644 (file)
--- a/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/uml2sd/TmfAsyncSequenceDiagramEventTest.java
+++ b/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/uml2sd/TmfAsyncSequenceDiagramEventTest.java
@@ -23,6 +23,7 @@ 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.timestamp.TmfTimestamp;
+import org.eclipse.tracecompass.tmf.core.trace.ITmfContext;
 import org.eclipse.tracecompass.tmf.core.uml2sd.TmfAsyncSequenceDiagramEvent;
 import org.junit.Test;
 
@@ -52,10 +53,10 @@ public class TmfAsyncSequenceDiagramEventTest {
      */
     public TmfAsyncSequenceDiagramEventTest() {
         fContent1 = new TmfEventField(ITmfEventField.ROOT_FIELD_ID, "Some content", null);
-        fEvent1 = new TmfEvent(null, fTimestamp1, fSource, fType, fContent1, fReference);
+        fEvent1 = new TmfEvent(null, ITmfContext.UNKNOWN_RANK, fTimestamp1, fSource, fType, fContent1, fReference);
 
         fContent2 = new TmfEventField(ITmfEventField.ROOT_FIELD_ID, "Some other content", null);
-        fEvent2 = new TmfEvent(null, fTimestamp2, fSource, fType, fContent2, fReference);
+        fEvent2 = new TmfEvent(null, ITmfContext.UNKNOWN_RANK, fTimestamp2, fSource, fType, fContent2, fReference);
     }
 
     /**

diff --git a/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/uml2sd/TmfSyncSequenceDiagramEventTest.java b/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/uml2sd/TmfSyncSequenceDiagramEventTest.java
index 676497811daaba6082b2040bac3cd4a93c6b4f14..a9227d113214c393f0a453026282c37353eb9d96 100644 (file)
--- a/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/uml2sd/TmfSyncSequenceDiagramEventTest.java
+++ b/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/uml2sd/TmfSyncSequenceDiagramEventTest.java
@@ -23,6 +23,7 @@ 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.timestamp.TmfTimestamp;
+import org.eclipse.tracecompass.tmf.core.trace.ITmfContext;
 import org.eclipse.tracecompass.tmf.core.uml2sd.TmfSyncSequenceDiagramEvent;
 import org.junit.Test;
 
@@ -49,7 +50,7 @@ public class TmfSyncSequenceDiagramEventTest {
      */
     public TmfSyncSequenceDiagramEventTest() {
         fContent1 = new TmfEventField(ITmfEventField.ROOT_FIELD_ID, "Some content", null);
-        fEvent1 = new TmfEvent(null, fTimestamp1, fSource, fType, fContent1, fReference);
+        fEvent1 = new TmfEvent(null, ITmfContext.UNKNOWN_RANK, fTimestamp1, fSource, fType, fContent1, fReference);
     }
 
     /**

diff --git a/org.eclipse.tracecompass.tmf.core.tests/stubs/org/eclipse/tracecompass/tmf/tests/stubs/event/TmfSyncEventStub.java b/org.eclipse.tracecompass.tmf.core.tests/stubs/org/eclipse/tracecompass/tmf/tests/stubs/event/TmfSyncEventStub.java
index 3cb6fe48c8e1b92aae3284c6618aec1b40338177..93d32242b2e8ed1cbf961c759aad5f0672effc7c 100644 (file)
--- a/org.eclipse.tracecompass.tmf.core.tests/stubs/org/eclipse/tracecompass/tmf/tests/stubs/event/TmfSyncEventStub.java
+++ b/org.eclipse.tracecompass.tmf.core.tests/stubs/org/eclipse/tracecompass/tmf/tests/stubs/event/TmfSyncEventStub.java
@@ -15,6 +15,7 @@ package org.eclipse.tracecompass.tmf.tests.stubs.event;
 import org.eclipse.tracecompass.tmf.core.event.TmfEvent;
 import org.eclipse.tracecompass.tmf.core.event.TmfEventField;
 import org.eclipse.tracecompass.tmf.core.timestamp.ITmfTimestamp;
+import org.eclipse.tracecompass.tmf.core.trace.ITmfContext;
 import org.eclipse.tracecompass.tmf.core.trace.ITmfTrace;
 
 /**
@@ -36,6 +37,7 @@ public class TmfSyncEventStub extends TmfEvent {
      */
     public TmfSyncEventStub(final ITmfTrace trace, final ITmfTimestamp timestamp) {
         super(trace,
+                ITmfContext.UNKNOWN_RANK,
                 timestamp,
                 stub,
                 new TmfEventTypeStub(),

diff --git a/org.eclipse.tracecompass.tmf.core.tests/stubs/org/eclipse/tracecompass/tmf/tests/stubs/trace/TmfEventParserStub.java b/org.eclipse.tracecompass.tmf.core.tests/stubs/org/eclipse/tracecompass/tmf/tests/stubs/trace/TmfEventParserStub.java
index f895571060525caa2ea8f88eb4042cbb5b4f1194..bd14908ce744a95fe246153cc4989642c774a55c 100644 (file)
--- a/org.eclipse.tracecompass.tmf.core.tests/stubs/org/eclipse/tracecompass/tmf/tests/stubs/trace/TmfEventParserStub.java
+++ b/org.eclipse.tracecompass.tmf.core.tests/stubs/org/eclipse/tracecompass/tmf/tests/stubs/trace/TmfEventParserStub.java
@@ -111,6 +111,7 @@ public class TmfEventParserStub implements ITmfEventParser {
 
                 final TmfEventField root = new TmfEventField(ITmfEventField.ROOT_FIELD_ID, content.toString(), null);
                 final ITmfEvent event = new TmfEvent(fEventStream,
+                        ITmfContext.UNKNOWN_RANK,
                         fEventStream.createTimestamp(ts * 1000000L),
                         source, fTypes[typeIndex], root, String.valueOf(reference));
                 return event;

diff --git a/org.eclipse.tracecompass.tmf.core.tests/stubs/org/eclipse/tracecompass/tmf/tests/stubs/trace/xml/TmfXmlTraceStub.java b/org.eclipse.tracecompass.tmf.core.tests/stubs/org/eclipse/tracecompass/tmf/tests/stubs/trace/xml/TmfXmlTraceStub.java
index d2b72c94b0b843c3672999a7fceec8c3486653b1..b6c921fd873f94c906d192e0fca7cf06c2eca92e 100644 (file)
--- a/org.eclipse.tracecompass.tmf.core.tests/stubs/org/eclipse/tracecompass/tmf/tests/stubs/trace/xml/TmfXmlTraceStub.java
+++ b/org.eclipse.tracecompass.tmf.core.tests/stubs/org/eclipse/tracecompass/tmf/tests/stubs/trace/xml/TmfXmlTraceStub.java
@@ -242,7 +242,7 @@ public class TmfXmlTraceStub extends TmfTrace {
         ITmfEventType customEventType = event.getType();
         TmfEventType eventType = new TmfEventType(getStringValue(content, EVENT_NAME_FIELD), customEventType.getRootField());
         ITmfEventField eventFields = new CustomEventContent(content.getName(), content.getValue(), fieldsArray);
-        TmfEvent newEvent = new TmfEvent(this, event.getTimestamp(), getStringValue(content, SOURCE_FIELD), eventType, eventFields, event.getReference());
+        TmfEvent newEvent = new TmfEvent(this, ITmfContext.UNKNOWN_RANK, event.getTimestamp(), getStringValue(content, SOURCE_FIELD), eventType, eventFields, event.getReference());
         updateAttributes(savedContext, event.getTimestamp());
         context.increaseRank();
 

diff --git a/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/event/TmfEvent.java b/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/event/TmfEvent.java
index 48c3514bd5ae7efdd02e5465a36145dd1b9ca005..c1f93454dbb2f937dd894b8106edb7c4b39d929b 100644 (file)
--- a/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/event/TmfEvent.java
+++ b/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/event/TmfEvent.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2009, 2013 Ericsson
+ * Copyright (c) 2009, 2014 Ericsson
  *
  * All rights reserved. This program and the accompanying materials are made
  * available under the terms of the Eclipse Public License v1.0 which
@@ -7,9 +7,8 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Francois Chouinard - Initial API and implementation
- *     Francois Chouinard - Updated as per TMF Event Model 1.0
- *     Alexandre Montplaisir - Made immutable
+ *     Francois Chouinard - Initial API and implementation, updated as per TMF Event Model 1.0
+ *     Alexandre Montplaisir - Made immutable, consolidated constructors
  *******************************************************************************/
 
 package org.eclipse.tracecompass.tmf.core.event;
@@ -50,60 +49,26 @@ public class TmfEvent extends PlatformObject implements ITmfEvent {
     // ------------------------------------------------------------------------
 
     /**
-     * Default constructor. All fields have their default value (null) and the
-     * event rank is set to TmfContext.UNKNOWN_RANK.
+     * Default constructor. Is required for extension points, but should not be
+     * used normally.
      *
-     * Note: This constructor with no parameter must be present for children
-     * classes functionnalities. It is preferable to use one of the constructors
-     * that specifies a trace sine the {@link #getTrace()} method will return a
-     * non null value and will throw an exception if the trace is null.
+     * @deprecated Do not use, extension-point use only. Use
+     *             {@link #TmfEvent(ITmfTrace, long, ITmfTimestamp, String, ITmfEventType, ITmfEventField, String)}
+     *             instead.
      */
+    @Deprecated
     public TmfEvent() {
         this(null, ITmfContext.UNKNOWN_RANK, null, null, null, null, null);
     }
 
-    /**
-     * Default constructor. All fields have their default value (null) and the
-     * event rank is set to TmfContext.UNKNOWN_RANK.
-     *
-     * @param trace
-     *            The trace associated with this event
-     */
-    public TmfEvent(@NonNull ITmfTrace trace) {
-        this(trace, ITmfContext.UNKNOWN_RANK, null, null, null, null, null);
-    }
-
-    /**
-     * Standard constructor. The event rank will be set to
-     * TmfContext.UNKNOWN_RANK.
-     *
-     * @param trace
-     *            the parent trace
-     * @param timestamp
-     *            the event timestamp
-     * @param source
-     *            the event source
-     * @param type
-     *            the event type
-     * @param content
-     *            the event content (payload)
-     * @param reference
-     *            the event reference
-     * @since 2.0
-     */
-    public TmfEvent(final ITmfTrace trace, final ITmfTimestamp timestamp, final String source,
-            final ITmfEventType type, final ITmfEventField content, final String reference)
-    {
-        this(trace, ITmfContext.UNKNOWN_RANK, timestamp, source, type, content, reference);
-    }
-
     /**
      * Full constructor
      *
      * @param trace
      *            the parent trace
      * @param rank
-     *            the event rank (in the trace)
+     *            the event rank (in the trace). You can use
+     *            {@link ITmfContext#UNKNOWN_RANK} as default value
      * @param timestamp
      *            the event timestamp
      * @param source
@@ -116,9 +81,13 @@ public class TmfEvent extends PlatformObject implements ITmfEvent {
      *            the event reference
      * @since 2.0
      */
-    public TmfEvent(final ITmfTrace trace, final long rank, final ITmfTimestamp timestamp, final String source,
-            final ITmfEventType type, final ITmfEventField content, final String reference)
-    {
+    public TmfEvent(final ITmfTrace trace,
+            final long rank,
+            final ITmfTimestamp timestamp,
+            final String source,
+            final ITmfEventType type,
+            final ITmfEventField content,
+            final String reference) {
         fTrace = trace;
         fRank = rank;
         fTimestamp = timestamp;

diff --git a/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/parsers/custom/CustomEvent.java b/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/parsers/custom/CustomEvent.java
index 19e84332c57f2fea594451175be9011eb51dfe60..15b46267ab201b1e2f9d95d0bbf9f42bf5d2ffd8 100644 (file)
--- a/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/parsers/custom/CustomEvent.java
+++ b/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/parsers/custom/CustomEvent.java
@@ -27,6 +27,7 @@ import org.eclipse.tracecompass.tmf.core.timestamp.ITmfTimestamp;
 import org.eclipse.tracecompass.tmf.core.timestamp.TmfNanoTimestamp;
 import org.eclipse.tracecompass.tmf.core.timestamp.TmfTimestamp;
 import org.eclipse.tracecompass.tmf.core.timestamp.TmfTimestampFormat;
+import org.eclipse.tracecompass.tmf.core.trace.ITmfContext;
 import org.eclipse.tracecompass.tmf.core.trace.ITmfTrace;
 
 /**
@@ -67,6 +68,7 @@ public class CustomEvent extends TmfEvent {
      *            The trace definition to which this event belongs
      */
     public CustomEvent(CustomTraceDefinition definition) {
+        super(null, ITmfContext.UNKNOWN_RANK, null, null, null, null, null);
         fDefinition = definition;
         fData = new HashMap<>();
     }
@@ -110,7 +112,7 @@ public class CustomEvent extends TmfEvent {
             ITmfTimestamp timestamp, String source, TmfEventType type,
             String reference) {
         /* Do not use upstream's fields for stuff we override */
-        super(parentTrace, null, source, null, null, reference);
+        super(parentTrace, ITmfContext.UNKNOWN_RANK, null, source, null, null, reference);
         fDefinition = definition;
         fData = new HashMap<>();
 

diff --git a/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/statesystem/AbstractTmfStateProvider.java b/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/statesystem/AbstractTmfStateProvider.java
index d862f431139378df53e1dbd00dcb978ca7917fb5..6101b0a97a6ab637b32dc923def7a9b55ad69352 100644 (file)
--- a/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/statesystem/AbstractTmfStateProvider.java
+++ b/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/statesystem/AbstractTmfStateProvider.java
@@ -20,6 +20,7 @@ import org.eclipse.tracecompass.statesystem.core.ITmfStateSystemBuilder;
 import org.eclipse.tracecompass.tmf.core.event.ITmfEvent;
 import org.eclipse.tracecompass.tmf.core.event.TmfEvent;
 import org.eclipse.tracecompass.tmf.core.timestamp.ITmfTimestamp;
+import org.eclipse.tracecompass.tmf.core.trace.ITmfContext;
 import org.eclipse.tracecompass.tmf.core.trace.ITmfTrace;
 
 /**
@@ -161,9 +162,18 @@ public abstract class AbstractTmfStateProvider implements ITmfStateProvider {
     // ------------------------------------------------------------------------
 
     /** Fake event indicating the build is over, and the provider should close */
-    private static class EndEvent extends TmfEvent {}
+    private static class EndEvent extends TmfEvent {
+        public EndEvent() {
+            super(null, ITmfContext.UNKNOWN_RANK, null, null, null, null, null);
+        }
+    }
+
     /** Fake event indicating we want to clear the current queue */
-    private static class EmptyQueueEvent extends TmfEvent {}
+    private static class EmptyQueueEvent extends TmfEvent {
+        public EmptyQueueEvent() {
+            super(null, ITmfContext.UNKNOWN_RANK, null, null, null, null, null);
+        }
+    }
 
     private static final EndEvent END_EVENT = new EndEvent();
     private static final EmptyQueueEvent EMPTY_QUEUE_EVENT = new EmptyQueueEvent();

diff --git a/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/trace/text/TextTraceEvent.java b/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/trace/text/TextTraceEvent.java
index 91abe45d5877354edfdddc35e1253306b3030a35..3f9ad4aab23a19ef756f04f2ff39fd8036cb138f 100644 (file)
--- a/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/trace/text/TextTraceEvent.java
+++ b/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/trace/text/TextTraceEvent.java
@@ -16,6 +16,7 @@ import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.tracecompass.tmf.core.event.ITmfEventType;
 import org.eclipse.tracecompass.tmf.core.event.TmfEvent;
 import org.eclipse.tracecompass.tmf.core.timestamp.ITmfTimestamp;
+import org.eclipse.tracecompass.tmf.core.trace.ITmfContext;
 
 /**
  * Class to store the common functionality of text trace events.
@@ -50,7 +51,7 @@ public abstract class TextTraceEvent extends TmfEvent {
             final ITmfEventType type,
             final TextTraceEventContent content,
             final String reference) {
-        super(parentTrace, timestamp, source, type, content, reference);
+        super(parentTrace, ITmfContext.UNKNOWN_RANK, timestamp, source, type, content, reference);
     }
 
     /**

diff --git a/org.eclipse.tracecompass.tmf.ui.tests/src/org/eclipse/tracecompass/tmf/ui/tests/statistics/TmfBaseColumnDataProviderTest.java b/org.eclipse.tracecompass.tmf.ui.tests/src/org/eclipse/tracecompass/tmf/ui/tests/statistics/TmfBaseColumnDataProviderTest.java
index 873fbe2946f7baede49dd6fb74c7081f809c1833..9abfb2fda81536354f00785c73b6a0cf85849c1c 100644 (file)
--- a/org.eclipse.tracecompass.tmf.ui.tests/src/org/eclipse/tracecompass/tmf/ui/tests/statistics/TmfBaseColumnDataProviderTest.java
+++ b/org.eclipse.tracecompass.tmf.ui.tests/src/org/eclipse/tracecompass/tmf/ui/tests/statistics/TmfBaseColumnDataProviderTest.java
@@ -29,6 +29,7 @@ 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.timestamp.TmfTimestamp;
+import org.eclipse.tracecompass.tmf.core.trace.ITmfContext;
 import org.eclipse.tracecompass.tmf.ui.viewers.statistics.model.Messages;
 import org.eclipse.tracecompass.tmf.ui.viewers.statistics.model.TmfBaseColumnData;
 import org.eclipse.tracecompass.tmf.ui.viewers.statistics.model.TmfBaseColumnDataProvider;
@@ -95,13 +96,13 @@ public class TmfBaseColumnDataProviderTest {
      */
     public TmfBaseColumnDataProviderTest() {
         fContent1 = new TmfEventField(ITmfEventField.ROOT_FIELD_ID, "Some content", null);
-        fEvent1 = new TmfEvent(null, fTimestamp1, fSource, fType1, fContent1, fReference);
+        fEvent1 = new TmfEvent(null, ITmfContext.UNKNOWN_RANK, fTimestamp1, fSource, fType1, fContent1, fReference);
 
         fContent2 = new TmfEventField(ITmfEventField.ROOT_FIELD_ID, "Some other content", null);
-        fEvent2 = new TmfEvent(null, fTimestamp2, fSource, fType2, fContent2, fReference);
+        fEvent2 = new TmfEvent(null, ITmfContext.UNKNOWN_RANK, fTimestamp2, fSource, fType2, fContent2, fReference);
 
         fContent3 = new TmfEventField(ITmfEventField.ROOT_FIELD_ID, "Some other different content", null);
-        fEvent3 = new TmfEvent(null, fTimestamp3, fSource, fType3, fContent3, fReference);
+        fEvent3 = new TmfEvent(null, ITmfContext.UNKNOWN_RANK, fTimestamp3, fSource, fType3, fContent3, fReference);
 
         fStatsData = new TmfStatisticsTree();
 

diff --git a/org.eclipse.tracecompass.tmf.ui.tests/src/org/eclipse/tracecompass/tmf/ui/tests/statistics/TmfBaseStatisticsDataTest.java b/org.eclipse.tracecompass.tmf.ui.tests/src/org/eclipse/tracecompass/tmf/ui/tests/statistics/TmfBaseStatisticsDataTest.java
index 11d5127baafb487b90c1b48ba3343f933ffcb081..dc772dc7861e222f058f1def26c883cbe384584a 100755 (executable)
--- a/org.eclipse.tracecompass.tmf.ui.tests/src/org/eclipse/tracecompass/tmf/ui/tests/statistics/TmfBaseStatisticsDataTest.java
+++ b/org.eclipse.tracecompass.tmf.ui.tests/src/org/eclipse/tracecompass/tmf/ui/tests/statistics/TmfBaseStatisticsDataTest.java
@@ -31,6 +31,7 @@ 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.timestamp.TmfTimestamp;
+import org.eclipse.tracecompass.tmf.core.trace.ITmfContext;
 import org.eclipse.tracecompass.tmf.ui.viewers.statistics.model.Messages;
 import org.eclipse.tracecompass.tmf.ui.viewers.statistics.model.TmfStatisticsTree;
 import org.eclipse.tracecompass.tmf.ui.viewers.statistics.model.TmfStatisticsTreeNode;
@@ -86,13 +87,13 @@ public class TmfBaseStatisticsDataTest {
      */
     public TmfBaseStatisticsDataTest() {
         fContent1 = new TmfEventField(ITmfEventField.ROOT_FIELD_ID, "Some content", null);
-        fEvent1 = new TmfEvent(null, fTimestamp1, fSource, fType1, fContent1, fReference);
+        fEvent1 = new TmfEvent(null, ITmfContext.UNKNOWN_RANK, fTimestamp1, fSource, fType1, fContent1, fReference);
 
         fContent2 = new TmfEventField(ITmfEventField.ROOT_FIELD_ID, "Some other content", null);
-        fEvent2 = new TmfEvent(null, fTimestamp2, fSource, fType2, fContent2, fReference);
+        fEvent2 = new TmfEvent(null, ITmfContext.UNKNOWN_RANK, fTimestamp2, fSource, fType2, fContent2, fReference);
 
         fContent3 = new TmfEventField(ITmfEventField.ROOT_FIELD_ID, "Some other different content", null);
-        fEvent3 = new TmfEvent(null, fTimestamp3, fSource, fType3, fContent3, fReference);
+        fEvent3 = new TmfEvent(null, ITmfContext.UNKNOWN_RANK, fTimestamp3, fSource, fType3, fContent3, fReference);
 
         fStatsTree = new TmfStatisticsTree();
 

diff --git a/org.eclipse.tracecompass.tmf.ui.tests/src/org/eclipse/tracecompass/tmf/ui/tests/statistics/TmfTreeContentProviderTest.java b/org.eclipse.tracecompass.tmf.ui.tests/src/org/eclipse/tracecompass/tmf/ui/tests/statistics/TmfTreeContentProviderTest.java
index 26b87517d0f52b05dfdcc47142f0c06c1b6875b3..383ee1fc00e573082e6b1550953f3b5ceda70bc0 100755 (executable)
--- a/org.eclipse.tracecompass.tmf.ui.tests/src/org/eclipse/tracecompass/tmf/ui/tests/statistics/TmfTreeContentProviderTest.java
+++ b/org.eclipse.tracecompass.tmf.ui.tests/src/org/eclipse/tracecompass/tmf/ui/tests/statistics/TmfTreeContentProviderTest.java
@@ -28,6 +28,7 @@ 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.timestamp.TmfTimestamp;
+import org.eclipse.tracecompass.tmf.core.trace.ITmfContext;
 import org.eclipse.tracecompass.tmf.ui.viewers.statistics.model.Messages;
 import org.eclipse.tracecompass.tmf.ui.viewers.statistics.model.TmfStatisticsTree;
 import org.eclipse.tracecompass.tmf.ui.viewers.statistics.model.TmfStatisticsTreeNode;
@@ -81,10 +82,10 @@ public class TmfTreeContentProviderTest {
      */
     public TmfTreeContentProviderTest() {
         fContent1 = new TmfEventField(ITmfEventField.ROOT_FIELD_ID, "Some content", null);
-        fEvent1 = new TmfEvent(null, fTimestamp1, fSource, fType1, fContent1, fReference);
+        fEvent1 = new TmfEvent(null, ITmfContext.UNKNOWN_RANK, fTimestamp1, fSource, fType1, fContent1, fReference);
 
         fContent2 = new TmfEventField(ITmfEventField.ROOT_FIELD_ID, "Some other content", null);
-        fEvent2 = new TmfEvent(null, fTimestamp2, fSource, fType2, fContent2, fReference);
+        fEvent2 = new TmfEvent(null, ITmfContext.UNKNOWN_RANK, fTimestamp2, fSource, fType2, fContent2, fReference);
 
         fStatsData = new TmfStatisticsTree();
 

diff --git a/org.eclipse.tracecompass.tmf.ui.tests/widgetStubs/org/eclipse/tracecompass/tmf/ui/tests/uml2sd/trace/TmfUml2SDTestTrace.java b/org.eclipse.tracecompass.tmf.ui.tests/widgetStubs/org/eclipse/tracecompass/tmf/ui/tests/uml2sd/trace/TmfUml2SDTestTrace.java
index 549f3cda36a0d7451677add68268392db5bc78f6..0e422360cc8bb7d60b98415eef25b33ff0158e37 100644 (file)
--- a/org.eclipse.tracecompass.tmf.ui.tests/widgetStubs/org/eclipse/tracecompass/tmf/ui/tests/uml2sd/trace/TmfUml2SDTestTrace.java
+++ b/org.eclipse.tracecompass.tmf.ui.tests/widgetStubs/org/eclipse/tracecompass/tmf/ui/tests/uml2sd/trace/TmfUml2SDTestTrace.java
@@ -100,7 +100,7 @@ public class TmfUml2SDTestTrace implements ITmfEventParser {
             fields[2] = new TmfEventField("signal", signal, null);
 
             ITmfEventField tmfContent = new TmfEventField(ITmfEventField.ROOT_FIELD_ID, content, fields);
-            ITmfEvent tmfEvent = new TmfEvent(fEventStream, new TmfTimestamp(ts, -9), source, tmfEventType, tmfContent, reference);
+            ITmfEvent tmfEvent = new TmfEvent(fEventStream, ITmfContext.UNKNOWN_RANK, new TmfTimestamp(ts, -9), source, tmfEventType, tmfContent, reference);
 
             return tmfEvent;
         } catch (final EOFException e) {