ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/jsr166/jsr166/src/main/java/util/concurrent/ConcurrentHashMap.java

Comparing jsr166/src/main/java/util/concurrent/ConcurrentHashMap.java (file contents):
Revision 1.171 by dl, Fri Feb 1 01:02:37 2013 UTC vs.
Revision 1.172 by jsr166, Tue Feb 5 19:54:06 2013 UTC

#	Line 2784 | Line 2784 | public class ConcurrentHashMap<K, V>
2784		* course only appropriate if it is acceptable to use the same
2785		* value for all additions from this view.
2786		*
2787	<	* @param mappedValue the mapped value to use for any
2788	<	* additions.
2787	>	* @param mappedValue the mapped value to use for any additions
2788		* @return the set view
2789		* @throws NullPointerException if the mappedValue is null
2790		*/
#	Line 3252 | Line 3251 | public class ConcurrentHashMap<K, V>
3251		*
3252		* @param transformer a function returning the transformation
3253		* for an element, or null if there is no transformation (in
3254	<	* which case the action is not applied).
3254	>	* which case the action is not applied)
3255		* @param action the action
3256		*/
3257		public <U> void forEachSequentially
#	Line 3296 | Line 3295 | public class ConcurrentHashMap<K, V>
3295		*
3296		* @param transformer a function returning the transformation
3297		* for an element, or null if there is no transformation (in
3298	<	* which case it is not combined).
3298	>	* which case it is not combined)
3299		* @param reducer a commutative associative combining function
3300		* @return the result of accumulating the given transformation
3301		* of all (key, value) pairs
#	Line 3409 | Line 3408 | public class ConcurrentHashMap<K, V>
3408		*
3409		* @param transformer a function returning the transformation
3410		* for an element, or null if there is no transformation (in
3411	<	* which case the action is not applied).
3411	>	* which case the action is not applied)
3412		* @param action the action
3413		*/
3414		public <U> void forEachKeySequentially
#	Line 3474 | Line 3473 | public class ConcurrentHashMap<K, V>
3473		*
3474		* @param transformer a function returning the transformation
3475		* for an element, or null if there is no transformation (in
3476	<	* which case it is not combined).
3476	>	* which case it is not combined)
3477		* @param reducer a commutative associative combining function
3478		* @return the result of accumulating the given transformation
3479		* of all keys
#	Line 3587 | Line 3586 | public class ConcurrentHashMap<K, V>
3586		*
3587		* @param transformer a function returning the transformation
3588		* for an element, or null if there is no transformation (in
3589	<	* which case the action is not applied).
3589	>	* which case the action is not applied)
3590		*/
3591		public <U> void forEachValueSequentially
3592		(Function<? super V, ? extends U> transformer,
#	Line 3647 | Line 3646 | public class ConcurrentHashMap<K, V>
3646		*
3647		* @param transformer a function returning the transformation
3648		* for an element, or null if there is no transformation (in
3649	<	* which case it is not combined).
3649	>	* which case it is not combined)
3650		* @param reducer a commutative associative combining function
3651		* @return the result of accumulating the given transformation
3652		* of all values
#	Line 3761 | Line 3760 | public class ConcurrentHashMap<K, V>
3760		*
3761		* @param transformer a function returning the transformation
3762		* for an element, or null if there is no transformation (in
3763	<	* which case the action is not applied).
3763	>	* which case the action is not applied)
3764		* @param action the action
3765		*/
3766		public <U> void forEachEntrySequentially
#	Line 3824 | Line 3823 | public class ConcurrentHashMap<K, V>
3823		*
3824		* @param transformer a function returning the transformation
3825		* for an element, or null if there is no transformation (in
3826	<	* which case it is not combined).
3826	>	* which case it is not combined)
3827		* @param reducer a commutative associative combining function
3828		* @return the result of accumulating the given transformation
3829		* of all entries
#	Line 3936 | Line 3935 | public class ConcurrentHashMap<K, V>
3935		*
3936		* @param transformer a function returning the transformation
3937		* for an element, or null if there is no transformation (in
3938	<	* which case the action is not applied).
3938	>	* which case the action is not applied)
3939		* @param action the action
3940		*/
3941		public <U> void forEachInParallel
#	Line 3971 | Line 3970 | public class ConcurrentHashMap<K, V>
3970		*
3971		* @param transformer a function returning the transformation
3972		* for an element, or null if there is no transformation (in
3973	<	* which case it is not combined).
3973	>	* which case it is not combined)
3974		* @param reducer a commutative associative combining function
3975		* @return the result of accumulating the given transformation
3976		* of all (key, value) pairs
#	Line 4059 | Line 4058 | public class ConcurrentHashMap<K, V>
4058		*
4059		* @param transformer a function returning the transformation
4060		* for an element, or null if there is no transformation (in
4061	<	* which case the action is not applied).
4061	>	* which case the action is not applied)
4062		* @param action the action
4063		*/
4064		public <U> void forEachKeyInParallel
#	Line 4108 | Line 4107 | public class ConcurrentHashMap<K, V>
4107		*
4108		* @param transformer a function returning the transformation
4109		* for an element, or null if there is no transformation (in
4110	<	* which case it is not combined).
4110	>	* which case it is not combined)
4111		* @param reducer a commutative associative combining function
4112		* @return the result of accumulating the given transformation
4113		* of all keys
#	Line 4196 | Line 4195 | public class ConcurrentHashMap<K, V>
4195		*
4196		* @param transformer a function returning the transformation
4197		* for an element, or null if there is no transformation (in
4198	<	* which case the action is not applied).
4198	>	* which case the action is not applied)
4199		*/
4200		public <U> void forEachValueInParallel
4201		(Function<? super V, ? extends U> transformer,
#	Line 4243 | Line 4242 | public class ConcurrentHashMap<K, V>
4242		*
4243		* @param transformer a function returning the transformation
4244		* for an element, or null if there is no transformation (in
4245	<	* which case it is not combined).
4245	>	* which case it is not combined)
4246		* @param reducer a commutative associative combining function
4247		* @return the result of accumulating the given transformation
4248		* of all values
#	Line 4331 | Line 4330 | public class ConcurrentHashMap<K, V>
4330		*
4331		* @param transformer a function returning the transformation
4332		* for an element, or null if there is no transformation (in
4333	<	* which case the action is not applied).
4333	>	* which case the action is not applied)
4334		* @param action the action
4335		*/
4336		public <U> void forEachEntryInParallel
#	Line 4379 | Line 4378 | public class ConcurrentHashMap<K, V>
4378		*
4379		* @param transformer a function returning the transformation
4380		* for an element, or null if there is no transformation (in
4381	<	* which case it is not combined).
4381	>	* which case it is not combined)
4382		* @param reducer a commutative associative combining function
4383		* @return the result of accumulating the given transformation
4384		* of all entries
#	Line 4612 | Line 4611 | public class ConcurrentHashMap<K, V>
4611		* or {@code null} if additions are not supported.
4612		*
4613		* @return the default mapped value for additions, or {@code null}
4614	<	* if not supported.
4614	>	* if not supported
4615		*/
4616		public V getMappedValue() { return value; }
4617
#	Line 4879 | Line 4878 | public class ConcurrentHashMap<K, V>
4878		* @param map the map
4879		* @param transformer a function returning the transformation
4880		* for an element, or null if there is no transformation (in
4881	<	* which case it is not combined).
4881	>	* which case it is not combined)
4882		* @param reducer a commutative associative combining function
4883		* @return the task
4884		*/
#	Line 5046 | Line 5045 | public class ConcurrentHashMap<K, V>
5045		* @param map the map
5046		* @param transformer a function returning the transformation
5047		* for an element, or null if there is no transformation (in
5048	<	* which case it is not combined).
5048	>	* which case it is not combined)
5049		* @param reducer a commutative associative combining function
5050		* @return the task
5051		*/
#	Line 5212 | Line 5211 | public class ConcurrentHashMap<K, V>
5211		* @param map the map
5212		* @param transformer a function returning the transformation
5213		* for an element, or null if there is no transformation (in
5214	<	* which case it is not combined).
5214	>	* which case it is not combined)
5215		* @param reducer a commutative associative combining function
5216		* @return the task
5217		*/
#	Line 5378 | Line 5377 | public class ConcurrentHashMap<K, V>
5377		* @param map the map
5378		* @param transformer a function returning the transformation
5379		* for an element, or null if there is no transformation (in
5380	<	* which case it is not combined).
5380	>	* which case it is not combined)
5381		* @param reducer a commutative associative combining function
5382		* @return the task
5383		*/

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines