common: Annotate String.split

This can't return null or null elements. Also cannot accept null
parameter. Fixes a warning in LTTngControlService.

Change-Id: Idb605e95fd20abfe8ecf73037bcc2a7b2e17dd70
Signed-off-by: Marc-Andre Laperle <marc-andre.laperle@ericsson.com>
Reviewed-on: https://git.eclipse.org/r/62075
Reviewed-by: Hudson CI
Reviewed-by: Alexandre Montplaisir <alexmonthy@efficios.com>
Tested-by: Alexandre Montplaisir <alexmonthy@efficios.com>

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 b89055daf811f4b1fd89f16acff8b87bc423b5ed..d08937251cb59c19618c6cc01df6041650e2f952 100644 (file)
--- a/common/org.eclipse.tracecompass.common.core/annotations/java/lang/String.eea
+++ b/common/org.eclipse.tracecompass.common.core/annotations/java/lang/String.eea
@@ -14,6 +14,12 @@ format
 intern
  ()Ljava/lang/String;
  ()L1java/lang/String;
+split
+ (Ljava/lang/String;)[Ljava/lang/String;
+ (L1java/lang/String;)[1L1java/lang/String;
+split
+ (Ljava/lang/String;I)[Ljava/lang/String;
+ (L1java/lang/String;I)[1L1java/lang/String;
 toString
  ()Ljava/lang/String;
  ()L1java/lang/String;

diff --git a/releng/org.eclipse.tracecompass.alltests/src/org/eclipse/tracecompass/alltests/perf/PerfResultsToJSon.java b/releng/org.eclipse.tracecompass.alltests/src/org/eclipse/tracecompass/alltests/perf/PerfResultsToJSon.java
index 457cadf2ae38cdea34f1cd899ff33a9bdefaadeb..0948f104164dff2d07ec93ab5b84b69194f04309 100644 (file)
--- a/releng/org.eclipse.tracecompass.alltests/src/org/eclipse/tracecompass/alltests/perf/PerfResultsToJSon.java
+++ b/releng/org.eclipse.tracecompass.alltests/src/org/eclipse/tracecompass/alltests/perf/PerfResultsToJSon.java
@@ -23,6 +23,7 @@ import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.test.internal.performance.PerformanceTestPlugin;
 import org.eclipse.test.internal.performance.data.Dim;
 import org.eclipse.test.internal.performance.db.DB;
@@ -230,7 +231,7 @@ public class PerfResultsToJSon {
     private static final String CHART_FILE_NAME = "chart";
     private static final String CHART_FILE_NAME_EXTENSION = ".json";
     private static final String WILDCARD_PATTERN = "%";
-    private static final String COMPONENT_SEPARATOR = "#";
+    private static final @NonNull String COMPONENT_SEPARATOR = "#";
     private static final String META_DATA_JAVASCRIPT_START = "var MetaData = ";
 
     private static Pattern BUILD_DATE_PATTERN = Pattern.compile("(\\w+-\\w+)(-\\w+)?");

diff --git a/tmf/org.eclipse.tracecompass.tmf.analysis.xml.ui/src/org/eclipse/tracecompass/tmf/analysis/xml/ui/module/TmfXmlAnalysisOutputSource.java b/tmf/org.eclipse.tracecompass.tmf.analysis.xml.ui/src/org/eclipse/tracecompass/tmf/analysis/xml/ui/module/TmfXmlAnalysisOutputSource.java
index b1078a4f58d7d48c617e313d11992e48f5a1f933..cdd0952e1b84fc630e8c7c741446593df30887fb 100644 (file)
--- a/tmf/org.eclipse.tracecompass.tmf.analysis.xml.ui/src/org/eclipse/tracecompass/tmf/analysis/xml/ui/module/TmfXmlAnalysisOutputSource.java
+++ b/tmf/org.eclipse.tracecompass.tmf.analysis.xml.ui/src/org/eclipse/tracecompass/tmf/analysis/xml/ui/module/TmfXmlAnalysisOutputSource.java
@@ -46,7 +46,7 @@ import org.xml.sax.SAXException;
 public class TmfXmlAnalysisOutputSource implements ITmfNewAnalysisModuleListener {
 
     /** String separating data elements for the output properties */
-    public static final String DATA_SEPARATOR = ";;;"; //$NON-NLS-1$
+    public static final @NonNull String DATA_SEPARATOR = ";;;"; //$NON-NLS-1$
 
     /**
      * Enum to match the name of a view's XML element to its view ID.

diff --git a/tmf/org.eclipse.tracecompass.tmf.analysis.xml.ui/src/org/eclipse/tracecompass/tmf/analysis/xml/ui/views/timegraph/XmlTimeGraphView.java b/tmf/org.eclipse.tracecompass.tmf.analysis.xml.ui/src/org/eclipse/tracecompass/tmf/analysis/xml/ui/views/timegraph/XmlTimeGraphView.java
index 868a456983e0b25e2d54c457a90ac96f84769dbd..1027ee4d6f341dd601c6630feaedec24d30c18df 100644 (file)
--- a/tmf/org.eclipse.tracecompass.tmf.analysis.xml.ui/src/org/eclipse/tracecompass/tmf/analysis/xml/ui/views/timegraph/XmlTimeGraphView.java
+++ b/tmf/org.eclipse.tracecompass.tmf.analysis.xml.ui/src/org/eclipse/tracecompass/tmf/analysis/xml/ui/views/timegraph/XmlTimeGraphView.java
@@ -96,7 +96,7 @@ public class XmlTimeGraphView extends AbstractTimeGraphView {
     private static final int[] fWeight = { 1, 2 };
 
     private static final String EMPTY_STRING = ""; //$NON-NLS-1$
-    private static final String SPLIT_STRING = "/"; //$NON-NLS-1$
+    private static final @NonNull String SPLIT_STRING = "/"; //$NON-NLS-1$
 
     private final @NonNull XmlViewInfo fViewInfo = new XmlViewInfo(ID);
     private final ITmfXmlModelFactory fFactory;

diff --git a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/widgets/rawviewer/TmfRawEventViewer.java b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/widgets/rawviewer/TmfRawEventViewer.java
index 5e5d90955854f552b26dcbd13e9d2565e484d4b9..66952f6ede531c02417dfcb0116b5c39bc162fab 100644 (file)
--- a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/widgets/rawviewer/TmfRawEventViewer.java
+++ b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/widgets/rawviewer/TmfRawEventViewer.java
@@ -15,6 +15,7 @@ package org.eclipse.tracecompass.tmf.ui.widgets.rawviewer;
 import java.util.ArrayList;
 import java.util.List;
 
+import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.jface.resource.ColorRegistry;
 import org.eclipse.jface.resource.FontRegistry;
 import org.eclipse.jface.util.IPropertyChangeListener;
@@ -79,7 +80,7 @@ public class TmfRawEventViewer extends Composite implements ControlListener, Sel
     private static final int SLIDER_MAX = 1000000;
     private static final String EMPTY_STRING = ""; //$NON-NLS-1$
     private static final String LF = "\n"; //$NON-NLS-1$
-    private static final String CR_LF = "\r?\n"; //$NON-NLS-1$
+    private static final @NonNull String CR_LF = "\r?\n"; //$NON-NLS-1$
 
     private ITmfTrace fTrace;
     private ITmfContext fBottomContext;