Porting code to be compatible with Java 1.6