Migrating to J2SE 5.0