I threw airsonic at IntelliJ's IDEA analysis, and asked it to flag what could be modernized for Java > 5. - foreach instead of for… - I added some null-deref checks - Integer.ValueOf, since Integer(…) is deprecated - Contextual try - Objects.equals instead of handcrafted comparisons - StringBuilder instead of StringBuffer - Removal of outdated/wrong javadoc comments