1.1 --- a/src/share/classes/com/sun/tools/javac/jvm/ClassReader.java Mon Sep 23 10:10:07 2013 +0200
1.2 +++ b/src/share/classes/com/sun/tools/javac/jvm/ClassReader.java Mon Sep 23 10:42:38 2013 +0200
1.3 @@ -1446,8 +1446,7 @@
1.4 void attachTypeAnnotations(final Symbol sym) {
1.5 int numAttributes = nextChar();
1.6 if (numAttributes != 0) {
1.7 - ListBuffer<TypeAnnotationProxy> proxies =
1.8 - ListBuffer.lb();
1.9 + ListBuffer<TypeAnnotationProxy> proxies = new ListBuffer<>();
1.10 for (int i = 0; i < numAttributes; i++)
1.11 proxies.append(readTypeAnnotation());
1.12 annotate.normal(new TypeAnnotationCompleter(sym, proxies.toList()));
1.13 @@ -1596,7 +1595,7 @@
1.14
1.15 { // See whether there is location info and read it
1.16 int len = nextByte();
1.17 - ListBuffer<Integer> loc = ListBuffer.lb();
1.18 + ListBuffer<Integer> loc = new ListBuffer<>();
1.19 for (int i = 0; i < len * TypeAnnotationPosition.TypePathEntry.bytesPerEntry; ++i)
1.20 loc = loc.append(nextByte());
1.21 position.location = TypeAnnotationPosition.getTypePathFromBinary(loc.toList());
1.22 @@ -1946,7 +1945,7 @@
1.23 }
1.24
1.25 List<Attribute.TypeCompound> deproxyTypeCompoundList(List<TypeAnnotationProxy> proxies) {
1.26 - ListBuffer<Attribute.TypeCompound> buf = ListBuffer.lb();
1.27 + ListBuffer<Attribute.TypeCompound> buf = new ListBuffer<>();
1.28 for (TypeAnnotationProxy proxy: proxies) {
1.29 Attribute.Compound compound = deproxyCompound(proxy.compound);
1.30 Attribute.TypeCompound typeCompound = new Attribute.TypeCompound(compound, proxy.position);
1.31 @@ -2033,7 +2032,7 @@
1.32 boolean isVarargs = (flags & VARARGS) != 0;
1.33 if (isVarargs) {
1.34 Type varargsElem = args.last();
1.35 - ListBuffer<Type> adjustedArgs = ListBuffer.lb();
1.36 + ListBuffer<Type> adjustedArgs = new ListBuffer<>();
1.37 for (Type t : args) {
1.38 adjustedArgs.append(t != varargsElem ?
1.39 t :
