Fix some minor issues in TMF for CTF support

6 files changed, 3 insertions, 37 deletions

diff --git a/lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfTimeRange.java b/lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfTimeRange.java
index 5b52285ab2..71886dbbd2 100644
--- a/lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfTimeRange.java
+++ b/lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfTimeRange.java
@@ -220,7 +220,7 @@ public final class TmfTimeRange implements Cloneable {
     @Override
     @SuppressWarnings("nls")
     public String toString() {
-        return "TmfTimeRange [" + fStartTime + ", " + fEndTime + "]";
+        return "TmfTimeRange [fStartTime=" + fStartTime + ", fEndTime=" + fEndTime + "]";
     }
 
 }
diff --git a/lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfTimestamp.java b/lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfTimestamp.java
index e79a54ffd4..601ac3f829 100644
--- a/lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfTimestamp.java
+++ b/lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfTimestamp.java
@@ -355,16 +355,7 @@ public class TmfTimestamp implements ITmfTimestamp, Cloneable {
     @Override
     @SuppressWarnings("nls")
     public String toString() {
-        if (equals(BIG_BANG)) {
-            return "BIG_BANG";
-        }
-        if (equals(BIG_CRUNCH)) {
-            return "BIG_CRUNCH";
-        }
-        if (equals(ZERO)) {
-            return "ZERO";
-        }
-        return "[" + fValue + "," + fScale + "," + fPrecision + "]";
+        return "TmfTimestamp [fValue=" + fValue + ", fScale=" + fScale + ", fPrecision=" + fPrecision + "]";
     }
 
 }
diff --git a/lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/experiment/TmfExperiment.java b/lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/experiment/TmfExperiment.java
index 2d0b0fcdc1..3c3d689933 100644
--- a/lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/experiment/TmfExperiment.java
+++ b/lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/experiment/TmfExperiment.java
@@ -84,7 +84,6 @@ public class TmfExperiment<T extends ITmfEvent> extends TmfTrace<T> implements I
         try {
             super.initTrace(resource, path, type);
         } catch (TmfTraceException e) {
-            // TODO Auto-generated catch block
             e.printStackTrace();
         }
     }
@@ -208,9 +207,6 @@ public class TmfExperiment<T extends ITmfEvent> extends TmfTrace<T> implements I
             timestamp = null;
         }
 
-        if (request.getIndex() == 600001) {
-            System.out.println("Aie"); //$NON-NLS-1$
-        }
         ITmfContext context = null;
         if (timestamp != null) { // Seek by timestamp
             context = seekEvent(timestamp);
diff --git a/lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/experiment/TmfLegacyExperiment.java b/lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/experiment/TmfLegacyExperiment.java
index 2de95e36db..1d4976fd62 100644
--- a/lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/experiment/TmfLegacyExperiment.java
+++ b/lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/experiment/TmfLegacyExperiment.java
@@ -724,7 +724,7 @@ public class TmfLegacyExperiment<T extends ITmfEvent> extends TmfExperiment<T> {
     // The index page size
     private static final int DEFAULT_INDEX_PAGE_SIZE = 5000;
 //    protected int fIndexPageSize;
-    protected boolean fIndexing = false;
+//    protected boolean fIndexing = false;
     protected TmfTimeRange fIndexingPendingRange = TmfTimeRange.NULL_RANGE;
 
 //    private Integer fEndSynchReference;
diff --git a/lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/TmfCheckpointIndexer.java b/lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/TmfCheckpointIndexer.java
index f1605e0419..d6b62f86ca 100644
--- a/lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/TmfCheckpointIndexer.java
+++ b/lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/TmfCheckpointIndexer.java
@@ -20,7 +20,6 @@ import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.linuxtools.internal.tmf.core.Tracer;
 import org.eclipse.linuxtools.tmf.core.event.ITmfEvent;
 import org.eclipse.linuxtools.tmf.core.event.ITmfTimestamp;
 import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange;
@@ -126,8 +125,6 @@ public class TmfCheckpointIndexer<T extends ITmfTrace<ITmfEvent>> implements ITm
         };
         job.schedule();
 
-        System.out.println("TmfCheckpointIndexer.buildIndex()");;
-
         // Clear the checkpoints
         fTraceIndex.clear();
 
@@ -149,10 +146,6 @@ public class TmfCheckpointIndexer<T extends ITmfTrace<ITmfEvent>> implements ITm
                     }
                     lastTime = timestamp.clone();
 
-                    if (Tracer.isEventTraced()) {
-                        Tracer.traceEvent(fTrace, this, event);
-                    }
-
                     // Update the trace status at regular intervals
                     if ((getNbRead() % fCheckpointInterval) == 0) {
                         updateTraceStatus();
@@ -215,7 +208,6 @@ public class TmfCheckpointIndexer<T extends ITmfTrace<ITmfEvent>> implements ITm
             if (fTraceIndex.size() == position) {
                 final ITmfLocation<?> location = context.getLocation().clone();
                 fTraceIndex.add(new TmfCheckpoint(timestamp.clone(), location));
-                System.out.println("TmfCheckpointIndexer.updateIndex()" + "[" + (fTraceIndex.size() - 1) + "] " + timestamp + ", " + location.toString());
             }
         }
     }
diff --git a/lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/TmfTrace.java b/lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/TmfTrace.java
index 530169f567..fa637436b9 100644
--- a/lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/TmfTrace.java
+++ b/lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/TmfTrace.java
@@ -554,19 +554,6 @@ public abstract class TmfTrace<T extends ITmfEvent> extends TmfEventProvider<T>
         return seekEvent(request.getIndex());
     }
 
-//    /* (non-Javadoc)
-//     * @see org.eclipse.linuxtools.tmf.core.component.TmfDataProvider#getNext(org.eclipse.linuxtools.tmf.core.trace.ITmfContext)
-//     */
-//    @Override
-//    @SuppressWarnings("unchecked")
-//    public T getNext(final ITmfContext context) {
-//        if (context instanceof TmfContext) {
-//            return (T) readNextEvent(context);
-//        }
-//        return null;
-//    }
-
-
     // ------------------------------------------------------------------------
     // toString
     // ------------------------------------------------------------------------