Added Java 6 API checker and updated code to remove Java 7 constructs