X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=org.eclipse.tracecompass.tmf.core%2Fsrc%2Forg%2Feclipse%2Ftracecompass%2Ftmf%2Fcore%2Fevent%2FITmfEvent.java;h=7c5bee2c555b16216d6623a76c0ec5d2dfc9dee3;hb=ae09c4ad11542af46a11d270e81dd8707d3da2b2;hp=6c2d6ace25097c7556f8b4712b0b976d35bb4af1;hpb=2bdf019339ac84238fd9be69f208d9e7741094c3;p=deliverable%2Ftracecompass.git

diff --git a/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/event/ITmfEvent.java b/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/event/ITmfEvent.java
index 6c2d6ace25..7c5bee2c55 100644
--- a/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/event/ITmfEvent.java
+++ b/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/event/ITmfEvent.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2012, 2013 Ericsson
+ * Copyright (c) 2012, 2015 Ericsson
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v1.0 which
@@ -23,15 +23,10 @@ import org.eclipse.tracecompass.tmf.core.trace.ITmfTrace;
  * <li>a parent trace
  * <li>a rank (order within the trace)
  * <li>a timestamp
- * <li>a source (reporting component)
  * <li>a type
  * <li>a content (payload)
  * </ul>
- * For convenience, a free-form reference field is also provided. It could be
- * used as e.g. a location marker (filename:lineno) to indicate where the event
- * was generated.
  *
- * @version 1.0
  * @author Francois Chouinard
  *
  * @see ITmfTimestamp
@@ -41,35 +36,6 @@ import org.eclipse.tracecompass.tmf.core.trace.ITmfTrace;
  */
 public interface ITmfEvent extends IAdaptable {
 
-    // ------------------------------------------------------------------------
-    // Constants
-    // ------------------------------------------------------------------------
-
-    /**
-     * Pre-defined event timestamp attribute (for searching &filtering purposes)
-     */
-    public static final @NonNull String EVENT_FIELD_TIMESTAMP = ":timestamp:"; //$NON-NLS-1$
-
-    /**
-     * Pre-defined event source attribute (for searching &filtering purposes)
-     */
-    public static final @NonNull String EVENT_FIELD_SOURCE = ":source:"; //$NON-NLS-1$
-
-    /**
-     * Pre-defined event type attribute (for searching &filtering purposes)
-     */
-    public static final @NonNull String EVENT_FIELD_TYPE = ":type:"; //$NON-NLS-1$
-
-    /**
-     * Pre-defined event content attribute (for searching &filtering purposes)
-     */
-    public static final @NonNull String EVENT_FIELD_CONTENT = ":content:"; //$NON-NLS-1$
-
-    /**
-     * Pre-defined event reference attribute (for searching &filtering purposes)
-     */
-    public static final @NonNull String EVENT_FIELD_REFERENCE = ":reference:"; //$NON-NLS-1$
-
     // ------------------------------------------------------------------------
     // Getters
     // ------------------------------------------------------------------------
@@ -77,7 +43,7 @@ public interface ITmfEvent extends IAdaptable {
     /**
      * @return the trace that 'owns' the event
      */
-    ITmfTrace getTrace();
+    @NonNull ITmfTrace getTrace();
 
     /**
      * @return the event rank within the parent trace
@@ -86,14 +52,8 @@ public interface ITmfEvent extends IAdaptable {
 
     /**
      * @return the event timestamp
-     * @since 2.0
-     */
-    ITmfTimestamp getTimestamp();
-
-    /**
-     * @return the event source
      */
-    String getSource();
+    @NonNull ITmfTimestamp getTimestamp();
 
     /**
      * @return the event type
@@ -104,10 +64,4 @@ public interface ITmfEvent extends IAdaptable {
      * @return the event content
      */
     ITmfEventField getContent();
-
-    /**
-     * @return the event reference
-     */
-    String getReference();
-
 }