ctf.core: remove deprecated code

Change-Id: I6059c372ea8690d23e1aec89aee3a766ac5d7388
Signed-off-by: Loïc Prieur-Drevon <loic.prieurdrevon@gmail.com>
Reviewed-on: https://git.eclipse.org/r/96687
Reviewed-by: Hudson CI
Reviewed-by: Matthew Khouzam <matthew.khouzam@ericsson.com>
Tested-by: Matthew Khouzam <matthew.khouzam@ericsson.com>
Reviewed-by: Bernd Hufmann <bernd.hufmann@ericsson.com>
Tested-by: Bernd Hufmann <bernd.hufmann@ericsson.com>

diff --git a/ctf/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/event/CtfTmfEventFieldTest.java b/ctf/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/event/CtfTmfEventFieldTest.java
index 13ce88db88ac5f1806d12c0b1e13414699f54843..2686553a8c6d661da7c9b12ac1cc0337d9b0d581 100644 (file)
--- a/ctf/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/event/CtfTmfEventFieldTest.java
+++ b/ctf/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/event/CtfTmfEventFieldTest.java
@@ -182,7 +182,7 @@ public class CtfTmfEventFieldTest {
     @Test
     public void testParseField_float() {
         FloatDefinition fieldDef = (FloatDefinition) fixture.lookupDefinition(FLOAT);
-        CtfTmfEventField result = CtfTmfEventField.parseField((IDefinition)fieldDef, "_" + NAME);
+        CtfTmfEventField result = CtfTmfEventField.parseField(fieldDef, "_" + NAME);
         assertEquals("test=2.0", result.toString());
     }
 

diff --git a/ctf/org.eclipse.tracecompass.tmf.ctf.core/META-INF/MANIFEST.MF b/ctf/org.eclipse.tracecompass.tmf.ctf.core/META-INF/MANIFEST.MF
index 85a297a269d575687eb77b86e960d707c7055f74..7b283e34546498d20b38c21469ebff25d545f63c 100644 (file)
--- a/ctf/org.eclipse.tracecompass.tmf.ctf.core/META-INF/MANIFEST.MF
+++ b/ctf/org.eclipse.tracecompass.tmf.ctf.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-Vendor: %Bundle-Vendor
-Bundle-Version: 2.2.0.qualifier
+Bundle-Version: 3.0.0.qualifier
 Bundle-Localization: plugin
 Bundle-SymbolicName: org.eclipse.tracecompass.tmf.ctf.core;singleton:=true
 Bundle-Activator: org.eclipse.tracecompass.internal.tmf.ctf.core.Activator

diff --git a/ctf/org.eclipse.tracecompass.tmf.ctf.core/src/org/eclipse/tracecompass/tmf/ctf/core/event/CtfTmfEvent.java b/ctf/org.eclipse.tracecompass.tmf.ctf.core/src/org/eclipse/tracecompass/tmf/ctf/core/event/CtfTmfEvent.java
index 3fdff499abd683d8a898067e139b9161d450c61b..952217d9205e38112ed963c85fde1090ced7dd42 100644 (file)
--- a/ctf/org.eclipse.tracecompass.tmf.ctf.core/src/org/eclipse/tracecompass/tmf/ctf/core/event/CtfTmfEvent.java
+++ b/ctf/org.eclipse.tracecompass.tmf.ctf.core/src/org/eclipse/tracecompass/tmf/ctf/core/event/CtfTmfEvent.java
@@ -28,7 +28,6 @@ import org.eclipse.jdt.annotation.Nullable;
 import org.eclipse.tracecompass.ctf.core.event.IEventDeclaration;
 import org.eclipse.tracecompass.ctf.core.event.IEventDefinition;
 import org.eclipse.tracecompass.ctf.core.event.types.ICompositeDefinition;
-import org.eclipse.tracecompass.ctf.core.event.types.IDefinition;
 import org.eclipse.tracecompass.ctf.core.trace.ICTFStream;
 import org.eclipse.tracecompass.tmf.core.event.ITmfCustomAttributes;
 import org.eclipse.tracecompass.tmf.core.event.ITmfEventField;
@@ -50,6 +49,7 @@ import org.eclipse.tracecompass.tmf.ctf.core.trace.CtfTmfTrace;
  * of Declaration to native Java types.
  *
  * @author Alexandre Montplaisir
+ * @since 3.0
  */
 @NonNullByDefault
 public class CtfTmfEvent extends TmfEvent
@@ -217,17 +217,6 @@ public class CtfTmfEvent extends TmfEvent
         return fChannel;
     }
 
