ViewVC Help

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

root/jsr166/jsr166/src/jsr166x/ConcurrentSkipListMap.java

Comparing jsr166/src/jsr166x/ConcurrentSkipListMap.java (file contents):
Revision 1.25 by jsr166, Tue Jan 22 20:08:33 2013 UTC vs.
Revision 1.30 by jsr166, Tue Feb 5 20:10:18 2013 UTC

#	Line 419 | Line 419 | public class ConcurrentSkipListMap<K,V>
419		* because callers will have already read value field and need
420		* to use that read (not another done here) and so directly
421		* test if value points to node.
422	<	* @param n a possibly null reference to a node
422	>	*
423		* @return true if this node is a marker node
424		*/
425		boolean isMarker() {
#	Line 468 | Line 468 | public class ConcurrentSkipListMap<K,V>
468		* Returns value if this node contains a valid key-value pair,
469		* else null.
470		* @return this node's value if it isn't a marker or header or
471	<	* is deleted, else null.
471	>	* is deleted, else null
472		*/
473		V getValidValue() {
474		Object v = value;
#	Line 507 | Line 507 | public class ConcurrentSkipListMap<K,V>
507		volatile Index<K,V> right;
508
509		/**
510	<	* Creates index node with given values
510	>	* Creates index node with given values.
511		*/
512		Index(Node<K,V> node, Index<K,V> down, Index<K,V> right) {
513		this.node = node;
#	Line 766 | Line 766 | public class ConcurrentSkipListMap<K,V>
766		}
767
768		/**
769	<	* Returns node holding key or null if no such, clearing out any
769	>	* Returns node holding key, or null if no such, clearing out any
770		* deleted nodes seen along the way.  Repeatedly traverses at
771		* base-level looking for key starting at predecessor returned
772		* from findPredecessor, processing base-level deletions as
#	Line 1601 | Line 1601 | public class ConcurrentSkipListMap<K,V>
1601		* Constructs a new map containing the same mappings as the given
1602		* {@code SortedMap}, sorted according to the same ordering.
1603		* @param m the sorted map whose mappings are to be placed in this
1604	<	* map, and whose comparator is to be used to sort this map.
1604	>	* map, and whose comparator is to be used to sort this map
1605		* @throws NullPointerException if the specified sorted map is
1606	<	* {@code null}.
1606	>	* {@code null}
1607		*/
1608		public ConcurrentSkipListMap(SortedMap<K, ? extends V> m) {
1609		this.comparator = m.comparator();
#	Line 2212 | Line 2212 | public class ConcurrentSkipListMap<K,V>
2212		* if this map uses its keys' natural order.
2213		*
2214		* @return the comparator associated with this map, or
2215	<	* {@code null} if it uses its keys' natural sort method.
2215	>	* {@code null} if it uses its keys' natural sort method
2216		*/
2217		public Comparator<? super K> comparator() {
2218		return comparator;
#	Line 3049 | Line 3049 | public class ConcurrentSkipListMap<K,V>
3049		/**
3050		* Creates a new submap.
3051		* @param least inclusive least value, or {@code null} if from start
3052	<	* @param fence exclusive upper bound or {@code null} if to end
3052	>	* @param fence exclusive upper bound, or {@code null} if to end
3053		* @throws IllegalArgumentException if least and fence non-null
3054		*  and least greater than fence
3055		*/
#	Line 3104 | Line 3104 | public class ConcurrentSkipListMap<K,V>
3104
3105		/**
3106		* Returns least key. Needed by ConcurrentSkipListSet.
3107	<	* @return least key or {@code null} if from start
3107	>	* @return least key, or {@code null} if from start
3108		*/
3109		K getLeast() {
3110		return least;
#	Line 3112 | Line 3112 | public class ConcurrentSkipListMap<K,V>
3112
3113		/**
3114		* Returns fence key. Needed by ConcurrentSkipListSet.
3115	<	* @return fence key or {@code null} of to end
3115	>	* @return fence key, or {@code null} if to end
3116		*/
3117		K getFence() {
3118		return fence;

Diff Legend

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