--- jsr166/src/test/tck/EntryTest.java	2010/08/25 00:07:03	1.5
+++ jsr166/src/test/tck/EntryTest.java	2011/05/31 16:16:23	1.10
@@ -1,13 +1,11 @@
 /*
  * Written by Doug Lea with assistance from members of JCP JSR-166
  * Expert Group and released to the public domain, as explained at
- * http://creativecommons.org/licenses/publicdomain
+ * http://creativecommons.org/publicdomain/zero/1.0/
  */
 
 import junit.framework.*;
 import java.util.*;
-import java.util.concurrent.*;
-import java.io.*;
 
 public class EntryTest extends JSR166TestCase {
     public static void main(String[] args) {
@@ -22,7 +20,6 @@ public class EntryTest extends JSR166Tes
     static final String k2 = "2";
     static final String v2 = "b";
 
-
     /**
      * A new SimpleEntry(k, v) holds k, v.
      */
@@ -41,7 +38,6 @@ public class EntryTest extends JSR166Tes
         assertEquals(v1, s.getValue());
     }
 
-
     /**
      * A new SimpleEntry(entry(k, v)) holds k, v.
      */
@@ -87,22 +83,21 @@ public class EntryTest extends JSR166Tes
     public void testNotEquals() {
         Map.Entry e2 = new AbstractMap.SimpleEntry(k1, v1);
         Map.Entry e = new AbstractMap.SimpleEntry(k2, v1);
-        assertFalse(e2.equals( e));
+        assertFalse(e2.equals(e));
         e = new AbstractMap.SimpleEntry(k1, v2);
-        assertFalse(e2.equals( e));
+        assertFalse(e2.equals(e));
         e = new AbstractMap.SimpleEntry(k2, v2);
-        assertFalse(e2.equals( e));
+        assertFalse(e2.equals(e));
 
         Map.Entry s2 = new AbstractMap.SimpleImmutableEntry(k1, v1);
         Map.Entry s = new AbstractMap.SimpleImmutableEntry(k2, v1);
-        assertFalse(s2.equals( s));
+        assertFalse(s2.equals(s));
         s = new AbstractMap.SimpleImmutableEntry(k1, v2);
-        assertFalse(s2.equals( s));
+        assertFalse(s2.equals(s));
         s = new AbstractMap.SimpleImmutableEntry(k2, v2);
-        assertFalse(s2.equals( s));
+        assertFalse(s2.equals(s));
     }
 
-
     /**
      * getValue returns last setValue for SimpleEntry
      */
@@ -113,13 +108,13 @@ public class EntryTest extends JSR166Tes
         assertEquals(v1, e.getValue());
         e.setValue(k2);
         assertEquals(k2, e.getValue());
-        assertFalse(e2.equals( e));
+        assertFalse(e2.equals(e));
     }
 
     /**
      * setValue for SimpleImmutableEntry throws UnsupportedOperationException
      */
-    public void testsetValue2() {
+    public void testSetValue2() {
         Map.Entry s2 = new AbstractMap.SimpleImmutableEntry(k1, v1);
         Map.Entry s = new AbstractMap.SimpleImmutableEntry(s2);
         assertEquals(k1, s.getKey());