tmf: CtfTmfEvent improvements

[deliverable/tracecompass.git] / org.eclipse.linuxtools.tmf.core / src / org / eclipse / linuxtools / tmf / core / ctfadaptor / CtfIterator.java

diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/ctfadaptor/CtfIterator.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/ctfadaptor/CtfIterator.java
index 62add563df8ee91460fab568d9751e418dddc8dc..a9fd93f604248f8a10cb2f6fa41639b83e81e601 100644 (file)
--- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/ctfadaptor/CtfIterator.java
+++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/ctfadaptor/CtfIterator.java
@@ -78,7 +78,7 @@ public class CtfIterator extends CTFTraceReader implements ITmfContext,
         this.ctfTmfTrace = trace;
         if (this.hasMoreEvents()) {
             this.curLocation = new CtfLocation(ctfLocationData);
-            if (this.getCurrentEvent().getTimestampValue() != ctfLocationData.getTimestamp()) {
+            if (this.getCurrentEvent().getTimestamp().getValue() != ctfLocationData.getTimestamp()) {
                 this.seek(ctfLocationData);
                 this.curRank = rank;
             }
@@ -135,10 +135,10 @@ public class CtfIterator extends CTFTraceReader implements ITmfContext,
          */
         long index = 0;
         if (this.getCurrentEvent() != null) {
-            currTimestamp = this.getCurrentEvent().getTimestampValue();
+            currTimestamp = this.getCurrentEvent().getTimestamp().getValue();
 
             for (long i = 0; i < ctfLocationData.getIndex(); i++) {
-                if (currTimestamp == this.getCurrentEvent().getTimestampValue()) {
+                if (currTimestamp == this.getCurrentEvent().getTimestamp().getValue()) {
                     index++;
                 } else {
                     index = 0;
@@ -150,7 +150,7 @@ public class CtfIterator extends CTFTraceReader implements ITmfContext,
         }
         /* Seek the current location accordingly */
         if (ret) {
-            curLocation.setLocation(new CtfLocationData(getCurrentEvent().getTimestampValue(), index));
+            curLocation.setLocation(new CtfLocationData(getCurrentEvent().getTimestamp().getValue(), index));
         } else {
             curLocation = NULL_LOCATION;
         }
@@ -253,7 +253,7 @@ public class CtfIterator extends CTFTraceReader implements ITmfContext,
         boolean ret = super.advance();
 
         if (ret) {
-            final long timestampValue = getCurrentEvent().getTimestampValue();
+            final long timestampValue = getCurrentEvent().getTimestamp().getValue();
             if (timestamp == timestampValue) {
                 curLocation.setLocation(timestampValue, index + 1);
             } else {