--- jsr166/src/test/jtreg/util/PriorityQueue/NoNulls.java	2011/05/29 20:42:40	1.3
+++ jsr166/src/test/jtreg/util/PriorityQueue/NoNulls.java	2017/01/04 04:46:19	1.7
@@ -11,10 +11,8 @@
  */
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Comparator;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.PriorityQueue;
 import java.util.SortedSet;
 import java.util.TreeSet;
@@ -26,7 +24,7 @@ import java.util.concurrent.PriorityBloc
 public class NoNulls {
     void test(String[] args) throws Throwable {
         final Comparator<String> nullTolerantComparator
-            = new Comparator<String>() {
+            = new Comparator<>() {
             public int compare(String x, String y) {
                 return (x == null ? -1 :
                         y == null ? 1 :
@@ -38,7 +36,7 @@ public class NoNulls {
         nullSortedSet.add(null);
 
         final PriorityQueue<String> nullPriorityQueue
-            = new PriorityQueue<String>() {
+            = new PriorityQueue<>() {
             public Object[] toArray() { return new Object[] { null };}};
 
         final Collection<String> nullCollection = new ArrayList<>();