BlueDevilDan - 2010-05-21

Also a note, there is no real place to put a SuppressWarnings in the file that has an effect on the PMD warnings produced