-    /**
-     * Return this event's reference.
-     *
-     * @return The event's reference
-     * @deprecated This method was replaced by {@link #getChannel()}.
-     */
-    @Deprecated
-    public String getReference() {
-        return getChannel();
-    }
-
     /**
      * Get the stream Id
      *
@@ -247,7 +236,7 @@ public class CtfTmfEvent extends TmfEvent
      * some cases it is the same as the actual timestamp.
      *
      * @return the event unscaled time in long format.
-     * @since 2.2
+     * @since 3.0
      */
     public long getUnscaledTime() {
         return fEvent.getTimestamp();
@@ -309,7 +298,7 @@ public class CtfTmfEvent extends TmfEvent
         if (structFields != null) {
             if (structFields.getFieldNames() != null) {
                 for (String fn : structFields.getFieldNames()) {
-                    fields.add(CtfTmfEventField.parseField((IDefinition) structFields.getDefinition(fn), fn));
+                    fields.add(CtfTmfEventField.parseField(structFields.getDefinition(fn), fn));
                 }
             }
         }
@@ -319,7 +308,7 @@ public class CtfTmfEvent extends TmfEvent
             for (String contextName : structContext.getFieldNames()) {
                 /* Prefix field name */
                 String curContextName = CtfConstants.CONTEXT_FIELD_PREFIX + contextName;
-                fields.add(CtfTmfEventField.parseField((IDefinition) structContext.getDefinition(contextName), curContextName));
+                fields.add(CtfTmfEventField.parseField(structContext.getDefinition(contextName), curContextName));
             }
         }
 
@@ -356,7 +345,7 @@ public class CtfTmfEvent extends TmfEvent
      * Get the call site for this event.
      *
      * @return the call site information, or null if there is none
