ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/src/main/java/util/concurrent/ConcurrentSkipListMap.java
(Generate patch)

Comparing jsr166/src/main/java/util/concurrent/ConcurrentSkipListMap.java (file contents):
Revision 1.100 by dl, Sun Feb 17 23:36:34 2013 UTC vs.
Revision 1.101 by jsr166, Mon Feb 18 01:30:23 2013 UTC

# Line 2748 | Line 2748 | public class ConcurrentSkipListMap<K,V>
2748                  return (Spliterator<Map.Entry<K1,V1>>)
2749                      ((SubMap<K1,V1>)m).entryIterator();
2750          }
2751 <        
2751 >
2752          public Stream<Map.Entry<K1,V1>> stream() {
2753              return Streams.stream(spliterator());
2754          }
# Line 3739 | Line 3739 | public class ConcurrentSkipListMap<K,V>
3739          }
3740  
3741          public int characteristics() {
3742 <            return  Spliterator.DISTINCT | Spliterator.SORTED |
3743 <                Spliterator.ORDERED | Spliterator.CONCURRENT |
3742 >            return  Spliterator.DISTINCT | Spliterator.SORTED |
3743 >                Spliterator.ORDERED | Spliterator.CONCURRENT |
3744                  Spliterator.NONNULL;
3745          }
3746  
# Line 3922 | Line 3922 | public class ConcurrentSkipListMap<K,V>
3922          }
3923  
3924          public int characteristics() {
3925 <            return  Spliterator.DISTINCT | Spliterator.SORTED |
3926 <                Spliterator.ORDERED | Spliterator.CONCURRENT |
3925 >            return  Spliterator.DISTINCT | Spliterator.SORTED |
3926 >                Spliterator.ORDERED | Spliterator.CONCURRENT |
3927                  Spliterator.NONNULL;
3928          }
3929      }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines