--- jsr166/src/jsr166e/ConcurrentHashMapV8.java 2013/12/01 20:55:50 1.120 +++ jsr166/src/jsr166e/ConcurrentHashMapV8.java 2015/02/27 21:08:53 1.123 @@ -15,7 +15,6 @@ import java.lang.reflect.Type; import java.util.AbstractMap; import java.util.Arrays; import java.util.Collection; -import java.util.Comparator; import java.util.ConcurrentModificationException; import java.util.Enumeration; import java.util.HashMap; @@ -638,10 +637,10 @@ public class ConcurrentHashMapV8 ex this.next = next; } - public final K getKey() { return key; } - public final V getValue() { return val; } - public final int hashCode() { return key.hashCode() ^ val.hashCode(); } - public final String toString(){ return key + "=" + val; } + public final K getKey() { return key; } + public final V getValue() { return val; } + public final int hashCode() { return key.hashCode() ^ val.hashCode(); } + public final String toString() { return key + "=" + val; } public final V setValue(V value) { throw new UnsupportedOperationException(); } @@ -2579,7 +2578,7 @@ public class ConcurrentHashMapV8 ex final TreeNode findTreeNode(int h, Object k, Class kc) { if (k != null) { TreeNode p = this; - do { + do { int ph, dir; K pk; TreeNode q; TreeNode pl = p.left, pr = p.right; if ((ph = p.hash) > h) @@ -3028,7 +3027,7 @@ public class ConcurrentHashMapV8 ex static TreeNode balanceDeletion(TreeNode root, TreeNode x) { - for (TreeNode xp, xpl, xpr;;) { + for (TreeNode xp, xpl, xpr;;) { if (x == null || x == root) return root; else if ((xp = x.parent) == null) {