-     * @since 2.2
+     * @since 3.0
      */
     @Override
     public @Nullable ITmfCallsite getCallsite() {

diff --git a/ctf/org.eclipse.tracecompass.tmf.ctf.core/src/org/eclipse/tracecompass/tmf/ctf/core/event/CtfTmfEventField.java b/ctf/org.eclipse.tracecompass.tmf.ctf.core/src/org/eclipse/tracecompass/tmf/ctf/core/event/CtfTmfEventField.java
index 4f0f38c5df6bfb2fc8e9806ca55739d04d3b6c7f..eaf2be2c09796989fa0df0397bcafab30658c3c9 100644 (file)
--- a/ctf/org.eclipse.tracecompass.tmf.ctf.core/src/org/eclipse/tracecompass/tmf/ctf/core/event/CtfTmfEventField.java
+++ b/ctf/org.eclipse.tracecompass.tmf.ctf.core/src/org/eclipse/tracecompass/tmf/ctf/core/event/CtfTmfEventField.java
@@ -85,22 +85,6 @@ public abstract class CtfTmfEventField extends TmfEventField {
     // Operations
     // ------------------------------------------------------------------------
 
-    /**
-     * Factory method to instantiate CtfTmfEventField objects.
-     *
-     * @param fieldDef
-     *            The CTF Definition of this event field
-     * @param fieldName
-     *            String The name to assign to this field
-     * @return The resulting CtfTmfEventField object
-     * @deprecated use {@link CtfTmfEventField#parseField(IDefinition, String)}
-     */
-    @Deprecated
-    public static CtfTmfEventField parseField(Definition fieldDef,
-            @NonNull String fieldName) {
-        return parseField((IDefinition) fieldDef, fieldName);
-    }
-
     /**
      * Factory method to instantiate CtfTmfEventField objects.
      *
@@ -198,7 +182,7 @@ public abstract class CtfTmfEventField extends TmfEventField {
             List<ITmfEventField> list = new ArrayList<>();
             /* Recursively parse the fields */
             for (String fn : strDef.getFieldNames()) {
-                list.add(CtfTmfEventField.parseField((IDefinition) strDef.getDefinition(fn), fn));
+                list.add(CtfTmfEventField.parseField(strDef.getDefinition(fn), fn));
             }
             field = new CTFStructField(fieldName, list.toArray(new CtfTmfEventField[list.size()]));
 

diff --git a/ctf/org.eclipse.tracecompass.tmf.ctf.core/src/org/eclipse/tracecompass/tmf/ctf/core/event/lookup/CtfTmfCallsite.java b/ctf/org.eclipse.tracecompass.tmf.ctf.core/src/org/eclipse/tracecompass/tmf/ctf/core/event/lookup/CtfTmfCallsite.java
index 2a4c2cfb2b5873bbb95bb6e8908a7b76301037ec..988d445d100e87fba4aec19526188f3cce8aa8ca 100644 (file)
--- a/ctf/org.eclipse.tracecompass.tmf.ctf.core/src/org/eclipse/tracecompass/tmf/ctf/core/event/lookup/CtfTmfCallsite.java
+++ b/ctf/org.eclipse.tracecompass.tmf.ctf.core/src/org/eclipse/tracecompass/tmf/ctf/core/event/lookup/CtfTmfCallsite.java
@@ -22,7 +22,7 @@ import org.eclipse.tracecompass.tmf.core.event.lookup.TmfCallsite;
  * CTF TMF call site information for source code lookup.
  *
  * @author Patrick Tasse
- * @since 2.2
+ * @since 3.0
  */
 public class CtfTmfCallsite extends TmfCallsite {
 

diff --git a/ctf/org.eclipse.tracecompass.tmf.ctf.core/src/org/eclipse/tracecompass/tmf/ctf/core/trace/CtfTmfTrace.java b/ctf/org.eclipse.tracecompass.tmf.ctf.core/src/org/eclipse/tracecompass/tmf/ctf/core/trace/CtfTmfTrace.java
index 017d1dfbc57eeb221b002ec37b9376783ce0f50f..fcb340853a41bb7a93f4e5479492a52b6e568134 100644 (file)
--- a/ctf/org.eclipse.tracecompass.tmf.ctf.core/src/org/eclipse/tracecompass/tmf/ctf/core/trace/CtfTmfTrace.java
+++ b/ctf/org.eclipse.tracecompass.tmf.ctf.core/src/org/eclipse/tracecompass/tmf/ctf/core/trace/CtfTmfTrace.java
@@ -467,7 +467,7 @@ public class CtfTmfTrace extends TmfTrace
      * @param eventName
      *            The event name to look for
      * @return The best callsite candidate
-     * @since 2.2
+     * @since 3.0
      */
     public @Nullable CtfTmfCallsite getCallsite(String eventName) {
         for (ICTFStream stream : fTrace.getStreams()) {
@@ -490,7 +490,7 @@ public class CtfTmfTrace extends TmfTrace
      * @param ip
      *            The instruction pointer
      * @return The closest matching callsite
-     * @since 2.2
+     * @since 3.0
      */
     public @Nullable CtfTmfCallsite getCallsite(String eventName, long ip) {
         CtfTmfCallsite callsite = null;
@@ -794,7 +794,7 @@ public class CtfTmfTrace extends TmfTrace
     }
 
     /**
-     * @since 2.2
+     * @since 3.0
      */
     @Override
     public long cyclesToNanos(long cycles) {
@@ -803,7 +803,7 @@ public class CtfTmfTrace extends TmfTrace
     }
 
     /**
-     * @since 2.2
+     * @since 3.0
      */
     @Override
     public long nanosToCycles(long nanos) {
@@ -812,7 +812,7 @@ public class CtfTmfTrace extends TmfTrace
     }
 
     /**
-     * @since 2.2
+     * @since 3.0
      */
     @Override
     public ITmfTimestamp readStart() {
@@ -820,7 +820,7 @@ public class CtfTmfTrace extends TmfTrace
     }
 
     /**
-     * @since 2.2
+     * @since 3.0
      */
     @Override
     public ITmfTimestamp readEnd() {