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.133 by jsr166, Sun Oct 21 03:26:48 2012 UTC vs.
Revision 1.134 by jsr166, Sun Oct 21 04:07:13 2012 UTC

# Line 2509 | Line 2509 | public class ConcurrentHashMap<K, V>
2509       *
2510       * @param key the key
2511       * @param defaultValue the value to return if this map contains
2512 <     * no mapping for the given key.
2512 >     * no mapping for the given key
2513       * @return the mapping for the key, if present; else the defaultValue
2514       * @throws NullPointerException if the specified key is null
2515       */
# Line 2649 | Line 2649 | public class ConcurrentHashMap<K, V>
2649       * @param key key with which the specified value is to be associated
2650       * @param mappingFunction the function to compute a value
2651       * @return the current (existing or computed) value associated with
2652 <     *         the specified key, or null if the computed value is null.
2652 >     *         the specified key, or null if the computed value is null
2653       * @throws NullPointerException if the specified key or mappingFunction
2654       *         is null
2655       * @throws IllegalStateException if the computation detectably
# Line 3671 | Line 3671 | public class ConcurrentHashMap<K, V>
3671           *
3672           * @param transformer a function returning the transformation
3673           * for an element, or null of there is no transformation (in
3674 <         * which case the action is not applied).
3674 >         * which case the action is not applied)
3675           * @param action the action
3676           */
3677          public <U> void forEach(BiFun<? super K, ? super V, ? extends U> transformer,
# Line 3704 | Line 3704 | public class ConcurrentHashMap<K, V>
3704           *
3705           * @param transformer a function returning the transformation
3706           * for an element, or null of there is no transformation (in
3707 <         * which case it is not combined).
3707 >         * which case it is not combined)
3708           * @param reducer a commutative associative combining function
3709           * @return the result of accumulating the given transformation
3710           * of all (key, value) pairs
# Line 3788 | Line 3788 | public class ConcurrentHashMap<K, V>
3788           *
3789           * @param transformer a function returning the transformation
3790           * for an element, or null of there is no transformation (in
3791 <         * which case the action is not applied).
3791 >         * which case the action is not applied)
3792           * @param action the action
3793           */
3794          public <U> void forEachKey(Fun<? super K, ? extends U> transformer,
# Line 3834 | Line 3834 | public class ConcurrentHashMap<K, V>
3834           *
3835           * @param transformer a function returning the transformation
3836           * for an element, or null of there is no transformation (in
3837 <         * which case it is not combined).
3837 >         * which case it is not combined)
3838           * @param reducer a commutative associative combining function
3839           * @return the result of accumulating the given transformation
3840           * of all keys
# Line 3918 | Line 3918 | public class ConcurrentHashMap<K, V>
3918           *
3919           * @param transformer a function returning the transformation
3920           * for an element, or null of there is no transformation (in
3921 <         * which case the action is not applied).
3921 >         * which case the action is not applied)
3922           */
3923          public <U> void forEachValue(Fun<? super V, ? extends U> transformer,
3924                                       Action<U> action) {
# Line 3963 | Line 3963 | public class ConcurrentHashMap<K, V>
3963           *
3964           * @param transformer a function returning the transformation
3965           * for an element, or null of there is no transformation (in
3966 <         * which case it is not combined).
3966 >         * which case it is not combined)
3967           * @param reducer a commutative associative combining function
3968           * @return the result of accumulating the given transformation
3969           * of all values
# Line 4047 | Line 4047 | public class ConcurrentHashMap<K, V>
4047           *
4048           * @param transformer a function returning the transformation
4049           * for an element, or null of there is no transformation (in
4050 <         * which case the action is not applied).
4050 >         * which case the action is not applied)
4051           * @param action the action
4052           */
4053          public <U> void forEachEntry(Fun<Map.Entry<K,V>, ? extends U> transformer,
# Line 4196 | Line 4196 | public class ConcurrentHashMap<K, V>
4196           * @param map the map
4197           * @param transformer a function returning the transformation
4198           * for an element, or null of there is no transformation (in
4199 <         * which case the action is not applied).
4199 >         * which case the action is not applied)
4200           * @param action the action
4201           * @return the task
4202           */
# Line 4346 | Line 4346 | public class ConcurrentHashMap<K, V>
4346           * @param map the map
4347           * @param transformer a function returning the transformation
4348           * for an element, or null of there is no transformation (in
4349 <         * which case the action is not applied).
4349 >         * which case the action is not applied)
4350           * @param action the action
4351           * @return the task
4352           */
# Line 4513 | Line 4513 | public class ConcurrentHashMap<K, V>
4513           * @param map the map
4514           * @param transformer a function returning the transformation
4515           * for an element, or null of there is no transformation (in
4516 <         * which case the action is not applied).
4516 >         * which case the action is not applied)
4517           * @param action the action
4518           */
4519          public static <K,V,U> ForkJoinTask<Void> forEachValue
# Line 4680 | Line 4680 | public class ConcurrentHashMap<K, V>
4680           * @param map the map
4681           * @param transformer a function returning the transformation
4682           * for an element, or null of there is no transformation (in
4683 <         * which case the action is not applied).
4683 >         * which case the action is not applied)
4684           * @param action the action
4685           */
4686          public static <K,V,U> ForkJoinTask<Void> forEachEntry

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines