Skip to content

timing.ui: Fix null related errors and warning #396

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
arfio merged 1 commit into from
Apr 22, 2026
Merged

timing.ui: Fix null related errors and warning #396

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 10 additions & 11 deletions ...ass/internal/analysis/timing/ui/views/segmentstore/table/SegmentStoreContentProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@
import java.util.Comparator;
import java.util.Iterator;
import java.util.List;
import java.util.Objects;
import java.util.function.Predicate;

import org.eclipse.jdt.annotation.NonNull;
import org.eclipse.jdt.annotation.Nullable;
import org.eclipse.jface.viewers.TableViewer;
import org.eclipse.jface.viewers.Viewer;
Expand Down Expand Up @@ -132,10 +132,10 @@ private Iterable<E> getIterable() {
}
fIterable = iterable;
}
return iterable;
return Objects.requireNonNull(iterable);
}

private Iterator<? extends @NonNull ISegment> resetIterator() {
private Iterator<? extends ISegment> resetIterator() {
Iterator<E> iterator = NonNullUtils.checkNotNull(getIterable().iterator());
fIterator = iterator;
fLastReadPos = -1;
Expand All @@ -160,19 +160,19 @@ private Iterable<E> getIterable() {
long idx = index;
// Special code path if we are looking for an element from the end there is a comparator
if (index == LAST) {
Comparator<@NonNull ISegment> comparator = fComparator;
Comparator<ISegment> comparator = fComparator;
if (comparator != null) {
return getLastElement(comparator);
}
// No comparator, so impossible the easily get last element,
// just return the first as it is random anyway
idx = 0;
}
Iterable<? extends @NonNull ISegment> iterable = fIterable;
Iterable<? extends @Nullable ISegment> iterable = fIterable;
if (iterable instanceof List<?> && idx <= Integer.MAX_VALUE) {
return Iterables.get(iterable, (int) idx, null);
}
Iterator<? extends @NonNull ISegment> iterator = fIterator;
Iterator<? extends ISegment> iterator = fIterator;
if (iterator == null || idx <= fLastReadPos) {
iterator = resetIterator();
}
Expand All @@ -187,10 +187,10 @@ private Iterable<E> getIterable() {
return null;
}

private @Nullable ISegment getLastElement(Comparator<@NonNull ISegment> comparator) {
private @Nullable ISegment getLastElement(Comparator<ISegment> comparator) {
Iterable<? extends ISegment> baseIterable = fIterable;
if (baseIterable instanceof List<?>) {
return Iterables.getLast(baseIterable, null);
return Iterables.getLast((Iterable<? extends @Nullable ISegment>) baseIterable, null);
}
// Not a trivial get, so get an iterable for the reverse comparator
// and fetch first element
Expand All @@ -199,9 +199,8 @@ private Iterable<E> getIterable() {
if (predicate != null) {
iterable = Iterables.filter(iterable, input -> predicate.test(input));
}
// FIXME: The cast turns an error into a warning for this null
// value, but it is completely unnecessary otherwise
return Iterables.getFirst((Iterable<? extends ISegment>) iterable, null);

return Iterables.getFirst((Iterable<? extends @Nullable ISegment>) iterable, null);
}

/**
Expand Down
Loading