Merge "Revert "JSR-166 update""

1 files changed, 3 insertions, 5 deletions

diff --git a/jsr166-tests/src/test/java/jsr166/ConcurrentHashMapTest.java b/jsr166-tests/src/test/java/jsr166/ConcurrentHashMapTest.java
index f4271279bf..4650f4140b 100644
--- a/jsr166-tests/src/test/java/jsr166/ConcurrentHashMapTest.java
+++ b/jsr166-tests/src/test/java/jsr166/ConcurrentHashMapTest.java
@@ -30,7 +30,7 @@ public class ConcurrentHashMapTest extends JSR166TestCase {
     //     main(suite(), args);
     // }
     // public static Test suite() {
-    //     return new TestSuite(ConcurrentHashMapTest.class);
+    //     return new TestSuite(...);
     // }
 
     /**
@@ -50,9 +50,7 @@ public class ConcurrentHashMapTest extends JSR166TestCase {
     }
 
     /** Re-implement Integer.compare for old java versions */
-    static int compare(int x, int y) {
-        return (x < y) ? -1 : (x > y) ? 1 : 0;
-    }
+    static int compare(int x, int y) { return x < y ? -1 : x > y ? 1 : 0; }
 
     // classes for testing Comparable fallbacks
     static class BI implements Comparable<BI> {
@@ -540,7 +538,7 @@ public class ConcurrentHashMapTest extends JSR166TestCase {
     /**
      * Constructor (initialCapacity, loadFactor) throws
      * IllegalArgumentException if either argument is negative
-     */
+      */
     public void testConstructor2() {
         try {
             new ConcurrentHashMap(-1, .75f);