How to Refactor for JDK 7