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

Comparing jsr166/src/main/java/util/concurrent/ConcurrentHashMap.java (file contents):
Revision 1.241 by jsr166, Thu Aug 8 18:25:06 2013 UTC vs.
Revision 1.242 by jsr166, Thu Aug 8 20:12:09 2013 UTC

# Line 1170 | Line 1170 | public class ConcurrentHashMap<K,V> exte
1170       * operations.  It does not support the {@code add} or
1171       * {@code addAll} operations.
1172       *
1173 <     * <p>The view's iterators and spliterators are "weakly consistent":
1174 <     * they will never throw {@link java.util.ConcurrentModificationException
1175 <     * ConcurrentModificationException}; are guaranteed to traverse elements
1176 <     * as they existed upon construction; and may (but are not guaranteed to)
1177 <     * reflect any modifications subsequent to construction.
1173 >     * <p>The view's iterators and spliterators are
1174 >     * <a href="package-summary.html#Weakly"><i>weakly consistent</i></a>.
1175       *
1176       * <p>The view's {@code spliterator} reports {@link Spliterator#CONCURRENT},
1177       * {@link Spliterator#DISTINCT}, and {@link Spliterator#NONNULL}.
# Line 1196 | Line 1193 | public class ConcurrentHashMap<K,V> exte
1193       * {@code retainAll}, and {@code clear} operations.  It does not
1194       * support the {@code add} or {@code addAll} operations.
1195       *
1196 <     * <p>The view's iterators and spliterators are "weakly consistent":
1197 <     * they will never throw {@link java.util.ConcurrentModificationException
1201 <     * ConcurrentModificationException}; are guaranteed to traverse elements
1202 <     * as they existed upon construction; and may (but are not guaranteed to)
1203 <     * reflect any modifications subsequent to construction.
1196 >     * <p>The view's iterators and spliterators are
1197 >     * <a href="package-summary.html#Weakly"><i>weakly consistent</i></a>.
1198       *
1199       * <p>The view's {@code spliterator} reports {@link Spliterator#CONCURRENT}
1200       * and {@link Spliterator#NONNULL}.
# Line 1221 | Line 1215 | public class ConcurrentHashMap<K,V> exte
1215       * {@code removeAll}, {@code retainAll}, and {@code clear}
1216       * operations.
1217       *
1218 <     * <p>The view's iterators and spliterators are "weakly consistent":
1219 <     * they will never throw {@link java.util.ConcurrentModificationException
1226 <     * ConcurrentModificationException}; are guaranteed to traverse elements
1227 <     * as they existed upon construction; and may (but are not guaranteed to)
1228 <     * reflect any modifications subsequent to construction.
1218 >     * <p>The view's iterators and spliterators are
1219 >     * <a href="package-summary.html#Weakly"><i>weakly consistent</i></a>.
1220       *
1221       * <p>The view's {@code spliterator} reports {@link Spliterator#CONCURRENT},
1222       * {@link Spliterator#DISTINCT}, and {@link Spliterator#NONNULL}.
# Line 4287 | Line 4278 | public class ConcurrentHashMap<K,V> exte
4278          // implementations below rely on concrete classes supplying these
4279          // abstract methods
4280          /**
4281 <         * Returns a "weakly consistent" iterator that will never throw
4282 <         * {@link java.util.ConcurrentModificationException
4283 <         * ConcurrentModificationException}, and guarantees to traverse
4284 <         * elements as they existed upon construction of the iterator,
4285 <         * and may (but is not guaranteed to) reflect any modifications
4286 <         * subsequent to construction.
4281 >         * Returns an iterator over the elements in this collection.
4282 >         *
4283 >         * <p>The returned iterator is
4284 >         * <a href="package-summary.html#Weakly"><i>weakly consistent</i></a>.
4285 >         *
4286 >         * @return an iterator over the elements in this collection
4287           */
4288          public abstract Iterator<E> iterator();
4289          public abstract boolean contains(Object o);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines