Updated Java source to 1.7