update to java 7 and use diamond operator