Fixing Compiler Warnings

I have updated java files to remove raw generics.  This isn't required, but should have no impact other than reducing all of the compiler warnings.