diff options
author | Roland Grunberg | 2014-01-08 17:11:05 +0000 |
---|---|---|
committer | Roland Grunberg | 2014-01-08 17:36:20 +0000 |
commit | 5aceeed369aeb481e25e41712f73bf7f77d01e1d (patch) | |
tree | aa16477f12faad92b28617d52de4f8759c96ca2a | |
parent | 44fd4a842d2af9e79cf811283ca3350ce7d13c1f (diff) | |
download | org.eclipse.linuxtools-5aceeed369aeb481e25e41712f73bf7f77d01e1d.tar.gz org.eclipse.linuxtools-5aceeed369aeb481e25e41712f73bf7f77d01e1d.tar.xz org.eclipse.linuxtools-5aceeed369aeb481e25e41712f73bf7f77d01e1d.zip |
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
-rw-r--r-- | lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/statesystem/ITmfAnalysisModuleWithStateSystems.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/statesystem/ITmfAnalysisModuleWithStateSystems.java b/lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/statesystem/ITmfAnalysisModuleWithStateSystems.java index 0830d97dca..a1ba17dd98 100644 --- a/lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/statesystem/ITmfAnalysisModuleWithStateSystems.java +++ b/lttng/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 |