Fix latest batch of null warnings

[deliverable/tracecompass.git] / ctf / org.eclipse.tracecompass.ctf.core / src / org / eclipse / tracecompass / ctf / core / event / types / StructDeclaration.java

diff --git a/ctf/org.eclipse.tracecompass.ctf.core/src/org/eclipse/tracecompass/ctf/core/event/types/StructDeclaration.java b/ctf/org.eclipse.tracecompass.ctf.core/src/org/eclipse/tracecompass/ctf/core/event/types/StructDeclaration.java
index d612dd77aa10a9a0cbb3487e69f1db2535bc24e0..1376e4107926874ae3d5b04d4f5503f8aeeb2df8 100644 (file)
--- a/ctf/org.eclipse.tracecompass.ctf.core/src/org/eclipse/tracecompass/ctf/core/event/types/StructDeclaration.java
+++ b/ctf/org.eclipse.tracecompass.ctf.core/src/org/eclipse/tracecompass/ctf/core/event/types/StructDeclaration.java
@@ -47,7 +47,7 @@ public class StructDeclaration extends Declaration {
     // ------------------------------------------------------------------------
 
     /** linked list of field names. So fieldName->fieldValue */
-    private final @NonNull Map<String, IDeclaration> fFieldMap = new LinkedHashMap<>();
+    private final @NonNull Map<@NonNull String, IDeclaration> fFieldMap = new LinkedHashMap<>();
 
     /** maximum bit alignment */
     private long fMaxAlign;
@@ -119,7 +119,7 @@ public class StructDeclaration extends Declaration {
      *
      * @return the field list.
      */
-    public Iterable<String> getFieldsList() {
+    public @NonNull Iterable<@NonNull String> getFieldsList() {
         return fFieldMap.keySet();
     }
 
@@ -193,7 +193,7 @@ public class StructDeclaration extends Declaration {
      * @param declaration
      *            the declaration of the field
      */
-    public void addField(String name, IDeclaration declaration) {
+    public void addField(@NonNull String name, IDeclaration declaration) {
         fFieldMap.put(name, declaration);
         fMaxAlign = Math.max(fMaxAlign, declaration.getAlignment());
     }