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

Comparing jsr166/src/main/java/util/concurrent/ConcurrentSkipListMap.java (file contents):
Revision 1.120 by jsr166, Fri Apr 19 17:54:06 2013 UTC vs.
Revision 1.121 by jsr166, Fri Apr 19 18:18:08 2013 UTC

# Line 44 | Line 44 | import java.util.function.Function;
44   * multiple threads.  Iterators are <i>weakly consistent</i>, returning
45   * elements reflecting the state of the map at some point at or since
46   * the creation of the iterator.  They do <em>not</em> throw {@link
47 < * ConcurrentModificationException}, and may proceed concurrently with
48 < * other operations. Ascending key ordered views and their iterators
49 < * are faster than descending ones.
47 > * java.util.ConcurrentModificationException ConcurrentModificationException},
48 > * and may proceed concurrently with other operations. Ascending key ordered
49 > * views and their iterators are faster than descending ones.
50   *
51   * <p>All {@code Map.Entry} pairs returned by methods in this class
52   * and its views represent snapshots of mappings at the time they were
# Line 1786 | Line 1786 | public class ConcurrentSkipListMap<K,V>
1786       * operations.  It does not support the {@code add} or {@code addAll}
1787       * operations.
1788       *
1789 <     * <p>The view's {@code iterator} is a "weakly consistent" iterator
1790 <     * that will never throw {@link ConcurrentModificationException},
1791 <     * and guarantees to traverse elements as they existed upon
1792 <     * construction of the iterator, and may (but is not guaranteed to)
1793 <     * reflect any modifications subsequent to construction.
1789 >     * <p>The view's {@code iterator} is a "weakly consistent" iterator that
1790 >     * will never throw {@link java.util.ConcurrentModificationException
1791 >     * ConcurrentModificationException}, and guarantees to traverse elements
1792 >     * as they existed upon construction of the iterator, and may (but is not
1793 >     * guaranteed to) reflect any modifications subsequent to construction.
1794       *
1795       * <p>This method is equivalent to method {@code navigableKeySet}.
1796       *
# Line 1818 | Line 1818 | public class ConcurrentSkipListMap<K,V>
1818       * {@code retainAll} and {@code clear} operations.  It does not
1819       * support the {@code add} or {@code addAll} operations.
1820       *
1821 <     * <p>The view's {@code iterator} is a "weakly consistent" iterator
1822 <     * that will never throw {@link ConcurrentModificationException},
1823 <     * and guarantees to traverse elements as they existed upon
1824 <     * construction of the iterator, and may (but is not guaranteed to)
1825 <     * reflect any modifications subsequent to construction.
1821 >     * <p>The view's {@code iterator} is a "weakly consistent" iterator that
1822 >     * will never throw {@link java.util.ConcurrentModificationException
1823 >     * ConcurrentModificationException}, and guarantees to traverse elements
1824 >     * as they existed upon construction of the iterator, and may (but is not
1825 >     * guaranteed to) reflect any modifications subsequent to construction.
1826       */
1827      public Collection<V> values() {
1828          Values<V> vs = values;
# Line 1840 | Line 1840 | public class ConcurrentSkipListMap<K,V>
1840       * operations.  It does not support the {@code add} or
1841       * {@code addAll} operations.
1842       *
1843 <     * <p>The view's {@code iterator} is a "weakly consistent" iterator
1844 <     * that will never throw {@link ConcurrentModificationException},
1845 <     * and guarantees to traverse elements as they existed upon
1846 <     * construction of the iterator, and may (but is not guaranteed to)
1847 <     * reflect any modifications subsequent to construction.
1843 >     * <p>The view's {@code iterator} is a "weakly consistent" iterator that
1844 >     * will never throw {@link java.util.ConcurrentModificationException
1845 >     * ConcurrentModificationException}, and guarantees to traverse elements
1846 >     * as they existed upon construction of the iterator, and may (but is not
1847 >     * guaranteed to) reflect any modifications subsequent to construction.
1848       *
1849       * <p>The {@code Map.Entry} elements returned by
1850       * {@code iterator.next()} do <em>not</em> support the

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines