Converting to java 1.6 syntax for GWT compatibility