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 13ce88d..2686553 100644
--- 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 @@
@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 85a297a..7b283e3 100644
--- 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 @@
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 3fdff49..952217d 100644
--- 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.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 @@
* of Declaration to native Java types.
*
* @author Alexandre Montplaisir
+ * @since 3.0
*/
@NonNullByDefault
public class CtfTmfEvent extends TmfEvent
@@ -218,17 +218,6 @@
}
/**
- * 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
*
* @return the stream ID or -1 if the stream is null
@@ -247,7 +236,7 @@
* 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 @@
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 @@
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 @@
* 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 4f0f38c..eaf2be2 100644
--- 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
@@ -93,22 +93,6 @@
* @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.
- *
- * @param fieldDef
- * The CTF Definition of this event field
- * @param fieldName
- * String The name to assign to this field
- * @return The resulting CtfTmfEventField object
*/
public static @NonNull CtfTmfEventField parseField(IDefinition fieldDef,
@NonNull String fieldName) {
@@ -198,7 +182,7 @@
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 2a4c2cf..988d445 100644
--- 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 @@
* 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 017d1df..fcb3408 100644
--- 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 @@
* @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 @@
* @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 @@
}
/**
- * @since 2.2
+ * @since 3.0
*/
@Override
public long cyclesToNanos(long cycles) {
@@ -803,7 +803,7 @@
}
/**
- * @since 2.2
+ * @since 3.0
*/
@Override
public long nanosToCycles(long nanos) {
@@ -812,7 +812,7 @@
}
/**
- * @since 2.2
+ * @since 3.0
*/
@Override
public ITmfTimestamp readStart() {
@@ -820,7 +820,7 @@
}
/**
- * @since 2.2
+ * @since 3.0
*/
@Override
public ITmfTimestamp readEnd() {
