Updates for Java 1.5 codestyle