fixed errors in diff.java