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

Comparing jsr166/src/jsr166e/ConcurrentHashMapV8.java (file contents):
Revision 1.43 by jsr166, Wed Jul 4 20:21:02 2012 UTC vs.
Revision 1.46 by dl, Thu Jul 5 18:05:28 2012 UTC

# Line 145 | Line 145 | public class ConcurrentHashMapV8<K, V>
145       * framework. As illustrated here, Spliterators are well suited to
146       * designs in which a task repeatedly splits off half its work
147       * into forked subtasks until small enough to process directly,
148 <     * and then joins these subtasks. Variants of this style can be
149 <     * also be used in completion-based designs.
148 >     * and then joins these subtasks. Variants of this style can also
149 >     * be used in completion-based designs.
150       *
151       * <pre>
152       * {@code ConcurrentHashMapV8<String, Long> m = ...
# Line 192 | Line 192 | public class ConcurrentHashMapV8<K, V>
192           * @return a Spliterator covering approximately half of the
193           * elements
194           * @throws IllegalStateException if this Spliterator has
195 <         * already commenced traversing elements.
195 >         * already commenced traversing elements
196           */
197          Spliterator<T> split();
198 –
199 –        /**
200 –         * Returns a Spliterator producing the same elements as this
201 –         * Spliterator. This method may be used for example to create
202 –         * a second Spliterator before a traversal, in order to later
203 –         * perform a second traversal.
204 –         *
205 –         * @return a Spliterator covering the same range as this Spliterator.
206 –         * @throws IllegalStateException if this Spliterator has
207 –         * already commenced traversing elements.
208 –         */
209 –        Spliterator<T> clone();
198      }
199  
200      /*
# Line 806 | Line 794 | public class ConcurrentHashMapV8<K, V>
794          }
795  
796          /**
797 <         * Find or add a node
797 >         * Finds or adds a node.
798           * @return null if added
799           */
800          @SuppressWarnings("unchecked") // suppress Comparable cast warning
# Line 2012 | Line 2000 | public class ConcurrentHashMapV8<K, V>
2000      }
2001  
2002      /**
2003 <     * Split a normal bin with list headed by e into lo and hi parts;
2004 <     * install in given table
2003 >     * Splits a normal bin with list headed by e into lo and hi parts;
2004 >     * installs in given table.
2005       */
2006      private static void splitBin(Node[] nextTab, int i, Node e) {
2007          int bit = nextTab.length >>> 1; // bit to split on
# Line 2043 | Line 2031 | public class ConcurrentHashMapV8<K, V>
2031      }
2032  
2033      /**
2034 <     * Split a tree bin into lo and hi parts; install in given table
2034 >     * Splits a tree bin into lo and hi parts; installs in given table.
2035       */
2036      private static void splitTreeBin(Node[] nextTab, int i, TreeBin t) {
2037          int bit = nextTab.length >>> 1;

Diff Legend

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