Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
home:mateli:java
java
_service:download_src_package:bootstrap-ecj-dia...
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File _service:download_src_package:bootstrap-ecj-diamond.patch of Package java
diff -up openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java.sav openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java --- openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java.sav 2011-07-29 12:21:02.000000000 -0400 +++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java 2011-07-29 14:27:07.764531588 -0400 @@ -103,9 +103,9 @@ class Attribute implements Comparable<At return this.def.compareTo(that.def); } - private static final Map<List<Attribute>, List<Attribute>> canonLists = new HashMap<>(); - private static final Map<Layout, Attribute> attributes = new HashMap<>(); - private static final Map<Layout, Attribute> standardDefs = new HashMap<>(); + private static final Map<List<Attribute>, List<Attribute>> canonLists = new HashMap<List<Attribute>, List<Attribute>>(); + private static final Map<Layout, Attribute> attributes = new HashMap<Layout, Attribute>(); + private static final Map<Layout, Attribute> standardDefs = new HashMap<Layout, Attribute>(); // Canonicalized lists of trivial attrs (Deprecated, etc.) // are used by trimToSize, in order to reduce footprint @@ -115,7 +115,7 @@ class Attribute implements Comparable<At synchronized (canonLists) { List<Attribute> cl = canonLists.get(al); if (cl == null) { - cl = new ArrayList<>(al.size()); + cl = new ArrayList<Attribute>(al.size()); cl.addAll(al); cl = Collections.unmodifiableList(cl); canonLists.put(al, cl); @@ -336,9 +336,9 @@ class Attribute implements Comparable<At public void addAttribute(Attribute a) { if (attributes == null) - attributes = new ArrayList<>(3); + attributes = new ArrayList<Attribute>(3); else if (!(attributes instanceof ArrayList)) - attributes = new ArrayList<>(attributes); // unfreeze it + attributes = new ArrayList<Attribute>(attributes); // unfreeze it attributes.add(a); } @@ -346,7 +346,7 @@ class Attribute implements Comparable<At if (attributes == null) return null; if (!attributes.contains(a)) return null; if (!(attributes instanceof ArrayList)) - attributes = new ArrayList<>(attributes); // unfreeze it + attributes = new ArrayList<Attribute>(attributes); // unfreeze it attributes.remove(a); return a; } @@ -838,7 +838,7 @@ class Attribute implements Comparable<At */ static //private Layout.Element[] tokenizeLayout(Layout self, int curCble, String layout) { - List<Layout.Element> col = new ArrayList<>(layout.length()); + List<Layout.Element> col = new ArrayList<Layout.Element>(layout.length()); tokenizeLayout(self, curCble, layout, col); Layout.Element[] res = new Layout.Element[col.size()]; col.toArray(res); @@ -903,7 +903,7 @@ class Attribute implements Comparable<At case 'T': // union: 'T' any_int union_case* '(' ')' '[' body ']' kind = EK_UN; i = tokenizeSInt(e, layout, i); - List<Layout.Element> cases = new ArrayList<>(); + List<Layout.Element> cases = new ArrayList<Layout.Element>(); for (;;) { // Keep parsing cases until we hit the default case. if (layout.charAt(i++) != '(') @@ -1057,7 +1057,7 @@ class Attribute implements Comparable<At } static //private String[] splitBodies(String layout) { - List<String> bodies = new ArrayList<>(); + List<String> bodies = new ArrayList<String>(); // Parse several independent layout bodies: "[foo][bar]...[baz]" for (int i = 0; i < layout.length(); i++) { if (layout.charAt(i++) != '[') diff -up openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java.sav openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java --- openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java.sav 2011-07-29 14:27:01.425625667 -0400 +++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java 2011-07-29 14:27:07.765531573 -0400 @@ -257,7 +257,7 @@ class BandStructure { assert(basicCodings[_meta_default] == null); assert(basicCodings[_meta_canon_min] != null); assert(basicCodings[_meta_canon_max] != null); - Map<Coding, Integer> map = new HashMap<>(); + Map<Coding, Integer> map = new HashMap<Coding, Integer>(); for (int i = 0; i < basicCodings.length; i++) { Coding c = basicCodings[i]; if (c == null) continue; @@ -1068,8 +1068,8 @@ class BandStructure { // Bootstrap support for CPRefBands. These are needed to record // intended CP indexes, before the CP has been created. - private final List<CPRefBand> allKQBands = new ArrayList<>(); - private List<Object[]> needPredefIndex = new ArrayList<>(); + private final List<CPRefBand> allKQBands = new ArrayList<CPRefBand>(); + private List<Object[]> needPredefIndex = new ArrayList<Object[]>(); int encodeRef(Entry e, Index ix) { @@ -1704,7 +1704,7 @@ class BandStructure { protected int attrClassFileVersionMask; // Mapping from Attribute.Layout to Band[] (layout element bands). - protected Map<Attribute.Layout, Band[]> attrBandTable = new HashMap<>(); + protected Map<Attribute.Layout, Band[]> attrBandTable = new HashMap<Attribute.Layout, Band[]>(); // Well-known attributes: protected final Attribute.Layout attrCodeEmpty; @@ -1713,16 +1713,16 @@ class BandStructure { protected final Attribute.Layout attrConstantValue; // Mapping from Attribute.Layout to Integer (inverse of attrDefs) - Map<Attribute.Layout, Integer> attrIndexTable = new HashMap<>(); + Map<Attribute.Layout, Integer> attrIndexTable = new HashMap<Attribute.Layout, Integer>(); // Mapping from attribute index (<32 are flag bits) to attributes. protected List<List<Attribute.Layout>> attrDefs = - new FixedList<>(ATTR_CONTEXT_LIMIT); + new FixedList<List<Attribute.Layout>>(ATTR_CONTEXT_LIMIT); { 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))); } @@ -1912,7 +1912,7 @@ class BandStructure { protected List<Attribute.Layout> getPredefinedAttrs(int ctype) { assert(attrIndexLimit[ctype] != 0); - List<Attribute.Layout> res = new ArrayList<>(attrIndexLimit[ctype]); + List<Attribute.Layout> res = new ArrayList<Attribute.Layout>(attrIndexLimit[ctype]); // Remove nulls and non-predefs. for (int ai = 0; ai < attrIndexLimit[ctype]; ai++) { if (testBit(attrDefSeen[ctype], 1L<<ai)) continue; @@ -2536,7 +2536,7 @@ class BandStructure { // DEBUG ONLY: Record something about the band order. boolean notePrevForAssert(Band b, Band p) { if (prevForAssertMap == null) - prevForAssertMap = new HashMap<>(); + prevForAssertMap = new HashMap<Band, Band>(); prevForAssertMap.put(b, p); return true; } diff -up openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java.sav openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java --- openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java.sav 2011-07-29 12:21:02.000000000 -0400 +++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java 2011-07-29 14:27:07.765531573 -0400 @@ -469,7 +469,7 @@ class ClassReader { void readInnerClasses(Class cls) throws IOException { int nc = readUnsignedShort(); - ArrayList<InnerClass> ics = new ArrayList<>(nc); + ArrayList<InnerClass> ics = new ArrayList<InnerClass>(nc); for (int i = 0; i < nc; i++) { InnerClass ic = new InnerClass(readClassRef(), diff -up openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java.sav openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java --- openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java.sav 2011-07-29 12:21:02.000000000 -0400 +++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java 2011-07-29 14:27:07.766531558 -0400 @@ -743,9 +743,9 @@ class CodingChooser { // Steps 1/2/3 are interdependent, and may be iterated. // Steps 4 and 5 may be decided independently afterward. int[] LValuesCoded = PopulationCoding.LValuesCoded; - List<Coding> bestFits = new ArrayList<>(); - List<Coding> fullFits = new ArrayList<>(); - List<Coding> longFits = new ArrayList<>(); + List<Coding> bestFits = new ArrayList<Coding>(); + List<Coding> fullFits = new ArrayList<Coding>(); + List<Coding> longFits = new ArrayList<Coding>(); final int PACK_TO_MAX_S = 1; if (bestPopFVC <= 255) { bestFits.add(BandStructure.BYTE1); @@ -785,7 +785,7 @@ class CodingChooser { } } } - List<Coding> allFits = new ArrayList<>(); + List<Coding> allFits = new ArrayList<Coding>(); for (Iterator<Coding> i = bestFits.iterator(), j = fullFits.iterator(), k = longFits.iterator(); @@ -1230,10 +1230,10 @@ class CodingChooser { Histogram hist = getValueHistogram(); int fVlen = stressLen(hist.getTotalLength()); if (fVlen == 0) return coding; - List<Integer> popvals = new ArrayList<>(); + List<Integer> popvals = new ArrayList<Integer>(); if (stress.nextBoolean()) { // Build the population from the value list. - Set<Integer> popset = new HashSet<>(); + Set<Integer> popset = new HashSet<Integer>(); for (int i = start; i < end; i++) { if (popset.add(values[i])) popvals.add(values[i]); } diff -up openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java.sav openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java --- openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java.sav 2011-07-29 12:21:02.000000000 -0400 +++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java 2011-07-29 14:27:07.766531558 -0400 @@ -402,7 +402,7 @@ class Coding implements Comparable<Codin private static Map<Coding, Coding> codeMap; private static synchronized Coding of(int B, int H, int S, int del) { - if (codeMap == null) codeMap = new HashMap<>(); + if (codeMap == null) codeMap = new HashMap<Coding, Coding>(); Coding x0 = new Coding(B, H, S, del); Coding x1 = codeMap.get(x0); if (x1 == null) codeMap.put(x0, x1 = x0); diff -up openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java.sav openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java --- openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java.sav 2011-07-29 12:21:02.000000000 -0400 +++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java 2011-07-29 14:27:07.766531558 -0400 @@ -915,7 +915,7 @@ class ConstantPool { public static Index[] partition(Index ix, int[] keys) { // %%% Should move this into class Index. - List<List<Entry>> parts = new ArrayList<>(); + List<List<Entry>> parts = new ArrayList<List<Entry>>(); Entry[] cpMap = ix.cpMap; assert(keys.length == cpMap.length); for (int i = 0; i < keys.length; i++) { @@ -926,7 +926,7 @@ class ConstantPool { } List<Entry> part = parts.get(key); if (part == null) { - parts.set(key, part = new ArrayList<>()); + parts.set(key, part = new ArrayList<Entry>()); } part.add(cpMap[i]); } @@ -1133,7 +1133,7 @@ class ConstantPool { void completeReferencesIn(Set<Entry> cpRefs, boolean flattenSigs) { cpRefs.remove(null); for (ListIterator<Entry> work = - new ArrayList<>(cpRefs).listIterator(cpRefs.size()); + new ArrayList<Entry>(cpRefs).listIterator(cpRefs.size()); work.hasPrevious(); ) { Entry e = work.previous(); work.remove(); // pop stack diff -up openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java.sav openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java --- openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java.sav 2011-07-29 14:27:01.425625667 -0400 +++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java 2011-07-29 14:27:07.767531543 -0400 @@ -59,7 +59,7 @@ class Driver { ResourceBundle.getBundle("com.sun.java.util.jar.pack.DriverResource"); public static void main(String[] ava) throws IOException { - List<String> av = new ArrayList<>(Arrays.asList(ava)); + List<String> av = new ArrayList<String>(Arrays.asList(ava)); boolean doPack = true; boolean doUnpack = false; @@ -84,7 +84,7 @@ class Driver { } // Collect engine properties here: - Map<String,String> engProps = new HashMap<>(); + Map<String,String> engProps = new HashMap<String, String>(); engProps.put(verboseProp, System.getProperty(verboseProp)); String optionMap; @@ -98,7 +98,7 @@ class Driver { } // Collect argument properties here: - Map<String,String> avProps = new HashMap<>(); + Map<String,String> avProps = new HashMap<String, String>(); try { for (;;) { String state = parseCommandOptions(av, optionMap, avProps); @@ -537,7 +537,7 @@ class Driver { String resultString = null; // Convert options string into optLines dictionary. - TreeMap<String,String[]> optmap = new TreeMap<>(); + TreeMap<String,String[]> optmap = new TreeMap<String,String[]>(); loadOptmap: for (String optline : options.split("\n")) { String[] words = optline.split("\\p{Space}+"); diff -up openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java.sav openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java --- openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java.sav 2011-07-29 12:21:02.000000000 -0400 +++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java 2011-07-29 14:27:07.767531543 -0400 @@ -45,7 +45,7 @@ final class FixedList<E> implements List private final ArrayList<E> flist; protected FixedList(int capacity) { - flist = new ArrayList<>(capacity); + flist = new ArrayList<E>(capacity); // initialize the list to null for (int i = 0 ; i < capacity ; i++) { flist.add(null); diff -up openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Fixups.java.sav openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Fixups.java --- openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Fixups.java.sav 2011-07-29 14:27:56.374810200 -0400 +++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Fixups.java 2011-07-29 14:28:15.044533166 -0400 @@ -126,11 +126,11 @@ final class Fixups extends AbstractColle public void setBytes(byte[] newBytes) { if (bytes == newBytes) return; ArrayList<Fixup> old = null; - assert((old = new ArrayList<>(this)) != null); + assert((old = new ArrayList<Fixup>(this)) != null); if (bytes == null || newBytes == null) { // One or the other representations is deficient. // Construct a checkpoint. - ArrayList<Fixup> save = new ArrayList<>(this); + ArrayList<Fixup> save = new ArrayList<Fixup>(this); clear(); bytes = newBytes; addAll(save); @@ -138,7 +138,7 @@ final class Fixups extends AbstractColle // assume newBytes is some sort of bitwise copy of the old bytes bytes = newBytes; } - assert(old.equals(new ArrayList<>(this))); + assert(old.equals(new ArrayList<Fixup>(this))); } static final int LOC_SHIFT = 1; diff -up openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java.sav openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java --- openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java.sav 2011-07-29 12:21:02.000000000 -0400 +++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java 2011-07-29 14:27:07.768531528 -0400 @@ -112,7 +112,7 @@ class Package { public static final Attribute.Layout attrSourceFileSpecial; public static final Map<Attribute.Layout, Attribute> attrDefs; static { - Map<Layout, Attribute> ad = new HashMap<>(3); + Map<Layout, Attribute> ad = new HashMap<Layout, Attribute>(3); attrCodeEmpty = Attribute.define(ad, ATTR_CONTEXT_METHOD, "Code", "").layout(); attrInnerClassesEmpty = Attribute.define(ad, ATTR_CONTEXT_CLASS, @@ -181,7 +181,7 @@ class Package { } } - ArrayList<Package.Class> classes = new ArrayList<>(); + ArrayList<Package.Class> classes = new ArrayList<Package.Class>(); public List<Package.Class> getClasses() { return classes; @@ -263,7 +263,7 @@ class Package { if (olda == null) return; // no SourceFile attr. String obvious = getObviousSourceFile(); - List<Entry> ref = new ArrayList<>(1); + List<Entry> ref = new ArrayList<Entry>(1); olda.visitRefs(this, VRM_PACKAGE, ref); Utf8Entry sfName = (Utf8Entry) ref.get(0); Attribute a = olda; @@ -291,7 +291,7 @@ class Package { if (a != olda) { if (verbose > 2) Utils.log.fine("recoding obvious SourceFile="+obvious); - List<Attribute> newAttrs = new ArrayList<>(getAttributes()); + List<Attribute> newAttrs = new ArrayList<Attribute>(getAttributes()); int where = newAttrs.indexOf(olda); newAttrs.set(where, a); setAttributes(newAttrs); @@ -321,7 +321,7 @@ class Package { } public void setInnerClasses(Collection<InnerClass> ics) { - innerClasses = (ics == null) ? null : new ArrayList<>(ics); + innerClasses = (ics == null) ? null : new ArrayList<InnerClass>(ics); // Edit the attribute list, if necessary. Attribute a = getAttribute(attrInnerClassesEmpty); if (innerClasses != null && a == null) @@ -340,7 +340,7 @@ class Package { * with that of Package.this.allInnerClasses. */ public List<InnerClass> computeGloballyImpliedICs() { - Set<Entry> cpRefs = new HashSet<>(); + Set<Entry> cpRefs = new HashSet<Entry>(); { // This block temporarily displaces this.innerClasses. ArrayList<InnerClass> innerClassesSaved = innerClasses; innerClasses = null; // ignore for the moment @@ -349,7 +349,7 @@ class Package { } ConstantPool.completeReferencesIn(cpRefs, true); - Set<Entry> icRefs = new HashSet<>(); + Set<Entry> icRefs = new HashSet<Entry>(); for (Entry e : cpRefs) { // Restrict cpRefs to InnerClasses entries only. if (!(e instanceof ClassEntry)) continue; @@ -365,7 +365,7 @@ class Package { // This loop is structured this way so as to accumulate // entries into impliedICs in an order which reflects // the order of allInnerClasses. - ArrayList<InnerClass> impliedICs = new ArrayList<>(); + ArrayList<InnerClass> impliedICs = new ArrayList<InnerClass>(); for (InnerClass ic : allInnerClasses) { // This one is locally relevant if it describes // a member of the current class, or if the current @@ -408,8 +408,8 @@ class Package { // Diff is A since I is empty. } // (I*A) is non-trivial - Set<InnerClass> center = new HashSet<>(actualICs); - center.retainAll(new HashSet<>(impliedICs)); + Set<InnerClass> center = new HashSet<InnerClass>(actualICs); + center.retainAll(new HashSet<InnerClass>(impliedICs)); impliedICs.addAll(actualICs); impliedICs.removeAll(center); // Diff is now I^A = (I+A)-(I*A). @@ -538,7 +538,7 @@ class Package { super(flags, descriptor); assert(!descriptor.isMethod()); if (fields == null) - fields = new ArrayList<>(); + fields = new ArrayList<Field>(); boolean added = fields.add(this); assert(added); order = fields.size(); @@ -563,7 +563,7 @@ class Package { super(flags, descriptor); assert(descriptor.isMethod()); if (methods == null) - methods = new ArrayList<>(); + methods = new ArrayList<Method>(); boolean added = methods.add(this); assert(added); } @@ -728,14 +728,14 @@ class Package { } // What non-class files are in this unit? - ArrayList<File> files = new ArrayList<>(); + ArrayList<File> files = new ArrayList<File>(); public List<File> getFiles() { return files; } public List<File> getClassStubs() { - List<File> classStubs = new ArrayList<>(classes.size()); + List<File> classStubs = new ArrayList<File>(classes.size()); for (Class cls : classes) { assert(cls.file.isClassStub()); classStubs.add(cls.file); @@ -749,7 +749,7 @@ class Package { int modtime = NO_MODTIME; int options = 0; // random flag bits, such as deflate_hint Class stubClass; // if this is a stub, here's the class - ArrayList<byte[]> prepend = new ArrayList<>(); // list of byte[] + ArrayList<byte[]> prepend = new ArrayList<byte[]>(); // list of byte[] java.io.ByteArrayOutputStream append = new ByteArrayOutputStream(); File(Utf8Entry name) { @@ -852,7 +852,7 @@ class Package { public InputStream getInputStream() { InputStream in = new ByteArrayInputStream(append.toByteArray()); if (prepend.isEmpty()) return in; - List<InputStream> isa = new ArrayList<>(prepend.size()+1); + List<InputStream> isa = new ArrayList<InputStream>(prepend.size()+1); for (byte[] bytes : prepend) { isa.add(new ByteArrayInputStream(bytes)); } @@ -888,7 +888,7 @@ class Package { } // Is there a globally declared table of inner classes? - List<InnerClass> allInnerClasses = new ArrayList<>(); + List<InnerClass> allInnerClasses = new ArrayList<InnerClass>(); Map<ClassEntry, InnerClass> allInnerClassesByThis; public @@ -903,7 +903,7 @@ class Package { allInnerClasses.addAll(ics); // Make an index: - allInnerClassesByThis = new HashMap<>(allInnerClasses.size()); + allInnerClassesByThis = new HashMap<ClassEntry,InnerClass>(allInnerClasses.size()); for (InnerClass ic : allInnerClasses) { Object pic = allInnerClassesByThis.put(ic.thisClass, ic); assert(pic == null); // caller must ensure key uniqueness! @@ -1295,7 +1295,7 @@ class Package { // Use this before writing the class files. void ensureAllClassFiles() { - Set<File> fileSet = new HashSet<>(files); + Set<File> fileSet = new HashSet<File>(files); for (Class cls : classes) { // Add to the end of ths list: if (!fileSet.contains(cls.file)) diff -up openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java.sav openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java --- openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java.sav 2011-07-29 14:27:01.426625653 -0400 +++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java 2011-07-29 14:27:07.768531528 -0400 @@ -686,7 +686,7 @@ class PackageReader extends BandStructur cp_Signature_classes.expectLength(getIntTotal(numSigClasses)); cp_Signature_classes.readFrom(in); cp_Signature_classes.setIndex(getCPIndex(CONSTANT_Class)); - utf8Signatures = new HashMap<>(); + utf8Signatures = new HashMap<Utf8Entry, SignatureEntry>(); for (int i = 0; i < cpMap.length; i++) { Utf8Entry formRef = (Utf8Entry) cp_Signature_form.getRef(); ClassEntry[] classRefs = new ClassEntry[numSigClasses[i]]; @@ -892,7 +892,7 @@ class PackageReader extends BandStructur ic_name.expectLength(longICCount); ic_name.readFrom(in); ic_flags.resetForSecondPass(); - List<InnerClass> icList = new ArrayList<>(numInnerClasses); + List<InnerClass> icList = new ArrayList<InnerClass>(numInnerClasses); for (int i = 0; i < numInnerClasses; i++) { int flags = ic_flags.getInt(); boolean longForm = (flags & ACC_IC_LONG_FORM) != 0; @@ -934,7 +934,7 @@ class PackageReader extends BandStructur void readLocalInnerClasses(Class cls) throws IOException { int nc = class_InnerClasses_N.getInt(); - List<InnerClass> localICs = new ArrayList<>(nc); + List<InnerClass> localICs = new ArrayList<InnerClass>(nc); for (int i = 0; i < nc; i++) { ClassEntry thisClass = (ClassEntry) class_InnerClasses_RC.getRef(); int flags = class_InnerClasses_F.getInt(); @@ -1062,7 +1062,7 @@ class PackageReader extends BandStructur Entry[] reconstructLocalCPMap(Class cls) { Set<Entry> ldcRefs = ldcRefMap.get(cls); - Set<Entry> cpRefs = new HashSet<>(); + Set<Entry> cpRefs = new HashSet<Entry>(); // look for constant pool entries: cls.visitRefs(VRM_CLASSIC, cpRefs); @@ -1167,7 +1167,7 @@ class PackageReader extends BandStructur method_descr.expectLength(totalNM); if (verbose > 1) Utils.log.fine("expecting #fields="+totalNF+" and #methods="+totalNM+" in #classes="+numClasses); - List<Class.Field> fields = new ArrayList<>(totalNF); + List<Class.Field> fields = new ArrayList<Class.Field>(totalNF); field_descr.readFrom(in); for (int i = 0; i < classes.length; i++) { Class c = classes[i]; @@ -1183,7 +1183,7 @@ class PackageReader extends BandStructur countAndReadAttrs(ATTR_CONTEXT_FIELD, fields); fields = null; // release to GC - List<Class.Method> methods = new ArrayList<>(totalNM); + List<Class.Method> methods = new ArrayList<Class.Method>(totalNM); method_descr.readFrom(in); for (int i = 0; i < classes.length; i++) { Class c = classes[i]; @@ -1206,10 +1206,10 @@ class PackageReader extends BandStructur Code[] allCodes; List<Code> codesWithFlags; - Map<Class, Set<Entry>> ldcRefMap = new HashMap<>(); + Map<Class, Set<Entry>> ldcRefMap = new HashMap<Class, Set<Entry>>(); Code[] buildCodeAttrs(List<Class.Method> methods) { - List<Code> codes = new ArrayList<>(methods.size()); + List<Code> codes = new ArrayList<Code>(methods.size()); for (Class.Method m : methods) { if (m.getAttribute(attrCodeEmpty) != null) { m.code = new Code(m); @@ -1233,7 +1233,7 @@ class PackageReader extends BandStructur boolean attrsOK = testBit(archiveOptions, AO_HAVE_ALL_CODE_FLAGS); code_headers.expectLength(allCodes.length); code_headers.readFrom(in); - List<Code> longCodes = new ArrayList<>(allCodes.length / 10); + List<Code> longCodes = new ArrayList<Code>(allCodes.length / 10); for (int i = 0; i < allCodes.length; i++) { Code c = allCodes[i]; int sc = code_headers.getByte(); @@ -1472,7 +1472,7 @@ class PackageReader extends BandStructur bits -= (1L<<ai); nfa += 1; } - List<Attribute> ha = new ArrayList<>(nfa + noa); + List<Attribute> ha = new ArrayList<Attribute>(nfa + noa); h.attributes = ha; bits = attrBits; // iterate again for (int ai = 0; bits != 0; ai++) { @@ -1596,7 +1596,7 @@ class PackageReader extends BandStructur void readAttrs(int ctype, Collection<? extends Attribute.Holder> holders) throws IOException { // Decode band values into attributes. - Set<Attribute.Layout> sawDefs = new HashSet<>(); + Set<Attribute.Layout> sawDefs = new HashSet<Attribute.Layout>(); ByteArrayOutputStream buf = new ByteArrayOutputStream(); for (final Attribute.Holder h : holders) { if (h.attributes == null) continue; @@ -1799,7 +1799,7 @@ class PackageReader extends BandStructur // scratch buffer for collecting code:: byte[] buf = new byte[1<<12]; // record of all switch opcodes (these are variable-length) - List<Integer> allSwitchOps = new ArrayList<>(); + List<Integer> allSwitchOps = new ArrayList<Integer>(); for (int k = 0; k < allCodes.length; k++) { Code c = allCodes[k]; scanOneMethod: @@ -1915,7 +1915,7 @@ class PackageReader extends BandStructur Set<Entry> ldcRefSet = ldcRefMap.get(curClass); if (ldcRefSet == null) - ldcRefMap.put(curClass, ldcRefSet = new HashSet<>()); + ldcRefMap.put(curClass, ldcRefSet = new HashSet<Entry>()); ClassEntry thisClass = curClass.thisClass; ClassEntry superClass = curClass.superClass; diff -up openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java.sav openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java --- openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java.sav 2011-07-29 14:27:01.427625638 -0400 +++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java 2011-07-29 14:27:07.769531513 -0400 @@ -116,7 +116,7 @@ class PackageWriter extends BandStructur int[][] attrCounts; // count attr. occurences void setup() { - requiredEntries = new HashSet<>(); + requiredEntries = new HashSet<Entry>(); setArchiveOptions(); trimClassAttributes(); collectAttributeLayouts(); @@ -176,7 +176,7 @@ class PackageWriter extends BandStructur } } // Decide on default version number (majority rule). - Map<Integer, int[]> verCounts = new HashMap<>(); + Map<Integer, int[]> verCounts = new HashMap<Integer, int[]>(); int bestCount = 0; int bestVersion = -1; for (Class cls : pkg.classes) { @@ -728,7 +728,7 @@ class PackageWriter extends BandStructur void collectAttributeLayouts() { maxFlags = new int[ATTR_CONTEXT_LIMIT]; - allLayouts = new FixedList<>(ATTR_CONTEXT_LIMIT); + allLayouts = new FixedList<Map<Attribute.Layout,int[]>>(ATTR_CONTEXT_LIMIT); for (int i = 0; i < ATTR_CONTEXT_LIMIT; i++) { allLayouts.set(i, new HashMap<Attribute.Layout, int[]>()); } @@ -773,7 +773,7 @@ class PackageWriter extends BandStructur } // Collect counts for both predefs. and custom defs. // Decide on custom, local attribute definitions. - backCountTable = new HashMap<>(); + backCountTable = new HashMap<Attribute.Layout, int[]>(); attrCounts = new int[ATTR_CONTEXT_LIMIT][]; for (int i = 0; i < ATTR_CONTEXT_LIMIT; i++) { // Now the remaining defs in allLayouts[i] need attr. indexes. @@ -888,7 +888,7 @@ class PackageWriter extends BandStructur Attribute.Layout[] attrDefsWritten; void writeAttrDefs() throws IOException { - List<Object[]> defList = new ArrayList<>(); + List<Object[]> defList = new ArrayList<Object[]>(); for (int i = 0; i < ATTR_CONTEXT_LIMIT; i++) { int limit = attrDefs.get(i).size(); for (int j = 0; j < limit; j++) { @@ -1005,7 +1005,7 @@ class PackageWriter extends BandStructur void collectInnerClasses() { // Capture inner classes, removing them from individual classes. // Irregular inner classes must stay local, though. - Map<ClassEntry, InnerClass> allICMap = new HashMap<>(); + Map<ClassEntry, InnerClass> allICMap = new HashMap<ClassEntry, InnerClass>(); // First, collect a consistent global set. for (Class cls : pkg.classes) { if (!cls.hasInnerClasses()) continue; diff -up openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java.sav openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java --- openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java.sav 2011-07-29 12:21:02.000000000 -0400 +++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java 2011-07-29 14:27:07.769531513 -0400 @@ -181,8 +181,8 @@ public class PackerImpl extends TLGloba final Map<Attribute.Layout, Attribute> attrDefs; final Map<Attribute.Layout, String> attrCommands; { - Map<Attribute.Layout, Attribute> lattrDefs = new HashMap<>(); - Map<Attribute.Layout, String> lattrCommands = new HashMap<>(); + Map<Attribute.Layout, Attribute> lattrDefs = new HashMap<Attribute.Layout, Attribute>(); + Map<Attribute.Layout, String> lattrCommands = new HashMap<Attribute.Layout, String>(); String[] keys = { Pack200.Packer.CLASS_ATTRIBUTE_PFX, Pack200.Packer.FIELD_ATTRIBUTE_PFX, @@ -590,7 +590,7 @@ public class PackerImpl extends TLGloba assert(pkg.files.containsAll(pkg.getClassStubs())); // Order of stubs in file list must agree with classes. List<Package.File> res = pkg.files; - assert((res = new ArrayList<>(pkg.files)) + assert((res = new ArrayList<Package.File>(pkg.files)) .retainAll(pkg.getClassStubs()) || true); assert(res.equals(pkg.getClassStubs())); } @@ -623,7 +623,7 @@ public class PackerImpl extends TLGloba List<InFile> scanJar(JarFile jf) throws IOException { // Collect jar entries, preserving order. - List<InFile> inFiles = new ArrayList<>(); + List<InFile> inFiles = new ArrayList<InFile>(); try { for (JarEntry je : Collections.list(jf.entries())) { InFile inFile = new InFile(jf, je); diff -up openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PopulationCoding.java.sav openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PopulationCoding.java --- openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PopulationCoding.java.sav 2011-07-29 12:21:02.000000000 -0400 +++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PopulationCoding.java 2011-07-29 14:27:07.769531513 -0400 @@ -309,7 +309,7 @@ class PopulationCoding implements Coding // As each new value is added, we assert that the value // was not already in the set. Set<Integer> uniqueValuesForDebug = null; - assert((uniqueValuesForDebug = new HashSet<>()) != null); + assert((uniqueValuesForDebug = new HashSet<Integer>()) != null); int fillp = 1; maxForDebug += fillp; int min = Integer.MIN_VALUE; // farthest from the center diff -up openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java.sav openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java --- openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java.sav 2011-07-29 14:27:01.427625638 -0400 +++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java 2011-07-29 14:27:07.770531498 -0400 @@ -47,8 +47,8 @@ import java.util.jar.Pack200; */ final class PropMap implements SortedMap<String, String> { - private final TreeMap<String, String> theMap = new TreeMap<>();; - private final List<PropertyChangeListener> listenerList = new ArrayList<>(1); + private final TreeMap<String, String> theMap = new TreeMap<String, String>();; + private final List<PropertyChangeListener> listenerList = new ArrayList<PropertyChangeListener>(1); void addListener(PropertyChangeListener listener) { listenerList.add(listener); @@ -187,7 +187,7 @@ final class PropMap implements SortedMap // Get sequence of props for "prefix", and "prefix.*". List<String> getProperties(String prefix) { Collection<String> values = prefixMap(prefix).values(); - List<String> res = new ArrayList<>(values.size()); + List<String> res = new ArrayList<String>(values.size()); res.addAll(values); while (res.remove(null)); return res; diff -up openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/TLGlobals.java.sav openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/TLGlobals.java --- openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/TLGlobals.java.sav 2011-07-29 12:21:02.000000000 -0400 +++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/TLGlobals.java 2011-07-29 14:27:07.770531498 -0400 @@ -58,12 +58,12 @@ class TLGlobals { private final Map<String, MemberEntry> memberEntries; TLGlobals() { - utf8Entries = new HashMap<>(); - classEntries = new HashMap<>(); - literalEntries = new HashMap<>(); - signatureEntries = new HashMap<>(); - descriptorEntries = new HashMap<>(); - memberEntries = new HashMap<>(); + utf8Entries = new HashMap<String,Utf8Entry>(); + classEntries = new HashMap<String,ClassEntry>(); + literalEntries = new HashMap<Object,LiteralEntry>(); + signatureEntries = new HashMap<String,SignatureEntry>(); + descriptorEntries = new HashMap<String,DescriptorEntry>(); + memberEntries = new HashMap<String,MemberEntry>(); props = new PropMap(); } diff -up openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java.sav openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java --- openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java.sav 2011-07-29 14:27:01.427625638 -0400 +++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java 2011-07-29 14:27:07.770531498 -0400 @@ -232,7 +232,7 @@ public class UnpackerImpl extends TLGlob props.setProperty(java.util.jar.Pack200.Unpacker.PROGRESS,"50"); pkg.ensureAllClassFiles(); // Now write out the files. - Set<Package.Class> classesToWrite = new HashSet<>(pkg.getClasses()); + Set<Package.Class> classesToWrite = new HashSet<Package.Class>(pkg.getClasses()); for (Package.File file : pkg.getFiles()) { String name = file.nameString; JarEntry je = new JarEntry(Utils.getJarEntryName(name)); diff -up openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java.sav openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java --- openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java.sav 2011-07-29 14:27:01.427625638 -0400 +++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java 2011-07-29 14:27:07.770531498 -0400 @@ -132,7 +132,7 @@ class Utils { // Keep a TLS point to the global data and environment. // This makes it simpler to supply environmental options // to the engine code, especially the native code. - static final ThreadLocal<TLGlobals> currentInstance = new ThreadLocal<>(); + static final ThreadLocal<TLGlobals> currentInstance = new ThreadLocal<TLGlobals>(); // convenience methods to access the TL globals static TLGlobals getTLGlobals() { diff -up openjdk-boot/jdk/src/share/classes/com/sun/rowset/CachedRowSetImpl.java.sav openjdk-boot/jdk/src/share/classes/com/sun/rowset/CachedRowSetImpl.java --- openjdk-boot/jdk/src/share/classes/com/sun/rowset/CachedRowSetImpl.java.sav 2011-07-29 12:21:06.000000000 -0400 +++ openjdk-boot/jdk/src/share/classes/com/sun/rowset/CachedRowSetImpl.java 2011-07-29 14:27:07.773531453 -0400 @@ -1284,7 +1284,7 @@ public class CachedRowSetImpl extends Ba */ public Collection<?> toCollection() throws SQLException { - TreeMap<Integer, Object> tMap = new TreeMap<>(); + TreeMap<Integer, Object> tMap = new TreeMap<Integer, Object>(); for (int i = 0; i<numRows; i++) { tMap.put(Integer.valueOf(i), rvh.get(i)); @@ -1314,7 +1314,7 @@ public class CachedRowSetImpl extends Ba public Collection<?> toCollection(int column) throws SQLException { int nRows = numRows; - Vector<Object> vec = new Vector<>(nRows); + Vector<Object> vec = new Vector<Object>(nRows); // create a copy CachedRowSetImpl crsTemp; diff -up openjdk-boot/jdk/src/share/classes/com/sun/rowset/JoinRowSetImpl.java.sav openjdk-boot/jdk/src/share/classes/com/sun/rowset/JoinRowSetImpl.java --- openjdk-boot/jdk/src/share/classes/com/sun/rowset/JoinRowSetImpl.java.sav 2011-07-29 12:21:06.000000000 -0400 +++ openjdk-boot/jdk/src/share/classes/com/sun/rowset/JoinRowSetImpl.java 2011-07-29 14:27:07.774531438 -0400 @@ -222,7 +222,7 @@ public class JoinRowSetImpl extends WebR // either of the setter methods have been set. if(boolColId){ // - ArrayList<Integer> indices = new ArrayList<>(); + ArrayList<Integer> indices = new ArrayList<Integer>(); for(int i=0;i<cRowset.getMatchColumnNames().length;i++) { if( (strMatchKey = (cRowset.getMatchColumnNames())[i]) != null) { iMatchKey = cRowset.findColumn(strMatchKey); diff -up openjdk-boot/jdk/src/share/classes/com/sun/security/auth/callback/DialogCallbackHandler.java.sav openjdk-boot/jdk/src/share/classes/com/sun/security/auth/callback/DialogCallbackHandler.java --- openjdk-boot/jdk/src/share/classes/com/sun/security/auth/callback/DialogCallbackHandler.java.sav 2011-07-29 12:21:06.000000000 -0400 +++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/callback/DialogCallbackHandler.java 2011-07-29 14:27:07.774531438 -0400 @@ -99,10 +99,10 @@ public class DialogCallbackHandler imple throws UnsupportedCallbackException { /* Collect messages to display in the dialog */ - final List<Object> messages = new ArrayList<>(3); + final List<Object> messages = new ArrayList<Object>(3); /* Collection actions to perform if the user clicks OK */ - final List<Action> okActions = new ArrayList<>(2); + final List<Action> okActions = new ArrayList<Action>(2); ConfirmationInfo confirmation = new ConfirmationInfo(); diff -up openjdk-boot/jdk/src/share/classes/com/sun/security/auth/login/ConfigFile.java.sav openjdk-boot/jdk/src/share/classes/com/sun/security/auth/login/ConfigFile.java --- openjdk-boot/jdk/src/share/classes/com/sun/security/auth/login/ConfigFile.java.sav 2011-07-29 12:21:06.000000000 -0400 +++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/login/ConfigFile.java 2011-07-29 14:27:07.774531438 -0400 @@ -152,7 +152,7 @@ public class ConfigFile extends javax.se // new configuration HashMap<String, LinkedList<AppConfigurationEntry>> newConfig = - new HashMap<>(); + new HashMap<String, LinkedList<AppConfigurationEntry>>(); if (url != null) { @@ -392,7 +392,7 @@ public class ConfigFile extends javax.se String moduleClass; String sflag; AppConfigurationEntry.LoginModuleControlFlag controlFlag; - LinkedList<AppConfigurationEntry> configEntries = new LinkedList<>(); + LinkedList<AppConfigurationEntry> configEntries = new LinkedList<AppConfigurationEntry>(); // application name appName = st.sval; @@ -432,7 +432,7 @@ public class ConfigFile extends javax.se } // get the args - HashMap<String, String> options = new HashMap<>(); + HashMap<String, String> options = new HashMap<String, String>(); String key; String value; while (peek(";") == false) { diff -up openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/JndiLoginModule.java.sav openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/JndiLoginModule.java --- openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/JndiLoginModule.java.sav 2011-07-29 12:21:06.000000000 -0400 +++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/JndiLoginModule.java 2011-07-29 14:27:07.775531424 -0400 @@ -184,7 +184,7 @@ public class JndiLoginModule implements private UnixNumericUserPrincipal UIDPrincipal; private UnixNumericGroupPrincipal GIDPrincipal; private LinkedList<UnixNumericGroupPrincipal> supplementaryGroups = - new LinkedList<>(); + new LinkedList<UnixNumericGroupPrincipal>(); // initial state private Subject subject; diff -up openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/KeyStoreLoginModule.java.sav openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/KeyStoreLoginModule.java --- openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/KeyStoreLoginModule.java.sav 2011-07-29 12:21:06.000000000 -0400 +++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/KeyStoreLoginModule.java 2011-07-29 14:27:07.775531424 -0400 @@ -658,7 +658,7 @@ public class KeyStoreLoginModule impleme throw new FailedLoginException( "Unable to find X.509 certificate chain in keystore"); } else { - LinkedList<Certificate> certList = new LinkedList<>(); + LinkedList<Certificate> certList = new LinkedList<Certificate>(); for (int i=0; i < fromKeyStore.length; i++) { certList.add(fromKeyStore[i]); } diff -up openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/SolarisLoginModule.java.sav openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/SolarisLoginModule.java --- openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/SolarisLoginModule.java.sav 2011-07-29 12:21:06.000000000 -0400 +++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/SolarisLoginModule.java 2011-07-29 14:27:07.775531424 -0400 @@ -76,7 +76,7 @@ public class SolarisLoginModule implemen private SolarisNumericUserPrincipal UIDPrincipal; private SolarisNumericGroupPrincipal GIDPrincipal; private LinkedList<SolarisNumericGroupPrincipal> supplementaryGroups = - new LinkedList<>(); + new LinkedList<SolarisNumericGroupPrincipal>(); /** * Initialize this <code>LoginModule</code>. diff -up openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/UnixLoginModule.java.sav openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/UnixLoginModule.java --- openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/UnixLoginModule.java.sav 2011-07-29 12:21:06.000000000 -0400 +++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/UnixLoginModule.java 2011-07-29 14:27:07.775531424 -0400 @@ -70,7 +70,7 @@ public class UnixLoginModule implements private UnixNumericUserPrincipal UIDPrincipal; private UnixNumericGroupPrincipal GIDPrincipal; private LinkedList<UnixNumericGroupPrincipal> supplementaryGroups = - new LinkedList<>(); + new LinkedList<UnixNumericGroupPrincipal>(); /** * Initialize this <code>LoginModule</code>. diff -up openjdk-boot/jdk/src/share/classes/com/sun/security/auth/PolicyFile.java.sav openjdk-boot/jdk/src/share/classes/com/sun/security/auth/PolicyFile.java --- openjdk-boot/jdk/src/share/classes/com/sun/security/auth/PolicyFile.java.sav 2011-07-29 12:21:06.000000000 -0400 +++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/PolicyFile.java 2011-07-29 14:27:07.775531424 -0400 @@ -1180,7 +1180,7 @@ public class PolicyFile extends javax.se // Done return certs; - ArrayList<Certificate> userCertList = new ArrayList<>(); + ArrayList<Certificate> userCertList = new ArrayList<Certificate>(); i = 0; while (i < certs.length) { userCertList.add(certs[i]); diff -up openjdk-boot/jdk/src/share/classes/com/sun/tools/example/trace/EventThread.java.sav openjdk-boot/jdk/src/share/classes/com/sun/tools/example/trace/EventThread.java --- openjdk-boot/jdk/src/share/classes/com/sun/tools/example/trace/EventThread.java.sav 2011-07-29 14:27:35.063126457 -0400 +++ openjdk-boot/jdk/src/share/classes/com/sun/tools/example/trace/EventThread.java 2011-07-29 14:27:43.454001938 -0400 @@ -50,7 +50,7 @@ public class EventThread extends Thread // Maps ThreadReference to ThreadTrace instances private Map<ThreadReference, ThreadTrace> traceMap = - new HashMap<>(); + new HashMap<ThreadReference, ThreadTrace>(); EventThread(VirtualMachine vm, String[] excludes, PrintWriter writer) { super("event-handler"); diff -up openjdk-boot/jdk/src/share/classes/java/io/DeleteOnExitHook.java.sav openjdk-boot/jdk/src/share/classes/java/io/DeleteOnExitHook.java --- openjdk-boot/jdk/src/share/classes/java/io/DeleteOnExitHook.java.sav 2011-07-29 12:21:10.000000000 -0400 +++ openjdk-boot/jdk/src/share/classes/java/io/DeleteOnExitHook.java 2011-07-29 14:27:07.775531424 -0400 @@ -34,7 +34,7 @@ import java.io.File; */ class DeleteOnExitHook { - private static LinkedHashSet<String> files = new LinkedHashSet<>(); + private static LinkedHashSet<String> files = new LinkedHashSet<String>(); static { // DeleteOnExitHook must be the last shutdown hook to be invoked. // Application shutdown hooks may add the first file to the @@ -71,7 +71,7 @@ class DeleteOnExitHook { files = null; } - ArrayList<String> toBeDeleted = new ArrayList<>(theFiles); + ArrayList<String> toBeDeleted = new ArrayList<String>(theFiles); // reverse the list to maintain previous jdk deletion order. // Last in first deleted. diff -up openjdk-boot/jdk/src/share/classes/java/io/FileInputStream.java.sav openjdk-boot/jdk/src/share/classes/java/io/FileInputStream.java --- openjdk-boot/jdk/src/share/classes/java/io/FileInputStream.java.sav 2011-07-29 12:21:10.000000000 -0400 +++ openjdk-boot/jdk/src/share/classes/java/io/FileInputStream.java 2011-07-29 14:27:07.775531424 -0400 @@ -57,7 +57,7 @@ class FileInputStream extends InputStrea private volatile boolean closed = false; private static final ThreadLocal<Boolean> runningFinalize = - new ThreadLocal<>(); + new ThreadLocal<Boolean>(); private static boolean isRunningFinalize() { Boolean val; diff -up openjdk-boot/jdk/src/share/classes/java/io/File.java.sav openjdk-boot/jdk/src/share/classes/java/io/File.java --- openjdk-boot/jdk/src/share/classes/java/io/File.java.sav 2011-07-29 12:21:10.000000000 -0400 +++ openjdk-boot/jdk/src/share/classes/java/io/File.java 2011-07-29 14:27:07.776531410 -0400 @@ -1082,7 +1082,7 @@ public class File if ((names == null) || (filter == null)) { return names; } - List<String> v = new ArrayList<>(); + List<String> v = new ArrayList<String>(); for (int i = 0 ; i < names.length ; i++) { if (filter.accept(this, names[i])) { v.add(names[i]); @@ -1173,7 +1173,7 @@ public class File public File[] listFiles(FilenameFilter filter) { String ss[] = list(); if (ss == null) return null; - ArrayList<File> files = new ArrayList<>(); + ArrayList<File> files = new ArrayList<File>(); for (String s : ss) if ((filter == null) || filter.accept(this, s)) files.add(new File(s, this)); @@ -1211,7 +1211,7 @@ public class File public File[] listFiles(FileFilter filter) { String ss[] = list(); if (ss == null) return null; - ArrayList<File> files = new ArrayList<>(); + ArrayList<File> files = new ArrayList<File>(); for (String s : ss) { File f = new File(s, this); if ((filter == null) || filter.accept(f)) diff -up openjdk-boot/jdk/src/share/classes/java/io/FileOutputStream.java.sav openjdk-boot/jdk/src/share/classes/java/io/FileOutputStream.java --- openjdk-boot/jdk/src/share/classes/java/io/FileOutputStream.java.sav 2011-07-29 12:21:10.000000000 -0400 +++ openjdk-boot/jdk/src/share/classes/java/io/FileOutputStream.java 2011-07-29 14:27:07.776531410 -0400 @@ -70,7 +70,7 @@ class FileOutputStream extends OutputStr private final Object closeLock = new Object(); private volatile boolean closed = false; private static final ThreadLocal<Boolean> runningFinalize = - new ThreadLocal<>(); + new ThreadLocal<Boolean>(); private static boolean isRunningFinalize() { Boolean val; diff -up openjdk-boot/jdk/src/share/classes/java/io/FilePermission.java.sav openjdk-boot/jdk/src/share/classes/java/io/FilePermission.java --- openjdk-boot/jdk/src/share/classes/java/io/FilePermission.java.sav 2011-07-29 12:21:10.000000000 -0400 +++ openjdk-boot/jdk/src/share/classes/java/io/FilePermission.java 2011-07-29 14:27:07.776531410 -0400 @@ -725,7 +725,7 @@ implements Serializable { */ public FilePermissionCollection() { - perms = new ArrayList<>(); + perms = new ArrayList<Permission>(); } /** @@ -830,7 +830,7 @@ implements Serializable { // Don't call out.defaultWriteObject() // Write out Vector - Vector<Permission> permissions = new Vector<>(perms.size()); + Vector<Permission> permissions = new Vector<Permission>(perms.size()); synchronized (this) { permissions.addAll(perms); } @@ -853,7 +853,7 @@ implements Serializable { // Get the one we want Vector<Permission> permissions = (Vector<Permission>)gfields.get("permissions", null); - perms = new ArrayList<>(permissions.size()); + perms = new ArrayList<Permission>(permissions.size()); perms.addAll(permissions); } } diff -up openjdk-boot/jdk/src/share/classes/java/io/ObjectInputStream.java.sav openjdk-boot/jdk/src/share/classes/java/io/ObjectInputStream.java --- openjdk-boot/jdk/src/share/classes/java/io/ObjectInputStream.java.sav 2011-07-29 12:21:10.000000000 -0400 +++ openjdk-boot/jdk/src/share/classes/java/io/ObjectInputStream.java 2011-07-29 14:27:07.776531410 -0400 @@ -213,7 +213,7 @@ public class ObjectInputStream /** table mapping primitive type names to corresponding class objects */ private static final HashMap<String, Class<?>> primClasses - = new HashMap<>(8, 1.0F); + = new HashMap<String, Class<?>>(8, 1.0F); static { primClasses.put("boolean", boolean.class); primClasses.put("byte", byte.class); @@ -229,11 +229,11 @@ public class ObjectInputStream private static class Caches { /** cache of subclass security audit results */ static final ConcurrentMap<WeakClassKey,Boolean> subclassAudits = - new ConcurrentHashMap<>(); + new ConcurrentHashMap<WeakClassKey,Boolean>(); /** queue for WeakReferences to audited subclasses */ static final ReferenceQueue<Class<?>> subclassAuditsQueue = - new ReferenceQueue<>(); + new ReferenceQueue<Class<?>>(); } /** filter stream for handling block data conversion */ diff -up openjdk-boot/jdk/src/share/classes/java/io/ObjectOutputStream.java.sav openjdk-boot/jdk/src/share/classes/java/io/ObjectOutputStream.java --- openjdk-boot/jdk/src/share/classes/java/io/ObjectOutputStream.java.sav 2011-07-29 12:21:10.000000000 -0400 +++ openjdk-boot/jdk/src/share/classes/java/io/ObjectOutputStream.java 2011-07-29 14:27:07.776531410 -0400 @@ -165,11 +165,11 @@ public class ObjectOutputStream private static class Caches { /** cache of subclass security audit results */ static final ConcurrentMap<WeakClassKey,Boolean> subclassAudits = - new ConcurrentHashMap<>(); + new ConcurrentHashMap<WeakClassKey,Boolean>(); /** queue for WeakReferences to audited subclasses */ static final ReferenceQueue<Class<?>> subclassAuditsQueue = - new ReferenceQueue<>(); + new ReferenceQueue<Class<?>>(); } /** filter stream for handling block data conversion */ @@ -2413,7 +2413,7 @@ public class ObjectOutputStream private final List<String> stack; DebugTraceInfoStack() { - stack = new ArrayList<>(); + stack = new ArrayList<String>(); } /** diff -up openjdk-boot/jdk/src/share/classes/java/io/ObjectStreamClass.java.sav openjdk-boot/jdk/src/share/classes/java/io/ObjectStreamClass.java --- openjdk-boot/jdk/src/share/classes/java/io/ObjectStreamClass.java.sav 2011-07-29 12:21:10.000000000 -0400 +++ openjdk-boot/jdk/src/share/classes/java/io/ObjectStreamClass.java 2011-07-29 14:27:07.777531395 -0400 @@ -84,18 +84,18 @@ public class ObjectStreamClass implement private static class Caches { /** cache mapping local classes -> descriptors */ static final ConcurrentMap<WeakClassKey,Reference<?>> localDescs = - new ConcurrentHashMap<>(); + new ConcurrentHashMap<WeakClassKey,Reference<?>>(); /** cache mapping field group/local desc pairs -> field reflectors */ static final ConcurrentMap<FieldReflectorKey,Reference<?>> reflectors = - new ConcurrentHashMap<>(); + new ConcurrentHashMap<FieldReflectorKey,Reference<?>>(); /** queue for WeakReferences to local classes */ private static final ReferenceQueue<Class<?>> localDescsQueue = - new ReferenceQueue<>(); + new ReferenceQueue<Class<?>>(); /** queue for WeakReferences to field reflectors keys */ private static final ReferenceQueue<Class<?>> reflectorsQueue = - new ReferenceQueue<>(); + new ReferenceQueue<Class<?>>(); } /** class associated with this descriptor (if any) */ @@ -290,7 +290,7 @@ public class ObjectStreamClass implement EntryFuture future = null; if (entry == null) { EntryFuture newEntry = new EntryFuture(); - Reference<?> newRef = new SoftReference<>(newEntry); + Reference<?> newRef = new SoftReference<EntryFuture>(newEntry); do { if (ref != null) { Caches.localDescs.remove(key, ref); @@ -1130,7 +1130,7 @@ public class ObjectStreamClass implement private ClassDataSlot[] getClassDataLayout0() throws InvalidClassException { - ArrayList<ClassDataSlot> slots = new ArrayList<>(); + ArrayList<ClassDataSlot> slots = new ArrayList<ClassDataSlot>(); Class<?> start = cl, end = cl; // locate closest non-serializable superclass @@ -1566,7 +1566,7 @@ public class ObjectStreamClass implement ObjectStreamField[] boundFields = new ObjectStreamField[serialPersistentFields.length]; - Set<String> fieldNames = new HashSet<>(serialPersistentFields.length); + Set<String> fieldNames = new HashSet<String>(serialPersistentFields.length); for (int i = 0; i < serialPersistentFields.length; i++) { ObjectStreamField spf = serialPersistentFields[i]; @@ -1604,7 +1604,7 @@ public class ObjectStreamClass implement */ private static ObjectStreamField[] getDefaultSerialFields(Class<?> cl) { Field[] clFields = cl.getDeclaredFields(); - ArrayList<ObjectStreamField> list = new ArrayList<>(); + ArrayList<ObjectStreamField> list = new ArrayList<ObjectStreamField>(); int mask = Modifier.STATIC | Modifier.TRANSIENT; for (int i = 0; i < clFields.length; i++) { @@ -1855,8 +1855,8 @@ public class ObjectStreamClass implement writeKeys = new long[nfields]; offsets = new int[nfields]; typeCodes = new char[nfields]; - ArrayList<Class<?>> typeList = new ArrayList<>(); - Set<Long> usedKeys = new HashSet<>(); + ArrayList<Class<?>> typeList = new ArrayList<Class<?>>(); + Set<Long> usedKeys = new HashSet<Long>(); for (int i = 0; i < nfields; i++) { @@ -2092,7 +2092,7 @@ public class ObjectStreamClass implement EntryFuture future = null; if (entry == null) { EntryFuture newEntry = new EntryFuture(); - Reference<?> newRef = new SoftReference<>(newEntry); + Reference<?> newRef = new SoftReference<EntryFuture>(newEntry); do { if (ref != null) { Caches.reflectors.remove(key, ref); diff -up openjdk-boot/jdk/src/share/classes/java/lang/ApplicationShutdownHooks.java.sav openjdk-boot/jdk/src/share/classes/java/lang/ApplicationShutdownHooks.java --- openjdk-boot/jdk/src/share/classes/java/lang/ApplicationShutdownHooks.java.sav 2011-07-29 12:21:10.000000000 -0400 +++ openjdk-boot/jdk/src/share/classes/java/lang/ApplicationShutdownHooks.java 2011-07-29 14:27:07.777531395 -0400 @@ -47,7 +47,7 @@ class ApplicationShutdownHooks { } } ); - hooks = new IdentityHashMap<>(); + hooks = new IdentityHashMap<Thread, Thread>(); } catch (IllegalStateException e) { // application shutdown hooks cannot be added if // shutdown is in progress. diff -up openjdk-boot/jdk/src/share/classes/java/lang/Character.java.sav openjdk-boot/jdk/src/share/classes/java/lang/Character.java --- openjdk-boot/jdk/src/share/classes/java/lang/Character.java.sav 2011-07-29 12:21:10.000000000 -0400 +++ openjdk-boot/jdk/src/share/classes/java/lang/Character.java 2011-07-29 14:27:07.777531395 -0400 @@ -646,7 +646,8 @@ class Character implements java.io.Seria */ public static final class UnicodeBlock extends Subset { - private static Map<String, UnicodeBlock> map = new HashMap<>(256); + private static Map<String, UnicodeBlock> map + = new HashMap<String, UnicodeBlock>(256); /** * Creates a UnicodeBlock with the given identifier name. @@ -4175,7 +4176,7 @@ class Character implements java.io.Seria private static HashMap<String, Character.UnicodeScript> aliases; static { - aliases = new HashMap<>(128); + aliases = new HashMap<String, UnicodeScript>(128); aliases.put("ARAB", ARABIC); aliases.put("ARMI", IMPERIAL_ARAMAIC); aliases.put("ARMN", ARMENIAN); diff -up openjdk-boot/jdk/src/share/classes/java/lang/CharacterName.java.sav openjdk-boot/jdk/src/share/classes/java/lang/CharacterName.java --- openjdk-boot/jdk/src/share/classes/java/lang/CharacterName.java.sav 2011-07-29 12:21:10.000000000 -0400 +++ openjdk-boot/jdk/src/share/classes/java/lang/CharacterName.java 2011-07-29 14:27:07.777531395 -0400 @@ -81,7 +81,7 @@ class CharacterName { } while (cpOff < cpEnd); strPool = new byte[total - cpEnd]; dis.readFully(strPool); - refStrPool = new SoftReference<>(strPool); + refStrPool = new SoftReference<byte[]>(strPool); } catch (Exception x) { throw new InternalError(x.getMessage()); } finally { diff -up openjdk-boot/jdk/src/share/classes/java/lang/Class.java.sav openjdk-boot/jdk/src/share/classes/java/lang/Class.java --- openjdk-boot/jdk/src/share/classes/java/lang/Class.java.sav 2011-07-29 12:21:10.000000000 -0400 +++ openjdk-boot/jdk/src/share/classes/java/lang/Class.java 2011-07-29 14:27:07.778531380 -0400 @@ -1308,7 +1308,7 @@ public final return java.security.AccessController.doPrivileged( new java.security.PrivilegedAction<Class<?>[]>() { public Class[] run() { - List<Class<?>> list = new ArrayList<>(); + List<Class<?>> list = new ArrayList<Class<?>>(); Class<?> currentClass = Class.this; while (currentClass != null) { Class<?>[] members = currentClass.getDeclaredClasses(); @@ -2308,9 +2308,9 @@ public final res = Reflection.filterFields(this, getDeclaredFields0(publicOnly)); if (useCaches) { if (publicOnly) { - declaredPublicFields = new SoftReference<>(res); + declaredPublicFields = new SoftReference<Field[]>(res); } else { - declaredFields = new SoftReference<>(res); + declaredFields = new SoftReference<Field[]>(res); } } return res; @@ -2332,9 +2332,9 @@ public final // No cached value available; compute value recursively. // Traverse in correct order for getField(). - List<Field> fields = new ArrayList<>(); + List<Field> fields = new ArrayList<Field>(); if (traversedInterfaces == null) { - traversedInterfaces = new HashSet<>(); + traversedInterfaces = new HashSet<Class<?>>(); } // Local fields @@ -2360,7 +2360,7 @@ public final res = new Field[fields.size()]; fields.toArray(res); if (useCaches) { - publicFields = new SoftReference<>(res); + publicFields = new SoftReference<Field[]>(res); } return res; } @@ -2405,9 +2405,9 @@ public final } if (useCaches) { if (publicOnly) { - publicConstructors = new SoftReference<>(res); + publicConstructors = new SoftReference<Constructor<T>[]>(res); } else { - declaredConstructors = new SoftReference<>(res); + declaredConstructors = new SoftReference<Constructor<T>[]>(res); } } return res; @@ -2442,9 +2442,9 @@ public final res = Reflection.filterMethods(this, getDeclaredMethods0(publicOnly)); if (useCaches) { if (publicOnly) { - declaredPublicMethods = new SoftReference<>(res); + declaredPublicMethods = new SoftReference<Method[]>(res); } else { - declaredMethods = new SoftReference<>(res); + declaredMethods = new SoftReference<Method[]>(res); } } return res; @@ -2600,7 +2600,7 @@ public final methods.compactAndTrim(); res = methods.getArray(); if (useCaches) { - publicMethods = new SoftReference<>(res); + publicMethods = new SoftReference<Method[]>(res); } return res; } @@ -2979,7 +2979,7 @@ public final if (universe == null) throw new IllegalArgumentException( getName() + " is not an enum type"); - Map<String, T> m = new HashMap<>(2 * universe.length); + Map<String, T> m = new HashMap<String, T>(2 * universe.length); for (T constant : universe) m.put(((Enum<?>)constant).name(), constant); enumConstantDirectory = m; @@ -3092,7 +3092,7 @@ public final if (superClass == null) { annotations = declaredAnnotations; } else { - annotations = new HashMap<>(); + annotations = new HashMap<Class<? extends Annotation>, Annotation>(); superClass.initAnnotationsIfNecessary(); for (Map.Entry<Class<? extends Annotation>, Annotation> e : superClass.annotations.entrySet()) { Class<? extends Annotation> annotationClass = e.getKey(); diff -up openjdk-boot/jdk/src/share/classes/java/lang/ClassLoader.java.sav openjdk-boot/jdk/src/share/classes/java/lang/ClassLoader.java --- openjdk-boot/jdk/src/share/classes/java/lang/ClassLoader.java.sav 2011-07-29 12:21:10.000000000 -0400 +++ openjdk-boot/jdk/src/share/classes/java/lang/ClassLoader.java 2011-07-29 14:27:07.778531380 -0400 @@ -246,7 +246,7 @@ public abstract class ClassLoader { // The classes loaded by this class loader. The only purpose of this table // is to keep the classes from being GC'ed until the loader is GC'ed. - private final Vector<Class<?>> classes = new Vector<>(); + private final Vector<Class<?>> classes = new Vector<Class<?>>(); // The "default" domain. Set as the default ProtectionDomain on newly // created classes. @@ -265,7 +265,8 @@ public abstract class ClassLoader { // The packages defined in this class loader. Each package name is mapped // to its corresponding Package object. // @GuardedBy("itself") - private final HashMap<String, Package> packages = new HashMap<>(); + private final HashMap<String, Package> packages = + new HashMap<String, Package>(); private static Void checkCreateClassLoader() { SecurityManager security = System.getSecurityManager(); @@ -278,16 +279,16 @@ public abstract class ClassLoader { private ClassLoader(Void unused, ClassLoader parent) { this.parent = parent; if (ParallelLoaders.isRegistered(this.getClass())) { - parallelLockMap = new ConcurrentHashMap<>(); - package2certs = new ConcurrentHashMap<>(); + parallelLockMap = new ConcurrentHashMap<String, Object>(); + package2certs = new ConcurrentHashMap<String, Certificate[]>(); domains = Collections.synchronizedSet(new HashSet<ProtectionDomain>()); assertionLock = new Object(); } else { // no finer-grained lock; lock on the classloader instance parallelLockMap = null; - package2certs = new Hashtable<>(); - domains = new HashSet<>(); + package2certs = new Hashtable<String, Certificate[]>(); + domains = new HashSet<ProtectionDomain>(); assertionLock = this; } } @@ -1175,7 +1176,7 @@ public abstract class ClassLoader { } tmp[1] = findResources(name); - return new CompoundEnumeration<>(tmp); + return new CompoundEnumeration<URL>(tmp); } /** @@ -1657,7 +1658,7 @@ public abstract class ClassLoader { protected Package[] getPackages() { Map<String, Package> map; synchronized (packages) { - map = new HashMap<>(packages); + map = new HashMap<String, Package>(packages); } Package[] pkgs; if (parent != null) { @@ -1764,17 +1765,20 @@ public abstract class ClassLoader { } // All native library names we've loaded. - private static Vector<String> loadedLibraryNames = new Vector<>(); + private static Vector<String> loadedLibraryNames + = new Vector<String>(); // Native libraries belonging to system classes. private static Vector<NativeLibrary> systemNativeLibraries - = new Vector<>(); + = new Vector<NativeLibrary>(); // Native libraries associated with the class loader. - private Vector<NativeLibrary> nativeLibraries = new Vector<>(); + private Vector<NativeLibrary> nativeLibraries + = new Vector<NativeLibrary>(); // native libraries being loaded/unloaded. - private static Stack<NativeLibrary> nativeLibraryContext = new Stack<>(); + private static Stack<NativeLibrary> nativeLibraryContext + = new Stack<NativeLibrary>(); // The paths searched for libraries private static String usr_paths[]; @@ -2097,8 +2101,8 @@ public abstract class ClassLoader { * them to empty maps, effectively ignoring any present settings. */ synchronized (assertionLock) { - classAssertionStatus = new HashMap<>(); - packageAssertionStatus = new HashMap<>(); + classAssertionStatus = new HashMap<String, Boolean>(); + packageAssertionStatus = new HashMap<String, Boolean>(); defaultAssertionStatus = false; } } @@ -2160,8 +2164,8 @@ public abstract class ClassLoader { private void initializeJavaAssertionMaps() { // assert Thread.holdsLock(assertionLock); - classAssertionStatus = new HashMap<>(); - packageAssertionStatus = new HashMap<>(); + classAssertionStatus = new HashMap<String, Boolean>(); + packageAssertionStatus = new HashMap<String, Boolean>(); AssertionStatusDirectives directives = retrieveDirectives(); for(int i = 0; i < directives.classes.length; i++) diff -up openjdk-boot/jdk/src/share/classes/java/lang/management/ManagementFactory.java.sav openjdk-boot/jdk/src/share/classes/java/lang/management/ManagementFactory.java --- openjdk-boot/jdk/src/share/classes/java/lang/management/ManagementFactory.java.sav 2011-07-29 12:21:11.000000000 -0400 +++ openjdk-boot/jdk/src/share/classes/java/lang/management/ManagementFactory.java 2011-07-29 14:27:07.778531380 -0400 @@ -787,7 +787,7 @@ public class ManagementFactory { getPlatformManagementInterfaces() { Set<Class<? extends PlatformManagedObject>> result = - new TreeSet<>(); + new TreeSet<Class<? extends PlatformManagedObject>>(); for (PlatformComponent component: PlatformComponent.values()) { result.add(component.getMXBeanInterface()); } diff -up openjdk-boot/jdk/src/share/classes/java/lang/management/PlatformComponent.java.sav openjdk-boot/jdk/src/share/classes/java/lang/management/PlatformComponent.java --- openjdk-boot/jdk/src/share/classes/java/lang/management/PlatformComponent.java.sav 2011-07-29 12:21:11.000000000 -0400 +++ openjdk-boot/jdk/src/share/classes/java/lang/management/PlatformComponent.java 2011-07-29 14:27:07.778531380 -0400 @@ -287,7 +287,7 @@ enum PlatformComponent { List<T> getGcMXBeanList(Class<T> gcMXBeanIntf) { List<GarbageCollectorMXBean> list = ManagementFactoryHelper.getGarbageCollectorMXBeans(); - List<T> result = new ArrayList<>(list.size()); + List<T> result = new ArrayList<T>(list.size()); for (GarbageCollectorMXBean m : list) { if (gcMXBeanIntf.isInstance(m)) { result.add(gcMXBeanIntf.cast(m)); @@ -342,7 +342,7 @@ enum PlatformComponent { } private static Set<String> keyProperties(String... keyNames) { - Set<String> set = new HashSet<>(); + Set<String> set = new HashSet<String>(); set.add("type"); for (String s : keyNames) { set.add(s); @@ -407,7 +407,7 @@ enum PlatformComponent { List<T> getMXBeans(MBeanServerConnection mbs, Class<T> mxbeanInterface) throws java.io.IOException { - List<T> result = new ArrayList<>(); + List<T> result = new ArrayList<T>(); for (ObjectName on : getObjectNames(mbs)) { result.add(ManagementFactory. newPlatformMXBeanProxy(mbs, @@ -438,7 +438,7 @@ enum PlatformComponent { private static Map<String, PlatformComponent> enumMap; private static synchronized void ensureInitialized() { if (enumMap == null) { - enumMap = new HashMap<>(); + enumMap = new HashMap<String,PlatformComponent>(); for (PlatformComponent pc: PlatformComponent.values()) { // Use String as the key rather than Class<?> to avoid // causing unnecessary class loading of management interface diff -up openjdk-boot/jdk/src/share/classes/java/lang/Package.java.sav openjdk-boot/jdk/src/share/classes/java/lang/Package.java --- openjdk-boot/jdk/src/share/classes/java/lang/Package.java.sav 2011-07-29 14:27:01.428625623 -0400 +++ openjdk-boot/jdk/src/share/classes/java/lang/Package.java 2011-07-29 14:27:07.779531365 -0400 @@ -596,13 +596,16 @@ public class Package implements java.lan } // The map of loaded system packages - private static Map<String, Package> pkgs = new HashMap<>(31); + private static Map<String, Package> pkgs + = new HashMap<String, Package>(31); // Maps each directory or zip file name to its corresponding url - private static Map<String, URL> urls = new HashMap<>(10); + private static Map<String, URL> urls + = new HashMap<String, URL>(10); // Maps each code source url for a jar file to its manifest - private static Map<String, Manifest> mans = new HashMap<>(10); + private static Map<String, Manifest> mans + = new HashMap<String, Manifest>(10); private static native String getSystemPackage0(String name); private static native String[] getSystemPackages0(); diff -up openjdk-boot/jdk/src/share/classes/java/lang/ProcessBuilder.java.sav openjdk-boot/jdk/src/share/classes/java/lang/ProcessBuilder.java --- openjdk-boot/jdk/src/share/classes/java/lang/ProcessBuilder.java.sav 2011-07-29 12:21:10.000000000 -0400 +++ openjdk-boot/jdk/src/share/classes/java/lang/ProcessBuilder.java 2011-07-29 14:27:07.779531365 -0400 @@ -214,7 +214,7 @@ public final class ProcessBuilder * @param command a string array containing the program and its arguments */ public ProcessBuilder(String... command) { - this.command = new ArrayList<>(command.length); + this.command = new ArrayList<String>(command.length); for (String arg : command) this.command.add(arg); } @@ -251,7 +251,7 @@ public final class ProcessBuilder * @return this process builder */ public ProcessBuilder command(String... command) { - this.command = new ArrayList<>(command.length); + this.command = new ArrayList<String>(command.length); for (String arg : command) this.command.add(arg); return this; diff -up openjdk-boot/jdk/src/share/classes/java/lang/reflect/Constructor.java.sav openjdk-boot/jdk/src/share/classes/java/lang/reflect/Constructor.java --- openjdk-boot/jdk/src/share/classes/java/lang/reflect/Constructor.java.sav 2011-07-29 12:21:11.000000000 -0400 +++ openjdk-boot/jdk/src/share/classes/java/lang/reflect/Constructor.java 2011-07-29 14:27:07.779531365 -0400 @@ -136,7 +136,7 @@ public final // which implicitly requires that new java.lang.reflect // objects be fabricated for each reflective call on Class // objects.) - Constructor<T> res = new Constructor<>(clazz, + Constructor<T> res = new Constructor<T>(clazz, parameterTypes, exceptionTypes, modifiers, slot, signature, diff -up openjdk-boot/jdk/src/share/classes/java/lang/reflect/Proxy.java.sav openjdk-boot/jdk/src/share/classes/java/lang/reflect/Proxy.java --- openjdk-boot/jdk/src/share/classes/java/lang/reflect/Proxy.java.sav 2011-07-29 12:21:11.000000000 -0400 +++ openjdk-boot/jdk/src/share/classes/java/lang/reflect/Proxy.java 2011-07-29 14:27:07.779531365 -0400 @@ -232,7 +232,7 @@ public class Proxy implements java.io.Se /** maps a class loader to the proxy class cache for that loader */ private static Map<ClassLoader, Map<List<String>, Object>> loaderToCache - = new WeakHashMap<>(); + = new WeakHashMap<ClassLoader, Map<List<String>, Object>>(); /** marks that a particular proxy class is currently being generated */ private static Object pendingGenerationMarker = new Object(); @@ -356,7 +356,7 @@ public class Proxy implements java.io.Se String[] interfaceNames = new String[interfaces.length]; // for detecting duplicates - Set<Class<?>> interfaceSet = new HashSet<>(); + Set<Class<?>> interfaceSet = new HashSet<Class<?>>(); for (int i = 0; i < interfaces.length; i++) { /* @@ -413,7 +413,7 @@ public class Proxy implements java.io.Se synchronized (loaderToCache) { cache = loaderToCache.get(loader); if (cache == null) { - cache = new HashMap<>(); + cache = new HashMap<List<String>, Object>(); loaderToCache.put(loader, cache); } /* diff -up openjdk-boot/jdk/src/share/classes/java/lang/reflect/ReflectAccess.java.sav openjdk-boot/jdk/src/share/classes/java/lang/reflect/ReflectAccess.java --- openjdk-boot/jdk/src/share/classes/java/lang/reflect/ReflectAccess.java.sav 2011-07-29 12:21:11.000000000 -0400 +++ openjdk-boot/jdk/src/share/classes/java/lang/reflect/ReflectAccess.java 2011-07-29 14:27:07.779531365 -0400 @@ -84,7 +84,7 @@ class ReflectAccess implements sun.refle byte[] annotations, byte[] parameterAnnotations) { - return new Constructor<>(declaringClass, + return new Constructor<T>(declaringClass, parameterTypes, checkedExceptions, modifiers, diff -up openjdk-boot/jdk/src/share/classes/java/lang/StringCoding.java.sav openjdk-boot/jdk/src/share/classes/java/lang/StringCoding.java --- openjdk-boot/jdk/src/share/classes/java/lang/StringCoding.java.sav 2011-07-29 12:21:10.000000000 -0400 +++ openjdk-boot/jdk/src/share/classes/java/lang/StringCoding.java 2011-07-29 14:27:07.779531365 -0400 @@ -53,9 +53,9 @@ class StringCoding { /** The cached coders for each thread */ private final static ThreadLocal<SoftReference<StringDecoder>> decoder = - new ThreadLocal<>(); + new ThreadLocal<SoftReference<StringDecoder>>(); private final static ThreadLocal<SoftReference<StringEncoder>> encoder = - new ThreadLocal<>(); + new ThreadLocal<SoftReference<StringEncoder>>(); private static boolean warnUnsupportedCharset = true; diff -up openjdk-boot/jdk/src/share/classes/java/lang/String.java.sav openjdk-boot/jdk/src/share/classes/java/lang/String.java --- openjdk-boot/jdk/src/share/classes/java/lang/String.java.sav 2011-07-29 12:21:10.000000000 -0400 +++ openjdk-boot/jdk/src/share/classes/java/lang/String.java 2011-07-29 14:27:07.779531365 -0400 @@ -2330,7 +2330,7 @@ public final class String int off = 0; int next = 0; boolean limited = limit > 0; - ArrayList<String> list = new ArrayList<>(); + ArrayList<String> list = new ArrayList<String>(); while ((next = indexOf(ch, off)) != -1) { if (!limited || list.size() < limit - 1) { list.add(substring(off, next)); diff -up openjdk-boot/jdk/src/share/classes/java/lang/Thread.java.sav openjdk-boot/jdk/src/share/classes/java/lang/Thread.java --- openjdk-boot/jdk/src/share/classes/java/lang/Thread.java.sav 2011-07-29 12:21:10.000000000 -0400 +++ openjdk-boot/jdk/src/share/classes/java/lang/Thread.java 2011-07-29 14:27:07.780531350 -0400 @@ -1616,7 +1616,8 @@ class Thread implements Runnable { // Get a snapshot of the list of all threads Thread[] threads = getThreads(); StackTraceElement[][] traces = dumpThreads(threads); - Map<Thread, StackTraceElement[]> m = new HashMap<>(threads.length); + Map<Thread, StackTraceElement[]> m + = new HashMap<Thread, StackTraceElement[]>(threads.length); for (int i = 0; i < threads.length; i++) { StackTraceElement[] stackTrace = traces[i]; if (stackTrace != null) { @@ -1637,11 +1638,11 @@ class Thread implements Runnable { private static class Caches { /** cache of subclass security audit results */ static final ConcurrentMap<WeakClassKey,Boolean> subclassAudits = - new ConcurrentHashMap<>(); + new ConcurrentHashMap<WeakClassKey,Boolean>(); /** queue for WeakReferences to audited subclasses */ static final ReferenceQueue<Class<?>> subclassAuditsQueue = - new ReferenceQueue<>(); + new ReferenceQueue<Class<?>>(); } /** diff -up openjdk-boot/jdk/src/share/classes/java/lang/Throwable.java.sav openjdk-boot/jdk/src/share/classes/java/lang/Throwable.java --- openjdk-boot/jdk/src/share/classes/java/lang/Throwable.java.sav 2011-07-29 12:21:10.000000000 -0400 +++ openjdk-boot/jdk/src/share/classes/java/lang/Throwable.java 2011-07-29 14:27:07.780531350 -0400 @@ -917,7 +917,7 @@ public class Throwable implements Serial // Use the sentinel for a zero-length list suppressed = SUPPRESSED_SENTINEL; } else { // Copy Throwables to new list - suppressed = new ArrayList<>(1); + suppressed = new ArrayList<Throwable>(1); for (Throwable t : suppressedExceptions) { // Enforce constraints on suppressed exceptions in // case of corrupt or malicious stream. @@ -1048,7 +1048,7 @@ public class Throwable implements Serial return; if (suppressedExceptions == SUPPRESSED_SENTINEL) - suppressedExceptions = new ArrayList<>(1); + suppressedExceptions = new ArrayList<Throwable>(1); suppressedExceptions.add(exception); } diff -up openjdk-boot/jdk/src/share/classes/java/net/InetAddress.java.sav openjdk-boot/jdk/src/share/classes/java/net/InetAddress.java --- openjdk-boot/jdk/src/share/classes/java/net/InetAddress.java.sav 2011-07-29 12:21:11.000000000 -0400 +++ openjdk-boot/jdk/src/share/classes/java/net/InetAddress.java 2011-07-29 14:27:07.780531350 -0400 @@ -677,7 +677,7 @@ class InetAddress implements java.io.Ser static InetAddressImpl impl; - private static final HashMap<String, Void> lookupTable = new HashMap<>(); + private static final HashMap<String, Void> lookupTable = new HashMap<String, Void>(); /** * Represents a cache entry @@ -736,7 +736,7 @@ class InetAddress implements java.io.Ser // As we iterate in insertion order we can // terminate when a non-expired entry is found. - LinkedList<String> expired = new LinkedList<>(); + LinkedList<String> expired = new LinkedList<String>(); long now = System.currentTimeMillis(); for (String key : cache.keySet()) { CacheEntry entry = cache.get(key); diff -up openjdk-boot/jdk/src/share/classes/java/net/URLClassLoader.java.sav openjdk-boot/jdk/src/share/classes/java/net/URLClassLoader.java --- openjdk-boot/jdk/src/share/classes/java/net/URLClassLoader.java.sav 2011-07-29 12:21:11.000000000 -0400 +++ openjdk-boot/jdk/src/share/classes/java/net/URLClassLoader.java 2011-07-29 14:27:07.780531350 -0400 @@ -205,7 +205,7 @@ public class URLClassLoader extends Secu */ private WeakHashMap<Closeable,Void> - closeables = new WeakHashMap<>(); + closeables = new WeakHashMap<Closeable, Void>(); /** * Returns an input stream for reading the specified resource. diff -up openjdk-boot/jdk/src/share/classes/java/nio/file/Files.java.sav openjdk-boot/jdk/src/share/classes/java/nio/file/Files.java --- openjdk-boot/jdk/src/share/classes/java/nio/file/Files.java.sav 2011-07-29 14:27:01.429625608 -0400 +++ openjdk-boot/jdk/src/share/classes/java/nio/file/Files.java 2011-07-29 14:27:07.780531350 -0400 @@ -1487,7 +1487,7 @@ public final class Files { return AccessController .doPrivileged(new PrivilegedAction<List<FileTypeDetector>>() { @Override public List<FileTypeDetector> run() { - List<FileTypeDetector> list = new ArrayList<>(); + List<FileTypeDetector> list = new ArrayList<FileTypeDetector>(); ServiceLoader<FileTypeDetector> loader = ServiceLoader .load(FileTypeDetector.class, ClassLoader.getSystemClassLoader()); for (FileTypeDetector detector: loader) { @@ -3008,7 +3008,7 @@ public final class Files { BufferedReader reader = null; try { reader = newBufferedReader(path, cs); - List<String> result = new ArrayList<>(); + List<String> result = new ArrayList<String>(); for (;;) { String line = reader.readLine(); if (line == null) diff -up openjdk-boot/jdk/src/share/classes/java/security/AccessControlContext.java.sav openjdk-boot/jdk/src/share/classes/java/security/AccessControlContext.java --- openjdk-boot/jdk/src/share/classes/java/security/AccessControlContext.java.sav 2011-07-29 12:21:12.000000000 -0400 +++ openjdk-boot/jdk/src/share/classes/java/security/AccessControlContext.java 2011-07-29 14:27:07.781531335 -0400 @@ -124,7 +124,7 @@ public final class AccessControlContext this.context = null; } } else { - List<ProtectionDomain> v = new ArrayList<>(context.length); + List<ProtectionDomain> v = new ArrayList<ProtectionDomain>(context.length); for (int i =0; i< context.length; i++) { if ((context[i] != null) && (!v.contains(context[i]))) v.add(context[i]); diff -up openjdk-boot/jdk/src/share/classes/java/security/BasicPermission.java.sav openjdk-boot/jdk/src/share/classes/java/security/BasicPermission.java --- openjdk-boot/jdk/src/share/classes/java/security/BasicPermission.java.sav 2011-07-29 12:21:12.000000000 -0400 +++ openjdk-boot/jdk/src/share/classes/java/security/BasicPermission.java 2011-07-29 14:27:07.781531335 -0400 @@ -515,7 +515,7 @@ implements java.io.Serializable // Copy perms into a Hashtable Hashtable<String, Permission> permissions = - new Hashtable<>(perms.size()*2); + new Hashtable<String, Permission>(perms.size()*2); synchronized (this) { permissions.putAll(perms); diff -up openjdk-boot/jdk/src/share/classes/java/security/CodeSource.java.sav openjdk-boot/jdk/src/share/classes/java/security/CodeSource.java --- openjdk-boot/jdk/src/share/classes/java/security/CodeSource.java.sav 2011-07-29 12:21:12.000000000 -0400 +++ openjdk-boot/jdk/src/share/classes/java/security/CodeSource.java 2011-07-29 14:27:07.781531335 -0400 @@ -188,7 +188,7 @@ public class CodeSource implements java. } else if (signers != null) { // Convert the code signers to certs ArrayList<java.security.cert.Certificate> certChains = - new ArrayList<>(); + new ArrayList<java.security.cert.Certificate>(); for (int i = 0; i < signers.length; i++) { certChains.addAll( signers[i].getSignerCertPath().getCertificates()); @@ -606,10 +606,10 @@ public class CodeSource implements java. // Iterate through all the certificates int i = 0; - List<CodeSigner> signers = new ArrayList<>(); + List<CodeSigner> signers = new ArrayList<CodeSigner>(); while (i < certs.length) { List<java.security.cert.Certificate> certChain = - new ArrayList<>(); + new ArrayList<java.security.cert.Certificate>(); certChain.add(certs[i++]); // first cert is an end-entity cert int j = i; diff -up openjdk-boot/jdk/src/share/classes/java/security/Permissions.java.sav openjdk-boot/jdk/src/share/classes/java/security/Permissions.java --- openjdk-boot/jdk/src/share/classes/java/security/Permissions.java.sav 2011-07-29 12:21:12.000000000 -0400 +++ openjdk-boot/jdk/src/share/classes/java/security/Permissions.java 2011-07-29 14:27:07.781531335 -0400 @@ -362,7 +362,7 @@ implements Serializable // Copy perms into a Hashtable Hashtable<Class<?>, PermissionCollection> perms = - new Hashtable<>(permsMap.size()*2); // no sync; estimate + new Hashtable<Class<?>, PermissionCollection>(permsMap.size()*2); // no sync; estimate synchronized (this) { perms.putAll(permsMap); } @@ -567,7 +567,7 @@ implements Serializable // Copy perms into a Hashtable Hashtable<Permission, Permission> perms = - new Hashtable<>(permsMap.size()*2); + new Hashtable<Permission, Permission>(permsMap.size()*2); synchronized (this) { perms.putAll(permsMap); } diff -up openjdk-boot/jdk/src/share/classes/java/security/ProtectionDomain.java.sav openjdk-boot/jdk/src/share/classes/java/security/ProtectionDomain.java --- openjdk-boot/jdk/src/share/classes/java/security/ProtectionDomain.java.sav 2011-07-29 12:21:12.000000000 -0400 +++ openjdk-boot/jdk/src/share/classes/java/security/ProtectionDomain.java 2011-07-29 14:27:07.781531335 -0400 @@ -368,8 +368,8 @@ public class ProtectionDomain { int swag = 32; int vcap = 8; Enumeration<Permission> e; - List<Permission> pdVector = new ArrayList<>(vcap); - List<Permission> plVector = new ArrayList<>(swag); + List<Permission> pdVector = new ArrayList<Permission>(vcap); + List<Permission> plVector = new ArrayList<Permission>(swag); // // Build a vector of domain permissions for subsequent merge diff -up openjdk-boot/jdk/src/share/classes/java/security/Provider.java.sav openjdk-boot/jdk/src/share/classes/java/security/Provider.java --- openjdk-boot/jdk/src/share/classes/java/security/Provider.java.sav 2011-07-29 12:21:12.000000000 -0400 +++ openjdk-boot/jdk/src/share/classes/java/security/Provider.java 2011-07-29 14:27:07.781531335 -0400 @@ -437,7 +437,7 @@ public abstract class Provider extends P private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException { - Map<Object,Object> copy = new HashMap<>(); + Map<Object,Object> copy = new HashMap<Object,Object>(); for (Map.Entry<Object,Object> entry : super.entrySet()) { copy.put(entry.getKey(), entry.getValue()); } @@ -719,7 +719,7 @@ public abstract class Provider extends P } if (serviceSet == null) { ensureLegacyParsed(); - Set<Service> set = new LinkedHashSet<>(); + Set<Service> set = new LinkedHashSet<Service>(); if (serviceMap != null) { set.addAll(serviceMap.values()); } @@ -1395,7 +1395,7 @@ public abstract class Provider extends P if (s != null) { String[] classNames = s.split("\\|"); List<Class> classList = - new ArrayList<>(classNames.length); + new ArrayList<Class>(classNames.length); for (String className : classNames) { Class clazz = getKeyClass(className); if (clazz != null) { diff -up openjdk-boot/jdk/src/share/classes/java/security/SecureClassLoader.java.sav openjdk-boot/jdk/src/share/classes/java/security/SecureClassLoader.java --- openjdk-boot/jdk/src/share/classes/java/security/SecureClassLoader.java.sav 2011-07-29 12:21:12.000000000 -0400 +++ openjdk-boot/jdk/src/share/classes/java/security/SecureClassLoader.java 2011-07-29 14:27:07.781531335 -0400 @@ -50,7 +50,7 @@ public class SecureClassLoader extends C // HashMap that maps CodeSource to ProtectionDomain // @GuardedBy("pdcache") private final HashMap<CodeSource, ProtectionDomain> pdcache = - new HashMap<>(11); + new HashMap<CodeSource, ProtectionDomain>(11); private static final Debug debug = Debug.getInstance("scl"); diff -up openjdk-boot/jdk/src/share/classes/java/security/Security.java.sav openjdk-boot/jdk/src/share/classes/java/security/Security.java --- openjdk-boot/jdk/src/share/classes/java/security/Security.java.sav 2011-07-29 12:21:12.000000000 -0400 +++ openjdk-boot/jdk/src/share/classes/java/security/Security.java 2011-07-29 14:27:07.781531335 -0400 @@ -546,7 +546,7 @@ public final class Security { value = filter.substring(index + 1); } - Hashtable<String, String> hashtableFilter = new Hashtable<>(1); + Hashtable<String, String> hashtableFilter = new Hashtable<String, String>(1); hashtableFilter.put(key, value); return (getProviders(hashtableFilter)); @@ -606,7 +606,7 @@ public final class Security { // Then only return those providers who satisfy the selection criteria. Provider[] allProviders = Security.getProviders(); Set<String> keySet = filter.keySet(); - LinkedHashSet<Provider> candidates = new LinkedHashSet<>(5); + LinkedHashSet<Provider> candidates = new LinkedHashSet<Provider>(5); // Returns all installed providers // if the selection criteria is null. @@ -660,7 +660,7 @@ public final class Security { } // Map containing cached Spi Class objects of the specified type - private static final Map<String, Class> spiMap = new ConcurrentHashMap<>(); + private static final Map<String, Class> spiMap = new ConcurrentHashMap<String, Class>(); /** * Return the Class object for the given engine type @@ -884,7 +884,7 @@ public final class Security { String attrName, String filterValue, Provider[] allProviders) { - LinkedHashSet<Provider> candidates = new LinkedHashSet<>(5); + LinkedHashSet<Provider> candidates = new LinkedHashSet<Provider>(5); for (int i = 0; i < allProviders.length; i++) { if (isCriterionSatisfied(allProviders[i], serviceName, algName, @@ -1081,7 +1081,7 @@ public final class Security { return Collections.EMPTY_SET; } - HashSet<String> result = new HashSet<>(); + HashSet<String> result = new HashSet<String>(); Provider[] providers = Security.getProviders(); for (int i = 0; i < providers.length; i++) { diff -up openjdk-boot/jdk/src/share/classes/java/security/UnresolvedPermissionCollection.java.sav openjdk-boot/jdk/src/share/classes/java/security/UnresolvedPermissionCollection.java --- openjdk-boot/jdk/src/share/classes/java/security/UnresolvedPermissionCollection.java.sav 2011-07-29 12:21:12.000000000 -0400 +++ openjdk-boot/jdk/src/share/classes/java/security/UnresolvedPermissionCollection.java 2011-07-29 14:27:07.782531320 -0400 @@ -119,7 +119,7 @@ implements java.io.Serializable public Enumeration<Permission> elements() { List<Permission> results = - new ArrayList<>(); // where results are stored + new ArrayList<Permission>(); // where results are stored // Get iterator of Map values (which are lists of permissions) synchronized (this) { @@ -161,7 +161,7 @@ implements java.io.Serializable // Copy perms into a Hashtable Hashtable<String, Vector<UnresolvedPermission>> permissions = - new Hashtable<>(perms.size()*2); + new Hashtable<String, Vector<UnresolvedPermission>>(perms.size()*2); // Convert each entry (List) into a Vector synchronized (this) { @@ -169,7 +169,7 @@ implements java.io.Serializable for (Map.Entry<String, List<UnresolvedPermission>> e : set) { // Convert list into Vector List<UnresolvedPermission> list = e.getValue(); - Vector<UnresolvedPermission> vec = new Vector<>(list.size()); + Vector<UnresolvedPermission> vec = new Vector<UnresolvedPermission>(list.size()); synchronized (list) { vec.addAll(list); } @@ -206,7 +206,7 @@ implements java.io.Serializable for (Map.Entry<String, Vector<UnresolvedPermission>> e : set) { // Convert Vector into ArrayList Vector<UnresolvedPermission> vec = e.getValue(); - List<UnresolvedPermission> list = new ArrayList<>(vec.size()); + List<UnresolvedPermission> list = new ArrayList<UnresolvedPermission>(vec.size()); list.addAll(vec); // Add to Hashtable being serialized diff -up openjdk-boot/jdk/src/share/classes/java/security/UnresolvedPermission.java.sav openjdk-boot/jdk/src/share/classes/java/security/UnresolvedPermission.java --- openjdk-boot/jdk/src/share/classes/java/security/UnresolvedPermission.java.sav 2011-07-29 12:21:12.000000000 -0400 +++ openjdk-boot/jdk/src/share/classes/java/security/UnresolvedPermission.java 2011-07-29 14:27:07.782531320 -0400 @@ -198,7 +198,7 @@ implements java.io.Serializable if (this.certs == null) { // extract the signer certs ArrayList<java.security.cert.Certificate> signerCerts = - new ArrayList<>(); + new ArrayList<java.security.cert.Certificate>(); i = 0; while (i < certs.length) { signerCerts.add(certs[i]); diff -up openjdk-boot/jdk/src/share/classes/java/util/AbstractList.java.sav openjdk-boot/jdk/src/share/classes/java/util/AbstractList.java --- openjdk-boot/jdk/src/share/classes/java/util/AbstractList.java.sav 2011-07-29 12:21:13.000000000 -0400 +++ openjdk-boot/jdk/src/share/classes/java/util/AbstractList.java 2011-07-29 14:27:07.782531320 -0400 @@ -482,8 +482,8 @@ public abstract class AbstractList<E> ex */ public List<E> subList(int fromIndex, int toIndex) { return (this instanceof RandomAccess ? - new RandomAccessSubList<>(this, fromIndex, toIndex) : - new SubList<>(this, fromIndex, toIndex)); + new RandomAccessSubList<E>(this, fromIndex, toIndex) : + new SubList<E>(this, fromIndex, toIndex)); } // Comparison and hashing @@ -747,7 +747,7 @@ class SubList<E> extends AbstractList<E> } public List<E> subList(int fromIndex, int toIndex) { - return new SubList<>(this, fromIndex, toIndex); + return new SubList<E>(this, fromIndex, toIndex); } private void rangeCheck(int index) { @@ -776,6 +776,6 @@ class RandomAccessSubList<E> extends Sub } public List<E> subList(int fromIndex, int toIndex) { - return new RandomAccessSubList<>(this, fromIndex, toIndex); + return new RandomAccessSubList<E>(this, fromIndex, toIndex); } } diff -up openjdk-boot/jdk/src/share/classes/java/util/Arrays.java.sav openjdk-boot/jdk/src/share/classes/java/util/Arrays.java --- openjdk-boot/jdk/src/share/classes/java/util/Arrays.java.sav 2011-07-29 12:21:13.000000000 -0400 +++ openjdk-boot/jdk/src/share/classes/java/util/Arrays.java 2011-07-29 14:27:07.782531320 -0400 @@ -2825,7 +2825,7 @@ public class Arrays { */ @SafeVarargs public static <T> List<T> asList(T... a) { - return new ArrayList<>(a); + return new ArrayList<T>(a); } /** diff -up openjdk-boot/jdk/src/share/classes/java/util/Collections.java.sav openjdk-boot/jdk/src/share/classes/java/util/Collections.java --- openjdk-boot/jdk/src/share/classes/java/util/Collections.java.sav 2011-07-29 12:21:13.000000000 -0400 +++ openjdk-boot/jdk/src/share/classes/java/util/Collections.java 2011-07-29 14:27:07.783531305 -0400 @@ -1035,7 +1035,7 @@ public class Collections { * @return an unmodifiable view of the specified collection. */ public static <T> Collection<T> unmodifiableCollection(Collection<? extends T> c) { - return new UnmodifiableCollection<>(c); + return new UnmodifiableCollection<T>(c); } /** @@ -1109,7 +1109,7 @@ public class Collections { * @return an unmodifiable view of the specified set. */ public static <T> Set<T> unmodifiableSet(Set<? extends T> s) { - return new UnmodifiableSet<>(s); + return new UnmodifiableSet<T>(s); } /** @@ -1141,7 +1141,7 @@ public class Collections { * @return an unmodifiable view of the specified sorted set. */ public static <T> SortedSet<T> unmodifiableSortedSet(SortedSet<T> s) { - return new UnmodifiableSortedSet<>(s); + return new UnmodifiableSortedSet<T>(s); } /** @@ -1158,13 +1158,13 @@ public class Collections { public Comparator<? super E> comparator() {return ss.comparator();} public SortedSet<E> subSet(E fromElement, E toElement) { - return new UnmodifiableSortedSet<>(ss.subSet(fromElement,toElement)); + return new UnmodifiableSortedSet<E>(ss.subSet(fromElement,toElement)); } public SortedSet<E> headSet(E toElement) { - return new UnmodifiableSortedSet<>(ss.headSet(toElement)); + return new UnmodifiableSortedSet<E>(ss.headSet(toElement)); } public SortedSet<E> tailSet(E fromElement) { - return new UnmodifiableSortedSet<>(ss.tailSet(fromElement)); + return new UnmodifiableSortedSet<E>(ss.tailSet(fromElement)); } public E first() {return ss.first();} @@ -1188,8 +1188,8 @@ public class Collections { */ public static <T> List<T> unmodifiableList(List<? extends T> list) { return (list instanceof RandomAccess ? - new UnmodifiableRandomAccessList<>(list) : - new UnmodifiableList<>(list)); + new UnmodifiableRandomAccessList<T>(list) : + new UnmodifiableList<T>(list)); } /** @@ -1250,7 +1250,7 @@ public class Collections { } public List<E> subList(int fromIndex, int toIndex) { - return new UnmodifiableList<>(list.subList(fromIndex, toIndex)); + return new UnmodifiableList<E>(list.subList(fromIndex, toIndex)); } /** @@ -1267,7 +1267,7 @@ public class Collections { */ private Object readResolve() { return (list instanceof RandomAccess - ? new UnmodifiableRandomAccessList<>(list) + ? new UnmodifiableRandomAccessList<E>(list) : this); } } @@ -1283,7 +1283,7 @@ public class Collections { } public List<E> subList(int fromIndex, int toIndex) { - return new UnmodifiableRandomAccessList<>( + return new UnmodifiableRandomAccessList<E>( list.subList(fromIndex, toIndex)); } @@ -1296,7 +1296,7 @@ public class Collections { * deserialization. */ private Object writeReplace() { - return new UnmodifiableList<>(list); + return new UnmodifiableList<E>(list); } } @@ -1315,7 +1315,7 @@ public class Collections { * @return an unmodifiable view of the specified map. */ public static <K,V> Map<K,V> unmodifiableMap(Map<? extends K, ? extends V> m) { - return new UnmodifiableMap<>(m); + return new UnmodifiableMap<K,V>(m); } /** @@ -1363,7 +1363,7 @@ public class Collections { public Set<Map.Entry<K,V>> entrySet() { if (entrySet==null) - entrySet = new UnmodifiableEntrySet<>(m.entrySet()); + entrySet = new UnmodifiableEntrySet<K,V>(m.entrySet()); return entrySet; } @@ -1400,7 +1400,7 @@ public class Collections { return i.hasNext(); } public Map.Entry<K,V> next() { - return new UnmodifiableEntry<>(i.next()); + return new UnmodifiableEntry<K,V>(i.next()); } public void remove() { throw new UnsupportedOperationException(); @@ -1411,7 +1411,7 @@ public class Collections { public Object[] toArray() { Object[] a = c.toArray(); for (int i=0; i<a.length; i++) - a[i] = new UnmodifiableEntry<>((Map.Entry<K,V>)a[i]); + a[i] = new UnmodifiableEntry<K,V>((Map.Entry<K,V>)a[i]); return a; } @@ -1422,7 +1422,7 @@ public class Collections { Object[] arr = c.toArray(a.length==0 ? a : Arrays.copyOf(a, 0)); for (int i=0; i<arr.length; i++) - arr[i] = new UnmodifiableEntry<>((Map.Entry<K,V>)arr[i]); + arr[i] = new UnmodifiableEntry<K,V>((Map.Entry<K,V>)arr[i]); if (arr.length > a.length) return (T[])arr; @@ -1443,7 +1443,7 @@ public class Collections { if (!(o instanceof Map.Entry)) return false; return c.contains( - new UnmodifiableEntry<>((Map.Entry<?,?>) o)); + new UnmodifiableEntry<Object,Object>((Map.Entry<?,?>) o)); } /** @@ -1517,7 +1517,7 @@ public class Collections { * @return an unmodifiable view of the specified sorted map. */ public static <K,V> SortedMap<K,V> unmodifiableSortedMap(SortedMap<K, ? extends V> m) { - return new UnmodifiableSortedMap<>(m); + return new UnmodifiableSortedMap<K,V>(m); } /** @@ -1535,13 +1535,13 @@ public class Collections { public Comparator<? super K> comparator() {return sm.comparator();} public SortedMap<K,V> subMap(K fromKey, K toKey) { - return new UnmodifiableSortedMap<>(sm.subMap(fromKey, toKey)); + return new UnmodifiableSortedMap<K,V>(sm.subMap(fromKey, toKey)); } public SortedMap<K,V> headMap(K toKey) { - return new UnmodifiableSortedMap<>(sm.headMap(toKey)); + return new UnmodifiableSortedMap<K,V>(sm.headMap(toKey)); } public SortedMap<K,V> tailMap(K fromKey) { - return new UnmodifiableSortedMap<>(sm.tailMap(fromKey)); + return new UnmodifiableSortedMap<K,V>(sm.tailMap(fromKey)); } public K firstKey() {return sm.firstKey();} @@ -1583,11 +1583,11 @@ public class Collections { * @return a synchronized view of the specified collection. */ public static <T> Collection<T> synchronizedCollection(Collection<T> c) { - return new SynchronizedCollection<>(c); + return new SynchronizedCollection<T>(c); } static <T> Collection<T> synchronizedCollection(Collection<T> c, Object mutex) { - return new SynchronizedCollection<>(c, mutex); + return new SynchronizedCollection<T>(c, mutex); } /** @@ -1686,11 +1686,11 @@ public class Collections { * @return a synchronized view of the specified set. */ public static <T> Set<T> synchronizedSet(Set<T> s) { - return new SynchronizedSet<>(s); + return new SynchronizedSet<T>(s); } static <T> Set<T> synchronizedSet(Set<T> s, Object mutex) { - return new SynchronizedSet<>(s, mutex); + return new SynchronizedSet<T>(s, mutex); } /** @@ -1754,7 +1754,7 @@ public class Collections { * @return a synchronized view of the specified sorted set. */ public static <T> SortedSet<T> synchronizedSortedSet(SortedSet<T> s) { - return new SynchronizedSortedSet<>(s); + return new SynchronizedSortedSet<T>(s); } /** @@ -1783,18 +1783,18 @@ public class Collections { public SortedSet<E> subSet(E fromElement, E toElement) { synchronized (mutex) { - return new SynchronizedSortedSet<>( + return new SynchronizedSortedSet<E>( ss.subSet(fromElement, toElement), mutex); } } public SortedSet<E> headSet(E toElement) { synchronized (mutex) { - return new SynchronizedSortedSet<>(ss.headSet(toElement), mutex); + return new SynchronizedSortedSet<E>(ss.headSet(toElement), mutex); } } public SortedSet<E> tailSet(E fromElement) { synchronized (mutex) { - return new SynchronizedSortedSet<>(ss.tailSet(fromElement),mutex); + return new SynchronizedSortedSet<E>(ss.tailSet(fromElement),mutex); } } @@ -1833,14 +1833,14 @@ public class Collections { */ public static <T> List<T> synchronizedList(List<T> list) { return (list instanceof RandomAccess ? - new SynchronizedRandomAccessList<>(list) : - new SynchronizedList<>(list)); + new SynchronizedRandomAccessList<T>(list) : + new SynchronizedList<T>(list)); } static <T> List<T> synchronizedList(List<T> list, Object mutex) { return (list instanceof RandomAccess ? - new SynchronizedRandomAccessList<>(list, mutex) : - new SynchronizedList<>(list, mutex)); + new SynchronizedRandomAccessList<T>(list, mutex) : + new SynchronizedList<T>(list, mutex)); } /** @@ -1903,7 +1903,7 @@ public class Collections { public List<E> subList(int fromIndex, int toIndex) { synchronized (mutex) { - return new SynchronizedList<>(list.subList(fromIndex, toIndex), + return new SynchronizedList<E>(list.subList(fromIndex, toIndex), mutex); } } @@ -1922,7 +1922,7 @@ public class Collections { */ private Object readResolve() { return (list instanceof RandomAccess - ? new SynchronizedRandomAccessList<>(list) + ? new SynchronizedRandomAccessList<E>(list) : this); } } @@ -1944,7 +1944,7 @@ public class Collections { public List<E> subList(int fromIndex, int toIndex) { synchronized (mutex) { - return new SynchronizedRandomAccessList<>( + return new SynchronizedRandomAccessList<E>( list.subList(fromIndex, toIndex), mutex); } } @@ -1958,7 +1958,7 @@ public class Collections { * deserialization. */ private Object writeReplace() { - return new SynchronizedList<>(list); + return new SynchronizedList<E>(list); } } @@ -1990,7 +1990,7 @@ public class Collections { * @return a synchronized view of the specified map. */ public static <K,V> Map<K,V> synchronizedMap(Map<K,V> m) { - return new SynchronizedMap<>(m); + return new SynchronizedMap<K,V>(m); } /** @@ -2051,7 +2051,7 @@ public class Collections { public Set<K> keySet() { synchronized (mutex) { if (keySet==null) - keySet = new SynchronizedSet<>(m.keySet(), mutex); + keySet = new SynchronizedSet<K>(m.keySet(), mutex); return keySet; } } @@ -2059,7 +2059,7 @@ public class Collections { public Set<Map.Entry<K,V>> entrySet() { synchronized (mutex) { if (entrySet==null) - entrySet = new SynchronizedSet<>(m.entrySet(), mutex); + entrySet = new SynchronizedSet<Map.Entry<K,V>>(m.entrySet(), mutex); return entrySet; } } @@ -2067,7 +2067,7 @@ public class Collections { public Collection<V> values() { synchronized (mutex) { if (values==null) - values = new SynchronizedCollection<>(m.values(), mutex); + values = new SynchronizedCollection<V>(m.values(), mutex); return values; } } @@ -2129,7 +2129,7 @@ public class Collections { * @return a synchronized view of the specified sorted map. */ public static <K,V> SortedMap<K,V> synchronizedSortedMap(SortedMap<K,V> m) { - return new SynchronizedSortedMap<>(m); + return new SynchronizedSortedMap<K,V>(m); } @@ -2159,18 +2159,18 @@ public class Collections { public SortedMap<K,V> subMap(K fromKey, K toKey) { synchronized (mutex) { - return new SynchronizedSortedMap<>( + return new SynchronizedSortedMap<K,V>( sm.subMap(fromKey, toKey), mutex); } } public SortedMap<K,V> headMap(K toKey) { synchronized (mutex) { - return new SynchronizedSortedMap<>(sm.headMap(toKey), mutex); + return new SynchronizedSortedMap<K,V>(sm.headMap(toKey), mutex); } } public SortedMap<K,V> tailMap(K fromKey) { synchronized (mutex) { - return new SynchronizedSortedMap<>(sm.tailMap(fromKey),mutex); + return new SynchronizedSortedMap<K,V>(sm.tailMap(fromKey),mutex); } } @@ -2246,7 +2246,7 @@ public class Collections { */ public static <E> Collection<E> checkedCollection(Collection<E> c, Class<E> type) { - return new CheckedCollection<>(c, type); + return new CheckedCollection<E>(c, type); } @SuppressWarnings("unchecked") @@ -2378,7 +2378,7 @@ public class Collections { * @since 1.5 */ public static <E> Set<E> checkedSet(Set<E> s, Class<E> type) { - return new CheckedSet<>(s, type); + return new CheckedSet<E>(s, type); } /** @@ -2424,7 +2424,7 @@ public class Collections { */ public static <E> SortedSet<E> checkedSortedSet(SortedSet<E> s, Class<E> type) { - return new CheckedSortedSet<>(s, type); + return new CheckedSortedSet<E>(s, type); } /** @@ -2484,8 +2484,8 @@ public class Collections { */ public static <E> List<E> checkedList(List<E> list, Class<E> type) { return (list instanceof RandomAccess ? - new CheckedRandomAccessList<>(list, type) : - new CheckedList<>(list, type)); + new CheckedRandomAccessList<E>(list, type) : + new CheckedList<E>(list, type)); } /** @@ -2550,7 +2550,7 @@ public class Collections { } public List<E> subList(int fromIndex, int toIndex) { - return new CheckedList<>(list.subList(fromIndex, toIndex), type); + return new CheckedList<E>(list.subList(fromIndex, toIndex), type); } } @@ -2567,7 +2567,7 @@ public class Collections { } public List<E> subList(int fromIndex, int toIndex) { - return new CheckedRandomAccessList<>( + return new CheckedRandomAccessList<E>( list.subList(fromIndex, toIndex), type); } } @@ -2609,7 +2609,7 @@ public class Collections { public static <K, V> Map<K, V> checkedMap(Map<K, V> m, Class<K> keyType, Class<V> valueType) { - return new CheckedMap<>(m, keyType, valueType); + return new CheckedMap<K,V>(m, keyType, valueType); } @@ -2677,14 +2677,15 @@ public class Collections { // - protection from malicious t // - correct behavior if t is a concurrent map Object[] entries = t.entrySet().toArray(); - List<Map.Entry<K,V>> checked = new ArrayList<>(entries.length); + List<Map.Entry<K,V>> checked = + new ArrayList<Map.Entry<K,V>>(entries.length); for (Object o : entries) { Map.Entry<?,?> e = (Map.Entry<?,?>) o; Object k = e.getKey(); Object v = e.getValue(); typeCheck(k, v); checked.add( - new AbstractMap.SimpleImmutableEntry<>((K) k, (V) v)); + new AbstractMap.SimpleImmutableEntry<K,V>((K) k, (V) v)); } for (Map.Entry<K,V> e : checked) m.put(e.getKey(), e.getValue()); @@ -2694,7 +2695,7 @@ public class Collections { public Set<Map.Entry<K,V>> entrySet() { if (entrySet==null) - entrySet = new CheckedEntrySet<>(m.entrySet(), valueType); + entrySet = new CheckedEntrySet<K,V>(m.entrySet(), valueType); return entrySet; } @@ -2809,7 +2810,7 @@ public class Collections { if (!(o instanceof Map.Entry)) return false; return s.remove(new AbstractMap.SimpleImmutableEntry - <>((Map.Entry<?,?>)o)); + <Object, Object>((Map.Entry<?,?>)o)); } public boolean removeAll(Collection<?> c) { @@ -2842,7 +2843,7 @@ public class Collections { static <K,V,T> CheckedEntry<K,V,T> checkedEntry(Map.Entry<K,V> e, Class<T> valueType) { - return new CheckedEntry<>(e, valueType); + return new CheckedEntry<K,V,T>(e, valueType); } /** @@ -2883,7 +2884,7 @@ public class Collections { if (!(o instanceof Map.Entry)) return false; return e.equals(new AbstractMap.SimpleImmutableEntry - <>((Map.Entry<?,?>)o)); + <Object, Object>((Map.Entry<?,?>)o)); } } } @@ -2926,7 +2927,7 @@ public class Collections { public static <K,V> SortedMap<K,V> checkedSortedMap(SortedMap<K, V> m, Class<K> keyType, Class<V> valueType) { - return new CheckedSortedMap<>(m, keyType, valueType); + return new CheckedSortedMap<K,V>(m, keyType, valueType); } /** @@ -2992,7 +2993,7 @@ public class Collections { private static class EmptyIterator<E> implements Iterator<E> { static final EmptyIterator<Object> EMPTY_ITERATOR - = new EmptyIterator<>(); + = new EmptyIterator<Object>(); public boolean hasNext() { return false; } public E next() { throw new NoSuchElementException(); } @@ -3041,7 +3042,7 @@ public class Collections { implements ListIterator<E> { static final EmptyListIterator<Object> EMPTY_ITERATOR - = new EmptyListIterator<>(); + = new EmptyListIterator<Object>(); public boolean hasPrevious() { return false; } public E previous() { throw new NoSuchElementException(); } @@ -3077,7 +3078,7 @@ public class Collections { private static class EmptyEnumeration<E> implements Enumeration<E> { static final EmptyEnumeration<Object> EMPTY_ENUMERATION - = new EmptyEnumeration<>(); + = new EmptyEnumeration<Object>(); public boolean hasMoreElements() { return false; } public E nextElement() { throw new NoSuchElementException(); } @@ -3089,7 +3090,7 @@ public class Collections { * @see #emptySet() */ @SuppressWarnings("unchecked") - public static final Set EMPTY_SET = new EmptySet<>(); + public static final Set EMPTY_SET = new EmptySet<Object>(); /** * Returns the empty set (immutable). This set is serializable. @@ -3149,7 +3150,7 @@ public class Collections { * @see #emptyList() */ @SuppressWarnings("unchecked") - public static final List EMPTY_LIST = new EmptyList<>(); + public static final List EMPTY_LIST = new EmptyList<Object>(); /** * Returns the empty list (immutable). This list is serializable. @@ -3223,7 +3224,7 @@ public class Collections { * @since 1.3 */ @SuppressWarnings("unchecked") - public static final Map EMPTY_MAP = new EmptyMap<>(); + public static final Map EMPTY_MAP = new EmptyMap<Object,Object>(); /** * Returns the empty map (immutable). This map is serializable. @@ -3285,7 +3286,7 @@ public class Collections { * @return an immutable set containing only the specified object. */ public static <T> Set<T> singleton(T o) { - return new SingletonSet<>(o); + return new SingletonSet<T>(o); } static <E> Iterator<E> singletonIterator(final E e) { @@ -3338,7 +3339,7 @@ public class Collections { * @since 1.3 */ public static <T> List<T> singletonList(T o) { - return new SingletonList<>(o); + return new SingletonList<T>(o); } /** @@ -3380,7 +3381,7 @@ public class Collections { * @since 1.3 */ public static <K,V> Map<K,V> singletonMap(K key, V value) { - return new SingletonMap<>(key, value); + return new SingletonMap<K,V>(key, value); } /** @@ -3422,7 +3423,7 @@ public class Collections { public Set<Map.Entry<K,V>> entrySet() { if (entrySet==null) entrySet = Collections.<Map.Entry<K,V>>singleton( - new SimpleImmutableEntry<>(k, v)); + new SimpleImmutableEntry<K,V>(k, v)); return entrySet; } @@ -3454,7 +3455,7 @@ public class Collections { public static <T> List<T> nCopies(int n, T o) { if (n < 0) throw new IllegalArgumentException("List length = " + n); - return new CopiesList<>(n, o); + return new CopiesList<T>(n, o); } /** @@ -3528,7 +3529,7 @@ public class Collections { if (fromIndex > toIndex) throw new IllegalArgumentException("fromIndex(" + fromIndex + ") > toIndex(" + toIndex + ")"); - return new CopiesList<>(toIndex - fromIndex, element); + return new CopiesList<E>(toIndex - fromIndex, element); } } @@ -3596,7 +3597,7 @@ public class Collections { if (cmp instanceof ReverseComparator2) return ((ReverseComparator2<T>)cmp).cmp; - return new ReverseComparator2<>(cmp); + return new ReverseComparator2<T>(cmp); } /** @@ -3675,7 +3676,7 @@ public class Collections { * @see ArrayList */ public static <T> ArrayList<T> list(Enumeration<T> e) { - ArrayList<T> l = new ArrayList<>(); + ArrayList<T> l = new ArrayList<T>(); while (e.hasMoreElements()) l.add(e.nextElement()); return l; @@ -3868,7 +3869,7 @@ public class Collections { * @since 1.6 */ public static <E> Set<E> newSetFromMap(Map<E, Boolean> map) { - return new SetFromMap<>(map); + return new SetFromMap<E>(map); } /** @@ -3932,7 +3933,7 @@ public class Collections { * @since 1.6 */ public static <T> Queue<T> asLifoQueue(Deque<T> deque) { - return new AsLIFOQueue<>(deque); + return new AsLIFOQueue<T>(deque); } /** diff -up openjdk-boot/jdk/src/share/classes/java/util/EnumMap.java.sav openjdk-boot/jdk/src/share/classes/java/util/EnumMap.java --- openjdk-boot/jdk/src/share/classes/java/util/EnumMap.java.sav 2011-07-29 12:21:13.000000000 -0400 +++ openjdk-boot/jdk/src/share/classes/java/util/EnumMap.java 2011-07-29 14:27:07.783531305 -0400 @@ -500,7 +500,7 @@ public class EnumMap<K extends Enum<K>, int j = 0; for (int i = 0; i < vals.length; i++) if (vals[i] != null) - a[j++] = new AbstractMap.SimpleEntry<>( + a[j++] = new AbstractMap.SimpleEntry<K,V>( keyUniverse[i], unmaskNull(vals[i])); return a; } diff -up openjdk-boot/jdk/src/share/classes/java/util/EnumSet.java.sav openjdk-boot/jdk/src/share/classes/java/util/EnumSet.java --- openjdk-boot/jdk/src/share/classes/java/util/EnumSet.java.sav 2011-07-29 12:21:13.000000000 -0400 +++ openjdk-boot/jdk/src/share/classes/java/util/EnumSet.java 2011-07-29 14:27:07.783531305 -0400 @@ -110,9 +110,9 @@ public abstract class EnumSet<E extends throw new ClassCastException(elementType + " not an enum"); if (universe.length <= 64) - return new RegularEnumSet<>(elementType, universe); + return new RegularEnumSet<E>(elementType, universe); else - return new JumboEnumSet<>(elementType, universe); + return new JumboEnumSet<E>(elementType, universe); } /** @@ -431,7 +431,7 @@ public abstract class EnumSet<E extends } Object writeReplace() { - return new SerializationProxy<>(this); + return new SerializationProxy<E>(this); } // readObject method for the serialization proxy pattern diff -up openjdk-boot/jdk/src/share/classes/java/util/Formatter.java.sav openjdk-boot/jdk/src/share/classes/java/util/Formatter.java --- openjdk-boot/jdk/src/share/classes/java/util/Formatter.java.sav 2011-07-29 12:21:13.000000000 -0400 +++ openjdk-boot/jdk/src/share/classes/java/util/Formatter.java 2011-07-29 14:27:07.783531305 -0400 @@ -2511,7 +2511,7 @@ public final class Formatter implements * Finds format specifiers in the format string. */ private FormatString[] parse(String s) { - ArrayList<FormatString> al = new ArrayList<>(); + ArrayList<FormatString> al = new ArrayList<FormatString>(); Matcher m = fsPattern.matcher(s); for (int i = 0, len = s.length(); i < len; ) { if (m.find(i)) { diff -up openjdk-boot/jdk/src/share/classes/java/util/HashMap.java.sav openjdk-boot/jdk/src/share/classes/java/util/HashMap.java --- openjdk-boot/jdk/src/share/classes/java/util/HashMap.java.sav 2011-07-29 12:21:13.000000000 -0400 +++ openjdk-boot/jdk/src/share/classes/java/util/HashMap.java 2011-07-29 14:27:07.784531290 -0400 @@ -763,7 +763,7 @@ public class HashMap<K,V> */ void addEntry(int hash, K key, V value, int bucketIndex) { Entry<K,V> e = table[bucketIndex]; - table[bucketIndex] = new Entry<>(hash, key, value, e); + table[bucketIndex] = new Entry<K,V>(hash, key, value, e); if (size++ >= threshold) resize(2 * table.length); } @@ -778,7 +778,7 @@ public class HashMap<K,V> */ void createEntry(int hash, K key, V value, int bucketIndex) { Entry<K,V> e = table[bucketIndex]; - table[bucketIndex] = new Entry<>(hash, key, value, e); + table[bucketIndex] = new Entry<K,V>(hash, key, value, e); size++; } diff -up openjdk-boot/jdk/src/share/classes/java/util/HashSet.java.sav openjdk-boot/jdk/src/share/classes/java/util/HashSet.java --- openjdk-boot/jdk/src/share/classes/java/util/HashSet.java.sav 2011-07-29 12:21:13.000000000 -0400 +++ openjdk-boot/jdk/src/share/classes/java/util/HashSet.java 2011-07-29 14:27:07.784531290 -0400 @@ -100,7 +100,7 @@ public class HashSet<E> * default initial capacity (16) and load factor (0.75). */ public HashSet() { - map = new HashMap<>(); + map = new HashMap<E,Object>(); } /** @@ -113,7 +113,7 @@ public class HashSet<E> * @throws NullPointerException if the specified collection is null */ public HashSet(Collection<? extends E> c) { - map = new HashMap<>(Math.max((int) (c.size()/.75f) + 1, 16)); + map = new HashMap<E,Object>(Math.max((int) (c.size()/.75f) + 1, 16)); addAll(c); } @@ -127,7 +127,7 @@ public class HashSet<E> * than zero, or if the load factor is nonpositive */ public HashSet(int initialCapacity, float loadFactor) { - map = new HashMap<>(initialCapacity, loadFactor); + map = new HashMap<E,Object>(initialCapacity, loadFactor); } /** @@ -139,7 +139,7 @@ public class HashSet<E> * than zero */ public HashSet(int initialCapacity) { - map = new HashMap<>(initialCapacity); + map = new HashMap<E,Object>(initialCapacity); } /** @@ -156,7 +156,7 @@ public class HashSet<E> * than zero, or if the load factor is nonpositive */ HashSet(int initialCapacity, float loadFactor, boolean dummy) { - map = new LinkedHashMap<>(initialCapacity, loadFactor); + map = new LinkedHashMap<E,Object>(initialCapacity, loadFactor); } /** diff -up openjdk-boot/jdk/src/share/classes/java/util/Hashtable.java.sav openjdk-boot/jdk/src/share/classes/java/util/Hashtable.java --- openjdk-boot/jdk/src/share/classes/java/util/Hashtable.java.sav 2011-07-29 12:21:13.000000000 -0400 +++ openjdk-boot/jdk/src/share/classes/java/util/Hashtable.java 2011-07-29 14:27:07.784531290 -0400 @@ -455,7 +455,7 @@ public class Hashtable<K,V> // Creates the new entry. Entry<K,V> e = tab[index]; - tab[index] = new Entry<>(hash, key, value, e); + tab[index] = new Entry<K,V>(hash, key, value, e); count++; return null; } @@ -579,7 +579,7 @@ public class Hashtable<K,V> if (count == 0) { return Collections.emptyEnumeration(); } else { - return new Enumerator<>(type, false); + return new Enumerator<T>(type, false); } } @@ -587,7 +587,7 @@ public class Hashtable<K,V> if (count == 0) { return Collections.emptyIterator(); } else { - return new Enumerator<>(type, true); + return new Enumerator<T>(type, true); } } @@ -863,7 +863,7 @@ public class Hashtable<K,V> while (entry != null) { entryStack = - new Entry<>(0, entry.key, entry.value, entryStack); + new Entry<Object, Object>(0, entry.key, entry.value, entryStack); entry = entry.next; } } @@ -941,7 +941,7 @@ public class Hashtable<K,V> } // Creates the new entry. Entry<K,V> e = tab[index]; - tab[index] = new Entry<>(hash, key, value, e); + tab[index] = new Entry<K,V>(hash, key, value, e); count++; } @@ -962,7 +962,7 @@ public class Hashtable<K,V> } protected Object clone() { - return new Entry<>(hash, key, value, + return new Entry<K,V>(hash, key, value, (next==null ? null : (Entry<K,V>) next.clone())); } diff -up openjdk-boot/jdk/src/share/classes/java/util/IdentityHashMap.java.sav openjdk-boot/jdk/src/share/classes/java/util/IdentityHashMap.java --- openjdk-boot/jdk/src/share/classes/java/util/IdentityHashMap.java.sav 2011-07-29 12:21:13.000000000 -0400 +++ openjdk-boot/jdk/src/share/classes/java/util/IdentityHashMap.java 2011-07-29 14:27:07.784531290 -0400 @@ -1145,7 +1145,7 @@ public class IdentityHashMap<K,V> Object[] result = new Object[size]; Iterator<Map.Entry<K,V>> it = iterator(); for (int i = 0; i < size; i++) - result[i] = new AbstractMap.SimpleEntry<>(it.next()); + result[i] = new AbstractMap.SimpleEntry<K,V>(it.next()); return result; } @@ -1157,7 +1157,7 @@ public class IdentityHashMap<K,V> .newInstance(a.getClass().getComponentType(), size); Iterator<Map.Entry<K,V>> it = iterator(); for (int i = 0; i < size; i++) - a[i] = (T) new AbstractMap.SimpleEntry<>(it.next()); + a[i] = (T) new AbstractMap.SimpleEntry<K,V>(it.next()); if (a.length > size) a[size] = null; return a; diff -up openjdk-boot/jdk/src/share/classes/java/util/JumboEnumSet.java.sav openjdk-boot/jdk/src/share/classes/java/util/JumboEnumSet.java --- openjdk-boot/jdk/src/share/classes/java/util/JumboEnumSet.java.sav 2011-07-29 12:21:13.000000000 -0400 +++ openjdk-boot/jdk/src/share/classes/java/util/JumboEnumSet.java 2011-07-29 14:27:07.784531290 -0400 @@ -91,7 +91,7 @@ class JumboEnumSet<E extends Enum<E>> ex * @return an iterator over the elements contained in this set */ public Iterator<E> iterator() { - return new EnumSetIterator<>(); + return new EnumSetIterator<E>(); } private class EnumSetIterator<E extends Enum<E>> implements Iterator<E> { diff -up openjdk-boot/jdk/src/share/classes/java/util/LinkedHashMap.java.sav openjdk-boot/jdk/src/share/classes/java/util/LinkedHashMap.java --- openjdk-boot/jdk/src/share/classes/java/util/LinkedHashMap.java.sav 2011-07-29 12:21:13.000000000 -0400 +++ openjdk-boot/jdk/src/share/classes/java/util/LinkedHashMap.java 2011-07-29 14:27:07.784531290 -0400 @@ -237,7 +237,7 @@ public class LinkedHashMap<K,V> * the chain. */ void init() { - header = new Entry<>(-1, null, null, null); + header = new Entry<K,V>(-1, null, null, null); header.before = header.after = header; } @@ -438,7 +438,7 @@ public class LinkedHashMap<K,V> */ void createEntry(int hash, K key, V value, int bucketIndex) { HashMap.Entry<K,V> old = table[bucketIndex]; - Entry<K,V> e = new Entry<>(hash, key, value, old); + Entry<K,V> e = new Entry<K,V>(hash, key, value, old); table[bucketIndex] = e; e.addBefore(header); size++; diff -up openjdk-boot/jdk/src/share/classes/java/util/LinkedList.java.sav openjdk-boot/jdk/src/share/classes/java/util/LinkedList.java --- openjdk-boot/jdk/src/share/classes/java/util/LinkedList.java.sav 2011-07-29 12:21:13.000000000 -0400 +++ openjdk-boot/jdk/src/share/classes/java/util/LinkedList.java 2011-07-29 14:27:07.784531290 -0400 @@ -122,7 +122,7 @@ public class LinkedList<E> */ private void linkFirst(E e) { final Node<E> f = first; - final Node<E> newNode = new Node<>(null, e, f); + final Node<E> newNode = new Node<E>(null, e, f); first = newNode; if (f == null) last = newNode; @@ -137,7 +137,7 @@ public class LinkedList<E> */ void linkLast(E e) { final Node<E> l = last; - final Node<E> newNode = new Node<>(l, e, null); + final Node<E> newNode = new Node<E>(l, e, null); last = newNode; if (l == null) first = newNode; @@ -153,7 +153,7 @@ public class LinkedList<E> void linkBefore(E e, Node<E> succ) { // assert succ != null; final Node<E> pred = succ.prev; - final Node<E> newNode = new Node<>(pred, e, succ); + final Node<E> newNode = new Node<E>(pred, e, succ); succ.prev = newNode; if (pred == null) first = newNode; @@ -419,7 +419,7 @@ public class LinkedList<E> for (Object o : a) { @SuppressWarnings("unchecked") E e = (E) o; - Node<E> newNode = new Node<>(pred, e, null); + Node<E> newNode = new Node<E>(pred, e, null); if (pred == null) first = newNode; else diff -up openjdk-boot/jdk/src/share/classes/java/util/ListResourceBundle.java.sav openjdk-boot/jdk/src/share/classes/java/util/ListResourceBundle.java --- openjdk-boot/jdk/src/share/classes/java/util/ListResourceBundle.java.sav 2011-07-29 12:21:13.000000000 -0400 +++ openjdk-boot/jdk/src/share/classes/java/util/ListResourceBundle.java 2011-07-29 14:27:07.784531290 -0400 @@ -187,7 +187,7 @@ public abstract class ListResourceBundle return; Object[][] contents = getContents(); - HashMap<String,Object> temp = new HashMap<>(contents.length); + HashMap<String,Object> temp = new HashMap<String,Object>(contents.length); for (int i = 0; i < contents.length; ++i) { // key must be non-null String, value must be non-null String key = (String) contents[i][0]; diff -up openjdk-boot/jdk/src/share/classes/java/util/Locale.java.sav openjdk-boot/jdk/src/share/classes/java/util/Locale.java --- openjdk-boot/jdk/src/share/classes/java/util/Locale.java.sav 2011-07-29 12:21:13.000000000 -0400 +++ openjdk-boot/jdk/src/share/classes/java/util/Locale.java 2011-07-29 14:27:07.785531275 -0400 @@ -1793,7 +1793,7 @@ public final class Locale implements Clo return formatList(variantNames, listPattern, listCompositionPattern); } } - ArrayList<String> names = new ArrayList<>(4); + ArrayList<String> names = new ArrayList<String>(4); if (languageName.length() != 0) { names.add(languageName); } diff -up openjdk-boot/jdk/src/share/classes/java/util/logging/FileHandler.java.sav openjdk-boot/jdk/src/share/classes/java/util/logging/FileHandler.java --- openjdk-boot/jdk/src/share/classes/java/util/logging/FileHandler.java.sav 2011-07-29 12:21:14.000000000 -0400 +++ openjdk-boot/jdk/src/share/classes/java/util/logging/FileHandler.java 2011-07-29 14:27:07.785531275 -0400 @@ -127,7 +127,7 @@ public class FileHandler extends StreamH private FileOutputStream lockStream; private File files[]; private static final int MAX_LOCKS = 100; - private static java.util.HashMap<String, String> locks = new java.util.HashMap<>(); + private static java.util.HashMap<String, String> locks = new java.util.HashMap<String, String>(); // A metered stream is a subclass of OutputStream that // (a) forwards all its output to a target stream diff -up openjdk-boot/jdk/src/share/classes/java/util/logging/Level.java.sav openjdk-boot/jdk/src/share/classes/java/util/logging/Level.java --- openjdk-boot/jdk/src/share/classes/java/util/logging/Level.java.sav 2011-07-29 12:21:14.000000000 -0400 +++ openjdk-boot/jdk/src/share/classes/java/util/logging/Level.java 2011-07-29 14:27:07.785531275 -0400 @@ -59,7 +59,7 @@ import java.util.ResourceBundle; */ public class Level implements java.io.Serializable { - private static java.util.ArrayList<Level> known = new java.util.ArrayList<>(); + private static java.util.ArrayList<Level> known = new java.util.ArrayList<Level>(); private static String defaultBundle = "sun.util.logging.resources.logging"; /** diff -up openjdk-boot/jdk/src/share/classes/java/util/logging/Logger.java.sav openjdk-boot/jdk/src/share/classes/java/util/logging/Logger.java --- openjdk-boot/jdk/src/share/classes/java/util/logging/Logger.java.sav 2011-07-29 12:21:14.000000000 -0400 +++ openjdk-boot/jdk/src/share/classes/java/util/logging/Logger.java 2011-07-29 14:27:07.785531275 -0400 @@ -170,7 +170,7 @@ public class Logger { private LogManager manager; private String name; private final CopyOnWriteArrayList<Handler> handlers = - new CopyOnWriteArrayList<>(); + new CopyOnWriteArrayList<Handler>(); private String resourceBundleName; private volatile boolean useParentHandlers = true; private volatile Filter filter; @@ -1439,7 +1439,7 @@ public class Logger { // Set our new parent. parent = newParent; if (parent.kids == null) { - parent.kids = new ArrayList<>(2); + parent.kids = new ArrayList<LogManager.LoggerWeakRef>(2); } if (ref == null) { // we didn't have a previous parent diff -up openjdk-boot/jdk/src/share/classes/java/util/logging/Logging.java.sav openjdk-boot/jdk/src/share/classes/java/util/logging/Logging.java --- openjdk-boot/jdk/src/share/classes/java/util/logging/Logging.java.sav 2011-07-29 12:21:14.000000000 -0400 +++ openjdk-boot/jdk/src/share/classes/java/util/logging/Logging.java 2011-07-29 14:27:07.785531275 -0400 @@ -56,7 +56,7 @@ class Logging implements LoggingMXBean { public List<String> getLoggerNames() { Enumeration loggers = logManager.getLoggerNames(); - ArrayList<String> array = new ArrayList<>(); + ArrayList<String> array = new ArrayList<String>(); for (; loggers.hasMoreElements();) { array.add((String) loggers.nextElement()); diff -up openjdk-boot/jdk/src/share/classes/java/util/logging/LogManager.java.sav openjdk-boot/jdk/src/share/classes/java/util/logging/LogManager.java --- openjdk-boot/jdk/src/share/classes/java/util/logging/LogManager.java.sav 2011-07-29 12:21:14.000000000 -0400 +++ openjdk-boot/jdk/src/share/classes/java/util/logging/LogManager.java 2011-07-29 14:27:07.785531275 -0400 @@ -156,7 +156,8 @@ public class LogManager { private final static Level defaultLevel = Level.INFO; // Table of named Loggers that maps names to Loggers. - private Hashtable<String,LoggerWeakRef> namedLoggers = new Hashtable<>(); + private Hashtable<String,LoggerWeakRef> namedLoggers = + new Hashtable<String,LoggerWeakRef>(); // Tree of named Loggers private LogNode root = new LogNode(null); private Logger rootLogger; @@ -444,7 +445,7 @@ public class LogManager { // loggerRefQueue holds LoggerWeakRef objects for Logger objects // that have been GC'ed. private final ReferenceQueue<Logger> loggerRefQueue - = new ReferenceQueue<>(); + = new ReferenceQueue<Logger>(); // Package-level inner class. // Helper class for managing WeakReferences to Logger objects. @@ -694,7 +695,7 @@ public class LogManager { name = ""; } if (node.children == null) { - node.children = new HashMap<>(); + node.children = new HashMap<String,LogNode>(); } LogNode child = node.children.get(head); if (child == null) { @@ -878,7 +879,7 @@ public class LogManager { } hands = hands.trim(); int ix = 0; - Vector<String> result = new Vector<>(); + Vector<String> result = new Vector<String>(); while (ix < hands.length()) { int end = ix; while (end < hands.length()) { diff -up openjdk-boot/jdk/src/share/classes/java/util/logging/LogRecord.java.sav openjdk-boot/jdk/src/share/classes/java/util/logging/LogRecord.java --- openjdk-boot/jdk/src/share/classes/java/util/logging/LogRecord.java.sav 2011-07-29 12:21:14.000000000 -0400 +++ openjdk-boot/jdk/src/share/classes/java/util/logging/LogRecord.java 2011-07-29 14:27:07.786531260 -0400 @@ -85,7 +85,8 @@ public class LogRecord implements java.i private static final AtomicInteger nextThreadId = new AtomicInteger(MIN_SEQUENTIAL_THREAD_ID); - private static final ThreadLocal<Integer> threadIds = new ThreadLocal<>(); + private static final ThreadLocal<Integer> threadIds + = new ThreadLocal<Integer>(); /** * @serial Logging message level diff -up openjdk-boot/jdk/src/share/classes/java/util/prefs/AbstractPreferences.java.sav openjdk-boot/jdk/src/share/classes/java/util/prefs/AbstractPreferences.java --- openjdk-boot/jdk/src/share/classes/java/util/prefs/AbstractPreferences.java.sav 2011-07-29 12:21:14.000000000 -0400 +++ openjdk-boot/jdk/src/share/classes/java/util/prefs/AbstractPreferences.java 2011-07-29 14:27:07.786531260 -0400 @@ -155,7 +155,8 @@ public abstract class AbstractPreference * All known unremoved children of this node. (This "cache" is consulted * prior to calling childSpi() or getChild(). */ - private Map<String, AbstractPreferences> kidCache = new HashMap<>(); + private Map<String, AbstractPreferences> kidCache + = new HashMap<String, AbstractPreferences>(); /** * This field is used to keep track of whether or not this node has @@ -712,7 +713,7 @@ public abstract class AbstractPreference if (removed) throw new IllegalStateException("Node has been removed."); - Set<String> s = new TreeSet<>(kidCache.keySet()); + Set<String> s = new TreeSet<String>(kidCache.keySet()); for (String kid : childrenNamesSpi()) s.add(kid); return s.toArray(EMPTY_STRING_ARRAY); @@ -1441,7 +1442,8 @@ public abstract class AbstractPreference * event delivery from preference activity, greatly simplifying * locking and reducing opportunity for deadlock. */ - private static final List<EventObject> eventQueue = new LinkedList<>(); + private static final List<EventObject> eventQueue + = new LinkedList<EventObject>(); /** * These two classes are used to distinguish NodeChangeEvents on diff -up openjdk-boot/jdk/src/share/classes/java/util/PriorityQueue.java.sav openjdk-boot/jdk/src/share/classes/java/util/PriorityQueue.java --- openjdk-boot/jdk/src/share/classes/java/util/PriorityQueue.java.sav 2011-07-29 12:21:13.000000000 -0400 +++ openjdk-boot/jdk/src/share/classes/java/util/PriorityQueue.java 2011-07-29 14:27:07.786531260 -0400 @@ -538,7 +538,7 @@ public class PriorityQueue<E> extends Ab cursor--; else { if (forgetMeNot == null) - forgetMeNot = new ArrayDeque<>(); + forgetMeNot = new ArrayDeque<E>(); forgetMeNot.add(moved); } } else if (lastRetElt != null) { diff -up openjdk-boot/jdk/src/share/classes/java/util/Properties.java.sav openjdk-boot/jdk/src/share/classes/java/util/Properties.java --- openjdk-boot/jdk/src/share/classes/java/util/Properties.java.sav 2011-07-29 12:21:13.000000000 -0400 +++ openjdk-boot/jdk/src/share/classes/java/util/Properties.java 2011-07-29 14:27:07.786531260 -0400 @@ -1010,7 +1010,7 @@ class Properties extends Hashtable<Objec * @since 1.6 */ public Set<String> stringPropertyNames() { - Hashtable<String, String> h = new Hashtable<>(); + Hashtable<String, String> h = new Hashtable<String, String>(); enumerateStringProperties(h); return h.keySet(); } diff -up openjdk-boot/jdk/src/share/classes/java/util/regex/Pattern.java.sav openjdk-boot/jdk/src/share/classes/java/util/regex/Pattern.java --- openjdk-boot/jdk/src/share/classes/java/util/regex/Pattern.java.sav 2011-07-29 12:21:14.000000000 -0400 +++ openjdk-boot/jdk/src/share/classes/java/util/regex/Pattern.java 2011-07-29 14:27:07.787531246 -0400 @@ -1193,7 +1193,7 @@ public final class Pattern public String[] split(CharSequence input, int limit) { int index = 0; boolean matchLimited = limit > 0; - ArrayList<String> matchList = new ArrayList<>(); + ArrayList<String> matchList = new ArrayList<String>(); Matcher m = matcher(input); // Add segments before each match found @@ -1695,7 +1695,7 @@ loop: for(int x=0, offset=0; x<nCodePo Map<String, Integer> namedGroups() { if (namedGroups == null) - namedGroups = new HashMap<>(2); + namedGroups = new HashMap<String, Integer>(2); return namedGroups; } @@ -5495,7 +5495,7 @@ NEXT: while (i <= last) { } private static final HashMap<String, CharPropertyFactory> map - = new HashMap<>(); + = new HashMap<String, CharPropertyFactory>(); static { // Unicode character property aliases, defined in diff -up openjdk-boot/jdk/src/share/classes/java/util/regex/UnicodeProp.java.sav openjdk-boot/jdk/src/share/classes/java/util/regex/UnicodeProp.java --- openjdk-boot/jdk/src/share/classes/java/util/regex/UnicodeProp.java.sav 2011-07-29 12:21:14.000000000 -0400 +++ openjdk-boot/jdk/src/share/classes/java/util/regex/UnicodeProp.java 2011-07-29 14:27:07.787531246 -0400 @@ -193,8 +193,8 @@ enum UnicodeProp { } }; - private final static HashMap<String, String> posix = new HashMap<>(); - private final static HashMap<String, String> aliases = new HashMap<>(); + private final static HashMap<String, String> posix = new HashMap<String,String>(); + private final static HashMap<String, String> aliases = new HashMap<String,String>(); static { posix.put("ALPHA", "ALPHABETIC"); posix.put("LOWER", "LOWERCASE"); diff -up openjdk-boot/jdk/src/share/classes/java/util/RegularEnumSet.java.sav openjdk-boot/jdk/src/share/classes/java/util/RegularEnumSet.java --- openjdk-boot/jdk/src/share/classes/java/util/RegularEnumSet.java.sav 2011-07-29 12:21:13.000000000 -0400 +++ openjdk-boot/jdk/src/share/classes/java/util/RegularEnumSet.java 2011-07-29 14:27:07.787531246 -0400 @@ -72,7 +72,7 @@ class RegularEnumSet<E extends Enum<E>> * @return an iterator over the elements contained in this set */ public Iterator<E> iterator() { - return new EnumSetIterator<>(); + return new EnumSetIterator<E>(); } private class EnumSetIterator<E extends Enum<E>> implements Iterator<E> { diff -up openjdk-boot/jdk/src/share/classes/java/util/ResourceBundle.java.sav openjdk-boot/jdk/src/share/classes/java/util/ResourceBundle.java --- openjdk-boot/jdk/src/share/classes/java/util/ResourceBundle.java.sav 2011-07-29 12:21:13.000000000 -0400 +++ openjdk-boot/jdk/src/share/classes/java/util/ResourceBundle.java 2011-07-29 14:27:07.787531246 -0400 @@ -289,7 +289,7 @@ public abstract class ResourceBundle { * name for compatibility with some workarounds for bug 4212439. */ private static final ConcurrentMap<CacheKey, BundleReference> cacheList - = new ConcurrentHashMap<>(INITIAL_CACHE_SIZE); + = new ConcurrentHashMap<CacheKey,BundleReference>(INITIAL_CACHE_SIZE); /** * Queue for reference objects referring to class loaders or bundles. @@ -1754,7 +1754,7 @@ public abstract class ResourceBundle { * @since 1.6 */ public Set<String> keySet() { - Set<String> keys = new HashSet<>(); + Set<String> keys = new HashSet<String>(); for (ResourceBundle rb = this; rb != null; rb = rb.parent) { keys.addAll(rb.handleKeySet()); } @@ -1782,7 +1782,7 @@ public abstract class ResourceBundle { if (keySet == null) { synchronized (this) { if (keySet == null) { - Set<String> keys = new HashSet<>(); + Set<String> keys = new HashSet<String>(); Enumeration<String> enumKeys = getKeys(); while (enumKeys.hasMoreElements()) { String key = enumKeys.nextElement(); @@ -2300,7 +2300,7 @@ public abstract class ResourceBundle { if (baseName == null) { throw new NullPointerException(); } - return new ArrayList<>(CANDIDATES_CACHE.get(locale.getBaseLocale())); + return new ArrayList<Locale>(CANDIDATES_CACHE.get(locale.getBaseLocale())); } private static final CandidateListCache CANDIDATES_CACHE = new CandidateListCache(); @@ -2326,7 +2326,7 @@ public abstract class ResourceBundle { if (language.equals("nb") || isNorwegianBokmal) { List<Locale> tmpList = getDefaultList("nb", script, region, variant); // Insert a locale replacing "nb" with "no" for every list entry - List<Locale> bokmalList = new LinkedList<>(); + List<Locale> bokmalList = new LinkedList<Locale>(); for (Locale l : tmpList) { bokmalList.add(l); if (l.getLanguage().length() == 0) { @@ -2373,7 +2373,7 @@ public abstract class ResourceBundle { List<String> variants = null; if (variant.length() > 0) { - variants = new LinkedList<>(); + variants = new LinkedList<String>(); int idx = variant.length(); while (idx != -1) { variants.add(variant.substring(0, idx)); @@ -2381,7 +2381,7 @@ public abstract class ResourceBundle { } } - List<Locale> list = new LinkedList<>(); + List<Locale> list = new LinkedList<Locale>(); if (variants != null) { for (String v : variants) { diff -up openjdk-boot/jdk/src/share/classes/java/util/ServiceLoader.java.sav openjdk-boot/jdk/src/share/classes/java/util/ServiceLoader.java --- openjdk-boot/jdk/src/share/classes/java/util/ServiceLoader.java.sav 2011-07-29 12:21:14.000000000 -0400 +++ openjdk-boot/jdk/src/share/classes/java/util/ServiceLoader.java 2011-07-29 14:27:07.787531246 -0400 @@ -191,7 +191,7 @@ public final class ServiceLoader<S> private ClassLoader loader; // Cached providers, in instantiation order - private LinkedHashMap<String,S> providers = new LinkedHashMap<>(); + private LinkedHashMap<String,S> providers = new LinkedHashMap<String,S>(); // The current lazy-lookup iterator private LazyIterator lookupIterator; @@ -291,7 +291,7 @@ public final class ServiceLoader<S> { InputStream in = null; BufferedReader r = null; - ArrayList<String> names = new ArrayList<>(); + ArrayList<String> names = new ArrayList<String>(); try { in = u.openStream(); r = new BufferedReader(new InputStreamReader(in, "utf-8")); @@ -463,7 +463,7 @@ public final class ServiceLoader<S> public static <S> ServiceLoader<S> load(Class<S> service, ClassLoader loader) { - return new ServiceLoader<>(service, loader); + return new ServiceLoader<S>(service, loader); } /** diff -up openjdk-boot/jdk/src/share/classes/java/util/TimSort.java.sav openjdk-boot/jdk/src/share/classes/java/util/TimSort.java --- openjdk-boot/jdk/src/share/classes/java/util/TimSort.java.sav 2011-07-29 12:21:14.000000000 -0400 +++ openjdk-boot/jdk/src/share/classes/java/util/TimSort.java 2011-07-29 14:27:07.787531246 -0400 @@ -196,7 +196,7 @@ class TimSort<T> { * extending short natural runs to minRun elements, and merging runs * to maintain stack invariant. */ - TimSort<T> ts = new TimSort<>(a, c); + TimSort<T> ts = new TimSort<T>(a, c); int minRun = minRunLength(nRemaining); do { // Identify next run diff -up openjdk-boot/jdk/src/share/classes/java/util/TreeMap.java.sav openjdk-boot/jdk/src/share/classes/java/util/TreeMap.java --- openjdk-boot/jdk/src/share/classes/java/util/TreeMap.java.sav 2011-07-29 12:21:14.000000000 -0400 +++ openjdk-boot/jdk/src/share/classes/java/util/TreeMap.java 2011-07-29 14:27:07.788531232 -0400 @@ -530,7 +530,7 @@ public class TreeMap<K,V> if (t == null) { compare(key, key); // type (and possibly null) check - root = new Entry<>(key, value, null); + root = new Entry<K,V>(key, value, null); size = 1; modCount++; return null; @@ -566,7 +566,7 @@ public class TreeMap<K,V> return t.setValue(value); } while (t != null); } - Entry<K,V> e = new Entry<>(key, value, parent); + Entry<K,V> e = new Entry<K,V>(key, value, parent); if (cmp < 0) parent.left = e; else @@ -1066,14 +1066,14 @@ public class TreeMap<K,V> } public NavigableSet<E> subSet(E fromElement, boolean fromInclusive, E toElement, boolean toInclusive) { - return new KeySet<>(m.subMap(fromElement, fromInclusive, + return new KeySet<E>(m.subMap(fromElement, fromInclusive, toElement, toInclusive)); } public NavigableSet<E> headSet(E toElement, boolean inclusive) { - return new KeySet<>(m.headMap(toElement, inclusive)); + return new KeySet<E>(m.headMap(toElement, inclusive)); } public NavigableSet<E> tailSet(E fromElement, boolean inclusive) { - return new KeySet<>(m.tailMap(fromElement, inclusive)); + return new KeySet<E>(m.tailMap(fromElement, inclusive)); } public SortedSet<E> subSet(E fromElement, E toElement) { return subSet(fromElement, true, toElement, false); @@ -1202,7 +1202,7 @@ public class TreeMap<K,V> */ static <K,V> Map.Entry<K,V> exportEntry(TreeMap.Entry<K,V> e) { return (e == null) ? null : - new AbstractMap.SimpleImmutableEntry<>(e); + new AbstractMap.SimpleImmutableEntry<K,V>(e); } /** @@ -2403,7 +2403,7 @@ public class TreeMap<K,V> value = (defaultVal != null ? defaultVal : (V) str.readObject()); } - Entry<K,V> middle = new Entry<>(key, value, null); + Entry<K,V> middle = new Entry<K,V>(key, value, null); // color nodes in non-full bottommost level red if (level == redLevel) diff -up openjdk-boot/jdk/src/share/classes/java/util/TreeSet.java.sav openjdk-boot/jdk/src/share/classes/java/util/TreeSet.java --- openjdk-boot/jdk/src/share/classes/java/util/TreeSet.java.sav 2011-07-29 12:21:14.000000000 -0400 +++ openjdk-boot/jdk/src/share/classes/java/util/TreeSet.java 2011-07-29 14:27:07.788531232 -0400 @@ -138,7 +138,7 @@ public class TreeSet<E> extends Abstract * ordering} of the elements will be used. */ public TreeSet(Comparator<? super E> comparator) { - this(new TreeMap<>(comparator)); + this(new TreeMap<E,Object>(comparator)); } /** @@ -195,7 +195,7 @@ public class TreeSet<E> extends Abstract * @since 1.6 */ public NavigableSet<E> descendingSet() { - return new TreeSet<>(m.descendingMap()); + return new TreeSet<E>(m.descendingMap()); } /** @@ -322,7 +322,7 @@ public class TreeSet<E> extends Abstract */ public NavigableSet<E> subSet(E fromElement, boolean fromInclusive, E toElement, boolean toInclusive) { - return new TreeSet<>(m.subMap(fromElement, fromInclusive, + return new TreeSet<E>(m.subMap(fromElement, fromInclusive, toElement, toInclusive)); } @@ -335,7 +335,7 @@ public class TreeSet<E> extends Abstract * @since 1.6 */ public NavigableSet<E> headSet(E toElement, boolean inclusive) { - return new TreeSet<>(m.headMap(toElement, inclusive)); + return new TreeSet<E>(m.headMap(toElement, inclusive)); } /** @@ -347,7 +347,7 @@ public class TreeSet<E> extends Abstract * @since 1.6 */ public NavigableSet<E> tailSet(E fromElement, boolean inclusive) { - return new TreeSet<>(m.tailMap(fromElement, inclusive)); + return new TreeSet<E>(m.tailMap(fromElement, inclusive)); } /** @@ -477,7 +477,7 @@ public class TreeSet<E> extends Abstract throw new InternalError(); } - clone.m = new TreeMap<>(m); + clone.m = new TreeMap<E,Object>(m); return clone; } @@ -524,9 +524,9 @@ public class TreeSet<E> extends Abstract // Create backing TreeMap TreeMap<E,Object> tm; if (c==null) - tm = new TreeMap<>(); + tm = new TreeMap<E,Object>(); else - tm = new TreeMap<>(c); + tm = new TreeMap<E,Object>(c); m = tm; // Read in size diff -up openjdk-boot/jdk/src/share/classes/java/util/WeakHashMap.java.sav openjdk-boot/jdk/src/share/classes/java/util/WeakHashMap.java --- openjdk-boot/jdk/src/share/classes/java/util/WeakHashMap.java.sav 2011-07-29 12:21:14.000000000 -0400 +++ openjdk-boot/jdk/src/share/classes/java/util/WeakHashMap.java 2011-07-29 14:27:07.788531232 -0400 @@ -171,7 +171,7 @@ public class WeakHashMap<K,V> /** * Reference queue for cleared WeakEntries */ - private final ReferenceQueue<Object> queue = new ReferenceQueue<>(); + private final ReferenceQueue<Object> queue = new ReferenceQueue<Object>(); /** * The number of times this WeakHashMap has been structurally modified. @@ -439,7 +439,7 @@ public class WeakHashMap<K,V> modCount++; Entry<K,V> e = tab[i]; - tab[i] = new Entry<>(k, value, queue, h, e); + tab[i] = new Entry<K,V>(k, value, queue, h, e); if (++size >= threshold) resize(tab.length * 2); return null; @@ -955,9 +955,10 @@ public class WeakHashMap<K,V> } private List<Map.Entry<K,V>> deepCopy() { - List<Map.Entry<K,V>> list = new ArrayList<>(size()); + List<Map.Entry<K,V>> list = + new ArrayList<Map.Entry<K,V>>(size()); for (Map.Entry<K,V> e : this) - list.add(new AbstractMap.SimpleEntry<>(e)); + list.add(new AbstractMap.SimpleEntry<K,V>(e)); return list; } diff -up openjdk-boot/jdk/src/share/classes/java/util/zip/ZipFile.java.sav openjdk-boot/jdk/src/share/classes/java/util/zip/ZipFile.java --- openjdk-boot/jdk/src/share/classes/java/util/zip/ZipFile.java.sav 2011-07-29 12:21:14.000000000 -0400 +++ openjdk-boot/jdk/src/share/classes/java/util/zip/ZipFile.java 2011-07-29 14:27:07.788531232 -0400 @@ -319,7 +319,7 @@ class ZipFile implements ZipConstants, C // the outstanding inputstreams that need to be closed, // mapped to the inflater objects they use. - private final Map<InputStream, Inflater> streams = new WeakHashMap<>(); + private final Map<InputStream, Inflater> streams = new WeakHashMap<InputStream,Inflater>(); /** * Returns an input stream for reading the contents of the specified @@ -461,7 +461,7 @@ class ZipFile implements ZipConstants, C } // List of available Inflater objects for decompression - private Deque<Inflater> inflaterCache = new ArrayDeque<>(); + private Deque<Inflater> inflaterCache = new ArrayDeque<Inflater>(); /** * Returns the path name of the ZIP file. @@ -577,7 +577,7 @@ class ZipFile implements ZipConstants, C // Close streams, release their inflaters synchronized (streams) { if (false == streams.isEmpty()) { - Map<InputStream, Inflater> copy = new HashMap<>(streams); + Map<InputStream, Inflater> copy = new HashMap<InputStream,Inflater>(streams); streams.clear(); for (Map.Entry<InputStream, Inflater> e : copy.entrySet()) { e.getKey().close(); diff -up openjdk-boot/jdk/src/share/classes/java/util/zip/ZipOutputStream.java.sav openjdk-boot/jdk/src/share/classes/java/util/zip/ZipOutputStream.java --- openjdk-boot/jdk/src/share/classes/java/util/zip/ZipOutputStream.java.sav 2011-07-29 12:21:14.000000000 -0400 +++ openjdk-boot/jdk/src/share/classes/java/util/zip/ZipOutputStream.java 2011-07-29 14:27:07.788531232 -0400 @@ -53,8 +53,8 @@ class ZipOutputStream extends DeflaterOu } private XEntry current; - private Vector<XEntry> xentries = new Vector<>(); - private HashSet<String> names = new HashSet<>(); + private Vector<XEntry> xentries = new Vector<XEntry>(); + private HashSet<String> names = new HashSet<String>(); private CRC32 crc = new CRC32(); private long written = 0; private long locoff = 0; diff -up openjdk-boot/jdk/src/share/classes/javax/security/auth/kerberos/DelegationPermission.java.sav openjdk-boot/jdk/src/share/classes/javax/security/auth/kerberos/DelegationPermission.java --- openjdk-boot/jdk/src/share/classes/javax/security/auth/kerberos/DelegationPermission.java.sav 2011-07-29 12:21:17.000000000 -0400 +++ openjdk-boot/jdk/src/share/classes/javax/security/auth/kerberos/DelegationPermission.java 2011-07-29 14:27:07.788531232 -0400 @@ -361,7 +361,7 @@ final class KrbDelegationPermissionColle // Don't call out.defaultWriteObject() // Write out Vector - Vector<Permission> permissions = new Vector<>(perms.size()); + Vector<Permission> permissions = new Vector<Permission>(perms.size()); synchronized (this) { permissions.addAll(perms); diff -up openjdk-boot/jdk/src/share/classes/javax/security/auth/kerberos/ServicePermission.java.sav openjdk-boot/jdk/src/share/classes/javax/security/auth/kerberos/ServicePermission.java --- openjdk-boot/jdk/src/share/classes/javax/security/auth/kerberos/ServicePermission.java.sav 2011-07-29 12:21:17.000000000 -0400 +++ openjdk-boot/jdk/src/share/classes/javax/security/auth/kerberos/ServicePermission.java 2011-07-29 14:27:07.788531232 -0400 @@ -569,7 +569,7 @@ final class KrbServicePermissionCollecti // Don't call out.defaultWriteObject() // Write out Vector - Vector<Permission> permissions = new Vector<>(perms.size()); + Vector<Permission> permissions = new Vector<Permission>(perms.size()); synchronized (this) { permissions.addAll(perms); diff -up openjdk-boot/jdk/src/share/classes/javax/security/auth/PrivateCredentialPermission.java.sav openjdk-boot/jdk/src/share/classes/javax/security/auth/PrivateCredentialPermission.java --- openjdk-boot/jdk/src/share/classes/javax/security/auth/PrivateCredentialPermission.java.sav 2011-07-29 12:21:17.000000000 -0400 +++ openjdk-boot/jdk/src/share/classes/javax/security/auth/PrivateCredentialPermission.java 2011-07-29 14:27:07.789531217 -0400 @@ -329,7 +329,7 @@ public final class PrivateCredentialPerm throw new IllegalArgumentException("invalid empty name"); } - ArrayList<CredOwner> pList = new ArrayList<>(); + ArrayList<CredOwner> pList = new ArrayList<CredOwner>(); StringTokenizer tokenizer = new StringTokenizer(name, " ", true); String principalClass = null; String principalName = null; diff -up openjdk-boot/jdk/src/share/classes/javax/security/auth/SubjectDomainCombiner.java.sav openjdk-boot/jdk/src/share/classes/javax/security/auth/SubjectDomainCombiner.java --- openjdk-boot/jdk/src/share/classes/javax/security/auth/SubjectDomainCombiner.java.sav 2011-07-29 12:21:17.000000000 -0400 +++ openjdk-boot/jdk/src/share/classes/javax/security/auth/SubjectDomainCombiner.java 2011-07-29 14:27:07.789531217 -0400 @@ -48,7 +48,7 @@ public class SubjectDomainCombiner imple private Subject subject; private WeakKeyValueMap<ProtectionDomain, ProtectionDomain> cachedPDs = - new WeakKeyValueMap<>(); + new WeakKeyValueMap<ProtectionDomain, ProtectionDomain>(); private Set<Principal> principalSet; private Principal[] principals; diff -up openjdk-boot/jdk/src/share/classes/sun/invoke/util/ValueConversions.java.sav openjdk-boot/jdk/src/share/classes/sun/invoke/util/ValueConversions.java --- openjdk-boot/jdk/src/share/classes/sun/invoke/util/ValueConversions.java.sav 2011-07-29 12:21:23.000000000 -0400 +++ openjdk-boot/jdk/src/share/classes/sun/invoke/util/ValueConversions.java 2011-07-29 14:27:07.789531217 -0400 @@ -59,7 +59,7 @@ public class ValueConversions { EnumMap<Wrapper, MethodHandle>[] caches = (EnumMap<Wrapper, MethodHandle>[]) new EnumMap[n]; // unchecked warning expected here for (int i = 0; i < n; i++) - caches[i] = new EnumMap<>(Wrapper.class); + caches[i] = new EnumMap<Wrapper, MethodHandle>(Wrapper.class); return caches; } @@ -1009,7 +1009,7 @@ public class ValueConversions { Object a8, Object a9) { return makeArray(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9); } private static MethodHandle[] makeArrays() { - ArrayList<MethodHandle> mhs = new ArrayList<>(); + ArrayList<MethodHandle> mhs = new ArrayList<MethodHandle>(); for (;;) { MethodHandle mh = findCollector("array", mhs.size(), Object[].class); if (mh == null) break; @@ -1055,7 +1055,7 @@ public class ValueConversions { Object a8, Object a9) { fillWithArguments(a, pos, a0, a1, a2, a3, a4, a5, a6, a7, a8, a9); return a; } private static MethodHandle[] makeFillArrays() { - ArrayList<MethodHandle> mhs = new ArrayList<>(); + ArrayList<MethodHandle> mhs = new ArrayList<MethodHandle>(); mhs.add(null); // there is no empty fill; at least a0 is required for (;;) { MethodHandle mh = findCollector("fillArray", mhs.size(), Object[].class, Object[].class, Integer.class); @@ -1210,7 +1210,7 @@ public class ValueConversions { Object a8, Object a9) { return makeList(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9); } private static MethodHandle[] makeLists() { - ArrayList<MethodHandle> mhs = new ArrayList<>(); + ArrayList<MethodHandle> mhs = new ArrayList<MethodHandle>(); for (;;) { MethodHandle mh = findCollector("list", mhs.size(), List.class); if (mh == null) break; diff -up openjdk-boot/jdk/src/share/classes/sun/io/CharacterEncoding.java.sav openjdk-boot/jdk/src/share/classes/sun/io/CharacterEncoding.java --- openjdk-boot/jdk/src/share/classes/sun/io/CharacterEncoding.java.sav 2011-07-29 12:21:23.000000000 -0400 +++ openjdk-boot/jdk/src/share/classes/sun/io/CharacterEncoding.java 2011-07-29 14:27:07.789531217 -0400 @@ -54,7 +54,7 @@ public class CharacterEncoding { private static volatile boolean installedAll; static { - aliasTable = new HashMap<>(460, 1.0f); /* MDA */ + aliasTable = new HashMap<String,String>(460, 1.0f); /* MDA */ aliasTable.put("us-ascii", "ASCII"); aliasTable.put("ascii", "ASCII"); diff -up openjdk-boot/jdk/src/share/classes/sun/io/Converters.java.sav openjdk-boot/jdk/src/share/classes/sun/io/Converters.java --- openjdk-boot/jdk/src/share/classes/sun/io/Converters.java.sav 2011-07-29 12:21:23.000000000 -0400 +++ openjdk-boot/jdk/src/share/classes/sun/io/Converters.java 2011-07-29 14:27:07.789531217 -0400 @@ -120,7 +120,7 @@ public class Converters { private static Class<?> cache(int type, Object encoding, Class<?> c) { SoftReference<Object[]>[] srs = classCache[type]; - srs[CACHE_SIZE - 1] = new SoftReference<>(new Object[] { c, encoding }); + srs[CACHE_SIZE - 1] = new SoftReference<Object[]>(new Object[] { c, encoding }); moveToFront(srs, CACHE_SIZE - 1); return c; } diff -up openjdk-boot/jdk/src/share/classes/sun/launcher/LauncherHelper.java.sav openjdk-boot/jdk/src/share/classes/sun/launcher/LauncherHelper.java --- openjdk-boot/jdk/src/share/classes/sun/launcher/LauncherHelper.java.sav 2011-07-29 12:21:24.000000000 -0400 +++ openjdk-boot/jdk/src/share/classes/sun/launcher/LauncherHelper.java 2011-07-29 14:27:07.789531217 -0400 @@ -173,7 +173,7 @@ public enum LauncherHelper { private static void printProperties(PrintStream ostream) { Properties p = System.getProperties(); ostream.println(PROP_SETTINGS); - List<String> sortedPropertyKeys = new ArrayList<>(); + List<String> sortedPropertyKeys = new ArrayList<String>(); sortedPropertyKeys.addAll(p.stringPropertyNames()); Collections.sort(sortedPropertyKeys); for (String x : sortedPropertyKeys) { @@ -248,7 +248,7 @@ public enum LauncherHelper { } // Locale does not implement Comparable so we convert it to String // and sort it for pretty printing. - Set<String> sortedSet = new TreeSet<>(); + Set<String> sortedSet = new TreeSet<String>(); for (Locale l : tlocales) { sortedSet.add(l.toString()); } diff -up openjdk-boot/jdk/src/share/classes/sun/management/ManagementFactoryHelper.java.sav openjdk-boot/jdk/src/share/classes/sun/management/ManagementFactoryHelper.java --- openjdk-boot/jdk/src/share/classes/sun/management/ManagementFactoryHelper.java.sav 2011-07-29 12:21:24.000000000 -0400 +++ openjdk-boot/jdk/src/share/classes/sun/management/ManagementFactoryHelper.java 2011-07-29 14:27:07.789531217 -0400 @@ -204,7 +204,7 @@ public class ManagementFactoryHelper { private static List<BufferPoolMXBean> bufferPools = null; public static synchronized List<BufferPoolMXBean> getBufferPoolMXBeans() { if (bufferPools == null) { - bufferPools = new ArrayList<>(2); + bufferPools = new ArrayList<BufferPoolMXBean>(2); bufferPools.add(createBufferPoolMXBean(sun.misc.SharedSecrets.getJavaNioAccess() .getDirectBufferPool())); bufferPools.add(createBufferPoolMXBean(sun.nio.ch.FileChannelImpl diff -up openjdk-boot/jdk/src/share/classes/sun/net/spi/nameservice/dns/DNSNameService.java.sav openjdk-boot/jdk/src/share/classes/sun/net/spi/nameservice/dns/DNSNameService.java --- openjdk-boot/jdk/src/share/classes/sun/net/spi/nameservice/dns/DNSNameService.java.sav 2011-07-29 12:21:25.000000000 -0400 +++ openjdk-boot/jdk/src/share/classes/sun/net/spi/nameservice/dns/DNSNameService.java 2011-07-29 14:27:07.789531217 -0400 @@ -52,7 +52,7 @@ public final class DNSNameService implem // Per-thread soft cache of the last temporary context private static ThreadLocal<SoftReference<ThreadContext>> contextRef = - new ThreadLocal<>(); + new ThreadLocal<SoftReference<ThreadContext>>(); // Simple class to encapsulate the temporary context private static class ThreadContext { @@ -99,7 +99,7 @@ public final class DNSNameService implem // new thread context needs to be created if (thrCtxt == null) { - final Hashtable<String,Object> env = new Hashtable<>(); + final Hashtable<String,Object> env = new Hashtable<String,Object>(); env.put("java.naming.factory.initial", "com.sun.jndi.dns.DnsContextFactory"); @@ -165,7 +165,7 @@ public final class DNSNameService implem final String[] ids, int depth) throws UnknownHostException { - ArrayList<String> results = new ArrayList<>(); + ArrayList<String> results = new ArrayList<String>(); Attributes attrs; // do the query diff -up openjdk-boot/jdk/src/share/classes/sun/net/www/protocol/http/AuthenticationInfo.java.sav openjdk-boot/jdk/src/share/classes/sun/net/www/protocol/http/AuthenticationInfo.java --- openjdk-boot/jdk/src/share/classes/sun/net/www/protocol/http/AuthenticationInfo.java.sav 2011-07-29 12:21:26.000000000 -0400 +++ openjdk-boot/jdk/src/share/classes/sun/net/www/protocol/http/AuthenticationInfo.java 2011-07-29 14:27:07.789531217 -0400 @@ -111,7 +111,7 @@ public abstract class AuthenticationInfo * at the same time, then all but the first will block until * the first completes its authentication. */ - static private HashMap<String,Thread> requests = new HashMap<>(); + static private HashMap<String,Thread> requests = new HashMap<String,Thread>(); /* check if a request for this destination is in progress * return false immediately if not. Otherwise block until diff -up openjdk-boot/jdk/src/share/classes/sun/net/www/URLConnection.java.sav openjdk-boot/jdk/src/share/classes/sun/net/www/URLConnection.java --- openjdk-boot/jdk/src/share/classes/sun/net/www/URLConnection.java.sav 2011-07-29 12:21:25.000000000 -0400 +++ openjdk-boot/jdk/src/share/classes/sun/net/www/URLConnection.java 2011-07-29 14:27:07.790531202 -0400 @@ -239,7 +239,7 @@ abstract public class URLConnection exte url = null; } - private static HashMap<String,Void> proxiedHosts = new HashMap<>(); + private static HashMap<String,Void> proxiedHosts = new HashMap<String,Void>(); public synchronized static void setProxiedHost(String host) { proxiedHosts.put(host.toLowerCase(), null); diff -up openjdk-boot/jdk/src/share/classes/sun/nio/cs/AbstractCharsetProvider.java.sav openjdk-boot/jdk/src/share/classes/sun/nio/cs/AbstractCharsetProvider.java --- openjdk-boot/jdk/src/share/classes/sun/nio/cs/AbstractCharsetProvider.java.sav 2011-07-29 12:21:26.000000000 -0400 +++ openjdk-boot/jdk/src/share/classes/sun/nio/cs/AbstractCharsetProvider.java 2011-07-29 14:27:07.790531202 -0400 @@ -49,22 +49,22 @@ public class AbstractCharsetProvider /* Maps canonical names to class names */ private Map<String,String> classMap - = new TreeMap<>(ASCIICaseInsensitiveComparator.CASE_INSENSITIVE_ORDER); + = new TreeMap<String,String>(ASCIICaseInsensitiveComparator.CASE_INSENSITIVE_ORDER); /* Maps alias names to canonical names */ private Map<String,String> aliasMap - = new TreeMap<>(ASCIICaseInsensitiveComparator.CASE_INSENSITIVE_ORDER); + = new TreeMap<String,String>(ASCIICaseInsensitiveComparator.CASE_INSENSITIVE_ORDER); /* Maps canonical names to alias-name arrays */ private Map<String,String[]> aliasNameMap - = new TreeMap<>(ASCIICaseInsensitiveComparator.CASE_INSENSITIVE_ORDER); + = new TreeMap<String,String[]>(ASCIICaseInsensitiveComparator.CASE_INSENSITIVE_ORDER); /* Maps canonical names to soft references that hold cached instances */ private Map<String,SoftReference<Charset>> cache - = new TreeMap<>(ASCIICaseInsensitiveComparator.CASE_INSENSITIVE_ORDER); + = new TreeMap<String,SoftReference<Charset>>(ASCIICaseInsensitiveComparator.CASE_INSENSITIVE_ORDER); private String packagePrefix; @@ -167,7 +167,7 @@ public class AbstractCharsetProvider final ArrayList<String> ks; synchronized (this) { init(); - ks = new ArrayList<>(classMap.keySet()); + ks = new ArrayList<String>(classMap.keySet()); } return new Iterator<Charset>() { diff -up openjdk-boot/jdk/src/share/classes/sun/nio/fs/AbstractAclFileAttributeView.java.sav openjdk-boot/jdk/src/share/classes/sun/nio/fs/AbstractAclFileAttributeView.java --- openjdk-boot/jdk/src/share/classes/sun/nio/fs/AbstractAclFileAttributeView.java.sav 2011-07-29 12:21:27.000000000 -0400 +++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/AbstractAclFileAttributeView.java 2011-07-29 14:27:07.790531202 -0400 @@ -84,7 +84,7 @@ abstract class AbstractAclFileAttributeV throw new IllegalArgumentException("'" + name() + ":" + attribute + "' not recognized"); } - Map<String,Object> result = new HashMap<>(2); + Map<String,Object> result = new HashMap<String,Object>(2); if (acl) result.put(ACL_NAME, getAcl()); if (owner) diff -up openjdk-boot/jdk/src/share/classes/sun/nio/fs/AbstractBasicFileAttributeView.java.sav openjdk-boot/jdk/src/share/classes/sun/nio/fs/AbstractBasicFileAttributeView.java --- openjdk-boot/jdk/src/share/classes/sun/nio/fs/AbstractBasicFileAttributeView.java.sav 2011-07-29 12:21:27.000000000 -0400 +++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/AbstractBasicFileAttributeView.java 2011-07-29 14:27:07.790531202 -0400 @@ -89,8 +89,8 @@ abstract class AbstractBasicFileAttribut * Used to build a map of attribute name/values. */ static class AttributesBuilder { - private Set<String> names = new HashSet<>(); - private Map<String,Object> map = new HashMap<>(); + private Set<String> names = new HashSet<String>(); + private Map<String,Object> map = new HashMap<String,Object>(); private boolean copyAll; private AttributesBuilder(Set<String> allowed, String[] requested) { diff -up openjdk-boot/jdk/src/share/classes/sun/nio/fs/AbstractPoller.java.sav openjdk-boot/jdk/src/share/classes/sun/nio/fs/AbstractPoller.java --- openjdk-boot/jdk/src/share/classes/sun/nio/fs/AbstractPoller.java.sav 2011-07-29 12:21:27.000000000 -0400 +++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/AbstractPoller.java 2011-07-29 14:27:07.790531202 -0400 @@ -102,7 +102,7 @@ abstract class AbstractPoller implements throw new NullPointerException(); if (events.length == 0) throw new IllegalArgumentException("No events to register"); - Set<WatchEvent.Kind<?>> eventSet = new HashSet<>(events.length); + Set<WatchEvent.Kind<?>> eventSet = new HashSet<WatchEvent.Kind<?>>(events.length); for (WatchEvent.Kind<?> event: events) { // standard events if (event == StandardWatchEventKinds.ENTRY_CREATE || diff -up openjdk-boot/jdk/src/share/classes/sun/nio/fs/AbstractUserDefinedFileAttributeView.java.sav openjdk-boot/jdk/src/share/classes/sun/nio/fs/AbstractUserDefinedFileAttributeView.java --- openjdk-boot/jdk/src/share/classes/sun/nio/fs/AbstractUserDefinedFileAttributeView.java.sav 2011-07-29 12:21:27.000000000 -0400 +++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/AbstractUserDefinedFileAttributeView.java 2011-07-29 14:27:07.790531202 -0400 @@ -77,7 +77,7 @@ abstract class AbstractUserDefinedFileAt throws IOException { // names of attributes to return - List<String> names = new ArrayList<>(); + List<String> names = new ArrayList<String>(); for (String name: attributes) { if (name.equals("*")) { names = list(); @@ -90,7 +90,7 @@ abstract class AbstractUserDefinedFileAt } // read each value and return in map - Map<String,Object> result = new HashMap<>(); + Map<String,Object> result = new HashMap<String,Object>(); for (String name: names) { int size = size(name); byte[] buf = new byte[size]; diff -up openjdk-boot/jdk/src/share/classes/sun/nio/fs/FileOwnerAttributeViewImpl.java.sav openjdk-boot/jdk/src/share/classes/sun/nio/fs/FileOwnerAttributeViewImpl.java --- openjdk-boot/jdk/src/share/classes/sun/nio/fs/FileOwnerAttributeViewImpl.java.sav 2011-07-29 12:21:27.000000000 -0400 +++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/FileOwnerAttributeViewImpl.java 2011-07-29 14:27:07.790531202 -0400 @@ -71,7 +71,7 @@ final class FileOwnerAttributeViewImpl @Override public Map<String,Object> readAttributes(String[] attributes) throws IOException { - Map<String,Object> result = new HashMap<>(); + Map<String,Object> result = new HashMap<String,Object>(); for (String attribute: attributes) { if (attribute.equals("*") || attribute.equals(OWNER_NAME)) { result.put(OWNER_NAME, getOwner()); diff -up openjdk-boot/jdk/src/share/classes/sun/nio/fs/Util.java.sav openjdk-boot/jdk/src/share/classes/sun/nio/fs/Util.java --- openjdk-boot/jdk/src/share/classes/sun/nio/fs/Util.java.sav 2011-07-29 12:21:27.000000000 -0400 +++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/Util.java 2011-07-29 14:27:07.790531202 -0400 @@ -63,7 +63,7 @@ class Util { * Returns a Set containing the given elements. */ static <E> Set<E> newSet(E... elements) { - HashSet<E> set = new HashSet<>(); + HashSet<E> set = new HashSet<E>(); for (E e: elements) { set.add(e); } @@ -75,7 +75,7 @@ class Util { * the given elements. */ static <E> Set<E> newSet(Set<E> other, E... elements) { - HashSet<E> set = new HashSet<>(other); + HashSet<E> set = new HashSet<E>(other); for (E e: elements) { set.add(e); } diff -up openjdk-boot/jdk/src/share/classes/sun/rmi/server/Activation.java.sav openjdk-boot/jdk/src/share/classes/sun/rmi/server/Activation.java --- openjdk-boot/jdk/src/share/classes/sun/rmi/server/Activation.java.sav 2011-07-29 12:21:27.000000000 -0400 +++ openjdk-boot/jdk/src/share/classes/sun/rmi/server/Activation.java 2011-07-29 14:27:07.790531202 -0400 @@ -149,10 +149,10 @@ public class Activation implements Seria /** maps activation id to its respective group id */ private Map<ActivationID,ActivationGroupID> idTable = - new ConcurrentHashMap<>(); + new ConcurrentHashMap<ActivationID,ActivationGroupID>(); /** maps group id to its GroupEntry groups */ private Map<ActivationGroupID,GroupEntry> groupTable = - new ConcurrentHashMap<>(); + new ConcurrentHashMap<ActivationGroupID,GroupEntry>(); private byte majorVersion = MAJOR_VERSION; private byte minorVersion = MINOR_VERSION; @@ -288,10 +288,10 @@ public class Activation implements Seria { ois.defaultReadObject(); if (! (groupTable instanceof ConcurrentHashMap)) { - groupTable = new ConcurrentHashMap<>(groupTable); + groupTable = new ConcurrentHashMap<ActivationGroupID,GroupEntry>(groupTable); } if (! (idTable instanceof ConcurrentHashMap)) { - idTable = new ConcurrentHashMap<>(idTable); + idTable = new ConcurrentHashMap<ActivationID,ActivationGroupID>(idTable); } } diff -up openjdk-boot/jdk/src/share/classes/sun/security/acl/AclEntryImpl.java.sav openjdk-boot/jdk/src/share/classes/sun/security/acl/AclEntryImpl.java --- openjdk-boot/jdk/src/share/classes/sun/security/acl/AclEntryImpl.java.sav 2011-07-29 12:21:28.000000000 -0400 +++ openjdk-boot/jdk/src/share/classes/sun/security/acl/AclEntryImpl.java 2011-07-29 14:27:07.790531202 -0400 @@ -37,7 +37,7 @@ import java.security.acl.*; */ public class AclEntryImpl implements AclEntry { private Principal user = null; - private Vector<Permission> permissionSet = new Vector<>(10, 10); + private Vector<Permission> permissionSet = new Vector<Permission>(10, 10); private boolean negative = false; /** diff -up openjdk-boot/jdk/src/share/classes/sun/security/acl/AclImpl.java.sav openjdk-boot/jdk/src/share/classes/sun/security/acl/AclImpl.java --- openjdk-boot/jdk/src/share/classes/sun/security/acl/AclImpl.java.sav 2011-07-29 12:21:28.000000000 -0400 +++ openjdk-boot/jdk/src/share/classes/sun/security/acl/AclImpl.java 2011-07-29 14:27:07.791531187 -0400 @@ -41,15 +41,15 @@ public class AclImpl extends OwnerImpl i // or principal. // private Hashtable<Principal, AclEntry> allowedUsersTable = - new Hashtable<>(23); + new Hashtable<Principal,AclEntry>(23); private Hashtable<Principal, AclEntry> allowedGroupsTable = - new Hashtable<>(23); + new Hashtable<Principal, AclEntry>(23); private Hashtable<Principal, AclEntry> deniedUsersTable = - new Hashtable<>(23); + new Hashtable<Principal, AclEntry>(23); private Hashtable<Principal, AclEntry> deniedGroupsTable = - new Hashtable<>(23); + new Hashtable<Principal, AclEntry>(23); private String aclName = null; - private Vector<Permission> zeroSet = new Vector<>(1,1); + private Vector<Permission> zeroSet = new Vector<Permission>(1,1); /** @@ -294,7 +294,7 @@ public class AclImpl extends OwnerImpl i // private static Enumeration<Permission> union(Enumeration<Permission> e1, Enumeration<Permission> e2) { - Vector<Permission> v = new Vector<>(20, 20); + Vector<Permission> v = new Vector<Permission>(20, 20); while (e1.hasMoreElements()) v.addElement(e1.nextElement()); @@ -313,7 +313,7 @@ public class AclImpl extends OwnerImpl i // private Enumeration<Permission> subtract(Enumeration<Permission> e1, Enumeration<Permission> e2) { - Vector<Permission> v = new Vector<>(20, 20); + Vector<Permission> v = new Vector<Permission>(20, 20); while (e1.hasMoreElements()) v.addElement(e1.nextElement()); diff -up openjdk-boot/jdk/src/share/classes/sun/security/acl/GroupImpl.java.sav openjdk-boot/jdk/src/share/classes/sun/security/acl/GroupImpl.java --- openjdk-boot/jdk/src/share/classes/sun/security/acl/GroupImpl.java.sav 2011-07-29 12:21:28.000000000 -0400 +++ openjdk-boot/jdk/src/share/classes/sun/security/acl/GroupImpl.java 2011-07-29 14:27:07.791531187 -0400 @@ -34,7 +34,7 @@ import java.security.acl.*; * @author Satish Dharmaraj */ public class GroupImpl implements Group { - private Vector<Principal> groupMembers = new Vector<>(50, 100); + private Vector<Principal> groupMembers = new Vector<Principal>(50, 100); private String group; /** @@ -131,7 +131,7 @@ public class GroupImpl implements Group if (groupMembers.contains(member)) { return true; } else { - Vector<Group> alreadySeen = new Vector<>(10); + Vector<Group> alreadySeen = new Vector<Group>(10); return isMemberRecurse(member, alreadySeen); } } diff -up openjdk-boot/jdk/src/share/classes/sun/security/jca/ProviderList.java.sav openjdk-boot/jdk/src/share/classes/sun/security/jca/ProviderList.java --- openjdk-boot/jdk/src/share/classes/sun/security/jca/ProviderList.java.sav 2011-07-29 12:21:28.000000000 -0400 +++ openjdk-boot/jdk/src/share/classes/sun/security/jca/ProviderList.java 2011-07-29 14:27:07.791531187 -0400 @@ -96,7 +96,7 @@ public final class ProviderList { if (providerList.getProvider(p.getName()) != null) { return providerList; } - List<ProviderConfig> list = new ArrayList<> + List<ProviderConfig> list = new ArrayList<ProviderConfig> (Arrays.asList(providerList.configs)); int n = list.size(); if ((position < 0) || (position > n)) { @@ -160,7 +160,7 @@ public final class ProviderList { * Return a new ProviderList parsed from the java.security Properties. */ private ProviderList() { - List<ProviderConfig> configList = new ArrayList<>(); + List<ProviderConfig> configList = new ArrayList<ProviderConfig>(); for (int i = 1; true; i++) { String entry = Security.getProperty("security.provider." + i); if (entry == null) { @@ -200,7 +200,7 @@ public final class ProviderList { * possible recursion and deadlock during verification. */ ProviderList getJarList(String[] jarClassNames) { - List<ProviderConfig> newConfigs = new ArrayList<>(); + List<ProviderConfig> newConfigs = new ArrayList<ProviderConfig>(); for (String className : jarClassNames) { ProviderConfig newConfig = new ProviderConfig(className); for (ProviderConfig config : configs) { @@ -356,7 +356,7 @@ public final class ProviderList { */ @Deprecated public List<Service> getServices(String type, List<String> algorithms) { - List<ServiceId> ids = new ArrayList<>(); + List<ServiceId> ids = new ArrayList<ServiceId>(); for (String alg : algorithms) { ids.add(new ServiceId(type, alg)); } diff -up openjdk-boot/jdk/src/share/classes/sun/security/jca/Providers.java.sav openjdk-boot/jdk/src/share/classes/sun/security/jca/Providers.java --- openjdk-boot/jdk/src/share/classes/sun/security/jca/Providers.java.sav 2011-07-29 12:21:28.000000000 -0400 +++ openjdk-boot/jdk/src/share/classes/sun/security/jca/Providers.java 2011-07-29 14:27:07.791531187 -0400 @@ -40,7 +40,7 @@ import java.security.Security; public class Providers { private static final ThreadLocal<ProviderList> threadLists = - new InheritableThreadLocal<>(); + new InheritableThreadLocal<ProviderList>(); // number of threads currently using thread-local provider lists // tracked to allow an optimization if == 0 diff -up openjdk-boot/jdk/src/share/classes/sun/security/jgss/krb5/Krb5Util.java.sav openjdk-boot/jdk/src/share/classes/sun/security/jgss/krb5/Krb5Util.java --- openjdk-boot/jdk/src/share/classes/sun/security/jgss/krb5/Krb5Util.java.sav 2011-07-29 12:21:28.000000000 -0400 +++ openjdk-boot/jdk/src/share/classes/sun/security/jgss/krb5/Krb5Util.java 2011-07-29 14:27:07.791531187 -0400 @@ -267,7 +267,7 @@ public class Krb5Util { if (ktabs.isEmpty()) { return kk.toArray(new KerberosKey[kk.size()]); } else { - List<KerberosKey> keys = new ArrayList<>(); + List<KerberosKey> keys = new ArrayList<KerberosKey>(); for (KeyTab ktab: ktabs) { for (KerberosKey k: ktab.getKeys(kp)) { keys.add(k); diff -up openjdk-boot/jdk/src/share/classes/sun/security/krb5/Config.java.sav openjdk-boot/jdk/src/share/classes/sun/security/krb5/Config.java --- openjdk-boot/jdk/src/share/classes/sun/security/krb5/Config.java.sav 2011-07-29 12:21:28.000000000 -0400 +++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/Config.java 2011-07-29 14:27:07.791531187 -0400 @@ -527,7 +527,7 @@ public class Config { } }))); String Line; - Vector<String> v = new Vector<>(); + Vector<String> v = new Vector<String>(); String previous = null; while ((Line = br.readLine()) != null) { // ignore comments and blank line in the configuration file. @@ -588,7 +588,7 @@ public class Config { throw new KrbException("I/O error while reading" + " configuration file."); } - Hashtable<String,Object> table = new Hashtable<>(); + Hashtable<String,Object> table = new Hashtable<String,Object>(); for (int i = 0; i < v.size(); i++) { String line = v.elementAt(i).trim(); if (line.equalsIgnoreCase("[realms]")) { @@ -597,7 +597,7 @@ public class Config { if ((count == v.size()) || (v.elementAt(count).startsWith("["))) { Hashtable<String,Hashtable<String,Vector<String>>> temp = - new Hashtable<>(); + new Hashtable<String,Hashtable<String,Vector<String>>>(); temp = parseRealmField(v, i + 1, count); table.put("realms", temp); i = count - 1; @@ -610,7 +610,7 @@ public class Config { if ((count == v.size()) || (v.elementAt(count).startsWith("["))) { Hashtable<String,Hashtable<String,Vector<String>>> temp = - new Hashtable<>(); + new Hashtable<String,Hashtable<String,Vector<String>>>(); temp = parseRealmField(v, i + 1, count); table.put("capaths", temp); i = count - 1; @@ -728,7 +728,7 @@ public class Config { * Parses key-value pairs under a stanza name. */ private Hashtable<String,String> parseField(Vector<String> v, int start, int end) { - Hashtable<String,String> table = new Hashtable<>(); + Hashtable<String,String> table = new Hashtable<String,String>(); String line; for (int i = start; i < end; i++) { line = v.elementAt(i); @@ -750,7 +750,7 @@ public class Config { * information for the realm given within a pair of braces. */ private Hashtable<String,Hashtable<String,Vector<String>>> parseRealmField(Vector<String> v, int start, int end) { - Hashtable<String,Hashtable<String,Vector<String>>> table = new Hashtable<>(); + Hashtable<String,Hashtable<String,Vector<String>>> table = new Hashtable<String,Hashtable<String,Vector<String>>>(); String line; for (int i = start; i < end; i++) { line = v.elementAt(i).trim(); @@ -790,9 +790,9 @@ public class Config { * Parses key-value pairs within each braces under [realms]. */ private Hashtable<String,Vector<String>> parseRealmFieldEx(Vector<String> v, int start, int end) { - Hashtable<String,Vector<String>> table = new Hashtable<>(); - Vector<String> keyVector = new Vector<>(); - Vector<String> nameVector = new Vector<>(); + Hashtable<String,Vector<String>> table = new Hashtable<String,Vector<String>>(); + Vector<String> keyVector = new Vector<String>(); + Vector<String> nameVector = new Vector<String>(); String line = ""; String key; for (int i = start; i < end; i++) { @@ -897,7 +897,7 @@ public class Config { } st = new StringTokenizer(default_enctypes, delim); int len = st.countTokens(); - ArrayList<Integer> ls = new ArrayList<>(len); + ArrayList<Integer> ls = new ArrayList<Integer>(len); int type; for (int i = 0; i < len; i++) { type = getType(st.nextToken()); diff -up openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/Authenticator.java.sav openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/Authenticator.java --- openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/Authenticator.java.sav 2011-07-29 12:21:28.000000000 -0400 +++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/Authenticator.java 2011-07-29 14:27:07.791531187 -0400 @@ -176,7 +176,7 @@ public class Authenticator { * @exception IOException if an I/O error occurs while reading encoded data. */ public byte[] asn1Encode() throws Asn1Exception, IOException { - Vector<DerValue> v = new Vector<>(); + Vector<DerValue> v = new Vector<DerValue>(); DerOutputStream temp = new DerOutputStream(); temp.putInteger(BigInteger.valueOf(authenticator_vno)); v.addElement(new DerValue(DerValue.createTag(DerValue.TAG_CONTEXT, true, (byte) 0x00), temp.toByteArray())); diff -up openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/AuthorizationData.java.sav openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/AuthorizationData.java --- openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/AuthorizationData.java.sav 2011-07-29 12:21:28.000000000 -0400 +++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/AuthorizationData.java 2011-07-29 14:27:07.791531187 -0400 @@ -99,7 +99,7 @@ public class AuthorizationData implement * @exception IOException if an I/O error occurs while reading encoded data. */ public AuthorizationData(DerValue der) throws Asn1Exception, IOException { - Vector<AuthorizationDataEntry> v = new Vector<>(); + Vector<AuthorizationDataEntry> v = new Vector<AuthorizationDataEntry>(); if (der.getTag() != DerValue.tag_Sequence) { throw new Asn1Exception(Krb5.ASN1_BAD_ID); } diff -up openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java.sav openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java --- openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java.sav 2011-07-29 12:21:28.000000000 -0400 +++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java 2011-07-29 14:27:07.791531187 -0400 @@ -490,7 +490,7 @@ public class FileCredentialsCache extend private static String exec(String c) { StringTokenizer st = new StringTokenizer(c); - Vector<String> v = new Vector<>(); + Vector<String> v = new Vector<String>(); while (st.hasMoreTokens()) { v.addElement(st.nextToken()); } diff -up openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/crypto/EType.java.sav openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/crypto/EType.java --- openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/crypto/EType.java.sav 2011-07-29 12:21:28.000000000 -0400 +++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/crypto/EType.java 2011-07-29 14:27:07.792531172 -0400 @@ -257,7 +257,7 @@ public abstract class EType { + configName); } - List<Integer> list = new ArrayList<>(answer.length); + List<Integer> list = new ArrayList<Integer>(answer.length); for (int i = 0; i < answer.length; i++) { if (EncryptionKey.findKey(answer[i], keys) != null) { list.add(answer[i]); diff -up openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/EncAPRepPart.java.sav openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/EncAPRepPart.java --- openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/EncAPRepPart.java.sav 2011-07-29 12:21:28.000000000 -0400 +++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/EncAPRepPart.java 2011-07-29 14:27:07.792531172 -0400 @@ -133,7 +133,7 @@ public class EncAPRepPart { * @exception IOException if an I/O error occurs while reading encoded data. */ public byte[] asn1Encode() throws Asn1Exception, IOException { - Vector<DerValue> v = new Vector<>(); + Vector<DerValue> v = new Vector<DerValue>(); DerOutputStream temp = new DerOutputStream(); v.addElement(new DerValue(DerValue.createTag(DerValue.TAG_CONTEXT, true, (byte) 0x00), ctime.asn1Encode())); diff -up openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/HostAddresses.java.sav openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/HostAddresses.java --- openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/HostAddresses.java.sav 2011-07-29 12:21:28.000000000 -0400 +++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/HostAddresses.java 2011-07-29 14:27:07.792531172 -0400 @@ -179,7 +179,7 @@ public class HostAddresses implements Cl */ public HostAddresses(DerValue encoding) throws Asn1Exception, IOException { - Vector<HostAddress> tempAddresses = new Vector<>(); + Vector<HostAddress> tempAddresses = new Vector<HostAddress>(); DerValue der = null; while (encoding.getData().available() > 0) { der = encoding.getData().getDerValue(); @@ -265,7 +265,7 @@ public class HostAddresses implements Cl if (addresses == null || addresses.length == 0) return null; - ArrayList<InetAddress> ipAddrs = new ArrayList<>(addresses.length); + ArrayList<InetAddress> ipAddrs = new ArrayList<InetAddress>(addresses.length); for (int i = 0; i < addresses.length; i++) { try { diff -up openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KDCReqBody.java.sav openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KDCReqBody.java --- openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KDCReqBody.java.sav 2011-07-29 12:21:28.000000000 -0400 +++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KDCReqBody.java 2011-07-29 14:27:07.792531172 -0400 @@ -158,7 +158,7 @@ public class KDCReqBody { throw new Asn1Exception(Krb5.ASN1_BAD_ID); } der = encoding.getData().getDerValue(); - Vector<Integer> v = new Vector<>(); + Vector<Integer> v = new Vector<Integer>(); if ((der.getTag() & (byte)0x1F) == (byte)0x08) { subDer = der.getData().getDerValue(); @@ -183,7 +183,7 @@ public class KDCReqBody { encAuthorizationData = EncryptedData.parse(encoding.getData(), (byte)0x0A, true); } if (encoding.getData().available() > 0) { - Vector<Ticket> tempTickets = new Vector<>(); + Vector<Ticket> tempTickets = new Vector<Ticket>(); der = encoding.getData().getDerValue(); if ((der.getTag() & (byte)0x1F) == (byte)0x0B) { subDer = der.getData().getDerValue(); @@ -216,7 +216,7 @@ public class KDCReqBody { * */ public byte[] asn1Encode(int msgType) throws Asn1Exception, IOException { - Vector<DerValue> v = new Vector<>(); + Vector<DerValue> v = new Vector<DerValue>(); v.addElement(new DerValue(DerValue.createTag(DerValue.TAG_CONTEXT, true, (byte)0x00), kdcOptions.asn1Encode())); if (msgType == Krb5.KRB_AS_REQ) { if (cname != null) { diff -up openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KDCReq.java.sav openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KDCReq.java --- openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KDCReq.java.sav 2011-07-29 12:21:28.000000000 -0400 +++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KDCReq.java 2011-07-29 14:27:07.792531172 -0400 @@ -150,7 +150,7 @@ public class KDCReq { if (subsubDer.getTag() != DerValue.tag_SequenceOf) { throw new Asn1Exception(Krb5.ASN1_BAD_ID); } - Vector<PAData> v = new Vector<>(); + Vector<PAData> v = new Vector<PAData>(); while (subsubDer.getData().available() > 0) { v.addElement(new PAData(subsubDer.getData().getDerValue())); } diff -up openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KrbCredInfo.java.sav openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KrbCredInfo.java --- openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KrbCredInfo.java.sav 2011-07-29 12:21:28.000000000 -0400 +++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KrbCredInfo.java 2011-07-29 14:27:07.792531172 -0400 @@ -157,7 +157,7 @@ public class KrbCredInfo { * @exception IOException if an I/O error occurs while reading encoded data. */ public byte[] asn1Encode() throws Asn1Exception, IOException { - Vector<DerValue> v = new Vector<>(); + Vector<DerValue> v = new Vector<DerValue>(); v.addElement(new DerValue(DerValue.createTag(DerValue.TAG_CONTEXT, true, (byte)0x00), key.asn1Encode())); if (prealm != null) v.addElement(new DerValue(DerValue.createTag(DerValue.TAG_CONTEXT, true, (byte)0x01), prealm.asn1Encode())); diff -up openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KRBCred.java.sav openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KRBCred.java --- openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KRBCred.java.sav 2011-07-29 12:21:28.000000000 -0400 +++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KRBCred.java 2011-07-29 14:27:07.792531172 -0400 @@ -134,7 +134,7 @@ public class KRBCred { if (subsubDer.getTag() != DerValue.tag_SequenceOf) { throw new Asn1Exception(Krb5.ASN1_BAD_ID); } - Vector<Ticket> v = new Vector<>(); + Vector<Ticket> v = new Vector<Ticket>(); while (subsubDer.getData().available() > 0) { v.addElement(new Ticket(subsubDer.getData().getDerValue())); } diff -up openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KRBError.java.sav openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KRBError.java --- openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KRBError.java.sav 2011-07-29 12:21:28.000000000 -0400 +++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KRBError.java 2011-07-29 14:27:07.792531172 -0400 @@ -260,7 +260,7 @@ public class KRBError implements java.io private void parsePAData(byte[] data) throws IOException, Asn1Exception { DerValue derPA = new DerValue(data); - List<PAData> paList = new ArrayList<>(); + List<PAData> paList = new ArrayList<PAData>(); while (derPA.data.available() > 0) { // read the PA-DATA DerValue tmp = derPA.data.getDerValue(); diff -up openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/ktab/KeyTab.java.sav openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/ktab/KeyTab.java --- openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/ktab/KeyTab.java.sav 2011-07-29 14:27:01.432625563 -0400 +++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/ktab/KeyTab.java 2011-07-29 14:27:07.792531172 -0400 @@ -67,7 +67,7 @@ public class KeyTab implements KeyTabCon // Attention: Currently there is no way to remove a keytab from this map, // this might lead to a memory leak. - private static Map<String,KeyTab> map = new HashMap<>(); + private static Map<String,KeyTab> map = new HashMap<String,KeyTab>(); // KeyTab file does not exist. Note: a missing keytab is still valid private boolean isMissing = false; @@ -79,7 +79,7 @@ public class KeyTab implements KeyTabCon private long lastModified; private int kt_vno; - private Vector<KeyTabEntry> entries = new Vector<>(); + private Vector<KeyTabEntry> entries = new Vector<KeyTabEntry>(); /** * Constructs a KeyTab object. @@ -280,7 +280,7 @@ public class KeyTab implements KeyTabCon KeyTabEntry entry; EncryptionKey key; int size = entries.size(); - ArrayList<EncryptionKey> keys = new ArrayList<>(size); + ArrayList<EncryptionKey> keys = new ArrayList<EncryptionKey>(size); for (int i = size-1; i >= 0; i--) { entry = entries.elementAt(i); if (entry.service.match(service)) { @@ -482,7 +482,7 @@ public class KeyTab implements KeyTabCon int count = 0; // Remember the highest KVNO for each etype. Used for kvno == -2 - Map<Integer,Integer> highest = new HashMap<>(); + Map<Integer,Integer> highest = new HashMap<Integer, Integer>(); for (int i = entries.size()-1; i >= 0; i--) { KeyTabEntry e = entries.get(i); diff -up openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/LastReq.java.sav openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/LastReq.java --- openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/LastReq.java.sav 2011-07-29 12:21:28.000000000 -0400 +++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/LastReq.java 2011-07-29 14:27:07.792531172 -0400 @@ -77,7 +77,7 @@ public class LastReq { */ public LastReq(DerValue encoding) throws Asn1Exception, IOException { - Vector<LastReqEntry> v= new Vector<>(); + Vector<LastReqEntry> v= new Vector<LastReqEntry>(); if (encoding.getTag() != DerValue.tag_Sequence) { throw new Asn1Exception(Krb5.ASN1_BAD_ID); } diff -up openjdk-boot/jdk/src/share/classes/sun/security/krb5/KdcComm.java.sav openjdk-boot/jdk/src/share/classes/sun/security/krb5/KdcComm.java --- openjdk-boot/jdk/src/share/classes/sun/security/krb5/KdcComm.java.sav 2011-07-29 12:21:28.000000000 -0400 +++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/KdcComm.java 2011-07-29 14:27:07.792531172 -0400 @@ -462,7 +462,7 @@ public final class KdcComm { */ static class KdcAccessibility { // Known bad KDCs - private static Set<String> bads = new HashSet<>(); + private static Set<String> bads = new HashSet<String>(); private static synchronized void addBad(String kdc) { if (DEBUG) { @@ -492,9 +492,9 @@ public final class KdcComm { // Returns a preferred KDC list by putting the bad ones at the end private static synchronized String[] list(String kdcList) { StringTokenizer st = new StringTokenizer(kdcList); - List<String> list = new ArrayList<>(); + List<String> list = new ArrayList<String>(); if (badPolicy == BpType.TRY_LAST) { - List<String> badkdcs = new ArrayList<>(); + List<String> badkdcs = new ArrayList<String>(); while (st.hasMoreTokens()) { String t = st.nextToken(); if (bads.contains(t)) badkdcs.add(t); diff -up openjdk-boot/jdk/src/share/classes/sun/security/krb5/PrincipalName.java.sav openjdk-boot/jdk/src/share/classes/sun/security/krb5/PrincipalName.java --- openjdk-boot/jdk/src/share/classes/sun/security/krb5/PrincipalName.java.sav 2011-07-29 12:21:28.000000000 -0400 +++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/PrincipalName.java 2011-07-29 14:27:07.793531157 -0400 @@ -244,7 +244,7 @@ public class PrincipalName if (subDer.getTag() != DerValue.tag_SequenceOf) { throw new Asn1Exception(Krb5.ASN1_BAD_ID); } - Vector<String> v = new Vector<>(); + Vector<String> v = new Vector<String>(); DerValue subSubDer; while(subDer.getData().available() > 0) { subSubDer = subDer.getData().getDerValue(); @@ -299,7 +299,7 @@ public class PrincipalName // Code repetition, realm parsed again by class Realm protected static String[] parseName(String name) { - Vector<String> tempStrings = new Vector<>(); + Vector<String> tempStrings = new Vector<String>(); String temp = name; int i = 0; int componentStart = 0; diff -up openjdk-boot/jdk/src/share/classes/sun/security/krb5/Realm.java.sav openjdk-boot/jdk/src/share/classes/sun/security/krb5/Realm.java --- openjdk-boot/jdk/src/share/classes/sun/security/krb5/Realm.java.sav 2011-07-29 12:21:28.000000000 -0400 +++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/Realm.java 2011-07-29 14:27:07.793531157 -0400 @@ -359,14 +359,14 @@ public class Realm implements Cloneable } String tempTarget = null, tempRealm = null; - Stack<String> iStack = new Stack<>(); + Stack<String> iStack = new Stack<String>(); /* * The half-established reversed-path, starting from the final target * (sRealm), each item can be connected to by the next one. * Might contains wrong item, if found, a bad track is performed */ - Vector<String> tempList = new Vector<>(8, 8); + Vector<String> tempList = new Vector<String>(8, 8); tempList.add(sRealm); int count = 0; // For debug only diff -up openjdk-boot/jdk/src/share/classes/sun/security/provider/certpath/DistributionPointFetcher.java.sav openjdk-boot/jdk/src/share/classes/sun/security/provider/certpath/DistributionPointFetcher.java --- openjdk-boot/jdk/src/share/classes/sun/security/provider/certpath/DistributionPointFetcher.java.sav 2011-07-29 12:21:29.000000000 -0400 +++ openjdk-boot/jdk/src/share/classes/sun/security/provider/certpath/DistributionPointFetcher.java 2011-07-29 14:27:07.793531157 -0400 @@ -590,7 +590,7 @@ class DistributionPointFetcher { // Except the performance improvement, another benefit is to break // the dead loop while looking for the issuer back and forth // between the delegated self-issued certificate and its issuer. - Set<TrustAnchor> newTrustAnchors = new HashSet<>(trustAnchors); + Set<TrustAnchor> newTrustAnchors = new HashSet<TrustAnchor>(trustAnchors); if (prevKey != null) { // Add the previous certificate as a trust anchor. diff -up openjdk-boot/jdk/src/share/classes/sun/security/provider/JavaKeyStore.java.sav openjdk-boot/jdk/src/share/classes/sun/security/provider/JavaKeyStore.java --- openjdk-boot/jdk/src/share/classes/sun/security/provider/JavaKeyStore.java.sav 2011-07-29 12:21:29.000000000 -0400 +++ openjdk-boot/jdk/src/share/classes/sun/security/provider/JavaKeyStore.java 2011-07-29 14:27:07.793531157 -0400 @@ -683,7 +683,7 @@ abstract class JavaKeyStore extends KeyS // Read the certificate chain int numOfCerts = dis.readInt(); if (numOfCerts > 0) { - List<Certificate> certs = new ArrayList<>( + List<Certificate> certs = new ArrayList<Certificate>( numOfCerts > 10 ? 10 : numOfCerts); for (int j = 0; j < numOfCerts; j++) { if (xVersion == 2) { diff -up openjdk-boot/jdk/src/share/classes/sun/security/provider/PolicyFile.java.sav openjdk-boot/jdk/src/share/classes/sun/security/provider/PolicyFile.java --- openjdk-boot/jdk/src/share/classes/sun/security/provider/PolicyFile.java.sav 2011-07-29 12:21:29.000000000 -0400 +++ openjdk-boot/jdk/src/share/classes/sun/security/provider/PolicyFile.java 2011-07-29 14:27:07.793531157 -0400 @@ -299,7 +299,7 @@ public class PolicyFile extends java.sec private static final int DEFAULT_CACHE_SIZE = 1; // contains the policy grant entries, PD cache, and alias mapping - private AtomicReference<PolicyInfo> policyInfo = new AtomicReference<>(); + private AtomicReference<PolicyInfo> policyInfo = new AtomicReference<PolicyInfo>(); private boolean constructed = false; private boolean expandProperties = true; @@ -1333,7 +1333,7 @@ public class PolicyFile extends java.sec List<PolicyParser.PrincipalEntry> entryPs = entry.getPrincipals(); if (debug != null) { - ArrayList<PolicyParser.PrincipalEntry> accPs = new ArrayList<>(); + ArrayList<PolicyParser.PrincipalEntry> accPs = new ArrayList<PolicyParser.PrincipalEntry>(); if (principals != null) { for (int i = 0; i < principals.length; i++) { accPs.add(new PolicyParser.PrincipalEntry @@ -1414,7 +1414,7 @@ public class PolicyFile extends java.sec // check if the PrincipalComparator // implies the current thread's principals - Set<Principal> pSet = new HashSet<>(principals.length); + Set<Principal> pSet = new HashSet<Principal>(principals.length); for (int j = 0; j < principals.length; j++) { pSet.add(principals[j]); } @@ -1697,7 +1697,7 @@ public class PolicyFile extends java.sec // build an info array for every principal // in the current domain which has a principal class // that is equal to policy entry principal class name - List<Principal> plist = new ArrayList<>(); + List<Principal> plist = new ArrayList<Principal>(); for (int i = 0; i < pdp.length; i++) { if(pe.principalClass.equals(pdp[i].getClass().getName())) plist.add(pdp[i]); @@ -1767,7 +1767,7 @@ public class PolicyFile extends java.sec // Done return certs; - ArrayList<Certificate> userCertList = new ArrayList<>(); + ArrayList<Certificate> userCertList = new ArrayList<Certificate>(); i = 0; while (i < certs.length) { userCertList.add(certs[i]); @@ -2246,7 +2246,7 @@ public class PolicyFile extends java.sec if (this.certs == null) { // extract the signer certs ArrayList<Certificate> signerCerts = - new ArrayList<>(); + new ArrayList<Certificate>(); i = 0; while (i < certs.length) { signerCerts.add(certs[i]); diff -up openjdk-boot/jdk/src/share/classes/sun/security/provider/Sun.java.sav openjdk-boot/jdk/src/share/classes/sun/security/provider/Sun.java --- openjdk-boot/jdk/src/share/classes/sun/security/provider/Sun.java.sav 2011-07-29 12:21:29.000000000 -0400 +++ openjdk-boot/jdk/src/share/classes/sun/security/provider/Sun.java 2011-07-29 14:27:07.793531157 -0400 @@ -55,7 +55,7 @@ public final class Sun extends Provider SunEntries.putEntries(this); } else { // use LinkedHashMap to preserve the order of the PRNGs - Map<Object, Object> map = new LinkedHashMap<>(); + Map<Object, Object> map = new LinkedHashMap<Object, Object>(); SunEntries.putEntries(map); AccessController.doPrivileged(new PutAllAction(this, map)); } diff -up openjdk-boot/jdk/src/share/classes/sun/security/provider/VerificationProvider.java.sav openjdk-boot/jdk/src/share/classes/sun/security/provider/VerificationProvider.java --- openjdk-boot/jdk/src/share/classes/sun/security/provider/VerificationProvider.java.sav 2011-07-29 12:21:29.000000000 -0400 +++ openjdk-boot/jdk/src/share/classes/sun/security/provider/VerificationProvider.java 2011-07-29 14:27:07.793531157 -0400 @@ -76,7 +76,7 @@ public final class VerificationProvider SunRsaSignEntries.putEntries(this); } else { // use LinkedHashMap to preserve the order of the PRNGs - Map<Object, Object> map = new LinkedHashMap<>(); + Map<Object, Object> map = new LinkedHashMap<Object, Object>(); SunEntries.putEntries(map); SunRsaSignEntries.putEntries(map); AccessController.doPrivileged(new PutAllAction(this, map)); diff -up openjdk-boot/jdk/src/share/classes/sun/security/provider/X509Factory.java.sav openjdk-boot/jdk/src/share/classes/sun/security/provider/X509Factory.java --- openjdk-boot/jdk/src/share/classes/sun/security/provider/X509Factory.java.sav 2011-07-29 12:21:29.000000000 -0400 +++ openjdk-boot/jdk/src/share/classes/sun/security/provider/X509Factory.java 2011-07-29 14:27:07.794531142 -0400 @@ -409,10 +409,10 @@ public class X509Factory extends Certifi parseX509orPKCS7Cert(InputStream is) throws CertificateException, IOException { - Collection<X509CertImpl> coll = new ArrayList<>(); + Collection<X509CertImpl> coll = new ArrayList<X509CertImpl>(); byte[] data = readOneBlock(is); if (data == null) { - return new ArrayList<>(0); + return new ArrayList<Certificate>(0); } try { PKCS7 pkcs7 = new PKCS7(data); @@ -422,7 +422,7 @@ public class X509Factory extends Certifi return Arrays.asList(certs); } else { // no crls provided - return new ArrayList<>(0); + return new ArrayList<Certificate>(0); } } catch (ParsingException e) { while (data != null) { @@ -442,10 +442,10 @@ public class X509Factory extends Certifi parseX509orPKCS7CRL(InputStream is) throws CRLException, IOException { - Collection<X509CRLImpl> coll = new ArrayList<>(); + Collection<X509CRLImpl> coll = new ArrayList<X509CRLImpl>(); byte[] data = readOneBlock(is); if (data == null) { - return new ArrayList<>(0); + return new ArrayList<java.security.cert.CRL>(0); } try { PKCS7 pkcs7 = new PKCS7(data); @@ -455,7 +455,7 @@ public class X509Factory extends Certifi return Arrays.asList(crls); } else { // no crls provided - return new ArrayList<>(0); + return new ArrayList<java.security.cert.CRL>(0); } } catch (ParsingException e) { while (data != null) { diff -up openjdk-boot/jdk/src/share/classes/sun/security/rsa/RSACore.java.sav openjdk-boot/jdk/src/share/classes/sun/security/rsa/RSACore.java --- openjdk-boot/jdk/src/share/classes/sun/security/rsa/RSACore.java.sav 2011-07-29 12:21:29.000000000 -0400 +++ openjdk-boot/jdk/src/share/classes/sun/security/rsa/RSACore.java 2011-07-29 14:27:07.794531142 -0400 @@ -219,7 +219,7 @@ public final class RSACore { // use a weak hashmap so that cached values are automatically cleared // when the modulus is GC'ed private final static Map<BigInteger, BlindingParameters> blindingCache = - new WeakHashMap<>(); + new WeakHashMap<BigInteger, BlindingParameters>(); /** * Set of blinding parameters for a given RSA key. diff -up openjdk-boot/jdk/src/share/classes/sun/security/rsa/SunRsaSign.java.sav openjdk-boot/jdk/src/share/classes/sun/security/rsa/SunRsaSign.java --- openjdk-boot/jdk/src/share/classes/sun/security/rsa/SunRsaSign.java.sav 2011-07-29 12:21:29.000000000 -0400 +++ openjdk-boot/jdk/src/share/classes/sun/security/rsa/SunRsaSign.java 2011-07-29 14:27:07.794531142 -0400 @@ -52,7 +52,7 @@ public final class SunRsaSign extends Pr SunRsaSignEntries.putEntries(this); } else { // use LinkedHashMap to preserve the order of the PRNGs - Map<Object, Object> map = new HashMap<>(); + Map<Object, Object> map = new HashMap<Object, Object>(); SunRsaSignEntries.putEntries(map); AccessController.doPrivileged(new PutAllAction(this, map)); } diff -up openjdk-boot/jdk/src/share/classes/sun/security/ssl/CipherSuite.java.sav openjdk-boot/jdk/src/share/classes/sun/security/ssl/CipherSuite.java --- openjdk-boot/jdk/src/share/classes/sun/security/ssl/CipherSuite.java.sav 2011-07-29 12:21:29.000000000 -0400 +++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/CipherSuite.java 2011-07-29 14:27:07.794531142 -0400 @@ -393,7 +393,7 @@ final class CipherSuite implements Compa // Map BulkCipher -> Boolean(available) private final static Map<BulkCipher,Boolean> availableCache = - new HashMap<>(8); + new HashMap<BulkCipher,Boolean>(8); // descriptive name including key size, e.g. AES/128 final String description; diff -up openjdk-boot/jdk/src/share/classes/sun/security/ssl/ClientHandshaker.java.sav openjdk-boot/jdk/src/share/classes/sun/security/ssl/ClientHandshaker.java --- openjdk-boot/jdk/src/share/classes/sun/security/ssl/ClientHandshaker.java.sav 2011-07-29 12:21:29.000000000 -0400 +++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/ClientHandshaker.java 2011-07-29 14:27:07.794531142 -0400 @@ -656,7 +656,7 @@ final class ClientHandshaker extends Han if (certRequest != null) { X509ExtendedKeyManager km = sslContext.getX509KeyManager(); - ArrayList<String> keytypesTmp = new ArrayList<>(4); + ArrayList<String> keytypesTmp = new ArrayList<String>(4); for (int i = 0; i < certRequest.types.length; i++) { String typeName; @@ -1175,7 +1175,7 @@ final class ClientHandshaker extends Han "Can't reuse existing SSL client session"); } - Collection<CipherSuite> cipherList = new ArrayList<>(2); + Collection<CipherSuite> cipherList = new ArrayList<CipherSuite>(2); cipherList.add(sessionSuite); if (!secureRenegotiation && cipherSuites.contains(CipherSuite.C_SCSV)) { @@ -1193,7 +1193,7 @@ final class ClientHandshaker extends Han // exclude SCSV for secure renegotiation if (secureRenegotiation && cipherSuites.contains(CipherSuite.C_SCSV)) { Collection<CipherSuite> cipherList = - new ArrayList<>(cipherSuites.size() - 1); + new ArrayList<CipherSuite>(cipherSuites.size() - 1); for (CipherSuite suite : cipherSuites.collection()) { if (suite != CipherSuite.C_SCSV) { cipherList.add(suite); diff -up openjdk-boot/jdk/src/share/classes/sun/security/ssl/HandshakeMessage.java.sav openjdk-boot/jdk/src/share/classes/sun/security/ssl/HandshakeMessage.java --- openjdk-boot/jdk/src/share/classes/sun/security/ssl/HandshakeMessage.java.sav 2011-07-29 12:21:29.000000000 -0400 +++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/HandshakeMessage.java 2011-07-29 14:27:07.794531142 -0400 @@ -258,7 +258,7 @@ static final class ClientHello extends H // add server_name extension void addServerNameIndicationExtension(String hostname) { // We would have checked that the hostname ia a FQDN. - ArrayList<String> hostnames = new ArrayList<>(1); + ArrayList<String> hostnames = new ArrayList<String>(1); hostnames.add(hostname); try { @@ -434,7 +434,7 @@ class CertificateMsg extends HandshakeMe CertificateMsg(HandshakeInStream input) throws IOException { int chainLen = input.getInt24(); - List<Certificate> v = new ArrayList<>(4); + List<Certificate> v = new ArrayList<Certificate>(4); CertificateFactory cf = null; while (chainLen > 0) { @@ -1334,7 +1334,7 @@ class CertificateRequest extends Handsha // read the certificate_authorities int len = input.getInt16(); - ArrayList<DistinguishedName> v = new ArrayList<>(); + ArrayList<DistinguishedName> v = new ArrayList<DistinguishedName>(); while (len >= 3) { DistinguishedName dn = new DistinguishedName(input); v.add(dn); @@ -1725,7 +1725,7 @@ static final class CertificateVerify ext // Note that this will prevent the Spi classes from being GC'd. We assume // that is not a problem. private final static Map<Class,Object> methodCache = - new ConcurrentHashMap<>(); + new ConcurrentHashMap<Class,Object>(); private static void digestKey(MessageDigest md, SecretKey key) { try { diff -up openjdk-boot/jdk/src/share/classes/sun/security/ssl/Handshaker.java.sav openjdk-boot/jdk/src/share/classes/sun/security/ssl/Handshaker.java --- openjdk-boot/jdk/src/share/classes/sun/security/ssl/Handshaker.java.sav 2011-07-29 12:21:29.000000000 -0400 +++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/Handshaker.java 2011-07-29 14:27:07.794531142 -0400 @@ -569,7 +569,7 @@ abstract class Handshaker { activeProtocols = getActiveProtocols(); } - ArrayList<CipherSuite> suites = new ArrayList<>(); + ArrayList<CipherSuite> suites = new ArrayList<CipherSuite>(); if (!(activeProtocols.collection().isEmpty()) && activeProtocols.min.v != ProtocolVersion.NONE.v) { for (CipherSuite suite : enabledCipherSuites.collection()) { @@ -614,7 +614,7 @@ abstract class Handshaker { */ ProtocolList getActiveProtocols() { if (activeProtocols == null) { - ArrayList<ProtocolVersion> protocols = new ArrayList<>(4); + ArrayList<ProtocolVersion> protocols = new ArrayList<ProtocolVersion>(4); for (ProtocolVersion protocol : enabledProtocols.collection()) { boolean found = false; for (CipherSuite suite : enabledCipherSuites.collection()) { diff -up openjdk-boot/jdk/src/share/classes/sun/security/ssl/HelloExtensions.java.sav openjdk-boot/jdk/src/share/classes/sun/security/ssl/HelloExtensions.java --- openjdk-boot/jdk/src/share/classes/sun/security/ssl/HelloExtensions.java.sav 2011-07-29 12:21:29.000000000 -0400 +++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/HelloExtensions.java 2011-07-29 14:27:07.795531127 -0400 @@ -169,7 +169,7 @@ final class ExtensionType { return name; } - static List<ExtensionType> knownExtensions = new ArrayList<>(9); + static List<ExtensionType> knownExtensions = new ArrayList<ExtensionType>(9); static ExtensionType get(int id) { for (ExtensionType ext : knownExtensions) { @@ -673,7 +673,7 @@ final class SupportedEllipticPointFormat } public String toString() { - List<String> list = new ArrayList<>(); + List<String> list = new ArrayList<String>(); for (byte format : formats) { list.add(toString(format)); } diff -up openjdk-boot/jdk/src/share/classes/sun/security/ssl/ProtocolList.java.sav openjdk-boot/jdk/src/share/classes/sun/security/ssl/ProtocolList.java --- openjdk-boot/jdk/src/share/classes/sun/security/ssl/ProtocolList.java.sav 2011-07-29 12:21:29.000000000 -0400 +++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/ProtocolList.java 2011-07-29 14:27:07.795531127 -0400 @@ -79,7 +79,7 @@ final class ProtocolList { throw new IllegalArgumentException("Protocols may not be null"); } - ArrayList<ProtocolVersion> versions = new ArrayList<>(3); + ArrayList<ProtocolVersion> versions = new ArrayList<ProtocolVersion>(3); for (int i = 0; i < names.length; i++ ) { ProtocolVersion version = ProtocolVersion.valueOf(names[i]); if (versions.contains(version) == false) { diff -up openjdk-boot/jdk/src/share/classes/sun/security/ssl/SignatureAndHashAlgorithm.java.sav openjdk-boot/jdk/src/share/classes/sun/security/ssl/SignatureAndHashAlgorithm.java --- openjdk-boot/jdk/src/share/classes/sun/security/ssl/SignatureAndHashAlgorithm.java.sav 2011-07-29 12:21:29.000000000 -0400 +++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/SignatureAndHashAlgorithm.java 2011-07-29 14:27:07.795531127 -0400 @@ -153,7 +153,7 @@ final class SignatureAndHashAlgorithm { static Collection<SignatureAndHashAlgorithm> getSupportedAlgorithms(AlgorithmConstraints constraints) { - Collection<SignatureAndHashAlgorithm> supported = new ArrayList<>(); + Collection<SignatureAndHashAlgorithm> supported = new ArrayList<SignatureAndHashAlgorithm>(); synchronized (priorityMap) { for (SignatureAndHashAlgorithm sigAlg : priorityMap.values()) { if (sigAlg.priority <= SUPPORTED_ALG_PRIORITY_MAX_NUM && @@ -170,7 +170,7 @@ final class SignatureAndHashAlgorithm { // Get supported algorithm collection from an untrusted collection static Collection<SignatureAndHashAlgorithm> getSupportedAlgorithms( Collection<SignatureAndHashAlgorithm> algorithms ) { - Collection<SignatureAndHashAlgorithm> supported = new ArrayList<>(); + Collection<SignatureAndHashAlgorithm> supported = new ArrayList<SignatureAndHashAlgorithm>(); for (SignatureAndHashAlgorithm sigAlg : algorithms) { if (sigAlg.priority <= SUPPORTED_ALG_PRIORITY_MAX_NUM) { supported.add(sigAlg); @@ -182,7 +182,7 @@ final class SignatureAndHashAlgorithm { static String[] getAlgorithmNames( Collection<SignatureAndHashAlgorithm> algorithms) { - ArrayList<String> algorithmNames = new ArrayList<>(); + ArrayList<String> algorithmNames = new ArrayList<String>(); if (algorithms != null) { for (SignatureAndHashAlgorithm sigAlg : algorithms) { algorithmNames.add(sigAlg.algorithm); @@ -195,7 +195,7 @@ final class SignatureAndHashAlgorithm { static Set<String> getHashAlgorithmNames( Collection<SignatureAndHashAlgorithm> algorithms) { - Set<String> algorithmNames = new HashSet<>(); + Set<String> algorithmNames = new HashSet<String>(); if (algorithms != null) { for (SignatureAndHashAlgorithm sigAlg : algorithms) { if (sigAlg.hash.value > 0) { diff -up openjdk-boot/jdk/src/share/classes/sun/security/ssl/SSLAlgorithmConstraints.java.sav openjdk-boot/jdk/src/share/classes/sun/security/ssl/SSLAlgorithmConstraints.java --- openjdk-boot/jdk/src/share/classes/sun/security/ssl/SSLAlgorithmConstraints.java.sav 2011-07-29 12:21:29.000000000 -0400 +++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/SSLAlgorithmConstraints.java 2011-07-29 14:27:07.795531127 -0400 @@ -261,7 +261,7 @@ final class SSLAlgorithmConstraints impl protected Set<String> decomposes(KeyExchange keyExchange, boolean forCertPathOnly) { - Set<String> components = new HashSet<>(); + Set<String> components = new HashSet<String>(); switch (keyExchange) { case K_NULL: if (!forCertPathOnly) { @@ -356,7 +356,7 @@ final class SSLAlgorithmConstraints impl } protected Set<String> decomposes(BulkCipher bulkCipher) { - Set<String> components = new HashSet<>(); + Set<String> components = new HashSet<String>(); if (bulkCipher.transformation != null) { components.addAll(super.decomposes(bulkCipher.transformation)); @@ -366,7 +366,7 @@ final class SSLAlgorithmConstraints impl } protected Set<String> decomposes(MacAlg macAlg) { - Set<String> components = new HashSet<>(); + Set<String> components = new HashSet<String>(); if (macAlg == CipherSuite.M_MD5) { components.add("MD5"); @@ -407,7 +407,7 @@ final class SSLAlgorithmConstraints impl } if (cipherSuite != null) { - Set<String> components = new HashSet<>(); + Set<String> components = new HashSet<String>(); if(cipherSuite.keyExchange != null) { components.addAll( @@ -448,7 +448,7 @@ final class SSLAlgorithmConstraints impl } if (cipherSuite != null) { - Set<String> components = new HashSet<>(); + Set<String> components = new HashSet<String>(); if(cipherSuite.keyExchange != null) { components.addAll( diff -up openjdk-boot/jdk/src/share/classes/sun/security/ssl/SSLContextImpl.java.sav openjdk-boot/jdk/src/share/classes/sun/security/ssl/SSLContextImpl.java --- openjdk-boot/jdk/src/share/classes/sun/security/ssl/SSLContextImpl.java.sav 2011-07-29 12:21:29.000000000 -0400 +++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/SSLContextImpl.java 2011-07-29 14:27:07.795531127 -0400 @@ -325,7 +325,7 @@ public abstract class SSLContextImpl ext Collection<CipherSuite> allowedCipherSuites = CipherSuite.allowedCipherSuites(); - ArrayList<CipherSuite> suites = new ArrayList<>(); + ArrayList<CipherSuite> suites = new ArrayList<CipherSuite>(); if (!(protocols.collection().isEmpty()) && protocols.min.v != ProtocolVersion.NONE.v) { for (CipherSuite suite : allowedCipherSuites) { @@ -532,7 +532,7 @@ public abstract class SSLContextImpl ext return defaultKeyManagers; } - final Map<String,String> props = new HashMap<>(); + final Map<String,String> props = new HashMap<String,String>(); AccessController.doPrivileged( new PrivilegedExceptionAction<Object>() { public Object run() throws Exception { diff -up openjdk-boot/jdk/src/share/classes/sun/security/ssl/SSLSessionImpl.java.sav openjdk-boot/jdk/src/share/classes/sun/security/ssl/SSLSessionImpl.java --- openjdk-boot/jdk/src/share/classes/sun/security/ssl/SSLSessionImpl.java.sav 2011-07-29 12:21:29.000000000 -0400 +++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/SSLSessionImpl.java 2011-07-29 14:27:07.795531127 -0400 @@ -618,7 +618,7 @@ final class SSLSessionImpl extends Exten * key and the calling security context. This is important since * sessions can be shared across different protection domains. */ - private Hashtable<SecureKey, Object> table = new Hashtable<>(); + private Hashtable<SecureKey, Object> table = new Hashtable<SecureKey, Object>(); /** * Assigns a session value. Session change events are given if @@ -686,7 +686,7 @@ final class SSLSessionImpl extends Exten */ public String[] getValueNames() { Enumeration<SecureKey> e; - Vector<Object> v = new Vector<>(); + Vector<Object> v = new Vector<Object>(); SecureKey key; Object securityCtx = SecureKey.getCurrentSecurityContext(); diff -up openjdk-boot/jdk/src/share/classes/sun/security/ssl/SunX509KeyManagerImpl.java.sav openjdk-boot/jdk/src/share/classes/sun/security/ssl/SunX509KeyManagerImpl.java --- openjdk-boot/jdk/src/share/classes/sun/security/ssl/SunX509KeyManagerImpl.java.sav 2011-07-29 12:21:29.000000000 -0400 +++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/SunX509KeyManagerImpl.java 2011-07-29 14:27:07.795531127 -0400 @@ -337,7 +337,7 @@ final class SunX509KeyManagerImpl extend X500Principal[] x500Issuers = (X500Principal[])issuers; // the algorithm below does not produce duplicates, so avoid Set - List<String> aliases = new ArrayList<>(); + List<String> aliases = new ArrayList<String>(); for (Map.Entry<String,X509Credentials> entry : credentialsMap.entrySet()) { @@ -397,7 +397,7 @@ final class SunX509KeyManagerImpl extend * possible. Principals that cannot be converted are ignored. */ private static X500Principal[] convertPrincipals(Principal[] principals) { - List<X500Principal> list = new ArrayList<>(principals.length); + List<X500Principal> list = new ArrayList<X500Principal>(principals.length); for (int i = 0; i < principals.length; i++) { Principal p = principals[i]; if (p instanceof X500Principal) { diff -up openjdk-boot/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java.sav openjdk-boot/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java --- openjdk-boot/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java.sav 2011-07-29 12:21:29.000000000 -0400 +++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java 2011-07-29 14:27:07.795531127 -0400 @@ -134,7 +134,7 @@ abstract class TrustManagerFactoryImpl e FileInputStream fis = null; String defaultTrustStoreType; String defaultTrustStoreProvider; - final HashMap<String,String> props = new HashMap<>(); + final HashMap<String,String> props = new HashMap<String,String>(); final String sep = File.separator; KeyStore ks = null; diff -up openjdk-boot/jdk/src/share/classes/sun/security/ssl/X509KeyManagerImpl.java.sav openjdk-boot/jdk/src/share/classes/sun/security/ssl/X509KeyManagerImpl.java --- openjdk-boot/jdk/src/share/classes/sun/security/ssl/X509KeyManagerImpl.java.sav 2011-07-29 12:21:29.000000000 -0400 +++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/X509KeyManagerImpl.java 2011-07-29 14:27:07.796531112 -0400 @@ -307,7 +307,7 @@ final class X509KeyManagerImpl extends X (keyTypes.length == 0) || (keyTypes[0] == null)) { return null; } - List<KeyType> list = new ArrayList<>(keyTypes.length); + List<KeyType> list = new ArrayList<KeyType>(keyTypes.length); for (String keyType : keyTypes) { list.add(new KeyType(keyType)); } @@ -429,7 +429,7 @@ final class X509KeyManagerImpl extends X // make a Set out of the array private Set<Principal> getIssuerSet(Principal[] issuers) { if ((issuers != null) && (issuers.length != 0)) { - return new HashSet<>(Arrays.asList(issuers)); + return new HashSet<Principal>(Arrays.asList(issuers)); } else { return null; } diff -up openjdk-boot/jdk/src/share/classes/sun/security/tools/JarSigner.java.sav openjdk-boot/jdk/src/share/classes/sun/security/tools/JarSigner.java --- openjdk-boot/jdk/src/share/classes/sun/security/tools/JarSigner.java.sav 2011-07-29 12:21:29.000000000 -0400 +++ openjdk-boot/jdk/src/share/classes/sun/security/tools/JarSigner.java 2011-07-29 14:27:07.796531112 -0400 @@ -123,14 +123,14 @@ public class JarSigner { boolean token = false; // token-based keystore String jarfile; // jar files to sign or verify String alias; // alias to sign jar with - List<String> ckaliases = new ArrayList<>(); // aliases in -verify + List<String> ckaliases = new ArrayList<String>(); // aliases in -verify char[] storepass; // keystore password boolean protectedPath; // protected authentication path String storetype; // keystore type String providerName; // provider name Vector<String> providers = null; // list of providers // arguments for provider constructors - HashMap<String,String> providerArgs = new HashMap<>(); + HashMap<String,String> providerArgs = new HashMap<String,String>(); char[] keypass; // private key password String sigfile; // name of .SF file String sigalg; // name of signature algorithm @@ -567,7 +567,7 @@ public class JarSigner { try { jf = new JarFile(jarName, true); - Vector<JarEntry> entriesVec = new Vector<>(); + Vector<JarEntry> entriesVec = new Vector<JarEntry>(); byte[] buffer = new byte[8192]; Enumeration<JarEntry> entries = jf.entries(); @@ -594,7 +594,7 @@ public class JarSigner { // The map to record display info, only used when -verbose provided // key: signer info string // value: the list of files with common key - Map<String,List<String>> output = new LinkedHashMap<>(); + Map<String,List<String>> output = new LinkedHashMap<String,List<String>>(); if (man != null) { if (verbose != null) System.out.println(); @@ -946,7 +946,7 @@ public class JarSigner { .append(signTimeForm.format(source)).append("]").toString(); } - private Map<CodeSigner,Integer> cacheForInKS = new IdentityHashMap<>(); + private Map<CodeSigner,Integer> cacheForInKS = new IdentityHashMap<CodeSigner,Integer>(); private int inKeyStoreForOneSigner(CodeSigner signer) { if (cacheForInKS.containsKey(signer)) { @@ -989,7 +989,7 @@ public class JarSigner { return result; } - Hashtable<Certificate, String> storeHash = new Hashtable<>(); + Hashtable<Certificate, String> storeHash = new Hashtable<Certificate,String>(); int inKeyStore(CodeSigner[] signers) { @@ -1119,7 +1119,7 @@ public class JarSigner { * generated one. (This may invalidate existing signatures!) */ BASE64Encoder encoder = new JarBASE64Encoder(); - Vector<ZipEntry> mfFiles = new Vector<>(); + Vector<ZipEntry> mfFiles = new Vector<ZipEntry>(); boolean wasSigned = false; @@ -1476,7 +1476,7 @@ public class JarSigner { return false; } - Map<CodeSigner,String> cacheForSignerInfo = new IdentityHashMap<>(); + Map<CodeSigner,String> cacheForSignerInfo = new IdentityHashMap<CodeSigner,String>(); /** * Returns a string of singer info, with a newline at the end @@ -1600,7 +1600,7 @@ public class JarSigner { } } } - Set<TrustAnchor> tas = new HashSet<>(); + Set<TrustAnchor> tas = new HashSet<TrustAnchor>(); try { KeyStore caks = KeyTool.getCacertsKeyStore(); if (caks != null) { diff -up openjdk-boot/jdk/src/share/classes/sun/security/tools/KeyTool.java.sav openjdk-boot/jdk/src/share/classes/sun/security/tools/KeyTool.java --- openjdk-boot/jdk/src/share/classes/sun/security/tools/KeyTool.java.sav 2011-07-29 12:21:29.000000000 -0400 +++ openjdk-boot/jdk/src/share/classes/sun/security/tools/KeyTool.java 2011-07-29 14:27:07.796531112 -0400 @@ -152,11 +152,11 @@ public final class KeyTool { private KeyStore caks = null; // "cacerts" keystore private char[] srcstorePass = null; private String srcstoretype = null; - private Set<char[]> passwords = new HashSet<>(); + private Set<char[]> passwords = new HashSet<char[]>(); private String startDate = null; - private List<String> ids = new ArrayList<>(); // used in GENCRL - private List<String> v3ext = new ArrayList<>(); + private List<String> ids = new ArrayList<String>(); // used in GENCRL + private List<String> v3ext = new ArrayList<String>(); enum Command { CERTREQ("Generates.a.certificate.request", @@ -2089,7 +2089,7 @@ public final class KeyTool { */ public static List<CRL> readCRLsFromCert(X509Certificate cert) throws Exception { - List<CRL> crls = new ArrayList<>(); + List<CRL> crls = new ArrayList<CRL>(); CRLDistributionPointsExtension ext = X509CertImpl.toImpl(cert).getCRLDistributionPointsExtension(); if (ext == null) return crls; @@ -2256,7 +2256,7 @@ public final class KeyTool { if (jarfile != null) { JarFile jf = new JarFile(jarfile, true); Enumeration<JarEntry> entries = jf.entries(); - Set<CodeSigner> ss = new HashSet<>(); + Set<CodeSigner> ss = new HashSet<CodeSigner>(); byte[] buffer = new byte[8192]; int pos = 0; while (entries.hasMoreElements()) { @@ -3331,7 +3331,7 @@ public final class KeyTool { } // start building chain - Vector<Certificate> chain = new Vector<>(2); + Vector<Certificate> chain = new Vector<Certificate>(2); if (buildChain((X509Certificate)certToVerify, chain, certs)) { Certificate[] newChain = new Certificate[chain.size()]; // buildChain() returns chain with self-signed root-cert first and @@ -3857,7 +3857,7 @@ public final class KeyTool { break; case 2: // EKU if(value != null) { - Vector<ObjectIdentifier> v = new Vector<>(); + Vector<ObjectIdentifier> v = new Vector<ObjectIdentifier>(); for (String s: value.split(",")) { int p = oneOf(s, "anyExtendedKeyUsage", @@ -3927,7 +3927,7 @@ public final class KeyTool { } if(value != null) { List<AccessDescription> accessDescriptions = - new ArrayList<>(); + new ArrayList<AccessDescription>(); String[] ps = value.split(","); for(String item: ps) { colonpos = item.indexOf(':'); @@ -4211,7 +4211,7 @@ class Pair<A, B> { } public static <A,B> Pair<A,B> of(A a, B b) { - return new Pair<>(a,b); + return new Pair<A,B>(a,b); } } diff -up openjdk-boot/jdk/src/share/classes/sun/security/tools/policytool/PolicyTool.java.sav openjdk-boot/jdk/src/share/classes/sun/security/tools/policytool/PolicyTool.java --- openjdk-boot/jdk/src/share/classes/sun/security/tools/policytool/PolicyTool.java.sav 2011-07-29 12:21:29.000000000 -0400 +++ openjdk-boot/jdk/src/share/classes/sun/security/tools/policytool/PolicyTool.java 2011-07-29 14:27:07.797531097 -0400 @@ -643,7 +643,7 @@ public class PolicyTool { Class<?> pc = Class.forName(type, true, Thread.currentThread().getContextClassLoader()); Constructor<?> c = null; - Vector<String> objects = new Vector<>(2); + Vector<String> objects = new Vector<String>(2); if (name != null) objects.add(name); if (actions != null) objects.add(actions); switch (objects.size()) { @@ -1722,7 +1722,7 @@ class ToolDialog extends Dialog { new PolicyParser.GrantEntry(signedby, codebase); // get the new Principals - LinkedList<PolicyParser.PrincipalEntry> prins = new LinkedList<>(); + LinkedList<PolicyParser.PrincipalEntry> prins = new LinkedList<PolicyParser.PrincipalEntry>(); TaggedList prinList = (TaggedList)getComponent(PE_PRIN_LIST); for (int i = 0; i < prinList.getItemCount(); i++) { prins.add((PolicyParser.PrincipalEntry)prinList.getObject(i)); @@ -1730,7 +1730,7 @@ class ToolDialog extends Dialog { ge.principals = prins; // get the new Permissions - Vector<PolicyParser.PermissionEntry> perms = new Vector<>(); + Vector<PolicyParser.PermissionEntry> perms = new Vector<PolicyParser.PermissionEntry>(); TaggedList permList = (TaggedList)getComponent(PE_PERM_LIST); for (int i = 0; i < permList.getItemCount(); i++) { perms.addElement((PolicyParser.PermissionEntry)permList.getObject(i)); @@ -3647,7 +3647,7 @@ class NoDisplayException extends Runtime * This is a java.awt.List that bind an Object to each String it holds. */ class TaggedList extends List { - private java.util.List<Object> data = new LinkedList<>(); + private java.util.List<Object> data = new LinkedList<Object>(); public TaggedList(int i, boolean b) { super(i, b); } diff -up openjdk-boot/jdk/src/share/classes/sun/tools/native2ascii/Main.java.sav openjdk-boot/jdk/src/share/classes/sun/tools/native2ascii/Main.java --- openjdk-boot/jdk/src/share/classes/sun/tools/native2ascii/Main.java.sav 2011-07-29 12:21:32.000000000 -0400 +++ openjdk-boot/jdk/src/share/classes/sun/tools/native2ascii/Main.java 2011-07-29 14:27:07.797531097 -0400 @@ -94,7 +94,7 @@ public class Main { * Run the converter */ public synchronized boolean convert(String argv[]){ - List<String> v = new ArrayList<>(2); + List<String> v = new ArrayList<String>(2); File outputFile = null; boolean createOutputFile = false; diff -up openjdk-boot/jdk/src/share/classes/sun/util/locale/InternalLocaleBuilder.java.sav openjdk-boot/jdk/src/share/classes/sun/util/locale/InternalLocaleBuilder.java --- openjdk-boot/jdk/src/share/classes/sun/util/locale/InternalLocaleBuilder.java.sav 2011-07-29 12:21:32.000000000 -0400 +++ openjdk-boot/jdk/src/share/classes/sun/util/locale/InternalLocaleBuilder.java 2011-07-29 14:27:07.797531097 -0400 @@ -113,7 +113,7 @@ public final class InternalLocaleBuilder } // Use case insensitive string to prevent duplication if (uattributes == null) { - uattributes = new HashSet<>(4); + uattributes = new HashSet<CaseInsensitiveString>(4); } uattributes.add(new CaseInsensitiveString(attribute)); return this; @@ -157,7 +157,7 @@ public final class InternalLocaleBuilder } } if (ukeywords == null) { - ukeywords = new HashMap<>(4); + ukeywords = new HashMap<CaseInsensitiveString,String>(4); } ukeywords.put(cikey, type); } @@ -211,7 +211,7 @@ public final class InternalLocaleBuilder setUnicodeLocaleExtension(val); } else { if (extensions == null) { - extensions = new HashMap<>(4); + extensions = new HashMap<CaseInsensitiveChar,String>(4); } extensions.put(key, val); } @@ -262,7 +262,7 @@ public final class InternalLocaleBuilder } if (extensions == null) { - extensions = new ArrayList<>(4); + extensions = new ArrayList<String>(4); } extensions.add(sb.toString()); } else { @@ -313,7 +313,7 @@ public final class InternalLocaleBuilder clearExtensions(); if (!LocaleUtils.isEmpty(bcpExtensions)) { - Set<CaseInsensitiveChar> done = new HashSet<>(bcpExtensions.size()); + Set<CaseInsensitiveChar> done = new HashSet<CaseInsensitiveChar>(bcpExtensions.size()); for (String bcpExt : bcpExtensions) { CaseInsensitiveChar key = new CaseInsensitiveChar(bcpExt); // ignore duplicates @@ -323,7 +323,7 @@ public final class InternalLocaleBuilder setUnicodeLocaleExtension(bcpExt.substring(2)); } else { if (extensions == null) { - extensions = new HashMap<>(4); + extensions = new HashMap<CaseInsensitiveChar,String>(4); } extensions.put(key, bcpExt.substring(2)); } @@ -334,7 +334,7 @@ public final class InternalLocaleBuilder if (privateuse != null && privateuse.length() > 0) { // privateuse string contains prefix, e.g. "x-abc-def" if (extensions == null) { - extensions = new HashMap<>(1); + extensions = new HashMap<CaseInsensitiveChar,String>(1); } extensions.put(new CaseInsensitiveChar(privateuse), privateuse.substring(2)); } @@ -442,19 +442,19 @@ public final class InternalLocaleBuilder UnicodeLocaleExtension ue = (UnicodeLocaleExtension)e; for (String uatr : ue.getUnicodeLocaleAttributes()) { if (uattributes == null) { - uattributes = new HashSet<>(4); + uattributes = new HashSet<CaseInsensitiveString>(4); } uattributes.add(new CaseInsensitiveString(uatr)); } for (String ukey : ue.getUnicodeLocaleKeys()) { if (ukeywords == null) { - ukeywords = new HashMap<>(4); + ukeywords = new HashMap<CaseInsensitiveString,String>(4); } ukeywords.put(new CaseInsensitiveString(ukey), ue.getUnicodeLocaleType(ukey)); } } else { if (extensions == null) { - extensions = new HashMap<>(4); + extensions = new HashMap<CaseInsensitiveChar,String>(4); } extensions.put(new CaseInsensitiveChar(key), e.getValue()); } @@ -604,7 +604,7 @@ public final class InternalLocaleBuilder break; } if (uattributes == null) { - uattributes = new HashSet<>(4); + uattributes = new HashSet<CaseInsensitiveString>(4); } uattributes.add(new CaseInsensitiveString(itr.current())); itr.next(); @@ -622,7 +622,7 @@ public final class InternalLocaleBuilder assert(typeStart == -1 || typeEnd != -1); type = (typeStart == -1) ? "" : subtags.substring(typeStart, typeEnd); if (ukeywords == null) { - ukeywords = new HashMap<>(4); + ukeywords = new HashMap<CaseInsensitiveString,String>(4); } ukeywords.put(key, type); @@ -652,7 +652,7 @@ public final class InternalLocaleBuilder assert(typeStart == -1 || typeEnd != -1); type = (typeStart == -1) ? "" : subtags.substring(typeStart, typeEnd); if (ukeywords == null) { - ukeywords = new HashMap<>(4); + ukeywords = new HashMap<CaseInsensitiveString,String>(4); } ukeywords.put(key, type); } diff -up openjdk-boot/jdk/src/share/classes/sun/util/locale/LanguageTag.java.sav openjdk-boot/jdk/src/share/classes/sun/util/locale/LanguageTag.java --- openjdk-boot/jdk/src/share/classes/sun/util/locale/LanguageTag.java.sav 2011-07-29 12:21:32.000000000 -0400 +++ openjdk-boot/jdk/src/share/classes/sun/util/locale/LanguageTag.java 2011-07-29 14:27:07.797531097 -0400 @@ -62,7 +62,7 @@ public class LanguageTag { // Map contains grandfathered tags and its preferred mappings from // http://www.ietf.org/rfc/rfc5646.txt // Keys are lower-case strings. - private static final Map<String, String[]> GRANDFATHERED = new HashMap<>(); + private static final Map<String, String[]> GRANDFATHERED = new HashMap<String,String[]>(); static { // grandfathered = irregular ; non-redundant tags registered @@ -257,7 +257,7 @@ public class LanguageTag { } found = true; if (extlangs.isEmpty()) { - extlangs = new ArrayList<>(3); + extlangs = new ArrayList<String>(3); } extlangs.add(s); sts.parseLength = itr.currentEnd(); @@ -322,7 +322,7 @@ public class LanguageTag { } found = true; if (variants.isEmpty()) { - variants = new ArrayList<>(3); + variants = new ArrayList<String>(3); } variants.add(s); sts.parseLength = itr.currentEnd(); @@ -365,7 +365,7 @@ public class LanguageTag { } if (extensions.isEmpty()) { - extensions = new ArrayList<>(4); + extensions = new ArrayList<String>(4); } extensions.add(sb.toString()); found = true; @@ -462,7 +462,7 @@ public class LanguageTag { break; } if (variants == null) { - variants = new ArrayList<>(); + variants = new ArrayList<String>(); } variants.add(var); // Do not canonicalize! varitr.next(); @@ -503,7 +503,7 @@ public class LanguageTag { privateuse = ext.getValue(); } else { if (extensions == null) { - extensions = new ArrayList<>(); + extensions = new ArrayList<String>(); } extensions.add(locextKey.toString() + SEP + ext.getValue()); } diff -up openjdk-boot/jdk/src/share/classes/sun/util/locale/LocaleExtensions.java.sav openjdk-boot/jdk/src/share/classes/sun/util/locale/LocaleExtensions.java --- openjdk-boot/jdk/src/share/classes/sun/util/locale/LocaleExtensions.java.sav 2011-07-29 12:21:32.000000000 -0400 +++ openjdk-boot/jdk/src/share/classes/sun/util/locale/LocaleExtensions.java 2011-07-29 14:27:07.797531097 -0400 @@ -81,7 +81,7 @@ public class LocaleExtensions { } // Build extension map - SortedMap<Character, Extension> map = new TreeMap<>(); + SortedMap<Character, Extension> map = new TreeMap<Character,Extension>(); if (hasExtension) { for (Entry<CaseInsensitiveChar, String> ext : extensions.entrySet()) { char key = LocaleUtils.toLower(ext.getKey().value()); @@ -104,14 +104,14 @@ public class LocaleExtensions { SortedMap<String, String> ukmap = null; if (hasUAttributes) { - uaset = new TreeSet<>(); + uaset = new TreeSet<String>(); for (CaseInsensitiveString cis : uattributes) { uaset.add(LocaleUtils.toLowerString(cis.value())); } } if (hasUKeywords) { - ukmap = new TreeMap<>(); + ukmap = new TreeMap<String,String>(); for (Entry<CaseInsensitiveString, String> kwd : ukeywords.entrySet()) { String key = LocaleUtils.toLowerString(kwd.getKey().value()); String type = LocaleUtils.toLowerString(kwd.getValue()); diff -up openjdk-boot/jdk/src/share/classes/sun/util/locale/LocaleObjectCache.java.sav openjdk-boot/jdk/src/share/classes/sun/util/locale/LocaleObjectCache.java --- openjdk-boot/jdk/src/share/classes/sun/util/locale/LocaleObjectCache.java.sav 2011-07-29 12:21:32.000000000 -0400 +++ openjdk-boot/jdk/src/share/classes/sun/util/locale/LocaleObjectCache.java 2011-07-29 14:27:07.797531097 -0400 @@ -38,14 +38,14 @@ import java.util.concurrent.ConcurrentMa public abstract class LocaleObjectCache<K, V> { private ConcurrentMap<K, CacheEntry<K, V>> map; - private ReferenceQueue<V> queue = new ReferenceQueue<>(); + private ReferenceQueue<V> queue = new ReferenceQueue<V>(); public LocaleObjectCache() { this(16, 0.75f, 16); } public LocaleObjectCache(int initialCapacity, float loadFactor, int concurrencyLevel) { - map = new ConcurrentHashMap<>(initialCapacity, loadFactor, concurrencyLevel); + map = new ConcurrentHashMap<K, CacheEntry<K,V>>(initialCapacity, loadFactor, concurrencyLevel); } public V get(K key) { @@ -64,7 +64,7 @@ public abstract class LocaleObjectCache< return null; } - CacheEntry<K, V> newEntry = new CacheEntry<>(key, newVal, queue); + CacheEntry<K, V> newEntry = new CacheEntry<K,V>(key, newVal, queue); while (value == null) { cleanStaleEntries(); @@ -81,7 +81,7 @@ public abstract class LocaleObjectCache< } protected V put(K key, V value) { - CacheEntry<K, V> entry = new CacheEntry<>(key, value, queue); + CacheEntry<K, V> entry = new CacheEntry<K,V>(key, value, queue); CacheEntry<K, V> oldEntry = map.put(key, entry); return (oldEntry == null) ? null : oldEntry.get(); } diff -up openjdk-boot/jdk/src/share/classes/sun/util/logging/PlatformLogger.java.sav openjdk-boot/jdk/src/share/classes/sun/util/logging/PlatformLogger.java --- openjdk-boot/jdk/src/share/classes/sun/util/logging/PlatformLogger.java.sav 2011-07-29 12:21:32.000000000 -0400 +++ openjdk-boot/jdk/src/share/classes/sun/util/logging/PlatformLogger.java 2011-07-29 14:27:07.797531097 -0400 @@ -113,7 +113,7 @@ public class PlatformLogger { // Table of known loggers. Maps names to PlatformLoggers. private static Map<String,WeakReference<PlatformLogger>> loggers = - new HashMap<>(); + new HashMap<String,WeakReference<PlatformLogger>>(); /** * Returns a PlatformLogger of a given name. @@ -126,7 +126,7 @@ public class PlatformLogger { } if (log == null) { log = new PlatformLogger(name); - loggers.put(name, new WeakReference<>(log)); + loggers.put(name, new WeakReference<PlatformLogger>(log)); } return log; } @@ -469,7 +469,7 @@ public class PlatformLogger { */ static class JavaLogger extends LoggerProxy { private static final Map<Integer, Object> levelObjects = - new HashMap<>(); + new HashMap<Integer, Object>(); static { if (LoggingSupport.isAvailable()) { diff -up openjdk-boot/jdk/src/share/demo/nio/zipfs/Demo.java.sav openjdk-boot/jdk/src/share/demo/nio/zipfs/Demo.java --- openjdk-boot/jdk/src/share/demo/nio/zipfs/Demo.java.sav 2011-07-29 12:21:35.000000000 -0400 +++ openjdk-boot/jdk/src/share/demo/nio/zipfs/Demo.java 2011-07-29 14:27:07.798531083 -0400 @@ -151,7 +151,7 @@ public class Demo { } Action action = Action.valueOf(args[0]); - Map<String, Object> env = env = new HashMap<>(); + Map<String, Object> env = env = new HashMap<String,Object>(); if (action == Action.create) env.put("create", "true"); try (FileSystem fs = provider.newFileSystem(Paths.get(args[1]), env)) { @@ -647,9 +647,9 @@ public class Demo { private static void fchCopy(Path src, Path dst) throws IOException { - Set<OpenOption> read = new HashSet<>(); + Set<OpenOption> read = new HashSet<OpenOption>(); read.add(READ); - Set<OpenOption> openwrite = new HashSet<>(); + Set<OpenOption> openwrite = new HashSet<OpenOption>(); openwrite.add(CREATE_NEW); openwrite.add(WRITE); @@ -667,9 +667,9 @@ public class Demo { private static void chCopy(Path src, Path dst) throws IOException { - Set<OpenOption> read = new HashSet<>(); + Set<OpenOption> read = new HashSet<OpenOption>(); read.add(READ); - Set<OpenOption> openwrite = new HashSet<>(); + Set<OpenOption> openwrite = new HashSet<OpenOption>(); openwrite.add(CREATE_NEW); openwrite.add(WRITE); diff -up openjdk-boot/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipCoder.java.sav openjdk-boot/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipCoder.java --- openjdk-boot/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipCoder.java.sav 2011-07-29 12:21:35.000000000 -0400 +++ openjdk-boot/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipCoder.java 2011-07-29 14:27:07.798531083 -0400 @@ -133,8 +133,8 @@ final class ZipCoder { return new ZipCoder(Charset.defaultCharset()); } - private final ThreadLocal<CharsetDecoder> decTL = new ThreadLocal<>(); - private final ThreadLocal<CharsetEncoder> encTL = new ThreadLocal<>(); + private final ThreadLocal<CharsetDecoder> decTL = new ThreadLocal<CharsetDecoder>(); + private final ThreadLocal<CharsetEncoder> encTL = new ThreadLocal<CharsetEncoder>();r private CharsetDecoder decoder() { CharsetDecoder dec = decTL.get(); diff -up openjdk-boot/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileAttributeView.java.sav openjdk-boot/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileAttributeView.java --- openjdk-boot/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileAttributeView.java.sav 2011-07-29 12:21:35.000000000 -0400 +++ openjdk-boot/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileAttributeView.java 2011-07-29 14:27:07.798531083 -0400 @@ -125,7 +125,7 @@ public class ZipFileAttributeView implem throws IOException { ZipFileAttributes zfas = readAttributes(); - LinkedHashMap<String, Object> map = new LinkedHashMap<>(); + LinkedHashMap<String, Object> map = new LinkedHashMap<String,Object>(); if ("*".equals(attributes)) { for (AttrID id : AttrID.values()) { try { diff -up openjdk-boot/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileSystem.java.sav openjdk-boot/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileSystem.java --- openjdk-boot/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileSystem.java.sav 2011-07-29 12:21:35.000000000 -0400 +++ openjdk-boot/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileSystem.java 2011-07-29 14:27:07.798531083 -0400 @@ -147,7 +147,7 @@ public class ZipFileSystem extends FileS @Override public Iterable<Path> getRootDirectories() { - ArrayList<Path> pathArr = new ArrayList<>(); + ArrayList<Path> pathArr = new ArrayList<Path>(); pathArr.add(new ZipPath(this, new byte[]{'/'})); return pathArr; } @@ -192,7 +192,7 @@ public class ZipFileSystem extends FileS @Override public Iterable<FileStore> getFileStores() { - ArrayList<FileStore> list = new ArrayList<>(1); + ArrayList<FileStore> list = new ArrayList<FileStore>(1); list.add(new ZipFileStore(new ZipPath(this, new byte[]{'/'}))); return list; } @@ -258,7 +258,7 @@ public class ZipFileSystem extends FileS endWrite(); } if (!streams.isEmpty()) { // unlock and close all remaining streams - Set<InputStream> copy = new HashSet<>(streams); + Set<InputStream> copy = new HashSet<InputStream>(streams); for (InputStream is: copy) is.close(); } @@ -386,7 +386,7 @@ public class ZipFileSystem extends FileS IndexNode inode = getInode(path); if (inode == null) throw new NotDirectoryException(getString(path)); - List<Path> list = new ArrayList<>(); + List<Path> list = new ArrayList<Path>(); IndexNode child = inode.child; while (child != null) { ZipPath zp = toZipPath(child.name); @@ -815,7 +815,7 @@ public class ZipFileSystem extends FileS // the ex-channel and ex-path that need to close when their outstanding // input streams are all closed by the obtainers. - private Set<ExChannelCloser> exChClosers = new HashSet<>(); + private Set<ExChannelCloser> exChClosers = new HashSet<ExChannelCloser>(); private Set<Path> tmppaths = Collections.synchronizedSet(new HashSet<Path>()); private Path getTempPathForEntry(byte[] path) throws IOException { @@ -1012,7 +1012,7 @@ public class ZipFileSystem extends FileS private byte[] initCEN() throws IOException { end = findEND(); if (end.endpos == 0) { - inodes = new LinkedHashMap<>(10); + inodes = new LinkedHashMap<IndexNode,IndexNode>(10); locpos = 0; buildNodeTree(); return null; // only END header present @@ -1033,7 +1033,7 @@ public class ZipFileSystem extends FileS zerror("read CEN tables failed"); } // Iterate through the entries in the central directory - inodes = new LinkedHashMap<>(end.centot + 1); + inodes = new LinkedHashMap<IndexNode,IndexNode>(end.centot + 1); int pos = 0; int limit = cen.length - ENDHDR; while (pos < limit) { @@ -1180,7 +1180,7 @@ public class ZipFileSystem extends FileS return; Path tmpFile = createTempFileInSameDirectoryAs(zfpath); OutputStream os = Files.newOutputStream(tmpFile, WRITE); - ArrayList<Entry> elist = new ArrayList<>(inodes.size()); + ArrayList<Entry> elist = new ArrayList<Entry>(inodes.size()); long written = 0; byte[] buf = new byte[8192]; Entry e = null; @@ -1592,7 +1592,7 @@ public class ZipFileSystem extends FileS // Maxmum number of de/inflater we cache private final int MAX_FLATER = 20; // List of available Inflater objects for decompression - private final List<Inflater> inflaters = new ArrayList<>(); + private final List<Inflater> inflaters = new ArrayList<Inflater>(); // Gets an inflater from the list of available inflaters or allocates // a new one. @@ -1621,7 +1621,7 @@ public class ZipFileSystem extends FileS } // List of available Deflater objects for compression - private final List<Deflater> deflaters = new ArrayList<>(); + private final List<Deflater> deflaters = new ArrayList<Deflater>(); // Gets an deflater from the list of available deflaters or allocates // a new one. @@ -2331,7 +2331,7 @@ public class ZipFileSystem extends FileS private void buildNodeTree() throws IOException { beginWrite(); try { - HashSet<IndexNode> dirs = new HashSet<>(); + HashSet<IndexNode> dirs = new HashSet<IndexNode>(); IndexNode root = new IndexNode(ROOTPATH, -1); inodes.put(root, root); dirs.add(root); diff -up openjdk-boot/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileSystemProvider.java.sav openjdk-boot/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileSystemProvider.java --- openjdk-boot/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileSystemProvider.java.sav 2011-07-29 12:21:35.000000000 -0400 +++ openjdk-boot/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileSystemProvider.java 2011-07-29 14:27:07.798531083 -0400 @@ -53,7 +53,7 @@ import java.util.concurrent.ExecutorServ public class ZipFileSystemProvider extends FileSystemProvider { - private final Map<Path, ZipFileSystem> filesystems = new HashMap<>(); + private final Map<Path, ZipFileSystem> filesystems = new HashMap<Path,ZipFileSystem>(); public ZipFileSystemProvider() {} diff -up openjdk-boot/jdk/src/solaris/classes/java/lang/ProcessEnvironment.java.sav openjdk-boot/jdk/src/solaris/classes/java/lang/ProcessEnvironment.java --- openjdk-boot/jdk/src/solaris/classes/java/lang/ProcessEnvironment.java.sav 2011-07-29 12:21:39.000000000 -0400 +++ openjdk-boot/jdk/src/solaris/classes/java/lang/ProcessEnvironment.java 2011-07-29 14:27:07.798531083 -0400 @@ -68,7 +68,7 @@ final class ProcessEnvironment // We cache the C environment. This means that subsequent calls // to putenv/setenv from C will not be visible from Java code. byte[][] environ = environ(); - theEnvironment = new HashMap<>(environ.length/2 + 3); + theEnvironment = new HashMap<Variable,Value>(environ.length/2 + 3); // Read environment variables back to front, // so that earlier variables override later ones. for (int i = environ.length-1; i > 0; i-=2) diff -up openjdk-boot/jdk/src/solaris/classes/java/util/prefs/FileSystemPreferences.java.sav openjdk-boot/jdk/src/solaris/classes/java/util/prefs/FileSystemPreferences.java --- openjdk-boot/jdk/src/solaris/classes/java/util/prefs/FileSystemPreferences.java.sav 2011-07-29 14:27:01.432625563 -0400 +++ openjdk-boot/jdk/src/solaris/classes/java/util/prefs/FileSystemPreferences.java 2011-07-29 14:27:07.798531083 -0400 @@ -354,7 +354,7 @@ class FileSystemPreferences extends Abst * log against that map. The resulting map is then written back * to the disk. */ - final List<Change> changeLog = new ArrayList<>(); + final List<Change> changeLog = new ArrayList<Change>(); /** * Represents a change to a preference. @@ -507,7 +507,7 @@ class FileSystemPreferences extends Abst }); if (newNode) { // These 2 things guarantee node will get wrtten at next flush/sync - prefsCache = new TreeMap<>(); + prefsCache = new TreeMap<String, String>(); nodeCreate = new NodeCreate(); changeLog.add(nodeCreate); } @@ -550,7 +550,7 @@ class FileSystemPreferences extends Abst loadCache(); } catch(Exception e) { // assert lastSyncTime == 0; - prefsCache = new TreeMap<>(); + prefsCache = new TreeMap<String, String>(); } } @@ -567,7 +567,7 @@ class FileSystemPreferences extends Abst AccessController.doPrivileged( new PrivilegedExceptionAction<Void>() { public Void run() throws BackingStoreException { - Map<String, String> m = new TreeMap<>(); + Map<String, String> m = new TreeMap<String, String>(); long newLastSyncTime = 0; FileInputStream fis = null; try { @@ -581,7 +581,7 @@ class FileSystemPreferences extends Abst prefsFile.renameTo( new File( prefsFile.getParentFile(), "IncorrectFormatPrefs.xml")); - m = new TreeMap<>(); + m = new TreeMap<String, String>(); } else if (e instanceof FileNotFoundException) { getLogger().warning("Prefs file removed in background " + prefsFile.getPath()); @@ -662,7 +662,7 @@ class FileSystemPreferences extends Abst return AccessController.doPrivileged( new PrivilegedAction<String[]>() { public String[] run() { - List<String> result = new ArrayList<>(); + List<String> result = new ArrayList<String>(); File[] dirContents = dir.listFiles(); if (dirContents != null) { for (int i = 0; i < dirContents.length; i++) @@ -810,7 +810,7 @@ class FileSystemPreferences extends Abst } else if (lastSyncTime != 0 && !dir.exists()) { // This node was removed in the background. Playback any changes // against a virgin (empty) Map. - prefsCache = new TreeMap<>(); + prefsCache = new TreeMap<String, String>(); replayChanges(); } if (!changeLog.isEmpty()) { diff -up openjdk-boot/jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java.sav openjdk-boot/jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java --- openjdk-boot/jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java.sav 2011-07-29 12:21:40.000000000 -0400 +++ openjdk-boot/jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java 2011-07-29 14:27:07.798531083 -0400 @@ -60,7 +60,7 @@ public class ResolverConfigurationImpl int maxperkeyword, int maxkeywords) { - LinkedList<String> ll = new LinkedList<>(); + LinkedList<String> ll = new LinkedList<String>(); try { BufferedReader in = @@ -200,7 +200,7 @@ public class ResolverConfigurationImpl // no local domain so try fallback (RPC) domain or // hostname - sl = new LinkedList<>(); + sl = new LinkedList<String>(); String domain = fallbackDomain0(); if (domain != null && domain.length() > 0) { sl.add(domain); diff -up openjdk-boot/jdk/src/solaris/classes/sun/nio/cs/ext/CompoundTextSupport.java.sav openjdk-boot/jdk/src/solaris/classes/sun/nio/cs/ext/CompoundTextSupport.java --- openjdk-boot/jdk/src/solaris/classes/sun/nio/cs/ext/CompoundTextSupport.java.sav 2011-07-29 12:21:40.000000000 -0400 +++ openjdk-boot/jdk/src/solaris/classes/sun/nio/cs/ext/CompoundTextSupport.java 2011-07-29 14:27:07.799531069 -0400 @@ -153,12 +153,12 @@ final class CompoundTextSupport { static { HashMap<ControlSequence, String> tSequenceToEncodingMap = - new HashMap<>(33, 1.0f); + new HashMap<ControlSequence, String>(33, 1.0f); HashMap<ControlSequence, Boolean> tHighBitsMap = - new HashMap<>(31, 1.0f); + new HashMap<ControlSequence, Boolean>(31, 1.0f); HashMap<String, ControlSequence> tEncodingToSequenceMap = - new HashMap<>(21, 1.0f); - ArrayList<String> tEncodings = new ArrayList<>(21); + new HashMap<String, ControlSequence>(21, 1.0f); + ArrayList<String> tEncodings = new ArrayList<String>(21); if (!(isEncodingSupported("US-ASCII") && isEncodingSupported("ISO-8859-1"))) diff -up openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/LinuxFileSystem.java.sav openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/LinuxFileSystem.java --- openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/LinuxFileSystem.java.sav 2011-07-29 12:21:40.000000000 -0400 +++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/LinuxFileSystem.java 2011-07-29 14:27:07.799531069 -0400 @@ -53,7 +53,7 @@ class LinuxFileSystem extends UnixFileSy static final Set<String> supportedFileAttributeViews = supportedFileAttributeViews(); private static Set<String> supportedFileAttributeViews() { - Set<String> result = new HashSet<>(); + Set<String> result = new HashSet<String>(); result.addAll(standardFileAttributeViews()); // additional Linux-specific views result.add("dos"); @@ -76,7 +76,7 @@ class LinuxFileSystem extends UnixFileSy * Returns object to iterate over the mount entries in the given fstab file. */ Iterable<UnixMountEntry> getMountEntries(String fstab) { - ArrayList<UnixMountEntry> entries = new ArrayList<>(); + ArrayList<UnixMountEntry> entries = new ArrayList<UnixMountEntry>(); try { long fp = setmntent(fstab.getBytes(), "r".getBytes()); try { diff -up openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/LinuxUserDefinedFileAttributeView.java.sav openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/LinuxUserDefinedFileAttributeView.java --- openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/LinuxUserDefinedFileAttributeView.java.sav 2011-07-29 12:21:40.000000000 -0400 +++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/LinuxUserDefinedFileAttributeView.java 2011-07-29 14:27:07.799531069 -0400 @@ -63,7 +63,7 @@ class LinuxUserDefinedFileAttributeView // Parses buffer as array of NULL-terminated C strings. private List<String> asList(long address, int size) { - List<String> list = new ArrayList<>(); + List<String> list = new ArrayList<String>(); int start = 0; int pos = 0; while (pos < size) { diff -up openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/SolarisAclFileAttributeView.java.sav openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/SolarisAclFileAttributeView.java --- openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/SolarisAclFileAttributeView.java.sav 2011-07-29 12:21:40.000000000 -0400 +++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/SolarisAclFileAttributeView.java 2011-07-29 14:27:07.799531069 -0400 @@ -198,7 +198,7 @@ class SolarisAclFileAttributeView * Decode the buffer, returning an ACL */ private static List<AclEntry> decode(long address, int n) { - ArrayList<AclEntry> acl = new ArrayList<>(n); + ArrayList<AclEntry> acl = new ArrayList<AclEntry>(n); for (int i=0; i<n; i++) { long offset = address + i*SIZEOF_ACE_T; diff -up openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/SolarisFileSystem.java.sav openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/SolarisFileSystem.java --- openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/SolarisFileSystem.java.sav 2011-07-29 12:21:40.000000000 -0400 +++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/SolarisFileSystem.java 2011-07-29 14:27:07.799531069 -0400 @@ -76,7 +76,7 @@ class SolarisFileSystem extends UnixFile static final Set<String> supportedFileAttributeViews = supportedFileAttributeViews(); private static Set<String> supportedFileAttributeViews() { - Set<String> result = new HashSet<>(); + Set<String> result = new HashSet<String>(); result.addAll(standardFileAttributeViews()); // additional Solaris-specific views result.add("acl"); @@ -101,7 +101,7 @@ class SolarisFileSystem extends UnixFile */ @Override Iterable<UnixMountEntry> getMountEntries() { - ArrayList<UnixMountEntry> entries = new ArrayList<>(); + ArrayList<UnixMountEntry> entries = new ArrayList<UnixMountEntry>(); try { UnixPath mnttab = new UnixPath(this, "/etc/mnttab"); long fp = fopen(mnttab, "r"); diff -up openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/SolarisUserDefinedFileAttributeView.java.sav openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/SolarisUserDefinedFileAttributeView.java --- openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/SolarisUserDefinedFileAttributeView.java.sav 2011-07-29 12:21:40.000000000 -0400 +++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/SolarisUserDefinedFileAttributeView.java 2011-07-29 14:27:07.799531069 -0400 @@ -83,7 +83,7 @@ class SolarisUserDefinedFileAttributeVie } // read list of extended attributes - List<String> list = new ArrayList<>(); + List<String> list = new ArrayList<String>(); try { byte[] name; while ((name = readdir(dp)) != null) { diff -up openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/UnixFileAttributes.java.sav openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/UnixFileAttributes.java --- openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/UnixFileAttributes.java.sav 2011-07-29 12:21:41.000000000 -0400 +++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/UnixFileAttributes.java 2011-07-29 14:27:07.799531069 -0400 @@ -194,7 +194,7 @@ class UnixFileAttributes @Override public Set<PosixFilePermission> permissions() { int bits = (st_mode & UnixConstants.S_IAMB); - HashSet<PosixFilePermission> perms = new HashSet<>(); + HashSet<PosixFilePermission> perms = new HashSet<PosixFilePermission>(); if ((bits & UnixConstants.S_IRUSR) > 0) perms.add(PosixFilePermission.OWNER_READ); diff -up openjdk-boot/jdk/src/windows/classes/java/lang/ProcessEnvironment.java.sav openjdk-boot/jdk/src/windows/classes/java/lang/ProcessEnvironment.java --- openjdk-boot/jdk/src/windows/classes/java/lang/ProcessEnvironment.java.sav 2011-07-29 12:21:43.000000000 -0400 +++ openjdk-boot/jdk/src/windows/classes/java/lang/ProcessEnvironment.java 2011-07-29 14:27:07.799531069 -0400 @@ -250,7 +250,8 @@ final class ProcessEnvironment extends H envblock.substring(eql+1,end)); } - theCaseInsensitiveEnvironment = new TreeMap<>(nameComparator); + theCaseInsensitiveEnvironment + = new TreeMap<String,String>(nameComparator); theCaseInsensitiveEnvironment.putAll(theEnvironment); } @@ -295,7 +296,8 @@ final class ProcessEnvironment extends H // Only for use by ProcessImpl.start() String toEnvironmentBlock() { // Sort Unicode-case-insensitively by name - List<Map.Entry<String,String>> list = new ArrayList<>(entrySet()); + List<Map.Entry<String,String>> list + = new ArrayList<Map.Entry<String,String>>(entrySet()); Collections.sort(list, entryComparator); StringBuilder sb = new StringBuilder(size()*30); diff -up openjdk-boot/jdk/src/windows/classes/sun/net/dns/ResolverConfigurationImpl.java.sav openjdk-boot/jdk/src/windows/classes/sun/net/dns/ResolverConfigurationImpl.java --- openjdk-boot/jdk/src/windows/classes/sun/net/dns/ResolverConfigurationImpl.java.sav 2011-07-29 12:21:43.000000000 -0400 +++ openjdk-boot/jdk/src/windows/classes/sun/net/dns/ResolverConfigurationImpl.java 2011-07-29 14:27:07.799531069 -0400 @@ -63,7 +63,7 @@ public class ResolverConfigurationImpl // Parse string that consists of token delimited by space or commas // and return LinkedHashMap private LinkedList<String> stringToList(String str) { - LinkedList<String> ll = new LinkedList<>(); + LinkedList<String> ll = new LinkedList<String>(); // comma and space are valid delimites StringTokenizer st = new StringTokenizer(str, ", "); diff -up openjdk-boot/jdk/src/windows/classes/sun/nio/fs/WindowsFileSystem.java.sav openjdk-boot/jdk/src/windows/classes/sun/nio/fs/WindowsFileSystem.java --- openjdk-boot/jdk/src/windows/classes/sun/nio/fs/WindowsFileSystem.java.sav 2011-07-29 12:21:43.000000000 -0400 +++ openjdk-boot/jdk/src/windows/classes/sun/nio/fs/WindowsFileSystem.java 2011-07-29 14:27:07.799531069 -0400 @@ -128,7 +128,7 @@ class WindowsFileSystem } // iterate over roots, ignoring those that the security manager denies - ArrayList<Path> result = new ArrayList<>(); + ArrayList<Path> result = new ArrayList<Path>(); SecurityManager sm = System.getSecurityManager(); for (int i = 0; i <= 25; i++) { // 0->A, 1->B, 2->C... if ((drives & (1 << i)) != 0) { diff -up openjdk-boot/jdk/src/windows/classes/sun/nio/fs/WindowsPath.java.sav openjdk-boot/jdk/src/windows/classes/sun/nio/fs/WindowsPath.java --- openjdk-boot/jdk/src/windows/classes/sun/nio/fs/WindowsPath.java.sav 2011-07-29 12:21:43.000000000 -0400 +++ openjdk-boot/jdk/src/windows/classes/sun/nio/fs/WindowsPath.java 2011-07-29 14:27:07.799531069 -0400 @@ -575,7 +575,7 @@ class WindowsPath extends AbstractPath { // generate offset array private void initOffsets() { if (offsets == null) { - ArrayList<Integer> list = new ArrayList<>(); + ArrayList<Integer> list = new ArrayList<Integer>(); if (isEmpty()) { // empty path considered to have one name element list.add(0); diff -up openjdk-boot/jdk/src/windows/classes/sun/nio/fs/WindowsSecurityDescriptor.java.sav openjdk-boot/jdk/src/windows/classes/sun/nio/fs/WindowsSecurityDescriptor.java --- openjdk-boot/jdk/src/windows/classes/sun/nio/fs/WindowsSecurityDescriptor.java.sav 2011-07-29 12:21:43.000000000 -0400 +++ openjdk-boot/jdk/src/windows/classes/sun/nio/fs/WindowsSecurityDescriptor.java 2011-07-29 14:27:07.800531055 -0400 @@ -378,7 +378,7 @@ class WindowsSecurityDescriptor { AclInformation aclInfo = GetAclInformation(aclAddress); aceCount = aclInfo.aceCount(); } - ArrayList<AclEntry> result = new ArrayList<>(aceCount); + ArrayList<AclEntry> result = new ArrayList<AclEntry>(aceCount); // decode each of the ACEs to AclEntry objects for (int i=0; i<aceCount; i++) { diff -up openjdk-boot/jdk/src/windows/classes/sun/nio/fs/WindowsUserDefinedFileAttributeView.java.sav openjdk-boot/jdk/src/windows/classes/sun/nio/fs/WindowsUserDefinedFileAttributeView.java --- openjdk-boot/jdk/src/windows/classes/sun/nio/fs/WindowsUserDefinedFileAttributeView.java.sav 2011-07-29 12:21:43.000000000 -0400 +++ openjdk-boot/jdk/src/windows/classes/sun/nio/fs/WindowsUserDefinedFileAttributeView.java 2011-07-29 14:27:07.800531055 -0400 @@ -65,7 +65,7 @@ class WindowsUserDefinedFileAttributeVie // enumerates the file streams using FindFirstStream/FindNextStream APIs. private List<String> listUsingStreamEnumeration() throws IOException { - List<String> list = new ArrayList<>(); + List<String> list = new ArrayList<String>(); try { FirstStream first = FindFirstStream(file.getPathForWin32Calls()); if (first != null) { @@ -114,7 +114,7 @@ class WindowsUserDefinedFileAttributeVie NativeBuffer buffer = null; // result with names of alternative data streams - final List<String> list = new ArrayList<>(); + final List<String> list = new ArrayList<String>(); try { buffer = NativeBuffers.getNativeBuffer(BUFFER_SIZE); @@ -216,7 +216,7 @@ class WindowsUserDefinedFileAttributeVie // wrap with channel FileChannel fc = null; try { - Set<OpenOption> opts = new HashSet<>(); + Set<OpenOption> opts = new HashSet<OpenOption>(); opts.add(READ); if (!followLinks) opts.add(WindowsChannelFactory.OPEN_REPARSE_POINT); @@ -243,7 +243,7 @@ class WindowsUserDefinedFileAttributeVie // wrap with channel FileChannel fc = null; try { - Set<OpenOption> opts = new HashSet<>(); + Set<OpenOption> opts = new HashSet<OpenOption>(); opts.add(READ); if (!followLinks) opts.add(WindowsChannelFactory.OPEN_REPARSE_POINT); @@ -298,7 +298,7 @@ class WindowsUserDefinedFileAttributeVie x.rethrowAsIOException(file); } try { - Set<OpenOption> opts = new HashSet<>(); + Set<OpenOption> opts = new HashSet<OpenOption>(); if (!followLinks) opts.add(WindowsChannelFactory.OPEN_REPARSE_POINT); opts.add(CREATE); diff -up openjdk-boot/jdk/test/java/io/Serializable/NPEProvoker/NPEProvoker.java.sav openjdk-boot/jdk/test/java/io/Serializable/NPEProvoker/NPEProvoker.java --- openjdk-boot/jdk/test/java/io/Serializable/NPEProvoker/NPEProvoker.java.sav 2011-07-29 12:21:50.000000000 -0400 +++ openjdk-boot/jdk/test/java/io/Serializable/NPEProvoker/NPEProvoker.java 2011-07-29 14:27:07.800531055 -0400 @@ -56,7 +56,7 @@ public class NPEProvoker implements java public static void main(String[] args) { System.err.println("\n Regression test for bug 6541870\n"); try { - ArrayList<NPEProvoker> list = new ArrayList<>(); + ArrayList<NPEProvoker> list = new ArrayList<NPEProvoker>(); list.add(new NPEProvoker()); ByteArrayOutputStream baos = new ByteArrayOutputStream(); ObjectOutputStream oos = new ObjectOutputStream(baos); diff -up openjdk-boot/jdk/test/java/lang/instrument/ilib/InjectBytecodes.java.sav openjdk-boot/jdk/test/java/lang/instrument/ilib/InjectBytecodes.java --- openjdk-boot/jdk/test/java/lang/instrument/ilib/InjectBytecodes.java.sav 2011-07-29 12:21:53.000000000 -0400 +++ openjdk-boot/jdk/test/java/lang/instrument/ilib/InjectBytecodes.java 2011-07-29 14:27:07.800531055 -0400 @@ -50,7 +50,7 @@ class InjectBytecodes implements Runtime private final Injector[] after = new Injector[256]; private final String className; private final String methodName; - private final Map<Integer,byte[]> snippets = new HashMap<>(); + private final Map<Integer,byte[]> snippets = new HashMap<Integer,byte[]>(); private int pos; private int newPos; diff -up openjdk-boot/jdk/test/java/lang/instrument/ilib/Inject.java.sav openjdk-boot/jdk/test/java/lang/instrument/ilib/Inject.java --- openjdk-boot/jdk/test/java/lang/instrument/ilib/Inject.java.sav 2011-07-29 12:21:53.000000000 -0400 +++ openjdk-boot/jdk/test/java/lang/instrument/ilib/Inject.java 2011-07-29 14:27:07.800531055 -0400 @@ -107,7 +107,7 @@ public class Inject implements RuntimeCo class IndexedInjector implements TrackerInjector { int counter = 0; int tracker; - List<Info> infoList = new ArrayList<>(); + List<Info> infoList = new ArrayList<Info>(); public int stackSize(int currentSize) { return currentSize + 1; diff -up openjdk-boot/jdk/test/java/lang/reflect/Generics/TestPlainArrayNotGeneric.java.sav openjdk-boot/jdk/test/java/lang/reflect/Generics/TestPlainArrayNotGeneric.java --- openjdk-boot/jdk/test/java/lang/reflect/Generics/TestPlainArrayNotGeneric.java.sav 2011-07-29 12:21:53.000000000 -0400 +++ openjdk-boot/jdk/test/java/lang/reflect/Generics/TestPlainArrayNotGeneric.java 2011-07-29 14:27:07.800531055 -0400 @@ -103,7 +103,7 @@ public class TestPlainArrayNotGeneric { } } - private static final Set<Type> checking = new HashSet<>(); + private static final Set<Type> checking = new HashSet<Type>(); private static void check(Type t, String what) { if (t == null || !checking.add(t)) diff -up openjdk-boot/jdk/test/java/util/logging/ClassLoaderLeakTest.java.sav openjdk-boot/jdk/test/java/util/logging/ClassLoaderLeakTest.java --- openjdk-boot/jdk/test/java/util/logging/ClassLoaderLeakTest.java.sav 2011-07-29 12:21:59.000000000 -0400 +++ openjdk-boot/jdk/test/java/util/logging/ClassLoaderLeakTest.java 2011-07-29 14:27:07.800531055 -0400 @@ -89,7 +89,7 @@ public class ClassLoaderLeakTest { MyClassLoader appClassLoader = new MyClassLoader(urls, "test0"); WeakReference<MyClassLoader> ref = - new WeakReference<>(appClassLoader); + new WeakReference<MyClassLoader>(appClassLoader); Thread appThread = new Thread(appsThreadGroup, launcher, "AppThread-0"); diff -up openjdk-boot/jdk/test/java/util/Random/DistinctSeeds.java.sav openjdk-boot/jdk/test/java/util/Random/DistinctSeeds.java --- openjdk-boot/jdk/test/java/util/Random/DistinctSeeds.java.sav 2011-07-29 12:21:59.000000000 -0400 +++ openjdk-boot/jdk/test/java/util/Random/DistinctSeeds.java 2011-07-29 14:27:07.800531055 -0400 @@ -59,7 +59,7 @@ public class DistinctSeeds { } } final int threadCount = 2; - List<RandomCollector> collectors = new ArrayList<>(); + List<RandomCollector> collectors = new ArrayList<RandomCollector>(); List<Thread> threads = new ArrayList<Thread>(); for (int i = 0; i < threadCount; i++) { RandomCollector r = new RandomCollector();
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor
