initial conversion for Java 5+
step2 - eclipse refactorings applied
step 3 to java 5+
step 4.