ViewVC Help

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

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

Comparing jsr166/src/jdk7/java/util/concurrent/ConcurrentHashMap.java (file contents):
Revision 1.11 by jsr166, Mon Jan 28 17:27:03 2013 UTC vs.
Revision 1.12 by jsr166, Tue Feb 5 19:54:07 2013 UTC

#	Line 2891 | Line 2891 | public class ConcurrentHashMap<K, V>
2891		* course only appropriate if it is acceptable to use the same
2892		* value for all additions from this view.
2893		*
2894	<	* @param mappedValue the mapped value to use for any
2895	<	* additions.
2894	>	* @param mappedValue the mapped value to use for any additions
2895		* @return the set view
2896		* @throws NullPointerException if the mappedValue is null
2897		*/
#	Line 3371 | Line 3370 | public class ConcurrentHashMap<K, V>
3370		*
3371		* @param transformer a function returning the transformation
3372		* for an element, or null if there is no transformation (in
3373	<	* which case the action is not applied).
3373	>	* which case the action is not applied)
3374		* @param action the action
3375		*/
3376		@SuppressWarnings("unchecked") public <U> void forEachSequentially
#	Line 3415 | Line 3414 | public class ConcurrentHashMap<K, V>
3414		*
3415		* @param transformer a function returning the transformation
3416		* for an element, or null if there is no transformation (in
3417	<	* which case it is not combined).
3417	>	* which case it is not combined)
3418		* @param reducer a commutative associative combining function
3419		* @return the result of accumulating the given transformation
3420		* of all (key, value) pairs
#	Line 3528 | Line 3527 | public class ConcurrentHashMap<K, V>
3527		*
3528		* @param transformer a function returning the transformation
3529		* for an element, or null if there is no transformation (in
3530	<	* which case the action is not applied).
3530	>	* which case the action is not applied)
3531		* @param action the action
3532		*/
3533		@SuppressWarnings("unchecked") public <U> void forEachKeySequentially
#	Line 3593 | Line 3592 | public class ConcurrentHashMap<K, V>
3592		*
3593		* @param transformer a function returning the transformation
3594		* for an element, or null if there is no transformation (in
3595	<	* which case it is not combined).
3595	>	* which case it is not combined)
3596		* @param reducer a commutative associative combining function
3597		* @return the result of accumulating the given transformation
3598		* of all keys
#	Line 3706 | Line 3705 | public class ConcurrentHashMap<K, V>
3705		*
3706		* @param transformer a function returning the transformation
3707		* for an element, or null if there is no transformation (in
3708	<	* which case the action is not applied).
3708	>	* which case the action is not applied)
3709		*/
3710		public <U> void forEachValueSequentially
3711		(Fun<? super V, ? extends U> transformer,
#	Line 3766 | Line 3765 | public class ConcurrentHashMap<K, V>
3765		*
3766		* @param transformer a function returning the transformation
3767		* for an element, or null if there is no transformation (in
3768	<	* which case it is not combined).
3768	>	* which case it is not combined)
3769		* @param reducer a commutative associative combining function
3770		* @return the result of accumulating the given transformation
3771		* of all values
#	Line 3880 | Line 3879 | public class ConcurrentHashMap<K, V>
3879		*
3880		* @param transformer a function returning the transformation
3881		* for an element, or null if there is no transformation (in
3882	<	* which case the action is not applied).
3882	>	* which case the action is not applied)
3883		* @param action the action
3884		*/
3885		@SuppressWarnings("unchecked") public <U> void forEachEntrySequentially
#	Line 3943 | Line 3942 | public class ConcurrentHashMap<K, V>
3942		*
3943		* @param transformer a function returning the transformation
3944		* for an element, or null if there is no transformation (in
3945	<	* which case it is not combined).
3945	>	* which case it is not combined)
3946		* @param reducer a commutative associative combining function
3947		* @return the result of accumulating the given transformation
3948		* of all entries
#	Line 4055 | Line 4054 | public class ConcurrentHashMap<K, V>
4054		*
4055		* @param transformer a function returning the transformation
4056		* for an element, or null if there is no transformation (in
4057	<	* which case the action is not applied).
4057	>	* which case the action is not applied)
4058		* @param action the action
4059		*/
4060		public <U> void forEachInParallel
#	Line 4090 | Line 4089 | public class ConcurrentHashMap<K, V>
4089		*
4090		* @param transformer a function returning the transformation
4091		* for an element, or null if there is no transformation (in
4092	<	* which case it is not combined).
4092	>	* which case it is not combined)
4093		* @param reducer a commutative associative combining function
4094		* @return the result of accumulating the given transformation
4095		* of all (key, value) pairs
#	Line 4178 | Line 4177 | public class ConcurrentHashMap<K, V>
4177		*
4178		* @param transformer a function returning the transformation
4179		* for an element, or null if there is no transformation (in
4180	<	* which case the action is not applied).
4180	>	* which case the action is not applied)
4181		* @param action the action
4182		*/
4183		public <U> void forEachKeyInParallel
#	Line 4227 | Line 4226 | public class ConcurrentHashMap<K, V>
4226		*
4227		* @param transformer a function returning the transformation
4228		* for an element, or null if there is no transformation (in
4229	<	* which case it is not combined).
4229	>	* which case it is not combined)
4230		* @param reducer a commutative associative combining function
4231		* @return the result of accumulating the given transformation
4232		* of all keys
#	Line 4315 | Line 4314 | public class ConcurrentHashMap<K, V>
4314		*
4315		* @param transformer a function returning the transformation
4316		* for an element, or null if there is no transformation (in
4317	<	* which case the action is not applied).
4317	>	* which case the action is not applied)
4318		*/
4319		public <U> void forEachValueInParallel
4320		(Fun<? super V, ? extends U> transformer,
#	Line 4362 | Line 4361 | public class ConcurrentHashMap<K, V>
4361		*
4362		* @param transformer a function returning the transformation
4363		* for an element, or null if there is no transformation (in
4364	<	* which case it is not combined).
4364	>	* which case it is not combined)
4365		* @param reducer a commutative associative combining function
4366		* @return the result of accumulating the given transformation
4367		* of all values
#	Line 4450 | Line 4449 | public class ConcurrentHashMap<K, V>
4449		*
4450		* @param transformer a function returning the transformation
4451		* for an element, or null if there is no transformation (in
4452	<	* which case the action is not applied).
4452	>	* which case the action is not applied)
4453		* @param action the action
4454		*/
4455		public <U> void forEachEntryInParallel
#	Line 4498 | Line 4497 | public class ConcurrentHashMap<K, V>
4497		*
4498		* @param transformer a function returning the transformation
4499		* for an element, or null if there is no transformation (in
4500	<	* which case it is not combined).
4500	>	* which case it is not combined)
4501		* @param reducer a commutative associative combining function
4502		* @return the result of accumulating the given transformation
4503		* of all entries
#	Line 4731 | Line 4730 | public class ConcurrentHashMap<K, V>
4730		* or {@code null} if additions are not supported.
4731		*
4732		* @return the default mapped value for additions, or {@code null}
4733	<	* if not supported.
4733	>	* if not supported
4734		*/
4735		public V getMappedValue() { return value; }
4736
#	Line 4972 | Line 4971 | public class ConcurrentHashMap<K, V>
4971		* @param map the map
4972		* @param transformer a function returning the transformation
4973		* for an element, or null if there is no transformation (in
4974	<	* which case it is not combined).
4974	>	* which case it is not combined)
4975		* @param reducer a commutative associative combining function
4976		* @return the task
4977		*/
#	Line 5139 | Line 5138 | public class ConcurrentHashMap<K, V>
5138		* @param map the map
5139		* @param transformer a function returning the transformation
5140		* for an element, or null if there is no transformation (in
5141	<	* which case it is not combined).
5141	>	* which case it is not combined)
5142		* @param reducer a commutative associative combining function
5143		* @return the task
5144		*/
#	Line 5305 | Line 5304 | public class ConcurrentHashMap<K, V>
5304		* @param map the map
5305		* @param transformer a function returning the transformation
5306		* for an element, or null if there is no transformation (in
5307	<	* which case it is not combined).
5307	>	* which case it is not combined)
5308		* @param reducer a commutative associative combining function
5309		* @return the task
5310		*/
#	Line 5471 | Line 5470 | public class ConcurrentHashMap<K, V>
5470		* @param map the map
5471		* @param transformer a function returning the transformation
5472		* for an element, or null if there is no transformation (in
5473	<	* which case it is not combined).
5473	>	* which case it is not combined)
5474		* @param reducer a commutative associative combining function
5475		* @return the task
5476		*/

Diff Legend

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