ctf.core: remove deprecated code

[deliverable/tracecompass.git] / ctf / org.eclipse.tracecompass.tmf.ctf.core / src / org / eclipse / tracecompass / tmf / ctf / core / event / lookup / CtfTmfCallsite.java

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 c65b1f5d64fcd97c1a826cce2401c9ee75f0ac71..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
@@ -13,7 +13,8 @@
 
 package org.eclipse.tracecompass.tmf.ctf.core.event.lookup;
 
-import static org.eclipse.tracecompass.common.core.NonNullUtils.equalsNullable;
+import java.util.Objects;
+
 import org.eclipse.tracecompass.ctf.core.event.CTFCallsite;
 import org.eclipse.tracecompass.tmf.core.event.lookup.TmfCallsite;
 
@@ -21,6 +22,7 @@ import org.eclipse.tracecompass.tmf.core.event.lookup.TmfCallsite;
  * CTF TMF call site information for source code lookup.
  *
  * @author Patrick Tasse
+ * @since 3.0
  */
 public class CtfTmfCallsite extends TmfCallsite {
 
@@ -45,7 +47,7 @@ public class CtfTmfCallsite extends TmfCallsite {
      *            - a CTF call site
      */
     public CtfTmfCallsite(CTFCallsite callsite) {
-        super(callsite.getFileName(), callsite.getFunctionName(), callsite.getLineNumber());
+        super(callsite.getFileName(), callsite.getLineNumber());
         fEventName = callsite.getEventName();
         fInstructionPointer = callsite.getIp();
     }
@@ -97,7 +99,7 @@ public class CtfTmfCallsite extends TmfCallsite {
             return false;
         }
         CtfTmfCallsite other = (CtfTmfCallsite) obj;
-        if (!equalsNullable(fEventName, other.fEventName)) {
+        if (!Objects.equals(fEventName, other.fEventName)) {
             return false;
         }
         if (fInstructionPointer != other.fInstructionPointer) {
@@ -109,6 +111,6 @@ public class CtfTmfCallsite extends TmfCallsite {
     @Override
     public String toString() {
         return getEventName() + "@0x" + Long.toHexString(fInstructionPointer) + ": " + //$NON-NLS-1$ //$NON-NLS-2$
-                getFileName() + ':' + Long.toString(getLineNumber()) + ' ' + getFileName() + "()"; //$NON-NLS-1$
+                getFileName() + ':' + String.valueOf(getLineNo()) + ' ' + getFileName() + "()"; //$NON-NLS-1$
     }
 }