Fix for custom parsers

[deliverable/tracecompass.git] / org.eclipse.linuxtools.tmf / src / org / eclipse / linuxtools / tmf / event / TmfEvent.java

diff --git a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/event/TmfEvent.java b/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/event/TmfEvent.java
index 8f8ebc1d39c1549f3c654e7623addd37eadedd39..be395743de9bee72ef9b29197fd283f2b7638f44 100644 (file)
--- a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/event/TmfEvent.java
+++ b/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/event/TmfEvent.java
@@ -43,7 +43,7 @@ public class TmfEvent extends TmfData implements Cloneable {
     // Attributes
     // ------------------------------------------------------------------------
 
-       protected ITmfTrace         fParentTrace;
+       protected ITmfTrace<?>         fParentTrace;
        protected long              fEventRank;
        protected TmfTimestamp      fEffectiveTimestamp;
        protected TmfTimestamp      fOriginalTimestamp;
@@ -60,13 +60,14 @@ public class TmfEvent extends TmfData implements Cloneable {
     // ------------------------------------------------------------------------
 
     /**
+     * @param trace the parent trace
      * @param originalTS the original timestamp
      * @param effectiveTS the effective timestamp
      * @param source the event source (generator)
      * @param type the event type
      * @param reference a free-form reference field
      */
-    public TmfEvent(ITmfTrace trace, long rank, TmfTimestamp originalTS, TmfTimestamp effectiveTS,
+    public TmfEvent(ITmfTrace<?> trace, long rank, TmfTimestamp originalTS, TmfTimestamp effectiveTS,
             TmfEventSource source, TmfEventType type, TmfEventReference reference)
     {
         fParentTrace        = trace;
@@ -91,6 +92,19 @@ public class TmfEvent extends TmfData implements Cloneable {
         this(null, -1, originalTS, effectiveTS, source, type, reference);
        }
 
+    /**
+     * @param trace the parent trace
+     * @param timestamp the effective timestamp
+     * @param source the event source (generator)
+     * @param type the event type
+     * @param reference a free-form reference field
+     */
+    public TmfEvent(ITmfTrace<?> parentTrace, TmfTimestamp timestamp, TmfEventSource source,
+            TmfEventType type, TmfEventReference reference)
+    {
+        this(parentTrace, -1, timestamp, timestamp, source, type, reference);
+    }
+
        /**
         * @param timestamp the effective timestamp
         * @param source the event source (generator)
@@ -136,7 +150,7 @@ public class TmfEvent extends TmfData implements Cloneable {
     /**
      * @return the parent trace
      */
-    public ITmfTrace getParentTrace() {
+    public ITmfTrace<?> getParentTrace() {
         return fParentTrace;
     }