ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/src/extra166y/CustomConcurrentHashMap.java
(Generate patch)

Comparing jsr166/src/extra166y/CustomConcurrentHashMap.java (file contents):
Revision 1.32 by jsr166, Tue Feb 5 19:54:06 2013 UTC vs.
Revision 1.34 by jsr166, Fri Feb 15 22:20:46 2013 UTC

# Line 110 | Line 110 | import sun.misc.Unsafe;
110   * @param <K> the type of keys maintained by this map
111   * @param <V> the type of mapped values
112   */
113 < public class CustomConcurrentHashMap<K, V> extends AbstractMap<K, V>
114 <    implements ConcurrentMap<K, V>, Serializable {
113 > public class CustomConcurrentHashMap<K,V> extends AbstractMap<K,V>
114 >    implements ConcurrentMap<K,V>, Serializable {
115      private static final long serialVersionUID = 7249069246764182397L;
116  
117      /*
# Line 226 | Line 226 | public class CustomConcurrentHashMap<K,
226       * A function computing a mapping from the given key to a value,
227       * or {@code null} if there is no mapping.
228       */
229 <    public static interface MappingFunction<K, V> {
229 >    public static interface MappingFunction<K,V> {
230          /**
231           * Returns a value for the given key, or null if there is no
232           * mapping. If this function throws an (unchecked) exception,
# Line 247 | Line 247 | public class CustomConcurrentHashMap<K,
247       * current value to a new value, or {@code null} if there is
248       * no mapping.
249       */
250 <    public static interface RemappingFunction<K, V> {
250 >    public static interface RemappingFunction<K,V> {
251          /**
252           * Returns a new value for the given key and its current, or
253           * null if there is no mapping.
# Line 698 | Line 698 | public class CustomConcurrentHashMap<K,
698       * if no such mapping exists.
699       *
700       * @param  key   possible key
701 <     * @return the value associated with the key or {@code null} if
701 >     * @return the value associated with the key, or {@code null} if
702       * there is no mapping
703       * @throws NullPointerException if the specified key is null
704       */

Diff Legend

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