Hi Valerie, You're up next for diamond conversion. :-)
These should be pretty straightforward. Almost all changes are variable initializations. There's one return statement, one use of diamond in a ternary operator (a ? b : c), and one whitespace fixup.
Webrev is here: http://cr.openjdk.java.net/~smarks/reviews/7011998/webrev.0/ Thanks! s'marks
