Re-structure LTTng sub-project as per the Linux Tools guidelines

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

diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomTxtEvent.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomTxtEvent.java
index 7008ee58275f8de74c3850fe60079c1484871e17..c09612991a181f1c0758ae52f929e06a8720c066 100644 (file)
--- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomTxtEvent.java
+++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomTxtEvent.java
@@ -14,22 +14,28 @@ package org.eclipse.linuxtools.tmf.ui.parsers.custom;
 \r
 import java.util.regex.Matcher;\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.core.event.TmfEvent;\r
+import org.eclipse.linuxtools.tmf.core.event.TmfEventReference;\r
+import org.eclipse.linuxtools.tmf.core.event.TmfEventSource;\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.CustomTxtTraceDefinition.InputData;\r
 import org.eclipse.linuxtools.tmf.ui.parsers.custom.CustomTxtTraceDefinition.InputLine;\r
 \r
 public class CustomTxtEvent extends CustomEvent {\r
 \r
+    public CustomTxtEvent(CustomTxtTraceDefinition definition) {\r
+        super(definition);\r
+        fType = new CustomTxtEventType(definition);\r
+    }\r
+\r
     public CustomTxtEvent(CustomTxtTraceDefinition definition, TmfEvent other) {\r
         super(definition, other);\r
     }\r
 \r
-    public CustomTxtEvent(CustomTxtTraceDefinition definition, TmfTimestamp timestamp, TmfEventSource source, TmfEventType type, TmfEventReference reference) {\r
-        super(definition, timestamp, source, type, reference);\r
+    public CustomTxtEvent(CustomTxtTraceDefinition definition, ITmfTrace<?> parentTrace, TmfTimestamp timestamp, TmfEventSource source, TmfEventType type, TmfEventReference reference) {\r
+        super(definition, parentTrace, timestamp, source, type, reference);\r
     }\r
 \r
     public CustomTxtEvent(CustomTxtTraceDefinition definition, TmfTimestamp originalTS, TmfTimestamp effectiveTS, TmfEventSource source, TmfEventType type, TmfEventReference reference) {\r
@@ -37,6 +43,9 @@ public class CustomTxtEvent extends CustomEvent {
     }\r
 \r
     public void processGroups(InputLine input, Matcher matcher) {\r
+       if (input.columns == null) {\r
+               return;\r
+       }\r
         for (int i = 0; i < input.columns.size(); i++) {\r
             InputData column = input.columns.get(i);\r
             if (i < matcher.groupCount() && matcher.group(i + 1) != null) {\r