changeset 3542:6d0217114886

7011095: revert diamond changes from 6880112 that occur in method args Reviewed-by: darcy, alanb
author smarks
date Tue, 11 Jan 2011 13:42:34 -0800
parents befe813e24d2
children cb3ecb5e4ce5
files src/share/classes/com/sun/java/util/jar/pack/BandStructure.java src/share/classes/java/io/ObjectStreamClass.java src/share/classes/java/lang/StringCoding.java src/share/classes/java/util/logging/Logger.java
diffstat 4 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java	Tue Jan 11 12:36:43 2011 -0500
+++ b/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java	Tue Jan 11 13:42:34 2011 -0800
@@ -1704,7 +1704,7 @@
         for (int i = 0; i < ATTR_CONTEXT_LIMIT; i++) {
             assert(attrIndexLimit[i] == 0);
             attrIndexLimit[i] = 32;  // just for the sake of predefs.
-            attrDefs.set(i, new ArrayList<>(Collections.nCopies(
+            attrDefs.set(i, new ArrayList<Attribute.Layout>(Collections.nCopies(
                     attrIndexLimit[i], (Attribute.Layout)null)));
 
         }
--- a/src/share/classes/java/io/ObjectStreamClass.java	Tue Jan 11 12:36:43 2011 -0500
+++ b/src/share/classes/java/io/ObjectStreamClass.java	Tue Jan 11 13:42:34 2011 -0800
@@ -329,7 +329,7 @@
                 entry = th;
             }
             if (future.set(entry)) {
-                Caches.localDescs.put(key, new SoftReference<>(entry));
+                Caches.localDescs.put(key, new SoftReference<Object>(entry));
             } else {
                 // nested lookup call already set future
                 entry = future.get();
@@ -2118,7 +2118,7 @@
                 entry = th;
             }
             future.set(entry);
-            Caches.reflectors.put(key, new SoftReference<>(entry));
+            Caches.reflectors.put(key, new SoftReference<Object>(entry));
         }
 
         if (entry instanceof FieldReflector) {
--- a/src/share/classes/java/lang/StringCoding.java	Tue Jan 11 12:36:43 2011 -0500
+++ b/src/share/classes/java/lang/StringCoding.java	Tue Jan 11 13:42:34 2011 -0800
@@ -67,7 +67,7 @@
     }
 
     private static <T> void set(ThreadLocal<SoftReference<T>> tl, T ob) {
-        tl.set(new SoftReference<>(ob));
+        tl.set(new SoftReference<T>(ob));
     }
 
     // Trim the given byte array to the given length
--- a/src/share/classes/java/util/logging/Logger.java	Tue Jan 11 12:36:43 2011 -0500
+++ b/src/share/classes/java/util/logging/Logger.java	Tue Jan 11 13:42:34 2011 -0800
@@ -1426,7 +1426,7 @@
                 // we didn't have a previous parent
                 ref = manager.new LoggerWeakRef(this);
             }
-            ref.setParentRef(new WeakReference<>(parent));
+            ref.setParentRef(new WeakReference<Logger>(parent));
             parent.kids.add(ref);
 
             // As a result of the reparenting, the effective level