archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-27 14:54:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8203670: unmodifiable List iterator() implementations should not be ListIterators

Browse source 
Reviewed-by: redestad, igerasim, plevart
This commit is contained in:
Stuart Marks 2018-06-26 19:45:59 -07:00
parent 7d63a78e0a
commit aaf546777f
2 changed files with 34 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/java.base/share/classes/java/util/ImmutableCollections.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -213,16 +213,23 @@ class ImmutableCollections {
@Stable
private final int size;
@Stable
private final boolean isListIterator;
private int cursor;
ListItr(List<E> list, int size) {
this(list, size, 0);
this.list = list;
this.size = size;
this.cursor = 0;
isListIterator = false;
}
ListItr(List<E> list, int size, int index) {
this.list = list;
this.size = size;
this.cursor = index;
isListIterator = true;
}
public boolean hasNext() {
@ -245,10 +252,16 @@ class ImmutableCollections {
}
public boolean hasPrevious() {
if (!isListIterator) {
throw uoe();
}
return cursor != 0;
}
public E previous() {
if (!isListIterator) {
throw uoe();
}
try {
int i = cursor - 1;
E previous = list.get(i);
@ -260,10 +273,16 @@ class ImmutableCollections {
}
public int nextIndex() {
if (!isListIterator) {
throw uoe();
}
return cursor;
}
public int previousIndex() {
if (!isListIterator) {
throw uoe();
}
return cursor - 1;
}