ctf: Fix API inconsistencies

[deliverable/tracecompass.git] / org.eclipse.linuxtools.ctf.core / src / org / eclipse / linuxtools / ctf / core / trace / CTFTrace.java

diff --git a/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/ctf/core/trace/CTFTrace.java b/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/ctf/core/trace/CTFTrace.java
index 97973e7bbb693362c10e168522f21fca82ddadb6..92e9bbf14973d0e46d52534ca5a4e6d6ab28a1d4 100644 (file)
--- a/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/ctf/core/trace/CTFTrace.java
+++ b/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/ctf/core/trace/CTFTrace.java
@@ -39,16 +39,14 @@ import org.eclipse.linuxtools.ctf.core.event.CTFCallsite;
 import org.eclipse.linuxtools.ctf.core.event.CTFClock;
 import org.eclipse.linuxtools.ctf.core.event.EventDeclaration;
 import org.eclipse.linuxtools.ctf.core.event.EventDefinition;
+import org.eclipse.linuxtools.ctf.core.event.io.BitBuffer;
 import org.eclipse.linuxtools.ctf.core.event.types.ArrayDefinition;
 import org.eclipse.linuxtools.ctf.core.event.types.Definition;
 import org.eclipse.linuxtools.ctf.core.event.types.IDefinitionScope;
 import org.eclipse.linuxtools.ctf.core.event.types.IntegerDefinition;
 import org.eclipse.linuxtools.ctf.core.event.types.StructDeclaration;
 import org.eclipse.linuxtools.ctf.core.event.types.StructDefinition;
-import org.eclipse.linuxtools.internal.ctf.core.event.io.BitBuffer;
 import org.eclipse.linuxtools.internal.ctf.core.event.metadata.exceptions.ParseException;
-import org.eclipse.linuxtools.internal.ctf.core.trace.Stream;
-import org.eclipse.linuxtools.internal.ctf.core.trace.StreamInput;
 import org.eclipse.linuxtools.internal.ctf.core.trace.StreamInputPacketIndex;
 
 /**
@@ -278,7 +276,7 @@ public class CTFTrace implements IDefinitionScope {
      * @param id the StreamInput
      * @return The index
      */
-    public StreamInputPacketIndex getIndex(StreamInput id){
+    StreamInputPacketIndex getIndex(StreamInput id){
         if(! indexes.containsKey(id)){
             indexes.put(id, new StreamInputPacketIndex());
         }
@@ -649,6 +647,7 @@ public class CTFTrace implements IDefinitionScope {
     /**
      * gets the Environment variables from the trace metadata (See CTF spec)
      * @return the environment variables in a map form (key value)
+     * @since 2.0
      */
     public Map<String, String> getEnvironment() {
         return environment;
@@ -759,6 +758,7 @@ public class CTFTrace implements IDefinitionScope {
      * @param cycles
      *            clock cycles since boot
      * @return time in nanoseconds UTC offset
+     * @since 2.0
      */
     public long timestampCyclesToNanos(long cycles) {
         long retVal = cycles + getOffset();
@@ -776,6 +776,7 @@ public class CTFTrace implements IDefinitionScope {
      * @param nanos
      *            time in nanoseconds UTC offset
      * @return clock cycles since boot.
+     * @since 2.0
      */
     public long timestampNanoToCycles(long nanos) {
         long retVal;