Made BigBang/BigCrunch/Zero ITmfTimestamp:s

[deliverable/tracecompass.git] / org.eclipse.linuxtools.tmf.ui / src / org / eclipse / linuxtools / tmf / ui / parsers / custom / CustomEvent.java

diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomEvent.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomEvent.java
index d6a04cf4da9d9752303c7c48dba07248cbf2f6bf..1a275f31cbaa60a67a2f7b5f22e94c24d5bb841c 100644 (file)
--- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomEvent.java
+++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomEvent.java
@@ -18,12 +18,12 @@ import java.util.Date;
 import java.util.HashMap;\r
 import java.util.Map;\r
 \r
-import org.eclipse.linuxtools.tmf.event.TmfEvent;\r
-import org.eclipse.linuxtools.tmf.event.TmfEventReference;\r
-import org.eclipse.linuxtools.tmf.event.TmfEventSource;\r
-import org.eclipse.linuxtools.tmf.event.TmfEventType;\r
-import org.eclipse.linuxtools.tmf.event.TmfTimestamp;\r
-import org.eclipse.linuxtools.tmf.trace.ITmfTrace;\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.TmfEventField;\r
+import org.eclipse.linuxtools.tmf.core.event.TmfEventType;\r
+import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp;\r
+import org.eclipse.linuxtools.tmf.core.trace.ITmfTrace;\r
 import org.eclipse.linuxtools.tmf.ui.parsers.custom.CustomTraceDefinition.OutputColumn;\r
 \r
 public class CustomEvent extends TmfEvent {\r
@@ -34,7 +34,7 @@ public class CustomEvent extends TmfEvent {
     \r
     protected CustomTraceDefinition fDefinition;\r
     protected Map<String, String> fData;\r
-    private String[] fColumnData;\r
+    private TmfEventField[] fColumnData;\r
 \r
     public CustomEvent(CustomTraceDefinition definition) {\r
         fDefinition = definition;\r
@@ -47,31 +47,19 @@ public class CustomEvent extends TmfEvent {
         fData = new HashMap<String, String>();\r
     }\r
 \r
-    public CustomEvent(CustomTraceDefinition definition, ITmfTrace<?> parentTrace, TmfTimestamp timestamp, TmfEventSource source, TmfEventType type, TmfEventReference reference) {\r
+    public CustomEvent(CustomTraceDefinition definition, ITmfTrace<?> parentTrace, ITmfTimestamp timestamp, String source, TmfEventType type, String reference) {\r
         super(parentTrace, timestamp, source, type, reference);\r
         fDefinition = definition;\r
         fData = new HashMap<String, String>();\r
     }\r
 \r
-    public CustomEvent(CustomTraceDefinition definition, TmfTimestamp originalTS, TmfTimestamp effectiveTS, TmfEventSource source, TmfEventType type, TmfEventReference reference) {\r
-        super(originalTS, effectiveTS, source, type, reference);\r
-        fDefinition = definition;\r
-        fData = new HashMap<String, String>();\r
-    }\r
-    \r
     @Override\r
-    public TmfTimestamp getTimestamp() {\r
+    public ITmfTimestamp getTimestamp() {\r
         if (fData != null) processData();\r
         return super.getTimestamp();\r
     }\r
 \r
-    @Override\r
-    public TmfTimestamp getOriginalTimestamp() {\r
-        if (fData != null) processData();\r
-        return super.getOriginalTimestamp();\r
-    }\r
-\r
-    public String[] extractItemFields() {\r
+    public TmfEventField[] extractItemFields() {\r
         if (fData != null) processData();\r
         return fColumnData;\r
     }\r
@@ -84,23 +72,23 @@ public class CustomEvent extends TmfEvent {
             SimpleDateFormat dateFormat = new SimpleDateFormat(timeStampInputFormat);\r
             try {\r
                 date = dateFormat.parse(timeStampString);\r
-                fOriginalTimestamp = fEffectiveTimestamp = new TmfTimestamp(date.getTime(), TIMESTAMP_SCALE);\r
+                fTimestamp = new TmfTimestamp(date.getTime(), TIMESTAMP_SCALE);\r
             } catch (ParseException e) {\r
-                fOriginalTimestamp = fEffectiveTimestamp = TmfTimestamp.Zero;\r
+                fTimestamp = TmfTimestamp.Zero;\r
             }\r
         } else {\r
-            fOriginalTimestamp = fEffectiveTimestamp = TmfTimestamp.Zero;\r
+            fTimestamp = TmfTimestamp.Zero;\r
         }\r
         \r
         int i = 0;\r
-        fColumnData = new String[fDefinition.outputs.size()];\r
+        fColumnData = new TmfEventField[fDefinition.outputs.size()];\r
         for (OutputColumn outputColumn : fDefinition.outputs) {\r
             String value = fData.get(outputColumn.name);\r
             if (outputColumn.name.equals(CustomTraceDefinition.TAG_TIMESTAMP) && date != null) {\r
                 SimpleDateFormat dateFormat = new SimpleDateFormat(fDefinition.timeStampOutputFormat);\r
-                fColumnData[i++] = dateFormat.format(date);\r
+                fColumnData[i++] = new TmfEventField(getContent(), outputColumn.name, dateFormat.format(date));\r
             } else {\r
-                fColumnData[i++] = (value != null ? value : ""); //$NON-NLS-1$\r
+                fColumnData[i++] = new TmfEventField(getContent(), outputColumn.name, (value != null ? value : "")); //$NON-NLS-1$\r
             }\r
         }\r
         fData = null;\r