ctf: make StructDeclarationFlattener more NonNull

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

diff --git a/org.eclipse.tracecompass.ctf.core/src/org/eclipse/tracecompass/internal/ctf/core/event/types/StructDeclarationFlattener.java b/org.eclipse.tracecompass.ctf.core/src/org/eclipse/tracecompass/internal/ctf/core/event/types/StructDeclarationFlattener.java
index a4cbc1b040cdaf58b030f8c653b45fddc53beb9d..0981f0b8c6fc4f5c51402e5c68f2f419454f7877 100644 (file)
--- a/org.eclipse.tracecompass.ctf.core/src/org/eclipse/tracecompass/internal/ctf/core/event/types/StructDeclarationFlattener.java
+++ b/org.eclipse.tracecompass.ctf.core/src/org/eclipse/tracecompass/internal/ctf/core/event/types/StructDeclarationFlattener.java
@@ -39,7 +39,7 @@ public final class StructDeclarationFlattener {
      * @return The flattened struct. Or if it couldn't be flattened, the 'sd'
      *         struct itself
      */
-    public static StructDeclaration tryFlattenStruct(@NonNull StructDeclaration sd) {
+    public static @NonNull StructDeclaration tryFlattenStruct(@NonNull StructDeclaration sd) {
         if (canBeFlattened(sd)) {
             return newFlattenedStruct(sd);
         }
@@ -77,7 +77,7 @@ public final class StructDeclarationFlattener {
         return false;
     }
 
-    private static StructDeclaration newFlattenedStruct(@NonNull StructDeclaration sd) {
+    private static @NonNull StructDeclaration newFlattenedStruct(@NonNull StructDeclaration sd) {
         StructDeclaration flatStruct = new StructDeclaration(sd.getAlignment());
         for (String name : sd.getFieldsList()) {
             depthFirstAdd(name, flatStruct, sd.getField(name));