ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/src/main/java/util/concurrent/ConcurrentLinkedDeque.java
(Generate patch)

Comparing jsr166/src/main/java/util/concurrent/ConcurrentLinkedDeque.java (file contents):
Revision 1.49 by jsr166, Thu Aug 8 15:13:34 2013 UTC vs.
Revision 1.50 by jsr166, Thu Aug 8 20:12:10 2013 UTC

# Line 28 | Line 28 | import java.util.function.Consumer;
28   * Like most other concurrent collection implementations, this class
29   * does not permit the use of {@code null} elements.
30   *
31 < * <p>Iterators are <i>weakly consistent</i>, returning elements
32 < * reflecting the state of the deque at some point at or since the
33 < * creation of the iterator.  They do <em>not</em> throw {@link
34 < * java.util.ConcurrentModificationException
35 < * ConcurrentModificationException}, and may proceed concurrently with
36 < * other operations.
31 > * <p>Iterators and spliterators are
32 > * <a href="package-summary.html#Weakly"><i>weakly consistent</i></a>.
33   *
34   * <p>Beware that, unlike in most collections, the {@code size} method
35   * is <em>NOT</em> a constant-time operation. Because of the
# Line 1263 | Line 1259 | public class ConcurrentLinkedDeque<E>
1259       * Returns an iterator over the elements in this deque in proper sequence.
1260       * The elements will be returned in order from first (head) to last (tail).
1261       *
1262 <     * <p>The returned iterator is a "weakly consistent" iterator that
1263 <     * will never throw {@link java.util.ConcurrentModificationException
1268 <     * ConcurrentModificationException}, and guarantees to traverse
1269 <     * elements as they existed upon construction of the iterator, and
1270 <     * may (but is not guaranteed to) reflect any modifications
1271 <     * subsequent to construction.
1262 >     * <p>The returned iterator is
1263 >     * <a href="package-summary.html#Weakly"><i>weakly consistent</i></a>.
1264       *
1265       * @return an iterator over the elements in this deque in proper sequence
1266       */
# Line 1281 | Line 1273 | public class ConcurrentLinkedDeque<E>
1273       * sequential order.  The elements will be returned in order from
1274       * last (tail) to first (head).
1275       *
1276 <     * <p>The returned iterator is a "weakly consistent" iterator that
1277 <     * will never throw {@link java.util.ConcurrentModificationException
1286 <     * ConcurrentModificationException}, and guarantees to traverse
1287 <     * elements as they existed upon construction of the iterator, and
1288 <     * may (but is not guaranteed to) reflect any modifications
1289 <     * subsequent to construction.
1276 >     * <p>The returned iterator is
1277 >     * <a href="package-summary.html#Weakly"><i>weakly consistent</i></a>.
1278       *
1279       * @return an iterator over the elements in this deque in reverse order
1280       */
# Line 1469 | Line 1457 | public class ConcurrentLinkedDeque<E>
1457      /**
1458       * Returns a {@link Spliterator} over the elements in this deque.
1459       *
1460 +     * <p>The returned spliterator is
1461 +     * <a href="package-summary.html#Weakly"><i>weakly consistent</i></a>.
1462 +     *
1463       * <p>The {@code Spliterator} reports {@link Spliterator#CONCURRENT},
1464       * {@link Spliterator#ORDERED}, and {@link Spliterator#NONNULL}.
1465       *

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines