changeset 3851:c0bf0f19897a

Merge
author lana
date Thu, 10 Mar 2011 19:38:44 -0800
parents 0b6d82c838d4 663c7623b96b
children c975c4fbca20
files
diffstat 2 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/test/java/nio/file/DirectoryStream/Basic.java	Mon Mar 07 14:48:27 2011 -0800
+++ b/test/java/nio/file/DirectoryStream/Basic.java	Thu Mar 10 19:38:44 2011 -0800
@@ -69,7 +69,7 @@
             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) {
--- a/test/java/util/PriorityQueue/NoNulls.java	Mon Mar 07 14:48:27 2011 -0800
+++ b/test/java/util/PriorityQueue/NoNulls.java	Thu Mar 10 19:38:44 2011 -0800
@@ -53,7 +53,7 @@
 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 @@
         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<>();