Refactor TmfTrace and dependencies - move parseEvent to ITmfEventParser

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

diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/custom/CustomXmlTrace.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/custom/CustomXmlTrace.java
index 707fddc7c43a88f1d050515133211f485a09a551..bc36be6d80cb11e0c85e7b306f1414f65724c07a 100644 (file)
--- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/custom/CustomXmlTrace.java
+++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/custom/CustomXmlTrace.java
@@ -29,6 +29,7 @@ import org.eclipse.linuxtools.tmf.core.event.TmfEvent;
 import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp;\r
 import org.eclipse.linuxtools.tmf.core.io.BufferedRandomAccessFile;\r
 import org.eclipse.linuxtools.tmf.core.trace.ITmfContext;\r
+import org.eclipse.linuxtools.tmf.core.trace.ITmfEventParser;\r
 import org.eclipse.linuxtools.tmf.core.trace.ITmfLocation;\r
 import org.eclipse.linuxtools.tmf.core.trace.TmfContext;\r
 import org.eclipse.linuxtools.tmf.core.trace.TmfLocation;\r
@@ -43,7 +44,7 @@ import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;\r
 import org.xml.sax.SAXParseException;\r
 \r
-public class CustomXmlTrace extends TmfTrace<CustomXmlEvent> {\r
+public class CustomXmlTrace extends TmfTrace<CustomXmlEvent> implements ITmfEventParser<CustomXmlEvent> {\r
 \r
     private static final TmfLocation<Long> NULL_LOCATION = new TmfLocation<Long>((Long) null);\r
     private static final int DEFAULT_CACHE_SIZE = 100;\r
@@ -71,7 +72,7 @@ public class CustomXmlTrace extends TmfTrace<CustomXmlEvent> {
     }\r
 \r
     @Override\r
-    public TmfContext seekLocation(final ITmfLocation<?> location) {\r
+    public TmfContext seekEvent(final ITmfLocation<?> location) {\r
         final CustomXmlTraceContext context = new CustomXmlTraceContext(NULL_LOCATION, ITmfContext.INITIAL_RANK);\r
         if (NULL_LOCATION.equals(location) || !new File(getPath()).isFile())\r
             return context;\r
@@ -105,7 +106,7 @@ public class CustomXmlTrace extends TmfTrace<CustomXmlEvent> {
     }\r
 \r
     @Override\r
-    public TmfContext seekLocation(final double ratio) {\r
+    public TmfContext seekEvent(final double ratio) {\r
         BufferedRandomAccessFile raFile = null;\r
         try {\r
             raFile = new BufferedRandomAccessFile(getPath(), "r"); //$NON-NLS-1$\r
@@ -118,7 +119,7 @@ public class CustomXmlTrace extends TmfTrace<CustomXmlEvent> {
                 pos--;\r
             }\r
             final ITmfLocation<?> location = new TmfLocation<Long>(pos);\r
-            final TmfContext context = seekLocation(location);\r
+            final TmfContext context = seekEvent(location);\r
             context.setRank(ITmfContext.UNKNOWN_RANK);\r
             return context;\r
         } catch (final FileNotFoundException e) {\r
@@ -167,7 +168,7 @@ public class CustomXmlTrace extends TmfTrace<CustomXmlEvent> {
     }\r
 \r
     @Override\r
-    public synchronized TmfEvent getNextEvent(final ITmfContext context) {\r
+    public synchronized TmfEvent readEvent(final ITmfContext context) {\r
         final ITmfContext savedContext = context.clone();\r
         final TmfEvent event = parseEvent(context);\r
         if (event != null) {\r