Now uses more jdk 1.5 functionality (particularly generics)
Authored by: keess 2006-02-10
Parent: [r1501]
Child: [r1503]