added some diamond notation and compiler config for java 7 to affect eclipse project configuration