ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/src/jsr166e/ConcurrentHashMapV8.java
(Generate patch)

Comparing jsr166/src/jsr166e/ConcurrentHashMapV8.java (file contents):
Revision 1.66 by jsr166, Sun Oct 21 03:26:47 2012 UTC vs.
Revision 1.68 by jsr166, Sun Oct 21 04:14:30 2012 UTC

# Line 2510 | Line 2510 | public class ConcurrentHashMapV8<K, V>
2510       *
2511       * @param key the key
2512       * @param defaultValue the value to return if this map contains
2513 <     * no mapping for the given key.
2513 >     * no mapping for the given key
2514       * @return the mapping for the key, if present; else the defaultValue
2515       * @throws NullPointerException if the specified key is null
2516       */
# Line 2650 | Line 2650 | public class ConcurrentHashMapV8<K, V>
2650       * @param key key with which the specified value is to be associated
2651       * @param mappingFunction the function to compute a value
2652       * @return the current (existing or computed) value associated with
2653 <     *         the specified key, or null if the computed value is null.
2653 >     *         the specified key, or null if the computed value is null
2654       * @throws NullPointerException if the specified key or mappingFunction
2655       *         is null
2656       * @throws IllegalStateException if the computation detectably
# Line 3671 | Line 3671 | public class ConcurrentHashMapV8<K, V>
3671           * of each (key, value).
3672           *
3673           * @param transformer a function returning the transformation
3674 <         * for an element, or null of there is no transformation (in
3675 <         * which case the action is not applied).
3674 >         * for an element, or null if there is no transformation (in
3675 >         * which case the action is not applied)
3676           * @param action the action
3677           */
3678          public <U> void forEach(BiFun<? super K, ? super V, ? extends U> transformer,
# Line 3704 | Line 3704 | public class ConcurrentHashMapV8<K, V>
3704           * combine values, or null if none.
3705           *
3706           * @param transformer a function returning the transformation
3707 <         * for an element, or null of there is no transformation (in
3708 <         * which case it is not combined).
3707 >         * for an element, or null if there is no transformation (in
3708 >         * which case it is not combined)
3709           * @param reducer a commutative associative combining function
3710           * @return the result of accumulating the given transformation
3711           * of all (key, value) pairs
# Line 3788 | Line 3788 | public class ConcurrentHashMapV8<K, V>
3788           * of each key.
3789           *
3790           * @param transformer a function returning the transformation
3791 <         * for an element, or null of there is no transformation (in
3792 <         * which case the action is not applied).
3791 >         * for an element, or null if there is no transformation (in
3792 >         * which case the action is not applied)
3793           * @param action the action
3794           */
3795          public <U> void forEachKey(Fun<? super K, ? extends U> transformer,
# Line 3834 | Line 3834 | public class ConcurrentHashMapV8<K, V>
3834           * null if none.
3835           *
3836           * @param transformer a function returning the transformation
3837 <         * for an element, or null of there is no transformation (in
3838 <         * which case it is not combined).
3837 >         * for an element, or null if there is no transformation (in
3838 >         * which case it is not combined)
3839           * @param reducer a commutative associative combining function
3840           * @return the result of accumulating the given transformation
3841           * of all keys
# Line 3918 | Line 3918 | public class ConcurrentHashMapV8<K, V>
3918           * of each value.
3919           *
3920           * @param transformer a function returning the transformation
3921 <         * for an element, or null of there is no transformation (in
3922 <         * which case the action is not applied).
3921 >         * for an element, or null if there is no transformation (in
3922 >         * which case the action is not applied)
3923           */
3924          public <U> void forEachValue(Fun<? super V, ? extends U> transformer,
3925                                       Action<U> action) {
# Line 3963 | Line 3963 | public class ConcurrentHashMapV8<K, V>
3963           * null if none.
3964           *
3965           * @param transformer a function returning the transformation
3966 <         * for an element, or null of there is no transformation (in
3967 <         * which case it is not combined).
3966 >         * for an element, or null if there is no transformation (in
3967 >         * which case it is not combined)
3968           * @param reducer a commutative associative combining function
3969           * @return the result of accumulating the given transformation
3970           * of all values
# Line 4047 | Line 4047 | public class ConcurrentHashMapV8<K, V>
4047           * of each entry.
4048           *
4049           * @param transformer a function returning the transformation
4050 <         * for an element, or null of there is no transformation (in
4051 <         * which case the action is not applied).
4050 >         * for an element, or null if there is no transformation (in
4051 >         * which case the action is not applied)
4052           * @param action the action
4053           */
4054          public <U> void forEachEntry(Fun<Map.Entry<K,V>, ? extends U> transformer,
# Line 4092 | Line 4092 | public class ConcurrentHashMapV8<K, V>
4092           * or null if none.
4093           *
4094           * @param transformer a function returning the transformation
4095 <         * for an element, or null of there is no transformation (in
4095 >         * for an element, or null if there is no transformation (in
4096           * which case it is not combined).
4097           * @param reducer a commutative associative combining function
4098           * @return the result of accumulating the given transformation
# Line 4196 | Line 4196 | public class ConcurrentHashMapV8<K, V>
4196           *
4197           * @param map the map
4198           * @param transformer a function returning the transformation
4199 <         * for an element, or null of there is no transformation (in
4200 <         * which case the action is not applied).
4199 >         * for an element, or null if there is no transformation (in
4200 >         * which case the action is not applied)
4201           * @param action the action
4202           * @return the task
4203           */
# Line 4239 | Line 4239 | public class ConcurrentHashMapV8<K, V>
4239           *
4240           * @param map the map
4241           * @param transformer a function returning the transformation
4242 <         * for an element, or null of there is no transformation (in
4242 >         * for an element, or null if there is no transformation (in
4243           * which case it is not combined).
4244           * @param reducer a commutative associative combining function
4245           * @return the task
# Line 4346 | Line 4346 | public class ConcurrentHashMapV8<K, V>
4346           *
4347           * @param map the map
4348           * @param transformer a function returning the transformation
4349 <         * for an element, or null of there is no transformation (in
4350 <         * which case the action is not applied).
4349 >         * for an element, or null if there is no transformation (in
4350 >         * which case the action is not applied)
4351           * @param action the action
4352           * @return the task
4353           */
# Line 4406 | Line 4406 | public class ConcurrentHashMapV8<K, V>
4406           *
4407           * @param map the map
4408           * @param transformer a function returning the transformation
4409 <         * for an element, or null of there is no transformation (in
4409 >         * for an element, or null if there is no transformation (in
4410           * which case it is not combined).
4411           * @param reducer a commutative associative combining function
4412           * @return the task
# Line 4513 | Line 4513 | public class ConcurrentHashMapV8<K, V>
4513           *
4514           * @param map the map
4515           * @param transformer a function returning the transformation
4516 <         * for an element, or null of there is no transformation (in
4517 <         * which case the action is not applied).
4516 >         * for an element, or null if there is no transformation (in
4517 >         * which case the action is not applied)
4518           * @param action the action
4519           */
4520          public static <K,V,U> ForkJoinTask<Void> forEachValue
# Line 4573 | Line 4573 | public class ConcurrentHashMapV8<K, V>
4573           *
4574           * @param map the map
4575           * @param transformer a function returning the transformation
4576 <         * for an element, or null of there is no transformation (in
4576 >         * for an element, or null if there is no transformation (in
4577           * which case it is not combined).
4578           * @param reducer a commutative associative combining function
4579           * @return the task
# Line 4680 | Line 4680 | public class ConcurrentHashMapV8<K, V>
4680           *
4681           * @param map the map
4682           * @param transformer a function returning the transformation
4683 <         * for an element, or null of there is no transformation (in
4684 <         * which case the action is not applied).
4683 >         * for an element, or null if there is no transformation (in
4684 >         * which case the action is not applied)
4685           * @param action the action
4686           */
4687          public static <K,V,U> ForkJoinTask<Void> forEachEntry
# Line 4740 | Line 4740 | public class ConcurrentHashMapV8<K, V>
4740           *
4741           * @param map the map
4742           * @param transformer a function returning the transformation
4743 <         * for an element, or null of there is no transformation (in
4743 >         * for an element, or null if there is no transformation (in
4744           * which case it is not combined).
4745           * @param reducer a commutative associative combining function
4746           * @return the task

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines