Fix some null warnings

[deliverable/tracecompass.git] / tmf / org.eclipse.tracecompass.tmf.ui / src / org / eclipse / tracecompass / tmf / ui / widgets / timegraph / model / EventIterator.java

diff --git a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/widgets/timegraph/model/EventIterator.java b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/widgets/timegraph/model/EventIterator.java
index ac964f1711c19d6047cd3759f3740fd8bd1d30bf..ad5427e9fd050fdfdc8f5c31dd882e59b5e932ea 100644 (file)
--- a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/widgets/timegraph/model/EventIterator.java
+++ b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/widgets/timegraph/model/EventIterator.java
@@ -12,10 +12,14 @@
 
 package org.eclipse.tracecompass.tmf.ui.widgets.timegraph.model;
 
+import static org.eclipse.tracecompass.common.core.NonNullUtils.checkNotNull;
+
 import java.util.Iterator;
 import java.util.List;
 import java.util.NoSuchElementException;
 
+import org.eclipse.jdt.annotation.NonNull;
+
 
 /**
  * An iterator for time events. Events from the zoomed event list override any
@@ -31,7 +35,7 @@ import java.util.NoSuchElementException;
  * iterator    [A][D][E][F]       [G][B][C]
  * </pre>
  */
-public class EventIterator implements Iterator<ITimeEvent> {
+public class EventIterator implements Iterator<@NonNull ITimeEvent> {
 
     private final long fStartTime;
     private final long fEndTime;
@@ -139,11 +143,11 @@ public class EventIterator implements Iterator<ITimeEvent> {
     public ITimeEvent next() {
         if (hasNext()) {
             if (fZoomedNext != null && (fNext == null || fZoomedNext.getTime() <= fNext.getTime())) {
-                ITimeEvent event = fZoomedNext;
+                ITimeEvent event = checkNotNull(fZoomedNext);
                 fZoomedNext = null;
                 return event;
             }
-            ITimeEvent event = fNext;
+            ITimeEvent event = checkNotNull(fNext);
             fNext = fSplitNext;
             fSplitNext = null;
             return event;