Updated to java 7 and new eclipse