From 0b1ac3e2cd08bddeef3b725efe63427f77d3002f Mon Sep 17 00:00:00 2001 From: Matthew Khouzam Date: Wed, 23 Mar 2016 17:39:01 -0400 Subject: [PATCH] common.core: annotate String#substring String.substring always returns a new String or "this". Change-Id: Id37b8a20489f07b6bfe8a225064d5be1cd4fc7aa Signed-off-by: Matthew Khouzam Reviewed-on: https://git.eclipse.org/r/69196 Reviewed-by: Hudson CI Reviewed-by: Genevieve Bastien Tested-by: Genevieve Bastien --- .../annotations/java/lang/String.eea | 3 +++ .../tracecompass/tmf/ctf/core/event/CtfTmfEventField.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/common/org.eclipse.tracecompass.common.core/annotations/java/lang/String.eea b/common/org.eclipse.tracecompass.common.core/annotations/java/lang/String.eea index 73b41b1f8a..195acf950f 100644 --- a/common/org.eclipse.tracecompass.common.core/annotations/java/lang/String.eea +++ b/common/org.eclipse.tracecompass.common.core/annotations/java/lang/String.eea @@ -20,6 +20,9 @@ split split (Ljava/lang/String;I)[Ljava/lang/String; (L1java/lang/String;I)[1L1java/lang/String; +substring + (I)Ljava/lang/String; + (I)L1java/lang/String; substring (II)Ljava/lang/String; (II)L1java/lang/String; 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 c64c28de1b..f7ebb56ec8 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 @@ -67,7 +67,7 @@ public abstract class CtfTmfEventField extends TmfEventField { */ protected CtfTmfEventField(@NonNull String name, Object value, ITmfEventField[] fields) { super(/* Strip the underscore from the field name if there is one */ - name.startsWith("_") ? checkNotNull(name.substring(1)) : name, //$NON-NLS-1$ + name.startsWith("_") ? name.substring(1) : name, //$NON-NLS-1$ value, fields); } -- 2.34.1