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.193 by jsr166, Tue Feb 26 17:33:53 2013 UTC vs.
Revision 1.194 by dl, Wed Mar 13 12:39:01 2013 UTC

#	Line 4870 | Line 4870 | public class ConcurrentHashMap<K,V>
4870		return added;
4871		}
4872
4873	<	Spliterator<K> spliterator() {
4873	>	public Spliterator<K> spliterator() {
4874		return new KeyIterator<>(map, null);
4875		}
4876
4877	–	public Stream<K> stream() {
4878	–	return Streams.stream(spliterator());
4879	–	}
4880	–	public Stream<K> parallelStream() {
4881	–	return Streams.parallelStream(spliterator());
4882	–	}
4877		}
4878
4879		/**
#	Line 4929 | Line 4923 | public class ConcurrentHashMap<K,V>
4923		throw new UnsupportedOperationException();
4924		}
4925
4926	<	Spliterator<V> spliterator() {
4926	>	public Spliterator<V> spliterator() {
4927		return new ValueIterator<K,V>(map, null);
4928		}
4929
4936	–	public Stream<V> stream() {
4937	–	return Streams.stream(spliterator());
4938	–	}
4939	–
4940	–	public Stream<V> parallelStream() {
4941	–	return Streams.parallelStream(spliterator());
4942	–	}
4943	–
4930		}
4931
4932		/**
#	Line 5005 | Line 4991 | public class ConcurrentHashMap<K,V>
4991		return added;
4992		}
4993
4994	<	Spliterator<Map.Entry<K,V>> spliterator() {
4994	>	public Spliterator<Map.Entry<K,V>> spliterator() {
4995		return new EntryIterator<K,V>(map, null);
4996		}
4997
5012	–	public Stream<Map.Entry<K,V>> stream() {
5013	–	return Streams.stream(spliterator());
5014	–	}
5015	–
5016	–	public Stream<Map.Entry<K,V>> parallelStream() {
5017	–	return Streams.parallelStream(spliterator());
5018	–	}
4998		}
4999
5000		// ---------------------------------------------------------------------

Diff Legend

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