X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=tmf%2Forg.eclipse.tracecompass.tmf.core%2Fsrc%2Forg%2Feclipse%2Ftracecompass%2Ftmf%2Fcore%2Fevent%2FTmfEventField.java;h=6ae877bbfbe42b78ac2900a34e3b676dbcd65498;hb=fafdd006b0a1df7996722bfdf85bb811e8b4b508;hp=05dbec9e76fba7eafda9a67bf1da45a7d2c30c4f;hpb=5b6c845638fb092548ea9a51cc8ebf7fd305caaa;p=deliverable%2Ftracecompass.git

diff --git a/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/event/TmfEventField.java b/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/event/TmfEventField.java
index 05dbec9e76..6ae877bbfb 100644
--- a/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/event/TmfEventField.java
+++ b/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/event/TmfEventField.java
@@ -64,10 +64,7 @@ public class TmfEventField implements ITmfEventField {
      * @throws IllegalArgumentException
      *             If 'name' is null, or if 'fields' has duplicate field names.
      */
-    public TmfEventField(String name, @Nullable Object value, @Nullable ITmfEventField[] fields) {
-        if (name == null) {
-            throw new IllegalArgumentException();
-        }
+    public TmfEventField(@NonNull String name, @Nullable Object value, @Nullable ITmfEventField[] fields) {
         fName = name;
         fValue = value;
 
@@ -114,12 +111,12 @@ public class TmfEventField implements ITmfEventField {
 
     @Override
     public Collection<String> getFieldNames() {
-        return fFields.keySet();
+        return checkNotNull(fFields.keySet());
     }
 
     @Override
     public Collection<ITmfEventField> getFields() {
-        return fFields.values();
+        return checkNotNull(fFields.values());
     }
 
     @Override
@@ -150,7 +147,8 @@ public class TmfEventField implements ITmfEventField {
     public static final ITmfEventField makeRoot(final String[] labels) {
         final ITmfEventField[] fields = new ITmfEventField[labels.length];
         for (int i = 0; i < labels.length; i++) {
-            fields[i] = new TmfEventField(labels[i], null, null);
+            String label = checkNotNull(labels[i]);
+            fields[i] = new TmfEventField(label, null, null);
         }
         // Return a new root field;
         return new TmfEventField(ITmfEventField.ROOT_FIELD_ID, null, fields);