new checkstyle warnings, findbugs in trunk

[Glenn Adams]

Please fix the 2 new checkstyle warnings and 9 new findbug errors in trunk.
In the future, please check and fix before committing.

Thanks, Glenn