PMD fixes

Change-Id: I348b37a14097439f8a56b0a671794410e46201ca
Reviewed-on: http://gerrit.dmdirc.com/3938
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Greg Holmes <greg@dmdirc.com>