PMD fixes

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