fix java 1.7 syntax warnings