Fix some null warnings

[deliverable/tracecompass.git] / statesystem / org.eclipse.tracecompass.segmentstore.core / src / org / eclipse / tracecompass / segmentstore / core / treemap / TreeMapStore.java

diff --git a/statesystem/org.eclipse.tracecompass.segmentstore.core/src/org/eclipse/tracecompass/segmentstore/core/treemap/TreeMapStore.java b/statesystem/org.eclipse.tracecompass.segmentstore.core/src/org/eclipse/tracecompass/segmentstore/core/treemap/TreeMapStore.java
index 01ce5017c848f6cda6c931420e016434ea7d2abd..0bca75b6f7ddc18b66a522c0ce7ebc09acf817f8 100644 (file)
--- a/statesystem/org.eclipse.tracecompass.segmentstore.core/src/org/eclipse/tracecompass/segmentstore/core/treemap/TreeMapStore.java
+++ b/statesystem/org.eclipse.tracecompass.segmentstore.core/src/org/eclipse/tracecompass/segmentstore/core/treemap/TreeMapStore.java
@@ -79,11 +79,11 @@ public class TreeMapStore<E extends ISegment> implements ISegmentStore<E> {
          * The same is done for the end times index, but swapping the first two
          * comparators instead.
          */
-        fStartTimesIndex = checkNotNull(TreeMultimap.<Long, E> create(
+        fStartTimesIndex = checkNotNull(TreeMultimap.create(
                 SegmentComparators.LONG_COMPARATOR,
                 Ordering.from(SegmentComparators.INTERVAL_END_COMPARATOR).compound(Ordering.natural())));
 
-        fEndTimesIndex = checkNotNull(TreeMultimap.<Long, E> create(
+        fEndTimesIndex = checkNotNull(TreeMultimap.create(
                 SegmentComparators.LONG_COMPARATOR,
                 Ordering.from(SegmentComparators.INTERVAL_START_COMPARATOR).compound(Ordering.natural())));
 
@@ -164,7 +164,7 @@ public class TreeMapStore<E extends ISegment> implements ISegmentStore<E> {
     public Object[] toArray() {
         fLock.readLock().lock();
         try {
-            return checkNotNull(fStartTimesIndex.values().toArray());
+            return fStartTimesIndex.values().toArray();
         } finally {
             fLock.readLock().unlock();
         }
@@ -174,7 +174,7 @@ public class TreeMapStore<E extends ISegment> implements ISegmentStore<E> {
     public <T> T[] toArray(T @Nullable[] a) {
         fLock.readLock().lock();
         try {
-            return checkNotNull(fStartTimesIndex.values().toArray(a));
+            return fStartTimesIndex.values().toArray(a);
         } finally {
             fLock.readLock().unlock();
         }