Changes to work with Java 1.6

Mac does not support java 1.7 fully yet. So I changed the diamond operators back.