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.132 by jsr166, Thu Aug 8 18:25:06 2013 UTC vs.
Revision 1.133 by jsr166, Thu Aug 8 20:12:10 2013 UTC

# Line 42 | Line 42 | import java.util.function.Function;
42   * {@code containsKey}, {@code get}, {@code put} and
43   * {@code remove} operations and their variants.  Insertion, removal,
44   * update, and access operations safely execute concurrently by
45 < * multiple threads.  Iterators and spliterators are <i>weakly consistent</i>,
46 < * returning elements reflecting the state of the map at some point at or
47 < * since the creation of the iterator.  They do <em>not</em> throw
48 < * {@link java.util.ConcurrentModificationException
49 < * ConcurrentModificationException}, and may proceed concurrently with other
50 < * operations.  Ascending key ordered views and their iterators are faster
51 < * than descending ones.
45 > * multiple threads.
46 > *
47 > * <p>Iterators and spliterators are
48 > * <a href="package-summary.html#Weakly"><i>weakly consistent</i></a>.
49 > *
50 > * <p>Ascending key ordered views and their iterators are faster than
51 > * descending ones.
52   *
53   * <p>All {@code Map.Entry} pairs returned by methods in this class
54   * and its views represent snapshots of mappings at the time they were
# Line 1795 | Line 1795 | public class ConcurrentSkipListMap<K,V>
1795       * operations.  It does not support the {@code add} or {@code addAll}
1796       * operations.
1797       *
1798 <     * <p>The view's iterators and spliterators are "weakly consistent":
1799 <     * they will never throw {@link java.util.ConcurrentModificationException
1800 <     * ConcurrentModificationException}; are guaranteed to traverse elements
1801 <     * as they existed upon construction; and may (but are not guaranteed to)
1802 <     * reflect any modifications subsequent to construction.
1798 >     * <p>The view's iterators and spliterators are
1799 >     * <a href="package-summary.html#Weakly"><i>weakly consistent</i></a>.
1800       *
1801       * <p>This method is equivalent to method {@code navigableKeySet}.
1802       *
# Line 1831 | Line 1828 | public class ConcurrentSkipListMap<K,V>
1828       * {@code retainAll} and {@code clear} operations.  It does not
1829       * support the {@code add} or {@code addAll} operations.
1830       *
1831 <     * <p>The view's iterators and spliterators are "weakly consistent":
1832 <     * they will never throw {@link java.util.ConcurrentModificationException
1836 <     * ConcurrentModificationException}; are guaranteed to traverse elements
1837 <     * as they existed upon construction; and may (but are not guaranteed to)
1838 <     * reflect any modifications subsequent to construction.
1831 >     * <p>The view's iterators and spliterators are
1832 >     * <a href="package-summary.html#Weakly"><i>weakly consistent</i></a>.
1833       */
1834      public Collection<V> values() {
1835          Values<V> vs = values;
# Line 1859 | Line 1853 | public class ConcurrentSkipListMap<K,V>
1853       * operations.  It does not support the {@code add} or
1854       * {@code addAll} operations.
1855       *
1856 <     * <p>The view's iterators and spliterators are "weakly consistent":
1857 <     * they will never throw {@link java.util.ConcurrentModificationException
1864 <     * ConcurrentModificationException}; are guaranteed to traverse elements
1865 <     * as they existed upon construction; and may (but are not guaranteed to)
1866 <     * reflect any modifications subsequent to construction.
1856 >     * <p>The view's iterators and spliterators are
1857 >     * <a href="package-summary.html#Weakly"><i>weakly consistent</i></a>.
1858       *
1859       * <p>The {@code Map.Entry} elements traversed by the {@code iterator}
1860       * or {@code spliterator} do <em>not</em> support the {@code setValue}

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines