Implement the new TMF Event Model

[deliverable/tracecompass.git] / org.eclipse.linuxtools.lttng.ui / src / org / eclipse / linuxtools / lttng / ui / views / events / EventsTable.java

diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/events/EventsTable.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/events/EventsTable.java
index 2c6388df59d398d015559de68965ca407aec17fa..7a4deab4d742d0e9acfbcec7a0330c1eea37929a 100644 (file)
--- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/events/EventsTable.java
+++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/events/EventsTable.java
@@ -13,9 +13,8 @@
 \r
 package org.eclipse.linuxtools.lttng.ui.views.events;\r
 \r
-import org.eclipse.linuxtools.tmf.core.event.ITmfEventContent;\r
+import org.eclipse.linuxtools.tmf.core.event.ITmfEvent;\r
 import org.eclipse.linuxtools.tmf.core.event.TmfEvent;\r
-import org.eclipse.linuxtools.tmf.core.event.TmfEventContent;\r
 import org.eclipse.linuxtools.tmf.core.event.TmfEventField;\r
 import org.eclipse.linuxtools.tmf.ui.viewers.events.TmfEventsTable;\r
 import org.eclipse.linuxtools.tmf.ui.widgets.ColumnData;\r
@@ -53,10 +52,10 @@ public class EventsTable extends TmfEventsTable {
 \r
     public EventsTable(Composite parent, int cacheSize) {\r
         super(parent, cacheSize, COLUMN_DATA);\r
-        fTable.getColumns()[0].setData(Key.FIELD_ID, TmfEventContent.FIELD_ID_TIMESTAMP);\r
-        fTable.getColumns()[1].setData(Key.FIELD_ID, TmfEventContent.FIELD_ID_REFERENCE);\r
-        fTable.getColumns()[2].setData(Key.FIELD_ID, TmfEventContent.FIELD_ID_TYPE);\r
-        fTable.getColumns()[3].setData(Key.FIELD_ID, TmfEventContent.FIELD_ID_CONTENT);\r
+        fTable.getColumns()[0].setData(Key.FIELD_ID, ITmfEvent.EVENT_FIELD_TIMESTAMP);\r
+        fTable.getColumns()[1].setData(Key.FIELD_ID, ITmfEvent.EVENT_FIELD_REFERENCE);\r
+        fTable.getColumns()[2].setData(Key.FIELD_ID, ITmfEvent.EVENT_FIELD_TYPE);\r
+        fTable.getColumns()[3].setData(Key.FIELD_ID, ITmfEvent.EVENT_FIELD_CONTENT);\r
     }\r
 \r
     /**\r
@@ -67,12 +66,11 @@ public class EventsTable extends TmfEventsTable {
     protected TmfEventField[] extractItemFields(TmfEvent event) {\r
         TmfEventField[] fields = new TmfEventField[0];\r
         if (event != null) {\r
-            ITmfEventContent content = event.getContent();\r
             fields = new TmfEventField[] {\r
-                     new TmfEventField(content, TmfEventContent.FIELD_ID_TIMESTAMP, ((Long) event.getTimestamp().getValue()).toString()),\r
-                     new TmfEventField(content, TmfEventContent.FIELD_ID_REFERENCE, event.getReference()),\r
-                     new TmfEventField(content, TmfEventContent.FIELD_ID_TYPE, event.getType().getId()),\r
-                     new TmfEventField(content, TmfEventContent.FIELD_ID_CONTENT, event.getContent().toString())\r
+                     new TmfEventField(ITmfEvent.EVENT_FIELD_TIMESTAMP, ((Long) event.getTimestamp().getValue()).toString()),\r
+                     new TmfEventField(ITmfEvent.EVENT_FIELD_REFERENCE, event.getReference()),\r
+                     new TmfEventField(ITmfEvent.EVENT_FIELD_TYPE, event.getType().getName()),\r
+                     new TmfEventField(ITmfEvent.EVENT_FIELD_CONTENT, event.getContent().toString())\r
                     };\r
         }\r
         return fields;\r