Fix JDT Null annotations bug occuring in Luna builds.

The JDT compiler fails when a method implemented from an interface whose
class is tagged with @NonNullByDefault, redefines @NonNull on the
parameter. It seems the interface itself must redundantly define
@NonNull for the condition to get carried over.

Change-Id: I8663c0ba9994466f1cb9f56b1746a59051b4c8ef

diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/statesystem/ITmfAnalysisModuleWithStateSystems.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/statesystem/ITmfAnalysisModuleWithStateSystems.java
index 0830d97dca373b559f5ab02dac55f1cebc309efd..a1ba17dd989e57bf1790cf80d38dc3d56dd116e7 100644 (file)
--- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/statesystem/ITmfAnalysisModuleWithStateSystems.java
+++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/statesystem/ITmfAnalysisModuleWithStateSystems.java
@@ -12,6 +12,7 @@
 
 package org.eclipse.linuxtools.tmf.core.statesystem;
 
+import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
 
@@ -33,7 +34,7 @@ public interface ITmfAnalysisModuleWithStateSystems {
      *         no match.
      */
     @Nullable
-    ITmfStateSystem getStateSystem(String id);
+    ITmfStateSystem getStateSystem(@NonNull String id);
 
     /**
      * FIXME The ID's should be saved in the state system themselves
@@ -47,7 +48,7 @@ public interface ITmfAnalysisModuleWithStateSystems {
      * @return The corresponding state system
      */
     @Nullable
-    String getStateSystemId(ITmfStateSystem ss);
+    String getStateSystemId(@NonNull ITmfStateSystem ss);
 
     /**
      * Return all the state systems provided by this analysis module, in