common.core: Annotate Status#OK_STATUS and Status#CANCEL_STATUS

The two statuses are assigned to a new value and are final.
This should help remove some checkNotNulls.

Change-Id: Ia42832140b0d5bc33f8eea2b66121e9182e587cd
Signed-off-by: Matthew Khouzam <matthew.khouzam@ericsson.com>
Reviewed-on: https://git.eclipse.org/r/67341
Reviewed-by: Alexandre Montplaisir <alexmonthy@efficios.com>
Reviewed-by: Hudson CI
Reviewed-by: Patrick Tasse <patrick.tasse@gmail.com>
Tested-by: Patrick Tasse <patrick.tasse@gmail.com>

diff --git a/common/org.eclipse.tracecompass.common.core/annotations/org/eclipse/core/runtime/Status.eea b/common/org.eclipse.tracecompass.common.core/annotations/org/eclipse/core/runtime/Status.eea
new file mode 100644 (file)
index 0000000..c197121
--- /dev/null
+++ b/common/org.eclipse.tracecompass.common.core/annotations/org/eclipse/core/runtime/Status.eea
@@ -0,0 +1,7 @@
+class org/eclipse/core/runtime/Status
+CANCEL_STATUS
+ Lorg/eclipse/core/runtime/IStatus;
+ L1org/eclipse/core/runtime/IStatus;
+OK_STATUS
+ Lorg/eclipse/core/runtime/IStatus;
+ L1org/eclipse/core/runtime/IStatus;

diff --git a/tmf/org.eclipse.tracecompass.tmf.core.tests/stubs/org/eclipse/tracecompass/tmf/tests/stubs/trace/xml/TmfXmlTraceStub.java b/tmf/org.eclipse.tracecompass.tmf.core.tests/stubs/org/eclipse/tracecompass/tmf/tests/stubs/trace/xml/TmfXmlTraceStub.java
index 7b91eeafacd2b11895ee35d0104b64ab709c6768..f6c3ac83a1940941555ac1eaab3a643aae526512 100644 (file)
--- a/tmf/org.eclipse.tracecompass.tmf.core.tests/stubs/org/eclipse/tracecompass/tmf/tests/stubs/trace/xml/TmfXmlTraceStub.java
+++ b/tmf/org.eclipse.tracecompass.tmf.core.tests/stubs/org/eclipse/tracecompass/tmf/tests/stubs/trace/xml/TmfXmlTraceStub.java
@@ -32,7 +32,6 @@ import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.jdt.annotation.Nullable;
 import org.eclipse.osgi.util.NLS;
 import org.eclipse.tracecompass.internal.tmf.core.Activator;
@@ -213,10 +212,7 @@ public class TmfXmlTraceStub extends TmfTrace {
         } catch (IOException e) {
             return new Status(IStatus.ERROR, Activator.PLUGIN_ID, NLS.bind(org.eclipse.tracecompass.tmf.tests.stubs.trace.xml.Messages.TmfDevelopmentTrace_IoError, path), e);
         }
-        @SuppressWarnings("null")
-        @NonNull
-        IStatus status = Status.OK_STATUS;
-        return status;
+        return Status.OK_STATUS;
     }
 
     private static String getStringValue(ITmfEventField content, String fieldName) {