TMF: Add some non null annotations to TmfTimeRange

[deliverable/tracecompass.git] / org.eclipse.tracecompass.tmf.core / src / org / eclipse / tracecompass / tmf / core / trace / TmfTraceManager.java

diff --git a/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/trace/TmfTraceManager.java b/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/trace/TmfTraceManager.java
index b471099fccc9cec1c8b82b9feae46717b4be8a72..9a061862fdb90e2a2fdae1bc96d0551ed4cb00d1 100644 (file)
--- a/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/trace/TmfTraceManager.java
+++ b/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/trace/TmfTraceManager.java
@@ -107,14 +107,14 @@ public final class TmfTraceManager {
     /**
      * @return The begin timestamp of selection
      */
-    public ITmfTimestamp getSelectionBeginTime() {
+    public @NonNull ITmfTimestamp getSelectionBeginTime() {
         return getCurrentTraceContext().getSelectionBegin();
     }
 
     /**
      * @return The end timestamp of selection
      */
-    public ITmfTimestamp getSelectionEndTime() {
+    public @NonNull ITmfTimestamp getSelectionEndTime() {
         return getCurrentTraceContext().getSelectionEnd();
     }
 
@@ -180,7 +180,7 @@ public final class TmfTraceManager {
         return null;
     }
 
-    private TmfTraceContext getCurrentTraceContext() {
+    private @NonNull TmfTraceContext getCurrentTraceContext() {
         TmfTraceContext curCtx = fTraces.get(fCurrentTrace);
         if (curCtx == null) {
             /* There are no traces opened at the moment. */
@@ -387,7 +387,7 @@ public final class TmfTraceManager {
         for (Map.Entry<ITmfTrace, TmfTraceContext> entry : fTraces.entrySet()) {
             final ITmfTrace trace = entry.getKey();
             if (beginTs.intersects(getValidTimeRange(trace)) || endTs.intersects(getValidTimeRange(trace))) {
-                TmfTraceContext prevCtx = entry.getValue();
+                TmfTraceContext prevCtx = NonNullUtils.checkNotNull(entry.getValue());
                 TmfTraceContext newCtx = new TmfTraceContext(prevCtx, beginTs, endTs);
                 entry.setValue(newCtx);
             }
@@ -407,12 +407,15 @@ public final class TmfTraceManager {
     public synchronized void timeRangeUpdated(final TmfRangeSynchSignal signal) {
         for (Map.Entry<ITmfTrace, TmfTraceContext> entry : fTraces.entrySet()) {
             final ITmfTrace trace = entry.getKey();
-            final TmfTraceContext curCtx = entry.getValue();
+            final TmfTraceContext curCtx = NonNullUtils.checkNotNull(entry.getValue());
 
             final TmfTimeRange validTr = getValidTimeRange(trace);
 
             /* Determine the new time range */
-            TmfTimeRange targetTr = signal.getCurrentRange().getIntersection(validTr);
+            TmfTimeRange targetTr = null;
+            if (validTr != null) {
+                targetTr = signal.getCurrentRange().getIntersection(validTr);
+            }
             TmfTimeRange newTr = (targetTr == null ? curCtx.getWindowRange() : targetTr);
 
             /* Update the values */