From a36a5ce5999ad092e47a9bbdfa1534422bdc2362 Mon Sep 17 00:00:00 2001
From: Alan Bateman <alanb@openjdk.org>
Date: Tue, 8 Mar 2011 10:32:18 +0000
Subject: [PATCH] 7025468: Tests using diamond with anonymous inner classes
 needs to be reverted

Reviewed-by: dholmes, forax
---
 jdk/test/java/nio/file/DirectoryStream/Basic.java | 2 +-
 jdk/test/java/util/PriorityQueue/NoNulls.java     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/jdk/test/java/nio/file/DirectoryStream/Basic.java b/jdk/test/java/nio/file/DirectoryStream/Basic.java
index 69f5d18f656..ec9d68ffd17 100644
--- a/jdk/test/java/nio/file/DirectoryStream/Basic.java
+++ b/jdk/test/java/nio/file/DirectoryStream/Basic.java
@@ -69,7 +69,7 @@ public class Basic {
             throw new RuntimeException("entry not found");
 
         // check filtering: f* should match foo
-        DirectoryStream.Filter<Path> filter = new DirectoryStream.Filter<>() {
+        DirectoryStream.Filter<Path> filter = new DirectoryStream.Filter<Path>() {
             private PathMatcher matcher =
                 dir.getFileSystem().getPathMatcher("glob:f*");
             public boolean accept(Path file) {
diff --git a/jdk/test/java/util/PriorityQueue/NoNulls.java b/jdk/test/java/util/PriorityQueue/NoNulls.java
index a56259a8ae0..21f76876b4c 100644
--- a/jdk/test/java/util/PriorityQueue/NoNulls.java
+++ b/jdk/test/java/util/PriorityQueue/NoNulls.java
@@ -53,7 +53,7 @@ import java.util.concurrent.PriorityBlockingQueue;
 public class NoNulls {
     void test(String[] args) throws Throwable {
         final Comparator<String> nullTolerantComparator
-            = new Comparator<>() {
+            = new Comparator<String>() {
             public int compare(String x, String y) {
                 return (x == null ? -1 :
                         y == null ? 1 :
@@ -65,7 +65,7 @@ public class NoNulls {
         nullSortedSet.add(null);
 
         final PriorityQueue<String> nullPriorityQueue
-            = new PriorityQueue<>() {
+            = new PriorityQueue<String>() {
             public Object[] toArray() { return new Object[] { null };}};
 
         final Collection<String> nullCollection = new ArrayList<>();