From cc2ce3e2a1eff3870f71081172e3fddfe001c4ce Mon Sep 17 00:00:00 2001 From: Roland Grunberg Date: Wed, 8 Jan 2014 12:11:05 -0500 Subject: [PATCH] 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 --- .../core/statesystem/ITmfAnalysisModuleWithStateSystems.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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 0830d97dca..a1ba17dd98 100644 --- 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 -- 2.34.1