Implement the new TMF Event Model

[deliverable/tracecompass.git] / org.eclipse.linuxtools.tmf.ui / src / org / eclipse / linuxtools / tmf / ui / viewers / events / TmfEventsTable.java

diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/events/TmfEventsTable.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/events/TmfEventsTable.java
index adf05e07c69821af9772f0f78500f2391db3b59d..03945036bebdcccca1d9245a3a4e8e4da2215e63 100644 (file)
--- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/events/TmfEventsTable.java
+++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/events/TmfEventsTable.java
@@ -44,10 +44,9 @@ import org.eclipse.jface.resource.JFaceResources;
 import org.eclipse.jface.resource.LocalResourceManager;\r
 import org.eclipse.linuxtools.tmf.core.component.ITmfDataProvider;\r
 import org.eclipse.linuxtools.tmf.core.component.TmfComponent;\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.ITmfTimestamp;\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.core.event.TmfTimeRange;\r
 import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp;\r
@@ -238,11 +237,11 @@ public class TmfEventsTable extends TmfComponent implements IGotoMarker, IColorS
 \r
         // Set the default column field ids if this is not a subclass\r
         if (Arrays.equals(columnData, 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_SOURCE);\r
-            fTable.getColumns()[2].setData(Key.FIELD_ID, TmfEventContent.FIELD_ID_TYPE);\r
-            fTable.getColumns()[3].setData(Key.FIELD_ID, TmfEventContent.FIELD_ID_REFERENCE);\r
-            fTable.getColumns()[4].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_SOURCE);\r
+            fTable.getColumns()[2].setData(Key.FIELD_ID, ITmfEvent.EVENT_FIELD_TYPE);\r
+            fTable.getColumns()[3].setData(Key.FIELD_ID, ITmfEvent.EVENT_FIELD_REFERENCE);\r
+            fTable.getColumns()[4].setData(Key.FIELD_ID, ITmfEvent.EVENT_FIELD_CONTENT);\r
         }\r
 \r
         // Set the frozen row for header row\r
@@ -1375,13 +1374,12 @@ public class TmfEventsTable extends TmfComponent implements IGotoMarker, IColorS
     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_SOURCE, event.getSource()),\r
-                     new TmfEventField(content, TmfEventContent.FIELD_ID_TYPE, event.getType().getId()),\r
-                     new TmfEventField(content, TmfEventContent.FIELD_ID_REFERENCE, event.getReference()),\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_SOURCE, event.getSource()),\r
+                     new TmfEventField(ITmfEvent.EVENT_FIELD_TYPE, event.getType().getName()),\r
+                     new TmfEventField(ITmfEvent.EVENT_FIELD_REFERENCE, event.getReference()),\r
+                     new TmfEventField(ITmfEvent.EVENT_FIELD_CONTENT, event.getContent().toString())\r
                     };\r
         }\r
         return fields;\r