Skip to content

Commit 7d9ccb0

Browse files
committed
Use List<? extends RandomAccessibleInterval<T>> instead of List<RandomAccessibleInterval<T>>
1 parent e6cd621 commit 7d9ccb0

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

src/main/java/qupath/ext/imglib2/ImgLib2ImageServer.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,11 @@
5353
public class ImgLib2ImageServer<T extends NativeType<T> & NumericType<T>> extends AbstractTileableImageServer {
5454

5555
private static final AtomicInteger counter = new AtomicInteger();
56-
private final List<RandomAccessibleInterval<T>> accessibles;
56+
private final List<? extends RandomAccessibleInterval<T>> accessibles;
5757
private final ImageServerMetadata metadata;
5858
private final int numberOfChannelsInAccessibles;
5959

60-
private ImgLib2ImageServer(List<RandomAccessibleInterval<T>> accessibles, PixelType pixelType, ImageServerMetadata metadata) {
60+
private ImgLib2ImageServer(List<? extends RandomAccessibleInterval<T>> accessibles, PixelType pixelType, ImageServerMetadata metadata) {
6161
this.accessibles = accessibles;
6262

6363
RandomAccessibleInterval<T> firstAccessible = accessibles.getFirst();
@@ -97,7 +97,7 @@ private ImgLib2ImageServer(List<RandomAccessibleInterval<T>> accessibles, PixelT
9797
* do not have the same number of channels, z-stacks, or timepoints, or if the accessible type is {@link ARGBType}
9898
* and the number of channels of the accessibles is not 1
9999
*/
100-
public static <T extends NativeType<T> & NumericType<T>> Builder<T> builder(List<RandomAccessibleInterval<T>> accessibles) {
100+
public static <T extends NativeType<T> & NumericType<T>> Builder<T> builder(List<? extends RandomAccessibleInterval<T>> accessibles) {
101101
return new Builder<>(accessibles);
102102
}
103103

@@ -182,11 +182,11 @@ protected BufferedImage createDefaultRGBImage(int width, int height) {
182182
public static class Builder<T extends NativeType<T> & NumericType<T>> {
183183

184184
private static final int DEFAULT_TILE_SIZE = 1024;
185-
private final List<RandomAccessibleInterval<T>> accessibles;
185+
private final List<? extends RandomAccessibleInterval<T>> accessibles;
186186
private final PixelType pixelType;
187187
private ImageServerMetadata metadata;
188188

189-
private Builder(List<RandomAccessibleInterval<T>> accessibles) {
189+
private Builder(List<? extends RandomAccessibleInterval<T>> accessibles) {
190190
checkAccessibles(accessibles);
191191

192192
RandomAccessibleInterval<T> firstAccessible = accessibles.getFirst();
@@ -324,7 +324,7 @@ public ImgLib2ImageServer<T> build() {
324324
return new ImgLib2ImageServer<>(accessibles, pixelType, metadata);
325325
}
326326

327-
private static <T extends NativeType<T> & NumericType<T>> void checkAccessibles(List<RandomAccessibleInterval<T>> accessibles) {
327+
private static <T extends NativeType<T> & NumericType<T>> void checkAccessibles(List<? extends RandomAccessibleInterval<T>> accessibles) {
328328
if (accessibles == null) {
329329
throw new NullPointerException("The provided list of accessibles is null");
330330
}
@@ -391,7 +391,7 @@ private static <T extends NativeType<T> & NumericType<T>> void checkAccessibles(
391391
}
392392

393393
private static <T extends NativeType<T> & NumericType<T>> void checkChannels(
394-
List<RandomAccessibleInterval<T>> accessibles,
394+
List<? extends RandomAccessibleInterval<T>> accessibles,
395395
Collection<ImageChannel> channels
396396
) {
397397
for (ImageChannel channel: channels) {

0 commit comments

Comments
 (0)